X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fsocket.c;h=075b51966f81b948c404a83b250791f97853b0a9;hb=b8131a87ccdd9376882ca0a8dd3cfe45172e4c46;hp=ee75de04d647b09210e50f71cc6f86d2a57d5caf;hpb=1e3ad081efda42dd1cc737ce7e98be8889c78340;p=elogind.git

diff --git a/src/socket.c b/src/socket.c
index ee75de04d..075b51966 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -268,7 +268,7 @@ static int socket_load(Unit *u) {
         if (u->meta.load_state == UNIT_LOADED) {
 
                 if (have_non_accept_socket(s)) {
-                        if ((r = unit_load_related_unit(u, ".service", (Unit**) &s->service)))
+                        if ((r = unit_load_related_unit(u, ".service", (Unit**) &s->service)) < 0)
                                 return r;
 
                         if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(s->service), true)) < 0)
@@ -1039,7 +1039,7 @@ static void socket_enter_running(Socket *s, int cfd) {
                 socket_set_state(s, SOCKET_RUNNING);
         } else {
                 Unit *u;
-                char *prefix, *instance, *name;
+                char *prefix, *instance = NULL, *name;
 
                 if (s->n_connections >= s->max_connections) {
                         log_warning("Too many incoming connections (%u)", s->n_connections);