Thu Oct 10 05:33:49 UTC 2013

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to annotated tag 2.1.30-10
in repository openldap.

commit e242a675bec2fdc032208924671925cc301fa278
Author: Torsten Landschoff <torsten at debian.org>
Date:   Mon May 30 12:31:50 2005 +0000

     r2088 at pulsar:  torsten | 2005-05-30 08:45:35 +0200
      * Copy libldap_r to libldap instead of using symlinks. Means 200kByte more
        of disk usage and less problems I hope.
      * Apply patch by Steven Ihde to fix libldap NTLM integration (and correct
        the libldap_r Makefile.in as well) (closes: #305559).
     r2096 at pulsar:  torsten | 2005-05-30 10:23:35 +0200
      * Revert the last change and have symlinks of the library again. Consensus
        on #debian-devel was that having the same library in two files is a
        recipe for disaster.
     r2097 at pulsar:  torsten | 2005-05-30 10:38:47 +0200
      * debian/libldap2.postinst: Improve the removal of old libraries to
        catch more cases which might occur.
     r2098 at pulsar:  torsten | 2005-05-30 11:08:30 +0200
     Fix typos
---
 debian/changelog                |   19 +++++++++++++++++++
 debian/libldap2.postinst        |   14 ++++++++++++--
 debian/move_files               |    1 -
 libraries/libldap/Makefile.in   |    2 +-
 libraries/libldap/ntlm.c        |   12 ++++++++----
 libraries/libldap_r/Makefile.in |    4 ++--
 6 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 540d9fe..cebea24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+openldap2 (2.1.30-10) unstable; urgency=low
+
+  * Apply patch by Steven Ihde to fix libldap NTLM integration (and correct
+    the libldap_r Makefile.in as well) (closes: #305559).
+  * Revert the last change and have symlinks of the library again. Consensus
+    on #debian-devel was that having the same library in two files is a 
+    recipe for disaster.
+  * debian/libldap2.postinst: Improve the removal of old libraries to 
+    catch more cases which might occur.
+
+ -- Torsten Landschoff <torsten at debian.org>  Mon, 30 May 2005 10:22:52 +0200
+
+openldap2 (2.1.30-9) unstable; urgency=low
+
+  * Copy libldap_r to libldap instead of using symlinks. Means 200kByte more
+    of disk usage and less problems I hope.
+
+ -- Torsten Landschoff <torsten at debian.org>  Sun, 29 May 2005 19:03:46 +0200
+
 openldap2 (2.1.30-8) unstable; urgency=low
 
   * Steve Langasek <vorlon at debian.org>
diff --git a/debian/libldap2.postinst b/debian/libldap2.postinst
index b1cfb1e..9d96133 100644
--- a/debian/libldap2.postinst
+++ b/debian/libldap2.postinst
@@ -1,8 +1,18 @@
 #!/bin/sh -e
 
+kill_old_libraries() {
+	local base lib
+	base="$1"
+	
+	for lib in /usr/lib/lib$base.so.2.0.[0-9][0-9]; do
+		rm -f $lib
+	done
+}
+
 if [ "$1" = "configure" ]; then
-	rm -f /usr/lib/libldap.so.2.0.15 /usr/lib/libldap_r.so.2.0.15 \
-	      /usr/lib/liblber.so.2.0.15
+	for l in ldap ldap_r lber; do 
+		kill_old_libraries $l
+	done
 fi
 
 #DEBHELPER#
diff --git a/debian/move_files b/debian/move_files
index 4a7e5d4..3dd20b4 100644
--- a/debian/move_files
+++ b/debian/move_files
@@ -68,7 +68,6 @@ echo -n "Installing: $target"
 install_stuff etc/ldap/ldap*.conf
 install_stuff usr/share/man/man5/ldap.conf*
 ( cd debian/tmp/usr/lib && \
-  	  ln -sf libldap_r.so.? libldap.so.? && \
   	  ln -sf libldap_r.so.?.?.??? libldap.so.?.?.???
 )
 install_stuff usr/lib/*.so.*
diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 5b8e1e0..27aac7b 100644
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -21,7 +21,7 @@ SRCS	= bind.c open.c result.c error.c compare.c search.c \
 OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
 	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
-	sasl.lo sbind.lo kbind.lo unbind.lo cancel.lo cache.lo \
+	sasl.lo sbind.lo kbind.lo ntlm.lo unbind.lo cancel.lo cache.lo \
 	filter.lo free.lo sort.lo passwd.lo whoami.lo \
 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
 	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
diff --git a/libraries/libldap/ntlm.c b/libraries/libldap/ntlm.c
index e0734d5..3f0e854 100644
--- a/libraries/libldap/ntlm.c
+++ b/libraries/libldap/ntlm.c
@@ -30,7 +30,6 @@ ldap_ntlm_bind(
 {
 	BerElement	*ber;
 	int rc;
-	ber_int_t id;
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
 
@@ -51,9 +50,8 @@ ldap_ntlm_bind(
 
 	assert( LBER_VALID( ber ) );
 
-	LDAP_NEXT_MSGID( ld, id );
 	rc = ber_printf( ber, "{it{istON}" /*}*/,
-			 id, LDAP_REQ_BIND,
+			 ++ld->ld_msgid, LDAP_REQ_BIND,
 			 ld->ld_version, dn, tag,
 			 cred );
 
@@ -69,8 +67,14 @@ ldap_ntlm_bind(
 		return ld->ld_errno;
 	}
 
+#ifndef LDAP_NOCACHE
+	if ( ld->ld_cache != NULL ) {
+		ldap_flush_cache( ld );
+	}
+#endif /* !LDAP_NOCACHE */
+
 	/* send the message */
-	*msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
+	*msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber );
 
 	if(*msgidp < 0)
 		return ld->ld_errno;
diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
index bda415a..d7546c3 100644
--- a/libraries/libldap_r/Makefile.in
+++ b/libraries/libldap_r/Makefile.in
@@ -13,7 +13,7 @@ XXSRCS    = apitest.c test.c \
 	bind.c open.c result.c error.c compare.c search.c \
 	controls.c messages.c references.c extended.c cyrus.c \
 	modify.c add.c modrdn.c delete.c abandon.c \
-	sasl.c sbind.c kbind.c unbind.c cancel.c cache.c \
+	sasl.c sbind.c kbind.c ntlm.c unbind.c cancel.c cache.c \
 	filter.c free.c sort.c passwd.c whoami.c \
 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
 	request.c os-ip.c url.c sortctrl.c vlvctrl.c \
@@ -29,7 +29,7 @@ OBJS	= threads.lo rdwr.lo tpool.lo  \
 	bind.lo open.lo result.lo error.lo compare.lo search.lo \
 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
 	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
-	sasl.lo sbind.lo kbind.lo unbind.lo cancel.lo cache.lo \
+	sasl.lo sbind.lo kbind.lo ntlm.lo unbind.lo cancel.lo cache.lo \
 	filter.lo free.lo sort.lo passwd.lo whoami.lo \
 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
 	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git

