aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-29 18:34:12 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-29 18:34:12 +0000
commit7ce54be5dcc486dd3ef0b82203a83dbcbf09a2ba (patch)
tree525190f62199364cebea13f1bdf956dc2f73b567
parent3689550c486c5e276beeaf95e5c33ab592cbc34e (diff)
Merged revisions 159853 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r159853 | tilghman | 2008-11-29 12:33:18 -0600 (Sat, 29 Nov 2008) | 2 lines Allow the '#' sign to exist within an extension (inspired by issue #13330) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@159854 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_readexten.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index 93ca4e670..415678d9d 100644
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -169,12 +169,13 @@ static int readexten_exec(struct ast_channel *chan, void *data)
else
status = "TIMEOUT";
break;
- } else if (res == '#') {
- break;
}
exten[x] = res;
if (!ast_matchmore_extension(chan, arglist.context, exten, 1 /* priority */, chan->cid.cid_num)) {
+ if (!ast_exists_extension(chan, arglist.context, exten, 1, chan->cid.cid_num) && res == '#') {
+ exten[x] = '\0';
+ }
break;
}
}