Remove `--force' from keys.new-keeper; introduce explicit delete command.

[distorted-keys] / userv / claim-dir.in

diff --git a/userv/claim-dir.in b/userv/claim-dir.in
index 4cc6032f43280c51a25cd31756979cf069a844f4..d5f14db3e50114efe8b3ccc4ad70206d593418cb 100644 (file)
--- a/userv/claim-dir.in
+++ b/userv/claim-dir.in
@@ -4,7 +4,9 @@
 
 if ( glob service claim-dir
    & glob service-user root
-   & grep calling-user-shell /etc/shells
+   & ( grep calling-user-shell /etc/shells
+     | glob calling-user-shell /dev/token-shells/userv
+     )
    )
        no-suppress-args
        null-fd 0