diff options
| -rw-r--r-- | res/res_config_ldap.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 52855fdec..33ed247b7 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -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"))) { |