From owner-p4-projects  Sat Mar 22 19: 7:20 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9580937B404; Sat, 22 Mar 2003 19:07:17 -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 3431B37B401
	for <perforce@freebsd.org>; Sat, 22 Mar 2003 19:07:17 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C989543F75
	for <perforce@freebsd.org>; Sat, 22 Mar 2003 19:07:16 -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 h2N37G0U019473
	for <perforce@freebsd.org>; Sat, 22 Mar 2003 19:07:16 -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 h2N37GB9019470
	for perforce@freebsd.org; Sat, 22 Mar 2003 19:07:16 -0800 (PST)
Date: Sat, 22 Mar 2003 19:07:16 -0800 (PST)
Message-Id: <200303230307.h2N37GB9019470@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 27246 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=27246

Change 27246 by rwatson@rwatson_paprika on 2003/03/22 19:06:15

	Adapt ufs_create() and ufs_mknod() for new cmask semantics;
	don't permit ACL override of the umask yet since I haven't
	decided how best to re-mix ufs_makeinode(), etc.

Affected files ...

.. //depot/projects/trustedbsd/acl/sys/ufs/ufs/ufs_vnops.c#3 edit

Differences ...

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

@@ -190,13 +190,19 @@
 		struct vnode **a_vpp;
 		struct componentname *a_cnp;
 		struct vattr *a_vap;
+		int a_cmask;
 	} */ *ap;
 {
+	u_short mode;
 	int error;
 
+	/*
+	 * XXXACL: No ACL umask override here yet.
+	 */
+	mode = ap->a_vap->va_mode &~ ap->a_cmask;
 	error =
-	    ufs_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_vap->va_mode),
-	    ap->a_dvp, ap->a_vpp, ap->a_cnp);
+	    ufs_makeinode(MAKEIMODE(ap->a_vap->va_type, mode), ap->a_dvp,
+	    ap->a_vpp, ap->a_cnp);
 	if (error)
 		return (error);
 	VN_KNOTE(ap->a_dvp, NOTE_WRITE);
@@ -214,16 +220,22 @@
 		struct vnode **a_vpp;
 		struct componentname *a_cnp;
 		struct vattr *a_vap;
+		int a_cmask;
 	} */ *ap;
 {
 	struct vattr *vap = ap->a_vap;
 	struct vnode **vpp = ap->a_vpp;
 	struct inode *ip;
+	u_short mode;
 	ino_t ino;
 	int error;
 
-	error = ufs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode),
-	    ap->a_dvp, vpp, ap->a_cnp);
+	/*
+	 * XXXACL: No ACL umask override here yet.
+	 */
+	mode = vap->va_mode &~ ap->a_cmask;
+	error = ufs_makeinode(MAKEIMODE(vap->va_type, mode), ap->a_dvp, vpp,
+	    ap->a_cnp);
 	if (error)
 		return (error);
 	VN_KNOTE(ap->a_dvp, NOTE_WRITE);

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