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

* lib/commonio.c (next_entry_by_name): New function.

Browse Source 
* NEWS, lib/commonio.c (commonio_update): When an entry is updated, make
   sure that there are no other entry with the same name. This fixes
   an infinite loop in userdel and usermod when an (erroneous) group 
   file contains two entries with the same name.
   (https://bugzilla.redhat.com/show_bug.cgi?id=240915)
This commit is contained in:
nekral-guest
2007-11-16 22:59:14 +00:00
parent c2ebdc4b5d
commit 07c2610170
3 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/commonio.c
View File

@ -35,6 +35,9 @@ static int name_is_nis (const char *);
static int write_all (const struct commonio_db *);
static struct commonio_entry *find_entry_by_name (struct commonio_db *,
const char *);
static struct commonio_entry *next_entry_by_name (struct commonio_db *,
struct commonio_entry *pos,
const char *);
static int lock_count = 0;
static int nscd_need_reload = 0;
@ -761,14 +764,17 @@ int commonio_close (struct commonio_db *db)
return errors == 0;
}
static struct commonio_entry *find_entry_by_name (struct commonio_db *db,
const char *name)
static struct commonio_entry *next_entry_by_name (struct commonio_db *db,
struct commonio_entry *pos,
const char *name)
{
struct commonio_entry *p;
void *ep;
for (p = db->head; p; p = p->next) {
if (NULL == pos)
return NULL;
for (p = pos; p; p = p->next) {
ep = p->eptr;
if (ep && strcmp (db->ops->getname (ep), name) == 0)
break;
@ -776,6 +782,12 @@ static struct commonio_entry *find_entry_by_name (struct commonio_db *db,
return p;
}
static struct commonio_entry *find_entry_by_name (struct commonio_db *db,
const char *name)
{
return next_entry_by_name(db, db->head, name);
}
int commonio_update (struct commonio_db *db, const void *eptr)
{
@ -792,6 +804,11 @@ int commonio_update (struct commonio_db *db, const void *eptr)
}
p = find_entry_by_name (db, db->ops->getname (eptr));
if (p) {
if (next_entry_by_name (db, p->next, db->ops->getname (eptr)))
{
fprintf (stderr, _("Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"), db->ops->getname (eptr), db->filename);
return 0;
}
db->ops->free (p->eptr);
p->eptr = nentry;
p->changed = 1;