From cdd53d9ce9fdb6916e3f602f4bb6faf020e527a8 Mon Sep 17 00:00:00 2001 From: Brian Somers Date: Sun, 22 Aug 1999 23:26:05 +0000 Subject: [PATCH] ppp_alias -> ppp_nat Submitted by: Josef L. Karthauser --- etc/defaults/rc.conf | 4 ++-- etc/network.subr | 6 +++--- etc/rc.d/netoptions | 6 +++--- etc/rc.d/network1 | 6 +++--- etc/rc.d/network2 | 6 +++--- etc/rc.d/network3 | 6 +++--- etc/rc.d/routing | 6 +++--- etc/rc.network | 6 +++--- share/man/man5/rc.conf.5 | 4 ++-- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 995e77ebe06d..f4f603569a21 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -9,7 +9,7 @@ # # All arguments must be in double or single quotes. # -# $Id: rc.conf,v 1.28 1999/08/14 17:13:40 obrien Exp $ +# $Id: rc.conf,v 1.29 1999/08/14 17:15:19 obrien Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -64,7 +64,7 @@ sppp_interfaces="" # List of sppp interfaces. ppp_enable="NO" # Start user-ppp (or NO). ppp_mode="auto" # Choice of "auto", "ddial", "direct" or "dedicated". # For details see man page for ppp(8). Default is auto. -ppp_alias="YES" # Packet aliasing (NAT/masquerading) or NO. +ppp_nat="YES" # Use PPP's internal network address translation or NO. ppp_profile="papchap" # Which profile to use from /etc/ppp/ppp.conf. ### Network daemon (miscellaneous) & NFS options: ### diff --git a/etc/network.subr b/etc/network.subr index 1c2529d2d88d..09ecc775e2e3 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.53 1999/08/10 09:45:31 des Exp $ +# $Id: rc.network,v 1.54 1999/08/19 21:15:16 brian Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -106,8 +106,8 @@ network_pass1() { ppp_command="-${ppp_mode} "; # Switch on alias mode? - if [ "X$ppp_alias" = X"YES" ]; then - ppp_command="${ppp_command} -alias"; + if [ "X$ppp_nat" = X"YES" ]; then + ppp_command="${ppp_command} -nat"; fi echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile} diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 1c2529d2d88d..09ecc775e2e3 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.53 1999/08/10 09:45:31 des Exp $ +# $Id: rc.network,v 1.54 1999/08/19 21:15:16 brian Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -106,8 +106,8 @@ network_pass1() { ppp_command="-${ppp_mode} "; # Switch on alias mode? - if [ "X$ppp_alias" = X"YES" ]; then - ppp_command="${ppp_command} -alias"; + if [ "X$ppp_nat" = X"YES" ]; then + ppp_command="${ppp_command} -nat"; fi echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile} diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 1c2529d2d88d..09ecc775e2e3 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.53 1999/08/10 09:45:31 des Exp $ +# $Id: rc.network,v 1.54 1999/08/19 21:15:16 brian Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -106,8 +106,8 @@ network_pass1() { ppp_command="-${ppp_mode} "; # Switch on alias mode? - if [ "X$ppp_alias" = X"YES" ]; then - ppp_command="${ppp_command} -alias"; + if [ "X$ppp_nat" = X"YES" ]; then + ppp_command="${ppp_command} -nat"; fi echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile} diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 1c2529d2d88d..09ecc775e2e3 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.53 1999/08/10 09:45:31 des Exp $ +# $Id: rc.network,v 1.54 1999/08/19 21:15:16 brian Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -106,8 +106,8 @@ network_pass1() { ppp_command="-${ppp_mode} "; # Switch on alias mode? - if [ "X$ppp_alias" = X"YES" ]; then - ppp_command="${ppp_command} -alias"; + if [ "X$ppp_nat" = X"YES" ]; then + ppp_command="${ppp_command} -nat"; fi echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile} diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 1c2529d2d88d..09ecc775e2e3 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.53 1999/08/10 09:45:31 des Exp $ +# $Id: rc.network,v 1.54 1999/08/19 21:15:16 brian Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -106,8 +106,8 @@ network_pass1() { ppp_command="-${ppp_mode} "; # Switch on alias mode? - if [ "X$ppp_alias" = X"YES" ]; then - ppp_command="${ppp_command} -alias"; + if [ "X$ppp_nat" = X"YES" ]; then + ppp_command="${ppp_command} -nat"; fi echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile} diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 1c2529d2d88d..09ecc775e2e3 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.53 1999/08/10 09:45:31 des Exp $ +# $Id: rc.network,v 1.54 1999/08/19 21:15:16 brian Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -106,8 +106,8 @@ network_pass1() { ppp_command="-${ppp_mode} "; # Switch on alias mode? - if [ "X$ppp_alias" = X"YES" ]; then - ppp_command="${ppp_command} -alias"; + if [ "X$ppp_nat" = X"YES" ]; then + ppp_command="${ppp_command} -nat"; fi echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile} diff --git a/etc/rc.network b/etc/rc.network index 1c2529d2d88d..09ecc775e2e3 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.53 1999/08/10 09:45:31 des Exp $ +# $Id: rc.network,v 1.54 1999/08/19 21:15:16 brian Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -106,8 +106,8 @@ network_pass1() { ppp_command="-${ppp_mode} "; # Switch on alias mode? - if [ "X$ppp_alias" = X"YES" ]; then - ppp_command="${ppp_command} -alias"; + if [ "X$ppp_nat" = X"YES" ]; then + ppp_command="${ppp_command} -nat"; fi echo -n 'Starting ppp: '; ppp ${ppp_command} -quiet ${ppp_profile} diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 183fc7832a79..7b6937ed2ba5 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rc.conf.5,v 1.40 1999/08/18 05:55:05 chris Exp $ +.\" $Id: rc.conf.5,v 1.41 1999/08/22 06:12:58 yokota Exp $ .\" .Dd April 26, 1997 .Dt RC.CONF 5 @@ -238,7 +238,7 @@ daemon. Accepted modes are and .Ar dedicated . See the manual for a full description. -.It Ar ppp_alias +.It Ar ppp_nat (bool) If set to .Ar YES , enables packet aliasing. Used in conjunction with