PERFORCE change 46995 for review
Robert Watson
rwatson at FreeBSD.org
Sun Feb 15 17:34:32 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=46995
Change 46995 by rwatson at rwatson_fledge on 2004/02/15 09:34:15
Copyright update, whitespace consistency cleanup, style cleanup.
Affected files ...
.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#2 edit
Differences ...
==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#2 (text+ko) ====
@@ -1,11 +1,11 @@
/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2003, 2004 Networks Associates Technology, Inc.
* All rights reserved.
*
- * This software was developed for the FreeBSD Project by NAI Labs, the
- * Security Research Division of Network Associates, Inc. under
- * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA
- * CHATS research program.
+ * This software was developed for the FreeBSD Project by McAfee
+ * Research, the Security Research Division of Network Associates, Inc.
+ * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
+ * DARPA CHATS research program.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -136,21 +136,21 @@
int
cap_check_cred(struct ucred *cred, struct thread *td, cap_value_t cap, int jailflags)
{
- int error;
+ int error;
#ifdef MAC
- error = mac_check_cap (cred, cap);
- if (error)
- return error;
+ error = mac_check_cap(cred, cap);
+ if (error)
+ return error;
#endif
- error = suser_cred (cred, jailflags);
+ error = suser_cred(cred, jailflags);
- return error;
+ return error;
}
int
cap_check(struct thread *td, cap_value_t cap)
{
- return cap_check_cred (td->td_ucred, td, cap, 0);
+ return cap_check_cred(td->td_ucred, td, cap, 0);
}
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list