From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 9 Dec 2008 16:47:39 +0000 (+0000)
Subject: Merged revisions 162014 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~693
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1ff75c37c297f4a7795566a8e85f03440405e96;p=thirdparty%2Fasterisk.git

Merged revisions 162014 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r162014 | russell | 2008-12-09 10:46:53 -0600 (Tue, 09 Dec 2008) | 5 lines

Allow DISA to handle extensions that start with #.

(closes issue #13330)
Reported by: jcovert

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@162016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_disa.c b/apps/app_disa.c
index 80aeb09eac..8217a2456d 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -303,8 +303,14 @@ static int disa_exec(struct ast_channel *chan, void *data)
 					continue;
 				}
 			} else {
-				if (j == '#') { /* end of extension */
-					break;
+				if (j == '#') { /* end of extension .. maybe */
+					if (i == 0 && 
+							(ast_matchmore_extension(chan, args.context, "#", 1, chan->cid.cid_num) ||
+							 ast_exists_extension(chan, args.context, "#", 1, chan->cid.cid_num)) ) {
+						/* Let the # be the part of, or the entire extension */
+					} else {
+						break;
+					}
 				}
 			}