Improved error message when no key has been found

[mirror/userdir-ldap.git] / ud-useradd

diff --git a/ud-useradd b/ud-useradd
index c51c944..7d0730b 100755 (executable)
--- a/ud-useradd
+++ b/ud-useradd
@@ -40,24 +40,34 @@ for (switch, val) in options:
       userdir_gpg.GPGKeyRings = OldGPGKeyRings;
 
 print "Accessing LDAP directory as '" + AdminUser + "'";
-Password = getpass(AdminUser + "'s password: ");
+while (1):
+   Password = getpass(AdminUser + "'s password: ");
+
+   if len(Password) == 0:
+      sys.exit(0)
 
-# Connect to the ldap server
-l = ldap.open(LDAPServer);
-UserDn = "uid=" + AdminUser + "," + BaseDn;
-l.simple_bind_s(UserDn,Password);
+   l = ldap.open(LDAPServer);
+   UserDn = "uid=" + AdminUser + "," + BaseDn;
+
+   # Connect to the ldap server
+   try:
+      l.simple_bind_s(UserDn,Password);
+   except ldap.INVALID_CREDENTIALS:
+      continue
+   break
 
 # Locate the key of the user we are adding
-GPGBasicOptions[0] = "--batch"           # Permit loading of the config file
+SetKeyrings(["/org/keyring.debian.org/keyrings/debian-keyring.gpg"])
 while (1):
    Foo = raw_input("Who are you going to add (for a GPG search)? ");
    if Foo == "":
-      continue;
+      sys.exit(0);
 
    Keys = GPGKeySearch(Foo);
 
    if len(Keys) == 0:
-      print "Sorry, that search did not turn up any keys";
+      print "Sorry, that search did not turn up any keys."
+      print "Has it been added to the Debian keyring already?"
       continue;
    if len(Keys) > 1:
       print "Sorry, more than one key was found, please specify the key to use by\nfingerprint:";
@@ -106,7 +116,7 @@ while 1:
    if len(Attrs) == 0:
       privsub = "%s@debian.org"%(account);
       break;
-   Res = raw_input("That account already exists, update [no]? ");
+   Res = raw_input("That account already exists, update [No/yes]? ");
    if Res == "yes":
       # Update mode, fetch the default values from the directory
       Update = 1;
@@ -185,7 +195,7 @@ print "   Private Subscription:",privsub;
 print "   GECOS Field: \"%s,,,,\"" % (FullName);
 print "   Login Shell: /bin/bash";
 print "   Key Fingerprint:",Keys[0][1];
-Res = raw_input("Continue [no]? ");
+Res = raw_input("Continue [No/yes]? ");
 if Res != "yes":
    sys.exit(1);