[svn-commits] kpfleming: branch 1.6.2 r348515 - /branches/1.6.2/configs/sip.conf.sample

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Sun Dec 18 12:25:12 2011
New Revision: 348515

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=348515
Log:
Correct two flaws in sip.conf.sample related to AST-2011-013.

* The sample file listed *two* values for the 'nat' option as being the default.
  Only 'yes' is the default.

* The warning about having differing 'nat' settings confusingly referred to both
  peers and users.


Modified:
    branches/1.6.2/configs/sip.conf.sample

Modified: branches/1.6.2/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configs/sip.conf.sample?view=diff&rev=348515&r1=348514&r2=348515
==============================================================================
--- branches/1.6.2/configs/sip.conf.sample (original)
+++ branches/1.6.2/configs/sip.conf.sample Sun Dec 18 12:25:12 2011
@@ -659,7 +659,7 @@
 ; However, this is only useful if the external traffic can reach us.
 ; The following settings are allowed (both globally and in individual sections):
 ;
-;        nat = no                ; default. Use NAT mode only according to RFC3581 (;rport)
+;        nat = no                ; Use NAT mode only according to RFC3581 (;rport)
 ;        nat = yes               ; Always ignore info and assume NAT (default)
 ;        nat = never             ; Never attempt NAT mode or RFC3581 support
 ;        nat = route             ; route = Assume NAT, don't send rport 
@@ -670,7 +670,7 @@
 ; by outside parties as Asterisk will respond to different ports for defined and
 ; undefined peers. For this reason it is recommended to ONLY DEFINE NAT SETTINGS IN THE
 ; GENERAL SECTION. Specifically, if nat=route or nat=yes in one section and nat=no or
-; nat=never in the other, then valid users with settings differing from those in the
+; nat=never in the other, then valid peers with settings differing from those in the
 ; general section will be discoverable.
 
 ;----------------------------------- MEDIA HANDLING --------------------------------