kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-26 07:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the ldap version setting work without having both version and protocol set.

Browse Source 
(closes issue #12613)
Reported by: suretec


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@116350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2008-05-14 18:25:54 +00:00
parent c15ed0f3f6
commit ac876a8e4e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/res_config_ldap.c
View File

@@ -1432,7 +1432,7 @@ int parse_config(void)
} else } else
ast_copy_string(basedn, s, sizeof(basedn)); 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"); ast_log(LOG_NOTICE, "No explicit LDAP version found, using 3 as default.\n");
version = 3; version = 3;
} else if (sscanf(s, "%d", &version) != 1 || version < 1 || version > 6) { } else if (sscanf(s, "%d", &version) != 1 || version < 1 || version > 6) {