OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=36

openldap-ntlm.diff

@@ -1,189 +0,0 @@
---- 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 */
---- /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 );
-+}
---- libraries/libldap/Makefile.in	2007/02/21 16:33:57	1.1
-+++ libraries/libldap/Makefile.in	2007/02/21 16:36:42
-@@ -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 unbind.c cancel.c  \
-+	sasl.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 pagectrl.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 unbind.lo cancel.lo \
-+	sasl.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 pagectrl.lo sortctrl.lo vlvctrl.lo \

openldap2-client.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  2 09:18:05 CEST 2008 - rhafer@suse.de
+
+- Dropped evolution specific ntlm-bind Patch (Fate#303480)
+
 -------------------------------------------------------------------
 Thu Aug 28 11:46:08 CEST 2008 - rhafer@suse.de
 

openldap2-client.spec

@@ -42,7 +42,7 @@ Summary:        OpenLDAP Client Utilities
 %endif
 AutoReqProv:    on
 Version:        2.4.11
-Release:        19
+Release:        21
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -55,7 +55,6 @@ Patch1:         secpatch.dif
 Patch2:         slapd_conf.dif
 Patch3:         ldap_conf.dif
 Patch4:         ldapi_url.dif
-Patch5:         openldap-ntlm.diff
 Patch6:         libldap-gethostbyname_r.dif
 Patch7:         pie-compile.dif
 Patch8:         slapd_getaddrinfo_dupl.dif
@@ -156,7 +155,6 @@ Authors:
 %patch2
 %patch3
 %patch4
-%patch5
 %patch6
 %if %suse_version > 920
 %patch7
@@ -489,6 +487,8 @@ fi
 %endif
 
 %changelog
+* Tue Sep 02 2008 rhafer@suse.de
+- Dropped evolution specific ntlm-bind Patch (Fate#303480)
 * Thu Aug 28 2008 rhafer@suse.de
 - added ldapns.schema , to allow to use pam_ldap's "check_host_attr"
   and "check_service_attr" features (bnc#419984)

openldap2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  2 09:18:05 CEST 2008 - rhafer@suse.de
+
+- Dropped evolution specific ntlm-bind Patch (Fate#303480)
+
 -------------------------------------------------------------------
 Thu Aug 28 11:46:08 CEST 2008 - rhafer@suse.de
 

openldap2.spec

@@ -42,7 +42,7 @@ Summary:        The OpenLDAP Server
 %endif
 AutoReqProv:    on
 Version:        2.4.11
-Release:        18
+Release:        20
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -55,7 +55,6 @@ Patch1:         secpatch.dif
 Patch2:         slapd_conf.dif
 Patch3:         ldap_conf.dif
 Patch4:         ldapi_url.dif
-Patch5:         openldap-ntlm.diff
 Patch6:         libldap-gethostbyname_r.dif
 Patch7:         pie-compile.dif
 Patch8:         slapd_getaddrinfo_dupl.dif
@@ -159,7 +158,6 @@ Authors:
 %patch2
 %patch3
 %patch4
-%patch5
 %patch6
 %if %suse_version > 920
 %patch7
@@ -492,6 +490,8 @@ fi
 %endif
 
 %changelog
+* Tue Sep 02 2008 rhafer@suse.de
+- Dropped evolution specific ntlm-bind Patch (Fate#303480)
 * Thu Aug 28 2008 rhafer@suse.de
 - added ldapns.schema , to allow to use pam_ldap's "check_host_attr"
   and "check_service_attr" features (bnc#419984)