[libvirt] [PATCH 2/3] Temporarily disable admin API

Don't listen on the admin socket in the daemon and comment out the admin devel files out of specfile. Library is still being compiled and installed in order to link easily without any disturbing modifications to the daemon code. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- daemon/libvirtd.c | 3 ++- libvirt.spec.in | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 20e0b2f07f36..654e7f4797a0 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -522,7 +522,8 @@ daemonSetupNetworking(virNetServerPtr srv, virNetServerAddService(srv, svcRO, NULL) < 0) goto cleanup; - if (sock_path_adm) { + /* Temporarily disabled */ + if (sock_path_adm && false) { VIR_DEBUG("Registering unix socket %s", sock_path_adm); if (!(svcAdm = virNetServerServiceNewUNIX(sock_path_adm, unix_sock_adm_mask, diff --git a/libvirt.spec.in b/libvirt.spec.in index e1a15f4300ab..e7e0e39072d7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2287,7 +2287,8 @@ exit 0 %{_libdir}/libvirt.so %{_libdir}/libvirt-qemu.so %{_libdir}/libvirt-lxc.so -%{_libdir}/libvirt-admin.so +# Temporarily disabled +# %{_libdir}/libvirt-admin.so %dir %{_includedir}/libvirt %{_includedir}/libvirt/virterror.h %{_includedir}/libvirt/libvirt.h @@ -2304,17 +2305,20 @@ exit 0 %{_includedir}/libvirt/libvirt-stream.h %{_includedir}/libvirt/libvirt-qemu.h %{_includedir}/libvirt/libvirt-lxc.h -%{_includedir}/libvirt/libvirt-admin.h +# Temporarily disabled +# %{_includedir}/libvirt/libvirt-admin.h %{_libdir}/pkgconfig/libvirt.pc %{_libdir}/pkgconfig/libvirt-qemu.pc %{_libdir}/pkgconfig/libvirt-lxc.pc -%{_libdir}/pkgconfig/libvirt-admin.pc +# Temporarily disabled +# %{_libdir}/pkgconfig/libvirt-admin.pc %dir %{_datadir}/libvirt/api/ %{_datadir}/libvirt/api/libvirt-api.xml %{_datadir}/libvirt/api/libvirt-qemu-api.xml %{_datadir}/libvirt/api/libvirt-lxc-api.xml -%{_datadir}/libvirt/api/libvirt-admin-api.xml +# Temporarily disabled +# %{_datadir}/libvirt/api/libvirt-admin-api.xml %doc docs/*.html docs/html docs/*.gif -- 2.4.4