[svn-upgrade] Integrating new upstream version, shadow (4.0.14)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#ident "$Id: commonio.c,v 1.30 2005/09/24 12:22:50 kloczek Exp $"
|
||||
#ident "$Id: commonio.c,v 1.31 2005/10/19 11:34:21 kloczek Exp $"
|
||||
|
||||
#include "defines.h"
|
||||
#include <sys/stat.h>
|
||||
@@ -563,6 +563,9 @@ int commonio_sort_wrt (struct commonio_db *shadow, struct commonio_db *passwd)
|
||||
struct commonio_entry *head = NULL, *pw_ptr, *spw_ptr;
|
||||
const char *name;
|
||||
|
||||
if(!shadow || !shadow->head)
|
||||
return 0;
|
||||
|
||||
for (pw_ptr = passwd->head; pw_ptr; pw_ptr = pw_ptr->next) {
|
||||
if (pw_ptr->eptr == NULL)
|
||||
continue;
|
||||
|
@@ -29,7 +29,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#ident "$Id: getdef.c,v 1.36 2005/08/31 17:24:56 kloczek Exp $"
|
||||
#ident "$Id: getdef.c,v 1.37 2005/12/02 22:16:11 kloczek Exp $"
|
||||
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
@@ -67,6 +67,8 @@ static struct itemdef def_table[] = {
|
||||
{"LOG_OK_LOGINS", NULL},
|
||||
{"LOG_UNKFAIL_ENAB", NULL},
|
||||
{"MAIL_DIR", NULL},
|
||||
{"MAIL_FILE", NULL},
|
||||
{"MD5_CRYPT_ENAB", NULL},
|
||||
{"PASS_MAX_DAYS", NULL},
|
||||
{"PASS_MIN_DAYS", NULL},
|
||||
{"PASS_WARN_AGE", NULL},
|
||||
@@ -93,8 +95,6 @@ static struct itemdef def_table[] = {
|
||||
{"LASTLOG_ENAB", NULL},
|
||||
{"LOGIN_STRING", NULL},
|
||||
{"MAIL_CHECK_ENAB", NULL},
|
||||
{"MAIL_FILE", NULL},
|
||||
{"MD5_CRYPT_ENAB", NULL},
|
||||
{"MOTD_FILE", NULL},
|
||||
{"NOLOGINS_FILE", NULL},
|
||||
{"OBSCURE_CHECKS_ENAB", NULL},
|
||||
|
@@ -1,6 +1,11 @@
|
||||
#include <security/pam_appl.h>
|
||||
#include <security/pam_misc.h>
|
||||
|
||||
static struct pam_conv conv = {
|
||||
misc_conv,
|
||||
NULL
|
||||
};
|
||||
|
||||
/* compatibility with different versions of Linux-PAM */
|
||||
#ifndef PAM_ESTABLISH_CRED
|
||||
#define PAM_ESTABLISH_CRED PAM_CRED_ESTABLISH
|
||||
|
@@ -6,7 +6,7 @@
|
||||
* Juha Virtanen, <jiivee@hut.fi>; November 1995
|
||||
*/
|
||||
/*
|
||||
* $Id: prototypes.h,v 1.24 2005/09/05 16:22:03 kloczek Exp $
|
||||
* $Id: prototypes.h,v 1.26 2006/01/02 23:32:51 kloczek Exp $
|
||||
*
|
||||
* Added a macro to work around ancient (non-ANSI) compilers, just in case
|
||||
* someone ever tries to compile this with SunOS cc... --marekm
|
||||
@@ -39,9 +39,6 @@ extern int isexpired (const struct passwd *, const struct spwd *);
|
||||
/* basename.c */
|
||||
extern char *Basename (char *str);
|
||||
|
||||
/* chkshell.c */
|
||||
extern int check_shell (const char *);
|
||||
|
||||
/* chowndir.c */
|
||||
extern int chown_tree (const char *, uid_t, uid_t, gid_t, gid_t);
|
||||
|
||||
@@ -76,11 +73,6 @@ extern int valid_field (const char *, const char *);
|
||||
extern char *fgetsx (char *, int, FILE *);
|
||||
extern int fputsx (const char *, FILE *);
|
||||
|
||||
/* grdbm.c */
|
||||
extern int gr_dbm_remove (const struct group *);
|
||||
extern int gr_dbm_update (const struct group *);
|
||||
extern int gr_dbm_present (void);
|
||||
|
||||
/* grent.c */
|
||||
extern int putgrent (const struct group *, FILE *);
|
||||
|
||||
|
Reference in New Issue
Block a user