[Da-tools-commits] ./debian/userdir-ldap r500: ud-info: Fix regression from r493: When we log in as admin user and modify

[Peter Palfrader]

------------------------------------------------------------
revno: 500
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Fri 2008-12-19 09:25:50 +0100
message:
  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.
modified:
  debian/changelog
  ud-info
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-12-18 09:04:19 +0000
+++ b/debian/changelog	2008-12-19 08:25:50 +0000
@@ -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 at 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.

=== modified file 'ud-info'
--- a/ud-info	2008-12-14 01:56:40 +0000
+++ b/ud-info	2008-12-19 08:25:50 +0000
@@ -351,14 +351,15 @@
 
 # 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']