From 174606b4bd3aca93a3330de5bbf2289cf55bb5d0 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 25 Jan 2007 01:38:05 +0000
Subject: [PATCH] Merged revisions 52160 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r52160 | russell | 2007-01-24 19:37:16 -0600 (Wed, 24 Jan 2007) | 2 lines
By suggestion from kpfleming last week, change "vmpassword" to "vmsecret".
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_voicemail.c | 14 +++++++-------
configs/users.conf.sample | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 25c9d6393a..22fdc2707f 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -678,9 +678,9 @@ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable *
struct ast_variable *tmp;
tmp = var;
while (tmp) {
- if (!strcasecmp(tmp->name, "vmpassword")) {
+ if (!strcasecmp(tmp->name, "vmsecret")) {
ast_copy_string(retval->password, tmp->value, sizeof(retval->password));
- } else if (!strcasecmp(tmp->name, "secret") || !strcasecmp(tmp->name, "password")) { /* don't overwrite vmpassword if it exists */
+ } else if (!strcasecmp(tmp->name, "secret") || !strcasecmp(tmp->name, "password")) { /* don't overwrite vmsecret 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")) {
@@ -823,7 +823,7 @@ static void vm_change_password(struct ast_vm_user *vmu, const char *newpassword)
category = NULL;
var = NULL;
/* check users.conf and update the password stored for the mailbox*/
- /* if no vmpassword entry exists create one. */
+ /* if no vmsecret entry exists create one. */
if ((cfg = ast_config_load_with_comments("users.conf"))) {
if (option_debug > 3)
ast_log(LOG_DEBUG, "we are looking for %s\n", vmu->mailbox);
@@ -831,10 +831,10 @@ static void vm_change_password(struct ast_vm_user *vmu, const char *newpassword)
if (option_debug > 3)
ast_log(LOG_DEBUG, "users.conf: %s\n", category);
if (!strcasecmp(category, vmu->mailbox)) {
- if (!(tmp = ast_variable_retrieve(cfg, category, "vmpassword"))) {
+ if (!(tmp = ast_variable_retrieve(cfg, category, "vmsecret"))) {
if (option_debug > 3)
- ast_log(LOG_DEBUG, "looks like we need to make vmpassword!\n");
- var = ast_variable_new("vmpassword", newpassword);
+ ast_log(LOG_DEBUG, "looks like we need to make vmsecret!\n");
+ var = ast_variable_new("vmsecret", newpassword);
}
new = alloca(strlen(newpassword)+1);
sprintf(new, "%s", newpassword);
@@ -844,7 +844,7 @@ static void vm_change_password(struct ast_vm_user *vmu, const char *newpassword)
break;
}
if (!var)
- ast_variable_update(cat, "vmpassword", new, NULL);
+ ast_variable_update(cat, "vmsecret", new, NULL);
else
ast_variable_append(cat, var);
}
diff --git a/configs/users.conf.sample b/configs/users.conf.sample
index 67a6b28346..0ac3aa0cd5 100644
--- a/configs/users.conf.sample
+++ b/configs/users.conf.sample
@@ -28,7 +28,7 @@ hasvoicemail = yes
;
; Set voicemail mailbox 6000 password to 1234
;
-vmpassword = 1234
+vmsecret = 1234
;
; Create SIP Peer
;
--
GitLab