9adfc136b6
libmisc/xgetXXbyYY.c, libmisc/xgetpwnam.c, libmisc/xgetpwuid.c, libmisc/xgetgrnam.c, libmisc/xgetgrgid.c, libmisc/xgetspnam.c: Added functions xgetpwnam(), xgetpwuid(), xgetgrnam(), xgetgrgid(), and xgetspnam(). They allocate memory for the returned structure and are more robust to successive calls. They are implemented with the libc's getxxyyy_r() functions if available. * libmisc/limits.c, libmisc/entry.c, libmisc/chowntty.c, libmisc/addgrps.c, libmisc/myname.c, libmisc/rlogin.c, libmisc/pwdcheck.c, src/newgrp.c, src/login_nopam.c, src/userdel.c, src/lastlog.c, src/grpck.c, src/gpasswd.c, src/newusers.c, src/chpasswd.c, src/chfn.c, src/groupmems.c, src/usermod.c, src/expiry.c, src/groupdel.c, src/chgpasswd.c, src/su.c, src/useradd.c, src/groupmod.c, src/passwd.c, src/pwck.c, src/groupadd.c, src/chage.c, src/login.c, src/suauth.c, src/faillog.c, src/groups.c, src/chsh.c, src/id.c: Review all the usage of one of the getpwnam(), getpwuid(), getgrnam(), getgrgid(), and getspnam() functions. It was noticed on http://bugs.debian.org/341230 that chfn and chsh use a passwd structure after calling a pam function, which result in using information from the passwd structure requested by pam, not the original one. It is much easier to use the new xget... functions to avoid these issues. I've checked which call to the original get... functions could be left (reducing the scope of the structure if possible), and I've left comments to ease future reviews (e.g. /* local, no need for xgetpwnam */). Note: the getpwent/getgrent calls should probably be checked also. * src/groupdel.c, src/expiry.c: Fix typos in comments. * src/groupmod.c: Re-indent. * libmisc/Makefile.am, lib/groupmem.c, lib/groupio.c, lib/pwmem.c, lib/pwio.c, lib/shadowmem.c, lib/shadowio.c: Move the __<xx>_dup functions (used by the xget... functions) from the <xx>io.c files to the new <xx>mem.c files. This avoid linking some utils against the SELinux library.
170 lines
2.7 KiB
C
170 lines
2.7 KiB
C
|
|
#include <config.h>
|
|
|
|
#ident "$Id$"
|
|
|
|
#include "prototypes.h"
|
|
#include "defines.h"
|
|
#include "commonio.h"
|
|
#include "groupio.h"
|
|
extern int putgrent (const struct group *, FILE *);
|
|
extern struct group *sgetgrent (const char *);
|
|
|
|
static void *group_dup (const void *ent)
|
|
{
|
|
const struct group *gr = ent;
|
|
|
|
return __gr_dup (gr);
|
|
}
|
|
|
|
static void group_free (void *ent)
|
|
{
|
|
struct group *gr = ent;
|
|
|
|
free (gr->gr_name);
|
|
free (gr->gr_passwd);
|
|
while (*(gr->gr_mem)) {
|
|
free (*(gr->gr_mem));
|
|
gr->gr_mem++;
|
|
}
|
|
free (gr);
|
|
}
|
|
|
|
static const char *group_getname (const void *ent)
|
|
{
|
|
const struct group *gr = ent;
|
|
|
|
return gr->gr_name;
|
|
}
|
|
|
|
static void *group_parse (const char *line)
|
|
{
|
|
return (void *) sgetgrent (line);
|
|
}
|
|
|
|
static int group_put (const void *ent, FILE * file)
|
|
{
|
|
const struct group *gr = ent;
|
|
|
|
return (putgrent (gr, file) == -1) ? -1 : 0;
|
|
}
|
|
|
|
static struct commonio_ops group_ops = {
|
|
group_dup,
|
|
group_free,
|
|
group_getname,
|
|
group_parse,
|
|
group_put,
|
|
fgetsx,
|
|
fputsx
|
|
};
|
|
|
|
static struct commonio_db group_db = {
|
|
GROUP_FILE, /* filename */
|
|
&group_ops, /* ops */
|
|
NULL, /* fp */
|
|
NULL, /* head */
|
|
NULL, /* tail */
|
|
NULL, /* cursor */
|
|
0, /* changed */
|
|
0, /* isopen */
|
|
0, /* locked */
|
|
0 /* readonly */
|
|
};
|
|
|
|
int gr_name (const char *filename)
|
|
{
|
|
return commonio_setname (&group_db, filename);
|
|
}
|
|
|
|
int gr_lock (void)
|
|
{
|
|
return commonio_lock (&group_db);
|
|
}
|
|
|
|
int gr_open (int mode)
|
|
{
|
|
return commonio_open (&group_db, mode);
|
|
}
|
|
|
|
const struct group *gr_locate (const char *name)
|
|
{
|
|
return commonio_locate (&group_db, name);
|
|
}
|
|
|
|
int gr_update (const struct group *gr)
|
|
{
|
|
return commonio_update (&group_db, (const void *) gr);
|
|
}
|
|
|
|
int gr_remove (const char *name)
|
|
{
|
|
return commonio_remove (&group_db, name);
|
|
}
|
|
|
|
int gr_rewind (void)
|
|
{
|
|
return commonio_rewind (&group_db);
|
|
}
|
|
|
|
const struct group *gr_next (void)
|
|
{
|
|
return commonio_next (&group_db);
|
|
}
|
|
|
|
int gr_close (void)
|
|
{
|
|
return commonio_close (&group_db);
|
|
}
|
|
|
|
int gr_unlock (void)
|
|
{
|
|
return commonio_unlock (&group_db);
|
|
}
|
|
|
|
void __gr_set_changed (void)
|
|
{
|
|
group_db.changed = 1;
|
|
}
|
|
|
|
struct commonio_entry *__gr_get_head (void)
|
|
{
|
|
return group_db.head;
|
|
}
|
|
|
|
struct commonio_db *__gr_get_db (void)
|
|
{
|
|
return &group_db;
|
|
}
|
|
|
|
void __gr_del_entry (const struct commonio_entry *ent)
|
|
{
|
|
commonio_del_entry (&group_db, ent);
|
|
}
|
|
|
|
static int gr_cmp (const void *p1, const void *p2)
|
|
{
|
|
gid_t u1, u2;
|
|
|
|
if ((*(struct commonio_entry **) p1)->eptr == NULL)
|
|
return 1;
|
|
if ((*(struct commonio_entry **) p2)->eptr == NULL)
|
|
return -1;
|
|
|
|
u1 = ((struct group *) (*(struct commonio_entry **) p1)->eptr)->gr_gid;
|
|
u2 = ((struct group *) (*(struct commonio_entry **) p2)->eptr)->gr_gid;
|
|
|
|
if (u1 < u2)
|
|
return -1;
|
|
else if (u1 > u2)
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* Sort entries by GID */
|
|
int gr_sort ()
|
|
{
|
|
return commonio_sort (&group_db, gr_cmp);
|
|
}
|