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

Remove dead code.

Browse Source 
* libmisc/find_new_sub_gids.c: Remove dead code.
	find_new_sub_gids() is always called with *range_count set to 0.
	It's more difficult to keep the subordinate GIDs and UIDs
	synchronized, than for the user's UID/GId because the count of
	subordinate IDs may differ.
	* libmisc/find_new_sub_uids.c: Likewise.
	* lib/subordinateio.h, lib/subordinateio.c: Remove APIs that are
	no more needed: is_sub_uid_range_free(), is_sub_gid_range_free(),
	is_range_free().
This commit is contained in:
Nicolas François 2013-08-15 16:46:51 +02:00
parent 1a8d386288
commit 7d5732cb49
5 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2013-08-15 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/find_new_sub_gids.c: Remove dead code.
find_new_sub_gids() is always called with *range_count set to 0.
It's more difficult to keep the subordinate GIDs and UIDs
synchronized, than for the user's UID/GId because the count of
subordinate IDs may differ.
* libmisc/find_new_sub_uids.c: Likewise.
* lib/subordinateio.h, lib/subordinateio.c: Remove APIs that are
no more needed: is_sub_uid_range_free(), is_sub_gid_range_free(),
is_range_free().
2013-08-13 Nicolas François <nicolas.francois@centraliens.net> 2013-08-13 Nicolas François <nicolas.francois@centraliens.net>
* configure.in: Check if sizeof uid_t and gid_t is larger than 32 * configure.in: Check if sizeof uid_t and gid_t is larger than 32

27
lib/subordinateio.c
View File

@ -125,23 +125,6 @@ static /*@observer@*/ /*@null*/const struct subordinate_range *subordinate_next(
commonio_next (db); commonio_next (db);
} }
static bool is_range_free(struct commonio_db *db, unsigned long start,
unsigned long count)
{
const struct subordinate_range *range;
unsigned long end = start + count - 1;
commonio_rewind(db);
while ((range = commonio_next(db)) != NULL) {
unsigned long first = range->start;
unsigned long last = first + range->count - 1;
if ((end >= first) && (start <= last))
return false;
}
return true;
}
static const bool range_exists(struct commonio_db *db, const char *owner) static const bool range_exists(struct commonio_db *db, const char *owner)
{ {
const struct subordinate_range *range; const struct subordinate_range *range;
@ -406,11 +389,6 @@ int sub_uid_open (int mode)
return commonio_open (&subordinate_uid_db, mode); return commonio_open (&subordinate_uid_db, mode);
} }
bool is_sub_uid_range_free(uid_t start, unsigned long count)
{
return is_range_free (&subordinate_uid_db, start, count);
}
bool sub_uid_assigned(const char *owner) bool sub_uid_assigned(const char *owner)
{ {
return range_exists (&subordinate_uid_db, owner); return range_exists (&subordinate_uid_db, owner);
@ -489,11 +467,6 @@ int sub_gid_open (int mode)
return commonio_open (&subordinate_gid_db, mode); return commonio_open (&subordinate_gid_db, mode);
} }
bool is_sub_gid_range_free(gid_t start, unsigned long count)
{
return is_range_free (&subordinate_gid_db, start, count);
}
bool have_sub_gids(const char *owner, gid_t start, unsigned long count) bool have_sub_gids(const char *owner, gid_t start, unsigned long count)
{ {
return have_range(&subordinate_gid_db, owner, start, count); return have_range(&subordinate_gid_db, owner, start, count);

2
lib/subordinateio.h
View File

@ -12,7 +12,6 @@
#include <sys/types.h> #include <sys/types.h>
extern int sub_uid_close(void); extern int sub_uid_close(void);
extern bool is_sub_uid_range_free(uid_t start, unsigned long count);
extern bool have_sub_uids(const char *owner, uid_t start, unsigned long count); extern bool have_sub_uids(const char *owner, uid_t start, unsigned long count);
extern bool sub_uid_file_present (void); extern bool sub_uid_file_present (void);
extern bool sub_uid_assigned(const char *owner); extern bool sub_uid_assigned(const char *owner);
@ -26,7 +25,6 @@ extern int sub_uid_remove (const char *owner, uid_t start, unsigned long count);
extern uid_t sub_uid_find_free_range(uid_t min, uid_t max, unsigned long count); extern uid_t sub_uid_find_free_range(uid_t min, uid_t max, unsigned long count);
extern int sub_gid_close(void); extern int sub_gid_close(void);
extern bool is_sub_gid_range_free(gid_t start, unsigned long count);
extern bool have_sub_gids(const char *owner, gid_t start, unsigned long count); extern bool have_sub_gids(const char *owner, gid_t start, unsigned long count);
extern bool sub_gid_file_present (void); extern bool sub_gid_file_present (void);
extern bool sub_gid_assigned(const char *owner); extern bool sub_gid_assigned(const char *owner);

8
libmisc/find_new_sub_gids.c
View File

@ -68,14 +68,6 @@ int find_new_sub_gids (const char *owner,
return -1; return -1;
} }
/* Is there a preferred range that works? */
if ((*range_count != 0) &&
(*range_start >= min) &&
(((*range_start) + (*range_count) - 1) <= max) &&
is_sub_gid_range_free(*range_start, *range_count)) {
return 0;
}
start = sub_gid_find_free_range(min, max, count); start = sub_gid_find_free_range(min, max, count);
if (start == (gid_t)-1) { if (start == (gid_t)-1) {
fprintf (stderr, fprintf (stderr,

8
libmisc/find_new_sub_uids.c
View File

@ -68,14 +68,6 @@ int find_new_sub_uids (const char *owner,
return -1; return -1;
} }
/* Is there a preferred range that works? */
if ((*range_count != 0) &&
(*range_start >= min) &&
(((*range_start) + (*range_count) - 1) <= max) &&
is_sub_uid_range_free(*range_start, *range_count)) {
return 0;
}
start = sub_uid_find_free_range(min, max, count); start = sub_uid_find_free_range(min, max, count);
if (start == (uid_t)-1) { if (start == (uid_t)-1) {
fprintf (stderr, fprintf (stderr,