kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 12:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 115523 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r115523 | russell | 2008-05-07 13:33:50 -0500 (Wed, 07 May 2008) | 6 lines

Only save a password if a username exists.

(closes issue #12600)
Reported By: suretec
Patch by me

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-05-07 18:35:52 +00:00
parent 41a4500980
commit f4eeb3481b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/res_config_ldap.c
View File

@@ -1401,11 +1401,14 @@ int parse_config(void)
} else
ast_copy_string(user, s, sizeof(user));
if (!(s = ast_variable_retrieve(config, "_general", "pass"))) {
ast_log(LOG_WARNING, "No directory password found, using 'asterisk' as default.\n");
ast_copy_string(pass, "asterisk", sizeof(pass) - 1);
} else
ast_copy_string(pass, s, sizeof(pass));
if (!ast_strlen_zero(user)) {
if (!(s = ast_variable_retrieve(config, "_general", "pass"))) {
ast_log(LOG_WARNING, "No directory password found, using 'asterisk' as default.\n");
ast_copy_string(pass, "asterisk", sizeof(pass));
} else {
ast_copy_string(pass, s, sizeof(pass));
}
}
/* URL is preferred, use host and port if not found */
if ((s = ast_variable_retrieve(config, "_general", "url"))) {