[asterisk-commits] bbryant: trunk r285199 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Tue Sep  7 12:57:32 2010
New Revision: 285199

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285199
Log:
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]
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=285199&r1=285198&r2=285199
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Sep  7 12:57:32 2010
@@ -1493,11 +1493,12 @@
 					}
 					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;