Support for no/all keyrings

diff --git a/doc/ud-useradd.8.yo b/doc/ud-useradd.8.yo
index a7d5649..ae7155a 100644 (file)
--- a/doc/ud-useradd.8.yo
+++ b/doc/ud-useradd.8.yo
@@ -93,6 +93,9 @@ name.
 
 dit(bf(-m))
 Force resending of the greeting emails.
+
+dit(bf(-a))
+Use all available key rings.
 enddit()
 
 manpagefiles()

diff --git a/ud-useradd b/ud-useradd
index cadb798..37ab675 100755 (executable)
--- a/ud-useradd
+++ b/ud-useradd
@@ -7,7 +7,7 @@ from userdir_gpg import *;
 
 # This tries to search for a free UID. There are two possible ways to do
 # this, one is to fetch all the entires and pick the highest, the other
-# is to randomly guess uids until one is free. This uses the formar.
+# is to randomly guess uids until one is free. This uses the former.
 # Regrettably ldap doesn't have an integer attribute comparision function
 # so we can only cut the search down slightly 
 def GetFreeID(l):
@@ -26,13 +26,17 @@ AdminUser = pwd.getpwuid(os.getuid())[0];
 
 # Process options
 ForceMail = 0;
-(options, arguments) = getopt.getopt(sys.argv[1:], "u:m")
+OldGPGKeyRings = GPGKeyRings;
+GPGKeyRings = [];
+(options, arguments) = getopt.getopt(sys.argv[1:], "u:ma")
 for (switch, val) in options:
    if (switch == '-u'):
       AdminUser = val;
    elif (switch == '-m'):
       ForceMail = 1;
-      
+   elif (switch == '-a'):
+      GPGKeyRings = OldGPGKeyRings;
+
 print "Accessing LDAP directory as '" + AdminUser + "'";
 Password = getpass(AdminUser + "'s password: ");