|
 |
24ea25 |
From 663824ef4ca927aa2b4319b69e0bfa68282ec719 Mon Sep 17 00:00:00 2001
|
|
|
24ea25 |
From: Serge Hallyn <serge@hallyn.com>
|
|
|
24ea25 |
Date: Sat, 22 May 2021 11:42:02 -0500
|
|
|
24ea25 |
Subject: [PATCH] Fix useradd with SUB_UID_COUNT=0
|
|
|
24ea25 |
|
|
|
24ea25 |
Closes #298
|
|
|
24ea25 |
|
|
|
24ea25 |
Fix useradd when SUB_UID_COUNT=0 in login.defs.
|
|
|
24ea25 |
|
|
|
24ea25 |
Signed-off-by: Serge Hallyn <serge@hallyn.com>
|
|
|
24ea25 |
---
|
|
|
24ea25 |
src/useradd.c | 8 ++++++--
|
|
|
24ea25 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
24ea25 |
|
|
|
24ea25 |
diff --git a/src/useradd.c b/src/useradd.c
|
|
|
24ea25 |
index 06accb2f..9862ae55 100644
|
|
|
24ea25 |
--- a/src/useradd.c
|
|
|
24ea25 |
+++ b/src/useradd.c
|
|
|
24ea25 |
@@ -2386,6 +2386,8 @@ int main (int argc, char **argv)
|
|
|
24ea25 |
#ifdef ENABLE_SUBIDS
|
|
|
24ea25 |
uid_t uid_min;
|
|
|
24ea25 |
uid_t uid_max;
|
|
|
24ea25 |
+ unsigned long subuid_count;
|
|
|
24ea25 |
+ unsigned long subgid_count;
|
|
|
24ea25 |
#endif
|
|
|
24ea25 |
|
|
|
24ea25 |
/*
|
|
|
24ea25 |
@@ -2427,9 +2429,11 @@ int main (int argc, char **argv)
|
|
|
24ea25 |
#ifdef ENABLE_SUBIDS
|
|
|
24ea25 |
uid_min = (uid_t) getdef_ulong ("UID_MIN", 1000UL);
|
|
|
24ea25 |
uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL);
|
|
|
24ea25 |
- is_sub_uid = sub_uid_file_present () && !rflg &&
|
|
|
24ea25 |
+ subuid_count = getdef_ulong ("SUB_UID_COUNT", 65536);
|
|
|
24ea25 |
+ subgid_count = getdef_ulong ("SUB_GID_COUNT", 65536);
|
|
|
24ea25 |
+ is_sub_uid = subuid_count > 0 && sub_uid_file_present () && !rflg &&
|
|
|
24ea25 |
(!user_id || (user_id <= uid_max && user_id >= uid_min));
|
|
|
24ea25 |
- is_sub_gid = sub_gid_file_present () && !rflg &&
|
|
|
24ea25 |
+ is_sub_gid = subgid_count > 0 && sub_gid_file_present () && !rflg &&
|
|
|
24ea25 |
(!user_id || (user_id <= uid_max && user_id >= uid_min));
|
|
|
24ea25 |
#endif /* ENABLE_SUBIDS */
|
|
|
24ea25 |
|
|
|
24ea25 |
--
|
|
|
24ea25 |
2.30.2
|
|
|
24ea25 |
|