diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-05 19:27:07 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-05 19:27:07 +0000 |
| commit | 9413e4b53638d8284ade1f53d69d67759d8cd79d (patch) | |
| tree | 4cf0c6dd63a353d25600629da83bd56f40d7fe80 /configs | |
| parent | 3ecb14c4e7c11a471864d6e5f91d3f22c790fb14 (diff) | |
Merged revisions 180383 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r180383 | mmichelson | 2009-03-05 13:14:14 -0600 (Thu, 05 Mar 2009) | 31 lines
Merged revisions 180380 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r180380 | mmichelson | 2009-03-05 12:58:48 -0600 (Thu, 05 Mar 2009) | 25 lines
Fix broken mailbox parsing when searchcontexts option is enabled.
When using the searchcontexts option in voicemail.conf, the code
made the assumption that all mailbox names defined were unique across
all contexts. However, the code did nothing to actually enforce this
assumption, nor did it do anything to alert a user that he may have
created an ambiguity in his voicemail.conf file by defining the same
mailbox name in multiple contexts.
With this change, we now will issue a nice long warning if searchcontexts
is on and we encounter the same mailbox name in multiple contexts and ignore
any duplicates after the first box. Whether searchcontexts is enabled or not,
if we come across a duplicate mailbox in the same context, then we will issue
a warning and ignore the duplicated mailbox. I have also added a small note
to voicemail.conf.sample in the explanation for searchcontexts explaining
that you cannot define the same mailbox in multiple contexts if you have
enabled the option.
(closes issue #14599)
Reported by: lmadsen
Patches:
14599.patch uploaded by mmichelson (license 60) (with slight modification)
Tested by: lmadsen
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@180425 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/voicemail.conf.sample | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample index 301009320..b9d1dcb12 100644 --- a/configs/voicemail.conf.sample +++ b/configs/voicemail.conf.sample @@ -232,6 +232,9 @@ sendvoicemail=yes ; Allow the user to compose and send a voicemail while inside ; searchcontexts=yes ; Current default behavior is to search only the default context ; if one is not specified. The older behavior was to search all contexts. ; This option restores the old behavior [DEFAULT=no] + ; Note: If you have this option enabled, then you will be required to have + ; unique mailbox names across all contexts. Otherwise, an ambiguity is created + ; since it is impossible to know which mailbox to retrieve when one is requested. ; callback=fromvm ; Context to call back from ; if not listed, calling the sender back will not be permitted ; exitcontext=fromvm ; Context to go to on user exit such as * or 0 |