X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-useradd;h=23e1cd0ce098e2cbba301c1e6b38e6b931635023;hb=595923978a9ad55f4ec55b1aabef44683b111911;hp=8cc425b6f8521225588ffa964ed8c5186ac07e06;hpb=7a14013dff13a4dd7689f8c35c4f0d1c4f17ef19;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-useradd b/ud-useradd
index 8cc425b..23e1cd0 100755
--- a/ud-useradd
+++ b/ud-useradd
@@ -19,7 +19,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-import string, re, time, ldap, getopt, sys, os, pwd;
+import re, time, ldap, getopt, sys, os, pwd;
 from userdir_ldap import *;
 from userdir_gpg import *;
 
@@ -67,10 +67,10 @@ for (switch, val) in options:
    elif (switch == '-n'):
       NoAutomaticIDs = 1;
 
-l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
+l = passwdAccessLDAP(BaseDn, AdminUser)
 
 # Locate the key of the user we are adding
-SetKeyrings(["/org/keyring.debian.org/keyrings/debian-keyring.gpg"])
+SetKeyrings(ConfModule.add_keyrings.split(":"))
 while (1):
    Foo = raw_input("Who are you going to add (for a GPG search)? ");
    if Foo == "":