summaryrefslogtreecommitdiffstats
path: root/avahi-client/client.c
diff options
context:
space:
mode:
Diffstat (limited to 'avahi-client/client.c')
-rw-r--r--avahi-client/client.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/avahi-client/client.c b/avahi-client/client.c
index 93d768a..cbc3004 100644
--- a/avahi-client/client.c
+++ b/avahi-client/client.c
@@ -233,6 +233,7 @@ static int get_server_state(AvahiClient *client, int *ret_error) {
client_set_state(client, (AvahiServerState) state);
+ *ret_error = AVAHI_OK;
return AVAHI_OK;
fail:
@@ -363,6 +364,10 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientCallback cal
if (!(dbus_bus_name_has_owner(client->bus, AVAHI_DBUS_NAME, &error)) ||
dbus_error_is_set(&error)) {
+ /* We free the error so its not set, that way the fail target
+ * will return the NO_DAEMON error rather than a DBUS error */
+ dbus_error_free (&error);
+
if (ret_error)
*ret_error = AVAHI_ERR_NO_DAEMON;