diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 1998-07-08 15:40:53 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 1998-07-08 15:40:53 +0000 |
| commit | e4e737cd854d7d4c0e22ca863bdfc28d1e1111ed (patch) | |
| tree | 81815fccb5f0c0611d671adf7aaeac13105b538f | |
| parent | abe2fe8a8b68af450baa84ad6d4bf3a30ac8bb07 (diff) | |
Notes
| -rw-r--r-- | etc/network.subr | 16 | ||||
| -rw-r--r-- | etc/rc.d/netoptions | 16 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 16 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 16 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 16 | ||||
| -rw-r--r-- | etc/rc.d/routing | 16 | ||||
| -rw-r--r-- | etc/rc.network | 16 |
7 files changed, 77 insertions, 35 deletions
diff --git a/etc/network.subr b/etc/network.subr index 5c362b2b85b5..c41d7acc16f7 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $ +# $Id: rc.network,v 1.27 1998/06/14 16:31:03 steve Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -269,10 +269,16 @@ network_pass3() { fi # Network Address Translation daemon - 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 + if [ "X${natd_enable}" = X"YES" -a X"${natd_interface}" != X"" \ + -a X"${firewall_enable}" = X"YES" ]; then + if echo ${natd_interface} | \ + grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then + natd_ifarg="-a ${natd_interface}" + else + natd_ifarg="-n ${natd_interface}" + fi + echo -n ' natd'; natd ${natd_flags} ${natd_ifarg} + fi echo '.' network_pass3_done=YES diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 5c362b2b85b5..c41d7acc16f7 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $ +# $Id: rc.network,v 1.27 1998/06/14 16:31:03 steve Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -269,10 +269,16 @@ network_pass3() { fi # Network Address Translation daemon - 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 + if [ "X${natd_enable}" = X"YES" -a X"${natd_interface}" != X"" \ + -a X"${firewall_enable}" = X"YES" ]; then + if echo ${natd_interface} | \ + grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then + natd_ifarg="-a ${natd_interface}" + else + natd_ifarg="-n ${natd_interface}" + fi + echo -n ' natd'; natd ${natd_flags} ${natd_ifarg} + fi echo '.' network_pass3_done=YES diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 5c362b2b85b5..c41d7acc16f7 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $ +# $Id: rc.network,v 1.27 1998/06/14 16:31:03 steve Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -269,10 +269,16 @@ network_pass3() { fi # Network Address Translation daemon - 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 + if [ "X${natd_enable}" = X"YES" -a X"${natd_interface}" != X"" \ + -a X"${firewall_enable}" = X"YES" ]; then + if echo ${natd_interface} | \ + grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then + natd_ifarg="-a ${natd_interface}" + else + natd_ifarg="-n ${natd_interface}" + fi + echo -n ' natd'; natd ${natd_flags} ${natd_ifarg} + fi echo '.' network_pass3_done=YES diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 5c362b2b85b5..c41d7acc16f7 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $ +# $Id: rc.network,v 1.27 1998/06/14 16:31:03 steve Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -269,10 +269,16 @@ network_pass3() { fi # Network Address Translation daemon - 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 + if [ "X${natd_enable}" = X"YES" -a X"${natd_interface}" != X"" \ + -a X"${firewall_enable}" = X"YES" ]; then + if echo ${natd_interface} | \ + grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then + natd_ifarg="-a ${natd_interface}" + else + natd_ifarg="-n ${natd_interface}" + fi + echo -n ' natd'; natd ${natd_flags} ${natd_ifarg} + fi echo '.' network_pass3_done=YES diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 5c362b2b85b5..c41d7acc16f7 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $ +# $Id: rc.network,v 1.27 1998/06/14 16:31:03 steve Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -269,10 +269,16 @@ network_pass3() { fi # Network Address Translation daemon - 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 + if [ "X${natd_enable}" = X"YES" -a X"${natd_interface}" != X"" \ + -a X"${firewall_enable}" = X"YES" ]; then + if echo ${natd_interface} | \ + grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then + natd_ifarg="-a ${natd_interface}" + else + natd_ifarg="-n ${natd_interface}" + fi + echo -n ' natd'; natd ${natd_flags} ${natd_ifarg} + fi echo '.' network_pass3_done=YES diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 5c362b2b85b5..c41d7acc16f7 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $ +# $Id: rc.network,v 1.27 1998/06/14 16:31:03 steve Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -269,10 +269,16 @@ network_pass3() { fi # Network Address Translation daemon - 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 + if [ "X${natd_enable}" = X"YES" -a X"${natd_interface}" != X"" \ + -a X"${firewall_enable}" = X"YES" ]; then + if echo ${natd_interface} | \ + grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then + natd_ifarg="-a ${natd_interface}" + else + natd_ifarg="-n ${natd_interface}" + fi + echo -n ' natd'; natd ${natd_flags} ${natd_ifarg} + fi echo '.' network_pass3_done=YES diff --git a/etc/rc.network b/etc/rc.network index 5c362b2b85b5..c41d7acc16f7 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.26 1998/05/19 04:36:31 jkh Exp $ +# $Id: rc.network,v 1.27 1998/06/14 16:31:03 steve Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -269,10 +269,16 @@ network_pass3() { fi # Network Address Translation daemon - 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 + if [ "X${natd_enable}" = X"YES" -a X"${natd_interface}" != X"" \ + -a X"${firewall_enable}" = X"YES" ]; then + if echo ${natd_interface} | \ + grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then + natd_ifarg="-a ${natd_interface}" + else + natd_ifarg="-n ${natd_interface}" + fi + echo -n ' natd'; natd ${natd_flags} ${natd_ifarg} + fi echo '.' network_pass3_done=YES |