summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2007-01-17 17:37:56 +0000
committerJason Parker <jparker@digium.com>2007-01-17 17:37:56 +0000
commitce5d9ab661ec7bb78046a11dfeb6c431dfc6b453 (patch)
tree49ffe2fd08901dca114d2f2fe5beca96e3209921 /apps
parent3e6d6e0e62950c5e6b79691f47ea5f6275683957 (diff)
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
Diffstat (limited to 'apps')
-rw-r--r--apps/app_voicemail.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 249d1c63f..998bbf5ad 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")) {