From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 19 Apr 2017 22:31:12 +0000 (+0100)
Subject: ipif: service-wrap: fix access handling if no config at all
X-Git-Tag: userv/0.6.1~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=commitdiff_plain;h=2449f13fad5be5ca9d1ce16955fe0afec7cfc050

ipif: service-wrap: fix access handling if no config at all

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/ipif/service-wrap b/ipif/service-wrap
index 3a4e806..678a867 100755
--- a/ipif/service-wrap
+++ b/ipif/service-wrap
@@ -272,12 +272,12 @@ sub readconfig ($) {
     }
     $cfgfh->error and die $!;
     close $cfgfh;
-
-    if ($v0config && $v0config =~ m{^[^#]} && $v0config ne '/dev/null') {
-	print "trying v0 config $v0config...\n" if $protocol eq 'debug';
-	execreal $v0config;
-    }
-    die "permission denied\n";
 }
 
 readconfig $v1config;
+
+if ($v0config && $v0config =~ m{^[^#]} && $v0config ne '/dev/null') {
+    print "trying v0 config $v0config...\n" if $protocol eq 'debug';
+    execreal $v0config;
+}
+die "permission denied\n";