Cleanup natd startup test.

PR:		6946
Submitted by:	Jacques Vidrine <n@nectar.com>

7 files changed, 28 insertions, 35 deletions

diff --git a/etc/network.subr b/etc/network.subr
index 6490c48..5c362b2 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $
+#	$Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -269,10 +269,9 @@ network_pass3() {
     fi
     
     # Network Address Translation daemon
-    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then
-	    if [ -a "X${firewall_enable}" = X"YES" ]; then
-	            echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
-	    fi
+    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" \
+	-a "X${firewall_enable}" = X"YES" ]; then
+	    echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
     fi
 
     echo '.'
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 6490c48..5c362b2 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $
+#	$Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -269,10 +269,9 @@ network_pass3() {
     fi
     
     # Network Address Translation daemon
-    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then
-	    if [ -a "X${firewall_enable}" = X"YES" ]; then
-	            echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
-	    fi
+    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" \
+	-a "X${firewall_enable}" = X"YES" ]; then
+	    echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
     fi
 
     echo '.'
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 6490c48..5c362b2 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $
+#	$Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -269,10 +269,9 @@ network_pass3() {
     fi
     
     # Network Address Translation daemon
-    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then
-	    if [ -a "X${firewall_enable}" = X"YES" ]; then
-	            echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
-	    fi
+    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" \
+	-a "X${firewall_enable}" = X"YES" ]; then
+	    echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
     fi
 
     echo '.'
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 6490c48..5c362b2 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $
+#	$Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -269,10 +269,9 @@ network_pass3() {
     fi
     
     # Network Address Translation daemon
-    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then
-	    if [ -a "X${firewall_enable}" = X"YES" ]; then
-	            echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
-	    fi
+    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" \
+	-a "X${firewall_enable}" = X"YES" ]; then
+	    echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
     fi
 
     echo '.'
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 6490c48..5c362b2 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $
+#	$Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -269,10 +269,9 @@ network_pass3() {
     fi
     
     # Network Address Translation daemon
-    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then
-	    if [ -a "X${firewall_enable}" = X"YES" ]; then
-	            echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
-	    fi
+    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" \
+	-a "X${firewall_enable}" = X"YES" ]; then
+	    echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
     fi
 
     echo '.'
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 6490c48..5c362b2 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $
+#	$Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -269,10 +269,9 @@ network_pass3() {
     fi
     
     # Network Address Translation daemon
-    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then
-	    if [ -a "X${firewall_enable}" = X"YES" ]; then
-	            echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
-	    fi
+    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" \
+	-a "X${firewall_enable}" = X"YES" ]; then
+	    echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
     fi
 
     echo '.'
diff --git a/etc/rc.network b/etc/rc.network
index 6490c48..5c362b2 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.25 1998/05/06 17:36:16 andreas Exp $
+#	$Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -269,10 +269,9 @@ network_pass3() {
     fi
     
     # Network Address Translation daemon
-    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" ]; then
-	    if [ -a "X${firewall_enable}" = X"YES" ]; then
-	            echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
-	    fi
+    if [ "X${natd_enable}" = X"YES" -a "X${natd_interface}" != X"" \
+	-a "X${firewall_enable}" = X"YES" ]; then
+	    echo -n ' natd'; natd ${natd_flags} -n ${natd_interface}
     fi
 
     echo '.'