avahi: Fail immediately if we can't talk to D-Bus or Avahi
authorSimon McVittie <smcv@debian.org>
Fri, 22 Jun 2018 00:10:55 +0000 (01:10 +0100)
committerAtomic Bot <atomic-devel@projectatomic.io>
Sat, 23 Jun 2018 14:54:39 +0000 (14:54 +0000)
We special-case AVAHI_ERR_NO_DAEMON to not cause warnings, but if
we pass AVAHI_CLIENT_NO_FAIL to avahi_client_new, we never actually
see AVAHI_ERR_NO_DAEMON. Instead, we will get AVAHI_ERR_BAD_STATE
when we try to use the client.

Closes: #1618
Signed-off-by: Simon McVittie <smcv@debian.org>
Closes: #1639
Approved by: cgwalters

src/libostree/ostree-repo-finder-avahi.c

index 223d8f0aaa8926ddca85d3df9c049172d34933e1..bc38376974e25070a9c8045e22dcd2064a869015 100644 (file)
@@ -1432,8 +1432,7 @@ ostree_repo_finder_avahi_start (OstreeRepoFinderAvahi  *self,
 
   g_assert (self->client == NULL);
 
-  client = avahi_client_new (avahi_glib_poll_get (self->poll),
-                             AVAHI_CLIENT_NO_FAIL,
+  client = avahi_client_new (avahi_glib_poll_get (self->poll), 0,
                              client_cb, self, &failure);
 
   if (client == NULL)