[asterisk-commits] file: branch 1.6.0 r116351 - in /branches/1.6.0: ./ res/res_config_ldap.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed May 14 13:27:06 2008
New Revision: 116351

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116351
Log:
Merged revisions 116350 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r116350 | file | 2008-05-14 15:25:54 -0300 (Wed, 14 May 2008) | 4 lines

Make the ldap version setting work without having both version and protocol set.
(closes issue #12613)
Reported by: suretec

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_config_ldap.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_config_ldap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_config_ldap.c?view=diff&rev=116351&r1=116350&r2=116351
==============================================================================
--- branches/1.6.0/res/res_config_ldap.c (original)
+++ branches/1.6.0/res/res_config_ldap.c Wed May 14 13:27:06 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) {