External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge WITH_POLKIT1 and WITH_POLKIT

Browse Source 
There is just one polkit now.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2018-03-07 10:14:23 +01:00
parent ab20f5059c
commit 0d4b988b3e
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
m4/virt-polkit.m4
View File

@ -27,8 +27,6 @@ AC_DEFUN([LIBVIRT_CHECK_POLKIT], [
PKCHECK_PATH=
with_polkit1=no
if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then
dnl Check for new polkit first. We directly talk over DBus
dnl but we use existence of pkcheck binary as a sign that
@ -40,10 +38,7 @@ AC_DEFUN([LIBVIRT_CHECK_POLKIT], [
if test "x$with_dbus" = "xyes" ; then
AC_DEFINE_UNQUOTED([WITH_POLKIT], 1,
[use PolicyKit for UNIX socket access checks])
AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1,
[use PolicyKit for UNIX socket access checks])
with_polkit="yes"
with_polkit1="yes"
else
if test "x$with_polkit" = "xcheck" ; then
with_polkit=no
@ -56,7 +51,6 @@ AC_DEFUN([LIBVIRT_CHECK_POLKIT], [
fi
AM_CONDITIONAL([WITH_POLKIT], [test "x$with_polkit" = "xyes"])
AM_CONDITIONAL([WITH_POLKIT1], [test "x$with_polkit1" = "xyes"])
])
AC_DEFUN([LIBVIRT_RESULT_POLKIT], [

6
src/access/Makefile.inc.am
View File

@ -64,7 +64,7 @@ $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \
$(srcdir)/access/genpolkit.pl Makefile.am
$(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@
if WITH_POLKIT1
if WITH_POLKIT
libvirt_driver_access_la_SOURCES += $(ACCESS_DRIVER_POLKIT_SOURCES)
polkitactiondir = $(datadir)/polkit-1/actions
@ -74,9 +74,9 @@ endif WITH_LIBVIRTD
CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY)
BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY)
else ! WITH_POLKIT1
else ! WITH_POLKIT
EXTRA_DIST += $(ACCESS_DRIVER_POLKIT_SOURCES)
endif ! WITH_POLKIT1
endif ! WITH_POLKIT
BUILT_SOURCES += \

4
src/access/viraccessmanager.c
View File

@ -23,7 +23,7 @@
#include "viraccessmanager.h"
#include "viraccessdrivernop.h"
#include "viraccessdriverstack.h"
#if WITH_POLKIT1
#if WITH_POLKIT
# include "viraccessdriverpolkit.h"
#endif
#include "viralloc.h"
@ -112,7 +112,7 @@ static virAccessManagerPtr virAccessManagerNewDriver(virAccessDriverPtr drv)
static virAccessDriverPtr accessDrivers[] = {
&accessDriverNop,
#if WITH_POLKIT1
#if WITH_POLKIT
&accessDriverPolkit,
#endif
};

6
src/util/virpolkit.c
View File

@ -35,7 +35,7 @@
VIR_LOG_INIT("util.polkit");
#if WITH_POLKIT1
#if WITH_POLKIT
struct _virPolkitAgent {
virCommandPtr cmd;
@ -206,7 +206,7 @@ virPolkitAgentCreate(void)
}
#else /* ! WITH_POLKIT1 */
#else /* ! WITH_POLKIT */
int virPolkitCheckAuth(const char *actionid ATTRIBUTE_UNUSED,
pid_t pid ATTRIBUTE_UNUSED,
@ -236,4 +236,4 @@ virPolkitAgentCreate(void)
_("polkit text authentication agent unavailable"));
return NULL;
}
#endif /* WITH_POLKIT1 */
#endif /* WITH_POLKIT */

4
tests/Makefile.am
View File

@ -251,9 +251,9 @@ test_programs += virdbustest \
virsystemdtest \
$(NULL)
test_libraries += virdbusmock.la
if WITH_POLKIT1
if WITH_POLKIT
test_programs += virpolkittest
endif WITH_POLKIT1
endif WITH_POLKIT
endif WITH_DBUS
if WITH_SECDRIVER_SELINUX