Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Feb 2007 15:39:07 GMT
From:      Todd Miller <millert@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 114630 for review
Message-ID:  <200702161539.l1GFd7k8031949@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=114630

Change 114630 by millert@millert_p4 on 2007/02/16 15:39:02

	Sync with contrib/sebsd

Affected files ...

.. //depot/projects/trustedbsd/sebsd/lib/libselinux/Makefile#2 edit
.. //depot/projects/trustedbsd/sebsd/lib/libsemanage/Makefile#2 edit
.. //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#5 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/lib/libselinux/Makefile#2 (text+ko) ====

@@ -15,22 +15,24 @@
 #LDADD+=	-L${.OBJDIR}/../libpam/libpam ${MINUSLPAM}
 #DPADD+=	${LIBPAM}
 
-SRCS=	booleans.c canonicalize_context.c compute_av.c compute_relabel.c \
-	compute_user.c context.c disable.c enabled.c fgetfilecon.c \
-	freecon.c freeconary.c fsetfilecon.c get_context_list.c \
-	get_default_type.c getcon.c getenforce.c getexeccon.c \
-	getfilecon.c getpeercon.c getpidcon.c init.c is_customizable_type.c \
-	lgetfilecon.c load_policy.c lsetfilecon.c matchmediacon.c \
-	matchpathcon.c policyvers.c query_user_context.c sebsd_config.c \
-	setcon.c setenforce.c setfilecon.c seusers.c trans.c
+SRCS=	avc.c avc_internal.c avc_sidtab.c booleans.c canonicalize_context.c \
+	checkAccess.c check_context.c compute_av.c compute_create.c \
+	compute_member.c compute_relabel.c compute_user.c context.c \
+	disable.c enabled.c fgetfilecon.c freecon.c freeconary.c \
+	fsetfilecon.c get_context_list.c get_default_type.c \
+	getcon.c getenforce.c getexeccon.c \
+	getfilecon.c getpeercon.c getpidcon.c getprevcon.c init.c \
+	is_customizable_type.c lgetfilecon.c load_policy.c \
+	lsetfilecon.c matchmediacon.c matchpathcon.c policyvers.c \
+	query_user_context.c sebsd_config.c \
+	selinux_check_securetty_context.c setcon.c setenforce.c \
+	setfilecon.c setrans_client.c seusers.c
+
+# The following require kernel support for fs and exec contexts
+#SRCS += getfscreatecon.c setfscreatecon.c setexeccon.c
 
-# Files left out, waiting for supporting functionality in the sebsd kernel
-# module
-#		check_context.c compute_create.c \
-#		compute_member.c getfscreatecon.c \
-#		getprevcon.c setfscreatecon.c \
-#		checkAccess.c rpm.c setexeccon.c 
-#
+# The following are Linux-specific
+#SRCS += procattr.c rpm.c
 
 INCSDIR=${INCLUDEDIR}/selinux
 
@@ -41,7 +43,7 @@
 MAN=	avc_add_callback.3 avc_cache_stats.3 avc_context_to_sid.3 \
 	avc_has_perm.3 avc_init.3 context_new.3 freecon.3 \
 	get_ordered_context_list.3 getcon.3 getexeccon.3 getfilecon.3 \
-	getfscreatecon.3 getseuserbyname.3 is_context_customizable.3 \
+	getseuserbyname.3 is_context_customizable.3 \
 	is_selinux_enabled.3 matchmediacon.3 matchpathcon.3 \
 	security_check_context.3 security_compute_av.3 \
 	security_getenforce.3 security_load_booleans.3 \
@@ -102,8 +104,11 @@
 	matchpathcon.3 set_matchpathcon_printf.3 \
 	getcon.3 setcon.3 \
 	getexeccon.3 setexeccon.3 \
-	getfscreatecon.3 setfscreatecon.3 \
 	avc_context_to_sid.3 sidget.3 \
 	avc_context_to_sid.3 sidput.3
 
+# Not currently supported
+#MAN+=	getfscreatecon.3
+#MLINKS+=getfscreatecon.3 setfscreatecon.3
+
 .include <bsd.lib.mk>

==== //depot/projects/trustedbsd/sebsd/lib/libsemanage/Makefile#2 (text+ko) ====


==== //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#5 (text+ko) ====




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702161539.l1GFd7k8031949>