diff options
| author | Mark Michelson <mmichelson@digium.com> | 2007-12-21 20:01:10 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2007-12-21 20:01:10 +0000 |
| commit | 590a70a9cd7603be11807fd3b0d566ec054c567c (patch) | |
| tree | 90d66fbaef645b24e983cc2ff9415ab10e0fbcf1 /apps | |
| parent | bf64785f1e970a8cae63a2294a1d8de6f16f97a5 (diff) | |
Merged revisions 94538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r94538 | mmichelson | 2007-12-21 13:59:45 -0600 (Fri, 21 Dec 2007) | 5 lines
The mail_copy c-client function does not expect a full imap mailbox string, just the name of the mailbox.
(closes issue #11419, reported and patched by jaroth, with additional patchwork from me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index d582c195f..8fb188e84 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2753,7 +2753,6 @@ static int has_voicemail(const char *mailbox, const char *folder) static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int imbox, int msgnum, long duration, struct ast_vm_user *recip, char *fmt, char *dir) { - char dest[256]; struct vm_state *sendvms = NULL, *destvms = NULL; char messagestring[10]; /*I guess this could be a problem if someone has more than 999999999 messages...*/ if(!(sendvms = get_vm_state_by_imapuser(vmu->imapuser, 2))) @@ -2766,9 +2765,8 @@ static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int i ast_log(LOG_ERROR, "Couldn't get vm_state for destination mailbox!\n"); return -1; } - imap_mailbox_name(dest, sizeof(dest), destvms, imbox, 1); snprintf(messagestring, sizeof(messagestring), "%ld", sendvms->msgArray[msgnum]); - if((mail_copy(sendvms->mailstream, messagestring, dest) == T)) + if((mail_copy(sendvms->mailstream, messagestring, (char *) mbox(imbox)) == T)) return 0; ast_log(LOG_WARNING, "Unable to copy message from mailbox %s to mailbox %s\n", vmu->mailbox, recip->mailbox); return -1; @@ -3422,7 +3420,6 @@ static int save_to_folder(struct ast_vm_user *vmu, struct vm_state *vms, int msg #ifdef IMAP_STORAGE /* we must use mbox(x) folder names, and copy the message there */ /* simple. huh? */ - char dbox[256]; long res; char sequence[10]; @@ -3430,9 +3427,8 @@ static int save_to_folder(struct ast_vm_user *vmu, struct vm_state *vms, int msg if (box == 1) return 10; /* get the real IMAP message number for this message */ snprintf(sequence, sizeof(sequence), "%ld", vms->msgArray[msg]); - imap_mailbox_name(dbox, sizeof(dbox), vms, box, 1); ast_debug(3, "Copying sequence %s to mailbox %s\n",sequence,dbox); - res = mail_copy(vms->mailstream, sequence, dbox); + res = mail_copy(vms->mailstream,sequence,(char *) mbox(box)); if (res == 1) return 0; return 1; #else |