Kill lber_debug

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index a7cae58e9563725bfcf8b655045ce0f4f0b7b293..6d310de8c3bd5c1a8e8bf2d9e3c9d3bd969c6742 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -149,7 +149,11 @@ int main( int argc, char **argv )
        int         serverMode = SLAP_SERVER_MODE;
 
        int port = LDAP_PORT;
+#ifdef HAVE_TLS
        int tls_port = LDAPS_PORT;
+#else
+       int tls_port = 0;
+#endif
 
        g_argc = argc;
        g_argv = argv;
@@ -320,7 +324,11 @@ int main( int argc, char **argv )
        openlog( serverName, OPENLOG_OPTIONS );
 #endif
 
-       slapd_daemon_init( urls, port, tls_port );
+       if( slapd_daemon_init( urls, port, tls_port ) != 0 ) {
+               rc = 1;
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );
+               goto stop;
+       }
 
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
        if ( username != NULL || groupname != NULL ) {