[Pkg-voip-commits] r7766 - in /asterisk/branches/lenny/debian: changelog patches/bristuff/app-dial-priority-202

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sat Nov  7 08:37:15 2009
New Revision: 7766

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7766
Log:
bristuff: don't priority jump to n+201 if priority jumping is disabled.
Thanks to Tim Retout for the report and fix (Closes: #537055)

Modified:
    asterisk/branches/lenny/debian/changelog
    asterisk/branches/lenny/debian/patches/bristuff/app-dial-priority-202

Modified: asterisk/branches/lenny/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/lenny/debian/changelog?rev=7766&op=diff
==============================================================================
--- asterisk/branches/lenny/debian/changelog (original)
+++ asterisk/branches/lenny/debian/changelog Sat Nov  7 08:37:15 2009
@@ -10,9 +10,11 @@
     - "IAX2 Call Number Resource Exhaustion", AST-2009-006, CVE-2009-2346.
   * Fix IAX2 encryption severe breakage. Thanks to Francois Marier for finding
     the upstream bug report and preparing a fix. (Closes: #521641)
+  * bristuff: don't priority jump to n+201 if priority jumping is disabled.
+    Thanks to Tim Retout for the report and fix (Closes: #537055)
   * Create the /usr/share/asterisk/agi-bin directory. (Closes: #463983)
 
- -- Faidon Liambotis <paravoid at debian.org>  Sat, 07 Nov 2009 10:28:15 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Sat, 07 Nov 2009 10:35:54 +0200
 
 asterisk (1:1.4.21.2~dfsg-3) unstable; urgency=medium
 

Modified: asterisk/branches/lenny/debian/patches/bristuff/app-dial-priority-202
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/lenny/debian/patches/bristuff/app-dial-priority-202?rev=7766&op=diff
==============================================================================
--- asterisk/branches/lenny/debian/patches/bristuff/app-dial-priority-202 (original)
+++ asterisk/branches/lenny/debian/patches/bristuff/app-dial-priority-202 Sat Nov  7 08:37:15 2009
@@ -21,7 +21,7 @@
  "    k    - Allow the called party to enable parking of the call by sending\n"
  "           the DTMF sequence defined for call parking in features.conf.\n"
  "    K    - Allow the calling party to enable parking of the call by sending\n"
-@@ -1292,14 +1297,16 @@ static int dial_exec_full(struct ast_cha
+@@ -1292,14 +1297,18 @@ static int dial_exec_full(struct ast_cha
  	}
  
  	if (!outgoing) {
@@ -32,7 +32,9 @@
  			goto out;
  		}
 +		/* See if there is a special message */
-+		ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 201);
++		if (ast_opt_priority_jumping || ast_test_flag(&opts, OPT_PRIORITY_JUMP)) {
++			ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 201);
++		}
  	} else {
  		/* Our status will at least be NOANSWER */
 -		strcpy(status, "NOANSWER");