Your message dated Tue, 15 Apr 2014 10:47:07 -0700
with message-id
<CAMXH3QBG=mdbuqybksblgdrd213oyhflpyymbgw9-iustmh...@mail.gmail.com>
and subject line ntlm.c linkage fixed in 2.1.30-10
has caused the Debian Bug report #305713,
regarding openldap2: ntlm.lo not linked into libldap.so
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
305713: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=305713
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: openldap2
Severity: normal
Tags: patch
Although ntlm.c is added to the sources and (partially) included in the
build process, the task is only partially done.
Thus ntlm.lo is not linked into libldap.so and its functions can
therefore not be used.
The attached patch fixes it: it completes the inclusion in the build
process and makes ntlm.c compile by backporting a macro from OL 2.2
and changing the number of arguments a function is called with.
Have fun
Peter
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.10-1-k7
Locale: LANG=de_DE@euro, LC_CTYPE=de_DE@euro (charmap=ISO-8859-15)
# complete inclusion of ntlm.c into libldap.so
--- libraries/libldap/Makefile.in
+++ libraries/libldap/Makefile.in
@@ -20,7 +20,7 @@
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 \
--- libraries/libldap/ldap-int.h
+++ libraries/libldap/ldap-int.h
@@ -322,6 +322,15 @@
#endif
#endif
+#ifdef LDAP_R_COMPILE
+#define LDAP_NEXT_MSGID(ld, id) \
+ ldap_pvt_thread_mutex_lock( &(ld)->ld_req_mutex ); \
+ id = ++(ld)->ld_msgid; \
+ ldap_pvt_thread_mutex_unlock( &(ld)->ld_req_mutex )
+#else
+#define LDAP_NEXT_MSGID(ld, id) id = ++(ld)->ld_msgid
+#endif
+
/*
* in init.c
*/
--- libraries/libldap/ntlm.c
+++ libraries/libldap/ntlm.c
@@ -70,7 +70,7 @@
}
/* 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;
--- End Message ---
--- Begin Message ---
Version: 2.1.30-10
Hi Peter,
Thanks for reporting this bug, long ago, and including the patch.
This looks to me like the same problem that was reported in #305559
and fixed (by a slightly different patch) in the upload of 2.1.30-10.
I'm not able to actually test the NTLM support, but as far as I know
it's been working all this time.
thanks,
Ryan
--- End Message ---
