From owner-svn-src-head@FreeBSD.ORG Tue Oct 28 21:58:48 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5B9B106567D; Tue, 28 Oct 2008 21:58:48 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 92B0C8FC0A; Tue, 28 Oct 2008 21:58:48 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SLwm8o005027; Tue, 28 Oct 2008 21:58:48 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9SLwmF4005026; Tue, 28 Oct 2008 21:58:48 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <200810282158.m9SLwmF4005026@svn.freebsd.org> From: Edward Tomasz Napierala Date: Tue, 28 Oct 2008 21:58:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184427 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Oct 2008 21:58:48 -0000 Author: trasz Date: Tue Oct 28 21:58:48 2008 New Revision: 184427 URL: http://svn.freebsd.org/changeset/base/184427 Log: Rename a variable missed in previous accmode_t-related commits. Approved by: rwatson (mentor) Modified: head/sys/kern/subr_acl_posix1e.c Modified: head/sys/kern/subr_acl_posix1e.c ============================================================================== --- head/sys/kern/subr_acl_posix1e.c Tue Oct 28 21:57:32 2008 (r184426) +++ head/sys/kern/subr_acl_posix1e.c Tue Oct 28 21:58:48 2008 (r184427) @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); */ int vaccess_acl_posix1e(enum vtype type, uid_t file_uid, gid_t file_gid, - struct acl *acl, accmode_t acc_mode, struct ucred *cred, int *privused) + struct acl *acl, accmode_t accmode, struct ucred *cred, int *privused) { struct acl_entry *acl_other, *acl_mask; accmode_t dac_granted; @@ -81,23 +81,23 @@ vaccess_acl_posix1e(enum vtype type, uid priv_granted = 0; if (type == VDIR) { - if ((acc_mode & VEXEC) && !priv_check_cred(cred, + if ((accmode & VEXEC) && !priv_check_cred(cred, PRIV_VFS_LOOKUP, 0)) priv_granted |= VEXEC; } else { - if ((acc_mode & VEXEC) && !priv_check_cred(cred, + if ((accmode & VEXEC) && !priv_check_cred(cred, PRIV_VFS_EXEC, 0)) priv_granted |= VEXEC; } - if ((acc_mode & VREAD) && !priv_check_cred(cred, PRIV_VFS_READ, 0)) + if ((accmode & VREAD) && !priv_check_cred(cred, PRIV_VFS_READ, 0)) priv_granted |= VREAD; - if (((acc_mode & VWRITE) || (acc_mode & VAPPEND)) && + if (((accmode & VWRITE) || (accmode & VAPPEND)) && !priv_check_cred(cred, PRIV_VFS_WRITE, 0)) priv_granted |= (VWRITE | VAPPEND); - if ((acc_mode & VADMIN) && !priv_check_cred(cred, PRIV_VFS_ADMIN, 0)) + if ((accmode & VADMIN) && !priv_check_cred(cred, PRIV_VFS_ADMIN, 0)) priv_granted |= VADMIN; /* @@ -120,14 +120,14 @@ vaccess_acl_posix1e(enum vtype type, uid dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) dac_granted |= (VWRITE | VAPPEND); - if ((acc_mode & dac_granted) == acc_mode) + if ((accmode & dac_granted) == accmode) return (0); /* * XXXRW: Do privilege lookup here. */ - if ((acc_mode & (dac_granted | priv_granted)) == - acc_mode) { + if ((accmode & (dac_granted | priv_granted)) == + accmode) { if (privused != NULL) *privused = 1; return (0); @@ -197,13 +197,13 @@ vaccess_acl_posix1e(enum vtype type, uid if (acl->acl_entry[i].ae_perm & ACL_WRITE) dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; - if ((acc_mode & dac_granted) == acc_mode) + if ((accmode & dac_granted) == accmode) return (0); /* * XXXRW: Do privilege lookup here. */ - if ((acc_mode & (dac_granted | priv_granted)) != - acc_mode) + if ((accmode & (dac_granted | priv_granted)) != + accmode) goto error; if (privused != NULL) @@ -234,7 +234,7 @@ vaccess_acl_posix1e(enum vtype type, uid dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; - if ((acc_mode & dac_granted) == acc_mode) + if ((accmode & dac_granted) == accmode) return (0); group_matched = 1; @@ -252,7 +252,7 @@ vaccess_acl_posix1e(enum vtype type, uid dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; - if ((acc_mode & dac_granted) == acc_mode) + if ((accmode & dac_granted) == accmode) return (0); group_matched = 1; @@ -285,8 +285,8 @@ vaccess_acl_posix1e(enum vtype type, uid /* * XXXRW: Do privilege lookup here. */ - if ((acc_mode & (dac_granted | priv_granted)) - != acc_mode) + if ((accmode & (dac_granted | priv_granted)) + != accmode) break; if (privused != NULL) @@ -309,8 +309,8 @@ vaccess_acl_posix1e(enum vtype type, uid /* * XXXRW: Do privilege lookup here. */ - if ((acc_mode & (dac_granted | priv_granted)) - != acc_mode) + if ((accmode & (dac_granted | priv_granted)) + != accmode) break; if (privused != NULL) @@ -339,19 +339,19 @@ vaccess_acl_posix1e(enum vtype type, uid if (acl_other->ae_perm & ACL_WRITE) dac_granted |= (VWRITE | VAPPEND); - if ((acc_mode & dac_granted) == acc_mode) + if ((accmode & dac_granted) == accmode) return (0); /* * XXXRW: Do privilege lookup here. */ - if ((acc_mode & (dac_granted | priv_granted)) == acc_mode) { + if ((accmode & (dac_granted | priv_granted)) == accmode) { if (privused != NULL) *privused = 1; return (0); } error: - return ((acc_mode & VADMIN) ? EPERM : EACCES); + return ((accmode & VADMIN) ? EPERM : EACCES); } /*