[systemd-commits] 3 commits - src/bus-proxyd src/core

[Lukas Nykryn]

 src/bus-proxyd/bus-proxyd.c |    4 ++--
 src/core/busname.c          |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit deffddf1df29a5ed047feff3a0f2b765006fb71b
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Fri Jul 25 10:44:27 2014 +0200

    busname: CLD_KILLED was used twice

diff --git a/src/core/busname.c b/src/core/busname.c
index d2c926b..b3f7e0d 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -763,7 +763,7 @@ static void busname_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                 f = BUSNAME_FAILURE_EXIT_CODE;
         else if (code == CLD_KILLED)
                 f = BUSNAME_FAILURE_SIGNAL;
-        else if (code == CLD_KILLED)
+        else if (code == CLD_DUMPED)
                 f = BUSNAME_FAILURE_CORE_DUMP;
         else
                 assert_not_reached("Unknown sigchld code");

commit e05aa2e02ba35d8b3741dddb79af3c802308414b
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Fri Jul 25 10:25:06 2014 +0200

    bus-proxyd: fix incorrect comparison
    
    We should be interested in k variable.

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 066da50..1f17fe8 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -1397,7 +1397,7 @@ int main(int argc, char *argv[]) {
                                 else {
                                         k = sd_bus_send(a, m, NULL);
                                         if (k < 0) {
-                                                if (r == -ECONNRESET)
+                                                if (k == -ECONNRESET)
                                                         r = 0;
                                                 else {
                                                         r = k;

commit eb17e1785973352c0853868e1c676078870f22dd
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Fri Jul 25 09:58:52 2014 +0200

    bus-proxyd: fix incorrect comparison
    
    Err can't be bigger then zero. Rest of the code uses negative Exxxx values.

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 79dbdcf..066da50 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -768,7 +768,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
                 if (r < 0)
                         return synthetic_reply_method_errno(m, r, NULL);
 
-                if (err > 0)
+                if (err < 0)
                         return synthetic_reply_method_errno(m, err, NULL);
 
                 return synthetic_reply_return_strv(m, owners);