[Pkg-openldap-devel] r617 - in openldap/trunk-2.3/debian: . patches
Matthijs Mohlmann
active2-guest at costa.debian.org
Thu Dec 29 23:35:16 UTC 2005
Author: active2-guest
Date: 2005-12-29 23:35:16 +0000 (Thu, 29 Dec 2005)
New Revision: 617
Added:
openldap/trunk-2.3/debian/patches/add-autogen-sh
openldap/trunk-2.3/debian/patches/libldap-makefile_in
openldap/trunk-2.3/debian/patches/man-slapd
openldap/trunk-2.3/debian/patches/ntlm-ldap_h-hack
openldap/trunk-2.3/debian/patches/ntlm_c
openldap/trunk-2.3/debian/patches/series
openldap/trunk-2.3/debian/patches/slurpd-in-spool
openldap/trunk-2.3/debian/patches/use-lpthreads
Removed:
openldap/trunk-2.3/debian/patches/00list
openldap/trunk-2.3/debian/patches/libldap-makefile_in.dpatch
openldap/trunk-2.3/debian/patches/man-slapd.dpatch
openldap/trunk-2.3/debian/patches/ntlm-ldap_h-hack.dpatch
openldap/trunk-2.3/debian/patches/ntlm_c.dpatch
openldap/trunk-2.3/debian/patches/slurpd-in-spool.dpatch
openldap/trunk-2.3/debian/patches/use-lpthreads.dpatch
Modified:
openldap/trunk-2.3/debian/control
openldap/trunk-2.3/debian/rules
Log:
* Moved to quilt
* Added a Build-Dependency to quilt
Modified: openldap/trunk-2.3/debian/control
===================================================================
--- openldap/trunk-2.3/debian/control 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/control 2005-12-29 23:35:16 UTC (rev 617)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenLDAP Maintainers <pkg-openldap-devel at lists.alioth.debian.org>
Uploaders: Roland Bauerschmidt <rb at debian.org>, Stephen Frost <sfrost at debian.org>, Steve Langasek <vorlon at debian.org>, Torsten Landschoff <torsten at debian.org>, Matthijs Mohlmann <matthijs at cacholong.nl>, Russ Allbery <rra at debian.org>
-Build-Depends: libdb4.2-dev, libwrap0-dev, libiodbc2-dev, libsasl2-dev (>= 2.1.18-1), dpkg-dev (>= 1.7.1), libncurses5-dev, debconf-utils, debhelper (>= 4.1.16), libltdl3-dev (>= 1.4.3), libslp-dev, po-debconf, libssl-dev (>= 0.9.7), libperl-dev (>= 5.8.0)
+Build-Depends: libdb4.2-dev, libwrap0-dev, libiodbc2-dev, libsasl2-dev (>= 2.1.18-1), dpkg-dev (>= 1.7.1), libncurses5-dev, debconf-utils, debhelper (>= 4.1.16), libltdl3-dev (>= 1.4.3), libslp-dev, po-debconf, libssl-dev (>= 0.9.7), libperl-dev (>= 5.8.0), quilt
Build-Conflicts: libbind-dev, bind-dev
Standards-Version: 3.6.2.1
Deleted: openldap/trunk-2.3/debian/patches/00list
===================================================================
--- openldap/trunk-2.3/debian/patches/00list 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/patches/00list 2005-12-29 23:35:16 UTC (rev 617)
@@ -1,7 +0,0 @@
-# patches to apply
-man-slapd.dpatch
-ntlm-ldap_h-hack.dpatch
-libldap-makefile_in.dpatch
-ntlm_c.dpatch
-use-lpthreads.dpatch
-slurpd-in-spool.dpatch
Added: openldap/trunk-2.3/debian/patches/add-autogen-sh
===================================================================
--- openldap/trunk-2.3/debian/patches/add-autogen-sh 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/patches/add-autogen-sh 2005-12-29 23:35:16 UTC (rev 617)
@@ -0,0 +1,33 @@
+diff -urNad openldap2.3-2.3.11~/autogen.sh openldap2.3-2.3.11/autogen.sh
+--- openldap2.3-2.3.11~/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ openldap2.3-2.3.11/autogen.sh 2005-12-24 16:37:21.693602500 +0100
+@@ -0,0 +1,29 @@
++#!/bin/sh
++#
++# autogen.sh
++
++LIBTOOL=`which libtoolize`
++AUTOCONF=`which autoconf`
++ACLOCAL=`which aclocal-1.9`
++
++if [ ! -x $LIBTOOL ]; then
++ echo "libtool doesn't exist! Please install libtool"
++ exit 1
++fi
++
++if [ ! -x $ACLOCAL ]; then
++ echo "aclocal doesn't exist! Please install automake1.9"
++ exit 1
++fi
++
++if [ ! -x $AUTOCONF ]; then
++ echo "autoconf doesn't exist! Please install autoconf"
++ exit 1
++fi
++
++$LIBTOOL --copy --force
++$ACLOCAL
++$AUTOCONF
++
++exit 0
++
Property changes on: openldap/trunk-2.3/debian/patches/add-autogen-sh
___________________________________________________________________
Name: svn:executable
+ *
Copied: openldap/trunk-2.3/debian/patches/libldap-makefile_in (from rev 615, openldap/trunk-2.3/debian/patches/libldap-makefile_in.dpatch)
===================================================================
--- openldap/trunk-2.3/debian/patches/libldap-makefile_in.dpatch 2005-12-24 13:42:30 UTC (rev 615)
+++ openldap/trunk-2.3/debian/patches/libldap-makefile_in 2005-12-29 23:35:16 UTC (rev 617)
@@ -0,0 +1,51 @@
+diff -urNad openldap2.3-2.3.11~/libraries/libldap/Makefile.in openldap2.3-2.3.11/libraries/libldap/Makefile.in
+--- openldap2.3-2.3.11~/libraries/libldap/Makefile.in 2005-12-01 13:48:50.000000000 +0100
++++ openldap2.3-2.3.11/libraries/libldap/Makefile.in 2005-12-02 10:04:11.513209500 +0100
+@@ -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 \
+@@ -31,7 +31,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 \
+diff -urNad openldap2.3-2.3.11~/libraries/libldap_r/Makefile.in openldap2.3-2.3.11/libraries/libldap_r/Makefile.in
+--- openldap2.3-2.3.11~/libraries/libldap_r/Makefile.in 2005-12-01 13:48:50.000000000 +0100
++++ openldap2.3-2.3.11/libraries/libldap_r/Makefile.in 2005-12-02 10:05:17.637342000 +0100
+@@ -22,7 +22,7 @@
+ 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 \
+@@ -38,7 +38,7 @@
+ 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 \
+@@ -56,7 +56,7 @@
+ XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
+ XXXLIBS = $(LTHREAD_LIBS)
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+-UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
++UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
+
+ .links : Makefile
+ @for i in $(XXSRCS); do \
Deleted: openldap/trunk-2.3/debian/patches/libldap-makefile_in.dpatch
===================================================================
--- openldap/trunk-2.3/debian/patches/libldap-makefile_in.dpatch 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/patches/libldap-makefile_in.dpatch 2005-12-29 23:35:16 UTC (rev 617)
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## libldap-makefile_in.dpatch by Matthijs Mohlmann <matthijs at cacholong.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad openldap2.3-2.3.11~/libraries/libldap/Makefile.in openldap2.3-2.3.11/libraries/libldap/Makefile.in
---- openldap2.3-2.3.11~/libraries/libldap/Makefile.in 2005-12-01 13:48:50.000000000 +0100
-+++ openldap2.3-2.3.11/libraries/libldap/Makefile.in 2005-12-02 10:04:11.513209500 +0100
-@@ -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 \
-@@ -31,7 +31,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 \
-diff -urNad openldap2.3-2.3.11~/libraries/libldap_r/Makefile.in openldap2.3-2.3.11/libraries/libldap_r/Makefile.in
---- openldap2.3-2.3.11~/libraries/libldap_r/Makefile.in 2005-12-01 13:48:50.000000000 +0100
-+++ openldap2.3-2.3.11/libraries/libldap_r/Makefile.in 2005-12-02 10:05:17.637342000 +0100
-@@ -22,7 +22,7 @@
- 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 \
-@@ -38,7 +38,7 @@
- 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 \
-@@ -56,7 +56,7 @@
- XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
- XXXLIBS = $(LTHREAD_LIBS)
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
--UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
-
- .links : Makefile
- @for i in $(XXSRCS); do \
Copied: openldap/trunk-2.3/debian/patches/man-slapd (from rev 615, openldap/trunk-2.3/debian/patches/man-slapd.dpatch)
===================================================================
--- openldap/trunk-2.3/debian/patches/man-slapd.dpatch 2005-12-24 13:42:30 UTC (rev 615)
+++ openldap/trunk-2.3/debian/patches/man-slapd 2005-12-29 23:35:16 UTC (rev 617)
@@ -0,0 +1,14 @@
+diff -urNad openldap2.3-2.3.11~/doc/man/man8/slapd.8 openldap2.3-2.3.11/doc/man/man8/slapd.8
+--- openldap2.3-2.3.11~/doc/man/man8/slapd.8 2005-12-01 13:48:49.000000000 +0100
++++ openldap2.3-2.3.11/doc/man/man8/slapd.8 2005-12-01 15:49:26.415888750 +0100
+@@ -85,7 +85,9 @@
+ will not fork or disassociate from the invoking terminal. Some general
+ operation and status messages are printed for any value of \fIdebug\-level\fP.
+ \fIdebug\-level\fP is taken as a bit string, with each bit corresponding to a
+-different kind of debugging information. See <ldap.h> for details.
++different kind of debugging information. The meaning is the same as for
++the \fBloglevel\fP configuration option documented in
++.BR slapd.conf (5).
+ Remember that if you turn on packet logging, packets containing bind passwords
+ will be output, so if you redirect the log to a logfile, that file should
+ be read-protected.
Deleted: openldap/trunk-2.3/debian/patches/man-slapd.dpatch
===================================================================
--- openldap/trunk-2.3/debian/patches/man-slapd.dpatch 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/patches/man-slapd.dpatch 2005-12-29 23:35:16 UTC (rev 617)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## man-slapd.dpatch by Matthijs Mohlmann <matthijs at cacholong.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad openldap2.3-2.3.11~/doc/man/man8/slapd.8 openldap2.3-2.3.11/doc/man/man8/slapd.8
---- openldap2.3-2.3.11~/doc/man/man8/slapd.8 2005-12-01 13:48:49.000000000 +0100
-+++ openldap2.3-2.3.11/doc/man/man8/slapd.8 2005-12-01 15:49:26.415888750 +0100
-@@ -85,7 +85,9 @@
- will not fork or disassociate from the invoking terminal. Some general
- operation and status messages are printed for any value of \fIdebug\-level\fP.
- \fIdebug\-level\fP is taken as a bit string, with each bit corresponding to a
--different kind of debugging information. See <ldap.h> for details.
-+different kind of debugging information. The meaning is the same as for
-+the \fBloglevel\fP configuration option documented in
-+.BR slapd.conf (5).
- Remember that if you turn on packet logging, packets containing bind passwords
- will be output, so if you redirect the log to a logfile, that file should
- be read-protected.
Copied: openldap/trunk-2.3/debian/patches/ntlm-ldap_h-hack (from rev 615, openldap/trunk-2.3/debian/patches/ntlm-ldap_h-hack.dpatch)
===================================================================
--- openldap/trunk-2.3/debian/patches/ntlm-ldap_h-hack.dpatch 2005-12-24 13:42:30 UTC (rev 615)
+++ openldap/trunk-2.3/debian/patches/ntlm-ldap_h-hack 2005-12-29 23:35:16 UTC (rev 617)
@@ -0,0 +1,29 @@
+diff -urNad openldap2.3-2.3.11~/include/ldap.h openldap2.3-2.3.11/include/ldap.h
+--- openldap2.3-2.3.11~/include/ldap.h 2005-12-01 13:48:43.000000000 +0100
++++ openldap2.3-2.3.11/include/ldap.h 2005-12-01 15:55:15.159144250 +0100
+@@ -2097,5 +2097,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 */
Deleted: openldap/trunk-2.3/debian/patches/ntlm-ldap_h-hack.dpatch
===================================================================
--- openldap/trunk-2.3/debian/patches/ntlm-ldap_h-hack.dpatch 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/patches/ntlm-ldap_h-hack.dpatch 2005-12-29 23:35:16 UTC (rev 617)
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ntlm-ldap_h-hack.dpatch by Matthijs Mohlmann <matthijs at cacholong.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad openldap2.3-2.3.11~/include/ldap.h openldap2.3-2.3.11/include/ldap.h
---- openldap2.3-2.3.11~/include/ldap.h 2005-12-01 13:48:43.000000000 +0100
-+++ openldap2.3-2.3.11/include/ldap.h 2005-12-01 15:55:15.159144250 +0100
-@@ -2097,5 +2097,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 */
Copied: openldap/trunk-2.3/debian/patches/ntlm_c (from rev 615, openldap/trunk-2.3/debian/patches/ntlm_c.dpatch)
===================================================================
--- openldap/trunk-2.3/debian/patches/ntlm_c.dpatch 2005-12-24 13:42:30 UTC (rev 615)
+++ openldap/trunk-2.3/debian/patches/ntlm_c 2005-12-29 23:35:16 UTC (rev 617)
@@ -0,0 +1,142 @@
+diff -urNad openldap2.3-2.3.11~/libraries/libldap/ntlm.c openldap2.3-2.3.11/libraries/libldap/ntlm.c
+--- openldap2.3-2.3.11~/libraries/libldap/ntlm.c 1970-01-01 01:00:00.000000000 +0100
++++ openldap2.3-2.3.11/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 );
++}
++
Deleted: openldap/trunk-2.3/debian/patches/ntlm_c.dpatch
===================================================================
--- openldap/trunk-2.3/debian/patches/ntlm_c.dpatch 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/patches/ntlm_c.dpatch 2005-12-29 23:35:16 UTC (rev 617)
@@ -1,149 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ntlm_c.dpatch by Matthijs Mohlmann <matthijs at cacholong.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad openldap2.3-2.3.11~/libraries/libldap/ntlm.c openldap2.3-2.3.11/libraries/libldap/ntlm.c
---- openldap2.3-2.3.11~/libraries/libldap/ntlm.c 1970-01-01 01:00:00.000000000 +0100
-+++ openldap2.3-2.3.11/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 );
-+}
-+
Added: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/patches/series 2005-12-29 23:35:16 UTC (rev 617)
@@ -0,0 +1,7 @@
+man-slapd
+use-lpthreads
+slurpd-in-spool
+ntlm-ldap_h-hack
+ntlm_c
+libldap-makefile_in
+add-autogen-sh
Copied: openldap/trunk-2.3/debian/patches/slurpd-in-spool (from rev 615, openldap/trunk-2.3/debian/patches/slurpd-in-spool.dpatch)
===================================================================
--- openldap/trunk-2.3/debian/patches/slurpd-in-spool.dpatch 2005-12-24 13:42:30 UTC (rev 615)
+++ openldap/trunk-2.3/debian/patches/slurpd-in-spool 2005-12-29 23:35:16 UTC (rev 617)
@@ -0,0 +1,12 @@
+diff -urNad openldap2.3-2.3.11~/servers/slurpd/slurp.h openldap2.3-2.3.11/servers/slurpd/slurp.h
+--- openldap2.3-2.3.11~/servers/slurpd/slurp.h 2005-12-01 13:48:46.000000000 +0100
++++ openldap2.3-2.3.11/servers/slurpd/slurp.h 2005-12-02 11:22:47.856278500 +0100
+@@ -67,7 +67,7 @@
+ #define SERVICE_NAME OPENLDAP_PACKAGE "-slurpd"
+
+ /* Default directory for slurpd's private copy of replication logs */
+-#define DEFAULT_SLURPD_REPLICA_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-slurp"
++#define DEFAULT_SLURPD_REPLICA_DIR LDAP_RUNDIR LDAP_DIRSEP "/var/spool/slurpd"
+
+ /* Default name for slurpd's private copy of the replication log */
+ #define DEFAULT_SLURPD_REPLOGFILE "slurpd.replog"
Deleted: openldap/trunk-2.3/debian/patches/slurpd-in-spool.dpatch
===================================================================
--- openldap/trunk-2.3/debian/patches/slurpd-in-spool.dpatch 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/patches/slurpd-in-spool.dpatch 2005-12-29 23:35:16 UTC (rev 617)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## slurpd-in-spool.dpatch by Matthijs Mohlmann <matthijs at cacholong.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad openldap2.3-2.3.11~/servers/slurpd/slurp.h openldap2.3-2.3.11/servers/slurpd/slurp.h
---- openldap2.3-2.3.11~/servers/slurpd/slurp.h 2005-12-01 13:48:46.000000000 +0100
-+++ openldap2.3-2.3.11/servers/slurpd/slurp.h 2005-12-02 11:22:47.856278500 +0100
-@@ -67,7 +67,7 @@
- #define SERVICE_NAME OPENLDAP_PACKAGE "-slurpd"
-
- /* Default directory for slurpd's private copy of replication logs */
--#define DEFAULT_SLURPD_REPLICA_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-slurp"
-+#define DEFAULT_SLURPD_REPLICA_DIR LDAP_RUNDIR LDAP_DIRSEP "/var/spool/slurpd"
-
- /* Default name for slurpd's private copy of the replication log */
- #define DEFAULT_SLURPD_REPLOGFILE "slurpd.replog"
Copied: openldap/trunk-2.3/debian/patches/use-lpthreads (from rev 615, openldap/trunk-2.3/debian/patches/use-lpthreads.dpatch)
===================================================================
--- openldap/trunk-2.3/debian/patches/use-lpthreads.dpatch 2005-12-24 13:42:30 UTC (rev 615)
+++ openldap/trunk-2.3/debian/patches/use-lpthreads 2005-12-29 23:35:16 UTC (rev 617)
@@ -0,0 +1,11 @@
+diff -urNad openldap2.3-2.3.11~/configure.in openldap2.3-2.3.11/configure.in
+--- openldap2.3-2.3.11~/configure.in 2005-12-01 13:48:51.000000000 +0100
++++ openldap2.3-2.3.11/configure.in 2005-12-01 15:46:27.828727750 +0100
+@@ -1485,6 +1485,7 @@
+
+ dnl OL_PTHREAD_TRY([-mt], [ol_cv_pthread_mt])
+ OL_PTHREAD_TRY([-kthread], [ol_cv_pthread_kthread])
++ OL_PTHREAD_TRY([-lpthread], [ol_cv_pthread_lpthread])
+ OL_PTHREAD_TRY([-pthread], [ol_cv_pthread_pthread])
+ OL_PTHREAD_TRY([-pthreads], [ol_cv_pthread_pthreads])
+ OL_PTHREAD_TRY([-mthreads], [ol_cv_pthread_mthreads])
Deleted: openldap/trunk-2.3/debian/patches/use-lpthreads.dpatch
===================================================================
--- openldap/trunk-2.3/debian/patches/use-lpthreads.dpatch 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/patches/use-lpthreads.dpatch 2005-12-29 23:35:16 UTC (rev 617)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## use-lpthreads.dpatch by Matthijs Mohlmann <matthijs at cacholong.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad openldap2.3-2.3.11~/configure.in openldap2.3-2.3.11/configure.in
---- openldap2.3-2.3.11~/configure.in 2005-12-01 13:48:51.000000000 +0100
-+++ openldap2.3-2.3.11/configure.in 2005-12-01 15:46:27.828727750 +0100
-@@ -1485,6 +1485,7 @@
-
- dnl OL_PTHREAD_TRY([-mt], [ol_cv_pthread_mt])
- OL_PTHREAD_TRY([-kthread], [ol_cv_pthread_kthread])
-+ OL_PTHREAD_TRY([-lpthread], [ol_cv_pthread_lpthread])
- OL_PTHREAD_TRY([-pthread], [ol_cv_pthread_pthread])
- OL_PTHREAD_TRY([-pthreads], [ol_cv_pthread_pthreads])
- OL_PTHREAD_TRY([-mthreads], [ol_cv_pthread_mthreads])
Modified: openldap/trunk-2.3/debian/rules
===================================================================
--- openldap/trunk-2.3/debian/rules 2005-12-24 13:43:59 UTC (rev 616)
+++ openldap/trunk-2.3/debian/rules 2005-12-29 23:35:16 UTC (rev 617)
@@ -21,16 +21,20 @@
CONFIG = $(shell grep -v "^\#" debian/configure.options.new)
-rootdir := $(shell pwd)
-installdir := $(rootdir)/debian/install
-tmpdir := $(rootdir)/debian/tmp
-builddir := $(rootdir)/debian/build
+installdir := $(CURDIR)/debian/install
+tmpdir := $(CURDIR)/debian/tmp
+builddir := $(CURDIR)/debian/build
MAKEVARS := DESTDIR=$(installdir)
+# Include the quilt patch system.
+include /usr/share/quilt/quilt.make
+
$(builddir)/Makefile:
mkdir -p $(builddir)
- cd $(builddir) && CFLAGS="$(CFLAGS)" $(rootdir)/configure \
+ chmod 755 $(CURDIR)/autogen.sh
+ ./autogen.sh
+ cd $(builddir) && CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
$(CONFIG)
perl debian/check_config
$(MAKE) -C $(builddir) depend
@@ -134,13 +138,4 @@
# XXX: remove after libldap2.2-dev is officially built
rm -Rf debian/libldap2.2-dev
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- touch patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
.PHONY: binary binary-arch binary-indep build clean
More information about the Pkg-openldap-devel
mailing list