chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket: be a bit more verbose when refusing to start a socket unit
[elogind.git]
/
src
/
execute.c
diff --git
a/src/execute.c
b/src/execute.c
index a467411f7dab13c238a8094f480240e4b8ad7cb9..d67916c249282699eb9215abcb230defc73833c4 100644
(file)
--- a/
src/execute.c
+++ b/
src/execute.c
@@
-646,7
+646,7
@@
static int enforce_groups(const ExecContext *context, const char *username, gid_
char **i;
/* Final step, initialize any manually set supplementary groups */
char **i;
/* Final step, initialize any manually set supplementary groups */
-
ngroups_max = (int) sysconf(_SC_NGROUPS_MAX
);
+
assert_se((ngroups_max = (int) sysconf(_SC_NGROUPS_MAX)) > 0
);
if (!(gids = new(gid_t, ngroups_max)))
return -ENOMEM;
if (!(gids = new(gid_t, ngroups_max)))
return -ENOMEM;
@@
-981,7
+981,7
@@
int exec_spawn(ExecCommand *command,
/* This string must fit in 10 chars (i.e. the length
* of "/sbin/init") */
/* This string must fit in 10 chars (i.e. the length
* of "/sbin/init") */
- rename_process("sd
:
exec");
+ rename_process("sd
.
exec");
/* We reset exactly these signals, since they are the
* only ones we set to SIG_IGN in the main daemon. All
/* We reset exactly these signals, since they are the
* only ones we set to SIG_IGN in the main daemon. All
@@
-1650,7
+1650,7
@@
void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
fprintf(f,
"%sSyslogFacility: %s\n"
"%sSyslogLevel: %s\n",
fprintf(f,
"%sSyslogFacility: %s\n"
"%sSyslogLevel: %s\n",
- prefix, log_facility_
to_string(LOG_FAC(c->syslog_priority)
),
+ prefix, log_facility_
unshifted_to_string(c->syslog_priority >> 3
),
prefix, log_level_to_string(LOG_PRI(c->syslog_priority)));
if (c->capabilities) {
prefix, log_level_to_string(LOG_PRI(c->syslog_priority)));
if (c->capabilities) {
@@
-1933,7
+1933,6
@@
DEFINE_STRING_TABLE_LOOKUP(exec_output, ExecOutput);
static const char* const kill_mode_table[_KILL_MODE_MAX] = {
[KILL_CONTROL_GROUP] = "control-group",
static const char* const kill_mode_table[_KILL_MODE_MAX] = {
[KILL_CONTROL_GROUP] = "control-group",
- [KILL_PROCESS_GROUP] = "process-group",
[KILL_PROCESS] = "process",
[KILL_NONE] = "none"
};
[KILL_PROCESS] = "process",
[KILL_NONE] = "none"
};