PERFORCE change 179130 for review
Robert Watson
rwatson at FreeBSD.org
Thu Jun 3 08:24:43 UTC 2010
http://p4web.freebsd.org/@@179130?ac=10
Change 179130 by rwatson at rwatson_vimage_client on 2010/06/03 08:24:04
Correct merge nits from integration.
Affected files ...
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#11 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/trap.c#13 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/posix4_mib.c#4 edit
Differences ...
==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#11 (text+ko) ====
@@ -853,7 +853,7 @@
* SYF_CAPENABLED.
*/
if (error == 0) {
- if (!(callp->sy_flags & SYF_CAPENABLED) &&
+ if (!(sa->callp->sy_flags & SYF_CAPENABLED) &&
(td->td_ucred->cr_flags & CRED_FLAG_CAPMODE))
error = ENOSYS;
}
==== //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/trap.c#13 (text+ko) ====
@@ -1025,7 +1025,7 @@
* SYF_CAPENABLED.
*/
if (error == 0) {
- if (!(callp->sy_flags & SYF_CAPENABLED) &&
+ if (!(sa->callp->sy_flags & SYF_CAPENABLED) &&
(td->td_ucred->cr_flags & CRED_FLAG_CAPMODE))
error = ENOSYS;
}
==== //depot/projects/trustedbsd/capabilities/src/sys/kern/posix4_mib.c#4 (text+ko) ====
@@ -57,7 +57,7 @@
SYSCTL_DECL(_p1003_1b);
#define P1B_SYSCTL(num, name) \
- SYSCTL_INT(_p1003_1b, num, name, CTLFLAG_RD | CTFLAG_CAPRD, \
+ SYSCTL_INT(_p1003_1b, num, name, CTLFLAG_RD | CTLFLAG_CAPRD, \
facility + num - 1, 0, "");
#define P1B_SYSCTL_RW(num, name) \
SYSCTL_PROC(_p1003_1b, num, name, CTLTYPE_INT | CTLFLAG_RW | \
@@ -68,11 +68,11 @@
SYSCTL_DECL(_kern_p1003_1b);
#define P1B_SYSCTL(num, name) \
- SYSCTL_INT(_kern_p1003_1b, OID_AUTO, name, CTLFLAG_RD | CTFLAG_CAPRD, \
+ SYSCTL_INT(_kern_p1003_1b, OID_AUTO, name, CTLFLAG_RD | CTLFLAG_CAPRD, \
facility + num - 1, 0, "");
#define P1B_SYSCTL_RW(num, name) \
SYSCTL_PROC(_p1003_1b, OID_AUTO, name, CTLTYPE_INT | CTLFLAG_RW | \
- CTFLAG_CAPRD, NULL, num, p31b_sysctl_proc, "I", "");
+ CTLFLAG_CAPRD, NULL, num, p31b_sysctl_proc, "I", "");
SYSCTL_NODE(_kern, OID_AUTO, p1003_1b, CTLFLAG_RW, 0, "P1003.1B");
#endif
More information about the p4-projects
mailing list