[systemd-commits] 3 commits - src/execute.c src/socket.c src/socket-util.c TODO

[Lennart Poettering]

 TODO              |    2 ++
 src/execute.c     |    3 ++-
 src/socket-util.c |    2 +-
 src/socket.c      |    6 ++++--
 4 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit a7444edaf768ae3dda13c42d8fe26f78b4e63e38
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 12 20:27:05 2011 +0200

    socket: try creating a socket under our own identity if we have no perms to consult the selinux database

diff --git a/src/socket.c b/src/socket.c
index a8f8dc3..01af34c 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -774,8 +774,10 @@ static int socket_open_fds(Socket *s) {
                                         return r;
 
                                 if (s->service && s->service->exec_command[SERVICE_EXEC_START])
-                                        if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0)
-                                                return r;
+                                        if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0) {
+                                                if (r != -EPERM)
+                                                        return r;
+                                        }
 
                                 know_label = true;
                         }

commit 5a2b80ceb20876e80907d0b7f7915afb20f716e6
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 12 20:26:33 2011 +0200

    socket: fix check for SEQPACKET

diff --git a/src/socket-util.c b/src/socket-util.c
index 4c28946..779850d 100644
--- a/src/socket-util.c
+++ b/src/socket-util.c
@@ -268,7 +268,7 @@ int socket_address_verify(const SocketAddress *a) {
                         }
                 }
 
-                if (a->type != SOCK_STREAM && a->type != SOCK_DGRAM && a->type == SOCK_SEQPACKET)
+                if (a->type != SOCK_STREAM && a->type != SOCK_DGRAM && a->type != SOCK_SEQPACKET)
                         return -EINVAL;
 
                 return 0;

commit 90a5f6e42a7422b6033be5d0fe2bf48ea6b91b98
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 12 20:12:15 2011 +0200

    execute: don't fail if we cannot fix OOM in a container

diff --git a/TODO b/TODO
index 04c3832..98251b2 100644
--- a/TODO
+++ b/TODO
@@ -23,6 +23,8 @@ F15:
 
 * get writev() /dev/kmsg support into the F15 kernel
 
+* fix sd_is_socket() invocation in dbus
+
 Features:
 
 * fix alsa mixer restore to not print error when no config is stored
diff --git a/src/execute.c b/src/execute.c
index d67916c..1e376ff 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -1106,7 +1106,8 @@ int exec_spawn(ExecCommand *command,
                                 snprintf(t, sizeof(t), "%i", adj);
                                 char_array_0(t);
 
-                                if (write_one_line_file("/proc/self/oom_adj", t) < 0) {
+                                if (write_one_line_file("/proc/self/oom_adj", t) < 0
+                                    && errno != EACCES) {
                                         r = EXIT_OOM_ADJUST;
                                         goto fail_child;
                                 }