Fix useradd with SUB_UID_COUNT=0

Closes #298

Fix useradd when SUB_UID_COUNT=0 in login.defs.

Signed-off-by: Serge Hallyn <serge@hallyn.com>

diff --git a/src/useradd.c b/src/useradd.c
index 06accb2f0c06f95593e76b9181a950cf3d2eceed..9862ae5571e48fb0783a51c23350d48518457bf0 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -2386,6 +2386,8 @@ int main (int argc, char **argv)
 #ifdef ENABLE_SUBIDS
        uid_t uid_min;
        uid_t uid_max;
+       unsigned long subuid_count;
+       unsigned long subgid_count;
 #endif
 
        /*
@@ -2427,9 +2429,11 @@ int main (int argc, char **argv)
 #ifdef ENABLE_SUBIDS
        uid_min = (uid_t) getdef_ulong ("UID_MIN", 1000UL);
        uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL);
-       is_sub_uid = sub_uid_file_present () && !rflg &&
+       subuid_count = getdef_ulong ("SUB_UID_COUNT", 65536);
+       subgid_count = getdef_ulong ("SUB_GID_COUNT", 65536);
+       is_sub_uid = subuid_count > 0 && sub_uid_file_present () && !rflg &&
            (!user_id || (user_id <= uid_max && user_id >= uid_min));
-       is_sub_gid = sub_gid_file_present () && !rflg &&
+       is_sub_gid = subgid_count > 0 && sub_gid_file_present () && !rflg &&
            (!user_id || (user_id <= uid_max && user_id >= uid_min));
 #endif                         /* ENABLE_SUBIDS */