Fix ITS#2132, give up if listener fails to open

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 94de3b729be2005a2f551732437bbecf899d152e..f8fc27aef4e15295fe5f4779c03941d86e6d7e49 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -581,6 +581,8 @@ static int slap_open_listener(
                return rc;
        }
 
+       l.sl_url = NULL;
+
 #ifndef HAVE_TLS
        if( ldap_pvt_url_scheme2tls( lud->lud_scheme ) ) {
 #ifdef NEW_LOGGING
@@ -859,10 +861,21 @@ static int slap_open_listener(
 
        slap_free_listener_addresses(psal);
 
+       if ( l.sl_url == NULL )
+       {
+#ifdef NEW_LOGGING
+               LDAP_LOG( CONNECTION, RESULTS, 
+                       "slap_open_listener: failed on %s\n", url, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_TRACE,
+                       "slap_open_listener: failed on %s\n", url, 0, 0 );
+#endif
+               return -1;
+       }
 
 #ifdef NEW_LOGGING
        LDAP_LOG( CONNECTION, RESULTS, 
-                       "slap_open_listener: daemon initialzed %s\n", l.sl_url, 0, 0 );
+               "slap_open_listener: daemon initialized %s\n", l.sl_url, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "daemon: initialized %s\n",
                l.sl_url, 0, 0 );