From owner-p4-projects@FreeBSD.ORG  Tue Jun 28 18:39:44 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 E324016A420; Tue, 28 Jun 2005 18:39:43 +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 BC1E516A41C
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 18:39:43 +0000 (GMT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8D8F243D58
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 18:39:43 +0000 (GMT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5SIdhHO095419
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 18:39:43 GMT
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5SIdhNO095416
	for perforce@freebsd.org; Tue, 28 Jun 2005 18:39:43 GMT
	(envelope-from areisse@nailabs.com)
Date: Tue, 28 Jun 2005 18:39:43 GMT
Message-Id: <200506281839.j5SIdhNO095416@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79089 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: Tue, 28 Jun 2005 18:39:44 -0000

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

Change 79089 by areisse@areisse_ibook on 2005/06/28 18:39:13

	Change miscellaneous sedarwin programs to be built with libselinux
	and not the (obsolete) libsedarwin. wslogin also needed a change
	for a difference in get_ordered_context_list.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/wslogin.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/Makefile#3 (text+ko) ====

@@ -7,8 +7,8 @@
 
 
 CFLAGS+= -I$(SOURCE_ROOT)/sedarwin
-LDADD+= -L$(SOURCE_ROOT)/sedarwin/libsedarwin
-LDADD+= -lsebsd $(LIBMAC)
+LDADD+= -L$(SOURCE_ROOT)/sedarwin/libselinux/src
+LDADD+= -lselinux $(LIBMAC)
 
 all: $(PROG)
 

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/Makefile#3 (text+ko) ====

@@ -7,7 +7,7 @@
 
 CFLAGS+= $(DARWIN_HDRS)
 CFLAGS+= -I$(SOURCE_ROOT)/sedarwin
-LDADD+= -L$(SOURCE_ROOT)/sedarwin/libsedarwin -lsebsd $(LIBMAC) -lpam
+LDADD+= -L$(SOURCE_ROOT)/sedarwin/libselinux/src -lselinux $(LIBMAC) -lpam
 
 all: $(PROG)
 

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 all: wslogin.dylib build/wsloginui.app
 
 wslogin.dylib: $(OBJS)
-	gcc -dynamiclib -o $@ $(OBJS) ../../libsedarwin/libsebsd.a $(DARWIN_ROOT)/libmac/*.o
+	gcc -dynamiclib -o $@ $(OBJS) ../../libselinux/src/libselinux.a $(DARWIN_ROOT)/libmac/*.o
 
 build/wsloginui.app: LabelChooser.m LabelChooser.h main.m
 	xcodebuild

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/wslogin.c#2 (text+ko) ====

@@ -84,7 +84,7 @@
       char userlabel[512];
 
       if (get_ordered_context_list(username, NULL, &contexts,
-				   &ncontexts) != 0 || ncontexts == 0)
+				   &ncontexts) < 0 || ncontexts == 0)
 	errexit ("Getting context list for %s: %s", username, strerror (errno));
 #if 0
       int retries = 3;