All other stateful drivers are linked directly to libvirtd
instead of libvirt.so. Link the secret driver to libvirtd too.
* daemon/Makefile.am: link the secret driver to libvirtd
* src/Makefile.am: don't link the secret driver to libvirt.so
* src/libvirt_private.syms: remove the secretRegister symbol
---
daemon/Makefile.am | 2 ++
src/Makefile.am | 3 ++-
src/libvirt_private.syms | 2 --
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index ab3f238..f6b6a3a 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -110,6 +110,8 @@ endif
if WITH_NODE_DEVICES
libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
endif
+
+ libvirtd_LDADD += ../src/libvirt_driver_secret.la
endif
libvirtd_LDADD += ../src/libvirt.la
diff --git a/src/Makefile.am b/src/Makefile.am
index 42108c0..526d985 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -598,7 +598,8 @@ if WITH_DRIVER_MODULES
mod_LTLIBRARIES += libvirt_driver_secret.la
else
noinst_LTLIBRARIES += libvirt_driver_secret.la
-libvirt_la_LIBADD += libvirt_driver_secret.la
+# Stateful, so linked to daemon instead
+#libvirt_la_LIBADD += libvirt_driver_secret.la
endif
libvirt_driver_secret_la_CFLAGS = \
-I@top_srcdir@/src/conf
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index f90f269..31c944c 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -456,8 +456,6 @@ virSecretDefParseString;
virSecretDefParseFile;
virSecretDefFormat;
-# secret_driver.h
-secretRegister;
# security.h
virSecurityDriverVerify;
--
1.6.0.4
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list