* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "portable.h"
-#include "slapi_common.h"
#include <stdio.h>
#include "ldap_pvt.h"
#include "slap.h"
-#include "slapi.h"
#include "lutil.h"
#include "ldif.h"
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
#ifdef LDAP_SIGCHLD
static RETSIGTYPE wait4child( int sig );
#endif
#define MAIN_RETURN(x) return
static struct sockaddr_in bind_addr;
-void CommenceStartupProcessing( LPCTSTR serverName,
- void(*stopper)(int));
-void ReportSlapdShutdownComplete( void );
-void *getRegParam( char *svc, char *value );
-
#define SERVICE_EXIT( e, n ) do { \
if ( is_NT_Service ) { \
- SLAPDServiceStatus.dwWin32ExitCode = (e); \
- SLAPDServiceStatus.dwServiceSpecificExitCode = (n); \
+ lutil_ServiceStatus.dwWin32ExitCode = (e); \
+ lutil_ServiceStatus.dwServiceSpecificExitCode = (n); \
} \
} while ( 0 )
#define MAIN_RETURN(x) return(x)
#endif
-#ifdef HAVE_NT_EVENT_LOG
-void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, char *urls );
-void LogSlapdStoppedEvent( char *svc );
-#endif
-
/*
* when more than one slapd is running on one machine, each one might have
* it's own LOCAL for syslogging and must have its own pid/args files
fprintf( stderr,
"\t-4\t\tIPv4 only\n"
"\t-6\t\tIPv6 only\n"
+ "\t-c cookie\tSync cookie of consumer\n"
"\t-d level\tDebug level" "\n"
"\t-f filename\tConfiguration file\n"
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
char *serverName = NULL;
int serverMode = SLAP_SERVER_MODE;
+ struct berval cookie = { 0, NULL };
+
#ifdef CSRIMALLOC
FILE *leakfile;
if( ( leakfile = fopen( "slapd.leak", "w" )) == NULL ) {
}
#endif
+ sl_mem_init();
+
#ifdef HAVE_NT_SERVICE_MANAGER
{
int *i;
if ( is_NT_Service ) {
serverName = argv[0];
- CommenceStartupProcessing( serverName, slap_sig_shutdown );
+ lutil_CommenceStartupProcessing( serverName, slap_sig_shutdown );
if ( strcmp(serverName, SERVICE_NAME) )
regService = serverName;
}
- i = (int*)getRegParam( regService, "DebugLevel" );
+ i = (int*)lutil_getRegParam( regService, "DebugLevel" );
if ( i != NULL )
{
slap_debug = *i;
#endif
}
- newUrls = (char *) getRegParam(regService, "Urls");
+ newUrls = (char *) lutil_getRegParam(regService, "Urls");
if (newUrls)
{
if (urls)
}
- newConfigFile = (char*)getRegParam( regService, "ConfigFile" );
+ newConfigFile = (char*)lutil_getRegParam( regService, "ConfigFile" );
if ( newConfigFile != NULL )
{
configfile = newConfigFile;
#endif
while ( (i = getopt( argc, argv,
- "d:f:h:s:n:t"
+ "c:d:f:h:s:n:t"
#if LDAP_PF_INET6
"46"
#endif
urls = ch_strdup( optarg );
break;
+ case 'c': /* provide sync cookie, override if exist in replica */
+ if ( slap_sync_cookie ) {
+ slap_sync_cookie_free( slap_sync_cookie, 1 );
+ }
+ slap_sync_cookie = (struct sync_cookie *) ch_calloc( 1,
+ sizeof( struct sync_cookie ));
+ ber_str2bv( optarg, strlen( optarg ), 1, &cookie );
+ ber_bvarray_add( &slap_sync_cookie->octet_str, &cookie );
+ break;
+
case 'd': /* set debug level and 'do not detach' flag */
no_detach = 1;
#ifdef LDAP_DEBUG
#endif
extops_init();
+ lutil_passwd_init();
+ slap_op_init();
#ifdef SLAPD_MODULES
if ( module_init() != 0 ) {
}
#endif
+ if ( slap_schema_init( ) != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, CRIT, "main: schema initialization error\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "schema initialization error\n",
+ 0, 0, 0 );
+#endif
+
+ goto destroy;
+ }
+
if ( slap_init( serverMode, serverName ) != 0 ) {
rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 );
goto destroy;
}
- if ( slap_schema_init( ) != 0 ) {
+ if ( slap_controls_init( ) != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT, "main: schema initialization error\n", 0, 0, 0 );
+ LDAP_LOG( OPERATION, CRIT, "main: controls initialization error\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "schema initialization error\n",
+ "controls initialization error\n",
0, 0, 0 );
#endif
mal_leaktrace(1);
#endif
+ /*
+ * FIXME: moved here from slapd_daemon_task()
+ * because back-monitor db_open() needs it
+ */
+ time( &starttime );
+
if ( slap_startup( NULL ) != 0 ) {
rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
goto shutdown;
}
- {
- FILE *fp;
-
#ifdef NEW_LOGGING
- LDAP_LOG( SLAPD, INFO, "main: slapd starting.\n", 0, 0, 0 );
+ LDAP_LOG( SLAPD, INFO, "main: slapd starting.\n", 0, 0, 0 );
#else
- Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
#endif
- if (( slapd_pid_file != NULL ) &&
- (( fp = fopen( slapd_pid_file, "w" )) != NULL ))
- {
+ if ( slapd_pid_file != NULL ) {
+ FILE *fp = fopen( slapd_pid_file, "w" );
+
+ if( fp != NULL ) {
fprintf( fp, "%d\n", (int) getpid() );
fclose( fp );
+
+ } else {
+ free(slapd_pid_file);
+ slapd_pid_file = NULL;
}
+ }
- if (( slapd_args_file != NULL ) &&
- (( fp = fopen( slapd_args_file, "w" )) != NULL ))
- {
+ if ( slapd_args_file != NULL ) {
+ FILE *fp = fopen( slapd_args_file, "w" );
+
+ if( fp != NULL ) {
for ( i = 0; i < g_argc; i++ ) {
fprintf( fp, "%s ", g_argv[i] );
}
fprintf( fp, "\n" );
fclose( fp );
+ } else {
+ free(slapd_args_file);
+ slapd_args_file = NULL;
}
}
#ifdef HAVE_NT_EVENT_LOG
if (is_NT_Service)
- LogSlapdStartedEvent( serverName, slap_debug, configfile, urls );
+ lutil_LogStartedEvent( serverName, slap_debug, configfile, urls );
#endif
rc = slapd_daemon();
module_kill();
#endif
+ slap_op_destroy();
+
extops_kill();
stop:
#ifdef HAVE_NT_EVENT_LOG
if (is_NT_Service)
- LogSlapdStoppedEvent( serverName );
+ lutil_LogStoppedEvent( serverName );
#endif
#ifdef NEW_LOGGING
#ifdef HAVE_NT_SERVICE_MANAGER
- ReportSlapdShutdownComplete();
+ lutil_ReportShutdownComplete();
#endif
#ifdef LOG_DEBUG
#endif
slapd_daemon_destroy();
+ controls_destroy();
+
schema_destroy();
+ lutil_passwd_destroy();
+
#ifdef HAVE_TLS
ldap_pvt_tls_destroy();
#endif
+ if ( slapd_pid_file != NULL ) {
+ unlink( slapd_pid_file );
+ }
+ if ( slapd_args_file != NULL ) {
+ unlink( slapd_args_file );
+ }
+
config_destroy();
#ifdef CSRIMALLOC
projects / openldap / blobdiff