[svn-upgrade] Integrating new upstream version, shadow (4.0.15)

lib/Makefile.am

@@ -6,7 +6,7 @@ DEFS =
 lib_LTLIBRARIES = libshadow.la
 
 libshadow_la_LDFLAGS = -version-info 0:0:0
-libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD) $(LIBSELINUX)
+libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
 
 libshadow_la_SOURCES = \
 	commonio.c \

lib/Makefile.in

@@ -58,7 +58,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libshadow_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am_libshadow_la_OBJECTS = commonio.lo encrypt.lo fputsx.lo getdef.lo \
 	getpass.lo groupio.lo gshadow.lo lockpw.lo nscd.lo port.lo \
 	pwauth.lo pwio.lo sgetgrent.lo sgetpwent.lo sgroupio.lo \
@@ -157,6 +157,8 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
+USE_NLS_FALSE = @USE_NLS_FALSE@
+USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XMLCATALOG = @XMLCATALOG@
@@ -209,7 +211,7 @@ target_alias = @target_alias@
 AUTOMAKE_OPTIONS = 1.0 foreign
 lib_LTLIBRARIES = libshadow.la
 libshadow_la_LDFLAGS = -version-info 0:0:0
-libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD) $(LIBSELINUX)
+libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
 libshadow_la_SOURCES = \
 	commonio.c \
 	commonio.h \

lib/exitcodes.h

@@ -1,4 +1,4 @@
-/* $Id: exitcodes.h,v 1.7 2005/08/31 17:36:11 kloczek Exp $ */
+/* $Id: exitcodes.h,v 1.8 2006/01/17 22:06:03 kloczek Exp $ */
 
 /*
  * Exit codes used by shadow programs
@@ -11,3 +11,5 @@
 #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 */
+#define E_CMD_NOEXEC		126	/* can't run command/shell */
+#define E_CMD_NOTFOUND		127	/* can't find command/shell to run */

lib/getdef.h

@@ -9,4 +9,7 @@ extern unsigned int getdef_unum (const char *, unsigned int);
 extern char *getdef_str (const char *);
 extern int putdef_str (const char *, const char *);
 
+/* default UMASK value if not specified in /etc/login.defs */
+#define		GETDEF_DEFAULT_UMASK	022
+
 #endif				/* _GETDEF_H */

lib/prototypes.h

@@ -6,7 +6,7 @@
  * Juha Virtanen, <jiivee@hut.fi>; November 1995
  */
 /*
- * $Id: prototypes.h,v 1.26 2006/01/02 23:32:51 kloczek Exp $
+ * $Id: prototypes.h,v 1.28 2006/02/07 16:36:30 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
@@ -82,13 +82,9 @@ 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
-;
+extern void audit_help_open (void);
+extern void audit_logger (int type, const char *pgname, const char *op,
+			  const char *name, unsigned int id, int result);
 #endif
 
 /* limits.c */
@@ -149,7 +145,7 @@ extern void setup (struct passwd *);
 extern void setup_env (struct passwd *);
 
 /* shell.c */
-extern void shell (const char *, const char *);
+extern int shell (const char *, const char *, char *const *);
 
 /* strtoday.c */
 extern long strtoday (const char *);

lib/pwauth.c

@@ -30,7 +30,7 @@
 #include <config.h>
 
 #ifndef USE_PAM
-#ident "$Id: pwauth.c,v 1.19 2005/08/31 17:24:56 kloczek Exp $"
+#ident "$Id: pwauth.c,v 1.20 2006/03/11 21:15:55 kloczek Exp $"
 
 #include <sys/types.h>
 #include <signal.h>
@@ -123,6 +123,14 @@ pw_auth (const char *cipher, const char *user, int reason, const char *input)
 	 * If there is no SKEY information we default to not using SKEY.
 	 */
 
+# ifdef SKEY_BSD_STYLE
+	/*
+	 * Some BSD updates to the S/KEY API adds a fourth parameter; the
+	 * sizeof of the challenge info buffer.
+	 */
+#  define skeychallenge(s,u,c) skeychallenge(s,u,c,sizeof(c))
+# endif
+
 	if (skeychallenge (&skey, user, challenge_info) == 0)
 		use_skey = 1;
 #endif