diff options
Diffstat (limited to 'abs/core/libldap')
-rw-r--r-- | abs/core/libldap/PKGBUILD | 62 | ||||
-rw-r--r-- | abs/core/libldap/ntlm.patch | 189 | ||||
-rw-r--r-- | abs/core/libldap/peercred.patch | 11 |
3 files changed, 262 insertions, 0 deletions
diff --git a/abs/core/libldap/PKGBUILD b/abs/core/libldap/PKGBUILD new file mode 100644 index 0000000..616e6a3 --- /dev/null +++ b/abs/core/libldap/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 1627 2008-05-14 03:02:30Z eric $ +# Maintainer: Judd Vinet <jvinet@zeroflux.org> +pkgname=libldap +pkgver=2.4.11 +pkgrel=1 +pkgdesc="LDAP client libraries" +arch=(i686 x86_64) +license=('custom') +url="http://www.openldap.org/" +backup=(etc/openldap/ldap.conf) +depends=('libsasl' 'openssl>=0.9.8f') +options=('!libtool' '!makeflags') +makedepends=('tcp_wrappers') +source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz + ntlm.patch + peercred.patch) + +build() { + cd ${startdir}/src/openldap-${pkgver} +# patch -Np0 -i ${startdir}/src/ntlm.patch || return 1 + patch -Np0 -i ${startdir}/src/peercred.patch || return 1 + + ./configure --prefix=/usr \ + --libexecdir=/usr/sbin \ + --sysconfdir=/etc \ + --localstatedir=/var/lib/openldap \ + --enable-crypt --enable-dynamic \ + --with-threads --enable-wrappers \ + --enable-spasswd --with-cyrus-sasl \ + --disable-bdb --disable-hdb + cd include + make || return 1 + make DESTDIR=${startdir}/pkg install + + cd ../libraries + make depend + make || return 1 + + make DESTDIR=${startdir}/pkg install + + cd ../doc/man/man3 + make + make DESTDIR=${startdir}/pkg install + + cd ../man5 + make + mkdir -p ${startdir}/pkg/usr/man/man5 + install -m644 ldap.conf.5.tmp ${startdir}/pkg/usr/man/man5/ldap.conf.5 + + # get rid of duplicate default conf files + rm ${startdir}/pkg/etc/openldap/*.default + + ln -sf liblber.so ${startdir}/pkg/usr/lib/liblber.so.2 + ln -sf libldap.so ${startdir}/pkg/usr/lib/libldap.so.2 + + mkdir -p ${startdir}/pkg/usr/share/licenses/openldap + install -m644 ${startdir}/src/openldap-${pkgver}/LICENSE \ + ${startdir}/pkg/usr/share/licenses/openldap/ +} +md5sums=('920fedbbb5bc61c2ca52c56edeef770a' + '64c539d5f01f46f329b9d5c1324be4e9' + 'acc4112845522a6a1a517064c216f781') diff --git a/abs/core/libldap/ntlm.patch b/abs/core/libldap/ntlm.patch new file mode 100644 index 0000000..fca806b --- /dev/null +++ b/abs/core/libldap/ntlm.patch @@ -0,0 +1,189 @@ +--- 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 sbind.c kbind.c unbind.c cancel.c \ ++ sasl.c ntlm.c sbind.c kbind.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 sbind.lo kbind.lo unbind.lo cancel.lo \ ++ sasl.lo ntlm.lo sbind.lo kbind.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 1970-01-01 01:00:00.000000000 +0100 ++++ libraries/libldap/ntlm.c 2005-12-02 09:47:08.226364500 +0100 +@@ -0,0 +1,138 @@ ++/* $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 ); ++} ++ +--- include/ldap.h.orig ++++ include/ldap.h +@@ -2115,5 +2115,25 @@ + ldap_passwordpolicy_err2txt LDAP_P(( LDAPPasswordPolicyError )); + #endif /* LDAP_CONTROL_PASSWORDPOLICYREQUEST */ + ++/* ++ * 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 */ diff --git a/abs/core/libldap/peercred.patch b/abs/core/libldap/peercred.patch new file mode 100644 index 0000000..7d159b7 --- /dev/null +++ b/abs/core/libldap/peercred.patch @@ -0,0 +1,11 @@ +--- ./libraries/liblutil/getpeereid.c 2008-02-12 00:24:13.000000000 +0100 ++++ ./libraries/liblutil/getpeereid.c 2008-06-12 12:55:34.000000000 +0200 +@@ -14,6 +14,8 @@ + * <http://www.OpenLDAP.org/license.html>. + */ + ++#define _GNU_SOURCE ++ + #include "portable.h" + + #ifndef HAVE_GETPEEREID |