kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue with IMAP storage and realtime voicemail.

Browse Source 
Also update the vmdb sql script for IMAP specific options.

Issue 8819, initial patches by bsmithurst (slightly modified by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@51167 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-01-16 22:50:19 +00:00
parent da01057b5e
commit c3f17ca3c1
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/app_voicemail.c
View File

@@ -673,6 +673,12 @@ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable *
ast_copy_string(retval->fullname, tmp->value, sizeof(retval->fullname));
} else if (!strcasecmp(tmp->name, "context")) {
ast_copy_string(retval->context, tmp->value, sizeof(retval->context));
#ifdef IMAP_STORAGE
} else if (!strcasecmp(tmp->name, "imapuser")) {
ast_copy_string(retval->imapuser, tmp->value, sizeof(retval->imapuser));
} else if (!strcasecmp(tmp->name, "imappassword")) {
ast_copy_string(retval->imappassword, tmp->value, sizeof(retval->imappassword));
#endif
} else
apply_option(retval, tmp->name, tmp->value);
tmp = tmp->next;
@@ -8244,6 +8250,28 @@ static void status(MAILSTREAM *stream)
}
#endif
static struct ast_vm_user *find_user_realtime_imapuser(const char *imapuser)
{
struct ast_variable *var;
struct ast_vm_user *vmu;
vmu = ast_calloc(1, sizeof *vmu);
if (!vmu)
return NULL;
ast_set_flag(vmu, VM_ALLOCED);
populate_defaults(vmu);
var = ast_load_realtime("voicemail", "imapuser", imapuser, NULL);
if (var) {
apply_options_full(vmu, var);
ast_variables_destroy(var);
return vmu;
} else {
free(vmu);
return NULL;
}
}
/* Interfaces to C-client */
void mm_exists(MAILSTREAM * stream, unsigned long number)
@@ -8379,6 +8407,12 @@ void mm_login(NETMBX * mb, char *user, char *pwd, long trial)
break;
}
}
if (!vmu) {
if ((vmu = find_user_realtime_imapuser(mb->user))) {
ast_copy_string(pwd, vmu->imappassword, MAILTMPLEN);
free_user(vmu);
}
}
}
}