diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-29 20:24:49 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-29 20:24:49 +0000 |
| commit | 58bee5be40f17f05b156b4ffdcd0f3d0ca8184e0 (patch) | |
| tree | 05a329c0d2305d9ac7381fde56242c1164e410e3 /res | |
| parent | 03894ccf28c94bc38ee3d7c0ecdbb68e9177d0a2 (diff) | |
Merged revisions 289333 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r289333 | russell | 2010-09-29 15:20:23 -0500 (Wed, 29 Sep 2010) | 11 lines
Merged revisions 289332 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r289332 | russell | 2010-09-29 15:15:57 -0500 (Wed, 29 Sep 2010) | 4 lines
Don't completely ignore md5secret from LDAP if the value does not begin with {md5}.
This fixes a problem that lmadsen ran in to where md5secret was not working for him.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@289335 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_config_ldap.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 9d5189bed..1cfe12cfc 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -306,8 +306,6 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config if (is_realmed_password_attribute) { if (!strncasecmp(valptr, "{md5}", 5)) { valptr += 5; - } else { - valptr = NULL; } ast_debug(2, "md5: %s\n", valptr); } @@ -428,8 +426,6 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf if (is_realmed_password_attribute) { if (strncasecmp(valptr, "{md5}", 5) == 0) { valptr += 5; - } else { - valptr = NULL; } ast_debug(2, "md5: %s\n", valptr); } |