"\t-c cookie\tSync cookie of consumer\n"
"\t-d level\tDebug level" "\n"
"\t-f filename\tConfiguration file\n"
+ "\t-F dir\tConfiguration directory\n"
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
"\t-g group\tGroup (id or name) to run as\n"
#endif
int g_argc = argc;
char **g_argv = argv;
-#ifdef HAVE_NT_SERVICE_MANAGER
- char *configfile = ".\\slapd.conf";
- char *configdir = ".\\slapd.d";
-#else
- char *configfile = SLAPD_DEFAULT_CONFIGFILE;
- char *configdir = SLAPD_DEFAULT_CONFIGDIR;
-#endif
+ char *configfile = NULL;
+ char *configdir = NULL;
char *serverName;
int serverMode = SLAP_SERVER_MODE;
#ifdef HAVE_NT_EVENT_LOG
if (is_NT_Service)
- lutil_LogStartedEvent( serverName, slap_debug, configfile, urls );
+ lutil_LogStartedEvent( serverName, slap_debug, configfile ?
+ configfile : SLAPD_DEFAULT_CONFIGFILE , urls );
#endif
rc = slapd_daemon();
config_destroy();
+ if ( configfile )
+ ch_free( configfile );
+ if ( configdir )
+ ch_free( configdir );
+ if ( urls )
+ ch_free( urls );
+
#ifdef CSRIMALLOC
mal_dumpleaktrace( leakfile );
#endif