Mailing List Archive

Author: Antonio Borneo
Date: Sat Jan 14 08:55:02 2012
New Revision: 488

Log:
Handle IPv6 nameservers (in $INTERNAL_IP4_DNS variable)

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Modified:
branches/vpnc-nortel/vpnc-script
trunk/vpnc-script

Modified: branches/vpnc-nortel/vpnc-script
==============================================================================
--- branches/vpnc-nortel/vpnc-script (original)
+++ branches/vpnc-nortel/vpnc-script Sat Jan 14 08:55:02 2012
@@ -521,7 +521,9 @@
i=`expr $i + 1`
done
for i in $INTERNAL_IP4_DNS ; do
- set_network_route "$i" "255.255.255.255" "32"
+ if ! echo "$i" | grep -q : ; then
+ set_network_route "$i" "255.255.255.255" "32"
+ fi
done
elif [ -n "$INTERNAL_IP4_ADDRESS" ]; then
set_default_route
@@ -538,8 +540,10 @@
fi
i=`expr $i + 1`
done
- for i in $INTERNAL_IP6_DNS ; do
- set_ipv6_network_route "$i" "128"
+ for i in $INTERNAL_IP4_DNS ; do
+ if echo "$i" | grep -q : ; then
+ set_ipv6_network_route "$i" "128"
+ fi
done
elif [ -n "$INTERNAL_IP6_NETMASK" -o -n "$INTERNAL_IP6_ADDRESS" ]; then
set_ipv6_default_route

Modified: trunk/vpnc-script
==============================================================================
--- trunk/vpnc-script (original)
+++ trunk/vpnc-script Sat Jan 14 08:55:02 2012
@@ -521,7 +521,9 @@
i=`expr $i + 1`
done
for i in $INTERNAL_IP4_DNS ; do
- set_network_route "$i" "255.255.255.255" "32"
+ if ! echo "$i" | grep -q : ; then
+ set_network_route "$i" "255.255.255.255" "32"
+ fi
done
elif [ -n "$INTERNAL_IP4_ADDRESS" ]; then
set_default_route
@@ -538,8 +540,10 @@
fi
i=`expr $i + 1`
done
- for i in $INTERNAL_IP6_DNS ; do
- set_ipv6_network_route "$i" "128"
+ for i in $INTERNAL_IP4_DNS ; do
+ if echo "$i" | grep -q : ; then
+ set_ipv6_network_route "$i" "128"
+ fi
done
elif [ -n "$INTERNAL_IP6_NETMASK" -o -n "$INTERNAL_IP6_ADDRESS" ]; then
set_ipv6_default_route

_______________________________________________
vpnc-devel mailing list
vpnc-devel@unix-ag.uni-kl.de
https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
http://www.unix-ag.uni-kl.de/~massar/vpnc/