Handle ODBC forwarding properly (bug #5606)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6974 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 1ab7dceff6259b2da2bfd4d51dc643e77c18c154..103bdfe5e6c553e9919562648be5a29c91360ec8 100755 (executable)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1098,7 +1098,7 @@ static void copy_file(char *sdir, int smsg, char *ddir, int dmsg, char *dmailbox
 {
        int res;
        SQLHSTMT stmt;
-       char sql[256];
+       char sql[512];
        char msgnums[20];
        char msgnumd[20];
        odbc_obj *obj;
@@ -3455,6 +3455,7 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i
                cmd = leave_voicemail(chan, username, &leave_options);
        } else {
                /* Forward VoiceMail */
+               RETRIEVE(dir, curmsg);
                cmd = vm_forwardoptions(chan, sender, dir, curmsg, vmfmts, context, record_gain);
                if (!cmd) {
                        while (!res && vmtmp) {
@@ -3485,6 +3486,8 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i
                                ast_log(LOG_DEBUG, "%s", sys);
                                ast_safe_system(sys);
                                snprintf(fn, sizeof(fn), "%s/msg%04d", todir,todircount);
+
+                               STORE(todir, vmtmp->mailbox, vmtmp->context, todircount);
        
                                /* load the information on the source message so we can send an e-mail like a new message */
                                snprintf(miffile, sizeof(miffile), "%s/msg%04d.txt", dir, curmsg);