X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-keys/blobdiff_plain/14e6d4c937521297056d31b4e9cb6e1eec0781cc..HEAD:/userv/distorted-keys.in

diff --git a/userv/distorted-keys.in b/userv/distorted-keys.in
index 4882d5c..07ecd4a 100644
--- a/userv/distorted-keys.in
+++ b/userv/distorted-keys.in
@@ -14,7 +14,24 @@ if ( glob service cryptop
 	require-fd 1-2 write
 	ignore-fd 3-
 	no-set-environment
-	execute @sbindir@/cryptop
+	execute @bindir@/cryptop
+fi
+
+###--------------------------------------------------------------------------
+### Key administration operations.
+
+if ( glob service keys
+   & glob service-user @user@
+   & ( grep calling-user @pkgconfdir@/admin.users
+     | grep calling-group @pkgconfdir@/admin.groups
+     )
+   )
+	no-suppress-args
+	require-fd 0 read
+	require-fd 1-2 write
+	ignore-fd 3-
+	no-set-environment
+	execute @sbindir@/keys
 fi
 
 ###--------------------------------------------------------------------------
@@ -29,16 +46,16 @@ if ( glob service cryptop-profile
 	require-fd 1-2 write
 	ignore-fd 3-
 	no-set-environment
-	execute sh -c "case $# in \
-	  1) \
-	    exec @bindir@/extract-profile \"$1\" \
-		@pkgconfdir@/profile.d/ \
-		.userv/cryptop-profile \
-	    ;; \
-	  *) \
-	    echo >&2 \"usage: cryptop-profile PROFILE\"; \
-	    exit 1 \
-	    ;; \
+	execute sh -c "case $# in					\
+	  1)								\
+	    exec @bindir@/extract-profile \"$1\"			\
+		@pkgconfdir@/profile.d/					\
+		.userv/cryptop-profile					\
+	    ;;								\
+	  *)								\
+	    echo >&2 \"usage: cryptop-profile PROFILE\";		\
+	    exit 1							\
+	    ;;								\
 	esac" _
 fi