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.
145 lines
2.3 KiB
C
145 lines
2.3 KiB
C
|
|
#include <config.h>
|
|
|
|
#ident "$Id$"
|
|
|
|
#include "prototypes.h"
|
|
#include "defines.h"
|
|
#ifdef HAVE_SHADOW_H
|
|
# include <shadow.h>
|
|
#endif
|
|
#include <stdio.h>
|
|
#include "commonio.h"
|
|
#include "shadowio.h"
|
|
|
|
static void *shadow_dup (const void *ent)
|
|
{
|
|
const struct spwd *sp = ent;
|
|
|
|
return __spw_dup (sp);
|
|
}
|
|
|
|
static void shadow_free (void *ent)
|
|
{
|
|
struct spwd *sp = ent;
|
|
|
|
free (sp->sp_namp);
|
|
free (sp->sp_pwdp);
|
|
free (sp);
|
|
}
|
|
|
|
static const char *shadow_getname (const void *ent)
|
|
{
|
|
const struct spwd *sp = ent;
|
|
|
|
return sp->sp_namp;
|
|
}
|
|
|
|
static void *shadow_parse (const char *line)
|
|
{
|
|
return (void *) sgetspent (line);
|
|
}
|
|
|
|
static int shadow_put (const void *ent, FILE * file)
|
|
{
|
|
const struct spwd *sp = ent;
|
|
|
|
return (putspent (sp, file) == -1) ? -1 : 0;
|
|
}
|
|
|
|
static struct commonio_ops shadow_ops = {
|
|
shadow_dup,
|
|
shadow_free,
|
|
shadow_getname,
|
|
shadow_parse,
|
|
shadow_put,
|
|
fgets,
|
|
fputs
|
|
};
|
|
|
|
static struct commonio_db shadow_db = {
|
|
SHADOW_FILE, /* filename */
|
|
&shadow_ops, /* ops */
|
|
NULL, /* fp */
|
|
NULL, /* head */
|
|
NULL, /* tail */
|
|
NULL, /* cursor */
|
|
0, /* changed */
|
|
0, /* isopen */
|
|
0, /* locked */
|
|
0 /* readonly */
|
|
};
|
|
|
|
int spw_name (const char *filename)
|
|
{
|
|
return commonio_setname (&shadow_db, filename);
|
|
}
|
|
|
|
int spw_file_present (void)
|
|
{
|
|
return commonio_present (&shadow_db);
|
|
}
|
|
|
|
int spw_lock (void)
|
|
{
|
|
return commonio_lock (&shadow_db);
|
|
}
|
|
|
|
int spw_open (int mode)
|
|
{
|
|
return commonio_open (&shadow_db, mode);
|
|
}
|
|
|
|
const struct spwd *spw_locate (const char *name)
|
|
{
|
|
return commonio_locate (&shadow_db, name);
|
|
}
|
|
|
|
int spw_update (const struct spwd *sp)
|
|
{
|
|
return commonio_update (&shadow_db, (const void *) sp);
|
|
}
|
|
|
|
int spw_remove (const char *name)
|
|
{
|
|
return commonio_remove (&shadow_db, name);
|
|
}
|
|
|
|
int spw_rewind (void)
|
|
{
|
|
return commonio_rewind (&shadow_db);
|
|
}
|
|
|
|
const struct spwd *spw_next (void)
|
|
{
|
|
return commonio_next (&shadow_db);
|
|
}
|
|
|
|
int spw_close (void)
|
|
{
|
|
return commonio_close (&shadow_db);
|
|
}
|
|
|
|
int spw_unlock (void)
|
|
{
|
|
return commonio_unlock (&shadow_db);
|
|
}
|
|
|
|
struct commonio_entry *__spw_get_head (void)
|
|
{
|
|
return shadow_db.head;
|
|
}
|
|
|
|
void __spw_del_entry (const struct commonio_entry *ent)
|
|
{
|
|
commonio_del_entry (&shadow_db, ent);
|
|
}
|
|
|
|
/* Sort with respect to passwd ordering. */
|
|
int spw_sort ()
|
|
{
|
|
extern struct commonio_db *__pw_get_db ();
|
|
|
|
return commonio_sort_wrt (&shadow_db, __pw_get_db ());
|
|
}
|