ppp_alias -> ppp_nat

Submitted by: Josef L. Karthauser <joe@FreeBSD.org.uk>

8 files changed, 23 insertions, 23 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 995e77e..f4f6035 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 1c2529d..09ecc77 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 1c2529d..09ecc77 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 1c2529d..09ecc77 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 1c2529d..09ecc77 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 1c2529d..09ecc77 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 1c2529d..09ecc77 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 1c2529d..09ecc77 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}