X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fmain.c;h=a502ea02651a23f4f308c4326e88e09fbd30939f;hb=d84ffb62a6c7528ef711547194307af629e0d082;hp=3220853fb7f0d97fb46ab51e0b37e29fa6deb1e4;hpb=3cbcf01cfdb77d6d8d575c1b23ca6db6a039ffa8;p=openldap
diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 3220853fb7..a502ea0265 100644
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -1,10 +1,18 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -14,6 +22,12 @@
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP). Additional significant contributors
+ * include:
+ * Howard Chu
+ */
/*
@@ -25,6 +39,7 @@
#include
#include
#include
+#include
#include "slurp.h"
#include "globals.h"
@@ -45,6 +60,11 @@
#define MAIN_RETURN(x) return(x)
#endif
+#ifndef HAVE_MKVERSION
+const char Versionstr[] =
+ OPENLDAP_PACKAGE " " OPENLDAP_VERSION " Standalone LDAP Replicator (slurpd)";
+#endif
+
#ifdef HAVE_NT_SERVICE_MANAGER
void WINAPI ServiceMain( DWORD argc, LPTSTR *argv )
#else
@@ -90,26 +110,14 @@ int main( int argc, char **argv )
if ( i != NULL )
{
ldap_debug = *i;
-#ifdef NEW_LOGGING
- lutil_log_initialize( argc, argv );
- LDAP_LOG( SLURPD, INFO,
- "main: new debug level from registry is: %d\n",
- ldap_debug, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", ldap_debug, 0, 0 );
-#endif
}
newConfigFile = (char*)lutil_getRegParam( regService, "ConfigFile" );
if ( newConfigFile != NULL )
{
sglob->slapd_configfile = newConfigFile;
-#ifdef NEW_LOGGING
- LDAP_LOG( SLURPD, INFO,
- "main: new config file from registry is: %s\n", sglob->slapd_configfile, 0, 0 );
-#else
Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", sglob->slapd_configfile, 0, 0 );
-#endif
}
}
@@ -124,6 +132,16 @@ int main( int argc, char **argv )
goto stop;
}
+ if ( sglob->version ) {
+ fprintf(stderr, "%s\n", Versionstr);
+ if (sglob->version > 1 ) {
+ rc = 1;
+ goto stop;
+ }
+ }
+
+ Debug ( LDAP_DEBUG_ANY, "%s\n", Versionstr, 0, 0 );
+
/*
* Read slapd config file and initialize Re (per-replica) structs.
*/
@@ -137,11 +155,21 @@ int main( int argc, char **argv )
}
#ifdef HAVE_TLS
- if( ldap_pvt_tls_init() || ldap_pvt_tls_init_def_ctx() ) {
- fprintf( stderr, "TLS Initialization failed.\n" );
- SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
- rc = 1;
- goto stop;
+ if( ldap_pvt_tls_init() || ldap_pvt_tls_init_def_ctx( 0 ) ) {
+ rc = 0;
+ /* See if we actually need TLS */
+ for ( i=0; i < sglob->num_replicas; i++ ) {
+ if ( sglob->replicas[i]->ri_tls || ( sglob->replicas[i]->ri_uri &&
+ !strncmp( sglob->replicas[i]->ri_uri, "ldaps:", 6 ))) {
+ rc = 1;
+ break;
+ }
+ }
+ if ( rc ) {
+ fprintf( stderr, "TLS Initialization failed.\n" );
+ SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+ goto stop;
+ }
}
#endif
@@ -160,7 +188,7 @@ int main( int argc, char **argv )
*/
if ( sglob->st->st_read( sglob->st )) {
fprintf( stderr, "Malformed slurpd status file \"%s\"\n",
- sglob->slurpd_status_file, 0, 0 );
+ sglob->slurpd_status_file );
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 17 );
rc = 1;
goto stop;
@@ -176,15 +204,77 @@ int main( int argc, char **argv )
goto stop;
}
+
/*
* Detach from the controlling terminal
* unless the -d flag is given or in one-shot mode.
*/
#ifndef HAVE_WINSOCK
- if ( ! (sglob->no_detach || sglob->one_shot_mode) )
- lutil_detach( 0, 0 );
+ if ( ! (sglob->no_detach || sglob->one_shot_mode) ) {
+ lutil_detach( 0, 0 );
+ }
#endif
+ /*
+ * don't open pid/args file in one-shot mode (ITS#4152)
+ *
+ * bail out if files were specified but cannot be opened (ITS#4074)
+ */
+ if ( !sglob->one_shot_mode) {
+ if ( slurpd_pid_file != NULL ) {
+ FILE *fp = fopen( slurpd_pid_file, "w" );
+
+ if ( fp == NULL ) {
+ int save_errno = errno;
+
+ fprintf( stderr, "unable to open pid file "
+ "\"%s\": %d (%s)\n",
+ slurpd_pid_file,
+ save_errno, strerror( save_errno ) );
+
+ free( slurpd_pid_file );
+ slurpd_pid_file = NULL;
+
+ rc = 1;
+ goto stop;
+ }
+
+ fprintf( fp, "%d\n", (int) getpid() );
+ fclose( fp );
+ }
+
+ if ( slurpd_args_file != NULL ) {
+ FILE *fp = fopen( slurpd_args_file, "w" );
+
+ if ( fp == NULL ) {
+ int save_errno = errno;
+
+ fprintf( stderr, "unable to open args file "
+ "\"%s\": %d (%s)\n",
+ slurpd_args_file,
+ save_errno, strerror( save_errno ) );
+
+ free( slurpd_args_file );
+ slurpd_pid_file = NULL;
+
+ rc = 1;
+ goto stop;
+ }
+
+ for ( i = 0; i < argc; i++ ) {
+ fprintf( fp, "%s ", argv[i] );
+ }
+ fprintf( fp, "\n" );
+ fclose( fp );
+ }
+ }
+
+ if ( (rc = lutil_pair( sglob->wake_sds )) < 0 ) {
+ SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );
+ rc = 1;
+ goto stop;
+ }
+
#ifdef HAVE_NT_EVENT_LOG
if (is_NT_Service) lutil_LogStartedEvent( sglob->serverName, ldap_debug, sglob->slapd_configfile, "n/a" );
#endif
@@ -195,13 +285,8 @@ int main( int argc, char **argv )
if ( ldap_pvt_thread_create( &(sglob->fm_tid),
0, fm, (void *) NULL ) != 0 )
{
-#ifdef NEW_LOGGING
- LDAP_LOG ( SLURPD, ERR,
- "main: file manager ldap_pvt_thread_create failed\n" , 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "file manager ldap_pvt_thread_create failed\n",
0, 0, 0 );
-#endif
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
rc = 1;
goto stop;
@@ -251,11 +336,20 @@ stop:
/* destroy the thread package */
ldap_pvt_thread_destroy();
-#ifdef NEW_LOGGING
- LDAP_LOG ( SLURPD, RESULTS, "main: slurpd terminated\n", 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
+#ifdef HAVE_TLS
+ ldap_pvt_tls_destroy();
#endif
+
+ Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
+
+ if ( slurpd_pid_file != NULL ) {
+ unlink( slurpd_pid_file );
+ }
+ if ( slurpd_args_file != NULL ) {
+ unlink( slurpd_args_file );
+ }
+
+
MAIN_RETURN(rc);
#endif /* !NO_THREADS */
}