Date: Tue, 28 Jun 2005 18:39:43 GMT From: Andrew Reisse <areisse@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 79089 for review Message-ID: <200506281839.j5SIdhNO095416@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506281839.j5SIdhNO095416>