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)
+
+ l = ldap.open(LDAPServer);
+ UserDn = "uid=" + AdminUser + "," + BaseDn;
-# Connect to the ldap server
-l = ldap.open(LDAPServer);
-UserDn = "uid=" + AdminUser + "," + BaseDn;
-l.simple_bind_s(UserDn,Password);
+ # 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 == "":
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;
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);