--- parser3/src/main/pa_exec.C 2009/10/02 01:18:27 1.78 +++ parser3/src/main/pa_exec.C 2010/08/25 02:13:06 1.80 @@ -7,7 +7,7 @@ @todo setrlimit */ -static const char * const IDENT_EXEC_C="$Date: 2009/10/02 01:18:27 $"; +static const char * const IDENT_EXEC_C="$Date: 2010/08/25 02:13:06 $"; #include "pa_config_includes.h" @@ -362,11 +362,11 @@ static void append_env_pair(HashStringSt } PA_exec_result pa_exec( - bool -#if defined(NO_PA_EXEC) || defined(PA_SAFE_MODE) - forced_allow + bool +#ifdef NO_PA_EXECS + forced_allow #endif - , + , const String& file_spec, const HashStringString* env, const ArrayString& argv, @@ -440,7 +440,6 @@ from http://www.apache.org/websrc/cvsweb int pipe_write, pipe_read, pipe_err; -#ifdef PA_SAFE_MODE if(!forced_allow) { struct stat finfo; if(stat(file_spec_cstr, &finfo)!=0) @@ -451,7 +450,6 @@ from http://www.apache.org/websrc/cvsweb check_safe_mode(finfo, file_spec, file_spec_cstr); } -#endif char* argv_cstrs[1+100+1]={file_spec_cstr, 0}; const int argv_size=argv.count();