diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2012-11-04 02:52:03 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2012-11-04 02:52:03 +0000 |
commit | 23090366f729c56cab62de74c7a51792357e98a9 (patch) | |
tree | c511c885796e28ec571b5267e8f11f3b103d35e9 /sbin/natd | |
parent | 7750ad47a9a7dbc83f87158464170c8640723293 (diff) | |
parent | 22ff74b2f44234d31540b1f7fd6c91489c37cad3 (diff) | |
download | src-23090366f729c56cab62de74c7a51792357e98a9.tar.gz src-23090366f729c56cab62de74c7a51792357e98a9.zip |
Sync from head
Notes
Notes:
svn path=/projects/bmake/; revision=242545
Diffstat (limited to 'sbin/natd')
-rw-r--r-- | sbin/natd/natd.8 | 12 | ||||
-rw-r--r-- | sbin/natd/natd.c | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8 index cba4ed4a48d2..b4b37ed1fb5d 100644 --- a/sbin/natd/natd.8 +++ b/sbin/natd/natd.8 @@ -130,9 +130,9 @@ According to RFC 1918, unregistered source addresses are 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16. .It Fl redirect_port Ar proto Xo .Ar targetIP Ns : Ns Xo -.Ar targetPORT Ns Op - Ns Ar targetPORT Xc -.Op Ar aliasIP Ns : Ns Xo -.Ar aliasPORT Ns Op - Ns Ar aliasPORT Xc +.Ar targetPORT Ns Oo - Ns Ar targetPORT Oc Xc +.Oo Ar aliasIP Ns : Oc Ns Xo +.Ar aliasPORT Ns Oo - Ns Ar aliasPORT Oc Xc .Oo Ar remoteIP Ns Oo : Ns .Ar remotePORT Ns Op - Ns Ar remotePORT .Oc Oc @@ -247,10 +247,8 @@ to appear from the specified .Ar targetIP Ns : Ns Xo .Ar targetPORT Ns Oo , Ns .Ar ...\& -.Oc Oc -.Xc -.Xc -.Op Ar aliasIP Ns : Ns Xo +.Oc Xc Oc Xc +.Oo Ar aliasIP Ns : Oc Ns Xo .Ar aliasPORT .Xc .Oo Ar remoteIP Ns diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c index 3dbfef0fe958..959e1eeaf52c 100644 --- a/sbin/natd/natd.c +++ b/sbin/natd/natd.c @@ -1330,7 +1330,7 @@ static void ParseOption (const char* option, const char* parms) struct in_addr addrValue; int max; char* end; - CODE* fac_record = NULL; + const CODE* fac_record = NULL; /* * Find option from table. */ @@ -1509,7 +1509,7 @@ static void ParseOption (const char* option, const char* parms) break; case LogIpfwDenied: - logIpfwDenied = yesNoValue;; + logIpfwDenied = yesNoValue; break; case PidFile: |