diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-07 16:53:40 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-07 16:53:40 +0000 |
| commit | d27b3c13790efb5f83467296870792c0405663e3 (patch) | |
| tree | 1b0fb77df36c05d9d3be8fbf41e2034a0cd954d7 /apps/app_voicemail.c | |
| parent | 4e57fdeb0004d975e7901f4d3dc7ae2bbc874623 (diff) | |
Merged revisions 147194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r147194 | seanbright | 2008-10-07 12:52:02 -0400 (Tue, 07 Oct 2008) | 10 lines
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/branches/1.6.0@147195 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 6146c58e9..666fbc6f3 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -724,7 +724,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")) { + } 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")) { @@ -854,7 +854,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")) { + } else if (!strcasecmp(tmp->name, "imappassword") || !strcasecmp(tmp->name, "imapsecret")) { ast_copy_string(retval->imappassword, tmp->value, sizeof(retval->imappassword)); #endif } else |