Merged revisions 51186 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 17 Jan 2007 17:37:56 +0000 (17:37 +0000)
committerJason Parker <jparker@digium.com>
Wed, 17 Jan 2007 17:37:56 +0000 (17:37 +0000)
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

apps/app_voicemail.c

index 249d1c6..998bbf5 100644 (file)
@@ -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")) {