add new ber dump routine (behind NEW_LOGGING)

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index b1a2ffc26d679e56d39674993019f86296587cd5..c9eb693cdcf880cb4a0ffcbbdb43b66025f7fd9c 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -59,6 +59,8 @@ typedef struct slap_listener {
 
 Listener **slap_listeners = NULL;
 
+#define SLAPD_LISTEN 10
+
 static ber_socket_t wake_sds[2];
 
 #ifdef NO_THREADS
@@ -191,7 +193,7 @@ static void slapd_close(ber_socket_t s) {
        tcp_close(s);
 }
 
-static slap_free_listener_addresses(struct sockaddr **sal)
+static void slap_free_listener_addresses(struct sockaddr **sal)
 {
        struct sockaddr **sap;
 
@@ -226,7 +228,7 @@ static int slap_get_listener_addresses(
                /* host specifies a service in this case */
                if (err = getaddrinfo(NULL, host, &hints, &res)) {
                        Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-                               gai_strerror(err), 0, 0);
+                               AC_GAI_STRERROR(err), 0, 0);
                        return -1;
                }
        } else
@@ -293,9 +295,8 @@ static int slap_get_listener_addresses(
                }
                if (*sap != NULL) {
                        (*sap)->sa_family = sai->ai_family;
-                       (*sap)->sa_len = sai->ai_addrlen;
+                       sap++;
                }
-               sap++;
        } while ((sai = sai->ai_next) != NULL);
 
        freeaddrinfo(res);
@@ -699,7 +700,7 @@ slapd_daemon_task(
                if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
                        continue;
 
-               if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
+               if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
                        int err = sock_errno();
                        Debug( LDAP_DEBUG_ANY,
                                "daemon: listen(%s, 5) failed errno=%d (%s)\n",
@@ -862,7 +863,7 @@ slapd_daemon_task(
                }
 
                for ( l = 0; slap_listeners[l] != NULL; l++ ) {
-                       ber_int_t s;
+                       ber_socket_t s;
                        socklen_t len = sizeof(from);
                        long id;
                        slap_ssf_t ssf = 0;