summaryrefslogtreecommitdiff
path: root/perl.c
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2009-01-23 22:40:18 +0000
committerNicholas Clark <nick@ccl4.org>2009-01-23 22:41:20 +0000
commit35726f546a74ade3021e3957be5fce56c1d6f2a7 (patch)
treec554c21db2e9ba5a861de8a52830898026fd3548 /perl.c
parentcf5a8da6882fed918a9d80d63b4aec653697b040 (diff)
downloadperl-35726f546a74ade3021e3957be5fce56c1d6f2a7.tar.gz
Remove redundant #ifndef SETUID_SCRIPTS_ARE_SECURE_NOW (and #endif).
Redundant because it was always true, as it was inside the #else of an #ifdef SETUID_SCRIPTS_ARE_SECURE_NOW (Another bit of cleanup following change 32997)
Diffstat (limited to 'perl.c')
-rw-r--r--perl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/perl.c b/perl.c
index 66411eea90..fc8e6555d9 100644
--- a/perl.c
+++ b/perl.c
@@ -4270,7 +4270,6 @@ S_validate_suid(pTHX_ PerlIO *rsfp)
PERL_ARGS_ASSERT_VALIDATE_SUID;
if (PL_euid != PL_uid || PL_egid != PL_gid) { /* (suidperl doesn't exist, in fact) */
-# ifndef SETUID_SCRIPTS_ARE_SECURE_NOW
dVAR;
PerlLIO_fstat(PerlIO_fileno(rsfp),&PL_statbuf); /* may be either wrapped or real suid */
@@ -4281,7 +4280,6 @@ S_validate_suid(pTHX_ PerlIO *rsfp)
if (!PL_do_undump)
Perl_croak(aTHX_ "YOU HAVEN'T DISABLED SET-ID SCRIPTS IN THE KERNEL YET!\n\
FIX YOUR KERNEL, PUT A C WRAPPER AROUND THIS SCRIPT, OR USE -u AND UNDUMP!\n");
-# endif /* SETUID_SCRIPTS_ARE_SECURE_NOW */
/* not set-id, must be wrapped */
}
}