From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 29 Sep 2010 20:15:57 +0000 (+0000)
Subject: Don't completely ignore md5secret from LDAP if the value does not begin with {md5}.
X-Git-Tag: 1.6.2.15-rc1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b2dd17728ab3124604804a9652428108df41b40;p=thirdparty%2Fasterisk.git

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/branches/1.6.2@289332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index ea2ad749af..6c91ccc989 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -293,8 +293,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);
 				}
@@ -414,8 +412,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);
 						}