Thought I fixed these errors previously... oh well.

diff --git a/include/lber.h b/include/lber.h
index 092e5b6685a4e04c2b5d6cf7e33046e5903c6c58..13551e37a6862f8b1e8e34005556fc19543e3713 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -103,7 +103,7 @@ LDAP_BEGIN_DECL
 
 typedef int* (*BER_ERRNO_FN) LDAP_P(( void ));
 
-typedef void (*BER_LOG_PRINT_FN) LDAP_P(( char *buf ));
+typedef void (*BER_LOG_PRINT_FN) LDAP_P(( LDAP_CONST char *buf ));
 
 typedef void* (*BER_MEMALLOC_FN)       LDAP_P(( ber_len_t size ));
 typedef void* (*BER_MEMCALLOC_FN)      LDAP_P(( ber_len_t n, ber_len_t size ));

diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c
index 2d3fd7f6e94f75bb53e3a24f6f37e29361cddb25..bafbdc3740006d7e87ad84a1c181e0173afd8043 100644 (file)
--- a/libraries/liblber/bprint.c
+++ b/libraries/liblber/bprint.c
@@ -42,8 +42,7 @@ int * ber_errno_addr(void)
 /*
  * Print stuff
  */
-static void
-ber_error_print( const char *data )
+void ber_error_print( LDAP_CONST char *data )
 {
        assert( data != NULL );
 

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 93ec33d23cc96c01c34f3a46e7a7966878669d1d..4d538400228ee71a08943f4765cd9b1a6b936968 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -245,7 +245,7 @@ static Listener * open_listener( const char* url )
        hints.ai_socktype = SOCK_STREAM;
 
 #  ifdef LDAP_PF_UNIX
-       if (lud->lud_protocol == LDAP_PROTO_LOCAL) {
+       if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
                if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
                        err = getaddrinfo(NULL, "/tmp/.ldap-sock", &hints, &res);
                        if (!err)
@@ -288,7 +288,7 @@ static Listener * open_listener( const char* url )
                if ( sai->ai_family != AF_UNIX ) {
 #else
 
-       if ( ldap_pvt_url_scheme2proto(url) == LDAP_PROTO_IPC ) {
+       if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
 #ifdef LDAP_PF_UNIX
                port = 0;
                (void) memset( (void *)&l.sl_sa.sa_un_addr, '\0', sizeof(l.sl_sa.sa_un_addr) );