diff options
| -rw-r--r-- | src/mount.c | 5 | ||||
| -rw-r--r-- | src/service.c | 7 | ||||
| -rw-r--r-- | src/socket.c | 7 |
3 files changed, 17 insertions, 2 deletions
diff --git a/src/mount.c b/src/mount.c index e3984203ac..081e92c029 100644 --- a/src/mount.c +++ b/src/mount.c @@ -303,6 +303,11 @@ static int mount_verify(Mount *m) { return -EBADMSG; } + if (m->exec_context.pam_name && m->kill_mode != KILL_CONTROL_GROUP) { + log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", m->meta.id); + return -EINVAL; + } + return 0; } diff --git a/src/service.c b/src/service.c index ba60b8f879..aff355112d 100644 --- a/src/service.c +++ b/src/service.c @@ -817,7 +817,12 @@ static int service_verify(Service *s) { } if (s->type == SERVICE_DBUS && !s->bus_name) { - log_error("%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", UNIT(s)->meta.id); + log_error("%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", s->meta.id); + return -EINVAL; + } + + if (s->exec_context.pam_name && s->kill_mode != KILL_CONTROL_GROUP) { + log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", s->meta.id); return -EINVAL; } diff --git a/src/socket.c b/src/socket.c index ccbe4326c1..7a8624c848 100644 --- a/src/socket.c +++ b/src/socket.c @@ -153,7 +153,12 @@ static int socket_verify(Socket *s) { } if (s->accept && s->max_connections <= 0) { - log_error("%s's MaxConnection setting too small. Refusing.", UNIT(s)->meta.id); + log_error("%s's MaxConnection setting too small. Refusing.", s->meta.id); + return -EINVAL; + } + + if (s->exec_context.pam_name && s->kill_mode != KILL_CONTROL_GROUP) { + log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", s->meta.id); return -EINVAL; } |