Commit 510c95af authored by Howard Chu's avatar Howard Chu
Browse files

ITS#9745 more for prev commit

parent a1799a6e
Pipeline #3799 passed with stage
in 43 minutes and 18 seconds
...@@ -94,6 +94,10 @@ struct signal_handler { ...@@ -94,6 +94,10 @@ struct signal_handler {
{ 0, NULL } { 0, NULL }
}; };
/* in logging.c */
extern char *serverName;
extern int slap_debug_orig;
/* /*
* when more than one lloadd is running on one machine, each one might have * when more than one lloadd is running on one machine, each one might have
* it's own LOCAL for syslogging and must have its own pid/args files * it's own LOCAL for syslogging and must have its own pid/args files
...@@ -367,7 +371,6 @@ main( int argc, char **argv ) ...@@ -367,7 +371,6 @@ main( int argc, char **argv )
char *configfile = NULL; char *configfile = NULL;
char *configdir = NULL; char *configdir = NULL;
char *serverName;
int serverMode = SLAP_SERVER_MODE; int serverMode = SLAP_SERVER_MODE;
char **debug_unknowns = NULL; char **debug_unknowns = NULL;
...@@ -601,6 +604,7 @@ unhandled_option:; ...@@ -601,6 +604,7 @@ unhandled_option:;
ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug ); ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug );
ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug ); ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug );
ldif_debug = slap_debug; ldif_debug = slap_debug;
slap_debug_orig = slap_debug;
if ( version ) { if ( version ) {
fprintf( stderr, "%s\n", Versionstr ); fprintf( stderr, "%s\n", Versionstr );
...@@ -833,7 +837,7 @@ unhandled_option:; ...@@ -833,7 +837,7 @@ unhandled_option:;
#ifndef HAVE_WINSOCK #ifndef HAVE_WINSOCK
if ( !no_detach ) { if ( !no_detach ) {
write( waitfds[1], "1", 1 ); (void)!write( waitfds[1], "1", 1 );
close( waitfds[1] ); close( waitfds[1] );
} }
#endif #endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment