kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle a few more cases of realtime and voicemail (bug #2648)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4021 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-10-16 20:01:57 +00:00
parent 996c8e7126
commit a3e8fa573c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/app_voicemail.c
View File

@@ -396,16 +396,12 @@ static struct ast_vm_user *find_user_realtime(struct ast_vm_user *ivm, const cha
memset(retval, 0, sizeof(struct ast_vm_user)); memset(retval, 0, sizeof(struct ast_vm_user));
if (!ivm) if (!ivm)
retval->alloced=1; retval->alloced=1;
if (mailbox) { if (mailbox)
strncpy(retval->mailbox, mailbox, sizeof(retval->mailbox) - 1); strncpy(retval->mailbox, mailbox, sizeof(retval->mailbox) - 1);
} if (context)
if (context) {
strncpy(retval->context, context, sizeof(retval->context) - 1); strncpy(retval->context, context, sizeof(retval->context) - 1);
}
else else
{
strncpy(retval->context, "default", sizeof(retval->context) - 1); strncpy(retval->context, "default", sizeof(retval->context) - 1);
}
populate_defaults(retval); populate_defaults(retval);
var = ast_load_realtime("voicemail", "mailbox", mailbox, "context", retval->context, NULL); var = ast_load_realtime("voicemail", "mailbox", mailbox, "context", retval->context, NULL);
if (var) { if (var) {
@@ -416,6 +412,12 @@ static struct ast_vm_user *find_user_realtime(struct ast_vm_user *ivm, const cha
strncpy(retval->password, tmp->value, sizeof(retval->password) - 1); strncpy(retval->password, tmp->value, sizeof(retval->password) - 1);
} else if (!strcasecmp(tmp->name, "uniqueid")) { } else if (!strcasecmp(tmp->name, "uniqueid")) {
strncpy(retval->uniqueid, tmp->value, sizeof(retval->uniqueid) - 1); strncpy(retval->uniqueid, tmp->value, sizeof(retval->uniqueid) - 1);
} else if (!strcasecmp(tmp->name, "pager")) {
strncpy(retval->pager, tmp->value, sizeof(retval->pager) - 1);
} else if (!strcasecmp(tmp->name, "email")) {
strncpy(retval->email, tmp->value, sizeof(retval->email) - 1);
} else if (!strcasecmp(tmp->name, "fullname")) {
strncpy(retval->fullname, tmp->value, sizeof(retval->fullname) - 1);
} else } else
apply_option(retval, tmp->name, tmp->value); apply_option(retval, tmp->name, tmp->value);
tmp = tmp->next; tmp = tmp->next;