From: Karel Zak <kzak@redhat.com>
Date: Mon, 5 Jan 2026 10:19:52 +0000 (+0100)
Subject: Merge branch 'PR/Benno-17Dec-25'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8008325e2167f145a8303cd52141c42623c5b34f;p=thirdparty%2Futil-linux.git

Merge branch 'PR/Benno-17Dec-25'

# Conflicts:
#	sys-utils/unshare.c
---

8008325e2167f145a8303cd52141c42623c5b34f
diff --cc sys-utils/unshare.c
index 6f82461b8,7b177e618..dbf5d038e
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@@ -1194,14 -1206,14 +1194,14 @@@ int main(int argc, char *argv[]
  #endif
  	}
  
-         if (mapuser != MAX_OF_UINT_TYPE(uid_t))
 -	if (mapuser != (uid_t) -1 && !usermap)
++	if (mapuser != MAX_OF_UINT_TYPE(uid_t) && !usermap)
  		map_id(_PATH_PROC_UIDMAP, mapuser, real_euid);
  
-         /* Since Linux 3.19 unprivileged writing of /proc/self/gid_map
-          * has been disabled unless /proc/self/setgroups is written
-          * first to permanently disable the ability to call setgroups
-          * in that user namespace. */
- 	if (mapgroup != MAX_OF_UINT_TYPE(gid_t)) {
+ 	/* Since Linux 3.19 unprivileged writing of /proc/self/gid_map
+ 	 * has been disabled unless /proc/self/setgroups is written
+ 	 * first to permanently disable the ability to call setgroups
+ 	 * in that user namespace. */
 -	if (mapgroup != (gid_t) -1 && !groupmap) {
++	if (mapgroup != MAX_OF_UINT_TYPE(gid_t) && !groupmap) {
  		if (setgrpcmd == SETGROUPS_ALLOW)
  			errx(EXIT_FAILURE, _("options --setgroups=allow and "
  					"--map-group are mutually exclusive"));