[asterisk-commits] russell: branch 1.8 r289333 - in /branches/1.8: ./ res/res_config_ldap.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Sep 29 15:20:23 2010
New Revision: 289333

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289333
Log:
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.
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/res/res_config_ldap.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/res/res_config_ldap.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_config_ldap.c?view=diff&rev=289333&r1=289332&r2=289333
==============================================================================
--- branches/1.8/res/res_config_ldap.c (original)
+++ branches/1.8/res/res_config_ldap.c Wed Sep 29 15:20:23 2010
@@ -306,8 +306,6 @@
 				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 @@
 						if (is_realmed_password_attribute) {
 							if (strncasecmp(valptr, "{md5}", 5) == 0) {
 								valptr += 5;
-							} else {
-								valptr = NULL;
 							}
 							ast_debug(2, "md5: %s\n", valptr);
 						}