[asterisk-commits] dvossel: trunk r206873 - in /trunk: ./ configs/iax.conf.sample

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Jul 16 16:33:51 2009
New Revision: 206873

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206873
Log:
Merged revisions 206872 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r206872 | dvossel | 2009-07-16 16:33:19 -0500 (Thu, 16 Jul 2009) | 6 lines
  
  error in iax.conf related IP-based access control
  
  (closes issue #15518)
  Reported by: pkempgen
........

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configs/iax.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/configs/iax.conf.sample?view=diff&rev=206873&r1=206872&r2=206873
==============================================================================
--- trunk/configs/iax.conf.sample (original)
+++ trunk/configs/iax.conf.sample Thu Jul 16 16:33:51 2009
@@ -349,7 +349,7 @@
 ;
 ; Further user sections may be added, specifying a context and a secret used
 ; for connections with that given authentication name.  Limited IP based
-; access control is allowed by use of "allow" and "deny" keywords.  Multiple
+; access control is allowed by use of "permit" and "deny" keywords.  Multiple
 ; rules are permitted.  Multiple permitted contexts may be specified, in
 ; which case the first will be the default.  You can also override caller*ID
 ; so that when you receive a call you set the Caller*ID to be what you want