From owner-p4-projects@FreeBSD.ORG Sun Feb 15 09:34:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6A4416A4D0; Sun, 15 Feb 2004 09:34:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1E1C16A4CE for ; Sun, 15 Feb 2004 09:34:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DB2D43D2D for ; Sun, 15 Feb 2004 09:34:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1FHYWGe029205 for ; Sun, 15 Feb 2004 09:34:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1FHYW27029202 for perforce@freebsd.org; Sun, 15 Feb 2004 09:34:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 15 Feb 2004 09:34:32 -0800 (PST) Message-Id: <200402151734.i1FHYW27029202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 46995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Feb 2004 17:34:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=46995 Change 46995 by rwatson@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); }