Bring head revision up to date with cabal (try #3)

[oweals/tinc.git] / debian / init.d

diff --git a/debian/init.d b/debian/init.d
index 9067c546d6f36219273aecd129c75ba53ef7afdb..1acbe4a1c54570c65d375069017548dbd0b1a27a 100644 (file)
--- a/debian/init.d
+++ b/debian/init.d
@@ -1,7 +1,7 @@
 #! /usr/bin/perl -w
 #
 # System startup script for tinc
-# $Id: init.d,v 1.14 2000/06/01 20:21:27 guus Exp $
+# $Id: init.d,v 1.15 2000/10/18 20:12:06 zarq Exp $
 #
 # Based on Lubomir Bulej's Redhat init script.
 #
@@ -68,6 +68,7 @@ sub vpn_load {
            chomp($VPN);
        } elsif ( /^[ ]*VpnMask[ =]+([^ \#]+)/i ) {
            $VPNMASK=$1;
+           chomp($VPNMASK);
        }
     }
     if(!defined($DEV)) {
@@ -108,10 +109,8 @@ sub vpn_load {
 
     if(!defined($VPNMASK)) {
        $VPNMASK = $MSK;
+       $VPNMASK = join(".", unpack('C4', $VPNMASK));
     }
-    
-    $VPNMASK = pack('C4', split(/\./, $VPNMASK));
-    $VPNMASK = join(".", unpack('C4', $VPNMASK));
     $ADR = join(".", unpack('C4', $ADR));
     $MSK = join(".", unpack('C4', $MSK));