From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 11 May 2006 20:33:31 +0000 (+0000)
Subject: From HEAD:
X-Git-Tag: OPENLDAP_REL_ENG_2_3_22~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2189c9e1a91519428cc9f8be08f238b5079a64ad;p=openldap

From HEAD:
+       Fixed libldap ldap_sort_entries tail bug (ITS#4536)
+       Fixed slapd-hdb IDL sort issue (ITS#4531)
+       Fixed OSF1 compilation problem (ITS#4537)
---

diff --git a/CHANGES b/CHANGES
index c6a35be935..6212b3127c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.22 Engineering
+	Fixed libldap ldap_sort_entries tail bug (ITS#4536)
 	Fixed libldap_r thread debug missing break
 	Fixed libldap_r tpool cleanup
 	Fixed liblutil strtoul(3) usage (ITS#4503)
@@ -17,6 +18,7 @@ OpenLDAP 2.3.22 Engineering
 	Added slapd syncrepl mandatory searchbase check
 	Fixed slapd-bdb pre/post-read freeing (ITS#4532)
 	Fixed slapd-bdb pre/post-read unavailable issue (ITS#4538)
+	Fixed slapd-hdb IDL sort issue (ITS#4531)
 	Fixed slapadd cn=config issue (ITS#4194)
 	Fixed slapd-ldap proxyAuthz of bound identity/override (ITS#4497)
 	Fixed slapd-ldap/meta protocol version propagation (ITS#4488)
@@ -33,6 +35,7 @@ OpenLDAP 2.3.22 Engineering
 	Fixed slurpd potential overflow issue
 	Build Environment
 		Fixed test020-proxycache disabled debug issue (ITS#4491)
+		Fixed OSF1 compilation problem (ITS#4537)
 
 OpenLDAP 2.3.21 Release
 	Fixed libldap referral chasing issue (ITS#4448)
diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index 9d8e5f8ba2..b556fc955e 100644
--- a/libraries/libldap/sort.c
+++ b/libraries/libldap/sort.c
@@ -158,7 +158,8 @@ ldap_sort_entries(
 		LDAP_VFREE( et[i].et_vals );
 	}
 	*ep = ohead;
-		
+	(*chain)->lm_chain_tail = otail ? otail : etail;
+
 	LDAP_FREE( (char *) et );
 
 	return( 0 );
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index f5df4a16b6..6b98e105ef 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -807,7 +807,8 @@ static int slap_get_listener_addresses(
 			sap[i]->sa_family = AF_INET;
 			((struct sockaddr_in *)sap[i])->sin_port = htons(port);
 			AC_MEMCPY( &((struct sockaddr_in *)sap[i])->sin_addr,
-				he ? he->h_addr_list[i] : &in, sizeof(struct in_addr) );
+				he ? (struct in_addr *)he->h_addr_list[i] : &in,
+				sizeof(struct in_addr) );
 		}
 		sap[i] = NULL;
 #endif