[svn-commits] dvossel: branch 1.6.1 r233283 - in /branches/1.6.1: ./ configs/iax.conf.sample

[SVN commits to the Digium repositories]

Author: dvossel
Date: Fri Dec  4 15:55:53 2009
New Revision: 233283

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=233283
Log:
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)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configs/iax.conf.sample

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configs/iax.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/configs/iax.conf.sample?view=diff&rev=233283&r1=233282&r2=233283
==============================================================================
--- branches/1.6.1/configs/iax.conf.sample (original)
+++ branches/1.6.1/configs/iax.conf.sample Fri Dec  4 15:55:53 2009
@@ -331,12 +331,13 @@
 ;
 ;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