From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 19 Apr 2017 20:30:24 +0000 (+0100)
Subject: ipif: ship and use ipif-access
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/userv-utils/commitdiff_plain/26f67181f7dfdb4eec067ad0488ef65961b0b961

ipif: ship and use ipif-access
---

diff --git a/ipif/Makefile b/ipif/Makefile
index fe6ec6e..289935e 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -39,6 +39,7 @@ PROGRAMS+=		$(PROGRAM_TARGETS)
 
 DIRS+=			$(libuserv) $(etcuserv) $(services)
 DIRS+=			$(docdir)/userv-ipif
+DIRS+=			$(etcuserv)/ipif-access
 DIRS$(depr)+=		$(bindir) $(varlibvpn) $(shareuserv)
 
 SHAREFILES$(depr)+=	udptunnel-vpn-config.m4 udptunnel-vpn-defaults
@@ -54,6 +55,7 @@ all:		$(TARGETS)
 install:	all
 		mkdir -p $(DIRS)
 		cp -b service $(libuserv)/ipif
+		cp -b service-wrap $(libuserv)/ipif-access
 		set -e; for f in $(PROGRAMS); do cp -b $$f $(bindir)/.; done
 		cp ipif $(services)/ipif:new
 		set -e; cd $(services); test -f ipif || mv ipif:new ipif
diff --git a/ipif/ipif b/ipif/ipif
index c6784c7..6154105 100644
--- a/ipif/ipif
+++ b/ipif/ipif
@@ -7,5 +7,5 @@ if ( grep calling-user-shell /etc/shells
 	no-set-environment
 	no-suppress-args
 	no-disconnect-hup
-	execute /usr/lib/userv/ipif /etc/userv/ipif-networks --
+	execute /usr/lib/userv/ipif-access /etc/userv/ipif-access /usr/lib/userv/ipif /etc/userv/ipif-networks --
 fi