From 50b8aa03a9d963c07935eb4d213d3d2c752f6231 Mon Sep 17 00:00:00 2001 From: phk Date: Sun, 6 Sep 1998 08:20:11 +0000 Subject: [PATCH] tcp_extensions now only applies to RFC1323 --- etc/network.subr | 3 +-- etc/rc.conf | 4 ++-- etc/rc.d/netoptions | 3 +-- etc/rc.d/network1 | 3 +-- etc/rc.d/network2 | 3 +-- etc/rc.d/network3 | 3 +-- etc/rc.d/routing | 3 +-- etc/rc.network | 3 +-- 8 files changed, 9 insertions(+), 16 deletions(-) diff --git a/etc/network.subr b/etc/network.subr index 74743ae7eb80..526cf3cb1bd5 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.28 1998/07/08 15:40:53 nectar Exp $ +# $Id: rc.network,v 1.29 1998/08/14 06:55:17 phk Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -108,7 +108,6 @@ network_pass1() { if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 - sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi if [ "X$gateway_enable" = X"YES" ]; then diff --git a/etc/rc.conf b/etc/rc.conf index 5cf8f88e684d..569994de6dbb 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -6,7 +6,7 @@ # # All arguments must be in double or single quotes. # -# $Id: rc.conf,v 1.54 1998/08/10 19:53:22 brian Exp $ +# $Id: rc.conf,v 1.55 1998/09/04 23:37:24 jkh Exp $ ############################################################## ### Important initial Boot-time options ##################### @@ -34,7 +34,7 @@ firewall_quiet="NO" # Set to YES to suppress rule display natd_enable="NO" # Enable natd (if firewall_enable == YES). natd_interface="fxp0" # Public interface to use with natd. natd_flags="" # Additional flags for natd. -tcp_extensions="NO" # Allow RFC1323 & RFC1644 extensions (or NO). +tcp_extensions="NO" # Disallow RFC1323 extensions (or YES). network_interfaces="lo0" # List of network interfaces (lo0 is loopback). ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 74743ae7eb80..526cf3cb1bd5 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.28 1998/07/08 15:40:53 nectar Exp $ +# $Id: rc.network,v 1.29 1998/08/14 06:55:17 phk Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -108,7 +108,6 @@ network_pass1() { if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 - sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi if [ "X$gateway_enable" = X"YES" ]; then diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 74743ae7eb80..526cf3cb1bd5 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.28 1998/07/08 15:40:53 nectar Exp $ +# $Id: rc.network,v 1.29 1998/08/14 06:55:17 phk Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -108,7 +108,6 @@ network_pass1() { if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 - sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi if [ "X$gateway_enable" = X"YES" ]; then diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 74743ae7eb80..526cf3cb1bd5 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.28 1998/07/08 15:40:53 nectar Exp $ +# $Id: rc.network,v 1.29 1998/08/14 06:55:17 phk Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -108,7 +108,6 @@ network_pass1() { if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 - sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi if [ "X$gateway_enable" = X"YES" ]; then diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 74743ae7eb80..526cf3cb1bd5 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.28 1998/07/08 15:40:53 nectar Exp $ +# $Id: rc.network,v 1.29 1998/08/14 06:55:17 phk Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -108,7 +108,6 @@ network_pass1() { if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 - sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi if [ "X$gateway_enable" = X"YES" ]; then diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 74743ae7eb80..526cf3cb1bd5 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.28 1998/07/08 15:40:53 nectar Exp $ +# $Id: rc.network,v 1.29 1998/08/14 06:55:17 phk Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -108,7 +108,6 @@ network_pass1() { if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 - sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi if [ "X$gateway_enable" = X"YES" ]; then diff --git a/etc/rc.network b/etc/rc.network index 74743ae7eb80..526cf3cb1bd5 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.28 1998/07/08 15:40:53 nectar Exp $ +# $Id: rc.network,v 1.29 1998/08/14 06:55:17 phk Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -108,7 +108,6 @@ network_pass1() { if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then echo -n ' tcp extensions=NO' sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 - sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 fi if [ "X$gateway_enable" = X"YES" ]; then