summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2007-06-27 21:09:24 +0000
committerRussell Bryant <russell@russellbryant.com>2007-06-27 21:09:24 +0000
commit8d89f741a5a8f6a3a69a22f0ae61c94f1793319f (patch)
tree16326fe9d05264fe979d1e2c0f82bb628e1938f3
parentdee58f2531edf796c198b2a8b1cc3999113e48b0 (diff)
Merged revisions 72272 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r72272 | russell | 2007-06-27 16:08:34 -0500 (Wed, 27 Jun 2007) | 13 lines Merged revisions 72267 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r72267 | russell | 2007-06-27 16:06:45 -0500 (Wed, 27 Jun 2007) | 5 lines Fix a minor issue with parsing the priority number. You could have as much whitespace as you want around a numeric priority, but you couldn't have any whitespace around a special priority like "n" or "hint". (issue #10039, reported by mitheloc, fixed by me) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--pbx/pbx_config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index be125ddb9..507a96039 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1401,6 +1401,8 @@ static int pbx_load_config(const char *config_file)
pri = strsep(&stringp, ",");
if (!pri)
pri="";
+ pri = ast_skip_blanks(pri);
+ pri = ast_trim_blanks(pri);
label = strchr(pri, '(');
if (label) {
*label++ = '\0';