From patchwork Wed Sep 28 15:26:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Roberts, William C" X-Patchwork-Id: 9354093 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7BE7E60756 for ; Wed, 28 Sep 2016 15:27:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D0D2296DF for ; Wed, 28 Sep 2016 15:27:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61F2B296E1; Wed, 28 Sep 2016 15:27:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00 autolearn=ham version=3.3.1 Received: from emsm-gh1-uea10.nsa.gov (smtp.nsa.gov [8.44.101.8]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BAE87296DF for ; Wed, 28 Sep 2016 15:27:31 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.30,410,1470700800"; d="scan'208";a="18059064" IronPort-PHdr: =?us-ascii?q?9a23=3A8/4v6hKnGMx+gbHJEdmcpTZWNBhigK39O0sv0rFi?= =?us-ascii?q?tYgUI/zxwZ3uMQTl6Ol3ixeRBMOAuqgC0rWd4/uocFdDyK7JiGoFfp1IWk1Nou?= =?us-ascii?q?QttCtkPvS4D1bmJuXhdS0wEZcKflZk+3amLRodQ56mNBXsq3G/pQQfBg/4fVIs?= =?us-ascii?q?YL+kQMiL0I/njKibwN76W01wnj2zYLd/fl2djD76kY0ou7ZkMbs70RDTo3FFKK?= =?us-ascii?q?x8zGJsIk+PzV6nvp/jtKN592xsn95pt4sZCeSpN5g/GKdVCDUgLnAd+NzgtR6F?= =?us-ascii?q?SxCGoHQbTCFeiRdBBQTf6xD2G5PwqTfSqvt22C7cO9b/C78zR3Dq9KtwYAP5gy?= =?us-ascii?q?cAcTgi+SfYjdIjorhcpUe+phh7wofRJorTLv10c7nBZvsbQ3ZMWoBaUCkSUcuH?= =?us-ascii?q?c4ITAr9Zbq5jpI7nqg5L9EOz?= X-IPAS-Result: =?us-ascii?q?A2HADQDV4OtX/wHyM5BdGwEBAQMBAQEJAQEBFwEBBAEBCgE?= =?us-ascii?q?BgxQBAQEBAR5XfKYFHwGUJyIDgXgZhVxMAQEBAQEBAQECAQJbJ4IyBAMTBXlbP?= =?us-ascii?q?QIEAQI3FCAOAwkBARcIIQgIAwEtFREHBwsFGASILL07JYg7hmYRAYV6BZl2hie?= =?us-ascii?q?JRAKCOodBhW9IkCFUgx0cgWxWAYRneIEoAQEB?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea10.nsa.gov with ESMTP; 28 Sep 2016 15:27:29 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u8SFRSoV031190; Wed, 28 Sep 2016 11:27:29 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u8SFQKRn003851 for ; Wed, 28 Sep 2016 11:26:20 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u8SFQJhJ031028; Wed, 28 Sep 2016 11:26:20 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1C0AwDw3+tX/yNjr8ZdGgEBAQECAQEBAQgBAQEBgz8BAQEBAR5XfLZAhBUchgICgWlMAQIBAQEBAQJehQkCBHkQIDFXBxKITb1EAQEBByeIO4xyBZl2hieJRAKCOo0wSJAhVIMdHIFsIjQBhwcBAQE X-IPAS-Result: A1C0AwDw3+tX/yNjr8ZdGgEBAQECAQEBAQgBAQEBgz8BAQEBAR5XfLZAhBUchgICgWlMAQIBAQEBAQJehQkCBHkQIDFXBxKITb1EAQEBByeIO4xyBZl2hieJRAKCOo0wSJAhVIMdHIFsIjQBhwcBAQE X-IronPort-AV: E=Sophos;i="5.30,410,1470715200"; d="scan'208";a="5733765" Received: from emsm-gh1-uea11.corp.nsa.gov (HELO emsm-gh1-uea11.nsa.gov) ([10.208.41.37]) by goalie.tycho.ncsc.mil with ESMTP; 28 Sep 2016 11:26:19 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3ANbhrkhx8xrqTwHPXCy+O+j09IxM/srCxBDY+r6Qd?= =?us-ascii?q?0OsTIJqq85mqBkHD//Il1AaPBtSBrasbwLqN+4nbGkU4qa6bt34DdJEeHzQksu?= =?us-ascii?q?4x2zIaPcieFEfgJ+TrZSFpVO5LVVti4m3peRMNQJW2WVTerzWI4CIIHV2nbEwu?= =?us-ascii?q?d76zQ9GZ35///tvx0qWbWx9Piju5bOE6BzSNhiKViPMrh5B/IL060BrDrygAUe?= =?us-ascii?q?1XwWR1OQDbxE6ktY+YtaRu+CVIuv8n69UIEeCjJ/x5HopjCy46PmwP6cbqrUOL?= =?us-ascii?q?DVfXpyhUbmJDiRdMAg7Y/DnmT5zxtW38reM71y6EeYXtQLkyVS6l7qsuTB7zlA?= =?us-ascii?q?8bJjU59yfRkcU2g6VF5Fq6qwdX35/fYIbTMuF3OKzaY4A0X21EC9lQUyhAC4b6?= =?us-ascii?q?ZM0VCOAMJ/pDh4j7u1YK6xC5AFr/TNjzwyNF0yellZYx1P4sRESYhAE=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0HJCwAt4OtX/yNjr8ZdGgEBAQECAQEBA?= =?us-ascii?q?QgBAQEBFgEBAQMBAQEJAQEBgxQBAQEBAR5XfKYFHwGQG4QVHIF4GYNxAoFpTAE?= =?us-ascii?q?BAQEBAQEBAgECWyeCMgQBFQV5Wz0CBHkQIDFXBxKITb01AQEBBwIBJIg7jHIFm?= =?us-ascii?q?XaGJ4lEAoI6jTBIkCFUgx0cgWwiNAGFRoFBAQEB?= X-IPAS-Result: =?us-ascii?q?A0HJCwAt4OtX/yNjr8ZdGgEBAQECAQEBAQgBAQEBFgEBAQM?= =?us-ascii?q?BAQEJAQEBgxQBAQEBAR5XfKYFHwGQG4QVHIF4GYNxAoFpTAEBAQEBAQEBAgECW?= =?us-ascii?q?yeCMgQBFQV5Wz0CBHkQIDFXBxKITb01AQEBBwIBJIg7jHIFmXaGJ4lEAoI6jTB?= =?us-ascii?q?IkCFUgx0cgWwiNAGFRoFBAQEB?= X-IronPort-AV: E=Sophos;i="5.30,410,1470700800"; d="scan'208";a="19627239" Received: from fmsmga002-icc.fm.intel.com ([198.175.99.35]) by emsm-gh1-uea11.nsa.gov with ESMTP; 28 Sep 2016 15:26:19 +0000 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.30,410,1470726000"; d="scan'208"; a="1063490906" Received: from vjain9-mobl4.amr.corp.intel.com (HELO wcrobert-MOBL1.amr.corp.intel.com) ([10.254.64.186]) by fmsmga002.fm.intel.com with ESMTP; 28 Sep 2016 08:26:18 -0700 From: william.c.roberts@intel.com To: selinux@tycho.nsa.gov, seandroid-list@tycho.nsa.gov, sds@tycho.nsa.gov Subject: [PATCH 3/3] libselinux: drop DISABLE_BOOL=y option Date: Wed, 28 Sep 2016 11:26:09 -0400 Message-Id: <1475076369-13586-3-git-send-email-william.c.roberts@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1475076369-13586-1-git-send-email-william.c.roberts@intel.com> References: <1475076369-13586-1-git-send-email-william.c.roberts@intel.com> X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP From: William Roberts Build option DISABLE_BOOL=y is not being used, and is broken, drop it. Signed-off-by: William Roberts --- libselinux/Makefile | 6 +----- libselinux/src/Makefile | 6 +----- libselinux/src/load_policy.c | 2 -- libselinux/utils/Makefile | 5 ----- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/libselinux/Makefile b/libselinux/Makefile index c96695d..bfeb4b8 100644 --- a/libselinux/Makefile +++ b/libselinux/Makefile @@ -2,17 +2,13 @@ SUBDIRS = src include utils man DISABLE_SETRANS ?= n DISABLE_RPM ?= n -DISABLE_BOOL ?= n -ifeq ($(DISABLE_BOOL),y) - EMFLAGS+= -DDISABLE_BOOL -endif ifeq ($(DISABLE_RPM),y) EMFLAGS+= -DDISABLE_RPM endif ifeq ($(DISABLE_SETRANS),y) EMFLAGS+= -DDISABLE_SETRANS endif -export DISABLE_SETRANS DISABLE_RPM DISABLE_BOOL EMFLAGS +export DISABLE_SETRANS DISABLE_RPM EMFLAGS USE_PCRE2 ?= n ifeq ($(USE_PCRE2),y) diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index 8cfdf34..d8a79b4 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -41,12 +41,8 @@ LIBSO=$(TARGET).$(LIBVERSION) AUDIT2WHYLOBJ=$(PYPREFIX)audit2why.lo AUDIT2WHYSO=$(PYPREFIX)audit2why.so -ifeq ($(DISABLE_BOOL),y) - UNUSED_SRCS+=booleans.c -endif - GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) selinuxswig_python_exception.i -SRCS= $(filter-out $(UNUSED_SRCS) $(GENERATED) audit2why.c, $(sort $(wildcard *.c))) +SRCS= $(filter-out $(GENERATED) audit2why.c, $(sort $(wildcard *.c))) MAX_STACK_SIZE=32768 diff --git a/libselinux/src/load_policy.c b/libselinux/src/load_policy.c index 249f82f..b7e1a6f 100644 --- a/libselinux/src/load_policy.c +++ b/libselinux/src/load_policy.c @@ -256,7 +256,6 @@ checkbool: } } -#ifndef DISABLE_BOOL if (preservebools) { int *values, len, i; char **names; @@ -279,7 +278,6 @@ checkbool: (void)genbools(data, size, (char *)selinux_booleans_path()); } -#endif } diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile index 9ec928b..0708d6d 100644 --- a/libselinux/utils/Makefile +++ b/libselinux/utils/Makefile @@ -36,11 +36,6 @@ sefcontext_compile: sefcontext_compile.o ../src/regex.o selinux_restorecon: LDLIBS += -lsepol -ifeq ($(DISABLE_BOOL),y) - UNUSED_TARGETS+=getsebool togglesebool -endif -TARGETS:= $(filter-out $(UNUSED_TARGETS), $(TARGETS)) - all: $(TARGETS) install: all