From 41a4500980cbb647cf44b2473735ea525bfe93ae Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 7 May 2008 18:30:29 +0000 Subject: [PATCH] Merged revisions 115521 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r115521 | russell | 2008-05-07 13:30:12 -0500 (Wed, 07 May 2008) | 7 lines 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115522 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_config_ldap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index cb1bd78cb5..52855fdec0 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));