From ab20f5059c98a92d0e709c366c985996ea5445ad Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Wed, 14 Mar 2018 12:08:37 +0100
Subject: [PATCH] Do not generate polkit rules file
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This essentially reverts commit <e1019e9>, which added
an extra step for generating the policy file.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 .gitignore                                        |  1 -
 src/remote/Makefile.inc.am                        | 15 +++------------
 .../{libvirtd.policy.in => libvirtd.policy}       |  6 +++---
 3 files changed, 6 insertions(+), 16 deletions(-)
 rename src/remote/{libvirtd.policy.in => libvirtd.policy} (92%)

diff --git a/.gitignore b/.gitignore
index 2ca7d9776e..dd00fc5ccf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,7 +135,6 @@
 /src/libvirt_lxc
 /src/libvirtd
 /src/libvirtd*.logrotate
-/src/libvirtd.policy
 /src/locking/libxl-lockd.conf
 /src/locking/libxl-sanlock.conf
 /src/locking/lock_daemon_dispatch_stubs.h
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 2fb6056fcc..12600b8bb5 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -75,7 +75,7 @@ EXTRA_DIST += \
 	remote/test_libvirtd.aug.in \
 	remote/libvirtd.aug \
 	remote/libvirtd.conf \
-	remote/libvirtd.policy.in \
+	remote/libvirtd.policy \
 	remote/libvirtd.rules \
 	remote/libvirtd.sasl \
 	remote/libvirtd.sysctl \
@@ -121,12 +121,8 @@ CLEANFILES += test_libvirtd.aug
 
 if WITH_POLKIT
 policydir = $(datadir)/polkit-1/actions
-policyauth = auth_admin_keep
 endif WITH_POLKIT
 
-BUILT_SOURCES += libvirtd.policy
-CLEANFILES += libvirtd.policy
-
 man8_MANS += libvirtd.8
 
 libvirtd_SOURCES = $(LIBVIRTD_SOURCES)
@@ -213,7 +209,8 @@ endif ! WITH_SYSCTL
 if WITH_POLKIT
 install-polkit::
 	$(MKDIR_P) $(DESTDIR)$(policydir)
-	$(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.policy \
+		$(DESTDIR)$(policydir)/org.libvirt.unix.policy
 	$(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d
 	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \
 		$(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
@@ -258,12 +255,6 @@ install-sasl:
 uninstall-sasl:
 endif ! WITH_SASL
 
-libvirtd.policy: remote/libvirtd.policy.in $(top_builddir)/config.status
-	$(AM_V_GEN) sed \
-	    -e 's|[@]authaction[@]|$(policyauth)|g' \
-	    < $< > $@-t && \
-	mv $@-t $@
-
 libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status
 	$(AM_V_GEN)sed \
 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
diff --git a/src/remote/libvirtd.policy.in b/src/remote/libvirtd.policy
similarity index 92%
rename from src/remote/libvirtd.policy.in
rename to src/remote/libvirtd.policy
index de1aba4593..e834d24327 100644
--- a/src/remote/libvirtd.policy.in
+++ b/src/remote/libvirtd.policy
@@ -43,9 +43,9 @@ License along with this library.  If not, see
       <defaults>
         <!-- Any program can use libvirt in read/write mode if they
              provide the root password -->
-        <allow_any>@authaction@</allow_any>
-        <allow_inactive>@authaction@</allow_inactive>
-        <allow_active>@authaction@</allow_active>
+        <allow_any>auth_admin_keep</allow_any>
+        <allow_inactive>auth_admin_keep</allow_inactive>
+        <allow_active>auth_admin_keep</allow_active>
       </defaults>
     </action>
 </policyconfig>
-- 
2.39.5