From b8e571fb440fd152089f3748d613c6b89cd7bb54 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 20 Aug 2009 21:33:11 +0000
Subject: [PATCH] Fix greeting retrieval from IMAP
Properly check for the current voicemail state and if it doesn't exist,
create it.
(closes issue #14597)
Reported by: wtca
Patches:
14597_v2.patch uploaded by mmichelson (license 60)
Tested by: jpeeler
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@213404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_voicemail.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 619754db6e..0ca60e1fe3 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1502,7 +1502,7 @@ static void vm_imap_delete(int msgnum, struct ast_vm_user *vmu)
ast_mutex_unlock(&vms->lock);
}
-static int imap_retrieve_greeting (const char *dir, const int msgnum, struct ast_vm_user *vmu)
+static int imap_retrieve_greeting(const char *dir, const int msgnum, struct ast_vm_user *vmu)
{
struct vm_state *vms_p;
char *file, *filename;
@@ -1526,9 +1526,16 @@ static int imap_retrieve_greeting (const char *dir, const int msgnum, struct ast
}
/* check if someone is accessing this box right now... */
- if (!(vms_p = get_vm_state_by_mailbox(vmu->mailbox, vmu->context, 1)) ||!(vms_p = get_vm_state_by_mailbox(vmu->mailbox, vmu->context, 0))) {
- ast_log(AST_LOG_ERROR, "Voicemail state not found!\n");
- return -1;
+ if (!(vms_p = get_vm_state_by_mailbox(vmu->mailbox, vmu->context, 1)) &&
+ !(vms_p = get_vm_state_by_mailbox(vmu->mailbox, vmu->context, 0))) {
+ /* Unlike when retrieving a message, it is reasonable not to be able to find a
+ * vm_state for a mailbox when trying to retrieve a greeting. Just create one,
+ * that's all we need to do.
+ */
+ if (!(vms_p = create_vm_state_from_user(vmu))) {
+ ast_log(LOG_NOTICE, "Unable to create vm_state object!\n");
+ return -1;
+ }
}
/* Greetings will never have a prepended message */
@@ -2150,7 +2157,11 @@ static void imap_mailbox_name(char *spec, size_t len, struct vm_state *vms, int
ast_build_string(&t, &left, "/%s", imapflags);
/* End with username */
+#if 1
ast_build_string(&t, &left, "/user=%s}", vms->imapuser);
+#else
+ ast_build_string(&t, &left, "/user=%s/novalidate-cert}", vms->imapuser);
+#endif
if (box == NEW_FOLDER || box == OLD_FOLDER)
snprintf(spec, len, "%s%s", tmp, use_folder? imapfolder: "INBOX");
else if (box == GREETINGS_FOLDER)
--
GitLab