[svn-commits] seanbright: trunk r316664 - in /trunk: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed May  4 09:40:08 2011
New Revision: 316664

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316664
Log:
Merged revisions 316663 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316663 | seanbright | 2011-05-04 10:35:05 -0400 (Wed, 04 May 2011) | 8 lines
  
  Only return a single error via AMI when requesting a forbidden action.
  
  (closes issue #19216)
  Reported by: oej
  Patches:
        issue19216-1.8-r316204.patch uploaded by seanbright (license 71)
  Tested by: seanbright
........

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

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

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=316664&r1=316663&r2=316664
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed May  4 09:40:08 2011
@@ -4497,18 +4497,25 @@
 		}
 		if (s->session->writeperm & tmp->authority || tmp->authority == 0) {
 			call_func = tmp->func;
+		}
+		break;
+	}
+	AST_RWLIST_UNLOCK(&actions);
+
+	if (tmp) {
+		if (call_func) {
+			/* Call our AMI function after we unlock our actions lists */
+			ast_debug(1, "Running action '%s'\n", tmp->action);
+			ret = call_func(s, m);
 		} else {
+			/* If we found our action but don't have a function pointer, access
+			 * was denied, so bail out.
+			 */
+			report_req_not_allowed(s, action);
+			mansession_lock(s);
 			astman_send_error(s, m, "Permission denied");
-			report_req_not_allowed(s, action);
-		}
-		break;
-	}
-	AST_RWLIST_UNLOCK(&actions);
-
-	if (tmp && call_func) {
-		/* call AMI function after actions list are unlocked */
-		ast_debug(1, "Running action '%s'\n", tmp->action);
-		ret = call_func(s, m);
+			mansession_unlock(s);
+		}
 	} else {
 		char buf[512];
 		if (!tmp) {