From 1ac6dfc23e3fd415012ff3530ed956543eba534d Mon Sep 17 00:00:00 2001 From: Automerge script Date: Wed, 28 Nov 2012 17:27:09 +0000 Subject: [PATCH] Merged revisions 376726 via svnmerge from file:///srv/subversion/repos/asterisk/branches/10 ................ r376726 | jrose | 2012-11-28 10:30:27 -0600 (Wed, 28 Nov 2012) | 16 lines manager: Make challenge work with allowmultiplelogin=no Prior to this patch, challenge would yield a multiple logins error if used without providing the username (which isn't really supposed to be an argument to challenge) if allowmultiplelogin was set to no because allowmultiplelogin finds a user with a zero length login name. This check is simply disabled for the challenge action when the username is empty by this patch. (closes issue ASTERISK-20677) Reported by: Vladimir Patches: challenge_action_nomultiplelogin.diff uploaded by Jonathan Rose (license 6182) ........ Merged revisions 376725 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@376754 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/manager.c b/main/manager.c index 9a67cce682..8b7a25e81a 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4844,7 +4844,7 @@ static int process_message(struct mansession *s, const struct message *m) || !strcasecmp(action, "Challenge"))) { user = astman_get_header(m, "Username"); - if (check_manager_session_inuse(user)) { + if (!ast_strlen_zero(user) && check_manager_session_inuse(user)) { report_session_limit(s); sleep(1); mansession_lock(s); -- 2.47.2