From: Jason Parker Date: Mon, 8 Jan 2007 23:40:28 +0000 (+0000) Subject: Merged revisions 50098 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~3514 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a98c6af87871a55accb5a45ad3ee8461aacc02c;p=thirdparty%2Fasterisk.git Merged revisions 50098 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r50098 | qwell | 2007-01-08 17:39:12 -0600 (Mon, 08 Jan 2007) | 4 lines Fix an issue with voicemail and users.conf, where it wouldn't ever parse a password, since it was using "secret" instead of "password" Issue 8761, reported by and patch suggestion from ssokol. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50099 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 7de25c116b..a4bcd9ea85 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -679,7 +679,7 @@ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable * tmp = var; while (tmp) { ast_log(LOG_DEBUG, "Name: %s Value: %s\n", tmp->name, tmp->value); - if (!strcasecmp(tmp->name, "password")) { + if (!strcasecmp(tmp->name, "password") || !strcasecmp(tmp->name, "secret")) { ast_copy_string(retval->password, tmp->value, sizeof(retval->password)); } else if (!strcasecmp(tmp->name, "uniqueid")) { ast_copy_string(retval->uniqueid, tmp->value, sizeof(retval->uniqueid));