aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-04 21:54:44 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-04 21:54:44 +0000
commit16c9e2051f62daedbdabe5dfda0ceef811e00153 (patch)
tree8117ccb64985c4d9c185675adab5852fb9c700ff
parentb9fbe03d18f36c96a617d7378201af59fbd4bcf3 (diff)
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/trunk@233280 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--configs/iax.conf.sample3
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index ca28c1192..b516d4b85 100644
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -339,12 +339,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