[svn-commits] file: trunk r116350 - /trunk/res/res_config_ldap.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed May 14 13:25:54 2008
New Revision: 116350

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116350
Log:
Make the ldap version setting work without having both version and protocol set.
(closes issue #12613)
Reported by: suretec

Modified:
    trunk/res/res_config_ldap.c

Modified: trunk/res/res_config_ldap.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_ldap.c?view=diff&rev=116350&r1=116349&r2=116350
==============================================================================
--- trunk/res/res_config_ldap.c (original)
+++ trunk/res/res_config_ldap.c Wed May 14 13:25:54 2008
@@ -1432,7 +1432,7 @@
 	} else 
 		ast_copy_string(basedn, s, sizeof(basedn));
 
-	if (!(s = ast_variable_retrieve(config, "_general", "version")) || !(s = ast_variable_retrieve(config, "_general", "protocol"))) {
+	if (!(s = ast_variable_retrieve(config, "_general", "version")) && !(s = ast_variable_retrieve(config, "_general", "protocol"))) {
 		ast_log(LOG_NOTICE, "No explicit LDAP version found, using 3 as default.\n");
 		version = 3;
 	} else if (sscanf(s, "%d", &version) != 1 || version < 1 || version > 6) {