All calls to ldap_init(host,port) are now replaced with a wrapper function ctdl_ldap_...

[citadel.git] / citadel / ldap.c

diff --git a/citadel/ldap.c b/citadel/ldap.c
index 754692e294d51dcc6885282f79354203ab5c5519..80f88bffacdae0933bdedffcd224b6bede6b1fa5 100644 (file)
--- a/citadel/ldap.c
+++ b/citadel/ldap.c
@@ -27,6 +27,21 @@ int ctdl_require_ldap_version = 3;
 #define LDAP_DEPRECATED 1      /* Suppress libldap's warning that we are using deprecated API calls */
 #include <ldap.h>
 
+
+
+/*
+ * This function is a replacement for all calls to ldap_init() in this file.
+ * It fills in the required fields with those from the server's global config.
+ */
+LDAP *ctdl_ldap_init(void) {
+       return ldap_init(config.c_ldap_host, config.c_ldap_port);
+}
+
+
+
+/* 
+ * Look up a username in the LDAP directory to see if it's valid for logging in.
+ */
 int CtdlTryUserLDAP(char *username,
                char *found_dn, int found_dn_size,
                char *fullname, int fullname_size,
@@ -41,10 +56,9 @@ int CtdlTryUserLDAP(char *username,
        char **values;
        char *user_dn = NULL;
 
-#ifndef LDAP_INITIALIZE
        if (fullname) safestrncpy(fullname, username, fullname_size);
 
-       ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
+       ldserver = ctdl_ldap_init();
        if (ldserver == NULL) {
                syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s",
                        config.c_ldap_host, config.c_ldap_port,
@@ -67,31 +81,6 @@ int CtdlTryUserLDAP(char *username,
                syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)", ldap_err2string(i), i);
                return(i);
        }
-#else
-       if (ldap_initialize(&ldserver, config.c_ldap_host))
-       {
-               syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s",
-                          config.c_ldap_host, config.c_ldap_port,
-                          strerror(errno)
-                       );
-               return(errno);
-       }
-
-       striplt(config.c_ldap_bind_dn);
-       striplt(config.c_ldap_bind_pw);
-
-       syslog(LOG_DEBUG, "LDAP bind DN: %s", config.c_ldap_bind_dn);
-       i = ldap_simple_bind_s(ldserver,
-               (!IsEmptyStr(config.c_ldap_bind_dn) ? config.c_ldap_bind_dn : NULL),
-               (!IsEmptyStr(config.c_ldap_bind_pw) ? config.c_ldap_bind_pw : NULL)
-       );
-
-       if (i != LDAP_SUCCESS) {
-               syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)", ldap_err2string(i), i);
-               return(i);
-       }
-#endif
-
 
        tv.tv_sec = 10;
        tv.tv_usec = 0;
@@ -214,7 +203,7 @@ 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);
+       ldserver = ctdl_ldap_init();
        if (ldserver) {
                ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ctdl_require_ldap_version);
                i = ldap_simple_bind_s(ldserver, user_dn, password);
@@ -306,7 +295,7 @@ 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);
+       ldserver = ctdl_ldap_init();
        if (ldserver == NULL) {
                syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s",
                        config.c_ldap_host, config.c_ldap_port,