[svn-commits] irroot: branch irroot/distrotech-customers-trunk r339243 - in /team/irroot/di...

[SVN commits to the Digium repositories]

Author: irroot
Date: Tue Oct  4 05:32:33 2011
New Revision: 339243

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=339243
Log:
Merged revisions 339206 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r339206 | oej | 2011-10-04 11:43:03 +0200 (Tue, 04 Oct 2011) | 7 lines
  
  Generate error message when AMI action originate extension doesn't exist
  
  Review: https://reviewboard.asterisk.org/r/1445/
  
  Is this a bug or a new feature? No responses on Asterisk-dev so I'm 
  committing to trunk only.
........

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/CHANGES
    team/irroot/distrotech-customers-trunk/main/manager.c

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct  4 05:32:33 2011
@@ -1,1 +1,1 @@
-/trunk:1-339160
+/trunk:1-339234

Modified: team/irroot/distrotech-customers-trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/CHANGES?view=diff&rev=339243&r1=339242&r2=339243
==============================================================================
--- team/irroot/distrotech-customers-trunk/CHANGES (original)
+++ team/irroot/distrotech-customers-trunk/CHANGES Tue Oct  4 05:32:33 2011
@@ -45,6 +45,11 @@
  * Run a macro specified with the channel variable PICKUP_BRIDGE_MACRO using
    arguments stored in channel variable PICKUP_BRIDGE_MACRO_ARGS when the
    pickup completes and channels bridge.
+
+AMI (Asterisk Manager Interface) changes
+----------------------------------------
+ * Originate now generates an error response if the extension given
+   is not found in the dialplan
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.8 to Asterisk 10 -------------------

Modified: team/irroot/distrotech-customers-trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/manager.c?view=diff&rev=339243&r1=339242&r2=339243
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/manager.c (original)
+++ team/irroot/distrotech-customers-trunk/main/manager.c Tue Oct  4 05:32:33 2011
@@ -3997,6 +3997,16 @@
 		}
 	}
 
+	/* Check early if the extension exists. If not, we need to bail out here. */
+	if (exten && context && pi) {
+		if (! ast_exists_extension(NULL, context, exten, pi, l)) {
+			/* The extension does not exist. */
+			astman_send_error(s, m, "Extension does not exist.");
+			res = 0;
+			goto fast_orig_cleanup;
+		}
+	}
+
 	/* Allocate requested channel variables */
 	vars = astman_get_variables(m);