From owner-p4-projects Thu Nov 14 8: 0: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0775B37B404; Thu, 14 Nov 2002 07:59:57 -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 9538F37B401 for ; Thu, 14 Nov 2002 07:59:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 215AD43E75 for ; Thu, 14 Nov 2002 07:59:56 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAEFvNmV063439 for ; Thu, 14 Nov 2002 07:57:23 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAEFvNkg063436 for perforce@freebsd.org; Thu, 14 Nov 2002 07:57:23 -0800 (PST) Date: Thu, 14 Nov 2002 07:57:23 -0800 (PST) Message-Id: <200211141557.gAEFvNkg063436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21055 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21055 Change 21055 by green@green_laptop_2 on 2002/11/14 07:56:59 Replace setfmac(8) with setfsmac(8)'s compatibility mode. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/Makefile#2 edit .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#1 branch .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#6 edit .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD$ PROG= setfsmac -MAN= +LINKS= ${BINDIR}/${PROG} ${BINDIR}/setfmac +MAN= setfmac.8 .include ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#6 (text+ko) ==== @@ -1,3 +1,41 @@ +/*- + * Copyright (c) 2002 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. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/usr.sbin/Makefile#21 (text+ko) ==== @@ -95,7 +95,6 @@ rtsold \ rwhod \ sa \ - setfmac \ setkey \ setpmac \ sliplogin \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message