From 02351826161f10001f956c4975f7087859c0ae19 Mon Sep 17 00:00:00 2001 From: Paul Traina Date: Sun, 6 Jul 1997 00:33:34 +0000 Subject: [PATCH] Merge from 2.2 (tcp extensions in phase 1) --- etc/network.subr | 13 +++++++------ etc/rc.d/netoptions | 13 +++++++------ etc/rc.d/network1 | 13 +++++++------ etc/rc.d/network2 | 13 +++++++------ etc/rc.d/network3 | 13 +++++++------ etc/rc.d/routing | 13 +++++++------ etc/rc.network | 13 +++++++------ 7 files changed, 49 insertions(+), 42 deletions(-) diff --git a/etc/network.subr b/etc/network.subr index 398b867e0870..3c5657dc5717 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ +# $Id: rc.network,v 1.8 1997/05/19 07:46:48 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -75,6 +75,12 @@ network_pass1() { fi echo -n 'Additional routing options:' + 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 echo -n ' IP gateway=YES' sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 @@ -104,11 +110,6 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - 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${named_enable}" = X"YES" ]; then echo -n ' named'; named ${named_flags} fi diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 398b867e0870..3c5657dc5717 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ +# $Id: rc.network,v 1.8 1997/05/19 07:46:48 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -75,6 +75,12 @@ network_pass1() { fi echo -n 'Additional routing options:' + 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 echo -n ' IP gateway=YES' sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 @@ -104,11 +110,6 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - 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${named_enable}" = X"YES" ]; then echo -n ' named'; named ${named_flags} fi diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 398b867e0870..3c5657dc5717 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ +# $Id: rc.network,v 1.8 1997/05/19 07:46:48 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -75,6 +75,12 @@ network_pass1() { fi echo -n 'Additional routing options:' + 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 echo -n ' IP gateway=YES' sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 @@ -104,11 +110,6 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - 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${named_enable}" = X"YES" ]; then echo -n ' named'; named ${named_flags} fi diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 398b867e0870..3c5657dc5717 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ +# $Id: rc.network,v 1.8 1997/05/19 07:46:48 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -75,6 +75,12 @@ network_pass1() { fi echo -n 'Additional routing options:' + 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 echo -n ' IP gateway=YES' sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 @@ -104,11 +110,6 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - 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${named_enable}" = X"YES" ]; then echo -n ' named'; named ${named_flags} fi diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 398b867e0870..3c5657dc5717 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ +# $Id: rc.network,v 1.8 1997/05/19 07:46:48 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -75,6 +75,12 @@ network_pass1() { fi echo -n 'Additional routing options:' + 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 echo -n ' IP gateway=YES' sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 @@ -104,11 +110,6 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - 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${named_enable}" = X"YES" ]; then echo -n ' named'; named ${named_flags} fi diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 398b867e0870..3c5657dc5717 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ +# $Id: rc.network,v 1.8 1997/05/19 07:46:48 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -75,6 +75,12 @@ network_pass1() { fi echo -n 'Additional routing options:' + 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 echo -n ' IP gateway=YES' sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 @@ -104,11 +110,6 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - 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${named_enable}" = X"YES" ]; then echo -n ' named'; named ${named_flags} fi diff --git a/etc/rc.network b/etc/rc.network index 398b867e0870..3c5657dc5717 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.7 1997/05/13 08:22:27 jkh Exp $ +# $Id: rc.network,v 1.8 1997/05/19 07:46:48 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -75,6 +75,12 @@ network_pass1() { fi echo -n 'Additional routing options:' + 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 echo -n ' IP gateway=YES' sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 @@ -104,11 +110,6 @@ network_pass1() { network_pass2() { echo -n 'Doing additional network setup:' - 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${named_enable}" = X"YES" ]; then echo -n ' named'; named ${named_flags} fi