diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-07 16:52:02 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-07 16:52:02 +0000 |
| commit | 548e63ae1f6cace630daa1d9af300f07a2eb17f2 (patch) | |
| tree | 69d4d9fcd8e953f08af7fffabbeeb8939376411a | |
| parent | 8f40a74e6238c53407b26422f834ec66f12071e5 (diff) | |
Merged revisions 147193 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r147193 | seanbright | 2008-10-07 12:48:30 -0400 (Tue, 07 Oct 2008) | 2 lines
Make 'imapsecret' an alias to 'imappassword' in voicemail.conf.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@147194 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 3af0de41a..74fb2330e 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -773,9 +773,7 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v #ifdef IMAP_STORAGE } else if (!strcasecmp(var, "imapuser")) { 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")) { + } else if (!strcasecmp(var, "imappassword") || !strcasecmp(var, "imapsecret")) { ast_copy_string(vmu->imappassword, value, sizeof(vmu->imappassword)); #endif } else if (!strcasecmp(var, "delete") || !strcasecmp(var, "deletevoicemail")) { @@ -1009,9 +1007,7 @@ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable * #ifdef IMAP_STORAGE } else if (!strcasecmp(tmp->name, "imapuser")) { 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")) { + } else if (!strcasecmp(tmp->name, "imappassword") || !strcasecmp(tmp->name, "imapsecret")) { ast_copy_string(retval->imappassword, tmp->value, sizeof(retval->imappassword)); #endif } else |