[svn-commits] russell: branch 1.4 r61787 - in /branches/1.4: ./ main/manager.c

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Apr 24 16:34:53 2007
New Revision: 61787

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61787
Log:
Merged revisions 61786 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61786 | russell | 2007-04-24 16:33:59 -0500 (Tue, 24 Apr 2007) | 4 lines

Don't crash if a manager connection provides a username that exists in
manager.conf but does not have a password, and also requests MD5 
authentication. (ASA-2007-012)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/main/manager.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/manager.c?view=diff&rev=61787&r1=61786&r2=61787
==============================================================================
--- branches/1.4/main/manager.c (original)
+++ branches/1.4/main/manager.c Tue Apr 24 16:34:53 2007
@@ -926,7 +926,8 @@
 				} else if (ha)
 					ast_free_ha(ha);
 				if (!strcasecmp(authtype, "MD5")) {
-					if (!ast_strlen_zero(key) && s->challenge) {
+					if (!ast_strlen_zero(key) && 
+					    !ast_strlen_zero(s->challenge) && !ast_strlen_zero(password)) {
 						int x;
 						int len = 0;
 						char md5key[256] = "";