[asterisk-commits] russell: trunk r63902 - in /trunk: ./ main/manager.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri May 11 11:21:45 2007
New Revision: 63902

URL: http://svn.digium.com/view/asterisk?view=rev&rev=63902
Log:
Merged revisions 63886 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63886 | russell | 2007-05-11 11:05:43 -0500 (Fri, 11 May 2007) | 6 lines

When MD5 authentication is not possible because there is no challenge present,
either because the Challenge action was never issued, or some other reason,
give a proper error message and return an error instead of claiming that the
user wasn't found.
(reported by jsmith on IRC)

........

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

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

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=63902&r1=63901&r2=63902
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Fri May 11 11:21:45 2007
@@ -1002,6 +1002,10 @@
 				len += sprintf(md5key + len, "%2.2x", digest[x]);
 			if (!strcmp(md5key, key))
 				error = 0;
+		} else {
+			ast_log(LOG_DEBUG, "MD5 authentication is not possible.  challenge: '%s'\n", 
+				S_OR(s->challenge, ""));
+			return -1;
 		}
 	} else if (password) {
 		const char *pass = astman_get_header(m, "Secret");