From c8b5ae3381b37695b7f09376559b83f7fedeac56 Mon Sep 17 00:00:00 2001 From: file Date: Wed, 14 May 2008 18:25:54 +0000 Subject: 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/trunk@116350 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_config_ldap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'res/res_config_ldap.c') 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) { -- cgit v1.2.3