PERFORCE change 22462 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=22462

Change 22462 by rwatson at rwatson_tislabs on 2002/12/18 06:48:59

	Correct errors associated with automatic resolve following
	integ.  Pick up the license from the FreeBSD CVS commit, and
	synchronize the variable definitions.

Affected files ...

.. //depot/projects/trustedbsd/mac/usr.sbin/setpmac/setpmac.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/mac/usr.sbin/setpmac/setpmac.c#8 (text+ko) ====

@@ -1,3 +1,38 @@
+/*-
+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * This software was developed for the FreeBSD Project by Network
+ * Associates Laboratories, 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: src/usr.sbin/setpmac/setpmac.c,v 1.1 2002/10/23 03:15:24 rwatson Exp $
+ */
 #include <sys/types.h>
 #include <sys/mac.h>
 
@@ -22,10 +57,9 @@
 int
 main(int argc, char *argv[])
 {
-	char *labels[MAXELEMENTS];
-	char *shell, ch, *labellist;
+	char *shell;
 	mac_t label;
-	int error, labelcount;
+	int error;
 
 
 	if (argc < 3)
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message