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 92cf99e24c8164c65cf316ac6ac59f60afbaa68e..a8004ed0f6070a3e3febd79476195c4aa03bfc00 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -528,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;
        }
@@ -594,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;
                }
@@ -1122,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);
                }
        }