[svn-upgrade] Integrating new upstream version, shadow (4.0.9)
This commit is contained in:
		@@ -52,7 +52,11 @@ noinst_PROGRAMS = id$(EXEEXT) sulogin$(EXEEXT)
 | 
			
		||||
subdir = src
 | 
			
		||||
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)/m4/gettext.m4 \
 | 
			
		||||
	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
 | 
			
		||||
	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 | 
			
		||||
	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
 | 
			
		||||
	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
 | 
			
		||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 | 
			
		||||
	$(ACLOCAL_M4)
 | 
			
		||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 | 
			
		||||
 
 | 
			
		||||
@@ -30,7 +30,7 @@
 | 
			
		||||
#include <config.h>
 | 
			
		||||
 | 
			
		||||
#include "rcsid.h"
 | 
			
		||||
RCSID (PKG_VER "$Id: lastlog.c,v 1.17 2005/04/25 10:26:37 kloczek Exp $")
 | 
			
		||||
RCSID (PKG_VER "$Id: lastlog.c,v 1.18 2005/04/27 16:55:33 kloczek Exp $")
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
#include <sys/stat.h>
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
@@ -64,7 +64,7 @@ static void usage (void)
 | 
			
		||||
	fprintf (stdout, _("Usage: lastlog [options]\n"
 | 
			
		||||
			   "\n"
 | 
			
		||||
			   "Options:\n"
 | 
			
		||||
			   "  -u, --login LOGIN	print lastlog record for user with specified LOGIN\n"
 | 
			
		||||
			   "  -u, --user LOGIN	print lastlog record for user with specified LOGIN\n"
 | 
			
		||||
			   "  -h, --help		display this help message and exit\n"
 | 
			
		||||
			   "  -t, --time DAYS	print only lastlog records more recent than DAYS\n"));
 | 
			
		||||
	exit (1);
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										11
									
								
								src/newgrp.c
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								src/newgrp.c
									
									
									
									
									
								
							@@ -30,7 +30,7 @@
 | 
			
		||||
#include <config.h>
 | 
			
		||||
 | 
			
		||||
#include "rcsid.h"
 | 
			
		||||
RCSID (PKG_VER "$Id: newgrp.c,v 1.27 2005/03/31 05:14:54 kloczek Exp $")
 | 
			
		||||
RCSID (PKG_VER "$Id: newgrp.c,v 1.28 2005/05/19 11:28:27 kloczek Exp $")
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <errno.h>
 | 
			
		||||
#include <grp.h>
 | 
			
		||||
@@ -379,8 +379,13 @@ int main (int argc, char **argv)
 | 
			
		||||
		SYSLOG ((LOG_INFO, "user `%s' switched to group `%s'",
 | 
			
		||||
			 name, group));
 | 
			
		||||
	if (getdef_bool ("SYSLOG_SG_ENAB")) {
 | 
			
		||||
		char *loginname = xstrdup (getlogin ());
 | 
			
		||||
		char *tty = xstrdup (ttyname (0));
 | 
			
		||||
		char *loginname = getlogin ();
 | 
			
		||||
		char *tty = ttyname (0);
 | 
			
		||||
 | 
			
		||||
		if (loginname != NULL)
 | 
			
		||||
			loginname = xstrdup (loginname);
 | 
			
		||||
		if (tty != NULL)
 | 
			
		||||
			tty = xstrdup (tty);
 | 
			
		||||
 | 
			
		||||
		if (loginname == NULL)
 | 
			
		||||
			loginname = "???";
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user