From owner-trustedbsd-cvs@FreeBSD.ORG Tue Oct 3 15:19:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84D0816A5DF for ; Tue, 3 Oct 2006 15:19:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5B0443D46 for ; Tue, 3 Oct 2006 15:19:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B620146C9B for ; Tue, 3 Oct 2006 11:19:22 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 52C58574D9; Tue, 3 Oct 2006 15:19:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A90616A415; Tue, 3 Oct 2006 15:19:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1CC4016A403 for ; Tue, 3 Oct 2006 15:19:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB26C43D46 for ; Tue, 3 Oct 2006 15:19:20 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93FJKSh030053 for ; Tue, 3 Oct 2006 15:19:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93FJK2b030050 for perforce@freebsd.org; Tue, 3 Oct 2006 15:19:20 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 15:19:20 GMT Message-Id: <200610031519.k93FJK2b030050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107189 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Oct 2006 15:19:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=107189 Change 107189 by millert@millert_macbook on 2006/10/03 15:18:35 Merge sebsd_cred_createlabels() into sebsd_task_create(), its only consumer. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#20 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#20 (text+ko) ==== @@ -779,29 +779,25 @@ } static void -sebsd_cred_createlabels(struct label *pl, struct label *chl) +sebsd_task_create(struct task *parent, struct task *child, struct label *pl, + struct label *chl, struct label *chpl) { int rc; - struct task_security_struct *parent, *task; + struct task_security_struct *psec, *chsec, *chpsec; rc = ss_precondition(); if (rc <= 0) return; - parent = SLOT(pl); - task = SLOT(chl); + psec = SLOT(pl); + chsec = SLOT(chl); + chpsec = SLOT(chpl); /* Default to using the attributes from the parent process */ - task->osid = parent->osid; - task->sid = parent->sid; -} - -static void -sebsd_task_create(struct task *parent, struct task *child, struct label *pl, - struct label *chl, struct label *chpl) -{ - sebsd_cred_createlabels(pl, chl); - sebsd_cred_createlabels(pl, chpl); + chsec->osid = psec->osid; + chsec->sid = psec->sid; + chpsec->osid = psec->osid; + chpsec->sid = psec->sid; } static void