From: Ivo Timmermans <ivo@lychnis.net>
Date: Sat, 3 Jun 2000 23:32:03 +0000 (+0000)
Subject: Don't touch VPNMASK if it's defined, otherwise use $MSK.
X-Git-Tag: import-tinc-1.1~785^2~921
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=377c4df245ceb8c19cabfe6d7a7c76841c07ba52;p=meshlink

Don't touch VPNMASK if it's defined, otherwise use $MSK.
---

diff --git a/debian/init.d b/debian/init.d
index 9067c546..d61becb1 100644
--- 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.14.2.1 2000/06/03 23:32:03 zarq Exp $
 #
 # Based on Lubomir Bulej's Redhat init script.
 #
@@ -108,10 +108,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));