emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

fix newusers when nss provides subids

Browse Source 
Closes #331

1. drop 'has_any_range' nss method as it is not useful

2. do not try to create a subid range in newusers when using nss for
   subids, since that's not possible.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
(cherry picked from commit 88a434adbdcf4a8640793fd58bcd2ba77598349d)
This commit is contained in:
Serge Hallyn
2021-05-16 21:59:14 -05:00
parent 0fe42f571c
commit 9d169ffc41
5 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/newusers.c
View File

@@ -1033,6 +1033,24 @@ static void close_files (void)
#endif /* ENABLE_SUBIDS */
}
static bool want_subuids(void)
{
if (get_subid_nss_handle() != NULL)
return false;
if (getdef_ulong ("SUB_UID_COUNT", 65536) == 0)
return false;
return true;
}
static bool want_subgids(void)
{
if (get_subid_nss_handle() != NULL)
return false;
if (getdef_ulong ("SUB_GID_COUNT", 65536) == 0)
return false;
return true;
}
int main (int argc, char **argv)
{
char buf[BUFSIZ];
@@ -1262,7 +1280,7 @@ int main (int argc, char **argv)
/*
* Add subordinate uids if the user does not have them.
*/
if (is_sub_uid && !sub_uid_assigned(fields[0])) {
if (is_sub_uid && want_subuids() && !local_sub_uid_assigned(fields[0])) {
uid_t sub_uid_start = 0;
unsigned long sub_uid_count = 0;
if (find_new_sub_uids(&sub_uid_start, &sub_uid_count) == 0) {
@@ -1282,7 +1300,7 @@ int main (int argc, char **argv)
/*
* Add subordinate gids if the user does not have them.
*/
if (is_sub_gid && !sub_gid_assigned(fields[0])) {
if (is_sub_gid && want_subgids() && !local_sub_gid_assigned(fields[0])) {
gid_t sub_gid_start = 0;
unsigned long sub_gid_count = 0;
if (find_new_sub_gids(&sub_gid_start, &sub_gid_count) == 0) {