From: joey <>
Date: Sun, 21 Nov 2004 11:03:24 +0000 (+0000)
Subject: Use the common routine from userdir_ldap.py which asks for the
X-Git-Tag: debian_userdir-ldap_0-3-8~26
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=81248cee1a829786b261289d37117ce55f708766

Use the common routine from userdir_ldap.py which asks for the
AdminUser  password and checks if access if granted to the LDAP
server.
---

diff --git a/ud-host b/ud-host
index 1eb8d76..7fde4d2 100755
--- 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;