[svn-upgrade] Integrating new upstream version, shadow (4.0.13)
This commit is contained in:
@@ -33,7 +33,6 @@ libshadow_la_SOURCES = \
|
||||
pwauth.h \
|
||||
pwio.c \
|
||||
pwio.h \
|
||||
rcsid.h \
|
||||
sgetgrent.c \
|
||||
sgetpwent.c \
|
||||
sgroupio.c \
|
||||
|
@@ -39,7 +39,8 @@ host_triplet = @host@
|
||||
subdir = lib
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
||||
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
|
||||
$(top_srcdir)/configure.in
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
@@ -105,6 +106,8 @@ ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
|
||||
ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
|
||||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
@@ -116,6 +119,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
INTLLIBS = @INTLLIBS@
|
||||
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBAUDIT = @LIBAUDIT@
|
||||
LIBCRACK = @LIBCRACK@
|
||||
LIBCRYPT = @LIBCRYPT@
|
||||
LIBICONV = @LIBICONV@
|
||||
@@ -155,6 +159,9 @@ U = @U@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
XMLCATALOG = @XMLCATALOG@
|
||||
XML_CATALOG_FILE = @XML_CATALOG_FILE@
|
||||
XSLTPROC = @XSLTPROC@
|
||||
YACC = @YACC@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
@@ -228,7 +235,6 @@ libshadow_la_SOURCES = \
|
||||
pwauth.h \
|
||||
pwio.c \
|
||||
pwio.h \
|
||||
rcsid.h \
|
||||
sgetgrent.c \
|
||||
sgetpwent.c \
|
||||
sgroupio.c \
|
||||
|
@@ -1,8 +1,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: commonio.c,v 1.28 2005/03/31 05:14:49 kloczek Exp $")
|
||||
#ident "$Id: commonio.c,v 1.30 2005/09/24 12:22:50 kloczek Exp $"
|
||||
|
||||
#include "defines.h"
|
||||
#include <sys/stat.h>
|
||||
#include <utime.h>
|
||||
@@ -432,7 +432,7 @@ int commonio_open (struct commonio_db *db, int mode)
|
||||
}
|
||||
#ifdef WITH_SELINUX
|
||||
db->scontext = NULL;
|
||||
if (is_selinux_enabled () && (!db->readonly)) {
|
||||
if ((is_selinux_enabled () > 0) && (!db->readonly)) {
|
||||
if (fgetfilecon (fileno (db->fp), &db->scontext) < 0) {
|
||||
goto cleanup_errno;
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* $Id: defines.h,v 1.27 2005/08/03 18:11:27 kloczek Exp $ */
|
||||
/* $Id: defines.h,v 1.29 2005/09/05 16:22:03 kloczek Exp $ */
|
||||
/* some useful defines */
|
||||
|
||||
#ifndef _DEFINES_H_
|
||||
@@ -331,4 +331,15 @@ extern char *strerror ();
|
||||
#define SHADOW_PASSWD_STRING "x"
|
||||
#endif
|
||||
|
||||
#ifdef WITH_AUDIT
|
||||
#ifdef __u8 /* in case we use pam < 0.80 */
|
||||
#undef __u8
|
||||
#endif
|
||||
#ifdef __u32
|
||||
#undef __u32
|
||||
#endif
|
||||
|
||||
#include <libaudit.h>
|
||||
#endif
|
||||
|
||||
#endif /* _DEFINES_H_ */
|
||||
|
@@ -29,8 +29,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: encrypt.c,v 1.13 2005/05/25 19:31:50 kloczek Exp $")
|
||||
#ident "$Id: encrypt.c,v 1.14 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include <unistd.h>
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
|
@@ -1,9 +1,13 @@
|
||||
/* $Id: exitcodes.h,v 1.3 2005/07/27 10:10:31 kloczek Exp $ */
|
||||
/* $Id: exitcodes.h,v 1.7 2005/08/31 17:36:11 kloczek Exp $ */
|
||||
|
||||
/*
|
||||
* Exit codes used by shadow programs
|
||||
*/
|
||||
#define E_SUCCESS 0 /* success */
|
||||
#define E_NOPERM 1 /* permission denied */
|
||||
#define E_USAGE 2 /* invalid command syntax */
|
||||
#define E_BAD_ARG 3 /* invalid argument to option */
|
||||
#define E_SUCCESS 0 /* success */
|
||||
#define E_NOPERM 1 /* permission denied */
|
||||
#define E_USAGE 2 /* invalid command syntax */
|
||||
#define E_BAD_ARG 3 /* invalid argument to option */
|
||||
#define E_PASSWD_NOTFOUND 14 /* not found password file */
|
||||
#define E_SHADOW_NOTFOUND 15 /* not found shadow password file */
|
||||
#define E_GROUP_NOTFOUND 16 /* not found group file */
|
||||
#define E_GSHADOW_NOTFOUND 17 /* not found shadow group file */
|
||||
|
@@ -32,8 +32,8 @@
|
||||
#include <stdio.h>
|
||||
#include "defines.h"
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: fputsx.c,v 1.6 2005/03/31 05:14:49 kloczek Exp $")
|
||||
#ident "$Id: fputsx.c,v 1.7 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
|
||||
char *fgetsx (char *buf, int cnt, FILE * f)
|
||||
{
|
||||
|
@@ -29,8 +29,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: getdef.c,v 1.35 2005/08/11 11:26:11 kloczek Exp $")
|
||||
#ident "$Id: getdef.c,v 1.36 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
#include <stdio.h>
|
||||
|
@@ -30,8 +30,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: getpass.c,v 1.13 2005/03/31 05:14:49 kloczek Exp $")
|
||||
#ident "$Id: getpass.c,v 1.14 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include "defines.h"
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
|
@@ -1,8 +1,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: groupio.c,v 1.12 2005/06/20 09:56:37 kloczek Exp $")
|
||||
#ident "$Id: groupio.c,v 1.13 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
#include "commonio.h"
|
||||
|
@@ -32,8 +32,8 @@
|
||||
/* Newer versions of Linux libc already have shadow support. */
|
||||
#if defined(SHADOWGRP) && !defined(HAVE_SHADOWGRP) /*{ */
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: gshadow.c,v 1.10 2005/05/25 19:31:50 kloczek Exp $")
|
||||
#ident "$Id: gshadow.c,v 1.11 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include <stdio.h>
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
|
@@ -31,8 +31,8 @@
|
||||
|
||||
#ifndef HAVE_LCKPWDF
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: lockpw.c,v 1.6 2005/05/25 18:20:22 kloczek Exp $")
|
||||
#ident "$Id: lockpw.c,v 1.7 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
#include "pwio.h"
|
||||
|
@@ -29,8 +29,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: port.c,v 1.4 2005/03/31 05:14:49 kloczek Exp $")
|
||||
#ident "$Id: port.c,v 1.5 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
@@ -6,7 +6,7 @@
|
||||
* Juha Virtanen, <jiivee@hut.fi>; November 1995
|
||||
*/
|
||||
/*
|
||||
* $Id: prototypes.h,v 1.22 2005/08/02 10:50:51 kloczek Exp $
|
||||
* $Id: prototypes.h,v 1.24 2005/09/05 16:22:03 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
|
||||
@@ -87,6 +87,18 @@ extern int putgrent (const struct group *, FILE *);
|
||||
/* hushed.c */
|
||||
extern int hushed (const struct passwd *);
|
||||
|
||||
/* audit_help.c */
|
||||
#ifdef WITH_AUDIT
|
||||
extern int audit_fd;
|
||||
#endif
|
||||
void audit_help_open (void);
|
||||
void audit_help_log (const char *, ...)
|
||||
#ifdef __GNUC__
|
||||
__attribute__ ((format (printf, 1, 2)));
|
||||
#else
|
||||
;
|
||||
#endif
|
||||
|
||||
/* limits.c */
|
||||
extern void setup_limits (const struct passwd *);
|
||||
|
||||
|
@@ -30,8 +30,8 @@
|
||||
#include <config.h>
|
||||
|
||||
#ifndef USE_PAM
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: pwauth.c,v 1.18 2005/07/07 18:53:14 kloczek Exp $")
|
||||
#ident "$Id: pwauth.c,v 1.19 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <signal.h>
|
||||
#include <fcntl.h>
|
||||
|
@@ -1,8 +1,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: pwio.c,v 1.15 2005/06/20 10:01:57 kloczek Exp $")
|
||||
#ident "$Id: pwio.c,v 1.16 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
#include <pwd.h>
|
||||
|
23
lib/rcsid.h
23
lib/rcsid.h
@@ -1,23 +0,0 @@
|
||||
/*
|
||||
* $Id: rcsid.h,v 1.3 2005/03/31 05:14:49 kloczek Exp $
|
||||
*/
|
||||
#define PKG_VER " $Package: " PACKAGE " $ $Version: " VERSION " $ "
|
||||
#if defined(NO_RCSID) || defined(lint)
|
||||
#define RCSID(x) /* empty */
|
||||
#else
|
||||
#if __STDC__
|
||||
/*
|
||||
* This function is never called from anywhere, but it calls itself
|
||||
* recursively only to fool gcc to not generate warnings :-).
|
||||
*/
|
||||
static const char *rcsid (const char *);
|
||||
|
||||
#define RCSID(x) \
|
||||
static const char *rcsid(const char *s) { \
|
||||
return rcsid(x); }
|
||||
#else /* ! __STDC__ */
|
||||
#define RCSID(x) \
|
||||
static char *rcsid(s) char *s; { \
|
||||
return rcsid(x); }
|
||||
#endif /* ! __STDC__ */
|
||||
#endif
|
@@ -29,8 +29,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: sgetgrent.c,v 1.5 2005/03/31 05:14:49 kloczek Exp $")
|
||||
#ident "$Id: sgetgrent.c,v 1.6 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <grp.h>
|
||||
#include "defines.h"
|
||||
|
@@ -29,8 +29,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: sgetpwent.c,v 1.7 2005/03/31 05:14:49 kloczek Exp $")
|
||||
#ident "$Id: sgetpwent.c,v 1.8 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include "defines.h"
|
||||
#include <stdio.h>
|
||||
|
@@ -3,8 +3,8 @@
|
||||
|
||||
#ifdef SHADOWGRP
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: sgroupio.c,v 1.13 2005/03/31 05:14:49 kloczek Exp $")
|
||||
#ident "$Id: sgroupio.c,v 1.14 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
#include "commonio.h"
|
||||
|
@@ -32,8 +32,8 @@
|
||||
/* Newer versions of Linux libc already have shadow support. */
|
||||
#ifndef HAVE_GETSPNAM
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: shadow.c,v 1.11 2005/05/25 19:31:50 kloczek Exp $")
|
||||
#ident "$Id: shadow.c,v 1.12 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
|
@@ -1,8 +1,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID ("$Id: shadowio.c,v 1.15 2005/05/25 18:20:22 kloczek Exp $")
|
||||
#ident "$Id: shadowio.c,v 1.16 2005/08/31 17:24:56 kloczek Exp $"
|
||||
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
#ifdef HAVE_SHADOW_H
|
||||
|
Reference in New Issue
Block a user