diff options
| author | Mark Spencer <markster@digium.com> | 2002-05-13 22:29:39 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2002-05-13 22:29:39 +0000 |
| commit | d5930d1fe84a2e34289911f5bbd0b700fc2fb32a (patch) | |
| tree | 64c5de0a1afb1872ee474057eb3f244015f2801c /pbx/pbx_config.c | |
| parent | 04cde57a77609a2e8c8b2cc860737983584af630 (diff) | |
Version 0.1.12 from FTP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/pbx_config.c')
| -rwxr-xr-x | pbx/pbx_config.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index fc5bc2586..38c6e1f39 100755 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -31,7 +31,7 @@ static char *registrar = "pbx_config"; static int static_config = 0; static int write_protect_config = 1; -static pthread_mutex_t save_dialplan_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t save_dialplan_lock = AST_MUTEX_INITIALIZER; /* * Help for commands provided by this module ... @@ -1496,8 +1496,12 @@ static int pbx_load_module(void) appl=""; data = strtok(NULL, ","); + cidmatch = strchr(ext, '/'); + if (cidmatch) { + *cidmatch = '\0'; + cidmatch++; + } strtok(ext, "/"); - cidmatch = strtok(NULL, "/"); if (!data) data=""; |