Listener commit broke test048, skip listener check on Hidden DBs

[openldap] / servers / slurpd / globals.c

diff --git a/servers/slurpd/globals.c b/servers/slurpd/globals.c
index d101a47ad529297bc0275cac23a438734f42a3e7..80e2238f721c57dc78e59b7cac4187a07001b2f3 100644 (file)
--- a/servers/slurpd/globals.c
+++ b/servers/slurpd/globals.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
 #include "globals.h"
 
 Globals                 *sglob;
+static Globals glob;
 
 int ldap_syslog = 0;
 #ifdef LOG_DEBUG
@@ -59,10 +60,10 @@ init_globals( void )
 {
     Globals *g;
 
-    g = ( Globals * ) calloc( 1, sizeof( Globals ));
-    if ( g == NULL ) {
-       return NULL;
-    }
+    g = &glob;
+
+       g->wake_sds[0] = -1;
+       g->wake_sds[1] = -1;
 
 #ifdef HAVE_NT_SERVICE_MANAGER
     g->slapd_configfile = ".\\slapd.conf";
@@ -71,11 +72,11 @@ init_globals( void )
     g->slapd_configfile = SLAPD_DEFAULT_CONFIGFILE;
     g->slurpd_rdir = DEFAULT_SLURPD_REPLICA_DIR "/replica";
 #endif
+
     g->no_work_interval = DEFAULT_NO_WORK_INTERVAL;
     g->slurpd_shutdown = 0;
     g->num_replicas = 0;
     g->replicas = NULL;
-    strcpy( g->slurpd_status_file, DEFAULT_SLURPD_STATUS_FILE );
     g->slapd_replogfile[ 0 ] = '\0';
     g->slurpd_replogfile[ 0 ] = '\0';
     g->slurpd_status_file[ 0 ] = '\0';
@@ -94,9 +95,6 @@ init_globals( void )
        fprintf( stderr, "Cannot initialize queue\n" );
        exit( EXIT_FAILURE );
     }
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-    g->default_srvtab = SRVTAB;
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 
     return g;
 }