From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 4 Jan 2011 18:39:45 +0000 (+0000)
Subject: ITS#6747
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~153
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=405aa10c710e32d0862c45586e8083e810a01f77;p=openldap

ITS#6747
---

diff --git a/CHANGES b/CHANGES
index 903d51f6cd..dc43dcec5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,17 +1,18 @@
 OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.24 Engineering
-	Added contrib/kinit for kerberos tickets
-	Added contrib/noopsrch for entry counting (ITS#6598)
 	Added libldap MozNSS non-blocking support (ITS#6714)
 	Added slapadd attribute value checking (ITS#6592)
 	Added slapcat continue mode for problematic DBs (ITS#6482)
 	Added slapd-null back-config support (ITS#6624)
 	Added slapd-sql autocommit support (ITS#6612)
 	Added slapd-sql support for long long keys (ITS#6617)
+	Added contrib/kinit for kerberos tickets
+	Added contrib/noopsrch for entry counting (ITS#6598)
 	Fixed liblber to not close invalid sockets (ITS#6585)
 	Fixed liblber error setting (ITS#6732)
 	Fixed liblber memory debugging (ITS#6733)
+	Fixed libldap connectionless warnings (ITS#6747)
 	Fixed libldap dnssrv port format specifier (ITS#6644)
 	Fixed libldap EOF handling (ITS#6723)
 	Fixed libldap GnuTLS hang on socket close (ITS#6673)
@@ -25,6 +26,7 @@ OpenLDAP 2.4.24 Engineering
 	Fixed slapd acl parsing overflow (ITS#6611)
 	Fixed slapd support for BDB 5.0+ (ITS#6698)
 	Fixed slapd config leak with olcDbDirectory (ITS#6634)
+	Fixed slapd connectionless warnings (ITS#6747)
 	Fixed slapd to free controls if needed (ITS#6629)
 	Fixed slapd filter leak (ITS#6635)
 	Fixed slapd matching rules for strict ordering (ITS#6722)
diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index e230099186..c1b72f5712 100644
--- a/libraries/libldap/abandon.c
+++ b/libraries/libldap/abandon.c
@@ -211,7 +211,7 @@ start_again:;
 			if ( LDAP_IS_UDP(ld) ) {
 				struct sockaddr sa = {0};
 				/* dummy, filled with ldo_peer in request.c */
-				err = ber_write( ber, &sa, sizeof(sa), 0 );
+				err = ber_write( ber, (char *) &sa, sizeof(sa), 0 );
 			}
 			if ( LDAP_IS_UDP(ld) && ld->ld_options.ldo_version ==
 				LDAP_VERSION2 )
diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index d74a6109a3..65d55e4774 100644
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -302,7 +302,7 @@ ldap_build_search_req(
 	if ( LDAP_IS_UDP(ld) ) {
 		struct sockaddr sa = {0};
 		/* dummy, filled with ldo_peer in request.c */
-	    err = ber_write( ber, &sa, sizeof( sa ), 0 );
+	    err = ber_write( ber, (char *) &sa, sizeof( sa ), 0 );
 	}
 	if ( LDAP_IS_UDP(ld) && ld->ld_options.ldo_version == LDAP_VERSION2) {
 	    char *dn = ld->ld_options.ldo_cldapdn;
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index c99f365624..83bed4e949 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -39,6 +39,10 @@
 #include "lutil.h"
 #include "slap.h"
 
+#ifdef LDAP_CONNECTIONLESS
+#include "../../libraries/liblber/lber-int.h"	/* ber_int_sb_read() */
+#endif
+
 #ifdef LDAP_SLAPI
 #include "slapi/slapi.h"
 #endif
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index a27031bb66..a504842ae0 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -2804,7 +2804,7 @@ connectionless_init( void )
 		if ( !c ) {
 			Debug( LDAP_DEBUG_TRACE,
 				"connectionless_init: failed on %s (%d)\n",
-				lr->sl_url, lr->sl_sd, 0 );
+				lr->sl_url.bv_val, lr->sl_sd, 0 );
 			return -1;
 		}
 		lr->sl_is_udp++;