From 3f3b817cb4bf634a37ae528f9b3e41b5b52ddf36 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Mon, 6 Jan 2014 12:16:55 +0000

Subject: [PATCH] hostnamed: avoid using NULL in error path

https://bugzilla.redhat.com/show_bug.cgi?id=1047335

(cherry picked from commit 04bbe7a7e009d3129e6956af8beb08a6e975e60b)

---

 src/hostname/hostnamed.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c

index 6a43aeb840..0c24b65141 100644

--- a/src/hostname/hostnamed.c

+++ b/src/hostname/hostnamed.c

@@ -637,7 +637,7 @@ static int connect_bus(DBusConnection **_bus) {

         if (!bus) {

                 log_error("Failed to get system D-Bus connection: %s", bus_error_message(&error));

                 r = -ECONNREFUSED;

-                goto fail;

+                goto fail2;

         }

         dbus_connection_set_exit_on_disconnect(bus, FALSE);

@@ -669,7 +669,7 @@ static int connect_bus(DBusConnection **_bus) {

 fail:

         dbus_connection_close(bus);

         dbus_connection_unref(bus);

-

+fail2:

         dbus_error_free(&error);

         return r;