From d88ea9d60993ba5082f35f5590b65069eabcdc77 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 9 Nov 2005 10:17:04 +0000 Subject: [PATCH] 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) --- servers/slurpd/main.c | 54 ++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c index 33dcd9b842..a502ea0265 100644 --- a/servers/slurpd/main.c +++ b/servers/slurpd/main.c @@ -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; } } -- 2.39.5