[svn-commits] tilghman: trunk r103198 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sat Feb  9 00:33:10 2008
New Revision: 103198

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103198
Log:
Merged revisions 103197 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103197 | tilghman | 2008-02-09 00:23:49 -0600 (Sat, 09 Feb 2008) | 4 lines

Commit fix for being unable to send voicemail from VoiceMailMain
 Reported by: William F Acker (via the -users mailing list)
 Patch by: Corydon76 (license 14)

........

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

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

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=103198&r1=103197&r2=103198
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Sat Feb  9 00:33:10 2008
@@ -4399,7 +4399,11 @@
 	if (flag==1) {
 		struct leave_vm_options leave_options;
 		char mailbox[AST_MAX_EXTENSION * 2 + 2];
-		snprintf(mailbox, sizeof(mailbox), "%s@%s", username, context);
+		/* Make sure that context doesn't get set as a literal "(null)" (or else find_user won't find it) */
+		if (context)
+			snprintf(mailbox, sizeof(mailbox), "%s@%s", username, context);
+		else
+			ast_copy_string(mailbox, username, sizeof(mailbox));
 
 		/* Send VoiceMail */
 		memset(&leave_options, 0, sizeof(leave_options));