From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 22 Mar 2006 19:11:01 +0000 (+0000)
Subject: userv: Tidy up a bit.  Require file descriptors to be right.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/cryptomail/commitdiff_plain/refs/heads/master

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

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