Add enums to hacking too.

[citadel.git] / citadel / ldap.c

diff --git a/citadel/ldap.c b/citadel/ldap.c
index 2b0282a85e6a451db94720af8cdcb2c114c7d229..9d6ddf16389c57ebb76d44ab99e5c87caca1fd28 100644 (file)
--- a/citadel/ldap.c
+++ b/citadel/ldap.c
@@ -60,7 +60,7 @@ int ctdl_ldap_initialize(LDAP **ld) {
 int CtdlTryUserLDAP(char *username,
                char *found_dn, int found_dn_size,
                char *fullname, int fullname_size,
-               uid_t *uid)
+               uid_t *uid, int lookup_based_on_username)
 {
        LDAP *ldserver = NULL;
        int i;
@@ -73,7 +73,6 @@ int CtdlTryUserLDAP(char *username,
 
        if (fullname) safestrncpy(fullname, username, fullname_size);
 
-       ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
        if (ctdl_ldap_initialize(&ldserver) != LDAP_SUCCESS) {
                return(errno);
        }
@@ -97,10 +96,16 @@ int CtdlTryUserLDAP(char *username,
        tv.tv_usec = 0;
 
        if (config.c_auth_mode == AUTHMODE_LDAP_AD) {
-               snprintf(searchstring, sizeof(searchstring), "(sAMAccountName=%s)", username);
+               if (lookup_based_on_username != 0)
+                       snprintf(searchstring, sizeof(searchstring), "(displayName=%s)",username);
+               else
+                       snprintf(searchstring, sizeof(searchstring), "(sAMAccountName=%s)", username);
        }
        else {
-               snprintf(searchstring, sizeof(searchstring), "(&(objectclass=posixAccount)(uid=%s))", username);
+               if (lookup_based_on_username != 0)
+                       snprintf(searchstring, sizeof(searchstring), "(cn=%s)",username);
+               else
+                       snprintf(searchstring, sizeof(searchstring), "(&(objectclass=posixAccount)(uid=%s))", username);
        }
 
        syslog(LOG_DEBUG, "LDAP search: %s", searchstring);
@@ -158,29 +163,31 @@ int CtdlTryUserLDAP(char *username,
                                ldap_value_free(values);
                        }
                }
-
-               if (config.c_auth_mode == AUTHMODE_LDAP_AD) {
-                       values = ldap_get_values(ldserver, search_result, "objectGUID");
-                       if (values) {
-                               if (values[0]) {
-                                       if (uid != NULL) {
-                                               *uid = abs(HashLittle(values[0], strlen(values[0])));
-                                               syslog(LOG_DEBUG, "uid hashed from objectGUID = %d", *uid);
+               /* If we know the username is the CN/displayName, we already set the uid*/
+               if (lookup_based_on_username==0) {
+                       if (config.c_auth_mode == AUTHMODE_LDAP_AD) {
+                               values = ldap_get_values(ldserver, search_result, "objectGUID");
+                               if (values) {
+                                       if (values[0]) {
+                                               if (uid != NULL) {
+                                                       *uid = abs(HashLittle(values[0], strlen(values[0])));
+                                                       syslog(LOG_DEBUG, "uid hashed from objectGUID = %d", *uid);
+                                               }
                                        }
+                                       ldap_value_free(values);
                                }
-                               ldap_value_free(values);
                        }
-               }
-               else {
-                       values = ldap_get_values(ldserver, search_result, "uidNumber");
-                       if (values) {
-                               if (values[0]) {
-                                       syslog(LOG_DEBUG, "uidNumber = %s", values[0]);
-                                       if (uid != NULL) {
-                                               *uid = atoi(values[0]);
+                       else {
+                               values = ldap_get_values(ldserver, search_result, "uidNumber");
+                               if (values) {
+                                       if (values[0]) {
+                                               syslog(LOG_DEBUG, "uidNumber = %s", values[0]);
+                                               if (uid != NULL) {
+                                                       *uid = atoi(values[0]);
+                                               }
                                        }
+                                       ldap_value_free(values);
                                }
-                               ldap_value_free(values);
                        }
                }
 
@@ -214,8 +221,6 @@ int CtdlTryPasswordLDAP(char *user_dn, const char *password)
        }
 
        syslog(LOG_DEBUG, "LDAP: trying to bind as %s", user_dn);
-       ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
-
        i = ctdl_ldap_initialize(&ldserver);
        if (i == LDAP_SUCCESS) {
                ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ctdl_require_ldap_version);
@@ -240,13 +245,14 @@ int CtdlTryPasswordLDAP(char *user_dn, const char *password)
 //return !0 iff property changed.
 int vcard_set_props_iff_different(struct vCard *v,char *propname,int numvals, char **vals) {
        int i;
-       char *oldval;
+       char *oldval = "";
        for(i=0;i<numvals;i++) {
          oldval = vcard_get_prop(v,propname,0,i,0);
          if (oldval == NULL) break;
          if (strcmp(vals[i],oldval)) break;
        }
        if (i!=numvals) {
+               syslog(LOG_DEBUG, "LDAP: vcard property %s, element %d of %d changed from %s to %s\n", propname, i, numvals, oldval, vals[i]);
                for(i=0;i<numvals;i++) vcard_set_prop(v,propname,vals[i],(i==0) ? 0 : 1);
                return 1;
        }
@@ -308,12 +314,8 @@ int Ctdl_LDAP_to_vCard(char *ldap_dn, struct vCard *v)
 
        if (!ldap_dn) return(0);
        if (!v) return(0);
-       ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
-       if (ldserver == NULL) {
-               syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s",
-                       config.c_ldap_host, config.c_ldap_port,
-                       strerror(errno)
-               );
+
+       if (ctdl_ldap_initialize(&ldserver) != LDAP_SUCCESS) {
                return(0);
        }
 
@@ -406,7 +408,7 @@ int Ctdl_LDAP_to_vCard(char *ldap_dn, struct vCard *v)
                if (mail) {
                        changed_something |= vcard_set_props_iff_different(v,"email;internet",ldap_count_values(mail),mail);
                }
-               if (uuid) changed_something |= vcard_set_one_prop_iff_different(v,"uid","%s",uuid[0]);
+               if (uuid) changed_something |= vcard_set_one_prop_iff_different(v,"X-uuid","%s",uuid[0]);
                if (o) changed_something |= vcard_set_one_prop_iff_different(v,"org","%s",o[0]);
                if (cn) changed_something |= vcard_set_one_prop_iff_different(v,"fn","%s",cn[0]);
                if (title) changed_something |= vcard_set_one_prop_iff_different(v,"title","%s",title[0]);