From dd89211409a419943596812c28d00a65f3b7adcb Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 29 Sep 2010 20:24:49 +0000 Subject: 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: https://origsvn.digium.com/svn/asterisk/trunk@289335 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_config_ldap.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'res/res_config_ldap.c') 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); } -- cgit v1.2.3