Use the default that the log output claims will be used for the basedn
authorRussell Bryant <russell@russellbryant.com>
Wed, 7 May 2008 18:30:12 +0000 (18:30 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 7 May 2008 18:30:12 +0000 (18:30 +0000)
(closes issue #12599)
Reported by: suretec
Patches:
      12599.patch uploaded by juggie (license 24)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115521 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_config_ldap.c

index cb1bd78..52855fd 100644 (file)
@@ -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));