From d6b4e48968eb7e8ee03d3df6b94db9e2a594bf65 Mon Sep 17 00:00:00 2001
From: Oliver Eikemeier <eik@FreeBSD.org>
Date: Thu, 3 Feb 2005 03:42:06 +0000
Subject: Update to OpenLDAP 2.2.23: - various fixes (see
 /usr/local/share/doc/openldap/CHANGES) [1] - fixed libldap fdset re-init for
 restart (ITS#3524) [3] - added ACI support [2] - added SLPv2 support

PR:		76192 [1], 74906 [2]
Submitted by:	Alex Deiter <tiamat@komi.mts.ru> [1], Rainer Duffner <rainer@ultra-secure.de> [2]
Obtained from:	OpenLDAP CVS [3]
---
 net/openldap23-server/files/patch-configure        | 17 ++++------------
 .../files/patch-libraries::libldap::os-ip.c        | 23 ++++++++++++++++++++++
 .../patch-servers::slapd::back-ldap::search.c      | 11 +++++++++++
 3 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 net/openldap23-server/files/patch-libraries::libldap::os-ip.c
 create mode 100644 net/openldap23-server/files/patch-servers::slapd::back-ldap::search.c

(limited to 'net/openldap23-server/files')

diff --git a/net/openldap23-server/files/patch-configure b/net/openldap23-server/files/patch-configure
index 7f32b0a770b9..d25ea3f8bc5d 100644
--- a/net/openldap23-server/files/patch-configure
+++ b/net/openldap23-server/files/patch-configure
@@ -1,29 +1,20 @@
 --- configure.orig	Tue Jul 27 18:33:12 2004
 +++ configure	Sat Aug 14 17:05:23 2004
-@@ -20145,7 +20145,7 @@
- 
- 
- 	if test $ol_cv_bdb_compat = yes ; then
--		ol_enable_bdb=yes
-+		ol_enable_bdb=${ol_enable_bdb-yes}
- 	elif test $ol_enable_bdb = yes ; then
- 		{ echo "configure: error: BDB: BerkeleyDB version incompatible" 1>&2; exit 1; }
- 	else
-@@ -20997,7 +20997,7 @@
+@@ -20985,7 +20985,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liodbc  $LIBS"
 +LIBS="-liodbc  $LIBS  $LTHREAD_LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 21003 "configure"
+ #line 20991 "configure"
  #include "confdefs.h"
-@@ -21041,7 +21041,7 @@
+@@ -21029,7 +21029,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lodbc  $LIBS"
 +LIBS="-lodbc  $LIBS  $LTHREAD_LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 21047 "configure"
+ #line 21035 "configure"
  #include "confdefs.h"
diff --git a/net/openldap23-server/files/patch-libraries::libldap::os-ip.c b/net/openldap23-server/files/patch-libraries::libldap::os-ip.c
new file mode 100644
index 000000000000..32df40c91e11
--- /dev/null
+++ b/net/openldap23-server/files/patch-libraries::libldap::os-ip.c
@@ -0,0 +1,23 @@
+--- libraries/libldap/os-ip.c	Thu Jan 20 18:01:01 2005
++++ libraries/libldap/os-ip.c	Mon Jan 31 16:53:39 2005
+@@ -258,15 +258,15 @@
+ 	if ( async ) return ( -2 );
+ #endif
+ 
+-	FD_ZERO(&wfds);
+-	FD_SET(s, &wfds );
++	do {
++		FD_ZERO(&wfds);
++		FD_SET(s, &wfds );
+ 
+ #ifdef HAVE_WINSOCK
+-	FD_ZERO(&efds);
+-	FD_SET(s, &efds );
++		FD_ZERO(&efds);
++		FD_SET(s, &efds );
+ #endif
+ 
+-	do {
+ 		rc = select(ldap_int_tblsize, z, &wfds,
+ #ifdef HAVE_WINSOCK
+ 			&efds,
diff --git a/net/openldap23-server/files/patch-servers::slapd::back-ldap::search.c b/net/openldap23-server/files/patch-servers::slapd::back-ldap::search.c
new file mode 100644
index 000000000000..a519d2de3781
--- /dev/null
+++ b/net/openldap23-server/files/patch-servers::slapd::back-ldap::search.c
@@ -0,0 +1,11 @@
+--- servers/slapd/back-ldap/search.c	Thu Jan 20 18:01:12 2005
++++ servers/slapd/back-ldap/search.c	Wed Feb  2 14:51:05 2005
+@@ -681,7 +681,7 @@
+ 
+ retry:
+ 	rc = ldap_search_ext_s(lc->ld, mdn.bv_val, LDAP_SCOPE_BASE, filter,
+-				gattr, 0, NULL, NULL, LDAP_NO_LIMIT,
++				at ? gattr : NULL, 0, NULL, NULL, LDAP_NO_LIMIT,
+ 				LDAP_NO_LIMIT, &result);
+ 	if ( rc != LDAP_SUCCESS ) {
+ 		if ( rc == LDAP_SERVER_DOWN && do_retry ) {
-- 
cgit v1.2.3