userv: Tidy up a bit. Require file descriptors to be right.

[cryptomail] / .userv / rc

diff --git a/.userv/rc b/.userv/rc
index dd2bd5318c29915d5f08157b98f910f733fed7e8..c1af7ad0d59d0c2fdd072cb906e6bbb4f297ee02 100644 (file)
--- a/.userv/rc
+++ b/.userv/rc
@@ -1,13 +1,22 @@
 ### Userv configuration for cryptomail
 
-if glob service generate
-       no-suppress-args
-       execute bin/cryptomail generate
-fi
+require-fd 0 read
+require-fd 1-2 write
+reject-fd 3-
+no-suppress-args
 
-if ( glob service addrcheck:cryptomail-default
-   & glob calling_user qmaild
-   )
-       no-suppress-args
+if glob service generate
+       execute bin/uwrap generate -f %@cryptomail.distorted.org.uk
+elif glob service info
+       execute bin/uwrap info
+elif glob service revoke
+       execute bin/uwrap revoke
+elif glob service list
+       execute bin/uwrap list
+elif glob service help
+       execute bin/uwrap help
+elif ( glob service addrcheck:cryptomail-default
+     & glob calling-user qmaild
+     )
        execute bin/cryptomail addrcheck --
 fi