From: Brett Bryant <bbryant@digium.com>
Date: Tue, 7 Sep 2010 17:57:32 +0000 (+0000)
Subject: Merged revisions 285197 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2369
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5418e227958a2601809ec594cac00abeb5676ce;p=thirdparty%2Fasterisk.git

Merged revisions 285197 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285197 | bbryant | 2010-09-07 13:54:21 -0400 (Tue, 07 Sep 2010) | 24 lines

  Merged revisions 285196 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r285196 | bbryant | 2010-09-07 13:49:07 -0400 (Tue, 07 Sep 2010) | 17 lines

    Merged revisions 285194 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r285194 | bbryant | 2010-09-07 13:45:41 -0400 (Tue, 07 Sep 2010) | 10 lines

      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/trunk@285199 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 5b050e99df..8f0a5bd82b 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1493,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;