projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the common routine from userdir_ldap.py which asks for the
[mirror/userdir-ldap.git]
/
ud-gpgimport
diff --git
a/ud-gpgimport
b/ud-gpgimport
index
1229e57
..
8c7ad73
100755
(executable)
--- a/
ud-gpgimport
+++ b/
ud-gpgimport
@@
-51,13
+51,10
@@
if len(arguments) == 0:
# Main program starts here
# Connect to the ldap server
# Main program starts here
# Connect to the ldap server
-l = ldap.open(LDAPServer);
if NoAct == 0:
if NoAct == 0:
- print "Accessing LDAP directory as '" + AdminUser + "'";
- Password = getpass(AdminUser + "'s password: ");
- UserDn = "uid=" + AdminUser + "," + BaseDn;
- l.simple_bind_s(UserDn,Password);
+ l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
else:
else:
+ l = ldap.open(LDAPServer);
l.simple_bind_s("","");
# Download the existing key list and put it into a map
l.simple_bind_s("","");
# Download the existing key list and put it into a map