From owner-p4-projects  Sat Mar  8 17:24:10 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B5A5B37B404; Sat,  8 Mar 2003 17:24:08 -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 64E9237B401
	for <perforce@freebsd.org>; Sat,  8 Mar 2003 17:24:08 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A470643F93
	for <perforce@freebsd.org>; Sat,  8 Mar 2003 17:24:07 -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 h291O70U050175
	for <perforce@freebsd.org>; Sat, 8 Mar 2003 17:24:07 -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 h291O7Gh050169
	for perforce@freebsd.org; Sat, 8 Mar 2003 17:24:07 -0800 (PST)
Date: Sat, 8 Mar 2003 17:24:07 -0800 (PST)
Message-Id: <200303090124.h291O7Gh050169@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 26563 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=26563

Change 26563 by rwatson@rwatson_paprika on 2003/03/08 17:23:06

	Revert branch-local non-changes.

Affected files ...

.. //depot/projects/trustedbsd/acl/sys/sys/mount.h#4 integrate
.. //depot/projects/trustedbsd/acl/sys/ufs/ufs/ufs_acl.c#3 integrate

Differences ...

==== //depot/projects/trustedbsd/acl/sys/sys/mount.h#4 (text+ko) ====

@@ -212,7 +212,7 @@
 			MNT_NOSYMFOLLOW	| MNT_IGNORE	| MNT_JAILDEVFS	| \
 			MNT_NOCLUSTERR	| MNT_NOCLUSTERW | MNT_SUIDDIR	| \
 			MNT_ACLS )
- 
+  
 /*
  * External filesystem command modifier flags.
  * Unmount can use the MNT_FORCE flag.

==== //depot/projects/trustedbsd/acl/sys/ufs/ufs/ufs_acl.c#3 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
+ * Copyright (c) 1999-2001 Robert N. M. Watson
  * All rights reserved.
  *
  * This software was developed by Robert Watson for the TrustedBSD Project.

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