[packages/openldap] - removed outdated exchange hack
qboosh
qboosh at pld-linux.org
Sun Apr 5 18:35:20 CEST 2026
commit bd5fdd04627062ce6770617e7e6db1418cf65ede
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 5 18:35:45 2026 +0200
- removed outdated exchange hack
openldap-ntlm.diff | 199 -----------------------------------------------------
openldap.spec | 107 +---------------------------
2 files changed, 1 insertion(+), 305 deletions(-)
---
diff --git a/openldap.spec b/openldap.spec
index d2dc38d..09ea2c5 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -1,6 +1,5 @@
#
# Conditional build:
-%bcond_with exchange # hacked version of library for Evolution Exchange support
%bcond_with krb5 # MIT Kerberos instead of Heimdal
%bcond_without odbc # sql backend (deprecated)
%bcond_without perl # perl backend (deprecated)
@@ -52,8 +51,6 @@ Patch22: %{name}-am.patch
Patch24: %{name}-default_cacert_path.patch
Patch25: %{name}-system-lmdb.patch
Patch26: %{name}-slapd_for_symbols_check.patch
-# Patch for the evolution library
-Patch100: %{name}-ntlm.diff
URL: https://www.openldap.org/
BuildRequires: autoconf >= 2.69
BuildRequires: automake
@@ -91,9 +88,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _libexecdir %{_sbindir}
%define _localstatedir /var/lib
%define schemadir %{_datadir}/openldap/schema
-%define evolution_exchange_prefix %{_libdir}/evolution-openldap
-%define evolution_exchange_includedir %{evolution_exchange_prefix}/include
-%define evolution_exchange_libdir %{evolution_exchange_prefix}/lib
%description
LDAP servers and clients, as well as interfaces to other protocols.
@@ -164,7 +158,7 @@ Requires: krb5-devel%{?_isa}
%else
Requires: heimdal-devel%{?_isa}
%endif
-%{!?with_exchange:Obsoletes: openldap-evolution-devel}
+Obsoletes: openldap-evolution-devel < 2.5
%description devel
Header files and libraries for developing applications that use LDAP.
@@ -227,18 +221,6 @@ Header files for developing OpenLDAP modules.
%description headers -l pl.UTF-8
Pliki nagłówkowe konieczne do rozwoju modułów OpenLDAP.
-%package evolution-devel
-Summary: LDAP NTLM hack for the evolution-exchange
-Summary(pl.UTF-8): Hack NTLM dla pakietu evolution-exchange
-Group: Development/Libraries
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-
-%description evolution-devel
-LDAP NTLM hack for the evolution-exchange.
-
-%description evolution-devel -l pl.UTF-8
-Hack NTLM dla pakietu evolution-exchange.
-
%package ldapc++
Summary: LDAPv3 C++ Class Library
Summary(pl.UTF-8): Biblioteka klas C++ LDAPv3
@@ -1195,19 +1177,6 @@ Nakładka śledząca wywołania nakładek.
%endif
cd ..
-%if %{with exchange}
-# Set up a build tree for a static version of libldap with the hooks for the
-# non-standard NTLM bind type which is needed to connect to Win2k GC servers
-# (Win2k3 supports SASL with DIGEST-MD5, so this shouldn't be needed for those
-# servers, though as of version 1.4 the exchange doesn't try SASL first).
-if ! cp -al %{name} evo-%{name}; then
- rm -rf evo-%{name}
- cp -a %{name} evo-%{name}
-fi
-cd evo-%{name}
-%patch -P100 -p0
-%endif
-
%build
CPPFLAGS="%{rpmcppflags}"
CFLAGS="%{rpmcflags} $CPPFLAGS -D_REENTRANT -fPIC -D_GNU_SOURCE"
@@ -1291,60 +1260,6 @@ cd contrib/ldapc++
%{__make}
%endif
-%if %{with exchange}
-# Build evolution-specific clients just as we would normal clients,
-# except with a different installation directory in mind
-# and no shared libraries.
-cd ../../../evo-%{name}
-
-%{__libtoolize} --install
-%{__aclocal}
-%{__autoconf}
-%configure \
- --includedir=%{evolution_exchange_includedir} \
- --libdir=%{evolution_exchange_libdir} \
- --disable-dynamic \
- --disable-slapd \
- --disable-shared \
- --enable-static \
- --enable-syslog \
- --enable-ipv6 \
- --enable-local \
- --enable-dynacl \
- --enable-aci \
- --enable-crypt \
- --enable-lmpasswd \
- --enable-modules \
- --enable-rewrite \
- --enable-rlookups \
- --enable-slapi \
-%if %{with sasl}
- --with-cyrus-sasl \
- --enable-spasswd \
-%else
- --without-cyrus-sasl \
-%endif
-%if %{with slp}
- --enable-slp \
-%else
- --disable-slp \
-%endif
- --enable-wrappers \
- --enable-backends=no \
- --enable-overlays=no \
-%if %{with odbc}
- --with-odbc=unixodbc \
-%endif
- --with-threads \
- --with-tls \
- --with-yielding-select \
- --with-mp=longlong
-# --with-gssapi currently not supported
-
-%{__make} -j1 depend
-%{__make}
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},/var/lib/openldap-data} \
@@ -1352,15 +1267,6 @@ install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},/var/lib/openldap-data}
$RPM_BUILD_ROOT/var/run/{slapd,nslcd} \
$RPM_BUILD_ROOT%{systemdtmpfilesdir}
-%if %{with exchange}
-# Install evolution hack first and remove everything but devel stuff
-%{__make} -C evo-%{name} install \
- DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -r $RPM_BUILD_ROOT{%{_sysconfdir}/openldap,%{_bindir},%{_mandir}}/*
-%{__rm} $RPM_BUILD_ROOT%{evolution_exchange_libdir}/*.la
-cp -p %{SOURCE100} $RPM_BUILD_ROOT%{evolution_exchange_prefix}/README.evolution
-%endif
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -1841,17 +1747,6 @@ fi
%defattr(644,root,root,755)
%{_includedir}/%{name}
-%if %{with exchange}
-%files evolution-devel
-%defattr(644,root,root,755)
-%dir %{evolution_exchange_prefix}
-%dir %{evolution_exchange_includedir}
-%dir %{evolution_exchange_libdir}
-%{evolution_exchange_prefix}/README*
-%{evolution_exchange_includedir}/*.h
-%{evolution_exchange_libdir}/*.a
-%endif
-
%if %{with sasl}
%files ldapc++
%defattr(644,root,root,755)
diff --git a/openldap-ntlm.diff b/openldap-ntlm.diff
deleted file mode 100644
index 37e9ed7..0000000
--- a/openldap-ntlm.diff
+++ /dev/null
@@ -1,199 +0,0 @@
-(Note that this patch is not useful on its own... it just adds some
-hooks to work with the LDAP authentication process at a lower level
-than the API otherwise allows. The code that calls these hooks and
-actually drives the NTLM authentication process is in
-lib/e2k-global-catalog.c, and the code that actually implements the
-NTLM algorithms is in xntlm/.)
-
-This is a patch against OpenLDAP 2.2.6. Apply with -p0
-
-
---- include/ldap.h.orig 2004-01-01 13:16:28.000000000 -0500
-+++ include/ldap.h 2004-07-14 11:58:49.000000000 -0400
-@@ -1753,5 +1753,26 @@
- LDAPControl **cctrls ));
-
-
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge));
-+
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
---- libraries/libldap/Makefile.in.orig 2004-01-01 13:16:29.000000000 -0500
-+++ libraries/libldap/Makefile.in 2004-07-14 13:37:23.000000000 -0400
-@@ -20,7 +20,7 @@
- SRCS = 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 gssapi.c sbind.c unbind.c cancel.c \
-+ sasl.c gssapi.c ntlm.c sbind.c unbind.c cancel.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 = 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 gssapi.lo sbind.lo unbind.lo cancel.lo \
-+ sasl.lo gssapi.lo ntlm.lo sbind.lo unbind.lo cancel.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 \
---- /dev/null 2004-06-30 15:04:37.000000000 -0400
-+++ libraries/libldap/ntlm.c 2004-07-14 13:44:18.000000000 -0400
-@@ -0,0 +1,137 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp )
-+{
-+ BerElement *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+ id, LDAP_REQ_BIND,
-+ ld->ld_version, dn, tag,
-+ cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+ ld->ld_errno = LDAP_ENCODING_ERROR;
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+ return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+ return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+ LDAP_FREE( ld->ld_error );
-+ ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+ LDAP_FREE( ld->ld_matched );
-+ ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+ &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+ ld->ld_errno = LDAP_DECODING_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openldap.git/commitdiff/bd5fdd04627062ce6770617e7e6db1418cf65ede
More information about the pld-cvs-commit
mailing list