From patchwork Fri Sep 30 16:13:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Smalley X-Patchwork-Id: 9358597 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 11752600C8 for ; Fri, 30 Sep 2016 16:11:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02D6A2A07E for ; Fri, 30 Sep 2016 16:11:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EBCCD2A0CF; Fri, 30 Sep 2016 16:11:47 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from emsm-gh1-uea11.nsa.gov (emsm-gh1-uea11.nsa.gov [8.44.101.9]) (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 D84092A07E for ; Fri, 30 Sep 2016 16:11:45 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.31,273,1473120000"; d="scan'208";a="19705812" IronPort-PHdr: =?us-ascii?q?9a23=3Al0XPnB/zwvUqHP9uRHKM819IXTAuvvDOBiVQ1KB9?= =?us-ascii?q?1+McTK2v8tzYMVDF4r011RmSDN+dsasP2reempujcFRI2YyGvnEGfc4EfD4+ou?= =?us-ascii?q?JSoTYdBtWYA1bwNv/gYn9yNs1DUFh44yPzahANS47AblHf6ke/8SQVUk2mc1Ek?= =?us-ascii?q?fKKvQ8WD0oye7KObw9XreQJGhT6wM/tZDS6dikHvjPQQmpZoMa0ryxHE8TNicu?= =?us-ascii?q?VSwn50dxrIx06vrvqq+NZf1wgY+7d7r48TGZn9Kr81Sb1eESQOL3E+5MqtswLK?= =?us-ascii?q?CwSI+CgySGITxyFUDhDF4ReyZZL4ti/3p6IpwyWBFdHnRrAzHzK55uFkTwG+23?= =?us-ascii?q?RPDCIw7GyC0p84t6lcuh/04kYnzg=3D=3D?= X-IPAS-Result: =?us-ascii?q?A2GtAwBuju5X/wHyM5BdGgEBAQECAQEBAQgBAQEBFwEBBAE?= =?us-ascii?q?BCgEBgxIBAQEBAR6BRA+6VR6HZEwBAQEBAQEBAQIBAlsngjIEAxMFghgCNxQgC?= =?us-ascii?q?wMDCQIXKQgIAwEtFR8LBRgEiCy8dSWPIxEBaIR1HQWZeI9xAol9hXECkGxUglm?= =?us-ascii?q?CTlaFRniBKAEBAQ?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea11.nsa.gov with ESMTP; 30 Sep 2016 16:11:24 +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 u8UGBKr0006809; Fri, 30 Sep 2016 12:11:22 -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 u8UGBIDV045222 for ; Fri, 30 Sep 2016 12:11:18 -0400 Received: from moss-pluto.infosec.tycho.ncsc.mil (moss-pluto [192.168.25.131]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u8UGBIKu006797; Fri, 30 Sep 2016 12:11:18 -0400 From: Stephen Smalley To: selinux@tycho.nsa.gov Subject: [PATCH] policycoreutils: setfiles: make -I imply -D Date: Fri, 30 Sep 2016 12:13:35 -0400 Message-Id: <1475252015-17100-1-git-send-email-sds@tycho.nsa.gov> X-Mailer: git-send-email 2.7.4 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: Cc: Stephen Smalley MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP -I only makes sense if we are also enabling digests. Signed-off-by: Stephen Smalley --- policycoreutils/setfiles/setfiles.c | 1 + 1 file changed, 1 insertion(+) diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c index 22eba0f..1a2d711 100644 --- a/policycoreutils/setfiles/setfiles.c +++ b/policycoreutils/setfiles/setfiles.c @@ -279,6 +279,7 @@ int main(int argc, char **argv) case 'I': /* Force label check by ignoring directory digest. */ r_opts.ignore_digest = SELINUX_RESTORECON_IGNORE_DIGEST; + request_digest = 1; break; case 'D': /* * Request file_contexts digest in selabel_open