ITS#6747 Fix LDAP_CONNECTIONLESS Debug(), warnings

diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index 55000407bc0ddf67f844a897386b5a1029b39ade..1a6b64b22f4a7e64429fe6a4442ab748e80a9a46 100644 (file)
--- 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 d74a6109a307a314a982a39887c00775851b37bd..65d55e477419d70bb3a4f49b65f38352ec9960cd 100644 (file)
--- 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 c99f365624e08c395e55c09145aadb937eab8136..83bed4e9495f57b246d02dc09a10288c0afe5cba 100644 (file)
--- 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 6abc52866b40220bea8815efe8274e67056646e5..459bb8d3bff4f551a16d3f4c17283e4d38a674ef 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -2867,7 +2867,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++;