chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: properly handle LABEL="" in fstab
[elogind.git]
/
src
/
socket.c
diff --git
a/src/socket.c
b/src/socket.c
index 7510a6d6decd7eaedd57b9dc9bb907ffbc535116..d0568c9b52074bdb18888f56e8b39283dbf24023 100644
(file)
--- a/
src/socket.c
+++ b/
src/socket.c
@@
-724,15
+724,10
@@
static int socket_open_fds(Socket *s) {
SocketPort *p;
int r;
char *label = NULL;
SocketPort *p;
int r;
char *label = NULL;
+ bool know_label = false;
assert(s);
assert(s);
- if ((r = socket_instantiate_service(s)) < 0)
- return r;
-
- if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0)
- return r;
-
LIST_FOREACH(port, p, s->ports) {
if (p->fd >= 0)
LIST_FOREACH(port, p, s->ports) {
if (p->fd >= 0)
@@
-740,6
+735,17
@@
static int socket_open_fds(Socket *s) {
if (p->type == SOCKET_SOCKET) {
if (p->type == SOCKET_SOCKET) {
+ if (!know_label) {
+
+ if ((r = socket_instantiate_service(s)) < 0)
+ return r;
+
+ if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0)
+ return r;
+
+ know_label = true;
+ }
+
if ((r = socket_address_listen(
&p->address,
s->backlog,
if ((r = socket_address_listen(
&p->address,
s->backlog,
@@
-760,7
+766,6
@@
static int socket_open_fds(Socket *s) {
p->path,
s->directory_mode,
s->socket_mode,
p->path,
s->directory_mode,
s->socket_mode,
- label,
&p->fd)) < 0)
goto rollback;
&p->fd)) < 0)
goto rollback;