From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 23 Jan 2009 22:40:18 +0000 (+0000)
Subject: Remove redundant #ifndef SETUID_SCRIPTS_ARE_SECURE_NOW (and #endif).
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=35726f546a74ade3021e3957be5fce56c1d6f2a7;p=p5sagit%2Fp5-mst-13.2.git

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)
---

diff --git a/perl.c b/perl.c
index 66411ee..fc8e655 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 */
     }
 }