syncrepl changes

[openldap] / servers / slurpd / globals.h

diff --git a/servers/slurpd/globals.h b/servers/slurpd/globals.h
index 645cf0593ab0887b16ebfbdc252b65aab66d4eda..86b9c154d7638da1ddda6b8d9c8cd5c724a1896a 100644 (file)
--- a/servers/slurpd/globals.h
+++ b/servers/slurpd/globals.h
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -25,6 +29,8 @@ LDAP_BEGIN_DECL
 typedef struct globals {
     /* Thread ID for file manager thread */
     ldap_pvt_thread_t fm_tid;
+    /* pipe/socket used to wake manager from signal handler */
+    int wake_sds[2];
     /* 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 */
@@ -49,6 +55,8 @@ typedef struct globals {
     int no_detach;
     /* Name of program */
     char *myname;
+    /* NT service name */
+    char *serverName;
     /* Current offset into slurpd replica logfile */
     off_t srpos;
     /* mutex to serialize access to reject file */
@@ -57,10 +65,10 @@ typedef struct globals {
     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 */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 } Globals;