diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-25 01:37:16 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-25 01:37:16 +0000 |
| commit | e99bfe873d8cff688b9162f242738ec8ba861b9c (patch) | |
| tree | c0770b2e624aaf9fac19a66ab116e1f8183ce384 | |
| parent | ed747b9f56ac24d1c4e1f0d6e26cd4a5d7be10fb (diff) | |
By suggestion from kpfleming last week, change "vmpassword" to "vmsecret".
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@52160 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 14 | ||||
| -rw-r--r-- | 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 de5b6f92f..e0a6a1275 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -657,9 +657,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")) { @@ -802,7 +802,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); @@ -810,10 +810,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); @@ -823,7 +823,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 67a6b2834..0ac3aa0cd 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 ; |