From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 17 Oct 2017 23:57:54 +0000 (+0900)
Subject: core: fix invalid error message
X-Git-Tag: v236~315^2~1
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=e2b0cc3415980f7a145f8772f4ae0a4ad0fbe85a;p=systemd%2F.git

core: fix invalid error message

The error message corresponds to EILSEQ is "Invalid or incomplete
multibyte or wide character", and is not suitable in this case.
So, let's show a custom error message when the function
dynamic_creds_realize() returns -EILSEQ.
---

diff --git a/src/core/execute.c b/src/core/execute.c
index c4dfac96d9..36dbc28707 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2798,6 +2798,10 @@ static int exec_child(
                 r = dynamic_creds_realize(dcreds, suggested_paths, &uid, &gid);
                 if (r < 0) {
                         *exit_status = EXIT_USER;
+                        if (r == -EILSEQ) {
+                                log_unit_error(unit, "Failed to update dynamic user credentials: User or group with specified name already exists.");
+                                return -EOPNOTSUPP;
+                        }
                         return log_unit_error_errno(unit, r, "Failed to update dynamic user credentials: %m");
                 }