PERFORCE change 181139 for review
Robert Watson
rwatson at FreeBSD.org
Sun Jul 18 15:02:32 UTC 2010
http://p4web.freebsd.org/@@181139?ac=10
Change 181139 by rwatson at rwatson_vimage_client on 2010/07/18 15:02:01
Minor capability-related style(9) tweaks to openat(2).
Affected files ...
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#32 edit
Differences ...
==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#32 (text+ko) ====
@@ -1117,8 +1117,10 @@
flags = FFLAGS(flags);
#ifdef CAPABILITIES
- if (flags & FREAD) baserights |= CAP_READ;
- if (flags & FWRITE) baserights |= CAP_WRITE;
+ if (flags & FREAD)
+ baserights |= CAP_READ;
+ if (flags & FWRITE)
+ baserights |= CAP_WRITE;
#endif
/*
@@ -1134,7 +1136,7 @@
fp->f_flag = flags & FMASK;
cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT;
NDINIT_ATRIGHTS(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg,
- path, fd, baserights, td);
+ path, fd, baserights, td);
td->td_dupfd = -1; /* XXX check for fdopen */
error = vn_open(&nd, &flags, cmode, fp);
if (error) {
@@ -1227,7 +1229,7 @@
success:
#ifdef CAPABILITIES
if (nd.ni_baserights != -1) {
- /* wrap the result in a capability */
+ /* Wrap the result in a capability. */
struct file *cap;
error = kern_capwrap(td, fp, nd.ni_baserights, &cap, &indx);
More information about the p4-projects
mailing list