From owner-p4-projects  Sat Nov 23 21:33: 2 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 70D6F37B404; Sat, 23 Nov 2002 21:33:00 -0800 (PST)
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 05FE537B401
	for <perforce@freebsd.org>; Sat, 23 Nov 2002 21:33:00 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B3B8543E4A
	for <perforce@freebsd.org>; Sat, 23 Nov 2002 21:32:59 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAO5TcmV034209
	for <perforce@freebsd.org>; Sat, 23 Nov 2002 21:29:38 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAO5Tb1Y034206
	for perforce@freebsd.org; Sat, 23 Nov 2002 21:29:37 -0800 (PST)
Date: Sat, 23 Nov 2002 21:29:37 -0800 (PST)
Message-Id: <200211240529.gAO5Tb1Y034206@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 21447 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://perforce.freebsd.org/chv.cgi?CH=21447

Change 21447 by rwatson@rwatson_tislabs on 2002/11/23 21:29:08

	Move to gshapiro's variation on the MAC patch to match what
	will be in sendmail.

Affected files ...

.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#11 (text+ko) ====

@@ -2352,15 +2352,20 @@
 
 			if (contextaddr != NULL)
 			{
+				int sucflags;
 				struct passwd *pwd;
 
 				if (contextaddr->q_ruser != NULL)
 					pwd = sm_getpwnam(contextaddr->q_ruser);
 				else
 					pwd = sm_getpwnam(contextaddr->q_user);
+				sucflags = LOGIN_SETRESOURCES|LOGIN_SETPRIORITY;
+#ifdef LOGIN_SETMAC
+				sucflags |= LOGIN_SETMAC;
+#endif /* LOGIN_SETMAC */
 				if (pwd != NULL &&
 				    setusercontext(NULL, pwd, pwd->pw_uid,
-						   LOGIN_SETRESOURCES|LOGIN_SETPRIORITY|LOGIN_SETMAC) == -1 &&
+						   sucflags) == -1 &&
 				    suidwarn)
 				{
 					syserr("openmailer: setusercontext() failed");

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