From de83ad2eba5500b5a729da8cf721db202f9223bd Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 6 Nov 2014 12:52:12 -0500 Subject: [PATCH] All calls to ldap_init(host,port) are now replaced with a wrapper function ctdl_ldap_init() that connects to the correct server specified in our config. --- citadel/ldap.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/citadel/ldap.c b/citadel/ldap.c index ea4ad0a3d..80f88bffa 100644 --- 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 + + +/* + * 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, @@ -43,7 +58,7 @@ int CtdlTryUserLDAP(char *username, 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, @@ -188,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); @@ -280,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, -- 2.30.2