From: Jason Parker <jparker@digium.com>
Date: Wed, 17 Jan 2007 17:37:56 +0000 (+0000)
Subject: Merged revisions 51186 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3455
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce5d9ab661ec7bb78046a11dfeb6c431dfc6b453;p=thirdparty%2Fasterisk.git

Merged revisions 51186 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51186 | qwell | 2007-01-17 11:36:53 -0600 (Wed, 17 Jan 2007) | 2 lines

re-add "password" for realtime voicemail

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51189 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 249d1c63f3..998bbf5ada 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -680,7 +680,7 @@ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable *
 	while (tmp) {
 		if (!strcasecmp(tmp->name, "vmpassword")) {
 			ast_copy_string(retval->password, tmp->value, sizeof(retval->password));
-		} else if (!strcasecmp(tmp->name, "secret")) { /* don't overwrite vmpassword if it exists */
+		} else if (!strcasecmp(tmp->name, "secret") || !strcasecmp(tmp->name, "password")) { /* don't overwrite vmpassword if it exists */
 			if (ast_strlen_zero(retval->password))
 				ast_copy_string(retval->password, tmp->value, sizeof(retval->password));
 		} else if (!strcasecmp(tmp->name, "uniqueid")) {