From owner-p4-projects  Tue Aug 13 18:41:58 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3FB8837B405; Tue, 13 Aug 2002 18:41:53 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D7F3237B400
	for <perforce@freebsd.org>; Tue, 13 Aug 2002 18:41:52 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 94BB443E42
	for <perforce@freebsd.org>; Tue, 13 Aug 2002 18:41:52 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7E1fqJU030976
	for <perforce@freebsd.org>; Tue, 13 Aug 2002 18:41:52 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7E1fqvC030973
	for perforce@freebsd.org; Tue, 13 Aug 2002 18:41:52 -0700 (PDT)
Date: Tue, 13 Aug 2002 18:41:52 -0700 (PDT)
Message-Id: <200208140141.g7E1fqvC030973@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 15950 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15950

Change 15950 by rwatson@rwatson_paprika on 2002/08/13 18:40:51

	Restore rc's sendmail startup for vi recovery to its pre-MAC
	state: labeling of processes in the boot sequence is not
	yet something we're highly ready to do.  This commit makes
	this invocation of sendmail consistent with the others where
	we also removed the setpmac call.

Affected files ...

.. //depot/projects/trustedbsd/mac/etc/rc#16 edit

Differences ...

==== //depot/projects/trustedbsd/mac/etc/rc#16 (text+ko) ====

@@ -802,8 +802,7 @@
 			# Else send mail to the user.
 			recfile=`awk '/^X-vi-recover-path:/{print $2}' < "${i}"`
 			if [ -n "${recfile}" -a -s "${recfile}" ]; then
-				/usr/sbin/setpmac ${sendmail_label} sendmail \
-				    -t < "${i}"
+				sendmail -t < "${i}"
 			else
 				rm -f "${i}"
 			fi

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message