From: Brett Bryant Date: Tue, 7 Sep 2010 17:45:41 +0000 (+0000) Subject: Fixes voicemail.conf issues where mailboxes with passwords that don't precede a comma... X-Git-Tag: 1.4.37-rc1~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1811246e4841f59e62e704020ba5bae9704bbbaf;p=thirdparty%2Fasterisk.git Fixes voicemail.conf issues where mailboxes with passwords that don't precede a comma would throw unnecessary error messages. (closes issue #15726) Reported by: 298 Patches: M15726.diff uploaded by junky (license 177) Tested by: junky Review: [full review board URL with trailing slash] git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@285194 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index a02ac78bf4..ead08664e2 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -915,11 +915,12 @@ static void vm_change_password(struct ast_vm_user *vmu, const char *newpassword) } value = strstr(tmp,","); if (!value) { - ast_log(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(LOG_WARNING, "Failed to get category structure.\n"); break;