From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 27 Jun 2022 01:31:53 +0000 (+0900)
Subject: nspawn: support PrivateUsers=identity
X-Git-Tag: v252-rc1~743^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F23835%2Fhead;p=thirdparty%2Fsystemd.git

nspawn: support PrivateUsers=identity

Follow-up for 33eac552ab22af58b303342b1fa912900fa42820.

Fixes #23825.
---

diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
index 3a5d72549a1..48daaa83e13 100644
--- a/src/nspawn/nspawn-settings.c
+++ b/src/nspawn/nspawn-settings.c
@@ -623,6 +623,11 @@ int config_parse_private_users(
                 settings->userns_mode = USER_NAMESPACE_PICK;
                 settings->uid_shift = UID_INVALID;
                 settings->uid_range = UINT32_C(0x10000);
+        } else if (streq(rvalue, "identity")) {
+                /* identity: User namespacing on, UID range is 0:65536 */
+                settings->userns_mode = USER_NAMESPACE_FIXED;
+                settings->uid_shift = 0;
+                settings->uid_range = UINT32_C(0x10000);
         } else {
                 const char *range, *shift;
                 uid_t sh, rn;