diff options
| author | cperciva <cperciva@FreeBSD.org> | 2004-07-26 07:24:04 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2004-07-26 07:24:04 +0000 |
| commit | d9fecc83c80e01cb4e66d1fd0a02e96b1fcbcbc5 (patch) | |
| tree | e24e86995427678a1313e8f62cc17f84bdcaf82b /sys/kern/vfs_acl.c | |
| parent | 5997e4b6ce7d492b2ccb725239af23a268509c09 (diff) | |
| download | FreeBSD-src-d9fecc83c80e01cb4e66d1fd0a02e96b1fcbcbc5.zip FreeBSD-src-d9fecc83c80e01cb4e66d1fd0a02e96b1fcbcbc5.tar.gz | |
Rename suser_cred()'s PRISON_ROOT flag to SUSER_ALLOWJAIL. This is
somewhat clearer, but more importantly allows for a consistent naming
scheme for suser_cred flags.
The old name is still defined, but will be removed in a few days (unless I
hear any complaints...)
Discussed with: rwatson, scottl
Requested by: jhb
Diffstat (limited to 'sys/kern/vfs_acl.c')
| -rw-r--r-- | sys/kern/vfs_acl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index 01e5e3ba..7beca5c 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -92,7 +92,7 @@ vaccess_acl_posix1e(enum vtype type, uid_t file_uid, gid_t file_gid, * a DAC entry that matches but has failed to allow access. */ #ifndef CAPABILITIES - if (suser_cred(cred, PRISON_ROOT) == 0) + if (suser_cred(cred, SUSER_ALLOWJAIL) == 0) cap_granted = VALLPERM; else cap_granted = 0; @@ -101,24 +101,24 @@ vaccess_acl_posix1e(enum vtype type, uid_t file_uid, gid_t file_gid, if (type == VDIR) { if ((acc_mode & VEXEC) && !cap_check(cred, NULL, - CAP_DAC_READ_SEARCH, PRISON_ROOT)) + CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) cap_granted |= VEXEC; } else { if ((acc_mode & VEXEC) && !cap_check(cred, NULL, - CAP_DAC_EXECUTE, PRISON_ROOT)) + CAP_DAC_EXECUTE, SUSER_ALLOWJAIL)) cap_granted |= VEXEC; } if ((acc_mode & VREAD) && !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, - PRISON_ROOT)) + SUSER_ALLOWJAIL)) cap_granted |= VREAD; if (((acc_mode & VWRITE) || (acc_mode & VAPPEND)) && - !cap_check(cred, NULL, CAP_DAC_WRITE, PRISON_ROOT)) + !cap_check(cred, NULL, CAP_DAC_WRITE, SUSER_ALLOWJAIL)) cap_granted |= (VWRITE | VAPPEND); if ((acc_mode & VADMIN) && !cap_check(cred, NULL, CAP_FOWNER, - PRISON_ROOT)) + SUSER_ALLOWJAIL)) cap_granted |= VADMIN; #endif /* CAPABILITIES */ |
