fix previous commit

[openldap] / servers / slurpd / main.c

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index d4ff5bcc4614869d6ba331cdab68d9aa0cd87f70..41d7fc3f2f35e2c762bfadfd03c31baa7402ef6c 100644 (file)
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -18,11 +23,14 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <sys/stat.h>
+#include <ac/stdlib.h>
 
 #include "slurp.h"
 #include "globals.h"
 #include "lutil.h"
 
+#include <ldap_pvt.h>
 
 int
 main(
@@ -38,20 +46,23 @@ main(
 
     int                        i;
 
+    /* initialize thread package */
+    ldap_pvt_thread_initialize();
+
     /* 
      * Create and initialize globals.  init_globals() also initializes
      * the main replication queue.
      */
     if (( sglob = init_globals()) == NULL ) {
        fprintf( stderr, "Out of memory initializing globals\n" );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     /*
      * Process command-line args and fill in globals.
      */
     if ( doargs( argc, argv, sglob ) < 0 ) {
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     /*
@@ -61,6 +72,21 @@ main(
        fprintf( stderr,
                "Errors encountered while processing config file \"%s\"\n",
                sglob->slapd_configfile );
+       exit( EXIT_FAILURE );
+    }
+
+#ifdef HAVE_TLS
+       if( ldap_pvt_tls_init() || ldap_pvt_tls_init_def_ctx() ) {
+               fprintf( stderr, "TLS Initialization failed.\n" );
+               exit( EXIT_FAILURE);
+       }
+#endif
+
+    /* 
+     * Make sure our directory exists
+     */
+    if ( mkdir(sglob->slurpd_rdir, 0755) == -1 && errno != EEXIST) {
+       perror(sglob->slurpd_rdir);
        exit( 1 );
     }
 
@@ -70,7 +96,7 @@ main(
     if ( sglob->st->st_read( sglob->st )) {
        fprintf( stderr, "Malformed slurpd status file \"%s\"\n",
                sglob->slurpd_status_file, 0, 0 );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     /*
@@ -78,29 +104,17 @@ main(
      * Check for any fatal error conditions before we get started
      */
      if ( sanity() < 0 ) {
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     /*
-     * Detach from the controlling terminal, if debug level = 0,
-     * and if not in one-shot mode.
+     * Detach from the controlling terminal
+     * unless the -d flag is given or in one-shot mode.
      */
-#ifdef LDAP_DEBUG
-    if (( ldap_debug == 0 )  && !sglob->one_shot_mode )
-#else /* LDAP_DEBUG */
-    if ( !sglob->one_shot_mode )
-#endif /* LDAP_DEBUG */
+#ifndef HAVE_WINSOCK
+    if ( ! (sglob->no_detach || sglob->one_shot_mode) )
        lutil_detach( 0, 0 );
-
-       /* initialize thread package */
-       ldap_pvt_thread_initialize();
-
-    /*
-     * Start threads - one thread for each replica
-     */
-    for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
-       start_replica_thread( sglob->replicas[ i ]);
-    }
+#endif
 
     /*
      * Start the main file manager thread (in fm.c).
@@ -108,16 +122,37 @@ main(
     if ( ldap_pvt_thread_create( &(sglob->fm_tid),
                0, fm, (void *) NULL ) != 0 )
        {
+#ifdef NEW_LOGGING
+       LDAP_LOG ( SLURPD, ERR,
+               "main: file manager ldap_pvt_thread_create failed\n" , 0, 0, 0 );
+#else
        Debug( LDAP_DEBUG_ANY, "file manager ldap_pvt_thread_create failed\n",
                0, 0, 0 );
-       exit( 1 );
+#endif
+       exit( EXIT_FAILURE );
 
     }
 
+    /*
+     * wait for fm to finish if in oneshot mode
+     */
+    if ( sglob->one_shot_mode ) {
+       ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+    }
+
+    /*
+     * Start threads - one thread for each replica
+     */
+    for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
+       start_replica_thread( sglob->replicas[ i ]);
+    }
+
     /*
      * Wait for the fm thread to finish.
      */
-    ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+    if ( !sglob->one_shot_mode ) {
+       ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+    }
 
     /*
      * Wait for the replica threads to finish.
@@ -126,10 +161,14 @@ main(
        ldap_pvt_thread_join( sglob->replicas[ i ]->ri_tid, (void *) NULL );
     }
 
-       /* destroy the thread package */
-       ldap_pvt_thread_destroy();
+    /* destroy the thread package */
+    ldap_pvt_thread_destroy();
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( SLURPD, RESULTS, "main: slurpd terminated\n", 0, 0, 0 );
+#else
     Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
+#endif
        return 0;
 #endif /* !NO_THREADS */
 }