From d7d910d98de24dcc5fe3acfb2d37b6258f87ddfe Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 18 Jun 2015 11:40:08 +0200 Subject: [PATCH] daemon: Add the admin service to the admin server only if it was allocated If the admin service is disabled it would not be allocated, but the NULL pointer still would be added to the admin server. Since virNetServerAddService would dereference it, the daemon would crash. Move the service registration into the block that allocates it. --- daemon/libvirtd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 368e10ca35..286512ab32 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -534,10 +534,10 @@ daemonSetupNetworking(virNetServerPtr srv, config->admin_max_queued_clients, config->admin_max_client_requests))) goto error; - } - if (virNetServerAddService(srvAdm, svcAdm, NULL) < 0) - goto error; + if (virNetServerAddService(srvAdm, svcAdm, NULL) < 0) + goto error; + } if (ipsock) { if (config->listen_tcp) { -- GitLab