ipif: ship and use ipif-access

diff --git a/ipif/Makefile b/ipif/Makefile
index fe6ec6efefcc00ae68dd3cce890ced5d510136f9..289935e7eef05fcae75d3e0ebee8fbc745af5896 100644 (file)
--- 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 c6784c759dcc8e8a9b8fc44fa7ad79d70bae571b..615410554c1ba39335256f9fb22e8bf023d14d77 100644 (file)
--- 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