upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-06 06:59:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

unlink pid/args files only if actually touched (ITS#4251)

Browse source
This commit is contained in:
Pierangelo Masarati 2005-12-07 14:47:00 +00:00
parent 51f9ef7ab9
commit a4f800413d
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
servers/slapd/main.c
View file

@ -247,23 +247,25 @@ int main( int argc, char **argv )
char *sandbox = NULL;
#endif
#ifdef LOG_LOCAL4
int syslogUser = DEFAULT_SYSLOG_USER;
int syslogUser = DEFAULT_SYSLOG_USER;
#endif
int g_argc = argc;
char **g_argv = argv;
char *configfile = NULL;
char *configdir = NULL;
char *serverName;
int serverMode = SLAP_SERVER_MODE;
char *configfile = NULL;
char *configdir = NULL;
char *serverName;
int serverMode = SLAP_SERVER_MODE;
struct sync_cookie *scp = NULL;
struct sync_cookie *scp_entry = NULL;
char *serverNamePrefix = "";
char *serverNamePrefix = "";
size_t l;
int slapd_pid_file_unlink = 0, slapd_args_file_unlink = 0;
#ifdef CSRIMALLOC
FILE *leakfile;
if( ( leakfile = fopen( "slapd.leak", "w" )) == NULL ) {
@ -749,9 +751,9 @@ unhandled_option:;
rc = 1;
goto destroy;
}
fprintf( fp, "%d\n", (int) getpid() );
fclose( fp );
slapd_pid_file_unlink = 1;
}
if ( slapd_args_file != NULL ) {
@ -777,6 +779,7 @@ unhandled_option:;
}
fprintf( fp, "\n" );
fclose( fp );
slapd_args_file_unlink = 1;
}
/*
@ -859,10 +862,10 @@ stop:
ldap_pvt_tls_destroy();
#endif
if ( slapd_pid_file != NULL ) {
if ( slapd_pid_file_unlink ) {
unlink( slapd_pid_file );
}
if ( slapd_args_file != NULL ) {
if ( slapd_args_file_unlink ) {
unlink( slapd_args_file );
}