From 8b50a0790684ef6df7f9f65e25ed9248d1327a94 Mon Sep 17 00:00:00 2001 From: dvossel Date: Fri, 4 Dec 2009 21:55:53 +0000 Subject: 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.1@233283 f38db490-d61c-443f-a65b-d21fe96a405b --- configs/iax.conf.sample | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configs/iax.conf.sample') diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index 805e5213c..7e5c3bbcc 100644 --- a/configs/iax.conf.sample +++ b/configs/iax.conf.sample @@ -331,12 +331,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 -- cgit v1.2.3