chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execute: implement privilige dropping properly
[elogind.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index 6d871f645f707d1d02ea7409c41074a3c4209199..aec0d392a683e531f674514b8a904e55d2b524e2 100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-105,6
+105,8
@@
static int socket_init(Unit *u) {
s->bind_ipv6_only = false;
s->backlog = SOMAXCONN;
s->timeout_usec = DEFAULT_TIMEOUT_USEC;
s->bind_ipv6_only = false;
s->backlog = SOMAXCONN;
s->timeout_usec = DEFAULT_TIMEOUT_USEC;
+ s->directory_mode = 0755;
+ s->socket_mode = 0666;
exec_context_init(&s->exec_context);
if ((r = unit_load_fragment_and_dropin(u)) <= 0) {
exec_context_init(&s->exec_context);
if ((r = unit_load_fragment_and_dropin(u)) <= 0) {
@@
-159,22
+161,26
@@
static void socket_dump(Unit *u, FILE *f, const char *prefix) {
SocketExecCommand c;
Socket *s = SOCKET(u);
SocketPort *p;
SocketExecCommand c;
Socket *s = SOCKET(u);
SocketPort *p;
- char *prefix2;
+ const char *prefix2;
+ char *p2;
assert(s);
assert(f);
assert(s);
assert(f);
- prefix2 = strappend(prefix, "\t");
- if (!prefix2)
- prefix2 = "";
+ p2 = strappend(prefix, "\t");
+ prefix2 = p2 ? p2 : prefix;
fprintf(f,
"%sSocket State: %s\n"
"%sBindIPv6Only: %s\n"
fprintf(f,
"%sSocket State: %s\n"
"%sBindIPv6Only: %s\n"
- "%sBacklog: %u\n",
+ "%sBacklog: %u\n"
+ "%sSocketMode: %04o\n"
+ "%sDirectoryMode: %04o\n",
prefix, state_string_table[s->state],
prefix, yes_no(s->bind_ipv6_only),
prefix, state_string_table[s->state],
prefix, yes_no(s->bind_ipv6_only),
- prefix, s->backlog);
+ prefix, s->backlog,
+ prefix, s->socket_mode,
+ prefix, s->directory_mode);
if (s->bind_to_device)
fprintf(f,
if (s->bind_to_device)
fprintf(f,
@@
-211,7
+217,7
@@
static void socket_dump(Unit *u, FILE *f, const char *prefix) {
exec_command_dump_list(s->exec_command[c], f, prefix2);
}
exec_command_dump_list(s->exec_command[c], f, prefix2);
}
- free(p
refix
2);
+ free(p2);
}
static void socket_close_fds(Socket *s) {
}
static void socket_close_fds(Socket *s) {
@@
-243,7
+249,14
@@
static int socket_open_fds(Socket *s) {
if (p->type == SOCKET_SOCKET) {
if (p->type == SOCKET_SOCKET) {
- if ((r = socket_address_listen(&p->address, s->backlog, s->bind_ipv6_only, s->bind_to_device, &p->fd)) < 0)
+ if ((r = socket_address_listen(
+ &p->address,
+ s->backlog,
+ s->bind_ipv6_only,
+ s->bind_to_device,
+ s->directory_mode,
+ s->socket_mode,
+ &p->fd)) < 0)
goto rollback;
} else {
goto rollback;
} else {
@@
-381,7
+394,7
@@
static int socket_spawn(Socket *s, ExecCommand *c, bool timeout, pid_t *_pid) {
} else
unit_unwatch_timer(UNIT(s), &s->timer_watch);
} else
unit_unwatch_timer(UNIT(s), &s->timer_watch);
- if ((r = exec_spawn(c, &s->exec_context, NULL, 0, &pid)) < 0)
+ if ((r = exec_spawn(c, &s->exec_context, NULL, 0,
true, true,
&pid)) < 0)
goto fail;
if ((r = unit_watch_pid(UNIT(s), pid)) < 0)
goto fail;
if ((r = unit_watch_pid(UNIT(s), pid)) < 0)