diff options
| author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-09 18:51:52 +0000 |
|---|---|---|
| committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-09 18:51:52 +0000 |
| commit | 722eb3c4c3cfa1c0cee915c949c5f95199ee24dd (patch) | |
| tree | 25683963c5e51bdedd6211cd0ea92a85639505c3 /apps/app_voicemail.c | |
| parent | 815b5b09da5e555add7bba3d8fca588e7611248a (diff) | |
Merged revisions 285710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r285710 | bbryant | 2010-09-09 14:50:13 -0400 (Thu, 09 Sep 2010) | 8 lines
Fixes an issue with dialplan pattern matching where the specificity for pattern ranges and pattern special characters was inconsistent.
(closes issue #16903)
Reported by: Nick_Lewis
Patches:
pbx.c-specificity.patch uploaded by Nick Lewis (license 657)
Tested by: Nick_Lewis
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@285711 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 4ff67e371..8f0a5bd82 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -38,7 +38,8 @@ */ /*** MODULEINFO - <depend>res_smdi</depend> + <use>res_adsi</use> + <use>res_smdi</use> ***/ /*** MAKEOPTS @@ -1492,11 +1493,12 @@ static void vm_change_password(struct ast_vm_user *vmu, const char *newpassword) } value = strstr(tmp, ","); if (!value) { - ast_log(AST_LOG_WARNING, "variable has bad format.\n"); - break; + new = alloca(strlen(newpassword)+1); + sprintf(new, "%s", newpassword); + } else { + new = alloca((strlen(value) + strlen(newpassword) + 1)); + sprintf(new, "%s%s", newpassword, value); } - new = alloca((strlen(value) + strlen(newpassword) + 1)); - sprintf(new, "%s%s", newpassword, value); if (!(cat = ast_category_get(cfg, category))) { ast_log(AST_LOG_WARNING, "Failed to get category structure.\n"); break; @@ -13085,4 +13087,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc, .load = load_module, .unload = unload_module, .reload = reload, + .nonoptreq = "res_adsi,res_smdi", ); |