From: Terry Wilson <twilson@digium.com>
Date: Mon, 21 Nov 2011 21:03:32 +0000 (+0000)
Subject: Change nat=yes to nat=force_rport in CHANGES
X-Git-Tag: 1.8.9.0-rc1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d9dbb2cbced971efcb05d16a304f935a8d2030;p=thirdparty%2Fasterisk.git

Change nat=yes to nat=force_rport in CHANGES

Fix a small documentation merge issue
ASTERISK-18862


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@345829 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/CHANGES b/CHANGES
index 89c67986e7..f941969c2d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,7 +15,7 @@
 SIP Changes
 -----------
     * Due to potential username discovery vulnerabilities, the 'nat' setting in sip.conf
-      now defaults to yes. It is very important that phones requiring nat=no be
+      now defaults to force_rport. It is very important that phones requiring nat=no be
       specifically set as such instead of relying on the default setting. If at all
       possible, all devices should have nat settings configured in the general section as
       opposed to configuring nat per-device.