Fixup bdb_entry_release now that entry_decode uses two memory blocks

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index ddb202bfea46408b0b7a5b14872e70601195973a..9a71105692dd5c2cfca56a48c7f2dd6d2fb38334 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -66,6 +66,7 @@ do { if (w) tcp_write( wake_sds[1], "0", 1 ); } while(0)
 
 #ifdef HAVE_NT_SERVICE_MANAGER
 /* in nt_main.c */
+/* externs are frowned upon, but so is NT :-) */
 extern ldap_pvt_thread_cond_t                  started_event;
 extern int       is_NT_Service;
 #endif
@@ -374,7 +375,7 @@ static int slap_get_listener_addresses(
                hints.ai_family = AF_UNSPEC;
                snprintf(serv, sizeof serv, "%d", port);
 
-               if (err = getaddrinfo(host, serv, &hints, &res)) {
+               if ( (err = getaddrinfo(host, serv, &hints, &res)) ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
                                   "slap_get_listener_addresses: getaddrinfo failed: %s\n",
@@ -502,7 +503,7 @@ static Listener * slap_open_listener(
        Listener *li;
        LDAPURLDesc *lud;
        unsigned short port;
-       int err, addrlen;
+       int err, addrlen = 0;
        struct sockaddr **sal, **psal;
        int socktype = SOCK_STREAM;     /* default to COTS */
 
@@ -940,7 +941,7 @@ slapd_daemon_task(
 )
 {
        int l;
-       time_t  last_idle_check;
+       time_t  last_idle_check = 0;
        time( &starttime );
 
        if ( global_idletimeout > 0 ) {
@@ -1162,7 +1163,7 @@ slapd_daemon_task(
                        slap_ssf_t ssf = 0;
                        char *authid = NULL;
 
-                       char    *dnsname;
+                       char    *dnsname = NULL;
                        char    *peeraddr;
 #ifdef LDAP_PF_LOCAL
                        char    peername[MAXPATHLEN + sizeof("PATH=")];