diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-14 18:27:06 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-14 18:27:06 +0000 |
| commit | d0d11b9ec82988725515f4f53e8a4efd0a66b303 (patch) | |
| tree | d837f74c63a3a218d4d25a10e598b4f2ad613ffd /res | |
| parent | 95630a94423b3e9180488b934edec3d78ff6aeb4 (diff) | |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@116351 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_config_ldap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 33ed247b7..b8816b920 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -1432,7 +1432,7 @@ int parse_config(void) } 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) { |