From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 12 Feb 2010 01:21:08 +0000 (+0100)
Subject: manager: properly return newly created job in transaction_add_job_and_dependencies()
X-Git-Tag: 0.git+20100605+dfd8ee-1~311
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0dafa4853b52741e9a4845419c00611426cefd8;p=systemd

manager: properly return newly created job in transaction_add_job_and_dependencies()
---

diff --git a/manager.c b/manager.c
index 7a31c0c9..ace480c4 100644
--- a/manager.c
+++ b/manager.c
@@ -901,6 +901,9 @@ static int transaction_add_job_and_dependencies(Manager *m, JobType type, Unit *
                 /* JOB_VERIFY_STARTED, JOB_RELOAD require no dependency handling */
         }
 
+        if (_ret)
+                *_ret = ret;
+
         return 0;
 
 fail:
@@ -918,7 +921,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool for
 
         log_debug("Trying to enqueue job %s/%s", unit_id(unit), job_type_to_string(type));
 
-        if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, force, &ret))) {
+        if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, force, &ret)) < 0) {
                 transaction_abort(m);
                 return r;
         }
@@ -926,7 +929,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool for
         if ((r = transaction_activate(m, mode)) < 0)
                 return r;
 
-        log_debug("Enqueued job %s/%s", unit_id(unit), job_type_to_string(type));
+        log_debug("Enqueued job %s/%s as %u", unit_id(unit), job_type_to_string(type), (unsigned) ret->id);
 
         if (_ret)
                 *_ret = ret;
diff --git a/test1/syslog.socket b/test1/syslog.socket
index 524da506..f2d3297a 100644
--- a/test1/syslog.socket
+++ b/test1/syslog.socket
@@ -5,4 +5,4 @@ Description=Syslog Socket
 ListenDatagram=/tmp/foobar/waldo/systemd-syslog-socket
 ListenStream=eth0:3456
 DirectoryMode=0700
-SocketMode=0400
+SocketMode=0600