ud-info: Fix regression from r493: When we log in as admin user and modify

another user we got shown that other user but all changes would be made against
our own record.

diff --git a/debian/changelog b/debian/changelog
index 11e8c9a..1be7816 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+userdir-ldap (0.3.58) unstable; urgency=low
+
+  * ud-info: Fix regression from r493: When we log in as admin user and modify
+    another user we got shown that other user but all changes would be made
+    against our own record.
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 19 Dec 2008 09:25:20 +0100
+
 userdir-ldap (0.3.57) unstable; urgency=low
 
   * In ud-mailgate use an empty envelope from when sending error messages.

diff --git a/ud-info b/ud-info
index 8842e05..8b9618b 100755 (executable)
--- a/ud-info
+++ b/ud-info
@@ -351,14 +351,15 @@ else:
 
 # Connect to the ldap server
 l = connectLDAP()
+UserDn = "uid=" + User + "," + BaseDn
 if (BindUser != ""):
    Password = getpass.getpass(BindUser + "'s password: ")
-   UserDn = "uid=" + BindUser + "," + BaseDn
+   BindUserDn = "uid=" + BindUser + "," + BaseDn
 else:
    Password = ""
-   UserDn = ""
+   BindUserDn = ""
 try:
-   l.simple_bind_s(UserDn,Password)
+   l.simple_bind_s(BindUserDn,Password)
 except ldap.LDAPError,e:
    print >> sys.stderr, "LDAP error:", e.args[0]['desc']
    print >> sys.stderr, "           ", e.args[0]['info']