mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-27 18:19:52 -05:00
ITS#2318: unlink pid file (and args file)
This commit is contained in:
parent
05619c6ec7
commit
13b63911a4
1 changed files with 26 additions and 12 deletions
|
|
@ -524,31 +524,38 @@ int main( int argc, char **argv )
|
|||
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 );
|
||||
}
|
||||
|
||||
if (( slapd_args_file != NULL ) &&
|
||||
(( fp = fopen( slapd_args_file, "w" )) != NULL ))
|
||||
{
|
||||
} else {
|
||||
free(slapd_pid_file);
|
||||
slapd_pid_file = 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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -607,6 +614,13 @@ stop:
|
|||
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
|
||||
|
|
|
|||
Loading…
Reference in a new issue