automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@22629 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 70a27f672669fc00559f8505d71acaf3856e1f05..5b2463af5cbc0ae19c2130523a5ab5869c6e8242 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3458,8 +3458,8 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i
                /* start optimistic */
                valid_extensions = 1;
                while (s) {
-                       /* find_user is going to 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))) {
                                if (!extensions)
                                        vmtmp = extensions = receiver;
                                else {