chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
be57e29
)
socket: fix error comparison
author
Lennart Poettering
<lennart@poettering.net>
Thu, 23 Oct 2014 21:57:50 +0000
(23:57 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 23 Oct 2014 21:57:50 +0000
(23:57 +0200)
src/core/socket.c
patch
|
blob
|
history
diff --git
a/src/core/socket.c
b/src/core/socket.c
index dc16af5e3910aecd17c69d70f24d19e38ceafa21..7ba3a1b8962d693602d2c1aa1e1d923deba89bc5 100644
(file)
--- 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);
/* 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 {
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 (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;
}
}
goto rollback;
}
}