aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-07 18:30:12 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-07 18:30:12 +0000
commit2420ef49a12c799677dfe26803985bbbc1699807 (patch)
tree4ba13ef34964ee3cdb73b3f6854d9f09a501ea78 /res
parent737fc359580d2d01bf0a5cf373431a5ae68c3c68 (diff)
Use the default that the log output claims will be used for the basedn
(closes issue #12599) Reported by: suretec Patches: 12599.patch uploaded by juggie (license 24) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@115521 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_config_ldap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index cb1bd78cb..52855fdec 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -58,6 +58,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/linkedlists.h"
#define RES_CONFIG_LDAP_CONF "res_ldap.conf"
+#define RES_CONFIG_LDAP_DEFAULT_BASEDN "asterisk"
AST_MUTEX_DEFINE_STATIC(ldap_lock);
@@ -1423,8 +1424,8 @@ int parse_config(void)
}
if (!(s = ast_variable_retrieve(config, "_general", "basedn"))) {
- ast_log(LOG_ERROR, "No LDAP base dn found, using 'asterisk' as default.\n");
- basedn[0] = '\0';
+ ast_log(LOG_ERROR, "No LDAP base dn found, using '%s' as default.\n", RES_CONFIG_LDAP_DEFAULT_BASEDN);
+ ast_copy_string(basedn, RES_CONFIG_LDAP_DEFAULT_BASEDN, sizeof(basedn));
} else
ast_copy_string(basedn, s, sizeof(basedn));