Merge remote-tracking branch 'origin/mdb.RE/0.9'

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index cc12395e088752a42bd612f34449fc7254eee49c..e7116e99b48f92073164e4838920eeeee904458e 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2013 The OpenLDAP Foundation.
+ * Copyright 1998-2016 The OpenLDAP Foundation.
  * Portions Copyright 2007 by Howard Chu, Symas Corporation.
  * All rights reserved.
  *
@@ -1361,7 +1361,10 @@ slap_open_listener(
 #endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */
 
        ldap_free_urldesc( lud );
-       if ( err ) return -1;
+       if ( err ) {
+               slap_free_listener_addresses(sal);
+               return -1;
+       }
 
        /* If we got more than one address returned, we need to make space
         * for it in the slap_listeners array.
@@ -3079,7 +3082,7 @@ slapd_wait_writer( ber_socket_t sd )
                tv.tv_usec = 0;
                tvp = &tv;
        } else {
-               tv = NULL;
+               tvp = NULL;
        }
        return select( 0, NULL, &writefds, NULL, tvp );
 #else