From: David Vossel Date: Fri, 4 Dec 2009 21:54:44 +0000 (+0000) Subject: Merged revisions 233279 via svnmerge from X-Git-Tag: 11.0.0-beta1~3764 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fd45889df31fd93ba7ce87e5075a7fda71a118e;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/trunk@233280 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index ca28c1192b..b516d4b855 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