From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 28 Sep 2005 18:44:15 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_8~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=18dc9cf7a44c9bb4eda123128354e5ce479a9a03;p=openldap

Sync with HEAD
Reflect changes in CHANGES
---

diff --git a/CHANGES b/CHANGES
index fd3ef961c9..30c37adccf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,42 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.8 Engineering
 	Fixed slapd undef HAVE_EPOLL issue
+	Fixed slapd connection-get wake bug (ITS#3999)
+	Fixed slapd uninitialized var bug (ITS#3854)
+	Fixed slapd add entry without parent bug (ITS#2757)
+	Fixed slapd cn=config value escaping bug (ITS#3807)
+	Fixed slapd cn=config missing host/uri bug (ITS#4009)
+	Fixed slapd alock symbol bug (ITS#3978)
+	Fixed slapd replogfile assert (ITS#4003)
+	Fixed slapd rewrite session var set bug (ITS#4023)
+	Fixed slapd syncrepl empty uniqueMember bug (ITS#4040)
+	Fixed slapd alias resolution bug (ITS#4030)
+	Fixed slapd-bdb/hdb pointer/integer size mismatch (ITS#4015)
+	Fixed slapd-glue mixtures bug (ITS#3979)
+	Fixed slapd-ldap unlock issue (ITS#4001)
+	Fixed slapd-ldap manageDIT check bug (ITS#4005)
+	Fixed slapd-ldap resource release issue (ITS#4016)
+	Fixed slapd-meta rootdn lookup bug (ITS#4004)
+	Fixed slapd-meta null value assert issue (ITS#4028)
+	Fixed slapd-monitor unavailable issue (ITS#4013)
+	Fixed slapd-perl init/destroy bug (ITS#3923)
+	Fixed slapo-ppolicy replication issues (ITS#3980)
+	Added slapo-ppolicy pwdattribute descriptor support (ITS#4025)
+	Fixed slapo-syncprov/unique interact issues (ITS#3989)
+	Fixed slapo-syncprov/subordinate interact issues (ITS#3996)
+	Fixed slapo-syncprov schema check assert (ITS#4031)
+	Fixed slapcat out-of-memory problem (ITS#4010)
+	Fixed slurpd unrecognized slave names bug (ITS#4012)
+	Fixed liblber dgram len bug (ITS#4046)
+	Updated slapd authz backend detection (ITS#4018)
+	Fixed slapd realloc zero bug (ITS#3981)
 	Documentation
-		Add slapo-valsort(5) man page
+		Added slapo-valsort(5) man page
+		Added slap tool -F option documentation (ITS#4026)
+	Build Environment
+		Fixed misc POSIX conformance issues (ITS#2667)
+		Fixed --without-threads build issue (ITS#4006)
+		Fixed test script exit checks (ITS#4045)
 
 OpenLDAP 2.3.7 Release
 	Updated slapd ManageDIT support
diff --git a/libraries/liblber/sockbuf.c b/libraries/liblber/sockbuf.c
index 4960c93bb4..c30469cdec 100644
--- a/libraries/liblber/sockbuf.c
+++ b/libraries/liblber/sockbuf.c
@@ -46,7 +46,7 @@
 #define LBER_MIN_BUFF_SIZE		4096
 #endif
 #ifndef LBER_MAX_BUFF_SIZE
-#define LBER_MAX_BUFF_SIZE		65536
+#define LBER_MAX_BUFF_SIZE		(65536*256)
 #endif
 #ifndef LBER_DEFAULT_READAHEAD
 #define LBER_DEFAULT_READAHEAD	16384
@@ -911,6 +911,7 @@ sb_dgram_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len )
 	addrlen = sizeof( struct sockaddr );
 	src = buf;
 	buf += addrlen;
+	len -= addrlen;
 	rc = recvfrom( sbiod->sbiod_sb->sb_fd, buf, len, 0, src, &addrlen );
 
 	return rc > 0 ? rc+sizeof(struct sockaddr) : rc;
diff --git a/servers/slapd/mods.c b/servers/slapd/mods.c
index 4be7849f2d..a9a66074da 100644
--- a/servers/slapd/mods.c
+++ b/servers/slapd/mods.c
@@ -334,7 +334,7 @@ modify_delete_vindex(
 			rc = LDAP_NO_SUCH_ATTRIBUTE;
 		}
 	} else if ( a->a_desc->ad_type->sat_flags & SLAP_AT_ORDERED_VAL ) {
-	/* For an ordered attribute, renumber the value indices */
+		/* For an ordered attribute, renumber the value indices */
 		ordered_value_sort( a, 1 );
 	}
 
diff --git a/tests/scripts/sql-test000-read b/tests/scripts/sql-test000-read
index 26ebc76846..c7d14b5334 100755
--- a/tests/scripts/sql-test000-read
+++ b/tests/scripts/sql-test000-read
@@ -401,7 +401,7 @@ fi
 echo "Testing operational attributes in request..."
 echo "# Testing operational attributes in request..." >> $SEARCHOUT
 $LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" \
-	 '+' 2>&1 | grep -v '^entryCSN:' >> $SEARCHOUT 
+	 '+' 2>&1 > $SEARCHFLT
 
 RC=$?
 if test $RC != 0 ; then
@@ -410,6 +410,8 @@ if test $RC != 0 ; then
 	exit $RC
 fi
 
+grep -v '^entryCSN:' $SEARCHFLT >> $SEARCHOUT 
+
 echo -n "Testing compare (should be TRUE)... "
 $LDAPCOMPARE -h $LOCALHOST -p $PORT1 "$BINDDN" \
 	 "sn:kovalev" >> $TESTOUT 2>&1
diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint
index 6b33344e68..fb1687cff5 100755
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@@ -66,10 +66,7 @@ fi
 
 echo "Searching unmodified database..."
 
-$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-	$EGREP_CMD "(manager|secretary):" | sed "s/george/foster/g" | \
-	sort > $SEARCHOUT 2>&1
-
+$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
 	echo "ldapsearch failed ($RC)!"
@@ -77,6 +74,9 @@ if test $RC != 0 ; then
 	exit $RC
 fi
 
+$EGREP_CMD "(manager|secretary):" $SEARCHOUT | sed "s/george/foster/g" | \
+	sort > $TESTOUT 2>&1
+
 echo "Testing modrdn..."
 $LDAPMODRDN -D "$REFINTDN" -r -h $LOCALHOST -p $PORT1 -w $PASSWD > \
 	/dev/null 2>&1 'uid=george,ou=users,o=refint' 'uid=foster'
@@ -92,8 +92,7 @@ fi
 
 echo "Using ldapsearch to check dependents new rdn..."
 
-$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-	$EGREP_CMD "(manager|secretary):" | sort > $SEARCHFLT 2>&1
+$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 
 RC=$?
 	if test $RC != 0 ; then
@@ -102,8 +101,10 @@ RC=$?
 	exit $RC
 fi
 
+$EGREP_CMD "(manager|secretary):" $SEARCHOUT | sort > $SEARCHFLT 2>&1
+
 echo "Comparing ldapsearch results against original..."
-$CMP $SEARCHOUT $SEARCHOUT > $CMPOUT
+$CMP $TESTOUT $SEARCHFLT > $CMPOUT
 
 if test $? != 0 ; then
 	echo "comparison failed - modify operations did not complete correctly"
@@ -127,8 +128,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Using ldapsearch to verify dependents have been deleted..."
-$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-	$EGREP_CMD "(manager|secretary):" > $SEARCHFLT 2>&1
+$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 
 RC=$?
 if test $RC != 0 ; then
@@ -137,6 +137,8 @@ if test $RC != 0 ; then
 	exit $RC
 fi
 
+$EGREP_CMD "(manager|secretary):" $SEARCHOUT > $SEARCHFLT 2>&1
+
 RC=`grep -c foster $SEARCHFLT`
 if test $RC != 0 ; then
 	echo "dependent modify failed - dependents were not deleted"
@@ -178,10 +180,6 @@ if test $RC != 0 ; then
 	exit $RC
 fi
 
-
-
-#####
-
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"