Change 'attribute' directive to 'attributetype'

[openldap] / servers / slurpd / main.c

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index cc094ba44670b69580276b5c9b7d410153777dfc..2aa86e75c9bb3789fd0c5d5a7198c741bfd46399 100644 (file)
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -17,6 +18,8 @@
 
 #include "portable.h"
 
+#include <ac/stdlib.h>
+
 #include <stdio.h>
 
 #include "slurp.h"
@@ -36,23 +39,25 @@ main(
     return( 1 );
 #else
 
-    int                        status;
     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 );
     }
 
     /*
@@ -62,7 +67,7 @@ main(
        fprintf( stderr,
                "Errors encountered while processing config file \"%s\"\n",
                sglob->slapd_configfile );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     /*
@@ -71,7 +76,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 );
     }
 
     /*
@@ -79,23 +84,16 @@ 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 */
+    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
      */
@@ -111,7 +109,7 @@ main(
        {
        Debug( LDAP_DEBUG_ANY, "file manager ldap_pvt_thread_create failed\n",
                0, 0, 0 );
-       exit( 1 );
+       exit( EXIT_FAILURE );
 
     }
 
@@ -126,9 +124,11 @@ main(
     for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
        ldap_pvt_thread_join( sglob->replicas[ i ]->ri_tid, (void *) NULL );
     }
-    Debug( LDAP_DEBUG_ANY, "slurpd: terminating normally\n", 0, 0, 0 );
-    sglob->slurpd_shutdown = 1;
 
+       /* destroy the thread package */
+       ldap_pvt_thread_destroy();
+
+    Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
        return 0;
 #endif /* !NO_THREADS */
 }