From owner-p4-projects@FreeBSD.ORG  Mon Jul 11 13:16:58 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE31216A420; Mon, 11 Jul 2005 13:16:57 +0000 (GMT)
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 AF41A16A41C
	for <perforce@freebsd.org>; Mon, 11 Jul 2005 13:16:57 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EDDA043D53
	for <perforce@freebsd.org>; Mon, 11 Jul 2005 13:16:56 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BDGuA8050659
	for <perforce@freebsd.org>; Mon, 11 Jul 2005 13:16:56 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BDGu3h050656
	for perforce@freebsd.org; Mon, 11 Jul 2005 13:16:56 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 11 Jul 2005 13:16:56 GMT
Message-Id: <200507111316.j6BDGu3h050656@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 <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79988 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jul 2005 13:16:58 -0000

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

Change 79988 by rwatson@rwatson_zoo on 2005/07/11 13:16:29

	Various NO_SEBSD build fixups.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#11 edit
.. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/Makefile#5 edit
.. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#6 edit
.. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/do_command.c#8 edit
.. //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/pwd_mkdb.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#11 (text+ko) ====

@@ -80,9 +80,9 @@
 #include <ttyent.h>
 #include <unistd.h>
 
-#ifdef SEBSD
 #include <security/pam_appl.h>
 #include <security/openpam.h>
+#ifdef SEBSD
 #include <selinux/selinux.h>
 #include <selinux/flask.h>
 #endif

==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/Makefile#5 (text+ko) ====

@@ -9,7 +9,7 @@
 DPADD=	${LIBCRON} ${LIBUTIL}
 LDADD=	${LIBCRON} -lutil
 
-.if !defined(SEBSD)
+.if !defined(NO_SEBSD)
 CFLAGS+= -I${.CURDIR}/../../../sys
 CFLAGS+= -DSEBSD
 DPADD+=	${LIBSEBSD}

==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#6 (text+ko) ====

@@ -30,9 +30,12 @@
 #include <sys/file.h>
 
 #include <sys/mac.h>
+
+#ifdef SEBSD
 #include <selinux/selinux.h>
 #include <selinux/flask.h>
 #include <selinux/av_permissions.h>
+#endif
 
 #define TMAX(a,b) ((a)>(b)?(a):(b))
 

==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/do_command.c#8 (text+ko) ====

@@ -33,7 +33,9 @@
 # include <login_cap.h>
 #endif
 #include <sys/mac.h>
+#ifdef SEBSD
 #include <selinux/selinux.h>
+#endif
 
 
 static void		child_process __P((entry *, user *)),
@@ -307,10 +309,10 @@
 				    e->envp);
 #ifdef SEBSD
 			}
+#endif /* !SEBSD */
 			warn("execl: couldn't exec `%s'", shell);
 			_exit(ERROR_EXIT);
 		}
-#endif /* !SEBSD */
 		break;
 	default:
 		/* parent process */

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

@@ -711,7 +711,11 @@
 
 
 void
+#ifdef SEBSD
 mv(char *from, char *to, const char *label)
+#else
+mv(char *from, char *to, __unused const char *label)
+#endif
 {
 	char buf[MAXPATHLEN];