kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 213404 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r213404 | jpeeler | 2009-08-20 16:33:11 -0500 (Thu, 20 Aug 2009) | 12 lines
  
  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/branches/1.6.1@213412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-08-20 21:43:52 +00:00
parent b7d5b3be6e
commit e918f0680a
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/app_voicemail.c
View File

@@ -1369,7 +1369,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;
@@ -1393,9 +1393,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 */
@@ -2021,7 +2028,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)