aboutsummaryrefslogtreecommitdiffstats
path: root/pbx/pbx_config.c
diff options
context:
space:
mode:
Diffstat (limited to 'pbx/pbx_config.c')
-rwxr-xr-xpbx/pbx_config.c8
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="";