CtdlTryUserLDAP() migrtated to ctdl_ldap_initialize()

[citadel.git] / citadel / ldap.c

diff --git a/citadel/ldap.c b/citadel/ldap.c
index 80f88bffacdae0933bdedffcd224b6bede6b1fa5..cb5a017037c70a2c7ae9ffa0f130be3b264caa33 100644 (file)
--- a/citadel/ldap.c
+++ b/citadel/ldap.c
@@ -30,17 +30,32 @@ int ctdl_require_ldap_version = 3;
 
 
 /*
- * 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.
+ * Wrapper function for ldap_initialize() that consistently fills in the correct fields
  */
-LDAP *ctdl_ldap_init(void) {
-       return ldap_init(config.c_ldap_host, config.c_ldap_port);
+int ctdl_ldap_initialize(LDAP **ld) {
+
+       char server_url[256];
+       int ret;
+
+       snprintf(server_url, sizeof server_url, "ldap://%s:%d", config.c_ldap_host, config.c_ldap_port);
+       ret = ldap_initialize(ld, server_url);
+       if (ret != LDAP_SUCCESS) {
+               syslog(LOG_ALERT, "LDAP: Could not connect to %s : %s",
+                       server_url,
+                       strerror(errno)
+               );
+               *ld = NULL;
+               return(errno);
+       }
+
+       return(ret);
 }
 
 
 
-/* 
- * Look up a username in the LDAP directory to see if it's valid for logging in.
+
+/*
+ * Look up a user in the directory to see if this is an account that can be authenticated
  */
 int CtdlTryUserLDAP(char *username,
                char *found_dn, int found_dn_size,
@@ -58,12 +73,8 @@ int CtdlTryUserLDAP(char *username,
 
        if (fullname) safestrncpy(fullname, username, fullname_size);
 
-       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,
-                       strerror(errno)
-               );
+       ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
+       if (ctdl_ldap_initialize(&ldserver) != LDAP_SUCCESS) {
                return(errno);
        }
 
@@ -203,7 +214,7 @@ int CtdlTryPasswordLDAP(char *user_dn, const char *password)
        }
 
        syslog(LOG_DEBUG, "LDAP: trying to bind as %s", user_dn);
-       ldserver = ctdl_ldap_init();
+       ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
        if (ldserver) {
                ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ctdl_require_ldap_version);
                i = ldap_simple_bind_s(ldserver, user_dn, password);
@@ -295,7 +306,7 @@ int Ctdl_LDAP_to_vCard(char *ldap_dn, struct vCard *v)
 
        if (!ldap_dn) return(0);
        if (!v) return(0);
-       ldserver = ctdl_ldap_init();
+       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,