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

This commit is contained in:
nekral-guest
2007-10-07 11:45:07 +00:00
parent 9db6abfa42
commit 37dc61340b
49 changed files with 734 additions and 1108 deletions

View File

@@ -38,7 +38,7 @@
#include <config.h>
#include "rcsid.h"
RCSID (PKG_VER "$Id: id.c,v 1.10 2002/01/05 15:41:43 kloczek Exp $")
RCSID (PKG_VER "$Id: id.c,v 1.11 2002/01/31 09:23:57 kloczek Exp $")
#include <sys/types.h>
#include <stdio.h>
#include <grp.h>
@@ -120,15 +120,15 @@ static void usage (void)
pw = getpwuid (ruid);
if (pw)
printf (_("uid=%u(%s)"), ruid, pw->pw_name);
printf ("uid=%u(%s)", ruid, pw->pw_name);
else
printf (_("uid=%u"), ruid);
printf ("uid=%u", ruid);
gr = getgrgid (rgid);
if (gr)
printf (_(" gid=%u(%s)"), rgid, gr->gr_name);
printf (" gid=%u(%s)", rgid, gr->gr_name);
else
printf (_(" gid=%u"), rgid);
printf (" gid=%u", rgid);
/*
* Print out the effective user ID and group ID if they are
@@ -138,16 +138,16 @@ static void usage (void)
if (ruid != euid) {
pw = getpwuid (euid);
if (pw)
printf (_(" euid=%u(%s)"), euid, pw->pw_name);
printf (" euid=%u(%s)", euid, pw->pw_name);
else
printf (_(" euid=%u"), euid);
printf (" euid=%u", euid);
}
if (rgid != egid) {
gr = getgrgid (egid);
if (gr)
printf (_(" egid=%u(%s)"), egid, gr->gr_name);
printf (" egid=%u(%s)", egid, gr->gr_name);
else
printf (_(" egid=%u"), egid);
printf (" egid=%u", egid);
}
#ifdef HAVE_GETGROUPS
/*

View File

@@ -30,7 +30,7 @@
#include <config.h>
#include "rcsid.h"
RCSID (PKG_VER "$Id: pwck.c,v 1.22 2002/01/05 15:41:44 kloczek Exp $")
RCSID (PKG_VER "$Id: pwck.c,v 1.23 2002/01/10 13:01:28 kloczek Exp $")
#include <stdio.h>
#include <fcntl.h>
#include <grp.h>
@@ -370,7 +370,7 @@ int main (int argc, char **argv)
* Check for invalid usernames. --marekm
*/
if (!check_user_name (pwd->pw_name)) {
printf (_("invalid user name `%s'\n"),
printf (_("invalid user name '%s'\n"),
pwd->pw_name);
errors++;
}

View File

@@ -30,7 +30,7 @@
#include <config.h>
#include "rcsid.h"
RCSID (PKG_VER "$Id: useradd.c,v 1.31 2002/01/06 14:09:07 kloczek Exp $")
RCSID (PKG_VER "$Id: useradd.c,v 1.32 2002/01/10 13:01:28 kloczek Exp $")
#include "prototypes.h"
#include "defines.h"
#include "chkname.h"
@@ -1374,7 +1374,7 @@ static void process_flags (int argc, char **argv)
user_name = argv[optind];
if (!check_user_name (user_name)) {
fprintf (stderr, _("%s: invalid user name `%s'\n"),
fprintf (stderr, _("%s: invalid user name '%s'\n"),
Prog, user_name);
exit (E_BAD_ARG);
}