From dceaefe377352cb403ffda93f06094cf66848bbf Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 4 Dec 2006 12:21:17 +0100 Subject: [PATCH] * Improve handling of NAT/gateway feature, thanks - Wolfgang Karall! --- debian/changelog | 6 ++++++ grml-terminalserver-config | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7bbe31c..2541b73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-terminalserver (0.82) unstable; urgency=low + + * Improve handling of NAT/gateway feature, thanks - Wolfgang Karall! + + -- Michael Prokop Mon, 4 Dec 2006 12:20:21 +0100 + grml-terminalserver (0.81) unstable; urgency=low * Fix iptables problem when not using the NAT/gateway feature. diff --git a/grml-terminalserver-config b/grml-terminalserver-config index b8b84bc..fc8c155 100755 --- a/grml-terminalserver-config +++ b/grml-terminalserver-config @@ -38,7 +38,7 @@ IPRANGE_TO_="" NETWORK_="" OPTIONS_="" BOOT_ARGS_="" -NAT_INTERFACE_="" +NAT_INTERFACE_="none" ### @@ -326,7 +326,7 @@ for addresses from 192.168.0.101 to (and including) 192.168.0.200. NAMESERVERS_=`netGetNameservers warn` GW_=`netGetDefaultGateway warn` GW_DEV_=`/sbin/ip route get "$GW_" | awk '{ print $3; exit; }'` - if [ "$GW_DEV_" != "$INTERFACE_" ]; then + if [ "$GW_DEV_" != "$INTERFACE_" ] && [ "$GW_DEV_" != "" ]; then # GW_DEV_ of server is not the same device as the one serviced by dhcpd # so it doesn't make sense to provide the GW_ address to the clients local do_nat_="YES" @@ -348,10 +348,6 @@ the internet?" GW_= NAT_INTERFACE_="none" fi - else - # no NAT, no sensible gateway - GW_= - NAT_INTERFACE_="none" fi -- 2.1.4