There was a boo-boo in TFOT that is causing some confusion on the mailing lists

so include 'imapsecret' as an alias to 'imappassword' (and print a little notice
nudging users toward the right option name).


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@147191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-10-07 16:40:24 +00:00
parent 0dc7ac9a6c
commit 4d9955141c

View File

@@ -775,6 +775,9 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v
ast_copy_string(vmu->imapuser, value, sizeof(vmu->imapuser));
} else if (!strcasecmp(var, "imappassword")) {
ast_copy_string(vmu->imappassword, value, sizeof(vmu->imappassword));
} else if (!strcasecmp(var, "imapsecret")) {
ast_log(LOG_WARNING, "Use of the 'imapsecret' option is discouraged, please use 'imappassword' instead.\n");
ast_copy_string(vmu->imappassword, value, sizeof(vmu->imappassword));
#endif
} else if (!strcasecmp(var, "delete") || !strcasecmp(var, "deletevoicemail")) {
ast_set2_flag(vmu, ast_true(value), VM_DELETE);
@@ -1009,6 +1012,9 @@ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable *
ast_copy_string(retval->imapuser, tmp->value, sizeof(retval->imapuser));
} else if (!strcasecmp(tmp->name, "imappassword")) {
ast_copy_string(retval->imappassword, tmp->value, sizeof(retval->imappassword));
} else if (!strcasecmp(tmp->name, "imapsecret")) {
ast_log(LOG_WARNING, "Use of the 'imapsecret' option is discouraged, please use 'imappassword' instead.\n");
ast_copy_string(retval->imappassword, tmp->value, sizeof(retval->imappassword));
#endif
} else
apply_option(retval, tmp->name, tmp->value);