[svn-commits] russell: branch 1.6.0 r115522 - in /branches/1.6.0: ./ res/res_config_ldap.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed May  7 13:30:29 2008
New Revision: 115522

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115522
Log:
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)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_config_ldap.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_config_ldap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_config_ldap.c?view=diff&rev=115522&r1=115521&r2=115522
==============================================================================
--- branches/1.6.0/res/res_config_ldap.c (original)
+++ branches/1.6.0/res/res_config_ldap.c Wed May  7 13:30:29 2008
@@ -58,6 +58,7 @@
 #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 @@
 	}
 
 	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));