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

sub_[ug]id_{add,remove}: fix return values

Browse Source 
On failure, these are meant to return 0 with errno set.  But if
an nss module is loaded, they were returning -ERRNO instead.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
This commit is contained in:
Serge Hallyn 2023-05-25 22:00:36 -05:00
parent 8665fe1957
commit a80b792afc
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/subordinateio.c
View File

@ -623,17 +623,28 @@ bool have_sub_uids(const char *owner, uid_t start, unsigned long count)
return have_range (&subordinate_uid_db, owner, start, count); return have_range (&subordinate_uid_db, owner, start, count);
} }
/*
* sub_uid_add: add a subuid range, perhaps through nss.
*
* Return 1 if the range is already present or on success. On error
* return 0 and set errno appropriately.
*/
int sub_uid_add (const char *owner, uid_t start, unsigned long count) int sub_uid_add (const char *owner, uid_t start, unsigned long count)
{ {
if (get_subid_nss_handle()) if (get_subid_nss_handle()) {
return -EOPNOTSUPP; errno = EOPNOTSUPP;
return 0;
}
return add_range (&subordinate_uid_db, owner, start, count); return add_range (&subordinate_uid_db, owner, start, count);
} }
/* Return 1 on success. on failure, return 0 and set errno appropriately */
int sub_uid_remove (const char *owner, uid_t start, unsigned long count) int sub_uid_remove (const char *owner, uid_t start, unsigned long count)
{ {
if (get_subid_nss_handle()) if (get_subid_nss_handle()) {
return -EOPNOTSUPP; errno = EOPNOTSUPP;
return 0;
}
return remove_range (&subordinate_uid_db, owner, start, count); return remove_range (&subordinate_uid_db, owner, start, count);
} }
@ -719,17 +730,28 @@ bool local_sub_gid_assigned(const char *owner)
return range_exists (&subordinate_gid_db, owner); return range_exists (&subordinate_gid_db, owner);
} }
/*
* sub_gid_add: add a subgid range, perhaps through nss.
*
* Return 1 if the range is already present or on success. On error
* return 0 and set errno appropriately.
*/
int sub_gid_add (const char *owner, gid_t start, unsigned long count) int sub_gid_add (const char *owner, gid_t start, unsigned long count)
{ {
if (get_subid_nss_handle()) if (get_subid_nss_handle()) {
return -EOPNOTSUPP; errno = EOPNOTSUPP;
return 0;
}
return add_range (&subordinate_gid_db, owner, start, count); return add_range (&subordinate_gid_db, owner, start, count);
} }
/* Return 1 on success. on failure, return 0 and set errno appropriately */
int sub_gid_remove (const char *owner, gid_t start, unsigned long count) int sub_gid_remove (const char *owner, gid_t start, unsigned long count)
{ {
if (get_subid_nss_handle()) if (get_subid_nss_handle()) {
return -EOPNOTSUPP; errno = EOPNOTSUPP;
return 0;
}
return remove_range (&subordinate_gid_db, owner, start, count); return remove_range (&subordinate_gid_db, owner, start, count);
} }