diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 21:56:28 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 21:56:28 +0000 |
commit | 11460ce71ffccad2df29c199fa1f24398414bed7 (patch) | |
tree | 804f27e5812e5df1ce3d5dd94adac901a49ec253 /configs | |
parent | f63599a487f0932da0aec3101bb56cce0d56e1b8 (diff) |
Merged revisions 233280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r233280 | dvossel | 2009-12-04 15:54:44 -0600 (Fri, 04 Dec 2009) | 14 lines
Merged revisions 233279 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r233279 | dvossel | 2009-12-04 15:54:01 -0600 (Fri, 04 Dec 2009) | 7 lines
clarify requirecalltoken option in iax.sample.conf
(closes issue #16223)
Reported by: bklang
Patches:
clarify-iax-requirecalltoken.patch uploaded by bklang (license 919)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@233284 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r-- | configs/iax.conf.sample | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index edf579335..017c4b047 100644 --- a/configs/iax.conf.sample +++ b/configs/iax.conf.sample @@ -323,12 +323,13 @@ autokill=yes ; ;calltokenoptional=209.16.236.73/255.255.255.0 ; -; In a peer/user/friend definition, the 'requirecalltoken' option may be used. ; By setting 'requirecalltoken=no', call token validation becomes optional for ; that peer/user. By setting 'requirecalltoken=auto', call token validation ; is optional until a call token supporting peer registers successfully using ; call token validation. This is used as an indication that from now on, we ; can require it from this peer. So, requirecalltoken is internally set to yes. +; requirecalltoken may only be used in peer/user/friend definitions, +; not in the global scope. ; By default, 'requirecalltoken=yes'. ; ;requirecalltoken=no |