Use the common routine from userdir_ldap.py which asks for the

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

diff --git a/ud-host b/ud-host
index 2e72b7b..7fde4d2 100755 (executable)
--- a/ud-host
+++ b/ud-host
@@ -174,22 +174,10 @@ for (switch, val) in options:
       BindUser = "";
 
 if (BindUser != ""):
-   print "Accessing LDAP entry",
-if (BindUser != User):
-   if (BindUser != ""):
-      print "as '" + BindUser + "'";
+   l = passwdAccessLDAP(LDAPServer, BaseDn, BindUser)
 else:
-   print;
-if (BindUser != ""):
-   Password = getpass(BindUser + "'s password: ");
-
-# Connect to the ldap server
-l = ldap.open(LDAPServer);
-UserDn = "uid=" + BindUser + "," + BaseDn;
-if (BindUser != ""):
-   l.simple_bind_s(UserDn,Password);
-else:
-   l.simple_bind_s("","");
+   l = ldap.open(LDAPServer);
+   l.simple_bind_s("","")
 
 HBaseDn = "ou=hosts,dc=debian,dc=org";
 HostDn = "host=" + Host + "," + HBaseDn;
@@ -247,7 +235,7 @@ while(1):
       if NewHost == "":
          continue;
       Dn = "host=" + NewHost + "," + HBaseDn;
-      l.add_s(Dn,[("host",NewHost),
+      l.add_s(Dn,[("host", NewHost),
                   ("hostname", NewHostName),
                   ("objectClass", ("top", "debianServer"))]);