From: Osier Yang <jyang@redhat.com>
Date: Tue, 11 Oct 2011 12:48:42 +0000 (+0800)
Subject: daemon: Always advertise libvirtd service
X-Git-Tag: v0.9.7-rc1~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b55fd85ae5435bda53c3cfcbe1385074befd01;p=thirdparty%2Flibvirt.git

daemon: Always advertise libvirtd service

This is a regression introduced by new RPC codes, previously
we advertise the service via ssh even if the daemon doesn't
listen on TLS port (TCP is not choosed). Now the service is
only advertised when it listens on TLS or TCP port. This breaks
upper layer apps which intends to discover the service, such
as virt-manager.
---

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index d1bc3ddda7..2f0e1be7df 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -470,8 +470,12 @@ static int daemonSetupNetworking(virNetServerPtr srv,
                                              NULL)))
         goto error;
 
-    if (virNetServerAddService(srv, svc, NULL) < 0)
+    if (virNetServerAddService(srv, svc,
+                               config->mdns_adv && !ipsock ?
+                               "_libvirt._tcp" :
+                               NULL) < 0)
         goto error;
+
     if (svcRO &&
         virNetServerAddService(srv, svcRO, NULL) < 0)
         goto error;