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.
166 lines
2.7 KiB
C
166 lines
2.7 KiB
C
|
|
#include <config.h>
|
|
|
|
#ident "$Id$"
|
|
|
|
#include "prototypes.h"
|
|
#include "defines.h"
|
|
#include <pwd.h>
|
|
#include <stdio.h>
|
|
#include "commonio.h"
|
|
#include "pwio.h"
|
|
extern struct passwd *sgetpwent (const char *);
|
|
extern int putpwent (const struct passwd *, FILE *);
|
|
|
|
static void *passwd_dup (const void *ent)
|
|
{
|
|
const struct passwd *pw = ent;
|
|
|
|
return __pw_dup (pw);
|
|
}
|
|
|
|
static void passwd_free (void *ent)
|
|
{
|
|
struct passwd *pw = ent;
|
|
|
|
free (pw->pw_name);
|
|
free (pw->pw_passwd);
|
|
free (pw->pw_gecos);
|
|
free (pw->pw_dir);
|
|
free (pw->pw_shell);
|
|
free (pw);
|
|
}
|
|
|
|
static const char *passwd_getname (const void *ent)
|
|
{
|
|
const struct passwd *pw = ent;
|
|
|
|
return pw->pw_name;
|
|
}
|
|
|
|
static void *passwd_parse (const char *line)
|
|
{
|
|
return (void *) sgetpwent (line);
|
|
}
|
|
|
|
static int passwd_put (const void *ent, FILE * file)
|
|
{
|
|
const struct passwd *pw = ent;
|
|
|
|
return (putpwent (pw, file) == -1) ? -1 : 0;
|
|
}
|
|
|
|
static struct commonio_ops passwd_ops = {
|
|
passwd_dup,
|
|
passwd_free,
|
|
passwd_getname,
|
|
passwd_parse,
|
|
passwd_put,
|
|
fgets,
|
|
fputs
|
|
};
|
|
|
|
static struct commonio_db passwd_db = {
|
|
PASSWD_FILE, /* filename */
|
|
&passwd_ops, /* ops */
|
|
NULL, /* fp */
|
|
NULL, /* head */
|
|
NULL, /* tail */
|
|
NULL, /* cursor */
|
|
0, /* changed */
|
|
0, /* isopen */
|
|
0, /* locked */
|
|
0 /* readonly */
|
|
};
|
|
|
|
int pw_name (const char *filename)
|
|
{
|
|
return commonio_setname (&passwd_db, filename);
|
|
}
|
|
|
|
int pw_lock (void)
|
|
{
|
|
return commonio_lock (&passwd_db);
|
|
}
|
|
|
|
int pw_open (int mode)
|
|
{
|
|
return commonio_open (&passwd_db, mode);
|
|
}
|
|
|
|
const struct passwd *pw_locate (const char *name)
|
|
{
|
|
return commonio_locate (&passwd_db, name);
|
|
}
|
|
|
|
int pw_update (const struct passwd *pw)
|
|
{
|
|
return commonio_update (&passwd_db, (const void *) pw);
|
|
}
|
|
|
|
int pw_remove (const char *name)
|
|
{
|
|
return commonio_remove (&passwd_db, name);
|
|
}
|
|
|
|
int pw_rewind (void)
|
|
{
|
|
return commonio_rewind (&passwd_db);
|
|
}
|
|
|
|
const struct passwd *pw_next (void)
|
|
{
|
|
return commonio_next (&passwd_db);
|
|
}
|
|
|
|
int pw_close (void)
|
|
{
|
|
return commonio_close (&passwd_db);
|
|
}
|
|
|
|
int pw_unlock (void)
|
|
{
|
|
return commonio_unlock (&passwd_db);
|
|
}
|
|
|
|
struct commonio_entry *__pw_get_head (void)
|
|
{
|
|
return passwd_db.head;
|
|
}
|
|
|
|
void __pw_del_entry (const struct commonio_entry *ent)
|
|
{
|
|
commonio_del_entry (&passwd_db, ent);
|
|
}
|
|
|
|
struct commonio_db *__pw_get_db (void)
|
|
{
|
|
return &passwd_db;
|
|
}
|
|
|
|
static int pw_cmp (const void *p1, const void *p2)
|
|
{
|
|
uid_t u1, u2;
|
|
|
|
if ((*(struct commonio_entry **) p1)->eptr == NULL)
|
|
return 1;
|
|
if ((*(struct commonio_entry **) p2)->eptr == NULL)
|
|
return -1;
|
|
|
|
u1 = ((struct passwd *) (*(struct commonio_entry **) p1)->eptr)->pw_uid;
|
|
u2 = ((struct passwd *) (*(struct commonio_entry **) p2)->eptr)->pw_uid;
|
|
|
|
if (u1 < u2)
|
|
return -1;
|
|
else if (u1 > u2)
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* Sort entries by UID */
|
|
int pw_sort ()
|
|
{
|
|
return commonio_sort (&passwd_db, pw_cmp);
|
|
}
|