2013-01-22 14:44:35 +05:30
|
|
|
/*
|
|
|
|
* Copyright (c) 2012 - Eric Biederman
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
Allow disabling of subordinate IDs.
* configure.in: Add configure options --enable-subordinate-ids /
--disable-subordinate-ids. Enabled by default.
* lib/prototypes.h: Include <config.h> before using its macros.
* lib/commonio.h, lib/commonio.c: Define commonio_append only when
ENABLE_SUBIDS is defined.
* lib/prototypes.h, libmisc/find_new_sub_gids.c,
libmisc/find_new_sub_uids.c: Likewise.
* lib/subordinateio.h, lib/subordinateio.c: Likewise.
* libmisc/user_busy.c: Only check if subordinate IDs are in use if
ENABLE_SUBIDS is defined.
* src/Makefile.am: Create newgidmap and newuidmap only if
ENABLE_SUBIDS is defined.
* src/newusers.c: Check for ENABLE_SUBIDS to enable support for
subordinate IDs.
* src/useradd.c: Likewise.
* src/userdel.c: Likewise.
* src/usermod.c: Likewise.
* man/Makefile.am: Install man1/newgidmap.1, man1/newuidmap.1,
man5/subgid.5, and man5/subuid.5 only if ENABLE_SUBIDS is defined.
* man/fr/Makefile.am: Install man1/newgidmap.1, man1/newuidmap.1,
man5/subgid.5, and man5/subuid.5 (not translated yet).
* man/generate_mans.mak: Add xsltproc conditionals
subids/no_subids.
* man/login.defs.d/SUB_GID_COUNT.xml: Add dependency on subids
condition.
* man/login.defs.d/SUB_UID_COUNT.xml: Likewise.
* man/usermod.8.xml: Document options for subordinate IDs and
reference subgid(5) / subuid(5) depending on the subids condition.
2013-08-11 18:24:22 +05:30
|
|
|
|
|
|
|
#ifdef ENABLE_SUBIDS
|
|
|
|
|
2013-01-22 14:44:35 +05:30
|
|
|
#include "prototypes.h"
|
|
|
|
#include "defines.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "commonio.h"
|
|
|
|
#include "subordinateio.h"
|
2014-09-06 02:51:03 +05:30
|
|
|
#include <sys/types.h>
|
|
|
|
#include <pwd.h>
|
Create a new libsubid
Closes #154
Currently this has three functions: one which returns the
list of subuid ranges for a user, one returning the subgids,
and one which frees the ranges lists.
I might be mistaken about what -disable-man means; some of
the code suggests it means just don't re-generate them, but
not totally ignore them. But that doesn't seem to really work,
so let's just ignore man/ when -disable-man.
Remove --disable-shared. I'm not sure why it was there, but it stems
from long, long ago, and I suspect it comes from some ancient
toolchain bug.
Create a tests/run_some, a shorter version of run_all. I'll
slowly add tests to this as I verify they work, then I can
work on fixing the once which don't.
Also, don't touch man/ if not -enable-man.
Changelog:
Apr 22: change the subid list api as recomended by Dan Walsh.
Apr 23: implement get_subid_owner
Apr 24: implement range add/release
Apr 25: finish tests and rebase
May 10: make @owner const
Signed-off-by: Serge Hallyn <serge@hallyn.com>
2020-04-19 04:33:54 +05:30
|
|
|
#include <ctype.h>
|
2013-01-22 14:44:35 +05:30
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* subordinate_dup: create a duplicate range
|
|
|
|
*
|
|
|
|
* @ent: a pointer to a subordinate_range struct
|
|
|
|
*
|
|
|
|
* Returns a pointer to a newly allocated duplicate subordinate_range struct
|
|
|
|
* or NULL on failure
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
static /*@null@*/ /*@only@*/void *subordinate_dup (const void *ent)
|
|
|
|
{
|
|
|
|
const struct subordinate_range *rangeent = ent;
|
|
|
|
struct subordinate_range *range;
|
|
|
|
|
|
|
|
range = (struct subordinate_range *) malloc (sizeof *range);
|
|
|
|
if (NULL == range) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
range->owner = strdup (rangeent->owner);
|
|
|
|
if (NULL == range->owner) {
|
|
|
|
free(range);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
range->start = rangeent->start;
|
|
|
|
range->count = rangeent->count;
|
|
|
|
|
|
|
|
return range;
|
|
|
|
}
|
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* subordinate_free: free a subordinate_range struct
|
|
|
|
*
|
|
|
|
* @ent: pointer to a subordinate_range struct to free.
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
static void subordinate_free (/*@out@*/ /*@only@*/void *ent)
|
|
|
|
{
|
|
|
|
struct subordinate_range *rangeent = ent;
|
|
|
|
|
|
|
|
free ((void *)(rangeent->owner));
|
|
|
|
free (rangeent);
|
|
|
|
}
|
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* subordinate_parse:
|
|
|
|
*
|
|
|
|
* @line: a line to parse
|
|
|
|
*
|
|
|
|
* Returns a pointer to a subordinate_range struct representing the values
|
|
|
|
* in @line, or NULL on failure. Note that the returned value should not
|
|
|
|
* be freed by the caller.
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
static void *subordinate_parse (const char *line)
|
|
|
|
{
|
|
|
|
static struct subordinate_range range;
|
2013-06-06 21:12:36 +05:30
|
|
|
static char rangebuf[1024];
|
2013-01-22 14:44:35 +05:30
|
|
|
int i;
|
|
|
|
char *cp;
|
Create a new libsubid
Closes #154
Currently this has three functions: one which returns the
list of subuid ranges for a user, one returning the subgids,
and one which frees the ranges lists.
I might be mistaken about what -disable-man means; some of
the code suggests it means just don't re-generate them, but
not totally ignore them. But that doesn't seem to really work,
so let's just ignore man/ when -disable-man.
Remove --disable-shared. I'm not sure why it was there, but it stems
from long, long ago, and I suspect it comes from some ancient
toolchain bug.
Create a tests/run_some, a shorter version of run_all. I'll
slowly add tests to this as I verify they work, then I can
work on fixing the once which don't.
Also, don't touch man/ if not -enable-man.
Changelog:
Apr 22: change the subid list api as recomended by Dan Walsh.
Apr 23: implement get_subid_owner
Apr 24: implement range add/release
Apr 25: finish tests and rebase
May 10: make @owner const
Signed-off-by: Serge Hallyn <serge@hallyn.com>
2020-04-19 04:33:54 +05:30
|
|
|
char *fields[SUBID_NFIELDS];
|
2013-01-22 14:44:35 +05:30
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy the string to a temporary buffer so the substrings can
|
|
|
|
* be modified to be NULL terminated.
|
|
|
|
*/
|
|
|
|
if (strlen (line) >= sizeof rangebuf)
|
|
|
|
return NULL; /* fail if too long */
|
|
|
|
strcpy (rangebuf, line);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Save a pointer to the start of each colon separated
|
|
|
|
* field. The fields are converted into NUL terminated strings.
|
|
|
|
*/
|
|
|
|
|
Create a new libsubid
Closes #154
Currently this has three functions: one which returns the
list of subuid ranges for a user, one returning the subgids,
and one which frees the ranges lists.
I might be mistaken about what -disable-man means; some of
the code suggests it means just don't re-generate them, but
not totally ignore them. But that doesn't seem to really work,
so let's just ignore man/ when -disable-man.
Remove --disable-shared. I'm not sure why it was there, but it stems
from long, long ago, and I suspect it comes from some ancient
toolchain bug.
Create a tests/run_some, a shorter version of run_all. I'll
slowly add tests to this as I verify they work, then I can
work on fixing the once which don't.
Also, don't touch man/ if not -enable-man.
Changelog:
Apr 22: change the subid list api as recomended by Dan Walsh.
Apr 23: implement get_subid_owner
Apr 24: implement range add/release
Apr 25: finish tests and rebase
May 10: make @owner const
Signed-off-by: Serge Hallyn <serge@hallyn.com>
2020-04-19 04:33:54 +05:30
|
|
|
for (cp = rangebuf, i = 0; (i < SUBID_NFIELDS) && (NULL != cp); i++) {
|
2013-01-22 14:44:35 +05:30
|
|
|
fields[i] = cp;
|
|
|
|
while (('\0' != *cp) && (':' != *cp)) {
|
|
|
|
cp++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ('\0' != *cp) {
|
|
|
|
*cp = '\0';
|
|
|
|
cp++;
|
|
|
|
} else {
|
|
|
|
cp = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
Create a new libsubid
Closes #154
Currently this has three functions: one which returns the
list of subuid ranges for a user, one returning the subgids,
and one which frees the ranges lists.
I might be mistaken about what -disable-man means; some of
the code suggests it means just don't re-generate them, but
not totally ignore them. But that doesn't seem to really work,
so let's just ignore man/ when -disable-man.
Remove --disable-shared. I'm not sure why it was there, but it stems
from long, long ago, and I suspect it comes from some ancient
toolchain bug.
Create a tests/run_some, a shorter version of run_all. I'll
slowly add tests to this as I verify they work, then I can
work on fixing the once which don't.
Also, don't touch man/ if not -enable-man.
Changelog:
Apr 22: change the subid list api as recomended by Dan Walsh.
Apr 23: implement get_subid_owner
Apr 24: implement range add/release
Apr 25: finish tests and rebase
May 10: make @owner const
Signed-off-by: Serge Hallyn <serge@hallyn.com>
2020-04-19 04:33:54 +05:30
|
|
|
* There must be exactly SUBID_NFIELDS colon separated fields or
|
2013-01-22 14:44:35 +05:30
|
|
|
* the entry is invalid. Also, fields must be non-blank.
|
|
|
|
*/
|
Create a new libsubid
Closes #154
Currently this has three functions: one which returns the
list of subuid ranges for a user, one returning the subgids,
and one which frees the ranges lists.
I might be mistaken about what -disable-man means; some of
the code suggests it means just don't re-generate them, but
not totally ignore them. But that doesn't seem to really work,
so let's just ignore man/ when -disable-man.
Remove --disable-shared. I'm not sure why it was there, but it stems
from long, long ago, and I suspect it comes from some ancient
toolchain bug.
Create a tests/run_some, a shorter version of run_all. I'll
slowly add tests to this as I verify they work, then I can
work on fixing the once which don't.
Also, don't touch man/ if not -enable-man.
Changelog:
Apr 22: change the subid list api as recomended by Dan Walsh.
Apr 23: implement get_subid_owner
Apr 24: implement range add/release
Apr 25: finish tests and rebase
May 10: make @owner const
Signed-off-by: Serge Hallyn <serge@hallyn.com>
2020-04-19 04:33:54 +05:30
|
|
|
if (i != SUBID_NFIELDS || *fields[0] == '\0' || *fields[1] == '\0' || *fields[2] == '\0')
|
2013-01-22 14:44:35 +05:30
|
|
|
return NULL;
|
|
|
|
range.owner = fields[0];
|
|
|
|
if (getulong (fields[1], &range.start) == 0)
|
|
|
|
return NULL;
|
|
|
|
if (getulong (fields[2], &range.count) == 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return ⦥
|
|
|
|
}
|
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* subordinate_put: print a subordinate_range value to a file
|
|
|
|
*
|
|
|
|
* @ent: a pointer to a subordinate_range struct to print out.
|
|
|
|
* @file: file to which to print.
|
|
|
|
*
|
|
|
|
* Returns 0 on success, -1 on error.
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
static int subordinate_put (const void *ent, FILE * file)
|
|
|
|
{
|
|
|
|
const struct subordinate_range *range = ent;
|
|
|
|
|
|
|
|
return fprintf(file, "%s:%lu:%lu\n",
|
|
|
|
range->owner,
|
|
|
|
range->start,
|
|
|
|
range->count) < 0 ? -1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct commonio_ops subordinate_ops = {
|
|
|
|
subordinate_dup, /* dup */
|
|
|
|
subordinate_free, /* free */
|
|
|
|
NULL, /* getname */
|
|
|
|
subordinate_parse, /* parse */
|
|
|
|
subordinate_put, /* put */
|
|
|
|
fgets, /* fgets */
|
|
|
|
fputs, /* fputs */
|
|
|
|
NULL, /* open_hook */
|
|
|
|
NULL, /* close_hook */
|
|
|
|
};
|
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* range_exists: Check whether @owner owns any ranges
|
|
|
|
*
|
|
|
|
* @db: database to query
|
|
|
|
* @owner: owner being queried
|
|
|
|
*
|
|
|
|
* Returns true if @owner owns any subuid ranges, false otherwise.
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
static const bool range_exists(struct commonio_db *db, const char *owner)
|
|
|
|
{
|
|
|
|
const struct subordinate_range *range;
|
|
|
|
commonio_rewind(db);
|
|
|
|
while ((range = commonio_next(db)) != NULL) {
|
|
|
|
if (0 == strcmp(range->owner, owner))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* find_range: find a range which @owner is authorized to use which includes
|
|
|
|
* subuid @val.
|
|
|
|
*
|
|
|
|
* @db: database to query
|
2017-10-23 02:35:52 +05:30
|
|
|
* @owner: owning uid being queried
|
2013-08-23 00:51:34 +05:30
|
|
|
* @val: subuid being searched for.
|
|
|
|
*
|
|
|
|
* Returns a range of subuids belonging to @owner and including the subuid
|
|
|
|
* @val, or NULL if no such range exists.
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
static const struct subordinate_range *find_range(struct commonio_db *db,
|
|
|
|
const char *owner, unsigned long val)
|
|
|
|
{
|
|
|
|
const struct subordinate_range *range;
|
2014-09-06 02:51:03 +05:30
|
|
|
|
|
|
|
/*
|
|
|
|
* Search for exact username/group specification
|
|
|
|
*
|
|
|
|
* This is the original method - go fast through the db, doing only
|
|
|
|
* exact username/group string comparison. Therefore we leave it as-is
|
|
|
|
* for the time being, in order to keep it equally fast as it was
|
|
|
|
* before.
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
commonio_rewind(db);
|
|
|
|
while ((range = commonio_next(db)) != NULL) {
|
|
|
|
unsigned long first = range->start;
|
|
|
|
unsigned long last = first + range->count - 1;
|
|
|
|
|
|
|
|
if (0 != strcmp(range->owner, owner))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if ((val >= first) && (val <= last))
|
|
|
|
return range;
|
|
|
|
}
|
2014-09-06 02:51:03 +05:30
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We only do special handling for these two files
|
|
|
|
*/
|
|
|
|
if ((0 != strcmp(db->filename, "/etc/subuid")) && (0 != strcmp(db->filename, "/etc/subgid")))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Search loop above did not produce any result. Let's rerun it,
|
2017-10-23 02:03:00 +05:30
|
|
|
* but this time try to match actual UIDs. The first entry that
|
2014-09-06 02:51:03 +05:30
|
|
|
* matches is considered a success.
|
|
|
|
* (It may be specified as literal UID or as another username which
|
|
|
|
* has the same UID as the username we are looking for.)
|
|
|
|
*/
|
|
|
|
struct passwd *pwd;
|
|
|
|
uid_t owner_uid;
|
|
|
|
char owner_uid_string[33] = "";
|
|
|
|
|
|
|
|
|
|
|
|
/* Get UID of the username we are looking for */
|
|
|
|
pwd = getpwnam(owner);
|
|
|
|
if (NULL == pwd) {
|
|
|
|
/* Username not defined in /etc/passwd, or error occured during lookup */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
owner_uid = pwd->pw_uid;
|
|
|
|
sprintf(owner_uid_string, "%lu", (unsigned long int)owner_uid);
|
|
|
|
|
|
|
|
commonio_rewind(db);
|
|
|
|
while ((range = commonio_next(db)) != NULL) {
|
|
|
|
unsigned long first = range->start;
|
|
|
|
unsigned long last = first + range->count - 1;
|
|
|
|
|
2014-09-07 00:17:55 +05:30
|
|
|
/* For performance reasons check range before using getpwnam() */
|
|
|
|
if ((val < first) || (val > last)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Range matches. Check if range owner is specified
|
|
|
|
* as numeric UID and if it matches.
|
|
|
|
*/
|
|
|
|
if (0 == strcmp(range->owner, owner_uid_string)) {
|
|
|
|
return range;
|
|
|
|
}
|
|
|
|
|
2014-09-06 02:51:03 +05:30
|
|
|
/*
|
2014-09-07 00:17:55 +05:30
|
|
|
* Ok, this range owner is not specified as numeric UID
|
|
|
|
* we are looking for. It may be specified as another
|
|
|
|
* UID or as a literal username.
|
|
|
|
*
|
|
|
|
* If specified as another UID, the call to getpwnam()
|
|
|
|
* will return NULL.
|
|
|
|
*
|
|
|
|
* If specified as literal username, we will get its
|
|
|
|
* UID and compare that to UID we are looking for.
|
2014-09-06 02:51:03 +05:30
|
|
|
*/
|
2014-09-07 00:17:55 +05:30
|
|
|
const struct passwd *range_owner_pwd;
|
|
|
|
|
|
|
|
range_owner_pwd = getpwnam(range->owner);
|
|
|
|
if (NULL == range_owner_pwd) {
|
|
|
|
continue;
|
2014-09-06 02:51:03 +05:30
|
|
|
}
|
|
|
|
|
2014-09-07 00:17:55 +05:30
|
|
|
if (owner_uid == range_owner_pwd->pw_uid) {
|
2014-09-06 02:51:03 +05:30
|
|
|
return range;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-22 14:44:35 +05:30
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* have_range: check whether @owner is authorized to use the range
|
|
|
|
* (@start .. @start+@count-1).
|
|
|
|
* @db: database to check
|
|
|
|
* @owner: owning uid being queried
|
|
|
|
* @start: start of range
|
|
|
|
* @count: number of uids in range
|
|
|
|
*
|
|
|
|
* Returns true if @owner is authorized to use the range, false otherwise.
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
static bool have_range(struct commonio_db *db,
|
|
|
|
const char *owner, unsigned long start, unsigned long count)
|
|
|
|
{
|
|
|
|
const struct subordinate_range *range;
|
|
|
|
unsigned long end;
|
|
|
|
|
|
|
|
if (count == 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
end = start + count - 1;
|
|
|
|
range = find_range (db, owner, start);
|
|
|
|
while (range) {
|
|
|
|
unsigned long last;
|
|
|
|
|
|
|
|
last = range->start + range->count - 1;
|
|
|
|
if (last >= (start + count - 1))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
count = end - last;
|
|
|
|
start = last + 1;
|
|
|
|
range = find_range(db, owner, start);
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
Create a new libsubid
Closes #154
Currently this has three functions: one which returns the
list of subuid ranges for a user, one returning the subgids,
and one which frees the ranges lists.
I might be mistaken about what -disable-man means; some of
the code suggests it means just don't re-generate them, but
not totally ignore them. But that doesn't seem to really work,
so let's just ignore man/ when -disable-man.
Remove --disable-shared. I'm not sure why it was there, but it stems
from long, long ago, and I suspect it comes from some ancient
toolchain bug.
Create a tests/run_some, a shorter version of run_all. I'll
slowly add tests to this as I verify they work, then I can
work on fixing the once which don't.
Also, don't touch man/ if not -enable-man.
Changelog:
Apr 22: change the subid list api as recomended by Dan Walsh.
Apr 23: implement get_subid_owner
Apr 24: implement range add/release
Apr 25: finish tests and rebase
May 10: make @owner const
Signed-off-by: Serge Hallyn <serge@hallyn.com>
2020-04-19 04:33:54 +05:30
|
|
|
static bool append_range(struct subordinate_range ***ranges, const struct subordinate_range *new, int n)
|
|
|
|
{
|
|
|
|
struct subordinate_range *tmp;
|
|
|
|
if (!*ranges) {
|
|
|
|
*ranges = malloc(2 * sizeof(struct subordinate_range **));
|
|
|
|
if (!*ranges)
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
struct subordinate_range **new;
|
|
|
|
new = realloc(*ranges, (n + 2) * (sizeof(struct subordinate_range **)));
|
|
|
|
if (!new)
|
|
|
|
return false;
|
|
|
|
*ranges = new;
|
|
|
|
}
|
|
|
|
(*ranges)[n] = (*ranges)[n+1] = NULL;
|
|
|
|
tmp = subordinate_dup(new);
|
|
|
|
if (!tmp)
|
|
|
|
return false;
|
|
|
|
(*ranges)[n] = tmp;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void free_subordinate_ranges(struct subordinate_range **ranges)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!ranges)
|
|
|
|
return;
|
|
|
|
for (i = 0; ranges[i]; i++)
|
|
|
|
subordinate_free(ranges[i]);
|
|
|
|
free(ranges);
|
|
|
|
}
|
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* subordinate_range_cmp: compare uid ranges
|
|
|
|
*
|
|
|
|
* @p1: pointer to a commonio_entry struct to compare
|
|
|
|
* @p2: pointer to second commonio_entry struct to compare
|
|
|
|
*
|
|
|
|
* Returns 0 if the entries are the same. Otherwise return -1
|
|
|
|
* if the range in p1 is lower than that in p2, or (if the ranges are
|
|
|
|
* equal) if the owning uid in p1 is lower than p2's. Return 1 if p1's
|
|
|
|
* range or owning uid is great than p2's.
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
static int subordinate_range_cmp (const void *p1, const void *p2)
|
|
|
|
{
|
|
|
|
struct subordinate_range *range1, *range2;
|
|
|
|
|
|
|
|
if ((*(struct commonio_entry **) p1)->eptr == NULL)
|
|
|
|
return 1;
|
|
|
|
if ((*(struct commonio_entry **) p2)->eptr == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
range1 = ((struct subordinate_range *) (*(struct commonio_entry **) p1)->eptr);
|
|
|
|
range2 = ((struct subordinate_range *) (*(struct commonio_entry **) p2)->eptr);
|
|
|
|
|
|
|
|
if (range1->start < range2->start)
|
|
|
|
return -1;
|
|
|
|
else if (range1->start > range2->start)
|
|
|
|
return 1;
|
|
|
|
else if (range1->count < range2->count)
|
|
|
|
return -1;
|
|
|
|
else if (range1->count > range2->count)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return strcmp(range1->owner, range2->owner);
|
|
|
|
}
|
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* find_free_range: find an unused consecutive sequence of ids to allocate
|
|
|
|
* to a user.
|
|
|
|
* @db: database to search
|
|
|
|
* @min: the first uid in the range to find
|
|
|
|
* @max: the highest uid to find
|
|
|
|
* @count: the number of uids needed
|
|
|
|
*
|
|
|
|
* Return the lowest new uid, or ULONG_MAX on failure.
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
static unsigned long find_free_range(struct commonio_db *db,
|
|
|
|
unsigned long min, unsigned long max,
|
|
|
|
unsigned long count)
|
|
|
|
{
|
|
|
|
const struct subordinate_range *range;
|
|
|
|
unsigned long low, high;
|
|
|
|
|
|
|
|
/* When given invalid parameters fail */
|
2013-08-13 03:41:24 +05:30
|
|
|
if ((count == 0) || (max < min))
|
2013-01-22 14:44:35 +05:30
|
|
|
goto fail;
|
|
|
|
|
2013-08-07 00:02:59 +05:30
|
|
|
/* Sort by range then by owner */
|
2013-01-22 14:44:35 +05:30
|
|
|
commonio_sort (db, subordinate_range_cmp);
|
|
|
|
commonio_rewind(db);
|
|
|
|
|
|
|
|
low = min;
|
|
|
|
while ((range = commonio_next(db)) != NULL) {
|
|
|
|
unsigned long first = range->start;
|
|
|
|
unsigned long last = first + range->count - 1;
|
|
|
|
|
|
|
|
/* Find the top end of the hole before this range */
|
|
|
|
high = first;
|
2013-08-15 20:33:18 +05:30
|
|
|
|
|
|
|
/* Don't allocate IDs after max (included) */
|
|
|
|
if (high > max + 1) {
|
|
|
|
high = max + 1;
|
|
|
|
}
|
2013-01-22 14:44:35 +05:30
|
|
|
|
|
|
|
/* Is the hole before this range large enough? */
|
2013-08-13 03:41:24 +05:30
|
|
|
if ((high > low) && ((high - low) >= count))
|
2013-01-22 14:44:35 +05:30
|
|
|
return low;
|
|
|
|
|
|
|
|
/* Compute the low end of the next hole */
|
|
|
|
if (low < (last + 1))
|
|
|
|
low = last + 1;
|
|
|
|
if (low > max)
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Is the remaining unclaimed area large enough? */
|
|
|
|
if (((max - low) + 1) >= count)
|
|
|
|
return low;
|
|
|
|
fail:
|
|
|
|
return ULONG_MAX;
|
|
|
|
}
|
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* add_range: add a subuid range to an owning uid's list of authorized
|
|
|
|
* subuids.
|
|
|
|
* @db: database to which to add
|
|
|
|
* @owner: uid which owns the subuid
|
|
|
|
* @start: the first uid in the owned range
|
|
|
|
* @count: the number of uids in the range
|
|
|
|
*
|
2017-10-23 02:53:13 +05:30
|
|
|
* Return 1 if the range is already present or on success. On error
|
2013-08-23 00:51:34 +05:30
|
|
|
* return 0 and set errno appropriately.
|
|
|
|
*/
|
2013-01-22 14:44:35 +05:30
|
|
|
static int add_range(struct commonio_db *db,
|
|
|
|
const char *owner, unsigned long start, unsigned long count)
|
|
|
|
{
|
|
|
|
struct subordinate_range range;
|
|
|
|
range.owner = owner;
|
|
|
|
range.start = start;
|
|
|
|
range.count = count;
|
|
|
|
|
|
|
|
/* See if the range is already present */
|
|
|
|
if (have_range(db, owner, start, count))
|
|
|
|
return 1;
|
|
|
|
|
2013-08-07 00:02:59 +05:30
|
|
|
/* Otherwise append the range */
|
2013-01-22 14:44:35 +05:30
|
|
|
return commonio_append(db, &range);
|
|
|
|
}
|
|
|
|
|
2013-08-23 00:51:34 +05:30
|
|
|
/*
|
|
|
|
* remove_range: remove a range of subuids from an owning uid's list
|
|
|
|
* of authorized subuids.
|
|
|
|
* @db: database to work on
|
|
|
|
* @owner: owning uid whose range is being removed
|
|
|
|
* @start: start of the range to be removed
|
|
|
|
* @count: number of uids in the range.
|
|
|
|
*
|
|
|
|
* Returns 0 on failure, 1 on success. Failure means that we needed to
|
|
|
|
* create a new range to represent the new limits, and failed doing so.
|
|
|
|
*/
|
2013-08-14 03:33:59 +05:30
|
|
|
static int remove_range (struct commonio_db *db,
|
|
|
|
const char *owner,
|
|
|
|
unsigned long start, unsigned long count)
|
2013-01-22 14:44:35 +05:30
|
|
|
{
|
|
|
|
struct commonio_entry *ent;
|
|
|
|
unsigned long end;
|
|
|
|
|
2013-08-14 03:33:59 +05:30
|
|
|
if (count == 0) {
|
2013-01-22 14:44:35 +05:30
|
|
|
return 1;
|
2013-08-14 03:33:59 +05:30
|
|
|
}
|
2013-01-22 14:44:35 +05:30
|
|
|
|
|
|
|
end = start + count - 1;
|
2013-08-14 03:33:59 +05:30
|
|
|
for (ent = db->head; NULL != ent; ent = ent->next) {
|
2013-01-22 14:44:35 +05:30
|
|
|
struct subordinate_range *range = ent->eptr;
|
|
|
|
unsigned long first;
|
|
|
|
unsigned long last;
|
|
|
|
|
|
|
|
/* Skip unparsed entries */
|
2013-08-14 03:33:59 +05:30
|
|
|
if (NULL == range) {
|
2013-01-22 14:44:35 +05:30
|
|
|
continue;
|
2013-08-14 03:33:59 +05:30
|
|
|
}
|
2013-01-22 14:44:35 +05:30
|
|
|
|
|
|
|
first = range->start;
|
|
|
|
last = first + range->count - 1;
|
|
|
|
|
|
|
|
/* Skip entries with a different owner */
|
2013-08-14 03:33:59 +05:30
|
|
|
if (0 != strcmp (range->owner, owner)) {
|
2013-01-22 14:44:35 +05:30
|
|
|
continue;
|
2013-08-14 03:33:59 +05:30
|
|
|
}
|
2013-01-22 14:44:35 +05:30
|
|
|
|
|
|
|
/* Skip entries outside of the range to remove */
|
2013-08-14 03:33:59 +05:30
|
|
|
if ((end < first) || (start > last)) {
|
2013-01-22 14:44:35 +05:30
|
|
|
continue;
|
2013-08-14 03:33:59 +05:30
|
|
|
}
|
2013-01-22 14:44:35 +05:30
|
|
|
|
2013-08-14 03:25:48 +05:30
|
|
|
if (start <= first) {
|
|
|
|
if (end >= last) {
|
2013-08-14 03:27:14 +05:30
|
|
|
/* to be removed: [start, end]
|
|
|
|
* range: [first, last] */
|
2013-08-14 03:25:48 +05:30
|
|
|
/* entry completely contained in the
|
|
|
|
* range to remove */
|
|
|
|
commonio_del_entry (db, ent);
|
|
|
|
} else {
|
2013-08-14 03:27:14 +05:30
|
|
|
/* to be removed: [start, end]
|
|
|
|
* range: [first, last] */
|
2013-08-14 03:25:48 +05:30
|
|
|
/* Remove only the start of the entry */
|
|
|
|
range->start = end + 1;
|
|
|
|
range->count = (last - range->start) + 1;
|
|
|
|
|
|
|
|
ent->changed = true;
|
|
|
|
db->changed = true;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (end >= last) {
|
2013-08-14 03:27:14 +05:30
|
|
|
/* to be removed: [start, end]
|
|
|
|
* range: [first, last] */
|
2013-08-14 03:25:48 +05:30
|
|
|
/* Remove only the end of the entry */
|
|
|
|
range->count = start - range->start;
|
|
|
|
|
|
|
|
ent->changed = true;
|
|
|
|
db->changed = true;
|
|
|
|
} else {
|
2013-08-14 03:27:14 +05:30
|
|
|
/* to be removed: [start, end]
|
|
|
|
* range: [first, last] */
|
2013-08-14 03:25:48 +05:30
|
|
|
/* Remove the middle of the range
|
|
|
|
* This requires to create a new range */
|
|
|
|
struct subordinate_range tail;
|
|
|
|
tail.owner = range->owner;
|
|
|
|
tail.start = end + 1;
|
|
|
|
tail.count = (last - tail.start) + 1;
|
|
|
|
|
2013-08-14 03:33:59 +05:30
|
|
|
if (commonio_append (db, &tail) == 0) {
|
2013-08-14 03:25:48 +05:30
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
range->count = start - range->start;
|
|
|
|
|
|
|
|
ent->changed = true;
|
|
|
|
db->changed = true;
|
|
|
|
}
|
2013-01-22 14:44:35 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct commonio_db subordinate_uid_db = {
|
|
|
|
"/etc/subuid", /* filename */
|
|
|
|
&subordinate_ops, /* ops */
|
|
|
|
NULL, /* fp */
|
|
|
|
#ifdef WITH_SELINUX
|
|
|
|
NULL, /* scontext */
|
|
|
|
#endif
|
2015-02-27 21:56:57 +05:30
|
|
|
0644, /* st_mode */
|
|
|
|
0, /* st_uid */
|
|
|
|
0, /* st_gid */
|
2013-01-22 14:44:35 +05:30
|
|
|
NULL, /* head */
|
|
|
|
NULL, /* tail */
|
|
|
|
NULL, /* cursor */
|
|
|
|
false, /* changed */
|
|
|
|
false, /* isopen */
|
|
|
|
false, /* locked */
|
2019-05-02 18:03:06 +05:30
|
|
|
false, /* readonly */
|
|
|
|
false /* setname */
|
2013-01-22 14:44:35 +05:30
|
|
|
};
|
|
|
|
|
|
|
|
int sub_uid_setdbname (const char *filename)
|
|
|
|
{
|
|
|
|
return commonio_setname (&subordinate_uid_db, filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*@observer@*/const char *sub_uid_dbname (void)
|
|
|
|
{
|
|
|
|
return subordinate_uid_db.filename;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool sub_uid_file_present (void)
|
|
|
|
{
|
|
|
|
return commonio_present (&subordinate_uid_db);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_uid_lock (void)
|
|
|
|
{
|
|
|
|
return commonio_lock (&subordinate_uid_db);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_uid_open (int mode)
|
|
|
|
{
|
|
|
|
return commonio_open (&subordinate_uid_db, mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool sub_uid_assigned(const char *owner)
|
|
|
|
{
|
|
|
|
return range_exists (&subordinate_uid_db, owner);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool have_sub_uids(const char *owner, uid_t start, unsigned long count)
|
|
|
|
{
|
|
|
|
return have_range (&subordinate_uid_db, owner, start, count);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_uid_add (const char *owner, uid_t start, unsigned long count)
|
|
|
|
{
|
|
|
|
return add_range (&subordinate_uid_db, owner, start, count);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_uid_remove (const char *owner, uid_t start, unsigned long count)
|
|
|
|
{
|
|
|
|
return remove_range (&subordinate_uid_db, owner, start, count);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_uid_close (void)
|
|
|
|
{
|
|
|
|
return commonio_close (&subordinate_uid_db);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_uid_unlock (void)
|
|
|
|
{
|
|
|
|
return commonio_unlock (&subordinate_uid_db);
|
|
|
|
}
|
|
|
|
|
|
|
|
uid_t sub_uid_find_free_range(uid_t min, uid_t max, unsigned long count)
|
|
|
|
{
|
|
|
|
unsigned long start;
|
|
|
|
start = find_free_range (&subordinate_uid_db, min, max, count);
|
|
|
|
return start == ULONG_MAX ? (uid_t) -1 : start;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct commonio_db subordinate_gid_db = {
|
|
|
|
"/etc/subgid", /* filename */
|
|
|
|
&subordinate_ops, /* ops */
|
|
|
|
NULL, /* fp */
|
|
|
|
#ifdef WITH_SELINUX
|
|
|
|
NULL, /* scontext */
|
|
|
|
#endif
|
2015-02-27 21:56:57 +05:30
|
|
|
0644, /* st_mode */
|
|
|
|
0, /* st_uid */
|
|
|
|
0, /* st_gid */
|
2013-01-22 14:44:35 +05:30
|
|
|
NULL, /* head */
|
|
|
|
NULL, /* tail */
|
|
|
|
NULL, /* cursor */
|
|
|
|
false, /* changed */
|
|
|
|
false, /* isopen */
|
|
|
|
false, /* locked */
|
2019-05-02 18:03:06 +05:30
|
|
|
false, /* readonly */
|
|
|
|
false /* setname */
|
2013-01-22 14:44:35 +05:30
|
|
|
};
|
|
|
|
|
|
|
|
int sub_gid_setdbname (const char *filename)
|
|
|
|
{
|
|
|
|
return commonio_setname (&subordinate_gid_db, filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*@observer@*/const char *sub_gid_dbname (void)
|
|
|
|
{
|
|
|
|
return subordinate_gid_db.filename;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool sub_gid_file_present (void)
|
|
|
|
{
|
|
|
|
return commonio_present (&subordinate_gid_db);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_gid_lock (void)
|
|
|
|
{
|
|
|
|
return commonio_lock (&subordinate_gid_db);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_gid_open (int mode)
|
|
|
|
{
|
|
|
|
return commonio_open (&subordinate_gid_db, mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool have_sub_gids(const char *owner, gid_t start, unsigned long count)
|
|
|
|
{
|
|
|
|
return have_range(&subordinate_gid_db, owner, start, count);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool sub_gid_assigned(const char *owner)
|
|
|
|
{
|
|
|
|
return range_exists (&subordinate_gid_db, owner);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_gid_add (const char *owner, gid_t start, unsigned long count)
|
|
|
|
{
|
|
|
|
return add_range (&subordinate_gid_db, owner, start, count);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_gid_remove (const char *owner, gid_t start, unsigned long count)
|
|
|
|
{
|
|
|
|
return remove_range (&subordinate_gid_db, owner, start, count);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_gid_close (void)
|
|
|
|
{
|
|
|
|
return commonio_close (&subordinate_gid_db);
|
|
|
|
}
|
|
|
|
|
|
|
|
int sub_gid_unlock (void)
|
|
|
|
{
|
|
|
|
return commonio_unlock (&subordinate_gid_db);
|
|
|
|
}
|
|
|
|
|
|
|
|
gid_t sub_gid_find_free_range(gid_t min, gid_t max, unsigned long count)
|
|
|
|
{
|
|
|
|
unsigned long start;
|
|
|
|
start = find_free_range (&subordinate_gid_db, min, max, count);
|
|
|
|
return start == ULONG_MAX ? (gid_t) -1 : start;
|
|
|
|
}
|
Create a new libsubid
Closes #154
Currently this has three functions: one which returns the
list of subuid ranges for a user, one returning the subgids,
and one which frees the ranges lists.
I might be mistaken about what -disable-man means; some of
the code suggests it means just don't re-generate them, but
not totally ignore them. But that doesn't seem to really work,
so let's just ignore man/ when -disable-man.
Remove --disable-shared. I'm not sure why it was there, but it stems
from long, long ago, and I suspect it comes from some ancient
toolchain bug.
Create a tests/run_some, a shorter version of run_all. I'll
slowly add tests to this as I verify they work, then I can
work on fixing the once which don't.
Also, don't touch man/ if not -enable-man.
Changelog:
Apr 22: change the subid list api as recomended by Dan Walsh.
Apr 23: implement get_subid_owner
Apr 24: implement range add/release
Apr 25: finish tests and rebase
May 10: make @owner const
Signed-off-by: Serge Hallyn <serge@hallyn.com>
2020-04-19 04:33:54 +05:30
|
|
|
|
|
|
|
/*
|
|
|
|
struct subordinate_range **list_owner_ranges(const char *owner, enum subid_type id_type)
|
|
|
|
*
|
|
|
|
* @owner: username
|
|
|
|
* @id_type: UID or GUID
|
|
|
|
*
|
|
|
|
* Returns the subuid or subgid ranges which are owned by the specified
|
|
|
|
* user. Username may be a username or a string representation of a
|
|
|
|
* UID number. If id_type is UID, then subuids are returned, else
|
|
|
|
* subgids are returned. If there is an error, < 0 is returned.
|
|
|
|
*
|
|
|
|
* The caller must free the subordinate range list.
|
|
|
|
*/
|
|
|
|
struct subordinate_range **list_owner_ranges(const char *owner, enum subid_type id_type)
|
|
|
|
{
|
|
|
|
// TODO - need to handle owner being either uid or username
|
|
|
|
const struct subordinate_range *range;
|
|
|
|
struct subordinate_range **ranges = NULL;
|
|
|
|
struct commonio_db *db;
|
|
|
|
int size = 0;
|
|
|
|
|
|
|
|
if (id_type == ID_TYPE_UID)
|
|
|
|
db = &subordinate_uid_db;
|
|
|
|
else
|
|
|
|
db = &subordinate_gid_db;
|
|
|
|
|
|
|
|
commonio_rewind(db);
|
|
|
|
while ((range = commonio_next(db)) != NULL) {
|
|
|
|
if (0 == strcmp(range->owner, owner)) {
|
|
|
|
if (!append_range(&ranges, range, size++)) {
|
|
|
|
free_subordinate_ranges(ranges);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ranges;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool all_digits(const char *str)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; str[i] != '\0'; i++)
|
|
|
|
if (!isdigit(str[i]))
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int append_uids(uid_t **uids, const char *owner, int n)
|
|
|
|
{
|
|
|
|
uid_t owner_uid;
|
|
|
|
uid_t *ret;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (all_digits(owner)) {
|
|
|
|
i = sscanf(owner, "%d", &owner_uid);
|
|
|
|
if (i != 1) {
|
|
|
|
// should not happen
|
|
|
|
free(*uids);
|
|
|
|
*uids = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
struct passwd *pwd = getpwnam(owner);
|
|
|
|
if (NULL == pwd) {
|
|
|
|
/* Username not defined in /etc/passwd, or error occured during lookup */
|
|
|
|
free(*uids);
|
|
|
|
*uids = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
owner_uid = pwd->pw_uid;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
if (owner_uid == (*uids)[i])
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = realloc(*uids, (n + 1) * sizeof(uid_t));
|
|
|
|
if (!ret) {
|
|
|
|
free(*uids);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ret[n] = owner_uid;
|
|
|
|
*uids = ret;
|
|
|
|
return n+1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int find_subid_owners(unsigned long id, uid_t **uids, enum subid_type id_type)
|
|
|
|
{
|
|
|
|
const struct subordinate_range *range;
|
|
|
|
struct commonio_db *db;
|
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
*uids = NULL;
|
|
|
|
if (id_type == ID_TYPE_UID)
|
|
|
|
db = &subordinate_uid_db;
|
|
|
|
else
|
|
|
|
db = &subordinate_gid_db;
|
|
|
|
|
|
|
|
commonio_rewind(db);
|
|
|
|
while ((range = commonio_next(db)) != NULL) {
|
|
|
|
if (id >= range->start && id < range->start + range-> count) {
|
|
|
|
n = append_uids(uids, range->owner, n);
|
|
|
|
if (n < 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool new_subid_range(struct subordinate_range *range, enum subid_type id_type, bool reuse)
|
|
|
|
{
|
|
|
|
struct commonio_db *db;
|
|
|
|
const struct subordinate_range *r;
|
|
|
|
|
|
|
|
if (id_type == ID_TYPE_UID)
|
|
|
|
db = &subordinate_uid_db;
|
|
|
|
else
|
|
|
|
db = &subordinate_gid_db;
|
|
|
|
commonio_rewind(db);
|
|
|
|
if (reuse) {
|
|
|
|
while ((r = commonio_next(db)) != NULL) {
|
|
|
|
// TODO account for username vs uid_t
|
|
|
|
if (0 != strcmp(r->owner, range->owner))
|
|
|
|
continue;
|
|
|
|
if (r->count >= range->count) {
|
|
|
|
range->count = r->count;
|
|
|
|
range->start = r->start;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
range->start = find_free_range(db, range->start, ULONG_MAX, range->count);
|
|
|
|
if (range->start == ULONG_MAX)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return add_range(db, range->owner, range->start, range->count) == 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool release_subid_range(struct subordinate_range *range, enum subid_type id_type)
|
|
|
|
{
|
|
|
|
struct commonio_db *db;
|
|
|
|
if (id_type == ID_TYPE_UID)
|
|
|
|
db = &subordinate_uid_db;
|
|
|
|
else
|
|
|
|
db = &subordinate_gid_db;
|
|
|
|
return remove_range(db, range->owner, range->start, range->count) == 1;
|
|
|
|
}
|
|
|
|
|
Allow disabling of subordinate IDs.
* configure.in: Add configure options --enable-subordinate-ids /
--disable-subordinate-ids. Enabled by default.
* lib/prototypes.h: Include <config.h> before using its macros.
* lib/commonio.h, lib/commonio.c: Define commonio_append only when
ENABLE_SUBIDS is defined.
* lib/prototypes.h, libmisc/find_new_sub_gids.c,
libmisc/find_new_sub_uids.c: Likewise.
* lib/subordinateio.h, lib/subordinateio.c: Likewise.
* libmisc/user_busy.c: Only check if subordinate IDs are in use if
ENABLE_SUBIDS is defined.
* src/Makefile.am: Create newgidmap and newuidmap only if
ENABLE_SUBIDS is defined.
* src/newusers.c: Check for ENABLE_SUBIDS to enable support for
subordinate IDs.
* src/useradd.c: Likewise.
* src/userdel.c: Likewise.
* src/usermod.c: Likewise.
* man/Makefile.am: Install man1/newgidmap.1, man1/newuidmap.1,
man5/subgid.5, and man5/subuid.5 only if ENABLE_SUBIDS is defined.
* man/fr/Makefile.am: Install man1/newgidmap.1, man1/newuidmap.1,
man5/subgid.5, and man5/subuid.5 (not translated yet).
* man/generate_mans.mak: Add xsltproc conditionals
subids/no_subids.
* man/login.defs.d/SUB_GID_COUNT.xml: Add dependency on subids
condition.
* man/login.defs.d/SUB_UID_COUNT.xml: Likewise.
* man/usermod.8.xml: Document options for subordinate IDs and
reference subgid(5) / subuid(5) depending on the subids condition.
2013-08-11 18:24:22 +05:30
|
|
|
#else /* !ENABLE_SUBIDS */
|
|
|
|
extern int errno; /* warning: ANSI C forbids an empty source file */
|
|
|
|
#endif /* !ENABLE_SUBIDS */
|
|
|
|
|