fix -h option example for multi-URI handling (as suggested by Roland Bauerschmidt...

[openldap] / servers / slurpd / globals.h

diff --git a/servers/slurpd/globals.h b/servers/slurpd/globals.h
index 365c32ed6c89bf26ef6e04b9d4b6face135d2836..2e21cde45c6bb89e3a2200ff2b2bd512fe847d93 100644 (file)
--- a/servers/slurpd/globals.h
+++ b/servers/slurpd/globals.h
@@ -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.
@@ -23,7 +28,7 @@ LDAP_BEGIN_DECL
 
 typedef struct globals {
     /* Thread ID for file manager thread */
-    pthread_t fm_tid;
+    ldap_pvt_thread_t fm_tid;
     /* The name of the slapd config file (which is also our config file) */
     char *slapd_configfile;
     /* How long the master slurpd sleeps when there's no work to do */
@@ -44,24 +49,22 @@ typedef struct globals {
     char slurpd_replogfile[ MAXPATHLEN ];
     /* Non-zero if we were given a replog file to process on command-line */
     int        one_shot_mode;
+    /* Non-zero if we should not detach the process */
+    int no_detach;
     /* Name of program */
     char *myname;
     /* Current offset into slurpd replica logfile */
     off_t srpos;
     /* mutex to serialize access to reject file */
-    pthread_mutex_t rej_mutex;
+    ldap_pvt_thread_mutex_t rej_mutex;
     /* pointer to status struct */
     St *st;
     /* Pointer to replication queue */
     Rq *rq;
-#ifdef HAVE_KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
     /* Default name of kerberos srvtab file */
     char *default_srvtab;
-#endif /* HAVE_KERBEROS */
-#if defined( HAVE_LWP )  && !defined( HAVE_THR )
-    tl_t *tsl_list;
-    mon_t tsl_mon;
-#endif /* THREAD_SUNOS4_LWP */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 } Globals;