31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
|
From efbd654ae84bc8033affed03538429b51eac02e8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Wed, 18 Oct 2017 08:57:54 +0900
|
||
|
|
Subject: [PATCH] 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.
|
||
|
|
|
||
|
|
(cherry picked from commit e2b0cc3415980f7a145f8772f4ae0a4ad0fbe85a)
|
||
|
|
---
|
||
|
|
src/core/execute.c | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/core/execute.c b/src/core/execute.c
|
||
|
|
index ef95a75e75..239ad7bcfd 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");
|
||
|
|
}
|
||
|
|
|