From d6e9891ad708df05e7273c4fecc5b4f22b08aa4c Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 7 Oct 2007 11:44:32 +0000 Subject: [PATCH] [svn-upgrade] Integrating new upstream version, shadow (20000902) --- configure | 4 +- configure.in | 4 +- debian/rules | 13 +- doc/CHANGES | 23 +++- doc/LSM | 9 +- lib/commonio.c | 132 +++++++++++++++------ lib/commonio.h | 3 +- lib/defines.h | 29 ++++- lib/groupio.c | 5 +- lib/pwio.c | 5 +- lib/sgroupio.c | 5 +- lib/shadowio.c | 5 +- man/usermod.8 | 11 +- po/cat-id-tbl.c | 53 +++++---- po/el.po | 229 ++++++++++++++++++------------------ po/fr.gmo | Bin 40067 -> 40067 bytes po/fr.po | 229 ++++++++++++++++++------------------ po/pl.gmo | Bin 40513 -> 40513 bytes po/pl.po | 229 ++++++++++++++++++------------------ po/shadow.pot | 228 +++++++++++++++++------------------ po/sv.po | 229 ++++++++++++++++++------------------ redhat/shadow-utils.spec.in | 5 +- src/chage.c | 23 +++- src/chfn.c | 7 +- src/chsh.c | 7 +- src/dpasswd.c | 4 +- src/gpasswd.c | 8 +- src/groupadd.c | 4 +- src/groupdel.c | 4 +- src/groupmod.c | 4 +- src/grpck.c | 4 +- src/login.c | 4 +- src/logoutd.c | 4 +- src/newgrp.c | 4 +- src/passwd.c | 4 +- src/pwck.c | 4 +- src/su.c | 4 +- src/sulogin.c | 4 +- src/useradd.c | 7 +- src/userdel.c | 4 +- src/usermod.c | 76 +++++++++--- 41 files changed, 910 insertions(+), 720 deletions(-) diff --git a/configure b/configure index 4c7f3918..8de554bb 100755 --- a/configure +++ b/configure @@ -723,7 +723,7 @@ fi PACKAGE=shadow -VERSION=20000826 +VERSION=20000902 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -2746,7 +2746,7 @@ else #include "confdefs.h" #include int main() { - struct passwd pw; pw.pw_quota = ""; + struct passwd pw; pw.pw_quota = 0; ; return 0; } EOF if { (eval echo configure:2753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then diff --git a/configure.in b/configure.in index aea7d557..1af42d8f 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(lib/dialchk.c) -AM_INIT_AUTOMAKE(shadow, 20000826) +AM_INIT_AUTOMAKE(shadow, 20000902) AM_CONFIG_HEADER(config.h) dnl Some hacks... @@ -64,7 +64,7 @@ fi AC_CACHE_CHECK(for pw_quota in struct passwd, ac_cv_struct_passwd_pw_quota, AC_TRY_COMPILE([#include ], -[ struct passwd pw; pw.pw_quota = ""; ], +[ struct passwd pw; pw.pw_quota = 0; ], ac_cv_struct_passwd_pw_quota=yes, ac_cv_struct_passwd_pw_quota=no)) if test "$ac_cv_struct_passwd_pw_quota" = "yes"; then diff --git a/debian/rules b/debian/rules index 91b81107..63284d78 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +# FIXME - this is out of date, please update for current Debian + package = shadow # see dpkg-architecture(8) @@ -21,11 +23,6 @@ else package-list = binary-passwd endif -# set up environment so that dpkg --build runs our tar wrapper -# (XXX this is no longer needed, and will be removed soon - install -# libtricks and use "dpkg-buildpackage -rfakeroot" instead) -#TAR_WRAPPER_SETUP = REAL_TAR=`command -p -v tar` PATH=`cd debian && pwd`:$$PATH - # for "exec login" to work for ordinary users, /bin/login needs to be setuid # but very few people use this feature, so we make it non-setuid by default LOGIN_PERM = 0755 @@ -37,9 +34,6 @@ build: ./configure --disable-shared --disable-desrpc \ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) $(MAKE) - if [ -n "$(TAR_WRAPPER_SETUP)" ] ; then \ - gcc -O2 -Wall -o debian/tar debian/tar.c ; \ - fi touch build clean: @@ -84,7 +78,6 @@ binary-login: checkroot build dpkg-shlibdeps debian/tmp-l/{bin/*,usr/bin/*,usr/sbin/*} dpkg-gencontrol -isp -plogin -Pdebian/tmp-l ./debian/checksums debian/tmp-l - $(TAR_WRAPPER_SETUP) dpkg --build debian/tmp-l .. binary-passwd: checkroot build $(checkdir) @@ -126,7 +119,6 @@ ifeq ($(DEB_HOST_GNU_SYSTEM),gnu) endif dpkg-gencontrol -isp -ppasswd -Pdebian/tmp-p ./debian/checksums debian/tmp-p - $(TAR_WRAPPER_SETUP) dpkg --build debian/tmp-p .. binary-su: checkroot build $(checkdir) @@ -146,7 +138,6 @@ binary-su: checkroot build dpkg-shlibdeps debian/tmp-s/bin/su dpkg-gencontrol -isp -psecure-su -Pdebian/tmp-s ./debian/checksums debian/tmp-s - $(TAR_WRAPPER_SETUP) dpkg --build debian/tmp-s .. define checkdir test -f lib/shadow.c -a -f debian/rules diff --git a/doc/CHANGES b/doc/CHANGES index d25ec5b1..36d2ab10 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,25 @@ -$Id: CHANGES,v 1.29 2000/08/26 18:27:09 marekm Exp $ +$Id: CHANGES,v 1.30 2000/09/02 18:40:42 marekm Exp $ + +shadow-20000826 => shadow-20000902 + +This is probably the last release from me. +Tomasz Kloczko is the new maintainer. +Good luck! + +(I'm still interested to know what is going on with this package, +which is fairly important to many Linux distributions, so please +Cc: marekm@linux.org.pl in any related discussions - just don't +expect me to respond quickly...) + +Previous warning still applies - be careful! + +- applied some of the Red Hat patches (revised slightly), thanks to + Bernhard Rosenkraenzer : fix for truncated long + lines (>8K) in /etc/group, send SIGHUP to nscd (caching daemon + in glibc 2.1.x) after changing anything, add usermod -L and -U + options, remove LOG_CONS from openlog(), chage -d and -E handles + dates in yyyy-mm-dd format ('/' is not required) +- various cleanups shadow-19990827 => shadow-20000826 diff --git a/doc/LSM b/doc/LSM index 39186a20..75a215e1 100644 --- a/doc/LSM +++ b/doc/LSM @@ -1,7 +1,7 @@ Begin3 Title: Shadow Password Suite -Version: 20000826 -Entered-date: 26AUG00 +Version: 20000902 +Entered-date: 02SEP00 Description: Shadow password file utilities. This package includes the programs necessary to convert traditional V7 UNIX password files to the SVR4 shadow password format, and @@ -9,9 +9,10 @@ Description: Shadow password file utilities. This package includes (that work with both shadow and non-shadow passwords). Keywords: login passwd security shadow Author: jfh@austin.ibm.com (Julianne F. Haugh) -Maintained-by: marekm@linux.org.pl (Marek Michalkiewicz) +Maintained-by: kloczek@rudy.mif.pg.gda.pl (Tomasz Kloczko) + marekm@linux.org.pl (Marek Michalkiewicz) - previous maintainer Primary-site: piast.t19.ds.pwr.wroc.pl /pub/linux/shadow/ - 717K shadow-20000826.tar.gz + 718K shadow-20000902.tar.gz Alternate-site: ftp.ists.pwr.wroc.pl /pub/linux/shadow/ Original-site: ftp.uu.net ? Platforms: Linux, SunOS, ... diff --git a/lib/commonio.c b/lib/commonio.c index 6343f956..4adb8eee 100644 --- a/lib/commonio.c +++ b/lib/commonio.c @@ -2,7 +2,7 @@ #include #include "rcsid.h" -RCSID("$Id: commonio.c,v 1.15 2000/08/26 18:27:17 marekm Exp $") +RCSID("$Id: commonio.c,v 1.16 2000/09/02 18:40:42 marekm Exp $") #include "defines.h" #include @@ -29,9 +29,8 @@ static int name_is_nis(const char *); static int write_all(const struct commonio_db *); static struct commonio_entry *find_entry_by_name(struct commonio_db *, const char *); -#ifdef HAVE_LCKPWDF static int lock_count = 0; -#endif +static int nscd_need_reload = 0; static int check_link_count(const char *file) @@ -236,6 +235,7 @@ commonio_lock_nowait(struct commonio_db *db) snprintf(lock, sizeof lock, "%s.lock", db->filename); if (do_lock_file(file, lock)) { db->locked = 1; + lock_count++; return 1; } return 0; @@ -245,31 +245,30 @@ commonio_lock_nowait(struct commonio_db *db) int commonio_lock(struct commonio_db *db) { - int i; - #ifdef HAVE_LCKPWDF /* * only if the system libc has a real lckpwdf() - the one from * lockpw.c calls us and would cause infinite recursion! */ - if (db->use_lckpwdf) { - /* - * Call lckpwdf() on the first lock. - * If it succeeds, call *_lock() only once - * (no retries, it should always succeed). - */ - if (lock_count == 0) { - if (lckpwdf() == -1) - return 0; /* failure */ - } - if (!commonio_lock_nowait(db)) { - ulckpwdf(); + + /* + * Call lckpwdf() on the first lock. + * If it succeeds, call *_lock() only once + * (no retries, it should always succeed). + */ + if (lock_count == 0) { + if (lckpwdf() == -1) return 0; /* failure */ - } - lock_count++; - return 1; /* success */ } -#endif + + if (commonio_lock_nowait(db)) + return 1; /* success */ + + ulckpwdf(); + return 0; /* failure */ +#else + int i; + /* * lckpwdf() not used - do it the old way. */ @@ -290,6 +289,53 @@ commonio_lock(struct commonio_db *db) return 0; } return 0; /* failure */ +#endif +} + +#ifndef NSCD_PID_FILE +#define NSCD_PID_FILE "/var/run/nscd.pid" +#endif + +/* + reload_nscd() is called after updating all of the password files, + to tell the "nscd" caching daemon to clear its cache. + Very loosely based on a shadow-utils patch from Red Hat. + */ + +static void +reload_nscd(void) +{ + FILE *pidfile; + int pid; + + pidfile = fopen(NSCD_PID_FILE, "r"); + if (pidfile) { + pid = 0; + fscanf(pidfile, "%d", &pid); + if (pid > 0) + kill(pid, SIGHUP); + fclose(pidfile); + } +} + + +static void +dec_lock_count(void) +{ + if (lock_count > 0) { + lock_count--; + if (lock_count == 0) { + /* Tell nscd when lock count goes to zero, + if any of the files were changed. */ + if (nscd_need_reload) { + reload_nscd(); + nscd_need_reload = 0; + } +#ifdef HAVE_LCKPWDF + ulckpwdf(); +#endif + } + } } @@ -300,8 +346,11 @@ commonio_unlock(struct commonio_db *db) if (db->isopen) { db->readonly = 1; - if (!commonio_close(db)) + if (!commonio_close(db)) { + if (db->locked) + dec_lock_count(); return 0; + } } if (db->locked) { /* @@ -311,13 +360,7 @@ commonio_unlock(struct commonio_db *db) db->locked = 0; snprintf(lock, sizeof lock, "%s.lock", db->filename); unlink(lock); -#ifdef HAVE_LCKPWDF - if (db->use_lckpwdf && lock_count > 0) { - lock_count--; - if (lock_count == 0) - ulckpwdf(); - } -#endif + dec_lock_count(); return 1; } return 0; @@ -353,7 +396,6 @@ name_is_nis(const char *n) #endif #if KEEP_NIS_AT_END -/* prototype */ static void add_one_entry_nis(struct commonio_db *, struct commonio_entry *); static void @@ -377,16 +419,20 @@ add_one_entry_nis(struct commonio_db *db, struct commonio_entry *newp) } #endif /* KEEP_NIS_AT_END */ +/* Initial buffer size, as well as increment if not sufficient + (for reading very long lines in group files). */ +#define BUFLEN 4096 int commonio_open(struct commonio_db *db, int mode) { - char buf[8192]; - char *cp; + char *buf; + char *cp; char *line; struct commonio_entry *p; void *eptr; int flags = mode; + int buflen; mode &= ~O_CREAT; @@ -417,12 +463,25 @@ commonio_open(struct commonio_db *db, int mode) return 0; } - while (db->ops->fgets(buf, sizeof buf, db->fp)) { + buflen = BUFLEN; + buf = (char *) malloc(buflen); + if (!buf) + goto cleanup; + + while (db->ops->fgets(buf, buflen, db->fp)) { + while (!(cp = strrchr(buf, '\n')) && !feof(db->fp)) { + buflen += BUFLEN; + cp = (char *) realloc(buf, buflen); + if (!cp) + goto cleanup_buf; + buf = cp; + db->ops->fgets(buf + buflen - BUFLEN, BUFLEN, db->fp); + } if ((cp = strrchr(buf, '\n'))) *cp = '\0'; if (!(line = strdup(buf))) - goto cleanup; + goto cleanup_buf; if (name_is_nis(line)) { eptr = NULL; @@ -444,6 +503,7 @@ commonio_open(struct commonio_db *db, int mode) } db->isopen = 1; + free(buf); return 1; cleanup_entry: @@ -451,6 +511,8 @@ cleanup_entry: db->ops->free(eptr); cleanup_line: free(line); +cleanup_buf: + free(buf); cleanup: free_linked_list(db); fclose(db->fp); @@ -564,6 +626,8 @@ commonio_close(struct commonio_db *db) if (rename(buf, db->filename)) goto fail; + nscd_need_reload = 1; + success: free_linked_list(db); return 1; diff --git a/lib/commonio.h b/lib/commonio.h index 6968692b..f25883b8 100644 --- a/lib/commonio.h +++ b/lib/commonio.h @@ -1,4 +1,4 @@ -/* $Id: commonio.h,v 1.5 2000/08/26 18:27:17 marekm Exp $ */ +/* $Id: commonio.h,v 1.6 2000/09/02 18:40:43 marekm Exp $ */ /* * Linked list entry. @@ -82,7 +82,6 @@ struct commonio_db { int isopen:1; int locked:1; int readonly:1; - int use_lckpwdf:1; }; extern int commonio_setname(struct commonio_db *, const char *); diff --git a/lib/defines.h b/lib/defines.h index 7294a7f9..c020f9e5 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -1,4 +1,4 @@ -/* $Id: defines.h,v 1.16 2000/08/26 18:27:17 marekm Exp $ */ +/* $Id: defines.h,v 1.17 2000/09/02 18:40:43 marekm Exp $ */ /* some useful defines */ #ifndef _DEFINES_H_ @@ -138,13 +138,24 @@ char *strchr(), *strrchr(), *strtok(); #define LOG_WARN LOG_WARNING #endif +/* LOG_NOWAIT is deprecated */ +#ifndef LOG_NOWAIT +#define LOG_NOWAIT 0 +#endif + +/* LOG_AUTH is deprecated, use LOG_AUTHPRIV instead */ +#ifndef LOG_AUTHPRIV +#define LOG_AUTHPRIV LOG_AUTH +#endif + /* cleaner than lots of #ifdefs everywhere - use this as follows: SYSLOG((LOG_CRIT, "user %s cracked root", user)); */ #if HAVE_SETLOCALE /* Temporarily set LC_TIME to "C" to avoid strange dates in syslog. This is a workaround for a more general syslog(d) design problem - syslogd should log the current system time for each event, and not - trust the formatted time received from the unix domain socket. -MM */ + trust the formatted time received from the unix domain (or worse, + UDP) socket. -MM */ #define SYSLOG(x) \ do { \ char *saved_locale = setlocale(LC_ALL, NULL); \ @@ -170,6 +181,20 @@ char *strchr(), *strrchr(), *strtok(); #endif /* !USE_SYSLOG */ +/* The default syslog settings can now be changed here, + in just one place. */ + +#ifndef SYSLOG_OPTIONS +/* #define SYSLOG_OPTIONS (LOG_PID | LOG_CONS | LOG_NOWAIT) */ +#define SYSLOG_OPTIONS (LOG_PID) +#endif + +#ifndef SYSLOG_FACILITY +#define SYSLOG_FACILITY LOG_AUTHPRIV +#endif + +#define OPENLOG(progname) openlog(progname, SYSLOG_OPTIONS, SYSLOG_FACILITY) + #ifndef F_OK # define F_OK 0 # define X_OK 1 diff --git a/lib/groupio.c b/lib/groupio.c index 04d470bd..a59faadd 100644 --- a/lib/groupio.c +++ b/lib/groupio.c @@ -2,7 +2,7 @@ #include #include "rcsid.h" -RCSID("$Id: groupio.c,v 1.8 2000/08/26 18:27:17 marekm Exp $") +RCSID("$Id: groupio.c,v 1.9 2000/09/02 18:40:43 marekm Exp $") #include "prototypes.h" #include "defines.h" @@ -102,8 +102,7 @@ static struct commonio_db group_db = { 0, /* changed */ 0, /* isopen */ 0, /* locked */ - 0, /* readonly */ - 0 /* use_lckpwdf */ + 0 /* readonly */ }; int diff --git a/lib/pwio.c b/lib/pwio.c index 4fa25da9..70b3d9ab 100644 --- a/lib/pwio.c +++ b/lib/pwio.c @@ -2,7 +2,7 @@ #include #include "rcsid.h" -RCSID("$Id: pwio.c,v 1.10 2000/08/26 18:27:17 marekm Exp $") +RCSID("$Id: pwio.c,v 1.11 2000/09/02 18:40:43 marekm Exp $") #include "prototypes.h" #include "defines.h" @@ -110,8 +110,7 @@ static struct commonio_db passwd_db = { 0, /* changed */ 0, /* isopen */ 0, /* locked */ - 0, /* readonly */ - 1 /* use_lckpwdf */ + 0 /* readonly */ }; int diff --git a/lib/sgroupio.c b/lib/sgroupio.c index 4f0c56b4..3bf2a087 100644 --- a/lib/sgroupio.c +++ b/lib/sgroupio.c @@ -4,7 +4,7 @@ #ifdef SHADOWGRP #include "rcsid.h" -RCSID("$Id: sgroupio.c,v 1.10 2000/08/26 18:27:17 marekm Exp $") +RCSID("$Id: sgroupio.c,v 1.11 2000/09/02 18:40:43 marekm Exp $") #include "prototypes.h" #include "defines.h" @@ -121,8 +121,7 @@ static struct commonio_db gshadow_db = { 0, /* changed */ 0, /* isopen */ 0, /* locked */ - 0, /* readonly */ - 0 /* use_lckpwdf */ + 0 /* readonly */ }; int diff --git a/lib/shadowio.c b/lib/shadowio.c index 4575b2bb..e6707cf2 100644 --- a/lib/shadowio.c +++ b/lib/shadowio.c @@ -4,7 +4,7 @@ #ifdef SHADOWPWD #include "rcsid.h" -RCSID("$Id: shadowio.c,v 1.11 1998/01/29 23:22:32 marekm Exp $") +RCSID("$Id: shadowio.c,v 1.12 2000/09/02 18:40:43 marekm Exp $") #include "prototypes.h" #include "defines.h" @@ -88,8 +88,7 @@ static struct commonio_db shadow_db = { 0, /* changed */ 0, /* isopen */ 0, /* locked */ - 0, /* readonly */ - 1 /* use_lckpwdf */ + 0 /* readonly */ }; int diff --git a/man/usermod.8 b/man/usermod.8 index 8e6bc0c1..152514fd 100644 --- a/man/usermod.8 +++ b/man/usermod.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: usermod.8,v 1.7 2000/08/26 18:27:17 marekm Exp $ +.\" $Id: usermod.8,v 1.8 2000/09/02 18:40:43 marekm Exp $ .\" .TH USERMOD 8 .SH NAME @@ -61,6 +61,7 @@ usermod \- Modify a user account .RB [ -u .IR uid " [" .BR -o ]] +.RB [ -L | -U ] .I login .SH DESCRIPTION The \fBusermod\fR command modifies the system account files to reflect @@ -124,6 +125,14 @@ Any files which the user owns and which are located in the directory tree rooted at the user's home directory will have the file user ID changed automatically. Files outside of the user's home directory must be altered manually. +.IP "\fB-L\fR" +Lock a user's password. +This puts a '!' in front of the encrypted password, effectively disabling +the password. You can't use this option with \fI-p\fR or \fI-U\fR. +.IP "\fB-U\fR" +Unlock a user's password. +This removes the '!' in front of the encrypted password. +You can't use this option with \fI-p\fR or \fI-L\fR. .SH CAVEATS \fBusermod\fR will not allow you to change the name of a user who is logged in. diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index 67e5badf..314d8ca0 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -468,36 +468,37 @@ Type control-d to proceed with normal startup,\n\ {"%s: error removing directory %s\n", 435}, {"\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n", 436}, {"[-A {DEFAULT|program},... ] ", 437}, - {"%s: out of memory in update_group\n", 438}, - {"%s: out of memory in update_gshadow\n", 439}, - {"%s: no flags given\n", 440}, - {"%s: shadow passwords required for -e and -f\n", 441}, - {"%s: uid %ld is not unique\n", 442}, - {"%s: error deleting authentication method\n", 443}, - {"%s: error changing authentication method\n", 444}, - {"%s: error changing password entry\n", 445}, - {"%s: error removing password entry\n", 446}, - {"%s: error adding password dbm entry\n", 447}, - {"%s: error removing passwd dbm entry\n", 448}, - {"%s: error removing shadow password entry\n", 449}, - {"%s: error removing shadow passwd dbm entry\n", 450}, - {"%s: directory %s exists\n", 451}, - {"%s: can't create %s\n", 452}, - {"%s: can't chown %s\n", 453}, - {"%s: cannot rename directory %s to %s\n", 454}, - {"%s: warning: %s not owned by %s\n", 455}, - {"failed to change mailbox owner", 456}, - {"failed to rename mailbox", 457}, + {"[-p passwd] [-L|-U] name\n", 438}, + {"%s: out of memory in update_group\n", 439}, + {"%s: out of memory in update_gshadow\n", 440}, + {"%s: no flags given\n", 441}, + {"%s: shadow passwords required for -e and -f\n", 442}, + {"%s: uid %ld is not unique\n", 443}, + {"%s: error deleting authentication method\n", 444}, + {"%s: error changing authentication method\n", 445}, + {"%s: error changing password entry\n", 446}, + {"%s: error removing password entry\n", 447}, + {"%s: error adding password dbm entry\n", 448}, + {"%s: error removing passwd dbm entry\n", 449}, + {"%s: error removing shadow password entry\n", 450}, + {"%s: error removing shadow passwd dbm entry\n", 451}, + {"%s: directory %s exists\n", 452}, + {"%s: can't create %s\n", 453}, + {"%s: can't chown %s\n", 454}, + {"%s: cannot rename directory %s to %s\n", 455}, + {"%s: warning: %s not owned by %s\n", 456}, + {"failed to change mailbox owner", 457}, + {"failed to rename mailbox", 458}, {"\ \n\ -%s: %s is unchanged\n", 458}, - {"Couldn't lock file", 459}, - {"Couldn't make backup", 460}, - {"%s: can't restore %s: %s (your changes are in %s)\n", 461}, +%s: %s is unchanged\n", 459}, + {"Couldn't lock file", 460}, + {"Couldn't make backup", 461}, + {"%s: can't restore %s: %s (your changes are in %s)\n", 462}, {"\ Usage:\n\ `vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n\ -`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n", 462}, +`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n", 463}, }; -int _msg_tbl_length = 462; +int _msg_tbl_length = 463; diff --git a/po/el.po b/po/el.po index e319dabd..16f129d5 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Shadow 980726\n" -"POT-Creation-Date: 2000-08-26 20:28+0200\n" +"POT-Creation-Date: 2000-09-02 20:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Nikos Mavroyanopoulos \n" "Language-Team: Hellenic \n" @@ -227,7 +227,7 @@ msgstr "" msgid "Unknown error %d" msgstr "Αγνωστο σφάλμα %d" -#: src/chage.c:141 +#: src/chage.c:156 #, c-format msgid "" "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -W warn ]\n" @@ -236,14 +236,14 @@ msgstr "" "Χρήση: %s [ -l ] [ -m ελαχ_μέρες ] [ -M μεγ_μέρες ] [ -W προειδ. ]\n" "\t[ -I ανενεργό ] [ -E λήξη ] [ -d τελευταία_μέρα ] χρήστης\n" -#: src/chage.c:143 +#: src/chage.c:158 #, c-format msgid "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -d last_day ] user\n" msgstr "" "Χρήση: %s [ -l ] [ -m ελάχ_μέρες ] [ -M μεγ_μέρες ]\n" "[ -d τελευταία_μέρα ] χρήστης\n" -#: src/chage.c:178 +#: src/chage.c:193 msgid "" "Enter the new value, or press return for the default\n" "\n" @@ -251,27 +251,27 @@ msgstr "" "Εισάγετε την νέα τιμή, ή πιέστε `return' για την προκαθορισμένη\n" "\n" -#: src/chage.c:181 +#: src/chage.c:196 msgid "Minimum Password Age" msgstr "Μικρότερη διάρκεια συνθηματικού" -#: src/chage.c:186 +#: src/chage.c:201 msgid "Maximum Password Age" msgstr "Μέγιστη διάρκεια συνθηματικού" -#: src/chage.c:192 +#: src/chage.c:207 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Τελευταία αλλαγή συνθηματικού (ΧΧΧΧ-ΜΜ-ΗΗ)" -#: src/chage.c:201 +#: src/chage.c:216 msgid "Password Expiration Warning" msgstr "Προειδοποίηση λήξης συνθηματικού" -#: src/chage.c:206 +#: src/chage.c:221 msgid "Password Inactive" msgstr "Ανενεργό συνθηματικό" -#: src/chage.c:212 +#: src/chage.c:227 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Ημερομηνία Λήξης Λογαριασμού (ΧΧΧΧ-ΜΜ-ΗΗ)" @@ -283,22 +283,22 @@ msgstr " #. * days after the password expires that the account becomes #. * unusable. #. -#: src/chage.c:266 +#: src/chage.c:281 #, c-format msgid "Minimum:\t%ld\n" msgstr "Ελάχιστο:\t%ld\n" -#: src/chage.c:267 +#: src/chage.c:282 #, c-format msgid "Maximum:\t%ld\n" msgstr "Μέγιστο:\t%ld\n" -#: src/chage.c:269 +#: src/chage.c:284 #, c-format msgid "Warning:\t%ld\n" msgstr "Προειδοποίηση:\t%ld\n" -#: src/chage.c:270 +#: src/chage.c:285 #, c-format msgid "Inactive:\t%ld\n" msgstr "Ανενεργός:\t%ld\n" @@ -308,11 +308,11 @@ msgstr " #. * password was last modified. The date is the number of #. * days since 1/1/1970. #. -#: src/chage.c:279 +#: src/chage.c:294 msgid "Last Change:\t\t" msgstr "Τελευταία αλλαγή:\t\t" -#: src/chage.c:281 src/chage.c:295 src/chage.c:312 src/chage.c:325 +#: src/chage.c:296 src/chage.c:310 src/chage.c:327 src/chage.c:340 msgid "Never\n" msgstr "Ποτέ\n" @@ -321,7 +321,7 @@ msgstr " #. * change date plus the number of days the password is valid #. * for. #. -#: src/chage.c:293 +#: src/chage.c:308 msgid "Password Expires:\t" msgstr "Το συνθηματικό λήγει:\t" @@ -331,7 +331,7 @@ msgstr " #. * and the number of inactive days is added. The resulting date #. * is when the active will be disabled. #. -#: src/chage.c:309 +#: src/chage.c:324 #, fuzzy msgid "Password Inactive:\t" msgstr "Ανενεργό συνθηματικό" @@ -340,83 +340,83 @@ msgstr " #. * The account will expire on the given date regardless of the #. * password expiring or not. #. -#: src/chage.c:323 +#: src/chage.c:338 #, fuzzy msgid "Account Expires:\t" msgstr "Το συνθηματικό λήγει:\t" -#: src/chage.c:471 +#: src/chage.c:486 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: Να μην συμπεριλαμβάνετε το \"l\" με τις άλλες ενδείξεις\n" -#: src/chage.c:483 src/chage.c:595 src/login.c:529 +#: src/chage.c:498 src/chage.c:610 src/login.c:529 #, c-format msgid "%s: permission denied\n" msgstr "%s: άδεια απορρίφθηκε\n" -#: src/chage.c:495 src/chpasswd.c:120 +#: src/chage.c:510 src/chpasswd.c:120 #, c-format msgid "%s: can't lock password file\n" msgstr "%s: αδυναμία κλειδώματος του αρχείου συνθηματικών\n" -#: src/chage.c:501 src/chpasswd.c:124 +#: src/chage.c:516 src/chpasswd.c:124 #, c-format msgid "%s: can't open password file\n" msgstr "%s: αδυναμία ανοίγματος του αρχείου συνθηματικών\n" -#: src/chage.c:508 +#: src/chage.c:523 #, c-format msgid "%s: unknown user: %s\n" msgstr "%s: άγνωστος χρήστης: %s\n" -#: src/chage.c:527 +#: src/chage.c:542 #, c-format msgid "%s: can't lock shadow password file\n" msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n" -#: src/chage.c:534 +#: src/chage.c:549 #, c-format msgid "%s: can't open shadow password file\n" msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n" -#: src/chage.c:616 +#: src/chage.c:631 #, c-format msgid "Changing the aging information for %s\n" msgstr "Αλλαγή πληροφοριών χρόνου για τον %s\n" -#: src/chage.c:618 +#: src/chage.c:633 #, c-format msgid "%s: error changing fields\n" msgstr "%s: Σφάλμα κατά την αλλαγή πεδίων\n" -#: src/chage.c:645 src/chage.c:708 src/pwunconv.c:183 +#: src/chage.c:660 src/chage.c:723 src/pwunconv.c:183 #, c-format msgid "%s: can't update password file\n" msgstr "%s: αδυναμία ανανέωσης αρχείου συνθηματικών\n" -#: src/chage.c:675 src/pwunconv.c:178 +#: src/chage.c:690 src/pwunconv.c:178 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: αδυναμία ανανέωσης του αρχείου σκιωδών συνθηματικών\n" -#: src/chage.c:724 src/chage.c:739 src/chfn.c:571 src/chsh.c:410 +#: src/chage.c:739 src/chage.c:754 src/chfn.c:570 src/chsh.c:409 #: src/passwd.c:825 src/passwd.c:926 msgid "Error updating the DBM password entry.\n" msgstr "" "Σφάλμα κατά την ανανέωση της καταχώρησης στο dbm αρχείο συνθηματικών.\n" -#: src/chage.c:756 +#: src/chage.c:771 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: αδυναμία επανεγγραφής αρχείου σκιωδών συνθηματικών\n" -#: src/chage.c:770 +#: src/chage.c:785 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: αδυναμία επανεγγραφής αρχείου συνθηματικών\n" -#: src/chage.c:821 +#: src/chage.c:836 #, c-format msgid "%s: no aging information present\n" msgstr "%s: Δεν υπάρχουν πληροφορίες γήρανσης\n" @@ -482,94 +482,94 @@ msgstr "\t msgid "Other" msgstr "Αλλο" -#: src/chfn.c:299 src/chfn.c:307 src/chfn.c:315 src/chfn.c:323 src/chfn.c:331 -#: src/chfn.c:392 src/passwd.c:1226 +#: src/chfn.c:298 src/chfn.c:306 src/chfn.c:314 src/chfn.c:322 src/chfn.c:330 +#: src/chfn.c:391 src/passwd.c:1226 #, c-format msgid "%s: Permission denied.\n" msgstr "%s: ¶δεια απορρίφθηκε.\n" -#: src/chfn.c:352 src/chsh.c:225 src/passwd.c:1277 +#: src/chfn.c:351 src/chsh.c:224 src/passwd.c:1277 #, c-format msgid "%s: Unknown user %s\n" msgstr "%s: Αγνωστος ο χρήστης %s\n" -#: src/chfn.c:358 src/chsh.c:233 src/passwd.c:1207 +#: src/chfn.c:357 src/chsh.c:232 src/passwd.c:1207 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Δεν είναι δυνατόν να καθοριστεί το όνομα χρήστη σας.\n" -#: src/chfn.c:374 src/chsh.c:251 +#: src/chfn.c:373 src/chsh.c:250 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: αδυναμία αλλαγής χρήστη `%s' στον NIS εξυπηρετούμενο.\n" -#: src/chfn.c:379 src/chsh.c:258 +#: src/chfn.c:378 src/chsh.c:257 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' είναι ο κύριος διακομιστής NIS γι'αυτόν τον εξυπηρετούμενο.\n" -#: src/chfn.c:454 +#: src/chfn.c:453 #, c-format msgid "Changing the user information for %s\n" msgstr "Αλλαγή πληροφοριών χρήστη για τον %s\n" -#: src/chfn.c:463 +#: src/chfn.c:462 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: Μη έγκυρο όνομα: `%s'\n" -#: src/chfn.c:468 +#: src/chfn.c:467 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: Μη έγκυρος αριθμός δωματίου: `%s'\n" -#: src/chfn.c:473 +#: src/chfn.c:472 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: Μη έγκυρο τηλέφωνο εργασίας: `%s'\n" -#: src/chfn.c:478 +#: src/chfn.c:477 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: Μη έγκυρο τηλέφωνο οικίας: `%s'\n" -#: src/chfn.c:483 +#: src/chfn.c:482 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" περιέχει μη έγκυρους χαρακτήρες\n" -#: src/chfn.c:495 +#: src/chfn.c:494 #, c-format msgid "%s: fields too long\n" msgstr "%s: Πολύ μακριά πεδία\n" -#: src/chfn.c:510 src/chsh.c:348 src/gpasswd.c:582 src/passwd.c:1388 +#: src/chfn.c:509 src/chsh.c:347 src/gpasswd.c:582 src/passwd.c:1388 msgid "Cannot change ID to root.\n" msgstr "Αδυναμία αλλαγής ταυτότητας χρήστη σε root.\n" -#: src/chfn.c:523 src/chsh.c:362 src/passwd.c:735 src/passwd.c:880 +#: src/chfn.c:522 src/chsh.c:361 src/passwd.c:735 src/passwd.c:880 msgid "Cannot lock the password file; try again later.\n" msgstr "Αδυναμία κλειδώματος του αρχείου συνθηματικών. Δοκιμάστε αργότερα.\n" -#: src/chfn.c:529 src/chsh.c:368 src/passwd.c:740 src/passwd.c:885 +#: src/chfn.c:528 src/chsh.c:367 src/passwd.c:740 src/passwd.c:885 msgid "Cannot open the password file.\n" msgstr "Αδυναμία ανοίγματος του αρχείου συνθηματικών.\n" -#: src/chfn.c:546 src/chsh.c:383 src/passwd.c:746 src/usermod.c:1271 +#: src/chfn.c:545 src/chsh.c:382 src/passwd.c:746 src/usermod.c:1313 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: Ο %s δεν βρέθηκε στο /etc/passwd\n" -#: src/chfn.c:563 src/chsh.c:402 src/passwd.c:819 src/passwd.c:920 +#: src/chfn.c:562 src/chsh.c:401 src/passwd.c:819 src/passwd.c:920 #: src/passwd.c:960 msgid "Error updating the password entry.\n" msgstr "Σφάλμα κατά την ανανέωση καταχώρησης στο αρχείο συνθηματικών.\n" -#: src/chfn.c:586 src/chsh.c:425 src/passwd.c:832 src/passwd.c:933 +#: src/chfn.c:585 src/chsh.c:424 src/passwd.c:832 src/passwd.c:933 msgid "Cannot commit password file changes.\n" msgstr "Αδυναμία εισαγωγής των αλλαγών στο αρχείο συνθηματικών.\n" -#: src/chfn.c:593 src/chsh.c:432 +#: src/chfn.c:592 src/chsh.c:431 msgid "Cannot unlock the password file.\n" msgstr "Αδυναμία ξεκλειδώματος του αρχείου συνθηματικών\n" @@ -634,22 +634,22 @@ msgstr " msgid "Login Shell" msgstr "Κέλυφος Εισόδου" -#: src/chsh.c:274 src/chsh.c:287 +#: src/chsh.c:273 src/chsh.c:286 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Δεν μπορείτε να αλλάξετε το φλοιό για το(ν) %s.\n" -#: src/chsh.c:316 +#: src/chsh.c:315 #, c-format msgid "Changing the login shell for %s\n" msgstr "Αλλάγή του φλοιού για τον %s\n" -#: src/chsh.c:328 +#: src/chsh.c:327 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Μη έγκυρη καταχώρηση: %s\n" -#: src/chsh.c:333 +#: src/chsh.c:332 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s δεν είναι έγκυρος φλοιός.\n" @@ -885,13 +885,13 @@ msgid "usage: groupadd [-g gid [-o]] group\n" msgstr "χρήση: groupadd [-g gid [-o]] ομάδα\n" #: src/groupadd.c:173 src/groupadd.c:196 src/groupmod.c:183 src/groupmod.c:230 -#: src/useradd.c:931 src/usermod.c:512 src/usermod.c:648 +#: src/useradd.c:931 src/usermod.c:539 src/usermod.c:675 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο ομάδων\n" #: src/groupadd.c:183 src/groupadd.c:206 src/groupmod.c:199 src/useradd.c:942 -#: src/usermod.c:524 src/usermod.c:660 +#: src/usermod.c:551 src/usermod.c:687 #, c-format msgid "%s: cannot add new dbm group entry\n" msgstr "%s: αδυναμία προσθήκης νέας dbm καταχώρησης στο αρχείο ομάδων\n" @@ -930,13 +930,13 @@ msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O απαιτεί ΌΝΟΜΑ=ΤΙΜΗ\n" #: src/groupadd.c:412 src/groupdel.c:167 src/groupmod.c:403 src/useradd.c:1381 -#: src/userdel.c:303 src/usermod.c:536 +#: src/userdel.c:303 src/usermod.c:563 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: αδυναμία επανεγγραφής του αρχείου ομάδων\n" #: src/groupadd.c:418 src/groupdel.c:173 src/groupmod.c:409 src/useradd.c:1389 -#: src/userdel.c:309 src/usermod.c:673 +#: src/userdel.c:309 src/usermod.c:700 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: αδυναμία επανεγγραφής του αρχείου σκιωδών συνθηματικών ομάδων\n" @@ -1011,7 +1011,7 @@ msgstr "%s: msgid "%s: group %s is a NIS group\n" msgstr "%s: Η ομάδα %s είναι NIS ομάδα\n" -#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:989 +#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:1016 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: Ο %s είναι ο κύριος διακομιστής NIS\n" @@ -1915,7 +1915,7 @@ msgstr "%s: msgid "%s: rebuild the shadow group database\n" msgstr "%s: επανακτίστε την βάση δεδομένων των σκιωδών συνθηματικών ομάδων\n" -#: src/useradd.c:287 src/usermod.c:940 +#: src/useradd.c:287 src/usermod.c:967 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: Μη έγκυρη αριθμητική παράμετρος `%s'\n" @@ -1925,8 +1925,8 @@ msgstr "%s: msgid "%s: unknown gid %s\n" msgstr "%s: άγνωστο gid %s\n" -#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:252 -#: src/usermod.c:1071 +#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:254 +#: src/usermod.c:1098 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: άγνωστη ομάδα %s\n" @@ -1986,17 +1986,17 @@ msgstr "%s: msgid "%s: rename: %s" msgstr "%s: μετονομασία: %s" -#: src/useradd.c:662 src/usermod.c:272 +#: src/useradd.c:662 src/usermod.c:274 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: Η ομάδα `%s' είναι NIS ομάδα.\n" -#: src/useradd.c:670 src/usermod.c:280 +#: src/useradd.c:670 src/usermod.c:282 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: Προσδιορίστηκαν υπερβολικές ομάδες (μεγ. %d).\n" -#: src/useradd.c:702 src/usermod.c:312 +#: src/useradd.c:702 src/usermod.c:314 #, c-format msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "χρήση: %s\t[-u uid [-o]] [-g ομάδα] [-G ομάδα,...] \n" @@ -2007,7 +2007,7 @@ msgstr "" "\t\t[-d μητρικός_κατάλογος] [-s φλοιός] [-c σχόλιο]\n" "\t\t[-m [-k κανόνας]]\n" -#: src/useradd.c:708 src/usermod.c:318 +#: src/useradd.c:708 src/usermod.c:320 msgid "[-f inactive] [-e expire ] " msgstr "[-f ανενεργό] [-e λήξη ] " @@ -2015,7 +2015,7 @@ msgstr "[-f msgid "[-A program] " msgstr "[-A πρόγραμμα] " -#: src/useradd.c:713 src/usermod.c:323 +#: src/useradd.c:713 msgid "[-p passwd] name\n" msgstr "[-p συνθηματικό] όνομα\n" @@ -2028,22 +2028,22 @@ msgstr " %s\t-D [-g msgid "\t\t[-f inactive] [-e expire ]\n" msgstr "\t\t[-f ανενεργό] [-e λήξη ]\n" -#: src/useradd.c:815 src/usermod.c:445 +#: src/useradd.c:815 src/usermod.c:472 #, c-format msgid "%s: error locking group file\n" msgstr "%s: Σφάλμα κατά το κλείδωμα του αρχείου ομάδων\n" -#: src/useradd.c:819 src/usermod.c:450 +#: src/useradd.c:819 src/usermod.c:477 #, c-format msgid "%s: error opening group file\n" msgstr "%s: Σφάλμα κατά το άνοιγμα του αρχείου ομάδων\n" -#: src/useradd.c:824 src/usermod.c:557 +#: src/useradd.c:824 src/usermod.c:584 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: Σφάλμα κατά το κλείδωμα του αρχείου σκιωδών συνθηματικών ομάδων\n" -#: src/useradd.c:829 src/usermod.c:563 +#: src/useradd.c:829 src/usermod.c:590 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: Σφάλμα κατά το άνοιγμα του αρχείου σκιωδών συνθηματικών ομάδων\n" @@ -2058,8 +2058,8 @@ msgstr "%s: msgid "%s: can't get unique uid\n" msgstr "%s: αδυναμία ευρεσης μοναδικού uid\n" -#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1019 src/usermod.c:1030 -#: src/usermod.c:1040 src/usermod.c:1086 src/usermod.c:1121 +#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1046 src/usermod.c:1057 +#: src/usermod.c:1067 src/usermod.c:1113 src/usermod.c:1157 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: Μη έγκυρο πεδίο `%s'\n" @@ -2079,7 +2079,7 @@ msgstr "%s: msgid "%s: invalid home directory `%s'\n" msgstr "%s: Μη έγκυρος μητρικός κατάλογος χρήστη `%s'\n" -#: src/useradd.c:1191 src/usermod.c:1053 +#: src/useradd.c:1191 src/usermod.c:1080 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: Μη έγκυρη ημερομηνία `%s'\n" @@ -2104,37 +2104,37 @@ msgstr "%s: msgid "%s: invalid user name `%s'\n" msgstr "%s: Μη έγκυρο όνομα χρήστη `%s'\n" -#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1183 +#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1225 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: αδυναμία επανεγγραφής του αρχείου συνθηματικών\n" -#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1188 +#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1230 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: αδυναμία επανεγγραφής του αρχείου σκιωδών συνθηματικών\n" -#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1223 +#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1265 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: Αδυναμία κλειδώματος του αρχείου συνθηματικών\n" -#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1227 +#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1269 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: Αδυναμία ανοίγματος του αρχείου συνθηματικών\n" -#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1232 +#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1274 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n" -#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1237 +#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1279 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: αδυναμία ανοίγματος αρχείου σκιωδών συνθηματικών\n" -#: src/useradd.c:1529 src/usermod.c:1324 +#: src/useradd.c:1529 src/usermod.c:1366 #, c-format msgid "%s: error adding authentication method\n" msgstr "%s: Σφάλμα κατά την προσθήκη μεθόδου εξακρίβωσης\n" @@ -2151,14 +2151,14 @@ msgid "%s: error updating password dbm entry\n" msgstr "" "%s: Σφάλμα κατά την ανανέωση καταχωρήσεων στο dbm αρχείο συνθηματικών\n" -#: src/useradd.c:1583 src/usermod.c:1383 +#: src/useradd.c:1583 src/usermod.c:1425 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "" "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο σκιωδών " "συνθηματικών\n" -#: src/useradd.c:1599 src/usermod.c:1398 +#: src/useradd.c:1599 src/usermod.c:1440 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" msgstr "" @@ -2170,7 +2170,7 @@ msgstr "" msgid "%s: cannot create directory %s\n" msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n" -#: src/useradd.c:1708 src/usermod.c:1161 +#: src/useradd.c:1708 src/usermod.c:1203 #, c-format msgid "%s: user %s exists\n" msgstr "%s: Ο χρήστης %s υπάρχει\n" @@ -2273,12 +2273,12 @@ msgstr "%s: msgid "%s: warning: can't remove " msgstr "%s: προειδοποίηση: αδυναμία διαγραφής " -#: src/userdel.c:741 src/usermod.c:967 +#: src/userdel.c:741 src/usermod.c:994 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: Ο χρήστης %s δεν υπάρχει\n" -#: src/userdel.c:755 src/usermod.c:983 +#: src/userdel.c:755 src/usermod.c:1010 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: Ο χρήστης %s είναι NIS χρήστης\n" @@ -2300,117 +2300,122 @@ msgstr "" msgid "%s: error removing directory %s\n" msgstr "%s: Σφάλμα κατά την διαγραφή του καταλόγου %s\n" -#: src/usermod.c:315 +#: src/usermod.c:317 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "" "\t\t[-d μητρικός_κατάλογος [-m]] [-s φλοιός] [-c σχόλιο]\n" "\t\t[-l νέο_όνομα]\n" -#: src/usermod.c:321 +#: src/usermod.c:323 msgid "[-A {DEFAULT|program},... ] " msgstr "[-A {DEFAULT|πρόγραμμα},... ] " -#: src/usermod.c:477 +#: src/usermod.c:325 +#, fuzzy +msgid "[-p passwd] [-L|-U] name\n" +msgstr "[-p συνθηματικό] όνομα\n" + +#: src/usermod.c:504 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: δεν υπάρχει ελεύθερη μνήμη στο update_group\n" -#: src/usermod.c:600 +#: src/usermod.c:627 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: στο update_gshadow\n" -#: src/usermod.c:1138 +#: src/usermod.c:1180 #, c-format msgid "%s: no flags given\n" msgstr "%s: Δεν δόθηκαν ενδείξεις\n" -#: src/usermod.c:1145 +#: src/usermod.c:1187 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: σκιώδη συνθηματικά απαιτούνται για το -e και -f\n" -#: src/usermod.c:1166 +#: src/usermod.c:1208 #, c-format msgid "%s: uid %ld is not unique\n" msgstr "%s: Το uid %ld δεν είναι μοναδικό\n" -#: src/usermod.c:1314 +#: src/usermod.c:1356 #, c-format msgid "%s: error deleting authentication method\n" msgstr "%s: Σφάλμα κατά την διαγραφή μεθόδου εξακρίβωσης\n" -#: src/usermod.c:1334 +#: src/usermod.c:1376 #, c-format msgid "%s: error changing authentication method\n" msgstr "%s: Σφάλμα κατά την αλλαγή μεθόδου εξακρίβωσης\n" -#: src/usermod.c:1351 +#: src/usermod.c:1393 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: Σφάλμα κατά την αλλαγή καταχώρησης συνθηματικού\n" -#: src/usermod.c:1357 +#: src/usermod.c:1399 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο αρχείο συνθηματικών\n" -#: src/usermod.c:1365 +#: src/usermod.c:1407 #, c-format msgid "%s: error adding password dbm entry\n" msgstr "" "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο dbm αρχείο συνθηματικών\n" -#: src/usermod.c:1372 +#: src/usermod.c:1414 #, c-format msgid "%s: error removing passwd dbm entry\n" msgstr "" "%s: Σφάλμα κατά την αφαίρεση καταχώρησης από το dbm αρχείο συνθηματικών\n" -#: src/usermod.c:1389 +#: src/usermod.c:1431 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" "%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο αρχείο σκιωδών συνθηματικών\n" -#: src/usermod.c:1404 +#: src/usermod.c:1446 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" msgstr "" "%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο dbm αρχείο σκιωδών " "συνθηματικών\n" -#: src/usermod.c:1435 +#: src/usermod.c:1477 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: ο κατάλογος %s υπάρχει\n" -#: src/usermod.c:1442 +#: src/usermod.c:1484 #, c-format msgid "%s: can't create %s\n" msgstr "%s: αδυναμία δημιουργίας του %s\n" -#: src/usermod.c:1448 +#: src/usermod.c:1490 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: Αδυναμία αλλαγής ιδιοκτήτη(chown) του %s\n" -#: src/usermod.c:1464 +#: src/usermod.c:1506 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n" #. better leave it alone -#: src/usermod.c:1561 +#: src/usermod.c:1603 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: προειδοποίηση: Το %s δεν ανήκει στον %s\n" -#: src/usermod.c:1567 +#: src/usermod.c:1609 msgid "failed to change mailbox owner" msgstr "αποτυχία αλλαγής του ιδιοκτήτη του γραμματοκιβωτίου" -#: src/usermod.c:1574 +#: src/usermod.c:1616 msgid "failed to rename mailbox" msgstr "αποτυχία μετονομασίας γραμματοκιβωτίου" diff --git a/po/fr.gmo b/po/fr.gmo index bb3ab8e0f7a3bbc6d2d7e1a105e0cf82a7f5fe57..93f5fb5347b7498bc8f95aeac433e156012a3633 100644 GIT binary patch delta 25 gcmZqP$<(})X#-0Hm!+\n" "Language-Team: Vincent Renardias \n" @@ -227,7 +227,7 @@ msgstr "" msgid "Unknown error %d" msgstr "Erreur %d inconnue" -#: src/chage.c:141 +#: src/chage.c:156 #, c-format msgid "" "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -W warn ]\n" @@ -237,14 +237,14 @@ msgstr "" " [ -W avertissement ] [ -I inactif ] [ -E expire ] [ -d dernier_jour ]\n" " utilisateur\n" -#: src/chage.c:143 +#: src/chage.c:158 #, c-format msgid "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -d last_day ] user\n" msgstr "" "Usage: %s [ -l ] [ -m min_jours ] [ -M max_jours ] [ -d dernier_jour ] " "utilisateur\n" -#: src/chage.c:178 +#: src/chage.c:193 msgid "" "Enter the new value, or press return for the default\n" "\n" @@ -252,27 +252,27 @@ msgstr "" "Entrez la nouvelle valeur ou tapes Entrιe pour la valeur par dιfaut\n" "\n" -#: src/chage.c:181 +#: src/chage.c:196 msgid "Minimum Password Age" msgstr "Age minimum du mot de passe" -#: src/chage.c:186 +#: src/chage.c:201 msgid "Maximum Password Age" msgstr "Age maximum du mot de passe" -#: src/chage.c:192 +#: src/chage.c:207 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Dernier changement de mot de passe (YYYY-MM-DD)" -#: src/chage.c:201 +#: src/chage.c:216 msgid "Password Expiration Warning" msgstr "Avertissement d'expiration de mot de passe" -#: src/chage.c:206 +#: src/chage.c:221 msgid "Password Inactive" msgstr "Mot de passe dιsactivι" -#: src/chage.c:212 +#: src/chage.c:227 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Date d'expiration du compte (YYYY-MM-DD)" @@ -284,22 +284,22 @@ msgstr "Date d'expiration du compte (YYYY-MM-DD)" #. * days after the password expires that the account becomes #. * unusable. #. -#: src/chage.c:266 +#: src/chage.c:281 #, c-format msgid "Minimum:\t%ld\n" msgstr "Minimum :\t%ld\n" -#: src/chage.c:267 +#: src/chage.c:282 #, c-format msgid "Maximum:\t%ld\n" msgstr "Maximum :\t%ld\n" -#: src/chage.c:269 +#: src/chage.c:284 #, c-format msgid "Warning:\t%ld\n" msgstr "Avertissement :\t%ld\n" -#: src/chage.c:270 +#: src/chage.c:285 #, c-format msgid "Inactive:\t%ld\n" msgstr "Dιsactivι :\t%ld\n" @@ -309,11 +309,11 @@ msgstr "D #. * password was last modified. The date is the number of #. * days since 1/1/1970. #. -#: src/chage.c:279 +#: src/chage.c:294 msgid "Last Change:\t\t" msgstr "Dernier changement :\t\t" -#: src/chage.c:281 src/chage.c:295 src/chage.c:312 src/chage.c:325 +#: src/chage.c:296 src/chage.c:310 src/chage.c:327 src/chage.c:340 msgid "Never\n" msgstr "Jamais\n" @@ -322,7 +322,7 @@ msgstr "Jamais\n" #. * change date plus the number of days the password is valid #. * for. #. -#: src/chage.c:293 +#: src/chage.c:308 msgid "Password Expires:\t" msgstr "Expiration du mot de passe :\t" @@ -332,7 +332,7 @@ msgstr "Expiration du mot de passe :\t" #. * and the number of inactive days is added. The resulting date #. * is when the active will be disabled. #. -#: src/chage.c:309 +#: src/chage.c:324 #, fuzzy msgid "Password Inactive:\t" msgstr "Mot de passe dιsactivι" @@ -341,82 +341,82 @@ msgstr "Mot de passe d #. * The account will expire on the given date regardless of the #. * password expiring or not. #. -#: src/chage.c:323 +#: src/chage.c:338 #, fuzzy msgid "Account Expires:\t" msgstr "Expiration du mot de passe :\t" -#: src/chage.c:471 +#: src/chage.c:486 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s : ne pas include \"l\" avec les autres drapeaux\n" -#: src/chage.c:483 src/chage.c:595 src/login.c:529 +#: src/chage.c:498 src/chage.c:610 src/login.c:529 #, c-format msgid "%s: permission denied\n" msgstr "%s : permission refusιe\n" -#: src/chage.c:495 src/chpasswd.c:120 +#: src/chage.c:510 src/chpasswd.c:120 #, c-format msgid "%s: can't lock password file\n" msgstr "%s: impossible de vιrouiller de fichier de mots de passe\n" -#: src/chage.c:501 src/chpasswd.c:124 +#: src/chage.c:516 src/chpasswd.c:124 #, c-format msgid "%s: can't open password file\n" msgstr "%s: impossible d'ouvrir le fichier de mots de passe\n" -#: src/chage.c:508 +#: src/chage.c:523 #, c-format msgid "%s: unknown user: %s\n" msgstr "%s: utilisateur inconnu: %s\n" -#: src/chage.c:527 +#: src/chage.c:542 #, c-format msgid "%s: can't lock shadow password file\n" msgstr "%s : impossible de vιrouiller le fichier shadow password\n" -#: src/chage.c:534 +#: src/chage.c:549 #, c-format msgid "%s: can't open shadow password file\n" msgstr "%s : impossible d'ouvrir le fichier shadow password\n" -#: src/chage.c:616 +#: src/chage.c:631 #, c-format msgid "Changing the aging information for %s\n" msgstr "Changement des informations sur l'age pour %s\n" -#: src/chage.c:618 +#: src/chage.c:633 #, c-format msgid "%s: error changing fields\n" msgstr "%s : erreur lors du changement des champs\n" -#: src/chage.c:645 src/chage.c:708 src/pwunconv.c:183 +#: src/chage.c:660 src/chage.c:723 src/pwunconv.c:183 #, c-format msgid "%s: can't update password file\n" msgstr "%s : impossible de mettre ΰ jour le fichier passwd\n" -#: src/chage.c:675 src/pwunconv.c:178 +#: src/chage.c:690 src/pwunconv.c:178 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s : impossible de mettre ΰ jour le fichier shadow password\n" -#: src/chage.c:724 src/chage.c:739 src/chfn.c:571 src/chsh.c:410 +#: src/chage.c:739 src/chage.c:754 src/chfn.c:570 src/chsh.c:409 #: src/passwd.c:825 src/passwd.c:926 msgid "Error updating the DBM password entry.\n" msgstr "Erreur durant la mise ΰ jour de l'entrιe du mot de passe DBM.\n" -#: src/chage.c:756 +#: src/chage.c:771 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s : impossible de re-ιcrire le fichier shadow password\n" -#: src/chage.c:770 +#: src/chage.c:785 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s : impossible de re-ιcrire le fichier password\n" -#: src/chage.c:821 +#: src/chage.c:836 #, c-format msgid "%s: no aging information present\n" msgstr "%s : aucune information sur l'age\n" @@ -480,95 +480,95 @@ msgstr "\tT msgid "Other" msgstr "Autre" -#: src/chfn.c:299 src/chfn.c:307 src/chfn.c:315 src/chfn.c:323 src/chfn.c:331 -#: src/chfn.c:392 src/passwd.c:1226 +#: src/chfn.c:298 src/chfn.c:306 src/chfn.c:314 src/chfn.c:322 src/chfn.c:330 +#: src/chfn.c:391 src/passwd.c:1226 #, c-format msgid "%s: Permission denied.\n" msgstr "%s: Permission refusιe.\n" -#: src/chfn.c:352 src/chsh.c:225 src/passwd.c:1277 +#: src/chfn.c:351 src/chsh.c:224 src/passwd.c:1277 #, c-format msgid "%s: Unknown user %s\n" msgstr "%s: Utilisateur %s inconnu\n" -#: src/chfn.c:358 src/chsh.c:233 src/passwd.c:1207 +#: src/chfn.c:357 src/chsh.c:232 src/passwd.c:1207 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Impossible de dιterminer votre nom d'utilisateur.\n" -#: src/chfn.c:374 src/chsh.c:251 +#: src/chfn.c:373 src/chsh.c:250 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: impossible de changer l'utilisateur `%' sur le client NIS.\n" -#: src/chfn.c:379 src/chsh.c:258 +#: src/chfn.c:378 src/chsh.c:257 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' est le maξtre NIS pour ce client.\n" -#: src/chfn.c:454 +#: src/chfn.c:453 #, c-format msgid "Changing the user information for %s\n" msgstr "Changement de l'information utilisateur pour %s\n" -#: src/chfn.c:463 +#: src/chfn.c:462 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s : nom non valide : \"%s\"\n" -#: src/chfn.c:468 +#: src/chfn.c:467 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s : no de bureau non valide : \"%s\"\n" -#: src/chfn.c:473 +#: src/chfn.c:472 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s : tιlιphone du bureau non valide : \"%s\"\n" -#: src/chfn.c:478 +#: src/chfn.c:477 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s : tιlιphone perso non valide : \"%s\"\n" -#: src/chfn.c:483 +#: src/chfn.c:482 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s : \"%s\" contient des caractθres non valide\n" -#: src/chfn.c:495 +#: src/chfn.c:494 #, c-format msgid "%s: fields too long\n" msgstr "%s: champs trop longs\n" -#: src/chfn.c:510 src/chsh.c:348 src/gpasswd.c:582 src/passwd.c:1388 +#: src/chfn.c:509 src/chsh.c:347 src/gpasswd.c:582 src/passwd.c:1388 msgid "Cannot change ID to root.\n" msgstr "Impossible de changer l'ID en root.\n" -#: src/chfn.c:523 src/chsh.c:362 src/passwd.c:735 src/passwd.c:880 +#: src/chfn.c:522 src/chsh.c:361 src/passwd.c:735 src/passwd.c:880 msgid "Cannot lock the password file; try again later.\n" msgstr "" "Impossible de vιrouiller le fichier de mots de passe; essayez plus tard.\n" -#: src/chfn.c:529 src/chsh.c:368 src/passwd.c:740 src/passwd.c:885 +#: src/chfn.c:528 src/chsh.c:367 src/passwd.c:740 src/passwd.c:885 msgid "Cannot open the password file.\n" msgstr "Impossible d'ouvrir le fichier de mots de passe.\n" -#: src/chfn.c:546 src/chsh.c:383 src/passwd.c:746 src/usermod.c:1271 +#: src/chfn.c:545 src/chsh.c:382 src/passwd.c:746 src/usermod.c:1313 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s non trouvι dans /etc/passwd\n" -#: src/chfn.c:563 src/chsh.c:402 src/passwd.c:819 src/passwd.c:920 +#: src/chfn.c:562 src/chsh.c:401 src/passwd.c:819 src/passwd.c:920 #: src/passwd.c:960 msgid "Error updating the password entry.\n" msgstr "Erreur durant la mise ΰ jour du mot de passe.\n" -#: src/chfn.c:586 src/chsh.c:425 src/passwd.c:832 src/passwd.c:933 +#: src/chfn.c:585 src/chsh.c:424 src/passwd.c:832 src/passwd.c:933 msgid "Cannot commit password file changes.\n" msgstr "Impossible de valider le changement de mot de passe.\n" -#: src/chfn.c:593 src/chsh.c:432 +#: src/chfn.c:592 src/chsh.c:431 msgid "Cannot unlock the password file.\n" msgstr "Impossible de dιvιrouiller le fichier de mots de passe.\n" @@ -632,22 +632,22 @@ msgstr "Usage: %s [ -s shell ] [ nom ]\n" msgid "Login Shell" msgstr "Shell de login" -#: src/chsh.c:274 src/chsh.c:287 +#: src/chsh.c:273 src/chsh.c:286 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Vous ne pouvez pas changer le shell de %s.\n" -#: src/chsh.c:316 +#: src/chsh.c:315 #, c-format msgid "Changing the login shell for %s\n" msgstr "Changement du shell de login pour %s\n" -#: src/chsh.c:328 +#: src/chsh.c:327 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Entrιe non valide : %s\n" -#: src/chsh.c:333 +#: src/chsh.c:332 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s n'est pas un shell valide.\n" @@ -880,13 +880,13 @@ msgid "usage: groupadd [-g gid [-o]] group\n" msgstr "usage: groupadd [-g gid [-o]] groupe\n" #: src/groupadd.c:173 src/groupadd.c:196 src/groupmod.c:183 src/groupmod.c:230 -#: src/useradd.c:931 src/usermod.c:512 src/usermod.c:648 +#: src/useradd.c:931 src/usermod.c:539 src/usermod.c:675 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s : erreur durant l'addition du nouveau groupe\n" #: src/groupadd.c:183 src/groupadd.c:206 src/groupmod.c:199 src/useradd.c:942 -#: src/usermod.c:524 src/usermod.c:660 +#: src/usermod.c:551 src/usermod.c:687 #, c-format msgid "%s: cannot add new dbm group entry\n" msgstr "%s : impossible d'ajouter une nouvelle entrιe pour le groupe dbm\n" @@ -925,13 +925,13 @@ msgid "%s: -O requires NAME=VALUE\n" msgstr "%s : -O requiert NAME=VALEUR\n" #: src/groupadd.c:412 src/groupdel.c:167 src/groupmod.c:403 src/useradd.c:1381 -#: src/userdel.c:303 src/usermod.c:536 +#: src/userdel.c:303 src/usermod.c:563 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s : impossible de re-ιcrire le fichier group\n" #: src/groupadd.c:418 src/groupdel.c:173 src/groupmod.c:409 src/useradd.c:1389 -#: src/userdel.c:309 src/usermod.c:673 +#: src/userdel.c:309 src/usermod.c:700 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s : impossible de re-ιcrire le fichier shadow group\n" @@ -1003,7 +1003,7 @@ msgstr "%s : le groupe %s n'existe pas\n" msgid "%s: group %s is a NIS group\n" msgstr "%s : le groupe %s est un groupe NIS\n" -#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:989 +#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:1016 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s : %s est le maξtre NIS\n" @@ -1897,7 +1897,7 @@ msgstr "%s : reconstruction de la base de donn msgid "%s: rebuild the shadow group database\n" msgstr "%s : reconstruction de la base de donnιes des groupes shadow\n" -#: src/useradd.c:287 src/usermod.c:940 +#: src/useradd.c:287 src/usermod.c:967 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s : argument numιrique `%s' non valide\n" @@ -1907,8 +1907,8 @@ msgstr "%s : argument num msgid "%s: unknown gid %s\n" msgstr "%s : gid %s inconnu\n" -#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:252 -#: src/usermod.c:1071 +#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:254 +#: src/usermod.c:1098 #, c-format msgid "%s: unknown group %s\n" msgstr "%s : groupe %s inconnu\n" @@ -1968,17 +1968,17 @@ msgstr "%s : impossible de cr msgid "%s: rename: %s" msgstr "%s : rename : %s" -#: src/useradd.c:662 src/usermod.c:272 +#: src/useradd.c:662 src/usermod.c:274 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s : le groupe `%s' est un groupe NIS.\n" -#: src/useradd.c:670 src/usermod.c:280 +#: src/useradd.c:670 src/usermod.c:282 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s : trop de groupes spιcifiιs (max %d).\n" -#: src/useradd.c:702 src/usermod.c:312 +#: src/useradd.c:702 src/usermod.c:314 #, c-format msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Usage : %s\t[-u uid [-o]] [-g groupe] [-G groupe,...] \n" @@ -1987,7 +1987,7 @@ msgstr "Usage : %s\t[-u uid [-o]] [-g groupe] [-G groupe,...] \n" msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "\t\t[-d home] [-s shell] [-c commentaire] [-m [-k template]]\n" -#: src/useradd.c:708 src/usermod.c:318 +#: src/useradd.c:708 src/usermod.c:320 msgid "[-f inactive] [-e expire ] " msgstr "[-f inactif] [-e expire ] " @@ -1995,7 +1995,7 @@ msgstr "[-f inactif] [-e expire ] " msgid "[-A program] " msgstr "[-A program] " -#: src/useradd.c:713 src/usermod.c:323 +#: src/useradd.c:713 msgid "[-p passwd] name\n" msgstr "[-p mot-de-passe] nom\n" @@ -2008,22 +2008,22 @@ msgstr " %s\t-D [-g groupe] [-b base] [-s shell]\n" msgid "\t\t[-f inactive] [-e expire ]\n" msgstr "\t\t[-f inactif] [-e expire ]\n" -#: src/useradd.c:815 src/usermod.c:445 +#: src/useradd.c:815 src/usermod.c:472 #, c-format msgid "%s: error locking group file\n" msgstr "%s : erreur lors du vιrouillage du fichier de groupe\n" -#: src/useradd.c:819 src/usermod.c:450 +#: src/useradd.c:819 src/usermod.c:477 #, c-format msgid "%s: error opening group file\n" msgstr "%s : erreur lors d'ouverture du fichier de groupe\n" -#: src/useradd.c:824 src/usermod.c:557 +#: src/useradd.c:824 src/usermod.c:584 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s : erreur lors du vιrouillage du fichier shadow group\n" -#: src/useradd.c:829 src/usermod.c:563 +#: src/useradd.c:829 src/usermod.c:590 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s : erreur lors de l'ouverture du fichier shadow group\n" @@ -2038,8 +2038,8 @@ msgstr "%s : l'uid %d n'est pas unique\n" msgid "%s: can't get unique uid\n" msgstr "%s : impossible d'obtenir un uid unique\n" -#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1019 src/usermod.c:1030 -#: src/usermod.c:1040 src/usermod.c:1086 src/usermod.c:1121 +#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1046 src/usermod.c:1057 +#: src/usermod.c:1067 src/usermod.c:1113 src/usermod.c:1157 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s : champs `%s' non valide\n" @@ -2059,7 +2059,7 @@ msgstr "%s : commentaire `%s' non valide\n" msgid "%s: invalid home directory `%s'\n" msgstr "%s : rιpertoire personnel `%s' non valide\n" -#: src/useradd.c:1191 src/usermod.c:1053 +#: src/useradd.c:1191 src/usermod.c:1080 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s : date `%s' non valide\n" @@ -2084,37 +2084,37 @@ msgstr "%s : shell `%s' non valide\n" msgid "%s: invalid user name `%s'\n" msgstr "%s : nom d'utilisateur `%s' non valide\n" -#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1183 +#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1225 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s : impossible de reιcrire le fichier de mots de passe\n" -#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1188 +#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1230 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s : impossible de reιcrire le fichier shadow\n" -#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1223 +#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1265 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s : impossible de vιrouiller le fichier de mots de passe\n" -#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1227 +#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1269 #, c-format msgid "%s: unable to open password file\n" msgstr "%s : impossible d'ouvrir le fichier de mots de passe\n" -#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1232 +#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1274 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s : impossible de vιrouiller le fichier de mots de passe\n" -#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1237 +#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1279 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s : impossible d'ouvrir le fichier shadow\n" -#: src/useradd.c:1529 src/usermod.c:1324 +#: src/useradd.c:1529 src/usermod.c:1366 #, c-format msgid "%s: error adding authentication method\n" msgstr "%s : erreur lors de l'ajout de la mιthode d'authentification\n" @@ -2129,12 +2129,12 @@ msgstr "%s : erreur lors de l'ajout de la nouvelle entr msgid "%s: error updating password dbm entry\n" msgstr "%s : erreur lors de la mise ΰ jour de l'entrιe dbm\n" -#: src/useradd.c:1583 src/usermod.c:1383 +#: src/useradd.c:1583 src/usermod.c:1425 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s : erreur lors de l'ajout de la nouvelle entrιe shadow\n" -#: src/useradd.c:1599 src/usermod.c:1398 +#: src/useradd.c:1599 src/usermod.c:1440 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" msgstr "%s : erreur lors de la mise ΰ jour de l'entrιe shadow passwd dbm\n" @@ -2144,7 +2144,7 @@ msgstr "%s : erreur lors de la mise msgid "%s: cannot create directory %s\n" msgstr "%s : impossible de crιer le rιpertoire %s\n" -#: src/useradd.c:1708 src/usermod.c:1161 +#: src/useradd.c:1708 src/usermod.c:1203 #, c-format msgid "%s: user %s exists\n" msgstr "%s : l'utilisateur %s existe\n" @@ -2245,12 +2245,12 @@ msgstr "%s : avertissement : %s n'appartient pas msgid "%s: warning: can't remove " msgstr "%s : impossible d'enlever " -#: src/userdel.c:741 src/usermod.c:967 +#: src/userdel.c:741 src/usermod.c:994 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s : l'utilisateur %s n'existe pas\n" -#: src/userdel.c:755 src/usermod.c:983 +#: src/userdel.c:755 src/usermod.c:1010 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s : le compte %s est un compte NIS\n" @@ -2272,110 +2272,115 @@ msgstr "" msgid "%s: error removing directory %s\n" msgstr "%s : erreur lors de l'effacement du rιpertoire %s\n" -#: src/usermod.c:315 +#: src/usermod.c:317 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "\t\t[-d home [-m]] [-s shell] [-c commentaire] [-l nouveau_nom]\n" -#: src/usermod.c:321 +#: src/usermod.c:323 msgid "[-A {DEFAULT|program},... ] " msgstr "[-A {DΙFAUT|programme},... ] " -#: src/usermod.c:477 +#: src/usermod.c:325 +#, fuzzy +msgid "[-p passwd] [-L|-U] name\n" +msgstr "[-p mot-de-passe] nom\n" + +#: src/usermod.c:504 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s : plus de mιmoire pour update_group\n" -#: src/usermod.c:600 +#: src/usermod.c:627 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s : plus de mιmoire pour update_gshadow\n" -#: src/usermod.c:1138 +#: src/usermod.c:1180 #, c-format msgid "%s: no flags given\n" msgstr "%s : aucun drapeau donnι\n" -#: src/usermod.c:1145 +#: src/usermod.c:1187 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s : mots de passe shadow nιcessaires pour -e ou -f\n" -#: src/usermod.c:1166 +#: src/usermod.c:1208 #, c-format msgid "%s: uid %ld is not unique\n" msgstr "%s : l'uid %ld n'est pas unique\n" -#: src/usermod.c:1314 +#: src/usermod.c:1356 #, c-format msgid "%s: error deleting authentication method\n" msgstr "%s : erreur lors de l'effacement de la mιthode d'authentification\n" -#: src/usermod.c:1334 +#: src/usermod.c:1376 #, c-format msgid "%s: error changing authentication method\n" msgstr "%s : erreur lors du changement de la mιthode d'authentification\n" -#: src/usermod.c:1351 +#: src/usermod.c:1393 #, c-format msgid "%s: error changing password entry\n" msgstr "%s : erreur lors du changement de l'entrιe dans /etc/passwd\n" -#: src/usermod.c:1357 +#: src/usermod.c:1399 #, c-format msgid "%s: error removing password entry\n" msgstr "%s : erreur lors de l'effacement du mot de passe\n" -#: src/usermod.c:1365 +#: src/usermod.c:1407 #, c-format msgid "%s: error adding password dbm entry\n" msgstr "" -#: src/usermod.c:1372 +#: src/usermod.c:1414 #, c-format msgid "%s: error removing passwd dbm entry\n" msgstr "" -#: src/usermod.c:1389 +#: src/usermod.c:1431 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" -#: src/usermod.c:1404 +#: src/usermod.c:1446 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" msgstr "" -#: src/usermod.c:1435 +#: src/usermod.c:1477 #, c-format msgid "%s: directory %s exists\n" msgstr "%s : le rιpertoire %s existe\n" -#: src/usermod.c:1442 +#: src/usermod.c:1484 #, c-format msgid "%s: can't create %s\n" msgstr "%s : impossible de crιer %s\n" -#: src/usermod.c:1448 +#: src/usermod.c:1490 #, c-format msgid "%s: can't chown %s\n" msgstr "%s : impossible de changer le propriθtaire de %s\n" -#: src/usermod.c:1464 +#: src/usermod.c:1506 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s : impossible de renommer le rιpertoire %s en %s\n" #. better leave it alone -#: src/usermod.c:1561 +#: src/usermod.c:1603 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s : avertissement : %s n'appartient pas ΰ %s\n" -#: src/usermod.c:1567 +#: src/usermod.c:1609 msgid "failed to change mailbox owner" msgstr "ιchec du changement de propriθtaire de la mailbox" -#: src/usermod.c:1574 +#: src/usermod.c:1616 msgid "failed to rename mailbox" msgstr "ιchec du renommage de la mailbox" diff --git a/po/pl.gmo b/po/pl.gmo index 5e395ff789746f854f95757ec511b538e084fe39..e4ee08ef4efb807f38e7443a552d5e20ed6be36c 100644 GIT binary patch delta 25 hcmX@Ohw0!RrVU4;xh!=Jj1-IvtV|3xpNlSb0sw\n" "Language-Team: PL \n" @@ -225,7 +225,7 @@ msgstr "" msgid "Unknown error %d" msgstr "Nieznany b³±d %d" -#: src/chage.c:141 +#: src/chage.c:156 #, c-format msgid "" "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -W warn ]\n" @@ -234,14 +234,14 @@ msgstr "" "UΏycie: %s [ -l ] [ -m min_dni ] [ -M maks_dni ] [ -W ostrzeΏ ]\n" " [ -I nieaktywne ] [ -E utrata_waΏno¶ci ] [ -d ostatni_dzieρ ] uΏytkownik\n" -#: src/chage.c:143 +#: src/chage.c:158 #, c-format msgid "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -d last_day ] user\n" msgstr "" "UΏycie: %s [ -l ] [ -m min_dni ] [ -M maks_dni ] [ -d ostatni_dzieρ ] " "uΏytkownik\n" -#: src/chage.c:178 +#: src/chage.c:193 msgid "" "Enter the new value, or press return for the default\n" "\n" @@ -249,27 +249,27 @@ msgstr "" "Wpisz now± warto¶ζ lub wci¶nij return by przyj±c warto¶ζ domy¶ln±\n" "\n" -#: src/chage.c:181 +#: src/chage.c:196 msgid "Minimum Password Age" msgstr "Minimalny wiek has³a" -#: src/chage.c:186 +#: src/chage.c:201 msgid "Maximum Password Age" msgstr "Maksymalny wiek has³a" -#: src/chage.c:192 +#: src/chage.c:207 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Ostatnia zmiana has³a (RRRR-MM-DD)" -#: src/chage.c:201 +#: src/chage.c:216 msgid "Password Expiration Warning" msgstr "OstrzeΏenie o utracie waΏno¶ci has³a" -#: src/chage.c:206 +#: src/chage.c:221 msgid "Password Inactive" msgstr "Has³o nieaktywne" -#: src/chage.c:212 +#: src/chage.c:227 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Data utraty waΏno¶ci konta (RRRR-MM-DD)" @@ -281,22 +281,22 @@ msgstr "Data utraty wa #. * days after the password expires that the account becomes #. * unusable. #. -#: src/chage.c:266 +#: src/chage.c:281 #, c-format msgid "Minimum:\t%ld\n" msgstr "Minimum:\t%ld\n" -#: src/chage.c:267 +#: src/chage.c:282 #, c-format msgid "Maximum:\t%ld\n" msgstr "Maksimim:\t%ld\n" -#: src/chage.c:269 +#: src/chage.c:284 #, c-format msgid "Warning:\t%ld\n" msgstr "OstrzeΏenie:\t%ld\n" -#: src/chage.c:270 +#: src/chage.c:285 #, c-format msgid "Inactive:\t%ld\n" msgstr "Nieaktywne:\t%ld\n" @@ -306,11 +306,11 @@ msgstr "Nieaktywne:\t%ld\n" #. * password was last modified. The date is the number of #. * days since 1/1/1970. #. -#: src/chage.c:279 +#: src/chage.c:294 msgid "Last Change:\t\t" msgstr "Ostatnia zmiana:\t\t" -#: src/chage.c:281 src/chage.c:295 src/chage.c:312 src/chage.c:325 +#: src/chage.c:296 src/chage.c:310 src/chage.c:327 src/chage.c:340 msgid "Never\n" msgstr "Nigdy\n" @@ -319,7 +319,7 @@ msgstr "Nigdy\n" #. * change date plus the number of days the password is valid #. * for. #. -#: src/chage.c:293 +#: src/chage.c:308 msgid "Password Expires:\t" msgstr "Has³o traci waΏno¶ζ:\t" @@ -329,7 +329,7 @@ msgstr "Has #. * and the number of inactive days is added. The resulting date #. * is when the active will be disabled. #. -#: src/chage.c:309 +#: src/chage.c:324 #, fuzzy msgid "Password Inactive:\t" msgstr "Has³o nieaktywne:\t" @@ -338,82 +338,82 @@ msgstr "Has #. * The account will expire on the given date regardless of the #. * password expiring or not. #. -#: src/chage.c:323 +#: src/chage.c:338 #, fuzzy msgid "Account Expires:\t" msgstr "Has³o traci waΏno¶ζ:\t" -#: src/chage.c:471 +#: src/chage.c:486 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: nie ³±cz \"l\" z innymi flagami\n" -#: src/chage.c:483 src/chage.c:595 src/login.c:529 +#: src/chage.c:498 src/chage.c:610 src/login.c:529 #, c-format msgid "%s: permission denied\n" msgstr "%s: odmowa dostκpu\n" -#: src/chage.c:495 src/chpasswd.c:120 +#: src/chage.c:510 src/chpasswd.c:120 #, c-format msgid "%s: can't lock password file\n" msgstr "%s: nie mogκ zablokowaζ pliku z has³ami\n" -#: src/chage.c:501 src/chpasswd.c:124 +#: src/chage.c:516 src/chpasswd.c:124 #, c-format msgid "%s: can't open password file\n" msgstr "%s: nie mogκ otworzyζ pliku z has³ami\n" -#: src/chage.c:508 +#: src/chage.c:523 #, c-format msgid "%s: unknown user: %s\n" msgstr "%s: nieznany uΏytkownik: %s\n" -#: src/chage.c:527 +#: src/chage.c:542 #, c-format msgid "%s: can't lock shadow password file\n" msgstr "%s: nie mogκ zablokowaζ pliku z ukrytymi has³ami\n" -#: src/chage.c:534 +#: src/chage.c:549 #, c-format msgid "%s: can't open shadow password file\n" msgstr "%s: nie mogκ otworzyζ pliku z ukrytymi has³ami\n" -#: src/chage.c:616 +#: src/chage.c:631 #, c-format msgid "Changing the aging information for %s\n" msgstr "Zmieniam informacjκ o uΏytkowniku %s\n" -#: src/chage.c:618 +#: src/chage.c:633 #, c-format msgid "%s: error changing fields\n" msgstr "%s: b³±d podczas zmieniania pσl\n" -#: src/chage.c:645 src/chage.c:708 src/pwunconv.c:183 +#: src/chage.c:660 src/chage.c:723 src/pwunconv.c:183 #, c-format msgid "%s: can't update password file\n" msgstr "%s: nie mogκ zaktualizowaζ pliku z has³ami\n" -#: src/chage.c:675 src/pwunconv.c:178 +#: src/chage.c:690 src/pwunconv.c:178 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: nie mogκ zaktualizowaζ pliku z ukrytymi has³ami\n" -#: src/chage.c:724 src/chage.c:739 src/chfn.c:571 src/chsh.c:410 +#: src/chage.c:739 src/chage.c:754 src/chfn.c:570 src/chsh.c:409 #: src/passwd.c:825 src/passwd.c:926 msgid "Error updating the DBM password entry.\n" msgstr "B³±d podczas aktualizacki bazy hase³ DBM.\n" -#: src/chage.c:756 +#: src/chage.c:771 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: nie mogκ przepisaζ pliku z ukrytymi has³ami\n" -#: src/chage.c:770 +#: src/chage.c:785 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: nie mogκ przepisaζ pliku z has³ami\n" -#: src/chage.c:821 +#: src/chage.c:836 #, c-format msgid "%s: no aging information present\n" msgstr "%s: brak informacji\n" @@ -479,94 +479,94 @@ msgstr "\tTelefon domowy: %s\n" msgid "Other" msgstr "Inne" -#: src/chfn.c:299 src/chfn.c:307 src/chfn.c:315 src/chfn.c:323 src/chfn.c:331 -#: src/chfn.c:392 src/passwd.c:1226 +#: src/chfn.c:298 src/chfn.c:306 src/chfn.c:314 src/chfn.c:322 src/chfn.c:330 +#: src/chfn.c:391 src/passwd.c:1226 #, c-format msgid "%s: Permission denied.\n" msgstr "%s: Brak praw dostκpu.\n" -#: src/chfn.c:352 src/chsh.c:225 src/passwd.c:1277 +#: src/chfn.c:351 src/chsh.c:224 src/passwd.c:1277 #, c-format msgid "%s: Unknown user %s\n" msgstr "%s: Nieznany uΏytkownik %s\n" -#: src/chfn.c:358 src/chsh.c:233 src/passwd.c:1207 +#: src/chfn.c:357 src/chsh.c:232 src/passwd.c:1207 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Nie mogκ ustaliζ twojej nazwy uΏytkownika.\n" -#: src/chfn.c:374 src/chsh.c:251 +#: src/chfn.c:373 src/chsh.c:250 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: nie mogκ zmieniζ uΏytkownika `%s' na kliencie NIS.\n" -#: src/chfn.c:379 src/chsh.c:258 +#: src/chfn.c:378 src/chsh.c:257 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' jest nadrzκdnym serwerm NIS dla tego klienta.\n" -#: src/chfn.c:454 +#: src/chfn.c:453 #, c-format msgid "Changing the user information for %s\n" msgstr "Zmieniam informacjκ o uΏytkowniku %s\n" -#: src/chfn.c:463 +#: src/chfn.c:462 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: nieprawid³owa nazwa: \"%s\"\n" -#: src/chfn.c:468 +#: src/chfn.c:467 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: nieprawid³owy numer pokoju: \"%s\"\n" -#: src/chfn.c:473 +#: src/chfn.c:472 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: nieprawid³owy numer telefonu do pracy: \"%s\"\n" -#: src/chfn.c:478 +#: src/chfn.c:477 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: nieprawid³owy numer telefonu domowego: \"%s\"\n" -#: src/chfn.c:483 +#: src/chfn.c:482 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" zawiera nieprawid³owe znaki\n" -#: src/chfn.c:495 +#: src/chfn.c:494 #, c-format msgid "%s: fields too long\n" msgstr "%s: pola zbyt d³ugie\n" -#: src/chfn.c:510 src/chsh.c:348 src/gpasswd.c:582 src/passwd.c:1388 +#: src/chfn.c:509 src/chsh.c:347 src/gpasswd.c:582 src/passwd.c:1388 msgid "Cannot change ID to root.\n" msgstr "Nie mogκ zmieniζ ID na root.\n" -#: src/chfn.c:523 src/chsh.c:362 src/passwd.c:735 src/passwd.c:880 +#: src/chfn.c:522 src/chsh.c:361 src/passwd.c:735 src/passwd.c:880 msgid "Cannot lock the password file; try again later.\n" msgstr "Nie mogκ zablokowaζ pliku z has³ami; sprσbuj pσΌniej.\n" -#: src/chfn.c:529 src/chsh.c:368 src/passwd.c:740 src/passwd.c:885 +#: src/chfn.c:528 src/chsh.c:367 src/passwd.c:740 src/passwd.c:885 msgid "Cannot open the password file.\n" msgstr "Nie mogκ otworzyζ pliku z has³ami.\n" -#: src/chfn.c:546 src/chsh.c:383 src/passwd.c:746 src/usermod.c:1271 +#: src/chfn.c:545 src/chsh.c:382 src/passwd.c:746 src/usermod.c:1313 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s nie znaleziony w /etc/passwd\n" -#: src/chfn.c:563 src/chsh.c:402 src/passwd.c:819 src/passwd.c:920 +#: src/chfn.c:562 src/chsh.c:401 src/passwd.c:819 src/passwd.c:920 #: src/passwd.c:960 msgid "Error updating the password entry.\n" msgstr "B³±d podczas aktualizacji wpisu do bazy hase³.\n" -#: src/chfn.c:586 src/chsh.c:425 src/passwd.c:832 src/passwd.c:933 +#: src/chfn.c:585 src/chsh.c:424 src/passwd.c:832 src/passwd.c:933 msgid "Cannot commit password file changes.\n" msgstr "Wprowadzenie zmian do pliku passwd jest niemoΏliwe.\n" -#: src/chfn.c:593 src/chsh.c:432 +#: src/chfn.c:592 src/chsh.c:431 msgid "Cannot unlock the password file.\n" msgstr "Nie mogκ usun±c blokady z pliku z has³ami.\n" @@ -630,22 +630,22 @@ msgstr "U msgid "Login Shell" msgstr "Pow³oka logowania" -#: src/chsh.c:274 src/chsh.c:287 +#: src/chsh.c:273 src/chsh.c:286 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Nie moΏesz zmieniaζ pow³oki dla %s.\n" -#: src/chsh.c:316 +#: src/chsh.c:315 #, c-format msgid "Changing the login shell for %s\n" msgstr "Zmieniam pow³okκ logowania dla %s\n" -#: src/chsh.c:328 +#: src/chsh.c:327 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Nieprawid³owy wpis: %s\n" -#: src/chsh.c:333 +#: src/chsh.c:332 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s jest nieprawid³ow± pow³ok±.\n" @@ -878,13 +878,13 @@ msgid "usage: groupadd [-g gid [-o]] group\n" msgstr "uΏycie: groupadd [-g gid [-o]] grupa\n" #: src/groupadd.c:173 src/groupadd.c:196 src/groupmod.c:183 src/groupmod.c:230 -#: src/useradd.c:931 src/usermod.c:512 src/usermod.c:648 +#: src/useradd.c:931 src/usermod.c:539 src/usermod.c:675 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: b³±d podczas dodawania nowej grupy\n" #: src/groupadd.c:183 src/groupadd.c:206 src/groupmod.c:199 src/useradd.c:942 -#: src/usermod.c:524 src/usermod.c:660 +#: src/usermod.c:551 src/usermod.c:687 #, c-format msgid "%s: cannot add new dbm group entry\n" msgstr "%s: nie mogκ dodaζ nowego wpisu do bazy dbm grup\n" @@ -923,13 +923,13 @@ msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O wymaga ZMIENNA=WARTO¦Ζ\n" #: src/groupadd.c:412 src/groupdel.c:167 src/groupmod.c:403 src/useradd.c:1381 -#: src/userdel.c:303 src/usermod.c:536 +#: src/userdel.c:303 src/usermod.c:563 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: nie mogκ przepisaζ pliku z grupami\n" #: src/groupadd.c:418 src/groupdel.c:173 src/groupmod.c:409 src/useradd.c:1389 -#: src/userdel.c:309 src/usermod.c:673 +#: src/userdel.c:309 src/usermod.c:700 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: nie mogκ przepisaζ pliku z ukrytymi grupami\n" @@ -1001,7 +1001,7 @@ msgstr "%s: grupa %s nie isnieje\n" msgid "%s: group %s is a NIS group\n" msgstr "%s: grupa %s jest grup± NIS\n" -#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:989 +#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:1016 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s jest g³σwnym serwerem NIS\n" @@ -1890,7 +1890,7 @@ msgstr "%s: przebuduj baz msgid "%s: rebuild the shadow group database\n" msgstr "%s: przebuduj bazκ przes³oniκtych hase³\n" -#: src/useradd.c:287 src/usermod.c:940 +#: src/useradd.c:287 src/usermod.c:967 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: nieprawid³owy argument numeryczny `%s'\n" @@ -1900,8 +1900,8 @@ msgstr "%s: nieprawid msgid "%s: unknown gid %s\n" msgstr "%s: nieznany gid %s\n" -#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:252 -#: src/usermod.c:1071 +#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:254 +#: src/usermod.c:1098 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: nieznana grupa %s\n" @@ -1961,17 +1961,17 @@ msgstr "%s: nie mog msgid "%s: rename: %s" msgstr "%s: zmiana nazwy: %s" -#: src/useradd.c:662 src/usermod.c:272 +#: src/useradd.c:662 src/usermod.c:274 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: grupa `%s' jest grup± NIS.\n" -#: src/useradd.c:670 src/usermod.c:280 +#: src/useradd.c:670 src/usermod.c:282 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: podano zbyt wiele grup (maks %d).\n" -#: src/useradd.c:702 src/usermod.c:312 +#: src/useradd.c:702 src/usermod.c:314 #, c-format msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "uΏycie: %s\t[-u uid [-o]] [-g grupa] [-G grupa,...] \n" @@ -1980,7 +1980,7 @@ msgstr "u msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "\t\t[-d kat_dom] [-s pow³oka] [-c komentarz] [-m [-k wzσr]]\n" -#: src/useradd.c:708 src/usermod.c:318 +#: src/useradd.c:708 src/usermod.c:320 msgid "[-f inactive] [-e expire ] " msgstr "[-f nieaktywne] [-e utrata_waΏno¶ci ]" @@ -1988,7 +1988,7 @@ msgstr "[-f nieaktywne] [-e utrata_wa msgid "[-A program] " msgstr "[-A program] " -#: src/useradd.c:713 src/usermod.c:323 +#: src/useradd.c:713 msgid "[-p passwd] name\n" msgstr "[-p has³o] nazwa\n" @@ -2001,22 +2001,22 @@ msgstr " %s\t-D [-g grupa] [-b baza] [-s pow msgid "\t\t[-f inactive] [-e expire ]\n" msgstr "\t\t[-f nieaktywne] [-e utrata_waΏno¶ci ]\n" -#: src/useradd.c:815 src/usermod.c:445 +#: src/useradd.c:815 src/usermod.c:472 #, c-format msgid "%s: error locking group file\n" msgstr "%s: b³±d podczas blokowania pliku z grupami\n" -#: src/useradd.c:819 src/usermod.c:450 +#: src/useradd.c:819 src/usermod.c:477 #, c-format msgid "%s: error opening group file\n" msgstr "%s: b³±d podczas otwierania pliku z grupami\n" -#: src/useradd.c:824 src/usermod.c:557 +#: src/useradd.c:824 src/usermod.c:584 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: b³±d podczas blokowania pliku z ukrytymi has³ami\n" -#: src/useradd.c:829 src/usermod.c:563 +#: src/useradd.c:829 src/usermod.c:590 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: b³±d podczas otwierania pliku z ukrytymi grupami\n" @@ -2031,8 +2031,8 @@ msgstr "%s: uid %d nie jest niepowtarzalny\n" msgid "%s: can't get unique uid\n" msgstr "%s: nie mogκ uzyskaζ niepowtarzalnego uid\n" -#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1019 src/usermod.c:1030 -#: src/usermod.c:1040 src/usermod.c:1086 src/usermod.c:1121 +#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1046 src/usermod.c:1057 +#: src/usermod.c:1067 src/usermod.c:1113 src/usermod.c:1157 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: nieprawid³owe pole `%s'\n" @@ -2052,7 +2052,7 @@ msgstr "%s: nieprawid msgid "%s: invalid home directory `%s'\n" msgstr "%s: nieprawid³owy katalog domowy `%s'\n" -#: src/useradd.c:1191 src/usermod.c:1053 +#: src/useradd.c:1191 src/usermod.c:1080 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: nieprawid³owa data `%s'\n" @@ -2077,37 +2077,37 @@ msgstr "%s: nieprawid msgid "%s: invalid user name `%s'\n" msgstr "%s: nieprawid³owa nazwa uΏytkownika `%s'\n" -#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1183 +#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1225 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: nie mogκ przepisaζ pliku z has³ami\n" -#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1188 +#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1230 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: nie mogκ przepisaζ pliku z ukrytymi has³ami\n" -#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1223 +#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1265 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: nie mogκ zablokowaζ pliku z has³ami\n" -#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1227 +#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1269 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: nie mogκ otworzyζ pliku z has³ami\n" -#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1232 +#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1274 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: nie mogκ zablokowaζ pliku z ukrytymi has³ami\n" -#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1237 +#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1279 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: nie mogκ otworzyζ pliku z ukrytymi has³ami\n" -#: src/useradd.c:1529 src/usermod.c:1324 +#: src/useradd.c:1529 src/usermod.c:1366 #, c-format msgid "%s: error adding authentication method\n" msgstr "%s: b³±d podczas dodawania metody uwierzytelniania\n" @@ -2122,12 +2122,12 @@ msgstr "%s: b msgid "%s: error updating password dbm entry\n" msgstr "%s: b³±d podczas aktualizacji wpisu dbm do pliku z has³ami\n" -#: src/useradd.c:1583 src/usermod.c:1383 +#: src/useradd.c:1583 src/usermod.c:1425 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s: b³±d podczas dodawania nowego wpisu do pliku z ukrytymi has³ami\n" -#: src/useradd.c:1599 src/usermod.c:1398 +#: src/useradd.c:1599 src/usermod.c:1440 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" msgstr "%s: b³±d podczas aktualizacji wpisu dbm do pliku z ukrytymi has³ami\n" @@ -2137,7 +2137,7 @@ msgstr "%s: b msgid "%s: cannot create directory %s\n" msgstr "%s: nie mogκ utworzyζ katalogu %s\n" -#: src/useradd.c:1708 src/usermod.c:1161 +#: src/useradd.c:1708 src/usermod.c:1203 #, c-format msgid "%s: user %s exists\n" msgstr "%s: uΏytkownik %s istnieje\n" @@ -2237,12 +2237,12 @@ msgstr "%s: ostrze msgid "%s: warning: can't remove " msgstr "%s: ostrzeΏenie: nie mogκ usun±ζ " -#: src/userdel.c:741 src/usermod.c:967 +#: src/userdel.c:741 src/usermod.c:994 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: uΏytkownik %s nie istnieje\n" -#: src/userdel.c:755 src/usermod.c:983 +#: src/userdel.c:755 src/usermod.c:1010 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: uΏytkownik %s jest uΏytkownikiem NIS\n" @@ -2262,110 +2262,115 @@ msgstr "%s: nie usuwam katalogu %s (would remove home of user %s)\n" msgid "%s: error removing directory %s\n" msgstr "%s: b³±d podczas usuwania katalogu %s\n" -#: src/usermod.c:315 +#: src/usermod.c:317 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "\t\t[-d kat_dom [-m]] [-s pow³oka] [-c komentarz] [-l nowa_nazwa]\n" -#: src/usermod.c:321 +#: src/usermod.c:323 msgid "[-A {DEFAULT|program},... ] " msgstr "[-A {DEFAULT|program},... ] " -#: src/usermod.c:477 +#: src/usermod.c:325 +#, fuzzy +msgid "[-p passwd] [-L|-U] name\n" +msgstr "[-p has³o] nazwa\n" + +#: src/usermod.c:504 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: zabrak³o pamiκci w pdate_group\n" -#: src/usermod.c:600 +#: src/usermod.c:627 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: zabrak³o pamiκci w update_gshadow\n" -#: src/usermod.c:1138 +#: src/usermod.c:1180 #, c-format msgid "%s: no flags given\n" msgstr "%s: nie podano flag\n" -#: src/usermod.c:1145 +#: src/usermod.c:1187 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: ukryte has³a wymagane dla -e i -f\n" -#: src/usermod.c:1166 +#: src/usermod.c:1208 #, c-format msgid "%s: uid %ld is not unique\n" msgstr "%s: uid %ld nie jest niepowtarzalny\n" -#: src/usermod.c:1314 +#: src/usermod.c:1356 #, c-format msgid "%s: error deleting authentication method\n" msgstr "%s: b³±d podczas usuwania metody uwierzytelniania\n" -#: src/usermod.c:1334 +#: src/usermod.c:1376 #, c-format msgid "%s: error changing authentication method\n" msgstr "%s: b³±d podczas zmiany metody uwierzytelniania\n" -#: src/usermod.c:1351 +#: src/usermod.c:1393 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: b³±d podczas zmiany wpisu w pliku z has³ami\n" -#: src/usermod.c:1357 +#: src/usermod.c:1399 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: b³±d podczas usuwania wpisu z pliku z has³ami\n" -#: src/usermod.c:1365 +#: src/usermod.c:1407 #, c-format msgid "%s: error adding password dbm entry\n" msgstr "%s: b³±d podczas dodawania wpisu dbm do pliku z has³ami\n" -#: src/usermod.c:1372 +#: src/usermod.c:1414 #, c-format msgid "%s: error removing passwd dbm entry\n" msgstr "%s: b³±d podczas usuwania wpisu dbm z pliku z has³ami\n" -#: src/usermod.c:1389 +#: src/usermod.c:1431 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: b³±d podczas usuwania wpisu z pliku z ukrytymi has³ami\n" -#: src/usermod.c:1404 +#: src/usermod.c:1446 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" msgstr "%s: b³±d podczas usuwania wpisu dbm z pliku z ukrytymi has³ami\n" -#: src/usermod.c:1435 +#: src/usermod.c:1477 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: katalog %s isnieje\n" -#: src/usermod.c:1442 +#: src/usermod.c:1484 #, c-format msgid "%s: can't create %s\n" msgstr "%s: nie mogκ utworzyζ %s\n" -#: src/usermod.c:1448 +#: src/usermod.c:1490 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: nie mogκ zmieniζ w³a¶ciciela %s\n" -#: src/usermod.c:1464 +#: src/usermod.c:1506 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: nie mogκ zmieniζ nazwy katalogu z %s na %s\n" #. better leave it alone -#: src/usermod.c:1561 +#: src/usermod.c:1603 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: ostrzeΏenie: w³a¶cicielem %s nie jest %s\n" -#: src/usermod.c:1567 +#: src/usermod.c:1609 msgid "failed to change mailbox owner" msgstr "nie powiod³a siκ zmiana w³a¶ciciela skrzynki pocztowej" -#: src/usermod.c:1574 +#: src/usermod.c:1616 msgid "failed to rename mailbox" msgstr "zmiana nazwy skrzynki pocztowej nie powiod³a siκ" diff --git a/po/shadow.pot b/po/shadow.pot index 8756bdba..7faa7116 100644 --- a/po/shadow.pot +++ b/po/shadow.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-08-26 20:28+0200\n" +"POT-Creation-Date: 2000-09-02 20:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -223,45 +223,45 @@ msgstr "" msgid "Unknown error %d" msgstr "" -#: src/chage.c:141 +#: src/chage.c:156 #, c-format msgid "" "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -W warn ]\n" " [ -I inactive ] [ -E expire ] [ -d last_day ] user\n" msgstr "" -#: src/chage.c:143 +#: src/chage.c:158 #, c-format msgid "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -d last_day ] user\n" msgstr "" -#: src/chage.c:178 +#: src/chage.c:193 msgid "" "Enter the new value, or press return for the default\n" "\n" msgstr "" -#: src/chage.c:181 +#: src/chage.c:196 msgid "Minimum Password Age" msgstr "" -#: src/chage.c:186 +#: src/chage.c:201 msgid "Maximum Password Age" msgstr "" -#: src/chage.c:192 +#: src/chage.c:207 msgid "Last Password Change (YYYY-MM-DD)" msgstr "" -#: src/chage.c:201 +#: src/chage.c:216 msgid "Password Expiration Warning" msgstr "" -#: src/chage.c:206 +#: src/chage.c:221 msgid "Password Inactive" msgstr "" -#: src/chage.c:212 +#: src/chage.c:227 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "" @@ -273,22 +273,22 @@ msgstr "" #. * days after the password expires that the account becomes #. * unusable. #. -#: src/chage.c:266 +#: src/chage.c:281 #, c-format msgid "Minimum:\t%ld\n" msgstr "" -#: src/chage.c:267 +#: src/chage.c:282 #, c-format msgid "Maximum:\t%ld\n" msgstr "" -#: src/chage.c:269 +#: src/chage.c:284 #, c-format msgid "Warning:\t%ld\n" msgstr "" -#: src/chage.c:270 +#: src/chage.c:285 #, c-format msgid "Inactive:\t%ld\n" msgstr "" @@ -298,11 +298,11 @@ msgstr "" #. * password was last modified. The date is the number of #. * days since 1/1/1970. #. -#: src/chage.c:279 +#: src/chage.c:294 msgid "Last Change:\t\t" msgstr "" -#: src/chage.c:281 src/chage.c:295 src/chage.c:312 src/chage.c:325 +#: src/chage.c:296 src/chage.c:310 src/chage.c:327 src/chage.c:340 msgid "Never\n" msgstr "" @@ -311,7 +311,7 @@ msgstr "" #. * change date plus the number of days the password is valid #. * for. #. -#: src/chage.c:293 +#: src/chage.c:308 msgid "Password Expires:\t" msgstr "" @@ -321,7 +321,7 @@ msgstr "" #. * and the number of inactive days is added. The resulting date #. * is when the active will be disabled. #. -#: src/chage.c:309 +#: src/chage.c:324 msgid "Password Inactive:\t" msgstr "" @@ -329,81 +329,81 @@ msgstr "" #. * The account will expire on the given date regardless of the #. * password expiring or not. #. -#: src/chage.c:323 +#: src/chage.c:338 msgid "Account Expires:\t" msgstr "" -#: src/chage.c:471 +#: src/chage.c:486 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "" -#: src/chage.c:483 src/chage.c:595 src/login.c:529 +#: src/chage.c:498 src/chage.c:610 src/login.c:529 #, c-format msgid "%s: permission denied\n" msgstr "" -#: src/chage.c:495 src/chpasswd.c:120 +#: src/chage.c:510 src/chpasswd.c:120 #, c-format msgid "%s: can't lock password file\n" msgstr "" -#: src/chage.c:501 src/chpasswd.c:124 +#: src/chage.c:516 src/chpasswd.c:124 #, c-format msgid "%s: can't open password file\n" msgstr "" -#: src/chage.c:508 +#: src/chage.c:523 #, c-format msgid "%s: unknown user: %s\n" msgstr "" -#: src/chage.c:527 +#: src/chage.c:542 #, c-format msgid "%s: can't lock shadow password file\n" msgstr "" -#: src/chage.c:534 +#: src/chage.c:549 #, c-format msgid "%s: can't open shadow password file\n" msgstr "" -#: src/chage.c:616 +#: src/chage.c:631 #, c-format msgid "Changing the aging information for %s\n" msgstr "" -#: src/chage.c:618 +#: src/chage.c:633 #, c-format msgid "%s: error changing fields\n" msgstr "" -#: src/chage.c:645 src/chage.c:708 src/pwunconv.c:183 +#: src/chage.c:660 src/chage.c:723 src/pwunconv.c:183 #, c-format msgid "%s: can't update password file\n" msgstr "" -#: src/chage.c:675 src/pwunconv.c:178 +#: src/chage.c:690 src/pwunconv.c:178 #, c-format msgid "%s: can't update shadow password file\n" msgstr "" -#: src/chage.c:724 src/chage.c:739 src/chfn.c:571 src/chsh.c:410 +#: src/chage.c:739 src/chage.c:754 src/chfn.c:570 src/chsh.c:409 #: src/passwd.c:825 src/passwd.c:926 msgid "Error updating the DBM password entry.\n" msgstr "" -#: src/chage.c:756 +#: src/chage.c:771 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "" -#: src/chage.c:770 +#: src/chage.c:785 #, c-format msgid "%s: can't rewrite password file\n" msgstr "" -#: src/chage.c:821 +#: src/chage.c:836 #, c-format msgid "%s: no aging information present\n" msgstr "" @@ -465,94 +465,94 @@ msgstr "" msgid "Other" msgstr "" -#: src/chfn.c:299 src/chfn.c:307 src/chfn.c:315 src/chfn.c:323 src/chfn.c:331 -#: src/chfn.c:392 src/passwd.c:1226 +#: src/chfn.c:298 src/chfn.c:306 src/chfn.c:314 src/chfn.c:322 src/chfn.c:330 +#: src/chfn.c:391 src/passwd.c:1226 #, c-format msgid "%s: Permission denied.\n" msgstr "" -#: src/chfn.c:352 src/chsh.c:225 src/passwd.c:1277 +#: src/chfn.c:351 src/chsh.c:224 src/passwd.c:1277 #, c-format msgid "%s: Unknown user %s\n" msgstr "" -#: src/chfn.c:358 src/chsh.c:233 src/passwd.c:1207 +#: src/chfn.c:357 src/chsh.c:232 src/passwd.c:1207 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "" -#: src/chfn.c:374 src/chsh.c:251 +#: src/chfn.c:373 src/chsh.c:250 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "" -#: src/chfn.c:379 src/chsh.c:258 +#: src/chfn.c:378 src/chsh.c:257 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "" -#: src/chfn.c:454 +#: src/chfn.c:453 #, c-format msgid "Changing the user information for %s\n" msgstr "" -#: src/chfn.c:463 +#: src/chfn.c:462 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "" -#: src/chfn.c:468 +#: src/chfn.c:467 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "" -#: src/chfn.c:473 +#: src/chfn.c:472 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "" -#: src/chfn.c:478 +#: src/chfn.c:477 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "" -#: src/chfn.c:483 +#: src/chfn.c:482 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "" -#: src/chfn.c:495 +#: src/chfn.c:494 #, c-format msgid "%s: fields too long\n" msgstr "" -#: src/chfn.c:510 src/chsh.c:348 src/gpasswd.c:582 src/passwd.c:1388 +#: src/chfn.c:509 src/chsh.c:347 src/gpasswd.c:582 src/passwd.c:1388 msgid "Cannot change ID to root.\n" msgstr "" -#: src/chfn.c:523 src/chsh.c:362 src/passwd.c:735 src/passwd.c:880 +#: src/chfn.c:522 src/chsh.c:361 src/passwd.c:735 src/passwd.c:880 msgid "Cannot lock the password file; try again later.\n" msgstr "" -#: src/chfn.c:529 src/chsh.c:368 src/passwd.c:740 src/passwd.c:885 +#: src/chfn.c:528 src/chsh.c:367 src/passwd.c:740 src/passwd.c:885 msgid "Cannot open the password file.\n" msgstr "" -#: src/chfn.c:546 src/chsh.c:383 src/passwd.c:746 src/usermod.c:1271 +#: src/chfn.c:545 src/chsh.c:382 src/passwd.c:746 src/usermod.c:1313 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "" -#: src/chfn.c:563 src/chsh.c:402 src/passwd.c:819 src/passwd.c:920 +#: src/chfn.c:562 src/chsh.c:401 src/passwd.c:819 src/passwd.c:920 #: src/passwd.c:960 msgid "Error updating the password entry.\n" msgstr "" -#: src/chfn.c:586 src/chsh.c:425 src/passwd.c:832 src/passwd.c:933 +#: src/chfn.c:585 src/chsh.c:424 src/passwd.c:832 src/passwd.c:933 msgid "Cannot commit password file changes.\n" msgstr "" -#: src/chfn.c:593 src/chsh.c:432 +#: src/chfn.c:592 src/chsh.c:431 msgid "Cannot unlock the password file.\n" msgstr "" @@ -616,22 +616,22 @@ msgstr "" msgid "Login Shell" msgstr "" -#: src/chsh.c:274 src/chsh.c:287 +#: src/chsh.c:273 src/chsh.c:286 #, c-format msgid "You may not change the shell for %s.\n" msgstr "" -#: src/chsh.c:316 +#: src/chsh.c:315 #, c-format msgid "Changing the login shell for %s\n" msgstr "" -#: src/chsh.c:328 +#: src/chsh.c:327 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "" -#: src/chsh.c:333 +#: src/chsh.c:332 #, c-format msgid "%s is an invalid shell.\n" msgstr "" @@ -864,13 +864,13 @@ msgid "usage: groupadd [-g gid [-o]] group\n" msgstr "" #: src/groupadd.c:173 src/groupadd.c:196 src/groupmod.c:183 src/groupmod.c:230 -#: src/useradd.c:931 src/usermod.c:512 src/usermod.c:648 +#: src/useradd.c:931 src/usermod.c:539 src/usermod.c:675 #, c-format msgid "%s: error adding new group entry\n" msgstr "" #: src/groupadd.c:183 src/groupadd.c:206 src/groupmod.c:199 src/useradd.c:942 -#: src/usermod.c:524 src/usermod.c:660 +#: src/usermod.c:551 src/usermod.c:687 #, c-format msgid "%s: cannot add new dbm group entry\n" msgstr "" @@ -909,13 +909,13 @@ msgid "%s: -O requires NAME=VALUE\n" msgstr "" #: src/groupadd.c:412 src/groupdel.c:167 src/groupmod.c:403 src/useradd.c:1381 -#: src/userdel.c:303 src/usermod.c:536 +#: src/userdel.c:303 src/usermod.c:563 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "" #: src/groupadd.c:418 src/groupdel.c:173 src/groupmod.c:409 src/useradd.c:1389 -#: src/userdel.c:309 src/usermod.c:673 +#: src/userdel.c:309 src/usermod.c:700 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "" @@ -987,7 +987,7 @@ msgstr "" msgid "%s: group %s is a NIS group\n" msgstr "" -#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:989 +#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:1016 #, c-format msgid "%s: %s is the NIS master\n" msgstr "" @@ -1857,7 +1857,7 @@ msgstr "" msgid "%s: rebuild the shadow group database\n" msgstr "" -#: src/useradd.c:287 src/usermod.c:940 +#: src/useradd.c:287 src/usermod.c:967 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "" @@ -1867,8 +1867,8 @@ msgstr "" msgid "%s: unknown gid %s\n" msgstr "" -#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:252 -#: src/usermod.c:1071 +#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:254 +#: src/usermod.c:1098 #, c-format msgid "%s: unknown group %s\n" msgstr "" @@ -1928,17 +1928,17 @@ msgstr "" msgid "%s: rename: %s" msgstr "" -#: src/useradd.c:662 src/usermod.c:272 +#: src/useradd.c:662 src/usermod.c:274 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "" -#: src/useradd.c:670 src/usermod.c:280 +#: src/useradd.c:670 src/usermod.c:282 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "" -#: src/useradd.c:702 src/usermod.c:312 +#: src/useradd.c:702 src/usermod.c:314 #, c-format msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "" @@ -1947,7 +1947,7 @@ msgstr "" msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" -#: src/useradd.c:708 src/usermod.c:318 +#: src/useradd.c:708 src/usermod.c:320 msgid "[-f inactive] [-e expire ] " msgstr "" @@ -1955,7 +1955,7 @@ msgstr "" msgid "[-A program] " msgstr "" -#: src/useradd.c:713 src/usermod.c:323 +#: src/useradd.c:713 msgid "[-p passwd] name\n" msgstr "" @@ -1968,22 +1968,22 @@ msgstr "" msgid "\t\t[-f inactive] [-e expire ]\n" msgstr "" -#: src/useradd.c:815 src/usermod.c:445 +#: src/useradd.c:815 src/usermod.c:472 #, c-format msgid "%s: error locking group file\n" msgstr "" -#: src/useradd.c:819 src/usermod.c:450 +#: src/useradd.c:819 src/usermod.c:477 #, c-format msgid "%s: error opening group file\n" msgstr "" -#: src/useradd.c:824 src/usermod.c:557 +#: src/useradd.c:824 src/usermod.c:584 #, c-format msgid "%s: error locking shadow group file\n" msgstr "" -#: src/useradd.c:829 src/usermod.c:563 +#: src/useradd.c:829 src/usermod.c:590 #, c-format msgid "%s: error opening shadow group file\n" msgstr "" @@ -1998,8 +1998,8 @@ msgstr "" msgid "%s: can't get unique uid\n" msgstr "" -#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1019 src/usermod.c:1030 -#: src/usermod.c:1040 src/usermod.c:1086 src/usermod.c:1121 +#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1046 src/usermod.c:1057 +#: src/usermod.c:1067 src/usermod.c:1113 src/usermod.c:1157 #, c-format msgid "%s: invalid field `%s'\n" msgstr "" @@ -2019,7 +2019,7 @@ msgstr "" msgid "%s: invalid home directory `%s'\n" msgstr "" -#: src/useradd.c:1191 src/usermod.c:1053 +#: src/useradd.c:1191 src/usermod.c:1080 #, c-format msgid "%s: invalid date `%s'\n" msgstr "" @@ -2044,37 +2044,37 @@ msgstr "" msgid "%s: invalid user name `%s'\n" msgstr "" -#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1183 +#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1225 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "" -#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1188 +#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1230 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "" -#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1223 +#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1265 #, c-format msgid "%s: unable to lock password file\n" msgstr "" -#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1227 +#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1269 #, c-format msgid "%s: unable to open password file\n" msgstr "" -#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1232 +#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1274 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "" -#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1237 +#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1279 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "" -#: src/useradd.c:1529 src/usermod.c:1324 +#: src/useradd.c:1529 src/usermod.c:1366 #, c-format msgid "%s: error adding authentication method\n" msgstr "" @@ -2089,12 +2089,12 @@ msgstr "" msgid "%s: error updating password dbm entry\n" msgstr "" -#: src/useradd.c:1583 src/usermod.c:1383 +#: src/useradd.c:1583 src/usermod.c:1425 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "" -#: src/useradd.c:1599 src/usermod.c:1398 +#: src/useradd.c:1599 src/usermod.c:1440 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" msgstr "" @@ -2104,7 +2104,7 @@ msgstr "" msgid "%s: cannot create directory %s\n" msgstr "" -#: src/useradd.c:1708 src/usermod.c:1161 +#: src/useradd.c:1708 src/usermod.c:1203 #, c-format msgid "%s: user %s exists\n" msgstr "" @@ -2204,12 +2204,12 @@ msgstr "" msgid "%s: warning: can't remove " msgstr "" -#: src/userdel.c:741 src/usermod.c:967 +#: src/userdel.c:741 src/usermod.c:994 #, c-format msgid "%s: user %s does not exist\n" msgstr "" -#: src/userdel.c:755 src/usermod.c:983 +#: src/userdel.c:755 src/usermod.c:1010 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "" @@ -2229,110 +2229,114 @@ msgstr "" msgid "%s: error removing directory %s\n" msgstr "" -#: src/usermod.c:315 +#: src/usermod.c:317 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "" -#: src/usermod.c:321 +#: src/usermod.c:323 msgid "[-A {DEFAULT|program},... ] " msgstr "" -#: src/usermod.c:477 +#: src/usermod.c:325 +msgid "[-p passwd] [-L|-U] name\n" +msgstr "" + +#: src/usermod.c:504 #, c-format msgid "%s: out of memory in update_group\n" msgstr "" -#: src/usermod.c:600 +#: src/usermod.c:627 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "" -#: src/usermod.c:1138 +#: src/usermod.c:1180 #, c-format msgid "%s: no flags given\n" msgstr "" -#: src/usermod.c:1145 +#: src/usermod.c:1187 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "" -#: src/usermod.c:1166 +#: src/usermod.c:1208 #, c-format msgid "%s: uid %ld is not unique\n" msgstr "" -#: src/usermod.c:1314 +#: src/usermod.c:1356 #, c-format msgid "%s: error deleting authentication method\n" msgstr "" -#: src/usermod.c:1334 +#: src/usermod.c:1376 #, c-format msgid "%s: error changing authentication method\n" msgstr "" -#: src/usermod.c:1351 +#: src/usermod.c:1393 #, c-format msgid "%s: error changing password entry\n" msgstr "" -#: src/usermod.c:1357 +#: src/usermod.c:1399 #, c-format msgid "%s: error removing password entry\n" msgstr "" -#: src/usermod.c:1365 +#: src/usermod.c:1407 #, c-format msgid "%s: error adding password dbm entry\n" msgstr "" -#: src/usermod.c:1372 +#: src/usermod.c:1414 #, c-format msgid "%s: error removing passwd dbm entry\n" msgstr "" -#: src/usermod.c:1389 +#: src/usermod.c:1431 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" -#: src/usermod.c:1404 +#: src/usermod.c:1446 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" msgstr "" -#: src/usermod.c:1435 +#: src/usermod.c:1477 #, c-format msgid "%s: directory %s exists\n" msgstr "" -#: src/usermod.c:1442 +#: src/usermod.c:1484 #, c-format msgid "%s: can't create %s\n" msgstr "" -#: src/usermod.c:1448 +#: src/usermod.c:1490 #, c-format msgid "%s: can't chown %s\n" msgstr "" -#: src/usermod.c:1464 +#: src/usermod.c:1506 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "" #. better leave it alone -#: src/usermod.c:1561 +#: src/usermod.c:1603 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "" -#: src/usermod.c:1567 +#: src/usermod.c:1609 msgid "failed to change mailbox owner" msgstr "" -#: src/usermod.c:1574 +#: src/usermod.c:1616 msgid "failed to rename mailbox" msgstr "" diff --git a/po/sv.po b/po/sv.po index 64e0eb49..2409210d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow 19990709\n" -"POT-Creation-Date: 2000-08-26 20:28+0200\n" +"POT-Creation-Date: 2000-09-02 20:40+0200\n" "PO-Revision-Date: 1999-08-16 21:20+0100\n" "Last-Translator: Kristoffer Brεnemyr \n" "Language-Team: sv \n" @@ -224,7 +224,7 @@ msgstr "" msgid "Unknown error %d" msgstr "Okδnt fel %d" -#: src/chage.c:141 +#: src/chage.c:156 #, c-format msgid "" "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -W warn ]\n" @@ -233,14 +233,14 @@ msgstr "" "Anvδndning: %s [ -l ] [ -m min_dagar ] [ -M max_dagar ] [ -W varna ]\n" " [ -I inaktiv ] [ -E utgεng ] [ -d senaste_dag ] anvδndare\n" -#: src/chage.c:143 +#: src/chage.c:158 #, c-format msgid "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -d last_day ] user\n" msgstr "" "Anvδndning: %s [ -l ] [ -m min_dagar ] [ -M max_dagar ] [ -d senaste_dag ] " "anvδndare\n" -#: src/chage.c:178 +#: src/chage.c:193 msgid "" "Enter the new value, or press return for the default\n" "\n" @@ -248,27 +248,27 @@ msgstr "" "Skriv in det nya vδrdet, eller tryck pε return fφr standardvδrdet\n" "\n" -#: src/chage.c:181 +#: src/chage.c:196 msgid "Minimum Password Age" msgstr "Minsta lφsenordsεlder" -#: src/chage.c:186 +#: src/chage.c:201 msgid "Maximum Password Age" msgstr "Hφgsta lφsenordsεlder" -#: src/chage.c:192 +#: src/chage.c:207 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Senaste lφsenordsδndring (ΕΕΕΕ-MM-DD)" -#: src/chage.c:201 +#: src/chage.c:216 msgid "Password Expiration Warning" msgstr "Lφsenords upphφrningsvarning" -#: src/chage.c:206 +#: src/chage.c:221 msgid "Password Inactive" msgstr "Lφsenord inaktivt" -#: src/chage.c:212 +#: src/chage.c:227 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Kontot upphφr (ΕΕΕΕ-MM-DD)" @@ -280,22 +280,22 @@ msgstr "Kontot upph #. * days after the password expires that the account becomes #. * unusable. #. -#: src/chage.c:266 +#: src/chage.c:281 #, c-format msgid "Minimum:\t%ld\n" msgstr "Minst:\t%ld\n" -#: src/chage.c:267 +#: src/chage.c:282 #, c-format msgid "Maximum:\t%ld\n" msgstr "Hφgst:\t%ld\n" -#: src/chage.c:269 +#: src/chage.c:284 #, c-format msgid "Warning:\t%ld\n" msgstr "Varning:\t%ld\n" -#: src/chage.c:270 +#: src/chage.c:285 #, c-format msgid "Inactive:\t%ld\n" msgstr "Inaktivt:\t%ld\n" @@ -305,11 +305,11 @@ msgstr "Inaktivt:\t%ld\n" #. * password was last modified. The date is the number of #. * days since 1/1/1970. #. -#: src/chage.c:279 +#: src/chage.c:294 msgid "Last Change:\t\t" msgstr "Senaste δndring:\t\t" -#: src/chage.c:281 src/chage.c:295 src/chage.c:312 src/chage.c:325 +#: src/chage.c:296 src/chage.c:310 src/chage.c:327 src/chage.c:340 msgid "Never\n" msgstr "Aldrig\n" @@ -318,7 +318,7 @@ msgstr "Aldrig\n" #. * change date plus the number of days the password is valid #. * for. #. -#: src/chage.c:293 +#: src/chage.c:308 msgid "Password Expires:\t" msgstr "Lφsenordet upphφr:\t" @@ -328,7 +328,7 @@ msgstr "L #. * and the number of inactive days is added. The resulting date #. * is when the active will be disabled. #. -#: src/chage.c:309 +#: src/chage.c:324 #, fuzzy msgid "Password Inactive:\t" msgstr "Lφsenord inaktivt" @@ -337,82 +337,82 @@ msgstr "L #. * The account will expire on the given date regardless of the #. * password expiring or not. #. -#: src/chage.c:323 +#: src/chage.c:338 #, fuzzy msgid "Account Expires:\t" msgstr "Lφsenordet upphφr:\t" -#: src/chage.c:471 +#: src/chage.c:486 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: inkludera inte \"l\" tillsammands med andra flaggor\n" -#: src/chage.c:483 src/chage.c:595 src/login.c:529 +#: src/chage.c:498 src/chage.c:610 src/login.c:529 #, c-format msgid "%s: permission denied\n" msgstr "%s: tillεtelse nekas\n" -#: src/chage.c:495 src/chpasswd.c:120 +#: src/chage.c:510 src/chpasswd.c:120 #, c-format msgid "%s: can't lock password file\n" msgstr "%s: kan inte lεsa lφsenordsfilen\n" -#: src/chage.c:501 src/chpasswd.c:124 +#: src/chage.c:516 src/chpasswd.c:124 #, c-format msgid "%s: can't open password file\n" msgstr "%s: kan inte φppna lφsenordsfilen\n" -#: src/chage.c:508 +#: src/chage.c:523 #, c-format msgid "%s: unknown user: %s\n" msgstr "%s: okδnd anvδndare: %s\n" -#: src/chage.c:527 +#: src/chage.c:542 #, c-format msgid "%s: can't lock shadow password file\n" msgstr "%s: kan inte lεsa skugglφsenordsfilen\n" -#: src/chage.c:534 +#: src/chage.c:549 #, c-format msgid "%s: can't open shadow password file\n" msgstr "%s: kan inte φppna skugglφsenordsfilen\n" -#: src/chage.c:616 +#: src/chage.c:631 #, c-format msgid "Changing the aging information for %s\n" msgstr "Δndrar εldringsinformation fφr %s\n" -#: src/chage.c:618 +#: src/chage.c:633 #, c-format msgid "%s: error changing fields\n" msgstr "%s: fel uppstod under byte av fδlt\n" -#: src/chage.c:645 src/chage.c:708 src/pwunconv.c:183 +#: src/chage.c:660 src/chage.c:723 src/pwunconv.c:183 #, c-format msgid "%s: can't update password file\n" msgstr "%s: kan inte uppdatera lφsenordsfilen\n" -#: src/chage.c:675 src/pwunconv.c:178 +#: src/chage.c:690 src/pwunconv.c:178 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: kan inte uppdatera skugglφsenordsfilen\n" -#: src/chage.c:724 src/chage.c:739 src/chfn.c:571 src/chsh.c:410 +#: src/chage.c:739 src/chage.c:754 src/chfn.c:570 src/chsh.c:409 #: src/passwd.c:825 src/passwd.c:926 msgid "Error updating the DBM password entry.\n" msgstr "Fel under uppdatering av DBM-lφsenordsnoteringen.\n" -#: src/chage.c:756 +#: src/chage.c:771 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: kan inte skriva om skugglφsenordsfilen\n" -#: src/chage.c:770 +#: src/chage.c:785 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: kan inte skriva om lφsenordsfilen\n" -#: src/chage.c:821 +#: src/chage.c:836 #, c-format msgid "%s: no aging information present\n" msgstr "%s: ingen εldringsinformation finns tillgδnglig\n" @@ -478,94 +478,94 @@ msgstr "\tHemtelefonnummer: %s\n" msgid "Other" msgstr "Φvrigt" -#: src/chfn.c:299 src/chfn.c:307 src/chfn.c:315 src/chfn.c:323 src/chfn.c:331 -#: src/chfn.c:392 src/passwd.c:1226 +#: src/chfn.c:298 src/chfn.c:306 src/chfn.c:314 src/chfn.c:322 src/chfn.c:330 +#: src/chfn.c:391 src/passwd.c:1226 #, c-format msgid "%s: Permission denied.\n" msgstr "%s: Tillεtelse nekas.\n" -#: src/chfn.c:352 src/chsh.c:225 src/passwd.c:1277 +#: src/chfn.c:351 src/chsh.c:224 src/passwd.c:1277 #, c-format msgid "%s: Unknown user %s\n" msgstr "%s: Okδnd anvδndare %s\n" -#: src/chfn.c:358 src/chsh.c:233 src/passwd.c:1207 +#: src/chfn.c:357 src/chsh.c:232 src/passwd.c:1207 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Kan inte avgφra ditt anvδndarnamn.\n" -#: src/chfn.c:374 src/chsh.c:251 +#: src/chfn.c:373 src/chsh.c:250 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: kan inte δndra anvδndare \"%s\" pε NIS-klienten.\n" -#: src/chfn.c:379 src/chsh.c:258 +#: src/chfn.c:378 src/chsh.c:257 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: \"%s\" δr NIS-mδstare fφr denna klient.\n" -#: src/chfn.c:454 +#: src/chfn.c:453 #, c-format msgid "Changing the user information for %s\n" msgstr "Δndrar anvδndarinformation fφr %s\n" -#: src/chfn.c:463 +#: src/chfn.c:462 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: felaktigt namn: \"%s\"\n" -#: src/chfn.c:468 +#: src/chfn.c:467 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: felaktigt rumsnummer: \"%s\"\n" -#: src/chfn.c:473 +#: src/chfn.c:472 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: felaktigt arbetstelefonnummer: \"%s\"\n" -#: src/chfn.c:478 +#: src/chfn.c:477 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: felaktigt hemtelefonnummer: \"%s\"\n" -#: src/chfn.c:483 +#: src/chfn.c:482 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" innehεller otillεtna tecken\n" -#: src/chfn.c:495 +#: src/chfn.c:494 #, c-format msgid "%s: fields too long\n" msgstr "%s: fφr lεnga fδlt\n" -#: src/chfn.c:510 src/chsh.c:348 src/gpasswd.c:582 src/passwd.c:1388 +#: src/chfn.c:509 src/chsh.c:347 src/gpasswd.c:582 src/passwd.c:1388 msgid "Cannot change ID to root.\n" msgstr "Kan inte δndra ID till root.\n" -#: src/chfn.c:523 src/chsh.c:362 src/passwd.c:735 src/passwd.c:880 +#: src/chfn.c:522 src/chsh.c:361 src/passwd.c:735 src/passwd.c:880 msgid "Cannot lock the password file; try again later.\n" msgstr "Kan inte lεsa lφsenordsfilen; fφrsφk igen senare.\n" -#: src/chfn.c:529 src/chsh.c:368 src/passwd.c:740 src/passwd.c:885 +#: src/chfn.c:528 src/chsh.c:367 src/passwd.c:740 src/passwd.c:885 msgid "Cannot open the password file.\n" msgstr "Kan inte φppna lφsenordsfilen.\n" -#: src/chfn.c:546 src/chsh.c:383 src/passwd.c:746 src/usermod.c:1271 +#: src/chfn.c:545 src/chsh.c:382 src/passwd.c:746 src/usermod.c:1313 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s hittades inte i /etc/passwd\n" -#: src/chfn.c:563 src/chsh.c:402 src/passwd.c:819 src/passwd.c:920 +#: src/chfn.c:562 src/chsh.c:401 src/passwd.c:819 src/passwd.c:920 #: src/passwd.c:960 msgid "Error updating the password entry.\n" msgstr "Fel under uppdatering av lφsenordsnoteringen.\n" -#: src/chfn.c:586 src/chsh.c:425 src/passwd.c:832 src/passwd.c:933 +#: src/chfn.c:585 src/chsh.c:424 src/passwd.c:832 src/passwd.c:933 msgid "Cannot commit password file changes.\n" msgstr "Kan inte genomfφra δndringar i lφsenordsfilen.\n" -#: src/chfn.c:593 src/chsh.c:432 +#: src/chfn.c:592 src/chsh.c:431 msgid "Cannot unlock the password file.\n" msgstr "Kan inte lεsa upp lφsenordsfilen.\n" @@ -629,22 +629,22 @@ msgstr "Anv msgid "Login Shell" msgstr "Inloggningsskal" -#: src/chsh.c:274 src/chsh.c:287 +#: src/chsh.c:273 src/chsh.c:286 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Du fεr inte δndra skal εt %s.\n" -#: src/chsh.c:316 +#: src/chsh.c:315 #, c-format msgid "Changing the login shell for %s\n" msgstr "Δndrar inloggningsskal εt %s\n" -#: src/chsh.c:328 +#: src/chsh.c:327 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Felaktig notering: %s\n" -#: src/chsh.c:333 +#: src/chsh.c:332 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s δr ett felaktigt skal.\n" @@ -878,13 +878,13 @@ msgid "usage: groupadd [-g gid [-o]] group\n" msgstr "Anvδndning: groupadd [-g gid [-o]] grupp\n" #: src/groupadd.c:173 src/groupadd.c:196 src/groupmod.c:183 src/groupmod.c:230 -#: src/useradd.c:931 src/usermod.c:512 src/usermod.c:648 +#: src/useradd.c:931 src/usermod.c:539 src/usermod.c:675 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: gick inte att lδgga till en ny gruppnotering\n" #: src/groupadd.c:183 src/groupadd.c:206 src/groupmod.c:199 src/useradd.c:942 -#: src/usermod.c:524 src/usermod.c:660 +#: src/usermod.c:551 src/usermod.c:687 #, c-format msgid "%s: cannot add new dbm group entry\n" msgstr "%s: kan inte lδgga till en ny dbm-gruppnotering\n" @@ -923,13 +923,13 @@ msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O krδver NAME=VΔRDE\n" #: src/groupadd.c:412 src/groupdel.c:167 src/groupmod.c:403 src/useradd.c:1381 -#: src/userdel.c:303 src/usermod.c:536 +#: src/userdel.c:303 src/usermod.c:563 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: kan inte skriva om gruppfilen\n" #: src/groupadd.c:418 src/groupdel.c:173 src/groupmod.c:409 src/useradd.c:1389 -#: src/userdel.c:309 src/usermod.c:673 +#: src/userdel.c:309 src/usermod.c:700 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: kan inte skriva om skuggruppfilen\n" @@ -1001,7 +1001,7 @@ msgstr "%s: grupp %s existerar inte\n" msgid "%s: group %s is a NIS group\n" msgstr "%s: grupp %s δr en NIS-grupp\n" -#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:989 +#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:1016 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s δr NIS-mδsteren\n" @@ -1889,7 +1889,7 @@ msgstr "%s: bygg om gruppdatabasen\n" msgid "%s: rebuild the shadow group database\n" msgstr "%s: bygg om skuggruppdatabasen\n" -#: src/useradd.c:287 src/usermod.c:940 +#: src/useradd.c:287 src/usermod.c:967 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: ogiltigt numeriskt argument \"%s\"\n" @@ -1899,8 +1899,8 @@ msgstr "%s: ogiltigt numeriskt argument \"%s\"\n" msgid "%s: unknown gid %s\n" msgstr "%s: okδnt gid %s\n" -#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:252 -#: src/usermod.c:1071 +#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:254 +#: src/usermod.c:1098 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: okδnd grupp %s\n" @@ -1960,17 +1960,17 @@ msgstr "%s: kan inte skapa en ny standardfil\n" msgid "%s: rename: %s" msgstr "%s: rename: %s" -#: src/useradd.c:662 src/usermod.c:272 +#: src/useradd.c:662 src/usermod.c:274 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: grupp \"%s\" δr en NIS-grupp.\n" -#: src/useradd.c:670 src/usermod.c:280 +#: src/useradd.c:670 src/usermod.c:282 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: fφr mεnga grupper speciferade (max %d).\n" -#: src/useradd.c:702 src/usermod.c:312 +#: src/useradd.c:702 src/usermod.c:314 #, c-format msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Anvδndning: %s\t[-u uid [-o]] [-g grupp] [-G grupp,...] \n" @@ -1979,7 +1979,7 @@ msgstr "Anv msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "\t\t[-d hem] [-s skal] [-c kommentar] [-m [-k mall]]\n" -#: src/useradd.c:708 src/usermod.c:318 +#: src/useradd.c:708 src/usermod.c:320 msgid "[-f inactive] [-e expire ] " msgstr "[-f inaktiv] [-e upphφr ] " @@ -1987,7 +1987,7 @@ msgstr "[-f inaktiv] [-e upph msgid "[-A program] " msgstr "[-A program] " -#: src/useradd.c:713 src/usermod.c:323 +#: src/useradd.c:713 msgid "[-p passwd] name\n" msgstr "[-p passwd] namn\n" @@ -2000,22 +2000,22 @@ msgstr " %s\t-D [-g grupp] [-b bas] [-s skal]\n" msgid "\t\t[-f inactive] [-e expire ]\n" msgstr "\t\t[-f inaktiv] [-e utgεng ]\n" -#: src/useradd.c:815 src/usermod.c:445 +#: src/useradd.c:815 src/usermod.c:472 #, c-format msgid "%s: error locking group file\n" msgstr "%s: fel under lεsning av gruppfilen\n" -#: src/useradd.c:819 src/usermod.c:450 +#: src/useradd.c:819 src/usermod.c:477 #, c-format msgid "%s: error opening group file\n" msgstr "%s: fel under φppning av gruppfilen\n" -#: src/useradd.c:824 src/usermod.c:557 +#: src/useradd.c:824 src/usermod.c:584 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: fel under lεsning av skuggruppfilen\n" -#: src/useradd.c:829 src/usermod.c:563 +#: src/useradd.c:829 src/usermod.c:590 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: fel under φppning av skuggruppfilen\n" @@ -2030,8 +2030,8 @@ msgstr "%s: uid %d msgid "%s: can't get unique uid\n" msgstr "%s: kan inte hitta ett unikt uid\n" -#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1019 src/usermod.c:1030 -#: src/usermod.c:1040 src/usermod.c:1086 src/usermod.c:1121 +#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1046 src/usermod.c:1057 +#: src/usermod.c:1067 src/usermod.c:1113 src/usermod.c:1157 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: felaktigt fδlt \"%s\"\n" @@ -2051,7 +2051,7 @@ msgstr "%s: felaktig kommentar \"%s\"\n" msgid "%s: invalid home directory `%s'\n" msgstr "%s: felaktig hemkatalog \"%s\"\n" -#: src/useradd.c:1191 src/usermod.c:1053 +#: src/useradd.c:1191 src/usermod.c:1080 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: felaktigt datum \"%s\"\n" @@ -2076,37 +2076,37 @@ msgstr "%s: felaktigt skal \"%s\"\n" msgid "%s: invalid user name `%s'\n" msgstr "%s: felaktigt anvδndar namn \"%s\"\n" -#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1183 +#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1225 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: kan inte skriva om lφsenordsfilen\n" -#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1188 +#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1230 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: kan inte skriva om skugglφsenordsfilen\n" -#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1223 +#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1265 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: kan inte lεsa lφsenordsfilen\n" -#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1227 +#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1269 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: kan inte φppna lφsenordsfilen\n" -#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1232 +#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1274 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: kan inte lεsa skugglφsenordsfilen\n" -#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1237 +#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1279 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: kan inte φppna skugglφsenordsfilen\n" -#: src/useradd.c:1529 src/usermod.c:1324 +#: src/useradd.c:1529 src/usermod.c:1366 #, c-format msgid "%s: error adding authentication method\n" msgstr "%s: fel under tillδgning av metod fφr δkthetsbevisning\n" @@ -2121,12 +2121,12 @@ msgstr "%s: fel under till msgid "%s: error updating password dbm entry\n" msgstr "%s: fel under uppdatering av dbm-lφsenordsnotering\n" -#: src/useradd.c:1583 src/usermod.c:1383 +#: src/useradd.c:1583 src/usermod.c:1425 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s: fel under tillδggning av ny skugglφsenordsnotering\n" -#: src/useradd.c:1599 src/usermod.c:1398 +#: src/useradd.c:1599 src/usermod.c:1440 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" msgstr "%s: fel under uppdatering av dbm-skugglφsenordsnotering\n" @@ -2136,7 +2136,7 @@ msgstr "%s: fel under uppdatering av dbm-skuggl msgid "%s: cannot create directory %s\n" msgstr "%s: kan inte skapa katalog %s\n" -#: src/useradd.c:1708 src/usermod.c:1161 +#: src/useradd.c:1708 src/usermod.c:1203 #, c-format msgid "%s: user %s exists\n" msgstr "%s: anvδndare %s existerar\n" @@ -2236,12 +2236,12 @@ msgstr "%s: varning: %s msgid "%s: warning: can't remove " msgstr "%s: varning: kan inte ta bort " -#: src/userdel.c:741 src/usermod.c:967 +#: src/userdel.c:741 src/usermod.c:994 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: anvδndare %s finns inte\n" -#: src/userdel.c:755 src/usermod.c:983 +#: src/userdel.c:755 src/usermod.c:1010 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: anvδndare %s δr en NIS-anvδndare\n" @@ -2261,110 +2261,115 @@ msgstr "%s: tar inte bort katalogen %s (skulle ta bort hemkatalogen f msgid "%s: error removing directory %s\n" msgstr "%s: fel under borttagning av katalogen %s\n" -#: src/usermod.c:315 +#: src/usermod.c:317 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "\t\t[-d hem [-m]] [-s skal] [-c kommentar] [-l nytt_namn]\n" -#: src/usermod.c:321 +#: src/usermod.c:323 msgid "[-A {DEFAULT|program},... ] " msgstr "[-A {DEFAULT|program},... ] " -#: src/usermod.c:477 +#: src/usermod.c:325 +#, fuzzy +msgid "[-p passwd] [-L|-U] name\n" +msgstr "[-p passwd] namn\n" + +#: src/usermod.c:504 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: slut pε minne i update_group\n" -#: src/usermod.c:600 +#: src/usermod.c:627 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: slut pε minne i update_gshadow\n" -#: src/usermod.c:1138 +#: src/usermod.c:1180 #, c-format msgid "%s: no flags given\n" msgstr "%s: inga flaggor givna\n" -#: src/usermod.c:1145 +#: src/usermod.c:1187 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: skugglφsenord krδvs fφr -e och -f\n" -#: src/usermod.c:1166 +#: src/usermod.c:1208 #, c-format msgid "%s: uid %ld is not unique\n" msgstr "%s: uid %ld δr inte unikt\n" -#: src/usermod.c:1314 +#: src/usermod.c:1356 #, c-format msgid "%s: error deleting authentication method\n" msgstr "%s: fel under borttagning av metod fφr δkthetsbevisning\n" -#: src/usermod.c:1334 +#: src/usermod.c:1376 #, c-format msgid "%s: error changing authentication method\n" msgstr "%s: fel under δndring av metod fφr δkthetsbevisning\n" -#: src/usermod.c:1351 +#: src/usermod.c:1393 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: fel under δndring av lφsenordsnotering\n" -#: src/usermod.c:1357 +#: src/usermod.c:1399 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: fel under borttagning av lφsenordsnotering\n" -#: src/usermod.c:1365 +#: src/usermod.c:1407 #, c-format msgid "%s: error adding password dbm entry\n" msgstr "%s: fel under tillδggning av dbm-lφsenordsnotering\n" -#: src/usermod.c:1372 +#: src/usermod.c:1414 #, c-format msgid "%s: error removing passwd dbm entry\n" msgstr "%s: fel under borttagning av dbm-lφsenordsnotering\n" -#: src/usermod.c:1389 +#: src/usermod.c:1431 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: fel under borttagning av skugglφsenordsnotering\n" -#: src/usermod.c:1404 +#: src/usermod.c:1446 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" msgstr "%s: fel under borttagning av dbm-skugglφsenordsnotering\n" -#: src/usermod.c:1435 +#: src/usermod.c:1477 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: katalogen %s existerar\n" -#: src/usermod.c:1442 +#: src/usermod.c:1484 #, c-format msgid "%s: can't create %s\n" msgstr "%s: kan inte skapa %s\n" -#: src/usermod.c:1448 +#: src/usermod.c:1490 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: kan inte byta δgare pε %s\n" -#: src/usermod.c:1464 +#: src/usermod.c:1506 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: kan inte byta namn pε katalogen %s till %s\n" #. better leave it alone -#: src/usermod.c:1561 +#: src/usermod.c:1603 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: varning: %s δgs inte av %s\n" -#: src/usermod.c:1567 +#: src/usermod.c:1609 msgid "failed to change mailbox owner" msgstr "kunde inte byta δgare av brevlεdan" -#: src/usermod.c:1574 +#: src/usermod.c:1616 msgid "failed to rename mailbox" msgstr "kunde inte byta namn pε brevlεdan" diff --git a/redhat/shadow-utils.spec.in b/redhat/shadow-utils.spec.in index e29f8a1b..017100bf 100644 --- a/redhat/shadow-utils.spec.in +++ b/redhat/shadow-utils.spec.in @@ -1,5 +1,8 @@ # shadow-utils.spec generated automatically from shadow-utils.spec.in -# $Id: shadow-utils.spec.in,v 1.2 1999/06/07 16:40:45 marekm Exp $ +# $Id: shadow-utils.spec.in,v 1.3 2000/09/02 18:40:43 marekm Exp $ + +# FIXME - this is out of date, please update for current Red Hat + Summary: Shadow password file utilities for Linux Name: shadow-utils Version: @VERSION@ diff --git a/src/chage.c b/src/chage.c index 9eed0da8..fd1e5d64 100644 --- a/src/chage.c +++ b/src/chage.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: chage.c,v 1.17 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: chage.c,v 1.18 2000/09/02 18:40:43 marekm Exp $") #include #include @@ -130,6 +130,21 @@ static void print_date(time_t); static void list_fields(void); static void cleanup(int); + +/* + * isnum - determine whether or not a string is a number + */ +int +isnum(const char *s) +{ + while (*s) { + if (!isdigit(*s)) + return 0; + s++; + } + return 1; +} + /* * usage - print command line syntax and exit */ @@ -390,7 +405,7 @@ main(int argc, char **argv) Prog = Basename(argv[0]); - openlog("chage", LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG("chage"); #ifdef NDBM #ifdef SHADOWPWD sp_dbm_mode = O_RDWR; @@ -427,7 +442,7 @@ main(int argc, char **argv) break; case 'd': dflg++; - if (strchr (optarg, '/')) + if (!isnum(optarg)) lastday = strtoday (optarg); else lastday = strtol (optarg, 0, 10); @@ -443,7 +458,7 @@ main(int argc, char **argv) break; case 'E': Eflg++; - if (strchr (optarg, '/')) + if (!isnum(optarg)) expdays = strtoday (optarg); else expdays = strtol (optarg, 0, 10); diff --git a/src/chfn.c b/src/chfn.c index 9bf74b66..413ff33f 100644 --- a/src/chfn.c +++ b/src/chfn.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: chfn.c,v 1.16 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: chfn.c,v 1.17 2000/09/02 18:40:43 marekm Exp $") #include #include @@ -275,13 +275,12 @@ main(int argc, char **argv) /* * Get the program name. The program name is used as a - * prefix to most error messages. It is also used as input - * to the openlog() function for error logging. + * prefix to most error messages. */ Prog = Basename(argv[0]); - openlog("chfn", LOG_PID, LOG_AUTH); + OPENLOG("chfn"); /* * The remaining arguments will be processed one by one and diff --git a/src/chsh.c b/src/chsh.c index 6f518753..fa4a7273 100644 --- a/src/chsh.c +++ b/src/chsh.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: chsh.c,v 1.16 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: chsh.c,v 1.17 2000/09/02 18:40:43 marekm Exp $") #include #include @@ -179,13 +179,12 @@ main(int argc, char **argv) /* * Get the program name. The program name is used as a - * prefix to most error messages. It is also used as input - * to the openlog() function for error logging. + * prefix to most error messages. */ Prog = Basename(argv[0]); - openlog("chsh", LOG_PID, LOG_AUTH); + OPENLOG("chsh"); /* * There is only one option, but use getopt() anyway to diff --git a/src/dpasswd.c b/src/dpasswd.c index b6baa7df..6de5ea20 100644 --- a/src/dpasswd.c +++ b/src/dpasswd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: dpasswd.c,v 1.11 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: dpasswd.c,v 1.12 2000/09/02 18:40:43 marekm Exp $") #include #include @@ -90,7 +90,7 @@ main(int argc, char **argv) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - openlog(Prog, LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(Prog); while ((opt = getopt (argc, argv, "a:d:")) != EOF) { switch (opt) { diff --git a/src/gpasswd.c b/src/gpasswd.c index 1221918d..d1bb023c 100644 --- a/src/gpasswd.c +++ b/src/gpasswd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: gpasswd.c,v 1.16 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: gpasswd.c,v 1.17 2000/09/02 18:40:43 marekm Exp $") #include #include @@ -230,9 +230,9 @@ main(int argc, char **argv) Prog = Basename(argv[0]); - openlog("gpasswd", LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); - setbuf (stdout, (char *) 0); - setbuf (stderr, (char *) 0); + OPENLOG("gpasswd"); + setbuf(stdout, NULL); + setbuf(stderr, NULL); #ifdef SHADOWGRP is_shadowgrp = sgr_file_present(); diff --git a/src/groupadd.c b/src/groupadd.c index 24200e56..cdf92334 100644 --- a/src/groupadd.c +++ b/src/groupadd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: groupadd.c,v 1.15 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: groupadd.c,v 1.16 2000/09/02 18:40:43 marekm Exp $") #include #include @@ -488,7 +488,7 @@ main(int argc, char **argv) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - openlog(Prog, LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(Prog); #ifdef SHADOWGRP is_shadow_grp = sgr_file_present(); diff --git a/src/groupdel.c b/src/groupdel.c index 38efa9a6..7ddc3922 100644 --- a/src/groupdel.c +++ b/src/groupdel.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: groupdel.c,v 1.11 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: groupdel.c,v 1.12 2000/09/02 18:40:43 marekm Exp $") #include #include @@ -279,7 +279,7 @@ main(int argc, char **argv) group_name = argv[1]; - openlog(Prog, LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(Prog); #ifdef SHADOWGRP is_shadow_grp = sgr_file_present(); diff --git a/src/groupmod.c b/src/groupmod.c index 9ed679cf..6fc9bbd9 100644 --- a/src/groupmod.c +++ b/src/groupmod.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: groupmod.c,v 1.13 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: groupmod.c,v 1.14 2000/09/02 18:40:44 marekm Exp $") #include #include @@ -474,7 +474,7 @@ main(int argc, char **argv) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - openlog(Prog, LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(Prog); #ifdef SHADOWGRP is_shadow_grp = sgr_file_present(); diff --git a/src/grpck.c b/src/grpck.c index dec6782b..50fc2eab 100644 --- a/src/grpck.c +++ b/src/grpck.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: grpck.c,v 1.13 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: grpck.c,v 1.14 2000/09/02 18:40:44 marekm Exp $") #include #include @@ -177,7 +177,7 @@ main(int argc, char **argv) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - openlog(Prog, LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(Prog); /* * Parse the command line arguments diff --git a/src/login.c b/src/login.c index 719005c0..fa5b9170 100644 --- a/src/login.c +++ b/src/login.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: login.c,v 1.17 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: login.c,v 1.18 2000/09/02 18:40:44 marekm Exp $") #include "prototypes.h" #include "defines.h" @@ -596,7 +596,7 @@ main(int argc, char **argv) preauth_flag++; #endif - openlog("login", LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG("login"); setup_tty(); diff --git a/src/logoutd.c b/src/logoutd.c index fa285f06..7d5ee566 100644 --- a/src/logoutd.c +++ b/src/logoutd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: logoutd.c,v 1.15 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: logoutd.c,v 1.16 2000/09/02 18:40:44 marekm Exp $") #include #include @@ -198,7 +198,7 @@ main(int argc, char **argv) Prog = Basename(argv[0]); - openlog(Prog, LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(Prog); /* * Scan the UTMP file once per minute looking for users that diff --git a/src/newgrp.c b/src/newgrp.c index 0b461eba..9eb2c5bf 100644 --- a/src/newgrp.c +++ b/src/newgrp.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: newgrp.c,v 1.15 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: newgrp.c,v 1.16 2000/09/02 18:40:44 marekm Exp $") #include #include @@ -114,7 +114,7 @@ main(int argc, char **argv) Prog = Basename(argv[0]); is_newgrp = (strcmp(Prog, "newgrp") == 0); - openlog(is_newgrp ? "newgrp" : "sg", LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(is_newgrp ? "newgrp" : "sg"); gid = getgid(); argc--; argv++; diff --git a/src/passwd.c b/src/passwd.c index 535af0c8..b43eb78b 100644 --- a/src/passwd.c +++ b/src/passwd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: passwd.c,v 1.19 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: passwd.c,v 1.20 2000/09/02 18:40:44 marekm Exp $") #include "prototypes.h" #include "defines.h" @@ -1038,7 +1038,7 @@ main(int argc, char **argv) sanitize_env(); - openlog("passwd", LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG("passwd"); /* * Start with the flags which cause another command to be diff --git a/src/pwck.c b/src/pwck.c index 13aec57b..00551794 100644 --- a/src/pwck.c +++ b/src/pwck.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: pwck.c,v 1.14 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: pwck.c,v 1.15 2000/09/02 18:40:44 marekm Exp $") #include #include @@ -158,7 +158,7 @@ main(int argc, char **argv) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - openlog(Prog, LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(Prog); /* * Parse the command line arguments diff --git a/src/su.c b/src/su.c index 5fc6278d..c8b88030 100644 --- a/src/su.c +++ b/src/su.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: su.c,v 1.14 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: su.c,v 1.15 2000/09/02 18:40:44 marekm Exp $") #include #include @@ -193,7 +193,7 @@ main(int argc, char **argv) Prog = Basename(argv[0]); - openlog("su", LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG("su"); initenv(); diff --git a/src/sulogin.c b/src/sulogin.c index baef1cce..e33aec62 100644 --- a/src/sulogin.c +++ b/src/sulogin.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: sulogin.c,v 1.11 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: sulogin.c,v 1.12 2000/09/02 18:40:44 marekm Exp $") #include "prototypes.h" #include "defines.h" @@ -113,7 +113,7 @@ main(int argc, char **argv) textdomain(PACKAGE); #ifdef USE_SYSLOG - openlog ("sulogin", LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG("sulogin"); #endif initenv(); if (argc > 1) { diff --git a/src/useradd.c b/src/useradd.c index a2492e07..880d854e 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: useradd.c,v 1.17 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: useradd.c,v 1.18 2000/09/02 18:40:44 marekm Exp $") #include "prototypes.h" #include "defines.h" @@ -750,7 +750,7 @@ new_pwent(struct passwd *pwent) pwent->pw_comment = (char *) ""; #endif #ifdef BSD_QUOTA - pwent->pw_quota = (char *) ""; + pwent->pw_quota = 0; #endif pwent->pw_dir = (char *) user_home; pwent->pw_shell = (char *) user_shell; @@ -1659,7 +1659,7 @@ main(int argc, char **argv) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - openlog(Prog, LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(Prog); #ifdef SHADOWPWD is_shadow_pwd = spw_file_present(); @@ -1740,6 +1740,7 @@ main(int argc, char **argv) } close_files (); + exit(E_SUCCESS); /*NOTREACHED*/ } diff --git a/src/userdel.c b/src/userdel.c index 135bede0..7637a4f1 100644 --- a/src/userdel.c +++ b/src/userdel.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: userdel.c,v 1.16 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: userdel.c,v 1.17 2000/09/02 18:40:44 marekm Exp $") #include #include @@ -690,7 +690,7 @@ main(int argc, char **argv) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - openlog(Prog, LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(Prog); #ifdef SHADOWPWD is_shadow_pwd = spw_file_present(); diff --git a/src/usermod.c b/src/usermod.c index 09d1172d..447e3c64 100644 --- a/src/usermod.c +++ b/src/usermod.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: usermod.c,v 1.18 2000/08/26 18:27:18 marekm Exp $") +RCSID(PKG_VER "$Id: usermod.c,v 1.19 2000/09/02 18:40:44 marekm Exp $") #include #include @@ -114,6 +114,8 @@ static int fflg = 0, /* days until account with expired password is locked */ eflg = 0, /* days since 1970-01-01 when account becomes expired */ #endif + Lflg = 0, /* lock the password */ + Uflg = 0, /* unlock the password */ pflg = 0, /* new encrypted password */ lflg = 0; /* new user name */ @@ -320,10 +322,41 @@ usage(void) #ifdef AUTH_METHODS fprintf(stderr, _("[-A {DEFAULT|program},... ] ")); #endif - fprintf(stderr, _("[-p passwd] name\n")); + fprintf(stderr, _("[-p passwd] [-L|-U] name\n")); exit(E_USAGE); } +/* update encrypted password string (for both shadow and non-shadow passwords) */ + +static char * +new_pw_passwd(char *pw_pass, const char *pw_name) +{ + if (Lflg && pw_pass[0] != '!') { + char *buf = xmalloc(strlen(pw_pass) + 2); + + SYSLOG((LOG_INFO, "lock user `%s' password\n", + pw_name)); + strcpy(buf, "!"); + strcat(buf, pw_pass); + pw_pass = buf; + } else if (Uflg && pw_pass[0] == '!') { + char *s; + + SYSLOG((LOG_INFO, "unlock user `%s' password\n", + pw_name)); + s = pw_pass; + while (*s) { + *s = *(s + 1); + s++; + } + } else if (pflg) { + SYSLOG((LOG_INFO, "change user `%s' password\n", + pw_name)); + pw_pass = xstrdup(user_pass); + } + return pw_pass; +} + /* * new_pwent - initialize the values in a password file entry * @@ -339,14 +372,12 @@ new_pwent(struct passwd *pwent) pwent->pw_name, user_newname)); pwent->pw_name = xstrdup (user_newname); } + #ifdef SHADOWPWD if (!is_shadow_pwd) #endif - if (pflg) { - SYSLOG((LOG_INFO, "change user `%s' password\n", - pwent->pw_name)); - pwent->pw_passwd = xstrdup(user_pass); - } + pwent->pw_passwd = new_pw_passwd(pwent->pw_passwd, pwent->pw_name); + if (uflg) { SYSLOG((LOG_INFO, "change user `%s' UID from `%d' to `%d'\n", pwent->pw_name, pwent->pw_uid, user_newid)); @@ -399,11 +430,7 @@ new_spent(struct spwd *spent) spent->sp_namp, spent->sp_expire, user_expire)); spent->sp_expire = user_expire; } - if (pflg) { - SYSLOG((LOG_INFO, "change user `%s' password\n", - spent->sp_namp)); - spent->sp_pwdp = xstrdup(user_pass); - } + spent->sp_pwdp = new_pw_passwd(spent->sp_pwdp, spent->sp_namp); } #endif /* SHADOWPWD */ @@ -1005,9 +1032,9 @@ process_flags(int argc, char **argv) } #endif #ifdef SHADOWPWD -#define FLAGS "A:u:og:G:d:s:c:mf:e:l:p:" +#define FLAGS "A:u:og:G:d:s:c:mf:e:l:p:LU" #else -#define FLAGS "A:u:og:G:d:s:c:ml:p:" +#define FLAGS "A:u:og:G:d:s:c:ml:p:LU" #endif while ((arg = getopt(argc, argv, FLAGS)) != EOF) { #undef FLAGS @@ -1099,6 +1126,12 @@ process_flags(int argc, char **argv) user_newname = optarg; break; + case 'L': + if (Uflg || pflg) + usage (); + + Lflg++; + break; case 'm': if (! dflg) usage (); @@ -1112,6 +1145,9 @@ process_flags(int argc, char **argv) oflg++; break; case 'p': + if (Lflg || Uflg) + usage (); + user_pass = optarg; pflg++; break; @@ -1129,6 +1165,12 @@ process_flags(int argc, char **argv) user_newid = get_number(optarg); uflg++; break; + case 'U': + if (Lflg && pflg) + usage (); + + Uflg++; + break; default: usage (); } @@ -1345,7 +1387,7 @@ usr_update(void) pwent.pw_passwd = user_auth; } #endif /* AUTH_METHODS */ - if (lflg || uflg || gflg || cflg || dflg || sflg || Aflg || pflg) { + if (lflg || uflg || gflg || cflg || dflg || sflg || Aflg || pflg || Lflg || Uflg) { if (! pw_update (&pwent)) { fprintf(stderr, _("%s: error changing password entry\n"), @@ -1377,7 +1419,7 @@ usr_update(void) #endif } #ifdef SHADOWPWD - if (spwd && (lflg || eflg || fflg || Aflg || pflg)) { + if (spwd && (lflg || eflg || fflg || Aflg || pflg || Lflg || Uflg)) { if (! spw_update (&spent)) { fprintf(stderr, _("%s: error adding new shadow password entry\n"), @@ -1594,7 +1636,7 @@ main(int argc, char **argv) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - openlog(Prog, LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH); + OPENLOG(Prog); #ifdef SHADOWPWD is_shadow_pwd = spw_file_present();