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

[svn-commits at lists.digium.com]

Author: mogorman
Date: Wed Apr 26 14:22:55 2006
New Revision: 22597

URL: http://svn.digium.com/view/asterisk?rev=22597&view=rev
Log:
Merged revisions 22596 via svnmerge from 
https://svn.digium.com/svn/asterisk/branches/1.2

........
r22596 | mogorman | 2006-04-26 14:18:55 -0500 (Wed, 26 Apr 2006) | 3 lines

do not allow for users to forward voicemail to
themselves, patch from 7001

........

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

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

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?rev=22597&r1=22596&r2=22597&view=diff
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Wed Apr 26 14:22:55 2006
@@ -3426,8 +3426,8 @@
 		/* start optimistic */
 		valid_extensions = 1;
 		while (s) {
-			/* find_user is going to ast_malloc since we have a NULL as first argument */
-			if ((receiver = find_user(NULL, context, s))) {
+			/* Don't forward to ourselves.  find_user is going to malloc since we have a NULL as first argument */
+			if (strcmp(s,sender->mailbox) && (receiver = find_user(NULL, context, s))) {
 				AST_LIST_INSERT_HEAD(&extensions, receiver, list);
 				found++;
 			} else {