+/* $OpenLDAP$ */
/*
* Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
#include "portable.h"
+#include <ac/stdlib.h>
+
#include <stdio.h>
#include "slurp.h"
exit( EXIT_FAILURE );
}
+ /*
+ * Make sure our directory exists
+ */
+ if ( mkdir(sglob->slurpd_rdir, 0755) == -1 && errno != EEXIST) {
+ perror(sglob->slurpd_rdir);
+ exit( 1 );
+ }
+
/*
* Get any saved state information off the disk.
*/
}
/*
- * 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 );
- /*
- * Start threads - one thread for each replica
- */
- for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
- start_replica_thread( sglob->replicas[ i ]);
- }
-
/*
* Start the main file manager thread (in fm.c).
*/
}
+ /*
+ * 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.
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();
Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
return 0;