Removed the whole configlen thing. Seriously, WTF?

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 270ca87dbe48590d1093f81e34cee0c5b226dec9..a8004ed0f6070a3e3febd79476195c4aa03bfc00 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -29,17 +29,6 @@ int chkpwd_write_pipe[2];
 int chkpwd_read_pipe[2];
 
 
-
-/*
- * getuser()  -  retrieve named user into supplied buffer.
- *            returns 0 on success
- */
-int getuser(struct ctdluser *usbuf, char name[])
-{
-       return CtdlGetUser(usbuf, name);
-}
-
-
 /*
  * CtdlGetUser()  -  retrieve named user into supplied buffer.
  *            returns 0 on success
@@ -76,6 +65,12 @@ int CtdlGetUser(struct ctdluser *usbuf, char *name)
        return CtdlGetUserLen(usbuf, name, cutuserkey(name));
 }
 
+int CtdlLockGetCurrentUser(void)
+{
+       CitContext *CCC = CC;
+
+       return CtdlGetUserLen(&CCC->user, CCC->curr_user, cutuserkey(CCC->curr_user));
+}
 
 /*
  * CtdlGetUserLock()  -  same as getuser() but locks the record
@@ -92,15 +87,6 @@ int CtdlGetUserLock(struct ctdluser *usbuf, char *name)
 }
 
 
-/*
- * lgetuser()  -  same as getuser() but locks the record
- */
-int lgetuser(struct ctdluser *usbuf, char *name)
-{
-       return CtdlGetUserLock(usbuf, name);
-}
-
-
 /*
  * CtdlPutUser()  -  write user buffer into the correct place on disk
  */
@@ -119,13 +105,9 @@ void CtdlPutUser(struct ctdluser *usbuf)
 
 }
 
-
-/*
- * putuser()  -  write user buffer into the correct place on disk
- */
-void putuser(struct ctdluser *usbuf)
+void CtdlPutCurrentUserLock()
 {
-       CtdlPutUser(usbuf);
+       CtdlPutUser(&CC->user);
 }
 
 
@@ -139,14 +121,6 @@ void CtdlPutUserLock(struct ctdluser *usbuf)
 }
 
 
-/*
- * lputuser()  -  same as putuser() but locks the record
- */
-void lputuser(struct ctdluser *usbuf)
-{
-       CtdlPutUserLock(usbuf);
-}
-
 
 /*
  * rename_user()  -  this is tricky because the user's display name is the database key
@@ -447,19 +421,6 @@ int CtdlGetUserByNumber(struct ctdluser *usbuf, long number)
        return(r);
 }
 
-/*
- * getuserbynumber() - get user by number
- *                     returns 0 if user was found
- *
- * Note: fetching a user this way requires one additional database operation.
- */
-int getuserbynumber(struct ctdluser *usbuf, long number)
-{
-       return CtdlGetUserByNumber(usbuf, number);
-}
-
-
-
 /*
  * Helper function for rebuild_usersbynumber()
  */
@@ -567,10 +528,10 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
 
        /* If a "master user" is defined, handle its authentication if specified */
        CC->is_master = 0;
-       if ((configlen.c_master_user > 0) && 
-           (configlen.c_master_pass > 0) &&
-           (authname != NULL) &&
-           (!strcasecmp(authname, config.c_master_user)))
+       if (    (strlen(config.c_master_user) > 0) && 
+               (strlen(config.c_master_pass) > 0) &&
+               (authname != NULL) &&
+               (!strcasecmp(authname, config.c_master_user)) )
        {
                CC->is_master = 1;
        }
@@ -633,7 +594,7 @@ 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);
+               found_user = CtdlTryUserLDAP(username, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &ldap_uid, 0);
                if (found_user != 0) {
                        return login_not_found;
                }
@@ -1161,7 +1122,7 @@ int create_user(const char *newusername, long len, int become_user)
 
 #ifdef HAVE_LDAP
        if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) {
-               if (CtdlTryUserLDAP(username, NULL, 0, username, sizeof username, &uid) != 0) {
+               if (CtdlTryUserLDAP(username, NULL, 0, username, sizeof username, &uid, 0) != 0) {
                        return(ERROR + NO_SUCH_USER);
                }
        }