From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAEFE158020 for ; Wed, 2 Nov 2022 14:43:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 257D9E0A94; Wed, 2 Nov 2022 14:42:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0AA15E0A94 for ; Wed, 2 Nov 2022 14:42:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50C3C341085 for ; Wed, 2 Nov 2022 14:42:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6A78738 for ; Wed, 2 Nov 2022 14:42:52 +0000 (UTC) From: "Kenton Groombridge" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kenton Groombridge" Message-ID: <1667398043.c735ad15b5bc4ebb73d3995c1c43a59d36fbd0d4.concord@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/admin/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/admin/fapolicyd.if X-VCS-Directories: policy/modules/admin/ X-VCS-Committer: concord X-VCS-Committer-Name: Kenton Groombridge X-VCS-Revision: c735ad15b5bc4ebb73d3995c1c43a59d36fbd0d4 X-VCS-Branch: master Date: Wed, 2 Nov 2022 14:42:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 25885dde-3205-4547-9c75-f69ff5cccc41 X-Archives-Hash: 97b8dd8c31d4f2c1699a54a7daba9152 commit: c735ad15b5bc4ebb73d3995c1c43a59d36fbd0d4 Author: Dave Sugar gmail com> AuthorDate: Mon Oct 3 11:54:03 2022 +0000 Commit: Kenton Groombridge gentoo org> CommitDate: Wed Nov 2 14:07:23 2022 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=c735ad15 fix: issue #550 - compile failed when DIRECT_INITRC=y Signed-off-by: Dave Sugar gmail.com> Signed-off-by: Kenton Groombridge gentoo.org> policy/modules/admin/fapolicyd.if | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/policy/modules/admin/fapolicyd.if b/policy/modules/admin/fapolicyd.if index aaa4c14eb..4ae2590ac 100644 --- a/policy/modules/admin/fapolicyd.if +++ b/policy/modules/admin/fapolicyd.if @@ -152,6 +152,8 @@ interface(`fapolicyd_admin',` files_search_runtime($1) admin_pattern($1, fapolicyd_runtime_t) - fapolicyd_run_fagenrules($1, $2) + ifndef(`direct_sysadm_daemon',` + fapolicyd_run_fagenrules($1, $2) + ') fapolicyd_run_cli($1, $2) ')