more moving towards ldap sync ... lots of refactoring

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 00b02728362cc48a6aaa60bbe554285320fc14df..bfd2660b65d69c0f2946a459c0a3f51015f0986f 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -367,8 +367,7 @@ int is_room_aide(void)
                return (0);
        }
 
-       if ((CC->user.axlevel >= AxAideU)
-           || (CC->room.QRroomaide == CC->user.usernum)) {
+       if ((CC->user.axlevel >= AxAideU) || (CC->room.QRroomaide == CC->user.usernum)) {
                return (1);
        } else {
                return (0);
@@ -551,11 +550,11 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
                 * If not found, make one attempt to create it.
                 */
                found_user = getuserbyuid(&CC->user, pd.pw_uid);
-               syslog(LOG_DEBUG, "user_ops: found it: uid=%ld, gecos=%s here: %d", (long)pd.pw_uid, pd.pw_gecos, found_user);
                if (found_user != 0) {
-                       create_user(username, 0);
+                       create_user(username, CREATE_USER_DO_NOT_BECOME_USER, pd.pw_uid);
                        found_user = getuserbyuid(&CC->user, pd.pw_uid);
                }
+               syslog(LOG_DEBUG, "user_ops: found it: uid=%ld, gecos=%s here: %d", (long)pd.pw_uid, pd.pw_gecos, found_user);
 
        }
 
@@ -568,14 +567,14 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
                char ldap_cn[256];
                char ldap_dn[256];
 
-               found_user = CtdlTryUserLDAP(username, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &ldap_uid, 0);
+               found_user = CtdlTryUserLDAP(username, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &ldap_uid);
                if (found_user != 0) {
                        return login_not_found;
                }
 
                found_user = getuserbyuid(&CC->user, ldap_uid);
                if (found_user != 0) {
-                       create_user(username, 0);
+                       create_user(ldap_cn, CREATE_USER_DO_NOT_BECOME_USER, ldap_uid);
                        found_user = getuserbyuid(&CC->user, ldap_uid);
                }
 
@@ -1036,63 +1035,23 @@ int internal_create_user(char *username, struct ctdluser *usbuf, uid_t uid)
  * create_user()  -  back end processing to create a new user
  *
  * Set 'newusername' to the desired account name.
- * Set 'become_user' to nonzero if this is self-service account creation and we want
- * to actually log in as the user we just created, otherwise set it to 0.
+ * Set 'become_user' to CREATE_USER_BECOME_USER if this is self-service account creation and we want to
+ *                   actually log in as the user we just created, otherwise set it to CREATE_USER_DO_NOT_BECOME_USER
+ * Set 'uid' to some uid_t value to associate the account with an external auth user, or (-1) for native auth
  */
-int create_user(const char *newusername, int become_user)
+int create_user(char *username, int become_user, uid_t uid)
 {
        struct ctdluser usbuf;
        struct ctdlroom qrbuf;
-       char username[256];
        char mailboxname[ROOMNAMELEN];
        char buf[SIZ];
        int retval;
-       uid_t uid = (-1);
 
-       safestrncpy(username, newusername, sizeof username);
        strproc(username);
-       
-       if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
-
-               /* host auth mode */
-
-               struct passwd pd;
-               struct passwd *tempPwdPtr;
-               char pwdbuffer[SIZ];
-       
-#ifdef HAVE_GETPWNAM_R
-#ifdef SOLARIS_GETPWUID
-               tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof(pwdbuffer));
-#else // SOLARIS_GETPWUID
-               getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
-#endif // SOLARIS_GETPWUID
-#else // HAVE_GETPWNAM_R
-               tempPwdPtr = NULL;
-#endif // HAVE_GETPWNAM_R
-               if (tempPwdPtr != NULL) {
-                       extract_token(username, pd.pw_gecos, 0, ',', sizeof username);
-                       uid = pd.pw_uid;
-                       if (IsEmptyStr (username))
-                       {
-                               safestrncpy(username, pd.pw_name, sizeof username);
-                       }
-               }
-               else {
-                       return (ERROR + NO_SUCH_USER);
-               }
+       if ((retval = internal_create_user(username, &usbuf, uid)) != 0) {
+               return retval;
        }
 
-#ifdef HAVE_LDAP
-       if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
-               if (CtdlTryUserLDAP(username, NULL, 0, username, sizeof username, &uid, 0) != 0) {
-                       return(ERROR + NO_SUCH_USER);
-               }
-       }
-#endif /* HAVE_LDAP */
-       
-       if ((retval = internal_create_user(username, &usbuf, uid)) != 0)
-               return retval;
-       
        /*
         * Give the user a private mailbox and a configuration room.
         * Make the latter an invisible system room.
@@ -1114,7 +1073,7 @@ int create_user(const char *newusername, int become_user)
         * creating a user, instead of doing self-service account creation
         */
 
-       if (become_user) {
+       if (become_user == CREATE_USER_BECOME_USER) {
                /* Now become the user we just created */
                memcpy(&CC->user, &usbuf, sizeof(struct ctdluser));
                safestrncpy(CC->curr_user, username, sizeof CC->curr_user);