From 08f6769675a30cf2c322d31b9fdb21bb6e1fb7e7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 14 Mar 2019 17:24:47 +0100
Subject: [PATCH] execute: generalize uid/gid handling in two cases for any
 kind of uid/gid

---
 src/core/execute.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/execute.c b/src/core/execute.c
index 6df90166eef..d46476630cc 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -3161,7 +3161,7 @@ static int exec_child(
                                       USER_PROCESS,
                                       username);
 
-        if (context->user) {
+        if (uid_is_valid(uid)) {
                 r = chown_terminal(STDIN_FILENO, uid);
                 if (r < 0) {
                         *exit_status = EXIT_STDIN;
@@ -3466,7 +3466,7 @@ static int exec_child(
         }
 
         if (needs_setuid) {
-                if (context->user) {
+                if (uid_is_valid(uid)) {
                         r = enforce_user(context, uid);
                         if (r < 0) {
                                 *exit_status = EXIT_USER;
-- 
2.47.3