Suidperl fixes.

1) Official patch - remove the whole effort to fork off a process
   to run /bin/mail; we don't have a /bin/mail, but this brings our
   code in line with mainstream Perl recommendation.

2) Make the "Can't do setuid" message a bit clearer; when our userbase
   bumps into our suidperl-with-no-commit-bit, give them a good clue as
   to what is going on.

2 files changed, 5 insertions, 13 deletions

diff --git a/contrib/perl5/patchlevel.h b/contrib/perl5/patchlevel.h
index f95db63..1d65002 100644
--- a/contrib/perl5/patchlevel.h
+++ b/contrib/perl5/patchlevel.h
@@ -2,6 +2,7 @@
 
 /* do not adjust the whitespace! Configure expects the numbers to be
  * exactly on the third column */
+/* $FreeBSD$ */
 
 #define PERL_REVISION	5		/* age */
 #define PERL_VERSION	6		/* epoch */
@@ -70,6 +71,7 @@
 #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
 static	char	*local_patches[] = {
 	NULL
+	,"SUIDMAIL - fixes for suidperl security"
 	,NULL
 };
 
diff --git a/contrib/perl5/perl.c b/contrib/perl5/perl.c
index 5426220..a84bf85 100644
--- a/contrib/perl5/perl.c
+++ b/contrib/perl5/perl.c
@@ -2578,7 +2578,7 @@ sed %s -e \"/^[^#]/b\" \
 	    PerlProc_execv(Perl_form(aTHX_ "%s/sperl"PERL_FS_VER_FMT, BIN_EXP,
 				     (int)PERL_REVISION, (int)PERL_VERSION,
 				     (int)PERL_SUBVERSION), PL_origargv);
-	    Perl_croak(aTHX_ "Can't do setuid\n");
+	    Perl_croak(aTHX_ "Can't do setuid; ensure that the setuid bit is set on suidperl\n");
 	}
 #endif
 #endif
@@ -2759,16 +2759,6 @@ S_validate_suid(pTHX_ char *validarg, char *scriptname, int fdscript)
 	    if (tmpstatbuf.st_dev != PL_statbuf.st_dev ||
 		tmpstatbuf.st_ino != PL_statbuf.st_ino) {
 		(void)PerlIO_close(PL_rsfp);
-		if (PL_rsfp = PerlProc_popen("/bin/mail root","w")) {	/* heh, heh */
-		    PerlIO_printf(PL_rsfp,
-"User %"Uid_t_f" tried to run dev %ld ino %ld in place of dev %ld ino %ld!\n\
-(Filename of set-id script was %s, uid %"Uid_t_f" gid %"Gid_t_f".)\n\nSincerely,\nperl\n",
-			PL_uid,(long)tmpstatbuf.st_dev, (long)tmpstatbuf.st_ino,
-			(long)PL_statbuf.st_dev, (long)PL_statbuf.st_ino,
-			CopFILE(PL_curcop),
-			PL_statbuf.st_uid, PL_statbuf.st_gid);
-		    (void)PerlProc_pclose(PL_rsfp);
-		}
 		Perl_croak(aTHX_ "Permission denied\n");
 	    }
 	    if (
@@ -2830,7 +2820,7 @@ FIX YOUR KERNEL, PUT A C WRAPPER AROUND THIS SCRIPT, OR USE -u AND UNDUMP!\n");
 				     (int)PERL_REVISION, (int)PERL_VERSION,
 				     (int)PERL_SUBVERSION), PL_origargv);
 #endif
-	    Perl_croak(aTHX_ "Can't do setuid\n");
+	    Perl_croak(aTHX_ "Can't do setuid; ensure that the setuid bit is set on suidperl\n");
 	}
 
 	if (PL_statbuf.st_mode & S_ISGID && PL_statbuf.st_gid != PL_egid) {
@@ -2913,7 +2903,7 @@ FIX YOUR KERNEL, PUT A C WRAPPER AROUND THIS SCRIPT, OR USE -u AND UNDUMP!\n");
     PerlProc_execv(Perl_form(aTHX_ "%s/perl"PERL_FS_VER_FMT, BIN_EXP,
 			     (int)PERL_REVISION, (int)PERL_VERSION,
 			     (int)PERL_SUBVERSION), PL_origargv);/* try again */
-    Perl_croak(aTHX_ "Can't do setuid\n");
+    Perl_croak(aTHX_ "Can't do setuid; ensure that the setuid bit is set on suidperl\n");
 #endif /* IAMSUID */
 #else /* !DOSUID */
     if (PL_euid != PL_uid || PL_egid != PL_gid) {	/* (suidperl doesn't exist, in fact) */