From fc25e47955a68f10cf44262744a48343bfdcfdd9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Wed, 7 Oct 2009 21:14:30 +0000 Subject: [PATCH] * by ano: use more uniq name in the ldap module; the old one clashed in solaris. --- citadel/ldap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/citadel/ldap.c b/citadel/ldap.c index 1bc38224c..0a4cb2c44 100644 --- a/citadel/ldap.c +++ b/citadel/ldap.c @@ -9,7 +9,7 @@ */ -int ldap_version = 3; +int ctdl_require_ldap_version = 3; #include "sysdep.h" @@ -89,7 +89,7 @@ int CtdlTryUserLDAP(char *username, return(errno); } - ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ldap_version); + ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ctdl_require_ldap_version); striplt(config.c_ldap_bind_dn); striplt(config.c_ldap_bind_pw); @@ -217,7 +217,7 @@ int CtdlTryPasswordLDAP(char *user_dn, char *password) ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port); if (ldserver) { - ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ldap_version); + ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ctdl_require_ldap_version); i = ldap_simple_bind_s(ldserver, user_dn, password); if (i == LDAP_SUCCESS) { CtdlLogPrintf(CTDL_DEBUG, "LDAP: bind succeeded\n"); -- 2.30.2