From aeb41dbdf4619e6e860a250414425b5f14b44dc9 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 7 May 2008 18:30:12 +0000
Subject: [PATCH] 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/trunk@115521 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));
--
GitLab