Import updated SLAPD .args/.pid file handling from devel.

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index dd7ecf0027a33e20ad5f5a530391c7d47c2bea68..fb2ee3f36d722d9afc5e858e60066ebc934ba7a8 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -48,12 +48,6 @@ static int   cnvt_str2int();
 
 #endif  /* LOG_LOCAL4 */
 
-/*
- * the server's name must be accessible from the daemon module,
- * to construct the pid/args file names
- */
-char  *serverName = NULL;
-
 
 static void
 usage( char *name )
@@ -75,6 +69,7 @@ main( int argc, char **argv )
        Backend         *be = NULL;
        FILE            *fp = NULL;
        char            *configfile;
+       char    *serverName;
 #ifdef LOG_LOCAL4
        int     syslogUser = DEFAULT_SYSLOG_USER;
 #endif