[systemd-commits] 2 commits - src/core

[Lennart Poettering]

 src/core/socket.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 43b133b4e09a0e991ba1680b9ef5458b24f9dcc9
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Oct 23 23:58:01 2014 +0200

    socket: properly label socket symlinks

diff --git a/src/core/socket.c b/src/core/socket.c
index 7ba3a1b..9004cb4 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1120,7 +1120,7 @@ static int socket_symlink(Socket *s) {
                 return 0;
 
         STRV_FOREACH(i, s->symlinks)
-                symlink(p, *i);
+                symlink_label(p, *i);
 
         return 0;
 }

commit 75514a707c74b69d64a5326ad075728212091cb4
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Oct 23 23:57:50 2014 +0200

    socket: fix error comparison

diff --git a/src/core/socket.c b/src/core/socket.c
index dc16af5..7ba3a1b 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1150,7 +1150,7 @@ static int socket_open_fds(Socket *s) {
                                         /* Get it from the network label */
 
                                         r = mac_selinux_get_our_label(&label);
-                                        if (r < 0 && r != EOPNOTSUPP)
+                                        if (r < 0 && r != -EOPNOTSUPP)
                                                 goto rollback;
 
                                 } else {
@@ -1163,7 +1163,7 @@ static int socket_open_fds(Socket *s) {
                                         if (UNIT_ISSET(s->service) &&
                                             SERVICE(UNIT_DEREF(s->service))->exec_command[SERVICE_EXEC_START]) {
                                                 r = mac_selinux_get_create_label_from_exe(SERVICE(UNIT_DEREF(s->service))->exec_command[SERVICE_EXEC_START]->path, &label);
-                                                if (r < 0 && r != -EPERM && r != EOPNOTSUPP)
+                                                if (r < 0 && r != -EPERM && r != -EOPNOTSUPP)
                                                         goto rollback;
                                         }
                                 }