upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 00:59:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't open pid/args files in one-shot mode (ITS#4152); bail out if files cannot be opened (port slapd's fix to ITS#4074)

Browse source
This commit is contained in:
Pierangelo Masarati 2005-11-09 10:17:04 +00:00
parent 10bf23d123
commit d88ea9d609
1 changed files with 40 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
servers/slurpd/main.c
View file

@ -215,31 +215,57 @@ int main( int argc, char **argv )
}
#endif
if ( slurpd_pid_file != NULL ) {
FILE *fp = fopen( slurpd_pid_file, "w" );
/*
* 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;
}
if( fp != NULL ) {
fprintf( fp, "%d\n", (int) getpid() );
fclose( fp );
} else {
free(slurpd_pid_file);
slurpd_pid_file = NULL;
}
}
if ( slurpd_args_file != NULL ) {
FILE *fp = fopen( slurpd_args_file, "w" );
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;
}
if( fp != NULL ) {
for ( i = 0; i < argc; i++ ) {
fprintf( fp, "%s ", argv[i] );
}
fprintf( fp, "\n" );
fclose( fp );
} else {
free(slurpd_args_file);
slurpd_args_file = NULL;
}
}