From 1ef14875dbb240863c14ef14f5a41c7f98908b91 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 10 Jun 2000 23:06:08 +0000 Subject: [PATCH] Thought I fixed these errors previously... oh well. --- include/lber.h | 2 +- libraries/liblber/bprint.c | 3 +-- servers/slapd/daemon.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/lber.h b/include/lber.h index 092e5b6685..13551e37a6 100644 --- 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 2d3fd7f6e9..bafbdc3740 100644 --- 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 93ec33d23c..4d53840022 100644 --- 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) ); -- 2.39.5