diff --git a/ABOUT-NLS b/ABOUT-NLS index 5fde45a0..47d5e39f 100644 --- a/ABOUT-NLS +++ b/ABOUT-NLS @@ -113,6 +113,13 @@ But in fact, some languages have dialects in different countries. For example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The country code serves to distinguish the dialects. + The locale naming convention of `LL_CC', with `LL' denoting the +language and `CC' denoting the country, is the one use on systems based +on GNU libc. On other systems, some variations of this scheme are +used, such as `LL' or `LL_CC.ENCODING'. You can get the list of +locales supported by your system for your country by running the command +`locale -a | grep '^LL''. + Not all programs have translations for all languages. By default, an English message is shown in place of a nonexistent translation. If you understand other languages, you can set up a priority list of languages. @@ -164,128 +171,422 @@ Available Packages ================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of September -2001. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a +matrix shows the current state of internationalization, as of May 2003. +The matrix shows, in regard of each package, for which languages PO +files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files bg cs da de el en eo es et fi fr gl he hr id it ja - +----------------------------------------------------+ - a2ps | [] [] [] | - bash | [] [] [] [] | - bfd | | - binutils | [] | - bison | [] [] [] [] [] | - clisp | [] [] [] [] | - cpio | [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] | - enscript | [] [] | - error | [] [] | - fetchmail | | - fileutils | [] [] [] [] [] [] [] [] | - findutils | [] [] [] [] [] [] [] [] | - flex | [] [] [] | - freetype | | - gas | | - gawk | [] [] | - gcal | | - gcc | | - gettext | [] [] [] [] [] [] [] [] [] [] | - gnupg | [] [] [] [] [] [] [] | - gprof | | - grep | [] [] [] [] [] [] [] [] | - hello | [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] [] [] | - jpilot | [] | - kbd | | - ld | [] | - libc | [] [] [] [] [] [] [] [] | - lilypond | [] | - lynx | [] [] [] [] | - m4 | [] [] [] [] [] [] [] [] | - make | [] [] [] [] [] [] | - mysecretdiary | [] | - nano | [] [] [] | - opcodes | | - parted | [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - recode | [] [] [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - sketch | | - soundtracker | [] [] [] | - sp | | - tar | [] [] [] [] [] [] [] [] | - texinfo | [] [] [] [] [] [] | - textutils | [] [] [] [] [] [] [] [] | - util-linux | [] [] | - wdiff | [] [] [] | - wget | [] [] [] [] [] [] [] [] [] [] | - +----------------------------------------------------+ - bg cs da de el en eo es et fi fr gl he hr id it ja - 0 14 24 32 11 1 8 23 13 1 33 22 4 0 7 9 18 + Ready PO files am az be bg ca cs da de el en en_GB eo es + +-------------------------------------------+ + a2ps | [] [] [] [] | + aegis | () | + anubis | | + ap-utils | | + bash | [] [] [] | + batchelor | | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] | + bluez-pin | [] [] | + clisp | | + clisp | [] [] [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + darkstat | () [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + error | [] [] [] [] [] | + fetchmail | [] () [] [] [] [] | + fileutils | [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] [] [] [] | + gas | [] | + gawk | [] [] [] [] | + gcal | [] | + gcc | [] [] | + gettext | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] | + gimp-print | [] [] [] [] [] | + gliv | | + glunarclock | [] [] [] | + gnucash | () [] | + gnucash-glossary | [] () [] | + gnupg | [] () [] [] [] [] | + gpe-calendar | [] | + gpe-conf | [] | + gpe-contacts | [] | + gpe-edit | | + gpe-login | [] | + gpe-ownerinfo | [] | + gpe-sketchbook | [] | + gpe-timesheet | | + gpe-today | [] | + gpe-todo | [] | + gphoto2 | [] [] [] [] | + gprof | [] [] | + gpsdrive | () () () | + grep | [] [] [] [] [] | + gretl | [] | + hello | [] [] [] [] [] [] | + id-utils | [] [] | + indent | [] [] [] [] | + jpilot | [] [] [] [] | + jwhois | [] | + kbd | [] [] [] [] [] | + ld | [] [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] | + libiconv | [] [] [] [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lingoteach_lessons | () () | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] | + man-db | [] () [] [] () | + mysecretdiary | [] [] [] | + nano | [] () [] [] [] | + nano_1_0 | [] () [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] [] | + ptx | [] [] [] [] [] | + python | | + radius | | + recode | [] [] [] [] [] [] | + screem | | + sed | [] [] [] [] [] | + sh-utils | [] [] [] | + sharutils | [] [] [] [] [] [] | + sketch | [] () [] | + soundtracker | [] [] [] | + sp | [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] | + tin | () () | + util-linux | [] [] [] [] [] | + vorbis-tools | [] [] [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] [] [] [] [] [] | + xchat | [] [] [] | + xpad | | + +-------------------------------------------+ + am az be bg ca cs da de el en en_GB eo es + 0 1 4 2 31 17 54 60 14 1 4 12 56 - ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh - +----------------------------------------------------+ - a2ps | [] [] [] | 6 - bash | | 4 - bfd | | 0 - binutils | | 1 - bison | [] | 6 - clisp | [] | 5 - cpio | [] [] [] [] [] | 10 - diffutils | [] [] [] [] | 11 - enscript | [] [] [] | 5 - error | [] [] | 4 - fetchmail | | 0 - fileutils | [] [] [] [] [] [] [] [] [] | 17 - findutils | [] [] [] [] [] [] [] [] | 16 - flex | [] [] [] | 6 - freetype | | 0 - gas | | 0 - gawk | [] | 3 - gcal | | 0 - gcc | | 0 - gettext | [] [] [] [] [] [] [] [] | 18 - gnupg | [] [] [] | 10 - gprof | | 0 - grep | [] [] [] [] | 12 - hello | [] [] [] [] [] [] [] [] [] [] [] | 22 - id-utils | [] [] [] | 6 - indent | [] [] [] [] [] [] [] | 12 - jpilot | | 1 - kbd | [] | 1 - ld | | 1 - libc | [] [] [] [] [] [] [] [] | 16 - lilypond | [] [] | 3 - lynx | [] [] [] [] | 8 - m4 | [] [] [] [] | 12 - make | [] [] [] [] [] [] | 12 - mysecretdiary | | 1 - nano | [] | 4 - opcodes | [] | 1 - parted | [] [] | 5 - ptx | [] [] [] [] [] [] [] [] | 15 - python | | 0 - recode | [] [] [] [] | 13 - sed | [] [] [] [] [] [] [] | 19 - sh-utils | [] [] [] [] [] [] [] [] [] [] [] | 21 - sharutils | [] [] [] | 11 - sketch | | 0 - soundtracker | | 3 - sp | | 0 - tar | [] [] [] [] [] [] [] | 15 - texinfo | [] | 7 - textutils | [] [] [] [] [] [] [] [] | 16 - util-linux | [] [] | 4 - wdiff | [] [] [] [] | 7 - wget | [] [] [] [] [] [] [] | 17 - +----------------------------------------------------+ - 33 teams ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh - 53 domains 9 1 6 20 0 6 17 1 13 25 10 11 23 21 2 2 387 + et fa fi fr ga gl he hr hu id it ja ko + +----------------------------------------+ + a2ps | [] [] [] () () | + aegis | | + anubis | [] | + ap-utils | [] | + bash | [] [] | + batchelor | [] | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] [] | + bluez-pin | [] [] [] [] | + clisp | | + clisp | [] | + coreutils | [] [] [] [] | + cpio | [] [] [] [] | + darkstat | () [] [] [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | | + enscript | [] [] | + error | [] [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] [] [] [] | + flex | [] [] | + gas | [] | + gawk | [] [] | + gcal | [] | + gcc | [] | + gettext | [] [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] | + gimp-print | [] [] | + gliv | () | + glunarclock | [] [] [] [] | + gnucash | [] | + gnucash-glossary | [] | + gnupg | [] [] [] [] [] [] [] | + gpe-calendar | [] | + gpe-conf | | + gpe-contacts | [] | + gpe-edit | [] [] | + gpe-login | [] | + gpe-ownerinfo | [] [] [] | + gpe-sketchbook | [] | + gpe-timesheet | [] [] [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] | + gprof | [] [] | + gpsdrive | () [] () () | + grep | [] [] [] [] [] [] [] [] [] [] [] | + gretl | [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] [] [] [] [] [] | + jpilot | [] () | + jwhois | [] [] [] [] | + kbd | [] | + ld | [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] [] [] | + libiconv | [] [] [] [] [] [] [] [] | + lifelines | () | + lilypond | [] | + lingoteach | [] [] | + lingoteach_lessons | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | | + make | [] [] [] [] [] [] | + man-db | [] () () | + mysecretdiary | [] [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | | + recode | [] [] [] [] [] [] | + screem | | + sed | [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] | + sharutils | [] [] [] [] [] | + sketch | [] | + soundtracker | [] [] [] | + sp | [] () | + tar | [] [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] [] | + tin | [] () | + util-linux | [] [] [] [] () [] | + vorbis-tools | [] | + wastesedge | () | + wdiff | [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] | + xchat | [] [] [] | + xpad | | + +----------------------------------------+ + et fa fi fr ga gl he hr hu id it ja ko + 20 1 15 73 14 24 8 10 30 31 19 31 9 + + lg lt lv ms nb nl nn no pl pt pt_BR ro + +----------------------------------------+ + a2ps | [] [] () () () [] [] | + aegis | () | + anubis | [] [] | + ap-utils | () | + bash | [] | + batchelor | | + bfd | | + binutils | | + bison | [] [] [] [] | + bluez-pin | [] | + clisp | | + clisp | [] | + coreutils | [] | + cpio | [] [] [] | + darkstat | [] [] [] [] | + diffutils | [] [] [] | + e2fsprogs | | + enscript | [] [] | + error | [] [] | + fetchmail | () () | + fileutils | [] | + findutils | [] [] [] [] | + flex | [] | + gas | | + gawk | [] | + gcal | | + gcc | | + gettext | [] | + gettext-runtime | [] | + gettext-tools | | + gimp-print | [] | + gliv | [] | + glunarclock | [] | + gnucash | | + gnucash-glossary | [] [] | + gnupg | | + gpe-calendar | [] [] | + gpe-conf | [] [] | + gpe-contacts | [] | + gpe-edit | [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-sketchbook | [] [] | + gpe-timesheet | [] [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | | + gprof | [] | + gpsdrive | () () () | + grep | [] [] [] [] | + gretl | | + hello | [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] | + jpilot | () () | + jwhois | [] [] [] | + kbd | | + ld | | + libc | [] [] [] [] | + libgpewidget | [] [] | + libiconv | [] [] | + lifelines | | + lilypond | [] | + lingoteach | | + lingoteach_lessons | | + lynx | [] [] | + m4 | [] [] [] [] | + mailutils | | + make | [] [] | + man-db | [] | + mysecretdiary | [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | | + recode | [] [] [] | + screem | | + sed | [] [] | + sh-utils | [] | + sharutils | [] | + sketch | [] | + soundtracker | | + sp | | + tar | [] [] [] [] [] [] | + texinfo | [] | + textutils | [] | + tin | | + util-linux | [] [] | + vorbis-tools | [] [] | + wastesedge | | + wdiff | [] [] [] [] | + wget | [] [] [] | + xchat | [] [] | + xpad | [] | + +----------------------------------------+ + lg lt lv ms nb nl nn no pl pt pt_BR ro + 0 0 2 11 7 26 3 4 18 15 34 34 + + ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW + +-------------------------------------------+ + a2ps | [] [] [] [] [] | 16 + aegis | () | 0 + anubis | [] [] | 5 + ap-utils | () | 1 + bash | [] | 7 + batchelor | | 1 + bfd | [] [] [] | 7 + binutils | [] [] [] | 7 + bison | [] [] | 13 + bluez-pin | | 7 + clisp | | 0 + clisp | | 5 + coreutils | [] [] [] [] [] | 14 + cpio | [] [] [] | 13 + darkstat | [] () () | 9 + diffutils | [] [] [] [] | 21 + e2fsprogs | [] | 3 + enscript | [] [] [] | 11 + error | [] [] [] | 14 + fetchmail | [] | 7 + fileutils | [] [] [] [] [] [] | 15 + findutils | [] [] [] [] [] [] | 27 + flex | [] [] [] | 10 + gas | [] | 3 + gawk | [] [] | 9 + gcal | [] [] | 4 + gcc | [] | 4 + gettext | [] [] [] [] [] [] | 15 + gettext-runtime | [] [] [] [] [] [] | 16 + gettext-tools | [] [] | 5 + gimp-print | [] [] | 10 + gliv | | 1 + glunarclock | [] [] [] | 11 + gnucash | [] [] | 4 + gnucash-glossary | [] [] [] | 8 + gnupg | [] [] [] [] | 16 + gpe-calendar | [] | 5 + gpe-conf | | 3 + gpe-contacts | [] | 4 + gpe-edit | [] | 5 + gpe-login | [] | 5 + gpe-ownerinfo | [] | 7 + gpe-sketchbook | [] | 5 + gpe-timesheet | [] | 6 + gpe-today | [] | 6 + gpe-todo | [] | 6 + gphoto2 | [] [] | 9 + gprof | [] [] | 7 + gpsdrive | [] [] | 3 + grep | [] [] [] [] | 24 + gretl | | 2 + hello | [] [] [] [] [] | 33 + id-utils | [] [] [] | 11 + indent | [] [] [] [] | 19 + jpilot | [] [] [] [] [] | 10 + jwhois | () () [] [] | 10 + kbd | [] [] | 8 + ld | [] [] | 5 + libc | [] [] [] [] | 20 + libgpewidget | | 6 + libiconv | [] [] [] [] [] [] | 21 + lifelines | [] | 2 + lilypond | [] | 4 + lingoteach | | 2 + lingoteach_lessons | () | 0 + lynx | [] [] [] [] | 14 + m4 | [] [] [] | 15 + mailutils | | 2 + make | [] [] [] [] | 15 + man-db | [] | 6 + mysecretdiary | [] [] | 8 + nano | [] [] [] | 15 + nano_1_0 | [] [] [] | 15 + opcodes | [] [] | 9 + parted | [] [] | 13 + ptx | [] [] [] | 22 + python | | 0 + radius | | 0 + recode | [] [] [] [] | 19 + screem | [] | 1 + sed | [] [] [] [] [] | 20 + sh-utils | [] [] [] | 13 + sharutils | [] [] [] [] | 16 + sketch | [] | 5 + soundtracker | [] | 7 + sp | [] | 3 + tar | [] [] [] [] [] | 24 + texinfo | [] [] [] [] | 13 + textutils | [] [] [] [] [] | 15 + tin | | 1 + util-linux | [] [] | 14 + vorbis-tools | [] | 7 + wastesedge | | 0 + wdiff | [] [] [] [] | 17 + wget | [] [] [] [] [] [] [] | 25 + xchat | [] [] [] | 11 + xpad | | 1 + +-------------------------------------------+ + 50 teams ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW + 97 domains 32 19 16 0 56 0 48 10 1 1 12 23 913 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -298,9 +599,9 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If September 2001 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. The most -up-to-date matrix with full percentage details can be found at + If May 2003 seems to be old, you may fetch a more recent copy of +this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date +matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. Using `gettext' in new packages @@ -315,7 +616,7 @@ library, whereas only free software can use `libintl' as a static library or use modified versions of `libintl'. Once the sources are changed appropriately and the setup can handle -to use of `gettext' the only thing missing are the translations. The +the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact diff --git a/ChangeLog b/ChangeLog index 39a8cb23..6114f4ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,539 @@ +2004-01-13 Tomasz K這czko + + * po/pl.po: Typo. + + * man/pl/useradd.8: Cleanups in SYNOPSIS. + +2004-01-12 Tomasz K這czko + + * po/pl.po: Cleanups. + +2004-01-07 Tomasz K這czko + + * configure.in: Cleanups after autoupdate. + +2004-01-05 Tomasz K這czko + + * src/groupadd.c, po/sv.po, po/uk.po, po/ru.po, po/ko.po, po/pl.po, po/fr.po, po/ja.po, po/el.po, po/cs.po, po/de.po, man/zh_TW/groupadd.8, man/zh_CN/groupadd.8, man/pt_BR/groupadd.8, man/pl/groupadd.8, man/ja/groupadd.8, man/it/groupadd.8, man/groupadd.8, NEWS: + Added missing information about -f options in groupadd usage mesage (document + this also in man page). + +2003-12-17 Tomasz K這czko + + * lib/lastlog_.h, libmisc/log.c, libmisc/utmp.c, src/lastlog.c, src/login.c: + More time() or gettimeofday() prevention overwrite memory on 64bit arch + (partialy based on patch from MDK). + + * po/sv.po, po/uk.po, po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po: + Post remove TCFS support "make update-po". + + * man/Makefile.am: Removed getspnam.3 from EXTRA_DIST. + + * po/POTFILES.in: Removed lib/tcfsio.c. + + * lib/Attic/tcfsio.c, lib/Attic/tcfsio.h, lib/Makefile.am, src/passwd.c, src/userdel.c, NEWS, configure.in, doc/README.pam: + Removed TCFS support (tcfs is dead). + + * configure.in: + Added using AM_MAINTAINER_MODE. AC_INIT without parameters. + + * acconfig.h, configure.in: + Cleanups on autoheadres level: use AC_DEFINE(VAR, VAL, [Comment]) for + USE_PAM, HAVE_TCFS and TCFS_GDBM_SUPPORT. + + * src/newusers.c, src/useradd.c, acconfig.h, autogen.sh, lib/pwpack.c, NEWS: + Remove all old BSD_QUOTA dependent code. + +2003-12-16 Tomasz K這czko + + * lib/Makefile.am, libmisc/Makefile.am, src/Makefile.am: + Removed -I$(top_srcdir) from INCLUDES (isn't neccessary becaus this is in + DEFAULT_INCLUDES) - slightly shorter compile output. + + * Makefile.am, configure.in: + Added using AM_GNU_GETTEXT([external]) - removed intl SUBDIRS. + Added locale.h to AC_CHECK_HEADERS() - lib/defines.h have part which depends + on HAVE_LOCALE_H. + + * lib/nscd.h: Added missing newline at end of file. + + * acconfig.h: Remove unused (#un)defines. + + * autogen.sh: Typo. + + * autogen.sh: Much more simpler script - use autoreconf. + + * po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po: + "make update-po". + +2003-12-07 Tomasz K這czko + + * po/LINGUAS: Languages list for gettext 1.12.x. + +2003-10-26 Tomasz K這czko + + * po/pl.po: Kill fuzzy entries. + +2003-10-21 Tomasz K這czko + + * man/usermod.8: + Typo: missing "." on end of sentence (submited by Stepan Kasal ). + +2003-09-07 Tomasz K這czko + + * po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po, po/cs.po, po/de.po, po/el.po, NEWS: + convert all po/*.po files to utf-8. + +2003-09-05 Andrzej Krzysztofowicz + + * po/ru.po: - fixed header + +2003-07-29 Tomasz K這czko + + * po/pl.po, po/ru.po, po/sv.po, po/uk.po, libmisc/pam_pass.c, po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po: + Otput "passwd: password updated successfully\n" message on successfull + password change (based on Debian changes). + + * src/newgrp.c: Remove work around for unsecure gettext. + +2003-06-30 Tomasz K這czko + + * src/useradd.c, src/usermod.c: + Added initializing memory in variables when get_groups() function is not called, + and memory allocated for user_groups is not initialized (in both useradd and + usermod when -G options is used and in usermod when -l option is used). + That causing segfaults sometimes. + This fix is importand but not critical because usermod and usermod aren't suid + root. + Problem reported and fixed by Alexey Voinov . + +2003-06-19 Tomasz K這czko + + * man/login.1: Fixed FILES section. + + * src/chfn.c, src/chpasswd.c, src/chsh.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/login.c, src/logoutd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/suauth.c, src/useradd.c, src/userdel.c, src/usermod.c, src/vipw.c: + Indented. + + * src/chage.c: Move *flg variables to global. + + * acconfig.h: Comment for USG. + +2003-05-14 Tomasz K這czko + + * man/de/chfn.1, man/de/login.1: + Fixed section name (s/NAME/BEZEICHNUNG/). + + * man/de/chfn.1, man/de/chsh.1: Sync FILES section with en version. + + * man/login.1: Typo (s/avr/var/). + + * man/de/login.1: Sync FILES section with en man version. + + * man/de/chfn.1, man/de/chsh.1, man/de/login.1: Remove ^M from EOL. + + * man/de/login.1, man/de/Makefile.am, man/de/chfn.1, man/de/chsh.1, NEWS: + Next round updates from Josef Spillner : update + chsh(1), login(1) and added new chfn(1) german man pages. + + * NEWS: Added info about remove d_passwd(5), dialups(5) man pags. + +2003-05-12 Tomasz K這czko + + * NEWS, TODO, src/chfn.c, src/chpasswd.c, src/chsh.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/passwd.c, src/pwunconv.c, src/useradd.c, src/userdel.c, src/usermod.c, src/vipw.c: + One TODO entry gone: fix nscd flushing databases on change (use + per service flushing method instead HUPing nscd process). + + * lib/Makefile.am, lib/commonio.c, lib/nscd.c, lib/nscd.h, libmisc/Attic/nscd.c, libmisc/Attic/nscd.h, libmisc/Makefile.am: + Move nscd.{c,h} from libmisc/ to lib/. + Fix warning about implicit declaration of function `nscd_flush_cache' in lib/commonio.c. + + * lib/pwauth.h: Fix pw_auth() prototype. + + * libmisc/Attic/nscd.c, libmisc/Attic/nscd.h, libmisc/Makefile.am: + Added header file for nscd communication functions. + + * libmisc/chkname.c (good_name): + fixed warning about comparison between pointer and integer. + + * po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po: + "make update-po". + + * src/useradd.c (main): + chain create_mail() and small fix in usage message. + + * src/userdel.c: Removed AUTH_METHODS code. + + * lib/pwauth.c: Fixed pw_auth() prototype. + + * src/sulogin.c, src/usermod.c: Removed AUTH_METHODS code. + + * po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po: + "make update-po". + + * src/useradd.c: Indent. + + * man/ja/Attic/pwauth.8, man/ja/Makefile.am, man/pl/Attic/pwauth.8, man/pl/Makefile.am, src/passwd.c, src/useradd.c, NEWS, lib/pwauth.c, man/Attic/pwauth.8, man/Makefile.am: + Cleanups continuations: removed old AUTH_METHODS dependent code, + removed also pwauth(8) man page. + + * man/pl/Makefile.am (man_MANS): remove d_passwd.5 man page. + + * src/useradd.c, src/usermod.c, po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po: + Cleanups in usage messages. + + * src/newgrp.c: Cleanups in comments. + + * po/uk.po, po/sv.po, po/ru.po, po/pl.po, po/ko.po, po/ja.po, po/fr.po, po/el.po, po/de.po, po/cs.po: + "make update-po". + + * lib/getdef.c (main): remove gettextize error messages from test code. + + * NEWS: Cleanups. + +2003-05-07 Tomasz K這czko + + * src/useradd.c, man/pl/useradd.8, po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po, NEWS, TODO, etc/useradd, man/useradd.8: + Added handle by useradd /etc/defaults/useradd::CREATE_MAIL_SPOOL={yes|no}. + Now on adding user account can be added also created empty user mail + spool. Curent code handle only mailbox. + TODO: add handle create user mail spool in maildir format. + + * TODO: Typo. + + * src/chage.c (usage): fix missing ")". + (main): updated commented description. + + * src/useradd.c: Indent. + + * man/faillog.8, man/gpasswd.1, man/groupadd.8: Minor cleanups. + + * man/chage.1, man/pl/chage.1: + Rewrite for use claissic list form options descriptions. + + * man/pl/groupadd.8: + s/Polecenie groupadd posiada opcje:/Polecenie groupadd posiada nast瘼uj帷e opcje:/ + + * TODO: ALL: + move base passwd/shadow/group/gshadow operation to module for allow write + diffrent backend modules for db, NIS, LDAP and others. Default backend it + will be choose depending on /etc/nsswitch.conf and allow overrride this by + -r options (where the can be file, db, nis + nisplus, ldap .. like on /etc/nsswitch.conf in service column). + passwd have old piece of code with handling -r option and it will be good + finish this and propagate on other shadow tools for allow operate on other + user databases by well known tools. + + useradd: + add handle /etc/defaults/useradd::CREATE_MAIL_SPOOL={yes,no} for allow + create empty mail spool for added user. + + * man/pl/Attic/d_passwd.5, man/pl/Attic/dialups.5: Removed. + + * man/groupmems.8: Close few \fB by add \fR. + + * man/groupadd.8, man/groupmems.8: Minor cleanups. + +2003-05-06 Tomasz K這czko + + * src/grpconv.c, src/grpunconv.c, src/pwconv.c, src/pwunconv.c: + Move non-SHADOWPWD stub code to end of file (like in chage.c) and do not use + gettextized message. + + * po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po: + "make update-po". + + * src/chage.c, NEWS: + Now all code depend on SHADOWPWD. If shadow will not be configured on + autoconf level for using shadow possword chage is olny stub which informs + "chage not configured for shadow password support." + + * man/it/Makefile.am: Removed EXTRA_DIST (not neccessary). + + * man/es/Makefile.am: Removed groups.1 (doen't exist es groups(1)). + + * man/de/Makefile.am (man_MANS): added login.1. + + * man/de/Makefile.am: Removed EXTRA_DIST (isn't neccessary now). + + * man/hu/Makefile.am, man/ja/Makefile.am, man/ko/Makefile.am, man/pl/Makefile.am, man/de/Makefile.am, man/fr/Makefile.am, NEWS, man/Makefile.am: + Install groups(1) man page (moved from EXTRA_DIST to man_MANS). + + * po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po: + Updated after removing dialup tools. + + * po/POTFILES.in: Removed lib/{dialchk,dialup}.c and src/dpasswd.c. + +2003-05-05 Tomasz K這czko + + * libmisc/shell.c (shell): do not gettexitize DEBUG message. + + * src/chsh.c, src/grpconv.c, src/login.c, src/logoutd.c, src/sulogin.c, src/vipw.c, libmisc/getdate.y, libmisc/limits.c, libmisc/login_access.c, libmisc/obscure.c, libmisc/setupenv.c, lib/getpass.c, lib/pwauth.c: + Removed "#if 0 .. #endif" dead code. + + * libmisc/utmp.c: Fixed unterminated #if. + + * libmisc/login_access.c (resolve_hostname): + cleanup: removed #if 1 .. #endif. + + * libmisc/Attic/getdate.c: + Removed - this file is generated by bison/yacc. + + * configure.in: + Change file name passwd in AC_INIT argument from lib/dialchk.c to src/passwd.c. + + * src/su.c: + Removed dead code (#if 0 .. #endif) with call motd() and mailcheck() + (was commnted because GNU su doesn't do this). + +2003-05-04 Tomasz K這czko + + * src/Attic/dpasswd.c, src/login.c, src/Makefile.am, man/pl/Attic/dpasswd.8, man/pl/Makefile.am, man/ja/Attic/dpasswd.8, man/ja/Makefile.am, man/Attic/dpasswd.8, man/Makefile.am, lib/Attic/dialchk.c, lib/Attic/dialchk.h, lib/Attic/dialup.c, lib/Attic/dialup.h, lib/Makefile.am, lib/getdef.c, etc/login.defs, etc/login.defs.linux, NEWS: + Removed old dpasswd and DIALUPS_CHECK_ENAB login.defs handling code from login. + + * doc/Attic/ANNOUNCE, doc/Makefile.am, NEWS: Removed old doc/ANNOUNCE. + + * src/login.c, lib/getdef.c, etc/login.defs.linux, NEWS: + Remove NO_PASSWORD_CONSOLE code. + +2003-05-03 Tomasz K這czko + + * libmisc/pwd2spwd.c, libmisc/utmp.c, libmisc/entry.c, libmisc/isexpired.c, lib/sgetspent.c, lib/shadow.c, lib/defines.h, lib/putpwent.c, lib/pwent.c, lib/pwio.c, lib/pwpack.c, lib/sgetpwent.c, acconfig.h, configure.in: + Remove old SVR4, ATT_AGE, ATT_COMMENT dependent code. + + * src/chage.c: + Remove some ageing code which was not used if SHADOWPWD isn't defined. + Now handling mindays, maxdays and lastday also depends on SHADOWPWD. + +2003-05-01 Tomasz K這czko + + * man/Attic/dpasswd.8, man/Attic/pwauth.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/expiry.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/limits.5, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pwck.8, man/pwconv.8, man/shadow.3, man/shadow.5, man/shadowconfig.8, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, man/vipw.8: + Reformated. + + * etc/login.defs: + Use FHS 2.x compliant paths to lastlog, sulog, mail spool and also change + ENV_SUPATH to PATH=/sbin:/bin:/usr/sbin:/usr/bin and + ENV_PATH to PATH=/bin:/usr/bin + + * old/Attic/Makefile.am, old/Attic/Makefile.linux, old/Attic/Makefile.sun4, old/Attic/Makefile.svr4, old/Attic/Makefile.xenix, old/Attic/config.h.linux, old/Attic/config.h.sun4, old/Attic/config.h.svr4, old/Attic/config.h.xenix, old/Attic/orig-config.h, old/Attic/pwconv-old.8, old/Attic/pwconv-old.c, old/Attic/pwconv.8, old/Attic/pwd.h.m4, old/Attic/pwunconv-old.8, old/Attic/pwunconv-old.c, old/Attic/pwunconv.8, old/Attic/scologin.c, old/Attic/vipw.8: + Removed old stuff. + +2003-04-30 Tomasz K這czko + + * po/pl.po, po/ru.po, po/sv.po, po/uk.po, po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po: + make update-po + + * src/su.c: Remove not mached #endif after removing ATT_AGE code. + + * man/ko/passwd.5: Remove ^M from end of line. + + * src/chage.c, src/chpasswd.c, src/login.c, src/newusers.c, src/passwd.c, src/pwunconv.c, src/su.c, src/useradd.c, NEWS, acconfig.h, configure.in: + Removed old ATT_AGE (account ageing in passwd file) dependent code. + + * po/pl.po: Fix chage and lastlog messages. + +2003-04-29 Tomasz K這czko + + * libmisc/limits.c, src/logoutd.c: + More utmp/utmpx fixes: use endutend() or endutxend() depending on HAVE_UTMPX_H. + + * po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po: + Run "make update-po" after remove SVR4 code and fix duplicated entries in sv.po. + + * NEWS, src/login.c, src/logoutd.c, src/useradd.c: + Remove old SVR4 and SVR4_SI86_EUA dependent code from login, useradd and + logoutd. + +2003-04-28 Tomasz K這czko + + * man/pl/usermod.8: Remove "OD TΣMACZA" section. + + * man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/grpck.8, man/pl/passwd.1, man/pl/pwck.8, man/pl/useradd.8, man/pl/userdel.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/grpck.8, man/passwd.1, man/pwck.8, man/useradd.8, man/userdel.8: + Added EXIT VALUES section with full description exit codes. + + * src/groupadd.c: Typo (s/nut/not/). + + * man/shadowconfig.8: Merge changes from Debian. + + * NEWS, man/passwd.5: + Remove text about password aging from passwd(5) (based on Debian changes). + + * po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po, src/lastlog.c, man/it/lastlog.8, man/ja/lastlog.8, man/lastlog.8, man/pl/lastlog.8: + More unification in lastlog command syntax. + + * man/it/lastlog.8, man/ja/lastlog.8, man/lastlog.8, man/pl/lastlog.8: + Unifications in SYNOPSIS. + + * man/it/gpasswd.1, man/it/groupadd.8, man/it/groupdel.8, man/it/groupmod.8, man/it/grpck.8, man/it/lastlog.8, man/it/useradd.8, man/it/userdel.8, man/it/usermod.8: + Remove ^M from end of line. + + * man/gpasswd.1, man/groupadd.8: Indentation in FILES section. + + * src/pwconv.c, src/useradd.c, src/userdel.c: + s/bad command syntax/invalid command syntax/ + + * src/userdel.c: + Indent by hand (seems indent have problems with complex conditions). + + * man/ru/Makefile.am: man_MANS: s#passwd.1#passwd.5# + + * po/pl.po: s/nie mog/nie mo積a/ + + * po/fr.po: Emoticon removed. + + * NEWS, configure.in, man/Makefile.am, man/ru/Makefile.am, man/ru/passwd.5: + Added ru passwd(1) man page from KSI resources. + + * man/zh_CN/Makefile.am, man/zh_CN/chfn.1, man/zh_CN/chsh.1, man/zh_TW/Makefile.am, man/zh_TW/chfn.1, man/zh_TW/chsh.1, man/ja/Attic/dpasswd.8, man/ja/Attic/pwauth.8, man/ja/Makefile.am, man/ja/chage.1, man/ja/chfn.1, man/ja/chpasswd.8, man/ja/chsh.1, man/ja/expiry.1, man/ja/faillog.5, man/ja/faillog.8, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/groups.1, man/ja/grpck.8, man/ja/id.1, man/ja/lastlog.8, man/ja/limits.5, man/ja/login.1, man/ja/login.access.5, man/ja/login.defs.5, man/ja/logoutd.8, man/ja/mkpasswd.8, man/ja/newgrp.1, man/ja/newusers.8, man/ja/passwd.1, man/ja/passwd.5, man/ja/porttime.5, man/ja/pw_auth.3, man/ja/pwck.8, man/ja/pwconv.8, man/ja/shadow.3, man/ja/shadow.5, man/ja/shadowconfig.8, man/ja/su.1, man/ja/suauth.5, man/ja/sulogin.8, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/vipw.8, NEWS, man/cs/Makefile.am, man/cs/id.1: + Added chch(1), chfn(1) man pages from chinese man pages translation + project. + Added id(1) man page czech man pages translation project. + Updated ja man pages and added expiry(1). + + * man/hu/groups.1, man/hu/login.1: + Remove info about $HOME/.profile from FILES section (this does not depends + stricte on shadow). + + * configure.in, man/Makefile.am, man/es/Makefile.am: + Added es man pages to ac/am suit. + + * man/hu/Makefile.am, man/hu/su.1: + Added su(1) man page from hungarian man pages translation project. + +2003-04-26 Tomasz K這czko + + * NEWS: Ready for gettext 0.11.5, automake 1.7.4, autoconf 2.57. + Many cleanups and unifications in man pages. + + * man/pt_BR/gpasswd.1, man/pt_BR/groupadd.8, man/pt_BR/groupdel.8, man/pt_BR/groupmod.8, man/pt_BR/shadow.5, man/zh_CN/chpasswd.8, man/zh_CN/groupadd.8, man/zh_CN/groupdel.8, man/zh_CN/groupmod.8, man/zh_CN/useradd.8, man/zh_CN/userdel.8, man/zh_CN/usermod.8, man/zh_TW/groupadd.8, man/zh_TW/groupdel.8, man/zh_TW/groupmod.8, man/zh_TW/useradd.8, man/zh_TW/userdel.8, man/zh_TW/usermod.8, man/ko/login.1, man/ko/su.1, man/pl/chage.1, man/pl/chfn.1, man/pl/chsh.1, man/pl/expiry.1, man/pl/gpasswd.1, man/pl/groupmems.8, man/pl/groups.1, man/pl/id.1, man/pl/lastlog.8, man/pl/login.1, man/pl/newgrp.1, man/pl/passwd.1, man/pl/su.1, man/pl/sulogin.8, man/pl/useradd.8, man/pl/usermod.8, man/ja/chage.1, man/ja/chfn.1, man/ja/chsh.1, man/ja/faillog.5, man/ja/faillog.8, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/groups.1, man/ja/grpck.8, man/ja/id.1, man/ja/lastlog.8, man/ja/limits.5, man/ja/login.1, man/ja/login.access.5, man/ja/logoutd.8, man/ja/mkpasswd.8, man/ja/newgrp.1, man/ja/passwd.1, man/ja/passwd.5, man/ja/porttime.5, man/ja/pwck.8, man/ja/shadow.3, man/ja/shadow.5, man/ja/su.1, man/ja/suauth.5, man/ja/sulogin.8, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/hu/chsh.1, man/hu/gpasswd.1, man/hu/groups.1, man/hu/login.1, man/hu/newgrp.1, man/hu/passwd.1, man/it/gpasswd.1, man/it/groupadd.8, man/it/groupdel.8, man/it/groupmod.8, man/it/grpck.8, man/it/lastlog.8, man/it/shadow.5, man/it/useradd.8, man/it/userdel.8, man/it/usermod.8, man/cs/shadow.5, man/es/su.1, man/fr/chage.1, man/fr/faillog.5, man/fr/gpasswd.1, man/fr/shadow.5, man/fr/su.1, man/fr/userdel.8, man/fr/usermod.8, man/Attic/dpasswd.8, man/chage.1, man/chfn.1, man/chsh.1, man/expiry.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/limits.5, man/login.1, man/login.access.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/passwd.1, man/passwd.5, man/porttime.5, man/pwck.8, man/shadow.3, man/shadow.5, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8: + Fixes: correct utmp/wtmp paths. + Unifications: bold commnanda and italify other file names. + Other minor changes and cleanups and unifications. + + * libmisc/limits.c: More utmpx/utmp fixes. + + * src/chpasswd.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmems.c, src/groupmod.c, src/id.c, src/login.c, src/newgrp.c, src/passwd.c, src/useradd.c, src/userdel.c, src/usermod.c, po/cs.po, po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po, po/sv.po, po/uk.po: + Usage help message unification (s/usage:/Usage:/). + + * TODO: Missing "are". + + * src/logoutd.c, src/userdel.c, NEWS: + Handle also utmpx if avalaile in userdel and logoutd. + +2003-04-25 Tomasz K這czko + + * src/sulogin.c: Remove unused utent declaration. + + * src/sulogin.c, src/login.c: + Remove #include and . This comes with #include "prototypes.h". + + * lib/prototypes.h: + "#include " or "#include " depending on HAVE_UTMPX_H. + + * libmisc/failure.c: + Remove "#include " (this is included in failure.h). + + * configure.in: + On detect mail spool directory location try first /var/mail. + +2003-04-22 Tomasz K這czko + + * libmisc/Attic/getdate.c, libmisc/Attic/nscd.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/motd.c, libmisc/myname.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/pwd2spwd.c, libmisc/pwd_init.c, libmisc/pwdcheck.c, libmisc/rlogin.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setup.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, libmisc/addgrps.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chkshell.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c: + Indent all using current .indent.pro settings. + + * po/Makevars: New file neccessary for gettext >=0.11.5. + + * man/Makefile.am: Removed getspnam.3 from man_MANS (dos not exist). + + * po/de.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po, po/ru.po: + Fixes after filtering gettext 0.11.5 (missing headers elements, inforrect + format strings). + +2003-04-21 Tomasz K這czko + + * NEWS, man/de/passwd.1: + updated german passwd(1) man page (by Josef Spillner ) + +2003-03-12 Andrzej Krzysztofowicz + + * po/pl.po: - updated; terminology unification + +2003-02-28 Pawe Go豉szewski + + * etc/login.defs: - missing "MD5_CRYPT_ENAB yes" added + +2003-01-20 Andrzej Krzysztofowicz + + * configure.in: - added Makefiles for man/zh_{CN,TW} + + * man/Makefile.am, man/zh_CN/Makefile.am, man/zh_CN/chpasswd.8, man/zh_CN/groupadd.8, man/zh_CN/groupdel.8, man/zh_CN/groupmod.8, man/zh_CN/useradd.8, man/zh_CN/userdel.8, man/zh_CN/usermod.8, man/zh_TW/Makefile.am, man/zh_TW/groupadd.8, man/zh_TW/groupdel.8, man/zh_TW/groupmod.8, man/zh_TW/useradd.8, man/zh_TW/userdel.8, man/zh_TW/usermod.8: + - added zh man pages from MDK (2 x 6) and from cman (1) + +2003-01-07 Tomasz K這czko + + * man/ja/shadow.3, man/pl/shadow.3, man/shadow.3: + sync spwd structure declaration with current glibc declaration (tahnks for + point this bug to Michael Kerrisk ). + + * man/pl/faillog.5: s/konsol/terminal/ + +2002-12-29 Tomasz K這czko + + * src/Makefile.am: typo (s/EXTRA_DOST/EXTRA_DIST/). + +2002-10-14 Tomasz K這czko + + * src/Makefile.am: + fixed making vigr symlink to vipw (not vipw to vigr) in install-exec-hook (fix submited by + Dimitar Zhekov ). + + * debian/Attic/login.copyright, debian/Attic/login.postinst, debian/Attic/login.postrm, debian/Attic/login.preinst, debian/Attic/login.prerm, debian/Attic/logoutd.init, debian/Attic/passwd.conffiles, debian/Attic/passwd.copyright, debian/Attic/passwd.cron, debian/Attic/passwd.init, debian/Attic/passwd.postinst, debian/Attic/passwd.postrm, debian/Attic/porttime, debian/Attic/rules, debian/Attic/secure-su.README, debian/Attic/secure-su.conffiles, debian/Attic/secure-su.copyright, debian/Attic/secure-su.postrm, debian/Attic/secure-su.preinst, debian/Attic/securetty, debian/Attic/shadowconfig.sh, debian/Attic/Makefile.am, debian/Attic/changelog, debian/Attic/checksums, debian/Attic/control, debian/Attic/control.gnu, debian/Attic/control.linux, debian/Attic/login.conffiles, Makefile.am, configure.in: + removed debian directory. + +2002-10-12 Tomasz K這czko + + * NEWS, src/newgrp.c: + Use CLOSE_SESSIONS depending code only when USE_PAM. + The problem was reported by Mattias Webjorn Eriksson using Slackware + 8.1 and reproduced it using slackware-current (9.0beta) (fix submited by + Simon Williams ). + +2002-10-07 Tomasz K這czko + + * man/ja/login.1, man/ja/logoutd.8, man/pl/login.1, man/pl/logoutd.8, man/hu/login.1, man/login.1, man/logoutd.8: + changed utmp and wtmp files paths (s#/etc/utmp/#/var/run/utmp#; s#/etc/wtmp#/var/log/wtmp#) + + * po/ru.po, configure.in: added ru translation (from KSI resources). + +2002-09-07 Tomasz K這czko + + * NEWS, libmisc/failure.c: + libbmisc/failure.c (too_many_failures): incorrect if() condition in non-PAM + dependent code in fail login handling (fixed by Krzysztof Oledzki ). + +2002-08-05 Tomasz K這czko + + * man/pl/useradd.8, man/useradd.8, NEWS: + document useradd and groupadd -M option in en and pl man pages + (by Jakub Mikusek ). + + * configure.in: start prepare 4.0.4. + +2002-03-18 Andrzej Krzysztofowicz + + * man/ja/Attic/dpasswd.8, man/ja/chpasswd.8, man/ja/faillog.8, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/id.1, man/ja/lastlog.8, man/ja/login.defs.5, man/ja/newusers.8, man/ja/shadowconfig.8, man/ja/su.1, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/vipw.8: + - updated to man-pages-ja-20020315 (except cvs tags) + +2002-03-15 Andrzej Krzysztofowicz + + * TODO: - remove already done pl man updates from the list + 2002-03-13 Tomasz K這czko + * man/ko/Makefile.am, man/ko/chfn.1, man/ko/chsh.1, man/ko/groups.1, man/ko/id.1, man/ko/login.1, man/ko/newgrp.1, man/ko/passwd.5, man/ko/su.1: + added ko man pages. + + * man/de/Makefile.am: automake files for de man pages. + * TODO: updated. * man/it/Makefile.am, man/id/Makefile.am, man/id/adduser.8, man/id/useradd.8, man/Makefile.am, man/cs/Makefile.am, man/fr/Makefile.am, configure.in, NEWS: @@ -57,12 +591,12 @@ 2002-03-09 Andrzej Krzysztofowicz - * man/pt_BR/groupadd.8, man/pt_BR/groupdel.8, man/pt_BR/groupmod.8, man/pt_BR/shadow.5, man/pl/userdel.8, man/pl/usermod.8, man/pl/sulogin.8, man/pl/useradd.8, man/pl/pwconv.8, man/pl/su.1, man/pl/mkpasswd.8, man/pl/newgrp.1, man/pl/passwd.5, man/pl/pwauth.8, man/pl/login.defs.5, man/pl/chpasswd.8, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmems.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/login.1, man/hu/groups.1, man/hu/newgrp.1, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/groups.1, man/ja/grpck.8, man/ja/id.1, man/ja/lastlog.8, man/ja/login.1, man/ja/login.defs.5, man/ja/mkpasswd.8, man/ja/newgrp.1, man/ja/passwd.5, man/ja/pw_auth.3, man/ja/pwauth.8, man/ja/pwck.8, man/ja/shadow.5, man/ja/su.1, man/ja/sulogin.8, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/vipw.8, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8: + * man/pt_BR/groupadd.8, man/pt_BR/groupdel.8, man/pt_BR/groupmod.8, man/pt_BR/shadow.5, man/pl/userdel.8, man/pl/usermod.8, man/pl/sulogin.8, man/pl/useradd.8, man/pl/pwconv.8, man/pl/su.1, man/pl/Attic/pwauth.8, man/pl/mkpasswd.8, man/pl/newgrp.1, man/pl/passwd.5, man/pl/login.defs.5, man/pl/chpasswd.8, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmems.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/login.1, man/hu/groups.1, man/hu/newgrp.1, man/ja/Attic/pwauth.8, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/groups.1, man/ja/grpck.8, man/ja/id.1, man/ja/lastlog.8, man/ja/login.1, man/ja/login.defs.5, man/ja/mkpasswd.8, man/ja/newgrp.1, man/ja/passwd.5, man/ja/pw_auth.3, man/ja/pwck.8, man/ja/shadow.5, man/ja/su.1, man/ja/sulogin.8, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/vipw.8, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8: - further "SEE ALSO" references sorting 2002-03-08 Tomasz K這czko - * man/pwck.8, man/pwconv.8, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, man/vipw.8, man/Makefile.am, man/chpasswd.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/login.1, man/login.defs.5, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.5, man/pw_auth.3, man/pwauth.8: + * man/pwck.8, man/pwconv.8, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, man/vipw.8, man/Attic/pwauth.8, man/Makefile.am, man/chpasswd.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/login.1, man/login.defs.5, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.5, man/pw_auth.3: merged shadow-4.0.0-owl-man.patch by Solar Designer . * NEWS: updated for 4.0.3. @@ -189,7 +723,7 @@ * po/sv.po, po/uk.po, po/cs.po, po/el.po, po/fr.po, po/ja.po, po/ko.po, po/pl.po: update. - * src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, src/vipw.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/dpasswd.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupmems.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c: + * src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, src/vipw.c, src/Attic/dpasswd.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupmems.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c: Add -pcs to .indent.pro file and reindent all code. Remove "\n" from all SYSLOG() messages. @@ -208,10 +742,10 @@ * po/uk.po: typo. - * man/pl/passwd.1, man/ja/passwd.1, man/chpasswd.8, man/dpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1: + * man/pl/passwd.1, man/ja/passwd.1, man/Attic/dpasswd.8, man/chpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1: cleanups. - * src/dpasswd.c, src/expiry.c, src/grpck.c, src/id.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/chfn.c, src/chsh.c, po/ja.po, po/ko.po, po/pl.po, po/sv.po, po/uk.po, po/cs.po, po/el.po, po/fr.po, man/useradd.8: + * src/Attic/dpasswd.c, src/expiry.c, src/grpck.c, src/id.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/chfn.c, src/chsh.c, po/ja.po, po/ko.po, po/pl.po, po/sv.po, po/uk.po, po/cs.po, po/el.po, po/fr.po, man/useradd.8: standarize usage messages syntax. * man/pl/useradd.8, man/pl/usermod.8, man/pl/vipw.8, man/pl/userdel.8: @@ -243,7 +777,7 @@ * src/newgrp.c, src/pwck.c, src/su.c, src/useradd.c, src/usermod.c, src/groupadd.c, src/groupmod.c, src/id.c, NEWS: fixes for handle/print correctly 32bit uid/gid (Thorsten Kukuk ). - * src/chage.c: - break ussage vomment line. + * src/chage.c: - break usage vomment line. * lib/defines.h: removed bunch spaces on end line in conditionale #include @@ -278,7 +812,7 @@ 2001-11-16 Andrzej Krzysztofowicz - * man/ja/passwd.5, man/ja/porttime.5, man/ja/pw_auth.3, man/ja/pwauth.8, man/ja/pwck.8, man/ja/shadow.3, man/ja/shadow.5, man/ja/su.1, man/ja/suauth.5, man/ja/sulogin.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/Makefile.am, man/ja/chage.1, man/ja/chfn.1, man/ja/chpasswd.8, man/ja/chsh.1, man/ja/dpasswd.8, man/ja/faillog.5, man/ja/faillog.8, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/grpck.8, man/ja/lastlog.8, man/ja/login.1, man/ja/login.access.5, man/ja/login.defs.5, man/ja/logoutd.8, man/ja/mkpasswd.8, man/ja/newgrp.1, man/ja/passwd.1: + * man/ja/Attic/pwauth.8, man/ja/passwd.5, man/ja/porttime.5, man/ja/pw_auth.3, man/ja/pwck.8, man/ja/shadow.3, man/ja/shadow.5, man/ja/su.1, man/ja/suauth.5, man/ja/sulogin.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/Attic/dpasswd.8, man/ja/Makefile.am, man/ja/chage.1, man/ja/chfn.1, man/ja/chpasswd.8, man/ja/chsh.1, man/ja/faillog.5, man/ja/faillog.8, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/grpck.8, man/ja/lastlog.8, man/ja/login.1, man/ja/login.access.5, man/ja/login.defs.5, man/ja/logoutd.8, man/ja/mkpasswd.8, man/ja/newgrp.1, man/ja/passwd.1: - updated to man-pages-ja-20011115.tar.gz * man/ja/groups.1: 3c26de91cfd359c0b7c36ca3cd3e170d groups.1 @@ -348,11 +882,11 @@ 2001-11-06 Tomasz K這czko - * src/dpasswd.c, src/gpasswd.c, src/groupadd.c, src/groupmod.c, src/grpck.c, src/lastlog.c, src/login.c, src/passwd.c, src/pwck.c, src/userdel.c, src/usermod.c, src/chage.c, src/chfn.c, src/chsh.c, libmisc/utmp.c: + * src/Attic/dpasswd.c, src/gpasswd.c, src/groupadd.c, src/groupmod.c, src/grpck.c, src/lastlog.c, src/login.c, src/passwd.c, src/pwck.c, src/userdel.c, src/usermod.c, src/chage.c, src/chfn.c, src/chsh.c, libmisc/utmp.c: removed prototypes which are defined in libc header files (Thorsten Kukuk ). - * libmisc/Makefile.am, libmisc/nscd.c, lib/commonio.c: + * libmisc/Attic/nscd.c, libmisc/Makefile.am, lib/commonio.c: implemetn better reloading the nscd cache (per NSS map) by Thorsten Kukuk @@ -376,7 +910,7 @@ * src/useradd.c: sort alphabetically *flg variables. - * debian/Attic/tar.c, debian/Makefile.am: removed. + * debian/Attic/Makefile.am, debian/Attic/tar.c: removed. 2001-10-10 Tomasz K這czko @@ -593,12 +1127,12 @@ * po/pl.po: fixed charset (must be iso-8859-2). - * man/Makefile.am, man/ja/Makefile.am, man/ja/chage.1, man/ja/chfn.1, man/ja/chpasswd.8, man/ja/chsh.1, man/ja/dpasswd.8, man/ja/faillog.5, man/ja/faillog.8, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/grpck.8, man/ja/lastlog.8, man/ja/login.1, man/ja/login.access.5, man/ja/login.defs.5, man/ja/logoutd.8, man/ja/mkpasswd.8, man/ja/newgrp.1, man/ja/passwd.1, man/ja/passwd.5, man/ja/porttime.5, man/ja/pw_auth.3, man/ja/pwauth.8, man/ja/pwck.8, man/ja/pwconv.8, man/ja/shadow.3, man/ja/shadow.5, man/ja/su.1, man/ja/suauth.5, man/ja/sulogin.8, man/ja/userdel.8, man/ja/usermod.8, configure.in, NEWS: + * man/Makefile.am, man/ja/Attic/dpasswd.8, man/ja/Attic/pwauth.8, man/ja/Makefile.am, man/ja/chage.1, man/ja/chfn.1, man/ja/chpasswd.8, man/ja/chsh.1, man/ja/faillog.5, man/ja/faillog.8, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/grpck.8, man/ja/lastlog.8, man/ja/login.1, man/ja/login.access.5, man/ja/login.defs.5, man/ja/logoutd.8, man/ja/mkpasswd.8, man/ja/newgrp.1, man/ja/passwd.1, man/ja/passwd.5, man/ja/porttime.5, man/ja/pw_auth.3, man/ja/pwck.8, man/ja/pwconv.8, man/ja/shadow.3, man/ja/shadow.5, man/ja/su.1, man/ja/suauth.5, man/ja/sulogin.8, man/ja/userdel.8, man/ja/usermod.8, configure.in, NEWS: added ja man pages. 2001-05-30 Tomasz K這czko - * src/Attic/shadowconfig.sh, src/Makefile.am, debian/Makefile.am, debian/shadowconfig.sh: + * src/Attic/shadowconfig.sh, src/Makefile.am, debian/Attic/Makefile.am, debian/Attic/shadowconfig.sh: move shadowconfig.sh to debian/ * src/Makefile.am: added missing -I${top_srcdir} to INCLUDES. @@ -643,14 +1177,14 @@ * TODO: - updated. - * man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/dpasswd.8, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/login.1, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/su.1, man/pl/useradd.8, man/pl/userdel.8, man/pl/vipw.8, man/dpasswd.8, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/id.1, man/lastlog.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/su.1, man/useradd.8, man/usermod.8, man/vipw.8: + * man/pl/Attic/dpasswd.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/login.1, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/su.1, man/pl/useradd.8, man/pl/userdel.8, man/pl/vipw.8, man/Attic/dpasswd.8, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/id.1, man/lastlog.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/su.1, man/useradd.8, man/usermod.8, man/vipw.8: many small cleanups, fixes also removed commented obsoleted texts. 2001-01-25 Tomasz K這czko * autogen.sh: add to conf_flags --disable-shared. - * man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/d_passwd.5, man/pl/dialups.5, man/pl/dpasswd.8, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/limits.5, man/pl/login.1, man/pl/login.access.5, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/mkpasswd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/passwd.5, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwauth.8, man/pl/pwck.8, man/pl/pwconv.8, man/pl/shadow.3, man/pl/shadow.5, man/pl/shadowconfig.8, man/pl/su.1, man/pl/suauth.5, man/pl/sulogin.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/usermod.8, man/pl/vipw.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwauth.8, man/pwck.8, man/pwconv.8, man/shadow.3, man/shadow.5, man/shadowconfig.8, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, man/vipw.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/dpasswd.8, man/expiry.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/limits.5, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8: + * man/pl/Attic/d_passwd.5, man/pl/Attic/dialups.5, man/pl/Attic/dpasswd.8, man/pl/Attic/pwauth.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/limits.5, man/pl/login.1, man/pl/login.access.5, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/mkpasswd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/passwd.5, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwck.8, man/pl/pwconv.8, man/pl/shadow.3, man/pl/shadow.5, man/pl/shadowconfig.8, man/pl/su.1, man/pl/suauth.5, man/pl/sulogin.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/usermod.8, man/pl/vipw.8, man/Attic/pwauth.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/shadow.3, man/shadow.5, man/shadowconfig.8, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, man/vipw.8, man/Attic/dpasswd.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/expiry.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/limits.5, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8: put or move to top cemmented Id cvs keyword, (passwd.1): documment -e option (patch from Debian), (userdel.1): remove commented obsoleted options. @@ -735,7 +1269,7 @@ 2000-10-16 Tomasz K這czko - * old/pwconv-old.8, old/pwconv.8, old/pwunconv-old.8, old/pwunconv.8, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/mkpasswd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwauth.8, man/pl/pwck.8, man/pl/shadow.3, man/pl/su.1, man/pl/sulogin.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/usermod.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/dpasswd.8, man/pl/faillog.5, man/pl/faillog.8, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/login.1, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/dpasswd.8, man/faillog.5, man/faillog.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwauth.8, man/pwck.8, man/shadow.3, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, debian/login.copyright, debian/passwd.copyright, debian/secure-su.copyright, doc/ANNOUNCE, doc/LSM, doc/README, doc/README.linux: + * old/Attic/pwconv-old.8, old/Attic/pwconv.8, old/Attic/pwunconv-old.8, old/Attic/pwunconv.8, man/pl/Attic/pwauth.8, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/mkpasswd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwck.8, man/pl/shadow.3, man/pl/su.1, man/pl/sulogin.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/usermod.8, man/pl/Attic/dpasswd.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/faillog.5, man/pl/faillog.8, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/login.1, man/Attic/dpasswd.8, man/Attic/pwauth.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/faillog.5, man/faillog.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwck.8, man/shadow.3, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, debian/Attic/login.copyright, debian/Attic/passwd.copyright, debian/Attic/secure-su.copyright, doc/Attic/ANNOUNCE, doc/LSM, doc/README, doc/README.linux: Julianne F. Haugh new contact adress. * NEWS: - summary chanfes for 20001016. @@ -777,7 +1311,7 @@ * libmisc/Makefile.am: - removed pwdcheck.c from libmisc_a_SOURCES. - * debian/Makefile.am: - removed FILES from EXTRA_DIST. + * debian/Attic/Makefile.am: - removed FILES from EXTRA_DIST. * contrib/Makefile.am: - s/udbachk.v012.tgz/udbachk.tgz/ @@ -881,62 +1415,62 @@ 2000-09-05 Marek Micha趾iewicz - * man/pl/sulogin.8, man/pl/vipw.8, po/el.po, po/fr.po, po/pl.po, po/sv.po, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/d_passwd.5, man/pl/dialups.5, man/pl/dpasswd.8, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/limits.5, man/pl/login.1, man/pl/login.access.5, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/mkpasswd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/passwd.5, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwauth.8, man/pl/pwck.8, man/pl/pwconv.8, man/pl/shadow.3, man/pl/shadow.5, man/pl/shadowconfig.8, man/pl/su.1, man/pl/suauth.5: + * man/pl/sulogin.8, man/pl/vipw.8, po/el.po, po/fr.po, po/pl.po, po/sv.po, man/pl/Attic/d_passwd.5, man/pl/Attic/dialups.5, man/pl/Attic/dpasswd.8, man/pl/Attic/pwauth.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/limits.5, man/pl/login.1, man/pl/login.access.5, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/mkpasswd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/passwd.5, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwck.8, man/pl/pwconv.8, man/pl/shadow.3, man/pl/shadow.5, man/pl/shadowconfig.8, man/pl/su.1, man/pl/suauth.5: *** empty log message *** 2000-09-02 Marek Micha趾iewicz - * src/groupmod.c, src/grpck.c, src/login.c, src/logoutd.c, src/newgrp.c, src/passwd.c, src/pwck.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/commonio.h, lib/defines.h, lib/groupio.c, lib/pwio.c, lib/sgroupio.c, lib/shadowio.c, man/usermod.8, po/el.po, po/fr.po, po/pl.po, po/sv.po, redhat/Attic/shadow-utils.spec.in, src/chage.c, src/chfn.c, src/chsh.c, src/dpasswd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, configure.in, debian/rules, doc/Attic/CHANGES, doc/LSM, lib/commonio.c: + * src/groupmod.c, src/grpck.c, src/login.c, src/logoutd.c, src/newgrp.c, src/passwd.c, src/pwck.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/commonio.h, lib/defines.h, lib/groupio.c, lib/pwio.c, lib/sgroupio.c, lib/shadowio.c, man/usermod.8, po/el.po, po/fr.po, po/pl.po, po/sv.po, redhat/Attic/shadow-utils.spec.in, src/Attic/dpasswd.c, src/chage.c, src/chfn.c, src/chsh.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, configure.in, debian/Attic/rules, doc/Attic/CHANGES, doc/LSM, lib/commonio.c: *** empty log message *** 2000-08-26 Marek Micha趾iewicz - * contrib/Makefile.am, contrib/groupmems.shar, doc/LSM, po/el.po, po/fr.po, po/pl.po, po/sv.po, doc/README.mirrors, src/vipw.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/dpasswd.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/Makefile.am, lib/commonio.c, lib/commonio.h, lib/defines.h, lib/dialchk.h, lib/dialup.h, lib/encrypt.c, lib/getdef.c, lib/getdef.h, lib/groupio.c, lib/groupio.h, lib/prototypes.h, lib/pwauth.c, lib/pwio.c, lib/pwio.h, lib/rad64.c, lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.h, lib/tcfsio.h, libmisc/Attic/suauth.c, libmisc/chkname.h, libmisc/chowndir.c, libmisc/copydir.c, libmisc/entry.c, libmisc/failure.h, libmisc/getdate.h, libmisc/hushed.c, libmisc/loginprompt.c, libmisc/setupenv.c, libmisc/sulog.c, man/Makefile.am, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/dpasswd.8, man/faillog.5, man/faillog.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/pl/Makefile.am, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/usermod.8, man/porttime.5, man/pw_auth.3, man/pwauth.8, man/pwck.8, man/shadow.3, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, etc/login.defs.hurd, etc/login.defs.linux, doc/ANNOUNCE, doc/Attic/CHANGES, doc/README, doc/README.linux, doc/README.pam, doc/WISHLIST, debian/login.copyright, debian/passwd.copyright, debian/secure-su.copyright, Attic/mkinstalldirs, configure.in, Makefile.am: + * contrib/Makefile.am, contrib/groupmems.shar, doc/LSM, po/el.po, po/fr.po, po/pl.po, po/sv.po, doc/README.mirrors, src/vipw.c, src/Attic/dpasswd.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/Attic/dialchk.h, lib/Attic/dialup.h, lib/Attic/tcfsio.h, lib/Makefile.am, lib/commonio.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/getdef.h, lib/groupio.c, lib/groupio.h, lib/prototypes.h, lib/pwauth.c, lib/pwio.c, lib/pwio.h, lib/rad64.c, lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.h, libmisc/Attic/suauth.c, libmisc/chkname.h, libmisc/chowndir.c, libmisc/copydir.c, libmisc/entry.c, libmisc/failure.h, libmisc/getdate.h, libmisc/hushed.c, libmisc/loginprompt.c, libmisc/setupenv.c, libmisc/sulog.c, man/Attic/dpasswd.8, man/Attic/pwauth.8, man/Makefile.am, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/faillog.5, man/faillog.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/pl/Makefile.am, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/usermod.8, man/porttime.5, man/pw_auth.3, man/pwck.8, man/shadow.3, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, etc/login.defs.hurd, etc/login.defs.linux, doc/Attic/ANNOUNCE, doc/Attic/CHANGES, doc/README, doc/README.linux, doc/README.pam, doc/WISHLIST, debian/Attic/login.copyright, debian/Attic/passwd.copyright, debian/Attic/secure-su.copyright, Attic/mkinstalldirs, configure.in, Makefile.am: *** empty log message *** 1999-08-27 Marek Micha趾iewicz - * doc/LSM, po/el.po, po/fr.po, po/pl.po, po/sv.po, debian/passwd.postinst, lib/dialchk.c, lib/getdef.c, lib/getpass.c, lib/pwauth.c, libmisc/limits.c, libmisc/rlogin.c, man/limits.5, man/newgrp.1, src/chage.c, src/dpasswd.c, src/gpasswd.c, src/login.c, src/logoutd.c, src/newgrp.c, src/passwd.c, src/sulogin.c, acconfig.h, configure.in, debian/Attic/logoutd, debian/Makefile.am, debian/changelog, debian/control.gnu, debian/control.linux, debian/login.postrm, debian/logoutd.init, debian/passwd.conffiles, debian/passwd.cron, debian/passwd.init, debian/passwd.postrm, debian/rules, doc/Attic/CHANGES, doc/README.mirrors, doc/WISHLIST, etc/Makefile.am, etc/login.defs.hurd, etc/login.defs.linux, lib/defines.h: + * doc/LSM, po/el.po, po/fr.po, po/pl.po, po/sv.po, debian/Attic/passwd.postinst, lib/Attic/dialchk.c, lib/getdef.c, lib/getpass.c, lib/pwauth.c, libmisc/limits.c, libmisc/rlogin.c, man/limits.5, man/newgrp.1, src/Attic/dpasswd.c, src/chage.c, src/gpasswd.c, src/login.c, src/logoutd.c, src/newgrp.c, src/passwd.c, src/sulogin.c, acconfig.h, configure.in, debian/Attic/Makefile.am, debian/Attic/changelog, debian/Attic/control.gnu, debian/Attic/control.linux, debian/Attic/login.postrm, debian/Attic/logoutd, debian/Attic/logoutd.init, debian/Attic/passwd.conffiles, debian/Attic/passwd.cron, debian/Attic/passwd.init, debian/Attic/passwd.postrm, debian/Attic/rules, doc/Attic/CHANGES, doc/README.mirrors, doc/WISHLIST, etc/Makefile.am, etc/login.defs.hurd, etc/login.defs.linux, lib/defines.h: *** empty log message *** 1999-07-09 Marek Micha趾iewicz - * configure.in, contrib/Makefile.am, debian/changelog, doc/Attic/CHANGES, doc/LSM, doc/WISHLIST, lib/prototypes.h, lib/strcasecmp.c, libmisc/Makefile.am, man/faillog.8, po/el.po, po/pl.po, src/Makefile.am, src/chfn.c, src/chsh.c, src/faillog.c, src/groupmod.c, src/grpconv.c, src/grpunconv.c, src/newgrp.c, src/passwd.c, src/vipw.c: + * configure.in, contrib/Makefile.am, debian/Attic/changelog, doc/Attic/CHANGES, doc/LSM, doc/WISHLIST, lib/prototypes.h, lib/strcasecmp.c, libmisc/Makefile.am, man/faillog.8, po/el.po, po/pl.po, src/Makefile.am, src/chfn.c, src/chsh.c, src/faillog.c, src/groupmod.c, src/grpconv.c, src/grpunconv.c, src/newgrp.c, src/passwd.c, src/vipw.c: *** empty log message *** 1999-06-07 Marek Micha趾iewicz - * redhat/Attic/shadow-utils.spec.in, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/dpasswd.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, contrib/Makefile.am, contrib/README, contrib/udbachk.tgz, debian/changelog, debian/rules, doc/Attic/CHANGES, doc/LSM, doc/README.linux, doc/README.mirrors, doc/README.platforms, doc/WISHLIST, lib/Makefile.am, lib/fputsx.c, lib/getpass.c, lib/pam_defs.h, lib/prototypes.h, lib/rcsid.h, libmisc/login_desrpc.c, libmisc/pam_pass.c, libmisc/utmp.c, man/login.1, po/el.po, po/pl.po, acconfig.h, configure.in: + * redhat/Attic/shadow-utils.spec.in, src/Attic/dpasswd.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, contrib/Makefile.am, contrib/README, contrib/udbachk.tgz, debian/Attic/changelog, debian/Attic/rules, doc/Attic/CHANGES, doc/LSM, doc/README.linux, doc/README.mirrors, doc/README.platforms, doc/WISHLIST, lib/Makefile.am, lib/fputsx.c, lib/getpass.c, lib/pam_defs.h, lib/prototypes.h, lib/rcsid.h, libmisc/login_desrpc.c, libmisc/pam_pass.c, libmisc/utmp.c, man/login.1, po/el.po, po/pl.po, acconfig.h, configure.in: *** empty log message *** 1999-03-07 Marek Micha趾iewicz - * po/pl.po, po/el.po, doc/LSM, src/useradd.c, src/su.c, src/pwconv.c, src/pwck.c, src/passwd.c, src/newusers.c, src/newgrp.c, src/logoutd.c, src/login.c, src/grpconv.c, src/grpck.c, src/groupadd.c, src/gpasswd.c, src/dpasswd.c, src/chfn.c, src/chage.c, man/usermod.8, man/useradd.8, man/limits.5, man/chage.1, libmisc/valid.c, libmisc/sub.c, libmisc/strtoday.c, libmisc/setupenv.c, libmisc/obscure.c, libmisc/limits.c, libmisc/env.c, lib/snprintf.h, lib/getdef.c, lib/encrypt.c, lib/defines.h, etc/login.defs.linux, doc/WISHLIST, doc/README.nls, doc/README.pam, doc/README.platforms, doc/README.mirrors, doc/README.linux, doc/Makefile.am, doc/Attic/CHANGES, debian/Attic/tar.c, debian/rules, debian/Attic/logoutd, debian/control, debian/changelog, configure.in: + * po/pl.po, po/el.po, doc/LSM, src/useradd.c, src/su.c, src/pwconv.c, src/pwck.c, src/passwd.c, src/newusers.c, src/newgrp.c, src/logoutd.c, src/login.c, src/grpconv.c, src/grpck.c, src/groupadd.c, src/gpasswd.c, src/Attic/dpasswd.c, src/chfn.c, src/chage.c, man/usermod.8, man/useradd.8, man/limits.5, man/chage.1, libmisc/valid.c, libmisc/sub.c, libmisc/strtoday.c, libmisc/setupenv.c, libmisc/obscure.c, libmisc/limits.c, libmisc/env.c, lib/snprintf.h, lib/getdef.c, lib/encrypt.c, lib/defines.h, etc/login.defs.linux, doc/WISHLIST, doc/README.nls, doc/README.pam, doc/README.platforms, doc/README.mirrors, doc/README.linux, doc/Makefile.am, doc/Attic/CHANGES, debian/Attic/tar.c, debian/Attic/rules, debian/Attic/logoutd, debian/Attic/control, debian/Attic/changelog, configure.in: *** empty log message *** 1998-12-28 Marek Micha趾iewicz - * src/usermod.c, src/userdel.c, src/useradd.c, src/sulogin.c, src/su.c, src/pwunconv.c, src/pwconv.c, src/pwck.c, src/passwd.c, src/newusers.c, src/newgrp.c, src/mkpasswd.c, src/logoutd.c, src/login.c, src/lastlog.c, src/id.c, src/grpunconv.c, src/grpconv.c, src/grpck.c, src/groups.c, src/groupmod.c, src/groupdel.c, src/groupadd.c, src/gpasswd.c, src/faillog.c, src/expiry.c, src/dpasswd.c, src/chsh.c, src/chpasswd.c, src/chfn.c, src/chage.c, po/Attic/doit, po/POTFILES.in, po/el.po, src/Makefile.am, man/usermod.8, man/userdel.8, man/useradd.8, man/sulogin.8, man/su.1, man/shadow.5, man/shadow.3, man/pwck.8, man/pwauth.8, man/pw_auth.3, man/porttime.5, man/passwd.5, man/passwd.1, man/newusers.8, man/newgrp.1, man/mkpasswd.8, man/logoutd.8, man/login.defs.5, man/login.1, man/lastlog.8, man/id.1, man/grpck.8, man/groups.1, man/groupmod.8, man/groupdel.8, man/groupadd.8, man/faillog.8, man/faillog.5, man/dpasswd.8, man/chsh.1, man/chpasswd.8, man/chfn.1, man/chage.1, libmisc/xmalloc.c, libmisc/sub.c, libmisc/Attic/suauth.c, libmisc/shell.c, libmisc/setupenv.c, libmisc/pam_pass.c, libmisc/obscure.c, libmisc/mail.c, libmisc/login_desrpc.c, libmisc/limits.c, libmisc/failure.c, libmisc/env.c, libmisc/console.c, libmisc/chowntty.c, libmisc/age.c, libmisc/addgrps.c, libmisc/Makefile.am, lib/strerror.c, lib/pwauth.c, lib/prototypes.h, lib/getpass.c, lib/getdef.c, lib/dialchk.c, lib/defines.h, lib/Makefile.am, doc/WISHLIST, doc/README.platforms, doc/README.mirrors, doc/README.linux, doc/README, doc/LSM, doc/Attic/CHANGES, debian/secure-su.copyright, debian/passwd.copyright, debian/login.copyright, debian/control, debian/changelog, configure.in, acconfig.h, Makefile.am: + * src/usermod.c, src/userdel.c, src/useradd.c, src/sulogin.c, src/su.c, src/pwunconv.c, src/pwconv.c, src/pwck.c, src/passwd.c, src/newusers.c, src/newgrp.c, src/mkpasswd.c, src/logoutd.c, src/login.c, src/lastlog.c, src/id.c, src/grpunconv.c, src/grpconv.c, src/grpck.c, src/groups.c, src/groupmod.c, src/groupdel.c, src/groupadd.c, src/gpasswd.c, src/faillog.c, src/expiry.c, src/Attic/dpasswd.c, src/chsh.c, src/chpasswd.c, src/chfn.c, src/chage.c, po/Attic/doit, po/POTFILES.in, po/el.po, src/Makefile.am, man/usermod.8, man/userdel.8, man/useradd.8, man/sulogin.8, man/su.1, man/shadow.5, man/shadow.3, man/pwck.8, man/Attic/pwauth.8, man/pw_auth.3, man/porttime.5, man/passwd.5, man/passwd.1, man/newusers.8, man/newgrp.1, man/mkpasswd.8, man/logoutd.8, man/login.defs.5, man/login.1, man/lastlog.8, man/id.1, man/grpck.8, man/groups.1, man/groupmod.8, man/groupdel.8, man/groupadd.8, man/faillog.8, man/faillog.5, man/Attic/dpasswd.8, man/chsh.1, man/chpasswd.8, man/chfn.1, man/chage.1, libmisc/xmalloc.c, libmisc/sub.c, libmisc/Attic/suauth.c, libmisc/shell.c, libmisc/setupenv.c, libmisc/pam_pass.c, libmisc/obscure.c, libmisc/mail.c, libmisc/login_desrpc.c, libmisc/limits.c, libmisc/failure.c, libmisc/env.c, libmisc/console.c, libmisc/chowntty.c, libmisc/age.c, libmisc/addgrps.c, libmisc/Makefile.am, lib/strerror.c, lib/pwauth.c, lib/prototypes.h, lib/getpass.c, lib/getdef.c, lib/Attic/dialchk.c, lib/defines.h, lib/Makefile.am, doc/WISHLIST, doc/README.platforms, doc/README.mirrors, doc/README.linux, doc/README, doc/LSM, doc/Attic/CHANGES, debian/Attic/secure-su.copyright, debian/Attic/passwd.copyright, debian/Attic/login.copyright, debian/Attic/control, debian/Attic/changelog, configure.in, acconfig.h, Makefile.am: *** empty log message *** 1998-07-24 Marek Micha趾iewicz - * src/passwd.c, src/su.c, src/userdel.c, src/Makefile.am, src/chage.c, src/faillog.c, src/login.c, lib/pwauth.c, lib/tcfsio.c, lib/tcfsio.h, libmisc/chowntty.c, libmisc/pam_pass.c, libmisc/setugid.c, etc/pam.d/passwd, etc/pam.d/su, lib/Makefile.am, lib/commonio.c, lib/defines.h, lib/prototypes.h, doc/Makefile.am, doc/README.linux, doc/README.mirrors, doc/README.platforms, doc/WISHLIST, etc/Makefile.am, etc/pam.d/Makefile.am, doc/Attic/CHANGES, debian/changelog, configure.in, acconfig.h: + * src/passwd.c, src/su.c, src/userdel.c, src/Makefile.am, src/chage.c, src/faillog.c, src/login.c, lib/Attic/tcfsio.c, lib/Attic/tcfsio.h, lib/pwauth.c, libmisc/chowntty.c, libmisc/pam_pass.c, libmisc/setugid.c, etc/pam.d/passwd, etc/pam.d/su, lib/Makefile.am, lib/commonio.c, lib/defines.h, lib/prototypes.h, doc/Makefile.am, doc/README.linux, doc/README.mirrors, doc/README.platforms, doc/WISHLIST, etc/Makefile.am, etc/pam.d/Makefile.am, doc/Attic/CHANGES, debian/Attic/changelog, configure.in, acconfig.h: *** empty log message *** 1998-06-26 Marek Micha趾iewicz - * src/passwd.c, src/usermod.c, man/faillog.8, man/pwconv.8, src/logoutd.c, lib/getpass.c, libmisc/copydir.c, doc/README.linux, doc/README.mirrors, doc/WISHLIST, lib/commonio.c, debian/changelog, doc/Attic/CHANGES, configure.in: + * src/passwd.c, src/usermod.c, man/faillog.8, man/pwconv.8, src/logoutd.c, lib/getpass.c, libmisc/copydir.c, doc/README.linux, doc/README.mirrors, doc/WISHLIST, lib/commonio.c, debian/Attic/changelog, doc/Attic/CHANGES, configure.in: *** empty log message *** 1998-05-29 Marek Micha趾iewicz - * man/lastlog.8, man/login.1, src/usermod.c, doc/Attic/CHANGES, doc/README.linux, etc/login.defs.linux, lib/defines.h, debian/changelog, debian/login.copyright, debian/login.postinst, debian/passwd.copyright, debian/rules, debian/secure-su.copyright, configure.in, contrib/Makefile.am, contrib/shadow-anonftp.patch: + * man/lastlog.8, man/login.1, src/usermod.c, doc/Attic/CHANGES, doc/README.linux, etc/login.defs.linux, lib/defines.h, debian/Attic/changelog, debian/Attic/login.copyright, debian/Attic/login.postinst, debian/Attic/passwd.copyright, debian/Attic/rules, debian/Attic/secure-su.copyright, configure.in, contrib/Makefile.am, contrib/shadow-anonftp.patch: *** empty log message *** 1998-04-16 Marek Micha趾iewicz - * src/useradd.c, src/userdel.c, src/usermod.c, src/passwd.c, src/sulogin.c, src/groupdel.c, src/login.c, src/logoutd.c, src/newgrp.c, src/chage.c, src/dpasswd.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, redhat/Attic/shadow-970616-rh.patch, redhat/Attic/shadow-970616-utuser.patch, redhat/Attic/shadow-970616.login.defs, redhat/Attic/shadow-970616.useradd, redhat/Attic/shadow-utils-970616.spec, src/Makefile.am, libmisc/utmp.c, redhat/Attic/Makefile.am, redhat/Attic/README, redhat/Attic/shadow-970616-fix.patch, redhat/Attic/shadow-970616-glibc.patch, libmisc/limits.c, libmisc/log.c, libmisc/login_desrpc.c, libmisc/loginprompt.c, libmisc/obscure.c, libmisc/strtoday.c, libmisc/chkname.c, libmisc/chowndir.c, libmisc/copydir.c, libmisc/failure.c, lib/defines.h, lib/dialchk.c, lib/pwauth.c, lib/pwpack.c, doc/Attic/CHANGES, doc/README.linux, doc/WISHLIST, doc/cracklib26.diff, lib/commonio.c, acconfig.h, configure.in, debian/Attic/tar.c: + * src/useradd.c, src/userdel.c, src/usermod.c, src/passwd.c, src/sulogin.c, src/groupdel.c, src/login.c, src/logoutd.c, src/newgrp.c, src/Attic/dpasswd.c, src/chage.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, redhat/Attic/shadow-970616-rh.patch, redhat/Attic/shadow-970616-utuser.patch, redhat/Attic/shadow-970616.login.defs, redhat/Attic/shadow-970616.useradd, redhat/Attic/shadow-utils-970616.spec, src/Makefile.am, libmisc/utmp.c, redhat/Attic/Makefile.am, redhat/Attic/README, redhat/Attic/shadow-970616-fix.patch, redhat/Attic/shadow-970616-glibc.patch, libmisc/limits.c, libmisc/log.c, libmisc/login_desrpc.c, libmisc/loginprompt.c, libmisc/obscure.c, libmisc/strtoday.c, libmisc/chkname.c, libmisc/chowndir.c, libmisc/copydir.c, libmisc/failure.c, lib/Attic/dialchk.c, lib/defines.h, lib/pwauth.c, lib/pwpack.c, doc/Attic/CHANGES, doc/README.linux, doc/WISHLIST, doc/cracklib26.diff, lib/commonio.c, acconfig.h, configure.in, debian/Attic/tar.c: *** empty log message *** 1998-04-02 Marek Micha趾iewicz @@ -946,7 +1480,7 @@ 1998-01-30 Marek Micha趾iewicz - * Attic/install-sh, src/userdel.c, src/usermod.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/useradd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/groupmod.c, src/login.c, src/logoutd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, redhat/Attic/README, redhat/Attic/shadow-utils.spec.in, src/Makefile.am, src/chage.c, man/login.defs.5, man/useradd.8, man/usermod.8, redhat/Attic/Makefile.am, libmisc/pam_pass.c, libmisc/strtoday.c, libmisc/tz.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/obscure.c, libmisc/age.c, libmisc/env.c, libmisc/limits.c, lib/shadow.c, lib/shadowio.c, lib/shadowio.h, lib/strstr.c, lib/utent.c, lib/pwio.c, lib/pwio.h, lib/rmdir.c, lib/sgetspent.c, lib/sgroupio.c, lib/mkdir.c, lib/prototypes.h, lib/putgrent.c, lib/pwauth.c, lib/md5crypt.c, lib/getpass.c, lib/groupio.c, lib/gshadow.c, lib/lockpw.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/getdef.h, doc/Attic/automake-1.0.diff, doc/README.mirrors, doc/WISHLIST, lib/Makefile.am, lib/commonio.c, doc/ANNOUNCE, doc/Attic/CHANGES, doc/Makefile.am, doc/README.limits, doc/README.linux, debian/Makefile.am, debian/changelog, debian/login.copyright, debian/rules, Attic/mkinstalldirs, Attic/shadow-utils.spec, contrib/README, Attic/aclocal.m4, acconfig.h, configure.in, Makefile.am: + * Attic/install-sh, src/userdel.c, src/usermod.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/useradd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/groupmod.c, src/login.c, src/logoutd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, redhat/Attic/README, redhat/Attic/shadow-utils.spec.in, src/Makefile.am, src/chage.c, man/login.defs.5, man/useradd.8, man/usermod.8, redhat/Attic/Makefile.am, libmisc/pam_pass.c, libmisc/strtoday.c, libmisc/tz.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/obscure.c, libmisc/age.c, libmisc/env.c, libmisc/limits.c, lib/shadow.c, lib/shadowio.c, lib/shadowio.h, lib/strstr.c, lib/utent.c, lib/pwio.c, lib/pwio.h, lib/rmdir.c, lib/sgetspent.c, lib/sgroupio.c, lib/mkdir.c, lib/prototypes.h, lib/putgrent.c, lib/pwauth.c, lib/md5crypt.c, lib/getpass.c, lib/groupio.c, lib/gshadow.c, lib/lockpw.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/getdef.h, doc/Attic/automake-1.0.diff, doc/README.mirrors, doc/WISHLIST, lib/Makefile.am, lib/commonio.c, doc/Attic/ANNOUNCE, doc/Attic/CHANGES, doc/Makefile.am, doc/README.limits, doc/README.linux, debian/Attic/Makefile.am, debian/Attic/changelog, debian/Attic/login.copyright, debian/Attic/rules, Attic/mkinstalldirs, Attic/shadow-utils.spec, contrib/README, Attic/aclocal.m4, acconfig.h, configure.in, Makefile.am: *** empty log message *** 1998-01-25 Marek Micha趾iewicz @@ -955,22 +1489,22 @@ 1997-12-14 Marek Micha趾iewicz - * doc/Attic/CHANGES, debian/checksums, debian/rules, debian/Makefile.am, src/Makefile.am, src/userdel.c, src/usermod.c, src/pwck.c, src/useradd.c, src/mkpasswd.c, src/gpasswd.c, src/grpck.c, src/login.c, src/chage.c, src/chfn.c, src/chsh.c, man/shadowconfig.8, man/vipw.8, old/Makefile.am, old/pwunconv.8, man/Makefile.am, man/login.defs.5, man/pwconv.8, man/pwunconv.8, libmisc/limits.c, libmisc/rlogin.c, lib/prototypes.h, lib/pwdbm.c, lib/pwent.c, lib/shadow.c, doc/LSM, doc/WISHLIST, etc/limits, lib/grent.c, Attic/shadow-utils.spec, debian/changelog, configure.in: + * doc/Attic/CHANGES, debian/Attic/checksums, debian/Attic/rules, debian/Attic/Makefile.am, src/Makefile.am, src/userdel.c, src/usermod.c, src/pwck.c, src/useradd.c, src/mkpasswd.c, src/gpasswd.c, src/grpck.c, src/login.c, src/chage.c, src/chfn.c, src/chsh.c, man/shadowconfig.8, man/vipw.8, old/Attic/Makefile.am, old/Attic/pwunconv.8, man/Makefile.am, man/login.defs.5, man/pwconv.8, man/pwunconv.8, libmisc/limits.c, libmisc/rlogin.c, lib/prototypes.h, lib/pwdbm.c, lib/pwent.c, lib/shadow.c, doc/LSM, doc/WISHLIST, etc/limits, lib/grent.c, Attic/shadow-utils.spec, debian/Attic/changelog, configure.in: *** empty log message *** 1997-12-08 Marek Micha趾iewicz - * src/userdel.c, src/usermod.c, src/Attic/shadowconfig.sh, src/su.c, src/sulogin.c, src/useradd.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/newgrp.c, src/newusers.c, src/logoutd.c, src/mkpasswd.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/chsh.c, src/dpasswd.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, old/Makefile.am, old/pwconv.8, old/vipw.8, man/Makefile.am, man/limits.5, man/pwconv.8, man/shadowconfig.8, man/vipw.8, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, libmisc/Attic/suauth.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setup.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/rlogin.c, libmisc/motd.c, libmisc/myname.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/pwd2spwd.c, libmisc/pwd_init.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/failure.h, libmisc/fields.c, libmisc/getdate.c, libmisc/getdate.h, libmisc/getdate.y, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chkname.h, libmisc/chkshell.c, lib/strdup.c, lib/strerror.c, lib/strstr.c, lib/utent.c, libmisc/Makefile.am, libmisc/addgrps.c, lib/sgroupio.c, lib/shadow.c, lib/shadowio.c, lib/spdbm.c, lib/sppack.c, lib/rename.c, lib/rmdir.c, lib/sgetgrent.c, lib/sgetpwent.c, lib/sgetspent.c, lib/rad64.c, lib/pwauth.c, lib/pwdbm.c, lib/pwent.c, lib/pwio.c, lib/pwpack.c, lib/mkdir.c, lib/port.c, lib/prototypes.h, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/gsdbm.c, lib/gshadow.c, lib/gspack.c, lib/lockpw.c, lib/md5.c, lib/md5crypt.c, lib/grdbm.c, lib/grent.c, lib/groupio.c, lib/grpack.c, lib/getpass.c, lib/dialup.c, lib/encrypt.c, lib/fputsx.c, lib/getdef.c, lib/commonio.c, lib/commonio.h, lib/defines.h, lib/dialchk.c, lib/dialchk.h, doc/Attic/automake-1.0.diff, etc/limits, etc/login.defs.linux, lib/Makefile.am, doc/Attic/CHANGES, doc/README.linux, doc/README.mirrors, doc/WISHLIST, debian/login.conffiles, debian/login.postinst, debian/passwd.postinst, debian/porttime, debian/rules, debian/secure-su.README, debian/securetty, contrib/pwdauth.c, debian/changelog, debian/control, Attic/aclocal.m4, Attic/shadow-utils.spec, acconfig.h, configure.in, Makefile.am: + * src/userdel.c, src/usermod.c, src/Attic/shadowconfig.sh, src/su.c, src/sulogin.c, src/useradd.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/newgrp.c, src/newusers.c, src/logoutd.c, src/mkpasswd.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/Attic/dpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, old/Attic/Makefile.am, old/Attic/pwconv.8, old/Attic/vipw.8, man/Makefile.am, man/limits.5, man/pwconv.8, man/shadowconfig.8, man/vipw.8, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, libmisc/Attic/suauth.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setup.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/rlogin.c, libmisc/motd.c, libmisc/myname.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/pwd2spwd.c, libmisc/pwd_init.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/Attic/getdate.c, libmisc/failure.h, libmisc/fields.c, libmisc/getdate.h, libmisc/getdate.y, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chkname.h, libmisc/chkshell.c, lib/strdup.c, lib/strerror.c, lib/strstr.c, lib/utent.c, libmisc/Makefile.am, libmisc/addgrps.c, lib/sgroupio.c, lib/shadow.c, lib/shadowio.c, lib/spdbm.c, lib/sppack.c, lib/rename.c, lib/rmdir.c, lib/sgetgrent.c, lib/sgetpwent.c, lib/sgetspent.c, lib/rad64.c, lib/pwauth.c, lib/pwdbm.c, lib/pwent.c, lib/pwio.c, lib/pwpack.c, lib/mkdir.c, lib/port.c, lib/prototypes.h, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/gsdbm.c, lib/gshadow.c, lib/gspack.c, lib/lockpw.c, lib/md5.c, lib/md5crypt.c, lib/grdbm.c, lib/grent.c, lib/groupio.c, lib/grpack.c, lib/getpass.c, lib/Attic/dialup.c, lib/encrypt.c, lib/fputsx.c, lib/getdef.c, lib/Attic/dialchk.c, lib/Attic/dialchk.h, lib/commonio.c, lib/commonio.h, lib/defines.h, doc/Attic/automake-1.0.diff, etc/limits, etc/login.defs.linux, lib/Makefile.am, doc/Attic/CHANGES, doc/README.linux, doc/README.mirrors, doc/WISHLIST, debian/Attic/login.conffiles, debian/Attic/login.postinst, debian/Attic/passwd.postinst, debian/Attic/porttime, debian/Attic/rules, debian/Attic/secure-su.README, debian/Attic/securetty, contrib/pwdauth.c, debian/Attic/changelog, debian/Attic/control, Attic/aclocal.m4, Attic/shadow-utils.spec, acconfig.h, configure.in, Makefile.am: *** empty log message *** 1997-10-01 Marek Micha趾iewicz - * debian/changelog, src/chpasswd.c, libmisc/login_access.c, lib/commonio.h, lib/sgroupio.c, lib/shadowio.c, etc/login.defs.linux, doc/Attic/CHANGES, doc/LSM, doc/README.mirrors, doc/WISHLIST, Attic/shadow-utils.spec: + * debian/Attic/changelog, src/chpasswd.c, libmisc/login_access.c, lib/commonio.h, lib/sgroupio.c, lib/shadowio.c, etc/login.defs.linux, doc/Attic/CHANGES, doc/LSM, doc/README.mirrors, doc/WISHLIST, Attic/shadow-utils.spec: *** empty log message *** 1997-09-30 Marek Micha趾iewicz - * src/useradd.c, src/userdel.c, src/usermod.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/newusers.c, src/passwd.c, src/pwck.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/login.c, src/groupmod.c, src/dpasswd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/Makefile.am, old/Attic/install-sh, old/pwconv-old.8, old/pwunconv-old.8, old/Makefile.am, man/pwconv.8, man/pwunconv.8, libmisc/setugid.c, libmisc/shell.c, libmisc/utmp.c, libmisc/mail.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/salt.c, libmisc/isexpired.c, libmisc/login_access.c, libmisc/env.c, libmisc/fields.c, libmisc/addgrps.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, lib/strerror.c, lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.c, lib/shadowio.h, lib/snprintf.c, lib/snprintf.h, lib/putgrent.c, lib/pwauth.c, lib/pwent.c, lib/getpass.c, lib/grent.c, lib/prototypes.h, lib/commonio.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/Makefile.am, etc/login.defs.linux, doc/README.linux, doc/README.mirrors, doc/WISHLIST, doc/Attic/CHANGES, doc/LSM, doc/Makefile.am, debian/rules, debian/changelog, contrib/adduser.c, configure.in, acconfig.h: + * src/useradd.c, src/userdel.c, src/usermod.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/newusers.c, src/passwd.c, src/pwck.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/login.c, src/groupmod.c, src/Attic/dpasswd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/Makefile.am, old/Attic/install-sh, old/Attic/pwconv-old.8, old/Attic/pwunconv-old.8, old/Attic/Makefile.am, man/pwconv.8, man/pwunconv.8, libmisc/setugid.c, libmisc/shell.c, libmisc/utmp.c, libmisc/mail.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/salt.c, libmisc/isexpired.c, libmisc/login_access.c, libmisc/env.c, libmisc/fields.c, libmisc/addgrps.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, lib/strerror.c, lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.c, lib/shadowio.h, lib/snprintf.c, lib/snprintf.h, lib/putgrent.c, lib/pwauth.c, lib/pwent.c, lib/getpass.c, lib/grent.c, lib/prototypes.h, lib/commonio.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/Makefile.am, etc/login.defs.linux, doc/README.linux, doc/README.mirrors, doc/WISHLIST, doc/Attic/CHANGES, doc/LSM, doc/Makefile.am, debian/Attic/rules, debian/Attic/changelog, contrib/adduser.c, configure.in, acconfig.h: *** empty log message *** 1997-09-29 Marek Micha趾iewicz @@ -980,17 +1514,17 @@ 1997-06-16 Marek Micha趾iewicz - * doc/Attic/console.c.spec, doc/Makefile.am, doc/WISHLIST, doc/console.c.spec.txt, doc/Attic/CHANGES, debian/changelog, src/Attic/shadowconfig.sh, redhat/Attic/Makefile.am, redhat/Attic/README, redhat/Attic/shadow-970502-config.patch, redhat/Attic/shadow-utils.spec, doc/Attic/README.shadow-paper, doc/README.mirrors, doc/README.linux, debian/login.copyright, debian/passwd.copyright, debian/secure-su.copyright, Attic/shadow-utils.spec, Makefile.am, configure.in: + * doc/Attic/console.c.spec, doc/Makefile.am, doc/WISHLIST, doc/console.c.spec.txt, doc/Attic/CHANGES, debian/Attic/changelog, src/Attic/shadowconfig.sh, redhat/Attic/Makefile.am, redhat/Attic/README, redhat/Attic/shadow-970502-config.patch, redhat/Attic/shadow-utils.spec, doc/Attic/README.shadow-paper, doc/README.mirrors, doc/README.linux, debian/Attic/login.copyright, debian/Attic/passwd.copyright, debian/Attic/secure-su.copyright, Attic/shadow-utils.spec, Makefile.am, configure.in: *** empty log message *** 1997-06-01 Marek Micha趾iewicz - * debian/changelog, src/userdel.c, src/usermod.c, src/pwck.c, src/pwunconv.c, src/useradd.c, src/grpunconv.c, src/newusers.c, src/passwd.c, src/expiry.c, src/grpconv.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/Makefile.am, redhat/Attic/Makefile.am, redhat/Attic/README, redhat/Attic/shadow-970502-config.patch, redhat/Attic/shadow-utils.spec, libmisc/mail.c, libmisc/login_desrpc.c, lib/pwio.h, lib/shadowio.c, lib/shadowio.h, lib/prototypes.h, lib/pwauth.c, lib/pwio.c, lib/commonio.c, lib/defines.h, doc/README.linux, doc/WISHLIST, doc/Attic/CHANGES, doc/INSTALL, Attic/install-sh, Attic/mkinstalldirs, Makefile.am, acconfig.h, configure.in: + * debian/Attic/changelog, src/userdel.c, src/usermod.c, src/pwck.c, src/pwunconv.c, src/useradd.c, src/grpunconv.c, src/newusers.c, src/passwd.c, src/expiry.c, src/grpconv.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/Makefile.am, redhat/Attic/Makefile.am, redhat/Attic/README, redhat/Attic/shadow-970502-config.patch, redhat/Attic/shadow-utils.spec, libmisc/mail.c, libmisc/login_desrpc.c, lib/pwio.h, lib/shadowio.c, lib/shadowio.h, lib/prototypes.h, lib/pwauth.c, lib/pwio.c, lib/commonio.c, lib/defines.h, doc/README.linux, doc/WISHLIST, doc/Attic/CHANGES, doc/INSTALL, Attic/install-sh, Attic/mkinstalldirs, Makefile.am, acconfig.h, configure.in: *** empty log message *** 1997-05-02 Marek Micha趾iewicz - * src/Attic/shadowconfig.sh, src/Makefile.am, man/Makefile.am, libmisc/mail.c, libmisc/salt.c, lib/sgroupio.c, lib/shadowio.c, lib/groupio.c, lib/pwio.c, etc/Makefile.am, doc/WISHLIST, doc/Attic/CHANGES, debian/Attic/shadowconfig, debian/Makefile.am, debian/changelog, debian/control, debian/rules, configure.in, Attic/configure, shlib/Attic/Makefile.in, man/Attic/Makefile.in, libmisc/Attic/Makefile.in, lib/Attic/Makefile.in, etc/Attic/Makefile.in, doc/Attic/Makefile.in, contrib/Attic/Makefile.in, Attic/Makefile.in, man/userdel.8, man/usermod.8, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/pw_auth.3, man/pwauth.8, man/pwck.8, man/pwconv.8, man/pwunconv.8, man/shadow.3, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/limits.5, man/login.1, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/faillog.5, man/faillog.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/dpasswd.8, libmisc/valid.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/utmp.c, libmisc/setup.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/setugid.c, libmisc/obscure.c, libmisc/pwd2spwd.c, libmisc/rlogin.c, libmisc/login_access.c, libmisc/loginprompt.c, libmisc/motd.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/copydir.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/age.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, lib/utent.c, lib/shadow_.h, lib/spdbm.c, lib/sppack.c, lib/strstr.c, lib/shadow.c, lib/sgetpwent.c, lib/sgetspent.c, lib/pwpack.c, lib/rad64.c, lib/rename.c, lib/rmdir.c, lib/sgetgrent.c, lib/pwauth.h, lib/pwdbm.c, lib/pwent.c, lib/port.h, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/pwauth.c, lib/lastlog_.h, lib/lockpw.c, lib/mkdir.c, lib/port.c, lib/grpack.c, lib/gsdbm.c, lib/gshadow.c, lib/gshadow_.h, lib/gspack.c, lib/getdef.c, lib/getpass.c, lib/grdbm.c, lib/grent.c, lib/dialup.h, lib/encrypt.c, lib/faillog.h, lib/fputsx.c, lib/commonio.c, lib/defines.h, lib/dialchk.c, lib/dialup.c, etc/login.defs, etc/login.defs.linux, doc/README.linux, doc/LICENSE, doc/Makefile.am, doc/README, doc/HOWTO, doc/ANNOUNCE, debian/secure-su.README, debian/secure-su.conffiles, debian/secure-su.copyright, debian/secure-su.postrm, debian/secure-su.preinst, debian/securetty, debian/passwd.conffiles, debian/passwd.copyright, debian/passwd.postinst, debian/porttime, debian/Attic/logoutd, debian/login.conffiles, debian/login.copyright, debian/login.postinst, debian/login.postrm, debian/login.preinst, debian/login.prerm, Attic/config.h.in, acconfig.h, Makefile.am, old/Attic/Makefile.in, old/scologin.c, old/orig-config.h, old/pwconv-old.c, old/pwd.h.m4, old/pwunconv-old.c, old/config.h.sun4, old/config.h.svr4, old/config.h.xenix, old/config.h.linux, old/Makefile.sun4, old/Makefile.svr4, old/Makefile.xenix, old/Makefile.am, old/Makefile.linux, src/Attic/Makefile.in, src/pwconv.c, src/userdel.c, src/usermod.c, src/useradd.c, src/su.c, src/sulogin.c, src/Attic/pwconv5.c, src/Attic/scologin.c, src/pwck.c, src/pwunconv.c, src/Attic/patchlevel.h, src/newusers.c, src/passwd.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/grpck.c, src/grpconv.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/chsh.c, src/dpasswd.c, src/expiry.c, src/chfn.c, src/chpasswd.c, src/chage.c: + * src/Attic/shadowconfig.sh, src/Makefile.am, man/Makefile.am, libmisc/mail.c, libmisc/salt.c, lib/sgroupio.c, lib/shadowio.c, lib/groupio.c, lib/pwio.c, etc/Makefile.am, doc/WISHLIST, doc/Attic/CHANGES, debian/Attic/shadowconfig, debian/Attic/Makefile.am, debian/Attic/changelog, debian/Attic/control, debian/Attic/rules, configure.in, Attic/configure, shlib/Attic/Makefile.in, man/Attic/Makefile.in, libmisc/Attic/Makefile.in, lib/Attic/Makefile.in, etc/Attic/Makefile.in, doc/Attic/Makefile.in, contrib/Attic/Makefile.in, Attic/Makefile.in, man/userdel.8, man/usermod.8, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/Attic/pwauth.8, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/pwunconv.8, man/shadow.3, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/limits.5, man/login.1, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/faillog.5, man/faillog.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/Attic/dpasswd.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, libmisc/valid.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/utmp.c, libmisc/setup.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/setugid.c, libmisc/obscure.c, libmisc/pwd2spwd.c, libmisc/rlogin.c, libmisc/login_access.c, libmisc/loginprompt.c, libmisc/motd.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/copydir.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/age.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, lib/utent.c, lib/shadow_.h, lib/spdbm.c, lib/sppack.c, lib/strstr.c, lib/shadow.c, lib/sgetpwent.c, lib/sgetspent.c, lib/pwpack.c, lib/rad64.c, lib/rename.c, lib/rmdir.c, lib/sgetgrent.c, lib/pwauth.h, lib/pwdbm.c, lib/pwent.c, lib/port.h, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/pwauth.c, lib/lastlog_.h, lib/lockpw.c, lib/mkdir.c, lib/port.c, lib/grpack.c, lib/gsdbm.c, lib/gshadow.c, lib/gshadow_.h, lib/gspack.c, lib/getdef.c, lib/getpass.c, lib/grdbm.c, lib/grent.c, lib/Attic/dialup.h, lib/encrypt.c, lib/faillog.h, lib/fputsx.c, lib/Attic/dialchk.c, lib/Attic/dialup.c, lib/commonio.c, lib/defines.h, etc/login.defs, etc/login.defs.linux, doc/README.linux, doc/LICENSE, doc/Makefile.am, doc/README, doc/HOWTO, doc/Attic/ANNOUNCE, debian/Attic/secure-su.README, debian/Attic/secure-su.conffiles, debian/Attic/secure-su.copyright, debian/Attic/secure-su.postrm, debian/Attic/secure-su.preinst, debian/Attic/securetty, debian/Attic/passwd.conffiles, debian/Attic/passwd.copyright, debian/Attic/passwd.postinst, debian/Attic/porttime, debian/Attic/login.conffiles, debian/Attic/login.copyright, debian/Attic/login.postinst, debian/Attic/login.postrm, debian/Attic/login.preinst, debian/Attic/login.prerm, debian/Attic/logoutd, Attic/config.h.in, acconfig.h, Makefile.am, old/Attic/Makefile.in, old/Attic/scologin.c, old/Attic/orig-config.h, old/Attic/pwconv-old.c, old/Attic/pwd.h.m4, old/Attic/pwunconv-old.c, old/Attic/config.h.sun4, old/Attic/config.h.svr4, old/Attic/config.h.xenix, old/Attic/config.h.linux, old/Attic/Makefile.sun4, old/Attic/Makefile.svr4, old/Attic/Makefile.xenix, old/Attic/Makefile.am, old/Attic/Makefile.linux, src/Attic/Makefile.in, src/pwconv.c, src/userdel.c, src/usermod.c, src/useradd.c, src/su.c, src/sulogin.c, src/Attic/pwconv5.c, src/Attic/scologin.c, src/pwck.c, src/pwunconv.c, src/Attic/patchlevel.h, src/newusers.c, src/passwd.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/grpck.c, src/grpconv.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/Attic/dpasswd.c, src/chsh.c, src/expiry.c, src/chfn.c, src/chpasswd.c, src/chage.c: *** empty log message *** 1997-02-11 Marek Micha趾iewicz @@ -1015,27 +1549,27 @@ 1996-09-20 Marek Micha趾iewicz - * src/usermod.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/newusers.c, src/passwd.c, src/pwck.c, src/grpck.c, src/login.c, src/logoutd.c, src/newgrp.c, src/groupdel.c, src/groupmod.c, src/chsh.c, src/dpasswd.c, src/gpasswd.c, src/groupadd.c, src/Attic/Makefile.in, src/chage.c, src/chfn.c, src/Makefile.am, libmisc/Attic/suauth.c, libmisc/shell.c, libmisc/sub.c, libmisc/ttytype.c, libmisc/env.c, libmisc/setugid.c, libmisc/setupenv.c, libmisc/chowntty.c, lib/prototypes.h, lib/getdef.c, doc/Attic/CHANGES, doc/WISHLIST: + * src/usermod.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/newusers.c, src/passwd.c, src/pwck.c, src/grpck.c, src/login.c, src/logoutd.c, src/newgrp.c, src/groupdel.c, src/groupmod.c, src/Attic/dpasswd.c, src/chsh.c, src/gpasswd.c, src/groupadd.c, src/Attic/Makefile.in, src/chage.c, src/chfn.c, src/Makefile.am, libmisc/Attic/suauth.c, libmisc/shell.c, libmisc/sub.c, libmisc/ttytype.c, libmisc/env.c, libmisc/setugid.c, libmisc/setupenv.c, libmisc/chowntty.c, lib/prototypes.h, lib/getdef.c, doc/Attic/CHANGES, doc/WISHLIST: *** empty log message *** 1996-09-10 Marek Micha趾iewicz - * src/su.c, src/sulogin.c, src/usermod.c, src/logoutd.c, src/newgrp.c, src/passwd.c, src/pwconv.c, src/Attic/Makefile.in, src/chfn.c, src/chsh.c, src/grpunconv.c, src/login.c, src/Makefile.am, man/useradd.8, man/userdel.8, man/usermod.8, man/shadow.3, man/shadow.5, man/su.1, man/suauth.5, man/sulogin.8, man/pw_auth.3, man/pwauth.8, man/pwck.8, man/pwconv.8, man/pwunconv.8, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/login.access.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/dpasswd.8, man/faillog.5, libmisc/isexpired.c, libmisc/obscure.c, libmisc/setupenv.c, libmisc/utmp.c, libmisc/age.c, lib/defines.h, lib/getdef.c, lib/getpass.c, etc/limits, etc/login.access, etc/login.defs.linux, doc/Attic/CHANGES, doc/README.linux, doc/WISHLIST, contrib/Attic/Makefile.in, contrib/Makefile.am, Attic/configure, configure.in: + * src/su.c, src/sulogin.c, src/usermod.c, src/logoutd.c, src/newgrp.c, src/passwd.c, src/pwconv.c, src/Attic/Makefile.in, src/chfn.c, src/chsh.c, src/grpunconv.c, src/login.c, src/Makefile.am, man/useradd.8, man/userdel.8, man/usermod.8, man/shadow.3, man/shadow.5, man/su.1, man/suauth.5, man/sulogin.8, man/Attic/pwauth.8, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/pwunconv.8, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/login.access.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/Attic/dpasswd.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/faillog.5, libmisc/isexpired.c, libmisc/obscure.c, libmisc/setupenv.c, libmisc/utmp.c, libmisc/age.c, lib/defines.h, lib/getdef.c, lib/getpass.c, etc/limits, etc/login.access, etc/login.defs.linux, doc/Attic/CHANGES, doc/README.linux, doc/WISHLIST, contrib/Attic/Makefile.in, contrib/Makefile.am, Attic/configure, configure.in: *** empty log message *** 1996-08-10 Marek Micha趾iewicz - * old/Attic/install-sh, old/Makefile.am, old/Makefile.linux, old/Makefile.sun4, old/Makefile.svr4, old/Makefile.xenix, old/config.h.linux, old/config.h.sun4, old/config.h.svr4, old/config.h.xenix, old/orig-config.h, old/pwd.h.m4, shlib/Attic/Makefile.am, shlib/Attic/Makefile.in, shlib/Attic/Makefile.in.saved: + * old/Attic/Makefile.am, old/Attic/Makefile.linux, old/Attic/Makefile.sun4, old/Attic/Makefile.svr4, old/Attic/Makefile.xenix, old/Attic/config.h.linux, old/Attic/config.h.sun4, old/Attic/config.h.svr4, old/Attic/config.h.xenix, old/Attic/install-sh, old/Attic/orig-config.h, old/Attic/pwd.h.m4, shlib/Attic/Makefile.am, shlib/Attic/Makefile.in, shlib/Attic/Makefile.in.saved: New file. * contrib/adduser-old.c, contrib/adduser.sh, contrib/adduser2.sh, contrib/atudel, doc/README.sun4: 960810 - first version under cvs - * contrib/Attic/Makefile.in, contrib/Makefile.am, contrib/README, contrib/adduser.c, contrib/pwdauth.c, doc/ANNOUNCE, doc/Attic/CHANGES, doc/Attic/Makefile.in, doc/Attic/automake-1.0.diff, doc/Attic/console.c.spec, doc/HOWTO, doc/LICENSE, doc/Makefile.am, doc/README, doc/README.limits, doc/README.linux, doc/WISHLIST, etc/Attic/Makefile.in, etc/Makefile.am, etc/login.access, etc/login.defs, etc/login.defs.linux, old/Attic/Makefile.in, src/Attic/patchlevel.h, src/Attic/pwconv5.c, src/Attic/scologin.c, src/chage.c, src/chfn.c, src/chsh.c, src/expiry.c, src/gpasswd.c, src/groups.c, src/grpconv.c, src/id.c, src/login.c, src/newgrp.c, src/passwd.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c: + * contrib/Attic/Makefile.in, contrib/Makefile.am, contrib/README, contrib/adduser.c, contrib/pwdauth.c, doc/Attic/ANNOUNCE, doc/Attic/CHANGES, doc/Attic/Makefile.in, doc/Attic/automake-1.0.diff, doc/Attic/console.c.spec, doc/HOWTO, doc/LICENSE, doc/Makefile.am, doc/README, doc/README.limits, doc/README.linux, doc/WISHLIST, etc/Attic/Makefile.in, etc/Makefile.am, etc/login.access, etc/login.defs, etc/login.defs.linux, old/Attic/Makefile.in, src/Attic/patchlevel.h, src/Attic/pwconv5.c, src/Attic/scologin.c, src/chage.c, src/chfn.c, src/chsh.c, src/expiry.c, src/gpasswd.c, src/groups.c, src/grpconv.c, src/id.c, src/login.c, src/newgrp.c, src/passwd.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c: New file. * lib/md5.h: 960810 - first version under cvs - * lib/defines.h, lib/dialup.h, lib/faillog.h, lib/getdef.h, lib/grdbm.c, lib/grent.c, lib/groupio.h, lib/grpack.c, lib/gsdbm.c, lib/gshadow_.h, lib/gspack.c, lib/lastlog_.h, lib/md5.c, lib/md5crypt.c, lib/mkdir.c, lib/port.h, lib/prototypes.h, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/pwauth.h, lib/pwdbm.c, lib/pwent.c, lib/pwio.h, lib/pwpack.c, lib/rcsid.h, lib/rename.c, lib/rmdir.c, lib/sgetgrent.c, lib/sgetpwent.c, lib/sgetspent.c, lib/sgroupio.h, lib/shadow.c, lib/shadow_.h, lib/shadowio.c, lib/shadowio.h, lib/spdbm.c, lib/sppack.c, lib/strdup.c, lib/strstr.c, lib/utent.c, src/Attic/Makefile.in, src/Makefile.am, src/chpasswd.c, src/dpasswd.c, src/faillog.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/grpck.c, src/lastlog.c, src/logoutd.c, src/mkpasswd.c, src/newusers.c, src/pwck.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/Attic/Makefile.in, lib/Makefile.am, lib/commonio.c, lib/dialchk.c, lib/dialup.c, lib/encrypt.c, lib/fputsx.c, lib/getdef.c, lib/getpass.c, lib/groupio.c, lib/gshadow.c, lib/lockpw.c, lib/port.c, lib/pwauth.c, lib/pwio.c, lib/rad64.c, lib/sgroupio.c, libmisc/Attic/suauth.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/motd.c, libmisc/obscure.c, libmisc/pwd2spwd.c, libmisc/rlogin.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setup.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, man/Attic/Makefile.in, man/Makefile.am, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/dpasswd.8, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwauth.8, man/pwck.8, man/pwconv.8, man/pwunconv.8, man/shadow.3, man/shadow.5, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, Attic/Makefile.in, Attic/aclocal.m4, Attic/config.h.in, Attic/configure, Attic/install-sh, Attic/mkinstalldirs, Attic/stamp-h.in, Makefile.am, README, acconfig.h, configure.in, libmisc/Attic/Makefile.in, libmisc/Makefile.am, libmisc/addgrps.c: + * lib/Attic/dialup.h, lib/defines.h, lib/faillog.h, lib/getdef.h, lib/grdbm.c, lib/grent.c, lib/groupio.h, lib/grpack.c, lib/gsdbm.c, lib/gshadow_.h, lib/gspack.c, lib/lastlog_.h, lib/md5.c, lib/md5crypt.c, lib/mkdir.c, lib/port.h, lib/prototypes.h, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/pwauth.h, lib/pwdbm.c, lib/pwent.c, lib/pwio.h, lib/pwpack.c, lib/rcsid.h, lib/rename.c, lib/rmdir.c, lib/sgetgrent.c, lib/sgetpwent.c, lib/sgetspent.c, lib/sgroupio.h, lib/shadow.c, lib/shadow_.h, lib/shadowio.c, lib/shadowio.h, lib/spdbm.c, lib/sppack.c, lib/strdup.c, lib/strstr.c, lib/utent.c, src/Attic/Makefile.in, src/Attic/dpasswd.c, src/Makefile.am, src/chpasswd.c, src/faillog.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/grpck.c, src/lastlog.c, src/logoutd.c, src/mkpasswd.c, src/newusers.c, src/pwck.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/Attic/Makefile.in, lib/Attic/dialchk.c, lib/Attic/dialup.c, lib/Makefile.am, lib/commonio.c, lib/encrypt.c, lib/fputsx.c, lib/getdef.c, lib/getpass.c, lib/groupio.c, lib/gshadow.c, lib/lockpw.c, lib/port.c, lib/pwauth.c, lib/pwio.c, lib/rad64.c, lib/sgroupio.c, libmisc/Attic/suauth.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/motd.c, libmisc/obscure.c, libmisc/pwd2spwd.c, libmisc/rlogin.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setup.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, man/Attic/Makefile.in, man/Attic/dpasswd.8, man/Attic/pwauth.8, man/Makefile.am, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/pwunconv.8, man/shadow.3, man/shadow.5, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, Attic/Makefile.in, Attic/aclocal.m4, Attic/config.h.in, Attic/configure, Attic/install-sh, Attic/mkinstalldirs, Attic/stamp-h.in, Makefile.am, README, acconfig.h, configure.in, libmisc/Attic/Makefile.in, libmisc/Makefile.am, libmisc/addgrps.c: New file. diff --git a/Makefile.am b/Makefile.am index 384e27b2..7492f07f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,5 +4,5 @@ EXTRA_DIST = NEWS README TODO shadow.spec.in AUTOMAKE_OPTIONS = 1.5 dist-bzip2 foreign -SUBDIRS = intl po man libmisc lib src \ - contrib debian doc etc +SUBDIRS = po man libmisc lib src \ + contrib doc etc diff --git a/Makefile.in b/Makefile.in index dccda293..3ae0ae59 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,128 +14,209 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ EXTRA_DIST = NEWS README TODO shadow.spec.in AUTOMAKE_OPTIONS = 1.5 dist-bzip2 foreign -SUBDIRS = intl po man libmisc lib src \ - contrib debian doc etc +SUBDIRS = po man libmisc lib src \ + contrib doc etc subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = intl/Makefile shadow.spec +CONFIG_CLEAN_FILES = shadow.spec DIST_SOURCES = -RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = README ./stamp-h.in ABOUT-NLS ChangeLog Makefile.am \ - Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \ - config.h.in config.sub configure configure.in depcomp \ - install-sh ltmain.sh missing mkinstalldirs shadow.spec.in +RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + ps-recursive install-info-recursive uninstall-info-recursive \ + all-recursive install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive +DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ + ABOUT-NLS ChangeLog Makefile.am NEWS TODO acconfig.h aclocal.m4 \ + config.guess config.h.in config.rpath config.sub configure \ + configure.in depcomp install-sh ltmain.sh missing mkinstalldirs \ + shadow.spec.in DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) + +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) + +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ + else :; fi + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + touch $(srcdir)/config.h.in + +distclean-hdr: + -rm -f config.h stamp-h1 +shadow.spec: $(top_builddir)/config.status shadow.spec.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + mostlyclean-libtool: -rm -f *.lo @@ -143,50 +225,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$@ $(SHELL) ./config.status - -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) - -$(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -config.h: stamp-h - @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ - else :; fi -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h stamp-hT - @echo timestamp > stamp-hT 2> /dev/null - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.h \ - $(SHELL) ./config.status - @mv stamp-hT stamp-h -$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/./stamp-h.in; \ - $(MAKE) $(srcdir)/./stamp-h.in; \ - else :; fi -$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h - @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT - @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null - cd $(top_srcdir) && $(AUTOHEADER) - @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in - -distclean-hdr: - -rm -f config.h -intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status -shadow.spec: $(top_builddir)/config.status shadow.spec.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd @@ -196,7 +234,7 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -216,7 +254,7 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -243,72 +281,120 @@ tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ETAGS = etags +ETAGSFLAGS = + +CTAGS = ctags +CTAGSFLAGS = tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . -# Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. $(distdir)/intl $(distdir)/po - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + $(mkinstalldirs) $(distdir)/. $(distdir)/po + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ @@ -326,46 +412,75 @@ distdir: $(DISTFILES) ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) -dist: distdir +dist-gzip: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) dist-bzip2: distdir $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/=build - mkdir $(distdir)/=inst + mkdir $(distdir)/_build + mkdir $(distdir)/_inst chmod a-w $(distdir) - dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ - && cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - --with-included-gettext \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ - || (echo "Error: files left after uninstall" 1>&2; \ - exit 1) ) \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && $(MAKE) $(AM_MAKEFLAGS) distclean \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ - && (test `find . -type f -print | wc -l` -eq 0 \ - || (echo "Error: files left after distclean" 1>&2; \ - exit 1) ) - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 check-am: all-am check: check-recursive all-am: Makefile config.h @@ -383,6 +498,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -390,7 +506,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -399,12 +515,9 @@ clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am -dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) distclean: distclean-recursive - -rm -f config.status config.cache config.log + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ distclean-tags @@ -427,31 +540,43 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive dist dist-all \ - dist-bzip2 distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ + clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ + distclean-recursive distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-data install-data-am \ + install-data-recursive install-exec install-exec-am \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ + pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ + tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/NEWS b/NEWS index 75405ce1..72ed6da3 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,49 @@ -$Id: NEWS,v 1.31 2002/03/13 09:30:52 kloczek Exp $ +$Id: NEWS,v 1.57.2.1 2004/01/14 06:20:26 kloczek Exp $ + +shadow-4.0.3 => shadow-4.0.4 + +*** general: +- added missing information about -f options in groupadd usage mesage + (document this also in man page), +- removed TCFS support (tcfs is dead), +- convert all po/*.po files to utf-8, +- one TODO entry gone: fix nscd flushing databases on change (use + per service flushing method instead HUPing nscd process), +- removed old AUTH_METHODS dependent code, +- chage: now all code depend on SHADOWPWD. If shadow will not be configured + on autoconf level for using shadow possword chage is olny stub which + informs "chage not configured for shadow password support." +- dpasswd: removed, +- login: remove handle login.defs::DIALUPS_CHECK_ENAB code, +- login: remove handle login.defs::NO_PASSWORD_CONSOLE code, +- ALL tools, libraries: remove old SVR4, SVR4_SI86_EUA BSD_QUOTA and ATT_AGE + dependent code, +- ALL: ready for gettext 0.11.5, automake 1.7.4, autoconf 2.57, +- logoutd, userd: handle also utmpx if avalaile, +- newgrp: fix for non-PAM version + Use CLOSE_SESSIONS depending code only when USE_PAM. + The problem was reported by Mattias Webjorn Eriksson using Slackware + 8.1 and reproduced it using slackware-current (9.0beta) (fix submited by + Simon Williams ), +- fix in too_many_failures() function: incorrect if() condition in non-PAM + dependent code in fail login handling (fixed by Krzysztof + Oledzki ), +*** documentation: +- install groups(1) man page (moved from EXTRA_DIST to man_MANS), +- removed pwauth(8), d_passwd(5), dialups(5) man pages, +- remove text about password aging from passwd(5) (based on Debian changes), +- document useradd and groupadd -M option in en and pl man pages + (by Jakub Mikusek ). +- added ru passwd(1) man page from KSI resources, +- added es man pages found in Conectiva distribution resources, +- added chch(1), chfn(1) man pages from chinese man pages translation + project, +- added id(1) man page czech man pages translation project, +- updated ja man pages and added expiry(1), +- removed old doc/ANNOUNCE, +- updated german passwd(1), chsh(1) and login(1) man page and added chfn(1) + (by Josef Spillner ), +- many other cleanups and unifications in man pages. shadow-4.0.2 => shadow-4.0.3 diff --git a/TODO b/TODO index 3fd06e40..0c8c8b10 100644 --- a/TODO +++ b/TODO @@ -2,16 +2,22 @@ # "*" partialy exist/implemented # "+" done -- fix nscd flushing databases on change (I'm still not shure where it will - be bether add this on shadow or on PAM level), +ALL: +- move base passwd/shadow/group/gshadow operation to module for allow write + diffrent backend modules for db, NIS, LDAP and others. Default backend it + will be choose depending on /etc/nsswitch.conf and allow overwride this by + -r options (where the can be file, db, nis + nisplus, ldap .. like on /etc/nsswitch.conf in service column). + passwd have old piece of code with handling -r option and it will be good + finish this and propagate on other shadow tools for allow operate on other + user databases by well known tools. -- add more translations (maintainners for man pages and gettext files - welcome), +- useradd: + - add handle /etc/defaults/useradd::USER_GROUPS={yes,no} for allow configure + using by useradd create per user group. + - add handle create user mail spool in maildir format. -- add handle /etc/defaults/useradd::USERGROUPS={yes,no} for allow configure - using by useradd create per user group, - -- add handle -n switch in groups nad id command for allow query is +- add handle -n switch in groups and id command for allow query is group/user with specyfied id/gid exist - this will be very useable on automation in packages for quoery/check is group/user exist in system or not, @@ -32,5 +38,3 @@ Documentation: - documment in pt_BR, ja man pages -s {pw,grp}ck option, - document -o option in ja man page, - -- pl man page for login(1) - documment -f -h -p -r options. diff --git a/acconfig.h b/acconfig.h index 16aa9e18..7cbd22e8 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,52 +1,13 @@ -/* $Id: acconfig.h,v 1.15 2001/07/27 13:26:04 kloczek Exp $ */ +/* $Id: acconfig.h,v 1.21 2003/12/17 01:46:59 kloczek Exp $ */ -/* Define to enable password aging. */ -#undef AGING - -/* Define if struct passwd has pw_age. */ -#undef ATT_AGE - -/* Define if struct passwd has pw_comment. */ -#undef ATT_COMMENT - -/* Define to support JFH's auth. methods. UNTESTED. */ -#undef AUTH_METHODS - -/* Define if struct passwd has pw_quota. */ -#undef BSD_QUOTA - /* Define if you have secure RPC. */ #undef DES_RPC -/* Define to support 16-character passwords. */ -#undef DOUBLESIZE - -/* Define to 1 if NLS is requested. */ -#undef ENABLE_NLS - /* Path for faillog file. */ #undef FAILLOG_FILE -/* Define if you want my getgrent routines. */ -#undef GETGRENT - -/* Define to libshadow_getpass to use our own version of getpass(). */ -#undef getpass - -/* Define if you want my getpwent routines. */ -#undef GETPWENT - -/* Define as 1 if you have catgets and don't want to use GNU gettext. */ -#undef HAVE_CATGETS - -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -#undef HAVE_GETTEXT - -/* Define if your locale.h file contains LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - /* Defined if you have libcrack. */ #undef HAVE_LIBCRACK @@ -65,12 +26,6 @@ /* Working shadow group support in libc? */ #undef HAVE_SHADOWGRP -/* Define to 1 if you have the stpcpy function. */ -#undef HAVE_STPCPY - -/* Define to support TCFS. */ -#undef HAVE_TCFS - /* Path for lastlog file. */ #undef LASTLOG_FILE @@ -83,24 +38,12 @@ /* Name of user's mail spool file if stored in user's home directory. */ #undef MAIL_SPOOL_FILE -/* Define to support the MD5-based password hashing algorithm. */ -#undef MD5_CRYPT - -/* Define to use ndbm. */ -#undef NDBM - /* Define to support OPIE one-time password logins. */ #undef OPIE -/* Package name. */ -#undef PACKAGE - /* Path to passwd program. */ #undef PASSWD_PROGRAM -/* Define if the compiler understands function prototypes. */ -#undef PROTOTYPES - /* Define if login should support the -r flag for rlogind. */ #undef RLOGIN @@ -119,32 +62,23 @@ /* Define to support /etc/suauth su access control. */ #undef SU_ACCESS -/* Define to support SecureWare(tm) long passwords. */ -#undef SW_CRYPT - -/* Define if you want gdbm for TCFS. */ -#undef TCFS_GDBM_SUPPORT - -/* Define to support Pluggable Authentication Modules. */ -#undef USE_PAM - /* Define to use syslog(). */ #undef USE_SYSLOG +/* Define to support USG (Unix Systems Group?) behavior. */ +#undef USG + /* Define if you have ut_host in struct utmp. */ #undef UT_HOST /* Path for utmp file. */ #undef _UTMP_FILE -/* Define to ut_name if struct utmp has ut_name (not ut_user). */ -#undef ut_user - -/* Version. */ -#undef VERSION - /* Path for wtmp file. */ #undef _WTMP_FILE -/* */ -#undef USG +/* Define to libshadow_getpass to use our own version of getpass(). */ +#undef getpass + +/* Define to ut_name if struct utmp has ut_name (not ut_user). */ +#undef ut_user diff --git a/aclocal.m4 b/aclocal.m4 index 60e41060..230e22b7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# aclocal.m4 generated automatically by aclocal 1.5 +# generated automatically by aclocal 1.7.8 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,75 +11,87 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. +# Do all the work for Automake. -*- Autoconf -*- -# serial 5 +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. -# We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. -# The purpose of this macro is to provide the user with a means to -# check macros which are provided without letting her know how the -# information is coded. -# If this macro is not defined by Autoconf, define it here. -ifdef([AC_PROVIDE_IFELSE], - [], - [define([AC_PROVIDE_IFELSE], - [ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. +# serial 10 -# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) -# ---------------------------------------------- -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) -fi - -# Define the identity of the package. -PACKAGE=$1 -AC_SUBST(PACKAGE)dnl -VERSION=$2 -AC_SUBST(VERSION)dnl -ifelse([$3],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) +AC_PREREQ([2.54]) # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. -ifdef([m4_pattern_allow], - [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. -AC_SUBST(EXEEXT) -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} -AC_SUBST(OBJEXT) +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal) +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) @@ -89,22 +101,135 @@ AM_PROG_INSTALL_STRIP # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl -AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CC], +AC_REQUIRE([AM_SET_LEADING_DOT])dnl + +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_][CC], - defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CXX], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_][CXX], - defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.7.8])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) # # Check to make sure that the build environment is sane. # +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # serial 3 # AM_SANITY_CHECK @@ -148,8 +273,27 @@ Check your system clock]) fi AC_MSG_RESULT(yes)]) +# -*- Autoconf -*- -# serial 2 + +# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -171,13 +315,29 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - am_backtick='`' - AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) + AC_MSG_WARN([`missing' script is too old or missing]) fi ]) # AM_AUX_DIR_EXPAND +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -216,19 +376,59 @@ fi # absolute PATH. The drawback is that using absolute paths prevent a # configured tree to be moved without reconfiguration. +# Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50]) + AC_DEFUN([AM_AUX_DIR_EXPAND], [ # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` ]) # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. + +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) +# AM_PROG_INSTALL_STRIP + +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -238,11 +438,68 @@ AC_SUBST(install_sh)]) # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# serial 4 -*- Autoconf -*- +# -*- Autoconf -*- +# Copyright (C) 2003 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# serial 5 -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be @@ -254,9 +511,9 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_DEPENDENCIES(NAME) -# --------------------- +# ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX" or "OBJC". +# NAME is "CC", "CXX", "GCJ", or "OBJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -271,7 +528,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -288,18 +545,32 @@ AC_CACHE_CHECK([dependency style of $depcc], # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_$1_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -317,13 +588,20 @@ AC_CACHE_CHECK([dependency style of $depcc], # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && - grep conftest.h conftest.Po > /dev/null 2>&1 && + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_$1_dependencies_compiler_type=$depmode - break + # icc doesn't choke on unknown options, it will just issue warnings + # (even with -Werror). So we grep stderr for any message + # that says an option was ignored. + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi fi done @@ -333,8 +611,10 @@ else am_cv_$1_dependencies_compiler_type=none fi ]) -$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" -AC_SUBST([$1DEPMODE]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) @@ -343,16 +623,8 @@ AC_SUBST([$1DEPMODE]) # Choose a directory name for dependency files. # This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], -[rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null -AC_SUBST(DEPDIR) +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ]) @@ -367,30 +639,48 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -pushdef([subst], defn([AC_SUBST])) -subst(AMDEPBACKSLASH) -popdef([subst]) +AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -# This macro should only be invoked once -- use via AC_REQUIRE. -# Usage: -# AM_OUTPUT_DEPENDENCY_COMMANDS +# Generate code to set up dependency tracking. -*- Autoconf -*- -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ -AC_OUTPUT_COMMANDS([ -test x"$AMDEP_TRUE" != x"" || -for mf in $CONFIG_FILES; do - case "$mf" in - Makefile) dirpart=.;; - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue +# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +#serial 2 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` @@ -414,14 +704,48 @@ for mf in $CONFIG_FILES; do sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`echo "$file" | sed -e 's|/[^/]*$||'` - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done -], [AMDEP_TRUE="$AMDEP_TRUE" -ac_aux_dir="$ac_aux_dir"])]) +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 # AM_MAKE_INCLUDE() # ----------------- @@ -429,12 +753,13 @@ ac_aux_dir="$ac_aux_dir"])]) AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} cat > confinc << 'END' -doit: +am__doit: @echo done +.PHONY: am__doit END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) -am__include='#' +am__include="#" am__quote= _am_result=none # First try GNU make style include. @@ -444,7 +769,7 @@ echo "include confinc" > confmf # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -454,33 +779,45 @@ if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then am__include=.include - am__quote='"' + am__quote="\"" _am_result=BSD fi fi -AC_SUBST(am__include) -AC_SUBST(am__quote) -AC_MSG_RESULT($_am_result) +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# serial 3 +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 5 + +AC_PREREQ(2.52) # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. -# -# FIXME: Once using 2.50, use this: -# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl -ifelse([$1], [FALSE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl +[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE]) AC_SUBST([$1_FALSE]) if $2; then @@ -489,81 +826,70 @@ if $2; then else $1_TRUE='#' $1_FALSE= -fi]) +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]) +fi])]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 3 +# serial 47 AC_PROG_LIBTOOL -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. We must strip everything past the first ":", -# and everything past the last "/". -AC_PREREQ([2.12]) +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) -AC_DEFUN([AM_CONFIG_HEADER], -[ifdef([AC_FOREACH],dnl - [dnl init our file count if it isn't already - m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) - dnl prepare to store our destination file list for use in config.status - AC_FOREACH([_AM_File], [$1], - [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) - m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) - dnl and add it to the list of files AC keeps track of, along - dnl with our hook - AC_CONFIG_HEADERS(_AM_File, -dnl COMMANDS, [, INIT-CMDS] -[# update the timestamp -echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index[" -][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS - m4_popdef([_AM_Dest])])],dnl -[AC_CONFIG_HEADER([$1]) - AC_OUTPUT_COMMANDS( - ifelse(patsubst([$1], [[^ ]], []), - [], - [test -z "$CONFIG_HEADERS" || echo timestamp >dnl - patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl -[am_indx=1 -for am_file in $1; do - case " \$CONFIG_HEADERS " in - *" \$am_file "*) - am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` - if test -n "\$am_dir"; then - am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` - for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do - am_tmpdir=\$am_tmpdir\$am_subdir/ - if test ! -d \$am_tmpdir; then - mkdir \$am_tmpdir - fi - done - fi - echo timestamp > "\$am_dir"stamp-h\$am_indx - ;; - esac - am_indx=\`expr \$am_indx + 1\` -done]) -])]) # AM_CONFIG_HEADER - -# _AM_DIRNAME(PATH) -# ----------------- -# Like AS_DIRNAME, only do it during macro expansion -AC_DEFUN([_AM_DIRNAME], - [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, - m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, - m4_if(m4_regexp([$1], [^/.*]), -1, - [.], - m4_patsubst([$1], [^\(/\).*], [\1])), - m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), - m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl -]) # _AM_DIRNAME - -# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- - -# serial 46 AC_PROG_LIBTOOL +# AC_PROG_LIBTOOL +# --------------- AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) + +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL + + +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -574,10 +900,13 @@ AC_SUBST(LIBTOOL)dnl # Prevent multiple expansion define([AC_PROG_LIBTOOL], []) -]) +])# _AC_PROG_LIBTOOL + +# AC_LIBTOOL_SETUP +# ---------------- AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.13)dnl +[AC_PREREQ(2.50)dnl AC_REQUIRE([AC_ENABLE_SHARED])dnl AC_REQUIRE([AC_ENABLE_STATIC])dnl AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl @@ -587,13 +916,103 @@ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_NM])dnl + AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR + +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl _LT_AC_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except M$VC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -603,324 +1022,78 @@ file_magic*) ;; esac -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], +AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) -AC_ARG_ENABLE(libtool-lock, - [ --disable-libtool-lock avoid locking (might break parallel builds)]) +AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; +AC_ARG_WITH([pic], + [AC_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) +test -z "$pic_mode" && pic_mode=default -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_SAVE - AC_LANG_C - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_RESTORE]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; +# Use C for the default configuration in the libtool script +tagname= +AC_LIBTOOL_LANG_C_CONFIG +_LT_AC_TAGCONFIG +])# AC_LIBTOOL_SETUP -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one - AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain, - [AC_TRY_LINK([], - [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); - DllMain (0, 0, 0);], - [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])]) +# _LT_AC_SYS_COMPILER +# ------------------- +AC_DEFUN([_LT_AC_SYS_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl - case $host/$CC in - *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) - # old mingw systems require "-dll" to link a DLL, while more recent ones - # require "-mdll" - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mdll" - AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, - [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) - CFLAGS="$SAVE_CFLAGS" ;; - *-*-cygwin* | *-*-pw32*) - # cygwin systems need to pass --dll to the linker, and not link - # crt.o which will require a WinMain@16 definition. - lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; - esac - ;; - ]) -esac +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -_LT_AC_LTCONFIG_HACK +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_AC_SYS_COMPILER -]) -# AC_LIBTOOL_HEADER_ASSERT -# ------------------------ -AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT], -[AC_CACHE_CHECK([whether $CC supports assert without backlinking], - [lt_cv_func_assert_works], - [case $host in - *-*-solaris*) - if test "$GCC" = yes && test "$with_gnu_ld" != yes; then - case `$CC --version 2>/dev/null` in - [[12]].*) lt_cv_func_assert_works=no ;; - *) lt_cv_func_assert_works=yes ;; - esac - fi - ;; - esac]) +# _LT_AC_SYS_LIBPATH_AIX +# ---------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi],[]) +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +])# _LT_AC_SYS_LIBPATH_AIX -if test "x$lt_cv_func_assert_works" = xyes; then - AC_CHECK_HEADERS(assert.h) -fi -])# AC_LIBTOOL_HEADER_ASSERT -# _LT_AC_CHECK_DLFCN -# -------------------- -AC_DEFUN([_LT_AC_CHECK_DLFCN], -[AC_CHECK_HEADERS(dlfcn.h) -])# _LT_AC_CHECK_DLFCN +# _LT_AC_SHELL_INIT(ARG) +# ---------------------- +AC_DEFUN([_LT_AC_SHELL_INIT], +[ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) +$1 +AC_DIVERT_POP +])# _LT_AC_SHELL_INIT -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - -# Transform an extracted symbol line into a proper C declaration -lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) # Its linker distinguishes data from code symbols - lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -irix*) - symcode='[[BCDEGRST]]' - ;; -solaris* | sysv5*) - symcode='[[BDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $host_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - symcode='[[ABCDGISTW]]' -fi - -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do - - # Write the raw and C identifiers. -lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no - rm -f conftest* - cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if egrep ' nm_test_var$' "$nlist" >/dev/null; then - if egrep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' - - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[[]] = -{ -EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$no_builtin_flag" - if AC_TRY_EVAL(ac_link) && test -s conftest; then - pipe_works=yes - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AC_FD_CC - fi - else - echo "cannot find nm_test_var in $nlist" >&AC_FD_CC - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC - fi - else - echo "$progname: failed program was:" >&AC_FD_CC - cat conftest.$ac_ext >&5 - fi - rm -f conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" -if test -z "$lt_cv_sys_global_symbol_pipe"; then - global_symbol_to_cdecl= - global_symbol_to_c_name_address= -else - global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" - global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" -fi -if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; -then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - -# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR -# --------------------------------- -AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR], -[# Find the correct PATH separator. Usually this is `:', but -# DJGPP uses `;' like DOS. -if test "X${PATH_SEPARATOR+set}" != Xset; then - UNAME=${UNAME-`uname 2>/dev/null`} - case X$UNAME in - *-DOS) lt_cv_sys_path_separator=';' ;; - *) lt_cv_sys_path_separator=':' ;; - esac - PATH_SEPARATOR=$lt_cv_sys_path_separator -fi -])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which # will find an echo command which doesn't interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR - +[_LT_AC_SHELL_INIT([ # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -938,7 +1111,7 @@ if test "X[$]1" = X--no-reexec; then elif test "X[$]1" = X--fallback-echo; then # Avoid inline document here, it may be left over : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then # Yippee, $echo works! : else @@ -950,7 +1123,7 @@ if test "X[$]1" = X--fallback-echo; then # used as fallback echo shift cat </dev/null`" = 'X\t' && echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && @@ -994,7 +1168,7 @@ else break fi done - IFS="$save_ifs" + IFS="$lt_save_ifs" if test "X$echo" = Xecho; then # We didn't find a better echo, so look for alternatives. @@ -1067,17 +1241,291 @@ if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then fi AC_SUBST(ECHO) -AC_DIVERT_POP -])# _LT_AC_PROG_ECHO_BACKSLASH +])])# _LT_AC_PROG_ECHO_BACKSLASH + + +# _LT_AC_LOCK +# ----------- +AC_DEFUN([_LT_AC_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case "`/usr/bin/file conftest.o`" in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +[*-*-cygwin* | *-*-mingw* | *-*-pw32*) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; + ]) +esac + +need_locks="$enable_libtool_lock" + +])# _LT_AC_LOCK + + +# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +[AC_CACHE_CHECK([$1], [$2], + [$2=no + ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s conftest.err; then + $2=yes + fi + fi + $rm conftest* +]) + +if test x"[$]$2" = xyes; then + ifelse([$5], , :, [$5]) +else + ifelse([$6], , :, [$6]) +fi +])# AC_LIBTOOL_COMPILER_OPTION + + +# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ------------------------------------------------------------ +# Check whether the given compiler option works +AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +[AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + else + $2=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" +]) + +if test x"[$]$2" = xyes; then + ifelse([$4], , :, [$4]) +else + ifelse([$5], , :, [$5]) +fi +])# AC_LIBTOOL_LINKER_OPTION + + +# AC_LIBTOOL_SYS_MAX_CMD_LEN +# -------------------------- +AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +[# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + testring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + *) + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ + = "XX$testring") >/dev/null 2>&1 && + new_result=`expr "X$testring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + testring=$testring$testring + done + testring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + ;; + esac +]) +if test -n $lt_cv_sys_max_cmd_len ; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +])# AC_LIBTOOL_SYS_MAX_CMD_LEN + + +# _LT_AC_CHECK_DLFCN +# -------------------- +AC_DEFUN([_LT_AC_CHECK_DLFCN], +[AC_CHECK_HEADERS(dlfcn.h)dnl +])# _LT_AC_CHECK_DLFCN + # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[if test "$cross_compiling" = yes; then : +[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +if test "$cross_compiling" = yes; then : [$4] else - AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext </dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + # According to Tom Tromey, Ian Lance Taylor reported there are C compilers + # that will create temporary files in the current directory regardless of + # the output directory. Thus, making CWD read-only will cause this test + # to fail, enabling locking or at least warning the user not to do parallel + # builds. + chmod -w . -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except M$VC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" -need_locks="$enable_libtool_lock" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -if test x"$host" != x"$build"; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= -fi - -# Transform linux* to *-*-linux-gnu*, to support old configure scripts. -case $host_os in -linux-gnu*) ;; -linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` -esac - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" - ;; - *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -# Allow CC to be a program name with arguments. -set dummy $CC -compiler="[$]2" - -AC_MSG_CHECKING([for objdir]) -rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - objdir=_libs -fi -rmdir .libs 2>/dev/null -AC_MSG_RESULT($objdir) - - -AC_ARG_WITH(pic, -[ --with-pic try to use only PIC/non-PIC objects [default=use both]], -pic_mode="$withval", pic_mode=default) -test -z "$pic_mode" && pic_mode=default - -# We assume here that the value for lt_cv_prog_cc_pic will not be cached -# in isolation, and that seeing it set (from the cache) indicates that -# the associated values are set (in the cache) correctly too. -AC_MSG_CHECKING([for $compiler option to produce PIC]) -AC_CACHE_VAL(lt_cv_prog_cc_pic, -[ lt_cv_prog_cc_pic= - lt_cv_prog_cc_shlib= - lt_cv_prog_cc_wl= - lt_cv_prog_cc_static= - lt_cv_prog_cc_no_builtin= - lt_cv_prog_cc_can_build_shared=$can_build_shared - - if test "$GCC" = yes; then - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-static' - - case $host_os in - aix*) - # Below there is a dirty hack to force normal static linking with -ldl - # The problem is because libdl dynamically linked with both libc and - # libC (AIX C++ library), which obviously doesn't included in libraries - # list by gcc. This cause undefined symbols with -static flags. - # This hack allows C programs to be linked with "-static -ldl", but - # not sure about C++ programs. - lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_cv_prog_cc_pic='-fno-common' - ;; - cygwin* | mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_cv_prog_cc_pic='-DDLL_EXPORT' - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_cv_prog_cc_pic=-Kconform_pic - fi - ;; - *) - lt_cv_prog_cc_pic='-fPIC' - ;; - esac - else - # PORTME Check for PIC flags for the system compiler. - case $host_os in - aix3* | aix4* | aix5*) - lt_cv_prog_cc_wl='-Wl,' - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - hpux9* | hpux10* | hpux11*) - # Is there a better lt_cv_prog_cc_static that works with the bundled CC? - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" - lt_cv_prog_cc_pic='+Z' - ;; - - irix5* | irix6*) - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - # PIC (with -KPIC) is the default. - ;; - - cygwin* | mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_cv_prog_cc_pic='-DDLL_EXPORT' - ;; - - newsos6) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - ;; - - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - ;; - - sco3.2v5*) - lt_cv_prog_cc_pic='-Kpic' - lt_cv_prog_cc_static='-dn' - lt_cv_prog_cc_shlib='-belf' - ;; - - solaris*) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' - ;; - - sunos4*) - lt_cv_prog_cc_pic='-PIC' - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Qoption ld ' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi - ;; - - uts4*) - lt_cv_prog_cc_pic='-pic' - lt_cv_prog_cc_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_cv_prog_cc_pic='-Kconform_pic' - lt_cv_prog_cc_static='-Bstatic' - fi - ;; - - *) - lt_cv_prog_cc_can_build_shared=no - ;; - esac - fi + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s out/conftest.err; then + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . + $rm conftest* out/* + rmdir out + cd .. + rmdir conftest + $rm conftest* ]) -if test -z "$lt_cv_prog_cc_pic"; then - AC_MSG_RESULT([none]) -else - AC_MSG_RESULT([$lt_cv_prog_cc_pic]) - - # Check to make sure the pic_flag actually works. - AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works]) - AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" - AC_TRY_COMPILE([], [], [dnl - case $host_os in - hpux9* | hpux10* | hpux11*) - # On HP-UX, both CC and GCC only warn that PIC is supported... then - # they create non-PIC objects. So, if there were any warnings, we - # assume that PIC is not supported. - if test -s conftest.err; then - lt_cv_prog_cc_pic_works=no - else - lt_cv_prog_cc_pic_works=yes - fi - ;; - *) - lt_cv_prog_cc_pic_works=yes - ;; - esac - ], [dnl - lt_cv_prog_cc_pic_works=no - ]) - CFLAGS="$save_CFLAGS" - ]) - - if test "X$lt_cv_prog_cc_pic_works" = Xno; then - lt_cv_prog_cc_pic= - lt_cv_prog_cc_can_build_shared=no - else - lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" - fi - - AC_MSG_RESULT([$lt_cv_prog_cc_pic_works]) -fi - -# Check for any special shared library compilation flags. -if test -n "$lt_cv_prog_cc_shlib"; then - AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : - else - AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) - lt_cv_prog_cc_can_build_shared=no - fi -fi - -AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works]) -AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl - lt_cv_prog_cc_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" - AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes]) - LDFLAGS="$save_LDFLAGS" -]) - -# Belt *and* braces to stop my trousers falling down: -test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -AC_MSG_RESULT([$lt_cv_prog_cc_static_works]) - -pic_flag="$lt_cv_prog_cc_pic" -special_shlib_compile_flags="$lt_cv_prog_cc_shlib" -wl="$lt_cv_prog_cc_wl" -link_static_flag="$lt_cv_prog_cc_static" -no_builtin_flag="$lt_cv_prog_cc_no_builtin" -can_build_shared="$lt_cv_prog_cc_can_build_shared" +])# AC_LIBTOOL_PROG_CC_C_O -# Check to see if options -o and -c are simultaneously supported by compiler -AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext]) -AC_CACHE_VAL([lt_cv_compiler_c_o], [ -$rm -r conftest 2>/dev/null -mkdir conftest -cd conftest -echo "int some_variable = 0;" > conftest.$ac_ext -mkdir out -# According to Tom Tromey, Ian Lance Taylor reported there are C compilers -# that will create temporary files in the current directory regardless of -# the output directory. Thus, making CWD read-only will cause this test -# to fail, enabling locking or at least warning the user not to do parallel -# builds. -chmod -w . -save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" -compiler_c_o=no -if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s out/conftest.err; then - lt_cv_compiler_c_o=no - else - lt_cv_compiler_c_o=yes - fi -else - # Append any errors to the config.log. - cat out/conftest.err 1>&AC_FD_CC - lt_cv_compiler_c_o=no -fi -CFLAGS="$save_CFLAGS" -chmod u+w . -$rm conftest* out/* -rmdir out -cd .. -rmdir conftest -$rm -r conftest 2>/dev/null -]) -compiler_c_o=$lt_cv_compiler_c_o -AC_MSG_RESULT([$compiler_c_o]) - -if test x"$compiler_c_o" = x"yes"; then - # Check to see if we can write to a .lo - AC_MSG_CHECKING([if $compiler supports -c -o file.lo]) - AC_CACHE_VAL([lt_cv_compiler_o_lo], [ - lt_cv_compiler_o_lo=no - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -c -o conftest.lo" - save_objext="$ac_objext" - ac_objext=lo - AC_TRY_COMPILE([], [int some_variable = 0;], [dnl - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - lt_cv_compiler_o_lo=no - else - lt_cv_compiler_o_lo=yes - fi - ]) - ac_objext="$save_objext" - CFLAGS="$save_CFLAGS" - ]) - compiler_o_lo=$lt_cv_compiler_o_lo - AC_MSG_RESULT([$compiler_o_lo]) -else - compiler_o_lo=no -fi - +# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +# ----------------------------------------- # Check to see if we can do hard links to lock some files if needed +AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +[AC_REQUIRE([_LT_AC_LOCK])dnl + hard_links="nottested" -if test "$compiler_c_o" = no && test "$need_locks" != no; then +if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -1663,749 +1791,77 @@ if test "$compiler_c_o" = no && test "$need_locks" != no; then ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) if test "$hard_links" = no; then - AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe]) + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) need_locks=warn fi else need_locks=no fi +])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS -if test "$GCC" = yes; then - # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions]) - echo "int some_variable = 0;" > conftest.$ac_ext - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" - compiler_rtti_exceptions=no - AC_TRY_COMPILE([], [int some_variable = 0;], [dnl - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - compiler_rtti_exceptions=no - else - compiler_rtti_exceptions=yes - fi - ]) - CFLAGS="$save_CFLAGS" - AC_MSG_RESULT([$compiler_rtti_exceptions]) - if test "$compiler_rtti_exceptions" = "yes"; then - no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' - else - no_builtin_flag=' -fno-builtin' - fi -fi - -# See if the linker supports building shared libraries. -AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries]) - -allow_undefined_flag= -no_undefined_flag= -need_lib_prefix=unknown -need_version=unknown -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -archive_cmds= -archive_expsym_cmds= -old_archive_from_new_cmds= -old_archive_from_expsyms_cmds= -export_dynamic_flag_spec= -whole_archive_flag_spec= -thread_safe_flag_spec= -hardcode_into_libs=no -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no -hardcode_shlibpath_var=unsupported -runpath_var= -link_all_deplibs=unknown -always_export_symbols=no -export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' -# include_expsyms should be a list of space-separated symbols to be *always* -# included in the symbol list -include_expsyms= -# exclude_expsyms can be an egrep regular expression of symbols to exclude -# it will be wrapped by ` (' and `)$', so one must not match beginning or -# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -# as well as any symbol that contains `d'. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" -# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -# platforms (ab)use it in PIC code, but their linkers get confused if -# the symbol is explicitly referenced. Since portable code cannot -# rely on this symbol name, it's probably fine to never include it in -# preloaded symbol tables. -extract_expsyms_cmds= - -case $host_os in -cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; -openbsd*) - with_gnu_ld=no - ;; -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX, the GNU linker is very broken - # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. - ld_shlibs=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - ;; - - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can use - # them. - ld_shlibs=no - ;; - - beos*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=yes - - extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ - sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ - test -f $output_objdir/impgen.exe || (cd $output_objdir && \ - if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ - else $CC -o impgen impgen.c ; fi)~ - $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' - - old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' - - # cygwin and mingw dlls have different entry points and sets of symbols - # to exclude. - # FIXME: what about values for MSVC? - dll_entry=__cygwin_dll_entry@12 - dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ - case $host_os in - mingw*) - # mingw values - dll_entry=_DllMainCRTStartup@12 - dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ - ;; - esac - - # mingw and cygwin differ, and it's simplest to just exclude the union - # of the two symbol sets. - dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one (in ltdll.c) - if test "x$lt_cv_need_dllmain" = "xyes"; then - ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ - test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' - else - ltdll_obj= - ltdll_cmds= - fi - - # Extract the symbol export list from an `--export-all' def file, - # then regenerate the def file from the symbol export list, so that - # the compiled dll only exports the symbol export list. - # Be careful not to strip the DATA tag left be newer dlltools. - export_symbols_cmds="$ltdll_cmds"' - $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ - sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' - - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is. - # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname-def; - else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \[$]# in - 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; - fi~ - '"$ltdll_cmds"' - $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ - $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ - $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris* | sysv5*) - if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw* | pw32*) - # dlltool doesn't understand --whole-archive et. al. - whole_archive_flag_spec= - ;; - *) - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - ;; - esac - fi +# AC_LIBTOOL_OBJDIR +# ----------------- +AC_DEFUN([AC_LIBTOOL_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - hardcode_direct=yes - archive_cmds='' - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - esac - - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - shared_flag='${wl}-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall can do strange things, so it is better to - # generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" - else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok' - # This is a bit strange, but is similar to how AIX traditionally builds - # it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' - fi - fi - ;; - - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - ;; - - darwin* | rhapsody*) - case "$host_os" in - rhapsody* | darwin1.[[012]]) - allow_undefined_flag='-undefined suppress' - ;; - *) # Darwin 1.3 on - allow_undefined_flag='-flat_namespace -undefined suppress' - ;; - esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' - # We need to add '_' to the symbols in $export_symbols first - #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' - hardcode_direct=yes - hardcode_shlibpath_var=no - whole_archive_flag_spec='-all_load $convenience' - ;; - - freebsd1*) - ld_shlibs=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9* | hpux10* | hpux11*) - case $host_os in - hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; - esac - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_minus_L=yes # Not in the search PATH, but as the default - # location of the library. - export_dynamic_flag_spec='${wl}-E' - ;; - - irix5* | irix6*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - openbsd*) - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case "$host_os" in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - #Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - export_dynamic_flag_spec='${wl}-Bexport' - ;; - - solaris*) - # gcc --version < 3.0 without binutils cannot create self contained - # shared libraries reliably, requiring libgcc.a to resolve some of - # the object symbols generated in some cases. Libraries that use - # assert need libgcc.a to resolve __eprintf, for example. Linking - # a copy of libgcc.a into every shared library to guarantee resolving - # such symbols causes other problems: According to Tim Van Holder - # , C++ libraries end up with a separate - # (to the application) exception stack for one thing. - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - case `$CC --version 2>/dev/null` in - [[12]].*) - cat <&2 - -*** Warning: Releases of GCC earlier than version 3.0 cannot reliably -*** create self contained shared libraries on Solaris systems, without -*** introducing a dependency on libgcc.a. Therefore, libtool is disabling -*** -no-undefined support, which will at least allow you to build shared -*** libraries. However, you may find that when you link such libraries -*** into an application without using GCC, you have to manually add -*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to -*** upgrade to a newer version of GCC. Another option is to rebuild your -*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. - -EOF - no_undefined_flag= - ;; - esac - fi - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - else - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv5*) - no_undefined_flag=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec= - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4.2uw2*) - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=no - hardcode_shlibpath_var=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; - - sysv5uw7* | unixware7*) - no_undefined_flag='${wl}-z ${wl}text' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs fi -AC_MSG_RESULT([$ld_shlibs]) -test "$ld_shlibs" = no && can_build_shared=no +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +])# AC_LIBTOOL_OBJDIR + +# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +# ---------------------------------------------- # Check hardcoding attributes. -AC_MSG_CHECKING([how to hardcode library paths into programs]) -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var"; then +AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_AC_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ + test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && + if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$hardcode_shlibpath_var" != no && - test "$hardcode_minus_L" != no; then + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then # Linking always hardcodes the temporary library directory. - hardcode_action=relink + _LT_AC_TAGVAR(hardcode_action, $1)=relink else # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate + _LT_AC_TAGVAR(hardcode_action, $1)=immediate fi else # We cannot hardcode anything, or else we can only hardcode existing # directories. - hardcode_action=unsupported + _LT_AC_TAGVAR(hardcode_action, $1)=unsupported fi -AC_MSG_RESULT([$hardcode_action]) +AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) -striplib= +if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi +])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH + + +# AC_LIBTOOL_SYS_LIB_STRIP +# ------------------------ +AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +[striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then @@ -2413,17 +1869,33 @@ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$striplib" && striplib="$STRIP --strip-unneeded" AC_MSG_RESULT([yes]) else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + AC_MSG_RESULT([yes]) + else AC_MSG_RESULT([no]) fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +])# AC_LIBTOOL_SYS_LIB_STRIP -reload_cmds='$LD$reload_flag -o $output$reload_objs' -test -z "$deplibs_check_method" && deplibs_check_method=unknown +# AC_LIBTOOL_SYS_DYNAMIC_LINKER +# ----------------------------- # PORTME Fill in your ld.so characteristics -AC_MSG_CHECKING([dynamic linker characteristics]) +AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +[AC_MSG_CHECKING([dynamic linker characteristics]) library_names_spec= libname_spec='lib$name' soname_spec= +shrext=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2433,23 +1905,60 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # sanitize + new_sys_lib_search_path_spec= + for d in $sys_lib_search_path_spec ; do + # check if exists + if test -d $d -a -x $d ; then + # normalize + new_d=$(cd $d ; pwd) + # uniq + if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then + new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d " + fi + fi + done + # compress spaces + sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown case $host_os in aix3*) version_type=linux - library_names_spec='${libname}${release}.so$versuffix $libname.a' + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH - # AIX has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}.so$major' + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' ;; aix4* | aix5*) version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file @@ -2459,29 +1968,28 @@ aix4* | aix5*) # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; esac - # AIX (on Power*) has no versioning support, so currently we can - # not hardcode correct soname into executable. Probably we can - # add versioning support to collect2, so additional links can - # be useful in future. + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. if test "$aix_use_runtimelinking" = yes; then # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' else # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}.so$major' + soname_spec='${libname}${release}${shared_ext}$major' fi shlibpath_var=LIBPATH fi @@ -2494,7 +2002,7 @@ amigaos*) ;; beos*) - library_names_spec='${libname}.so' + library_names_spec='${libname}${shared_ext}' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2502,13 +2010,12 @@ beos*) bsdi4*) version_type=linux need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - export_dynamic_flag_spec=-rdynamic # the default ld.so.conf also contains /usr/contrib/lib and # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow # libtool to hard-code these into programs @@ -2516,29 +2023,55 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows + shrext=".dll" need_version=no need_lib_prefix=no + case $GCC,$host_os in - yes,cygwin*) + yes,cygwin* | yes,mingw* | yes,pw32*) library_names_spec='$libname.dll.a' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' - postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog .libs/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac ;; - yes,mingw*) - library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` - ;; - yes,pw32*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - ;; + *) - library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' @@ -2554,10 +2087,25 @@ darwin* | rhapsody*) # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' - soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH + shrext='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH ;; freebsd1*) @@ -2569,12 +2117,12 @@ freebsd*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; esac @@ -2583,7 +2131,11 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - *) + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + *) # from 3.2 on shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -2594,8 +2146,8 @@ gnu*) version_type=linux need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' - soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH hardcode_into_libs=yes ;; @@ -2603,33 +2155,75 @@ gnu*) hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. - dynamic_linker="$host_os dld.sl" version_type=sunos need_lib_prefix=no need_version=no - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' - soname_spec='${libname}${release}.sl$major' + case "$host_cpu" in + ia64*) + shrext='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' ;; -irix5* | irix6*) - version_type=irix +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' case $host_os in - irix5*) + irix5* | nonstopux*) libsuff= shlibsuff= ;; *) case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; *) libsuff= shlibsuff= libmagic=never-match;; esac ;; @@ -2638,20 +2232,21 @@ irix5* | irix6*) shlibpath_overrides_runpath=no sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes ;; # No shared lib support for Linux oldld, aout, or coff. -linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) +linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; # This must be Linux ELF. -linux-gnu*) +linux*) version_type=linux need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2674,12 +2269,12 @@ netbsd*) need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' - soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2689,7 +2284,17 @@ netbsd*) newsos6) version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2698,36 +2303,38 @@ openbsd*) version_type=sunos need_lib_prefix=no need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case "$host_os" in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac else shlibpath_overrides_runpath=yes fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH ;; os2*) libname_spec='$name' + shrext=".dll" need_lib_prefix=no - library_names_spec='$libname.dll $libname.a' + library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' shlibpath_var=LIBPATH ;; osf3* | osf4* | osf5*) version_type=osf + need_lib_prefix=no need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" @@ -2735,8 +2342,8 @@ osf3* | osf4* | osf5*) sco3.2v5*) version_type=osf - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2744,8 +2351,8 @@ solaris*) version_type=linux need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2755,7 +2362,7 @@ solaris*) sunos4*) version_type=sunos - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2767,12 +2374,18 @@ sunos4*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no ;; motorola) need_lib_prefix=no @@ -2783,39 +2396,950 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) esac ;; -uts4*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - sysv4*MP*) if test -d /usr/nec ;then version_type=linux - library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' - soname_spec='$libname.so.$major' + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + *) dynamic_linker=no ;; esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no +])# AC_LIBTOOL_SYS_DYNAMIC_LINKER -# Report the final consequences. + +# _LT_AC_TAGCONFIG +# ---------------- +AC_DEFUN([_LT_AC_TAGCONFIG], +[AC_ARG_WITH([tags], + [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], + [include additional configurations @<:@automatic@:>@])], + [tagnames="$withval"]) + +if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then + AC_MSG_WARN([output file `$ofile' does not exist]) + fi + + if test -z "$LTCC"; then + eval "`$SHELL ${ofile} --config | grep '^LTCC='`" + if test -z "$LTCC"; then + AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) + else + AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) + fi + fi + + # Extract list of available tagged configurations in $ofile. + # Note that this assumes the entire list is on one line. + available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for tagname in $tagnames; do + IFS="$lt_save_ifs" + # Check whether tagname contains only valid characters + case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in + "") ;; + *) AC_MSG_ERROR([invalid tag name: $tagname]) + ;; + esac + + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null + then + AC_MSG_ERROR([tag name \"$tagname\" already exists]) + fi + + # Update the list of available tags. + if test -n "$tagname"; then + echo appending configuration tag \"$tagname\" to $ofile + + case $tagname in + CXX) + if test -n "$CXX" && test "X$CXX" != "Xno"; then + AC_LIBTOOL_LANG_CXX_CONFIG + else + tagname="" + fi + ;; + + F77) + if test -n "$F77" && test "X$F77" != "Xno"; then + AC_LIBTOOL_LANG_F77_CONFIG + else + tagname="" + fi + ;; + + GCJ) + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then + AC_LIBTOOL_LANG_GCJ_CONFIG + else + tagname="" + fi + ;; + + RC) + AC_LIBTOOL_LANG_RC_CONFIG + ;; + + *) + AC_MSG_ERROR([Unsupported tag name: $tagname]) + ;; + esac + + # Append the new tag name to the list of available tags. + if test -n "$tagname" ; then + available_tags="$available_tags $tagname" + fi + fi + done + IFS="$lt_save_ifs" + + # Now substitute the updated list of available tags. + if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then + mv "${ofile}T" "$ofile" + chmod +x "$ofile" + else + rm -f "${ofile}T" + AC_MSG_ERROR([unable to update list of available tagged configurations.]) + fi +fi +])# _LT_AC_TAGCONFIG + + +# AC_LIBTOOL_DLOPEN +# ----------------- +# enable checks for dlopen support +AC_DEFUN([AC_LIBTOOL_DLOPEN], + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +])# AC_LIBTOOL_DLOPEN + + +# AC_LIBTOOL_WIN32_DLL +# -------------------- +# declare package support for building win32 dll's +AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +])# AC_LIBTOOL_WIN32_DLL + + +# AC_ENABLE_SHARED([DEFAULT]) +# --------------------------- +# implement the --enable-shared flag +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +AC_DEFUN([AC_ENABLE_SHARED], +[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +AC_ARG_ENABLE([shared], + [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +])# AC_ENABLE_SHARED + + +# AC_DISABLE_SHARED +# ----------------- +#- set the default shared flag to --disable-shared +AC_DEFUN([AC_DISABLE_SHARED], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_SHARED(no) +])# AC_DISABLE_SHARED + + +# AC_ENABLE_STATIC([DEFAULT]) +# --------------------------- +# implement the --enable-static flag +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +AC_DEFUN([AC_ENABLE_STATIC], +[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +AC_ARG_ENABLE([static], + [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_static=]AC_ENABLE_STATIC_DEFAULT) +])# AC_ENABLE_STATIC + + +# AC_DISABLE_STATIC +# ----------------- +# set the default static flag to --disable-static +AC_DEFUN([AC_DISABLE_STATIC], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_STATIC(no) +])# AC_DISABLE_STATIC + + +# AC_ENABLE_FAST_INSTALL([DEFAULT]) +# --------------------------------- +# implement the --enable-fast-install flag +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +AC_DEFUN([AC_ENABLE_FAST_INSTALL], +[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +AC_ARG_ENABLE([fast-install], + [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +])# AC_ENABLE_FAST_INSTALL + + +# AC_DISABLE_FAST_INSTALL +# ----------------------- +# set the default to --disable-fast-install +AC_DEFUN([AC_DISABLE_FAST_INSTALL], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_FAST_INSTALL(no) +])# AC_DISABLE_FAST_INSTALL + + +# AC_LIBTOOL_PICMODE([MODE]) +# -------------------------- +# implement the --with-pic flag +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +AC_DEFUN([AC_LIBTOOL_PICMODE], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +pic_mode=ifelse($#,1,$1,default) +])# AC_LIBTOOL_PICMODE + + +# AC_PROG_EGREP +# ------------- +# This is predefined starting with Autoconf 2.54, so this conditional +# definition can be removed once we require Autoconf 2.54 or later. +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], + [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi]) + EGREP=$ac_cv_prog_egrep + AC_SUBST([EGREP]) +])]) + + +# AC_PATH_TOOL_PREFIX +# ------------------- +# find a file program which can recognise shared library +AC_DEFUN([AC_PATH_TOOL_PREFIX], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="ifelse([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$1; then + lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac]) +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +])# AC_PATH_TOOL_PREFIX + + +# AC_PATH_MAGIC +# ------------- +# find a file program which can recognise a shared library +AC_DEFUN([AC_PATH_MAGIC], +[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# AC_PATH_MAGIC + + +# AC_PROG_LD +# ---------- +# find the path to the GNU or non-GNU linker +AC_DEFUN([AC_PROG_LD], +[AC_ARG_WITH([gnu-ld], + [AC_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no]) +AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case "$host_cpu" in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + irix5* | nonstopux*) + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" + ;; + *) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" + ;; + esac + lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be Linux ELF. +linux*) + case $host_cpu in + alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + ;; + +netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +nto-qnx) + lt_cv_deplibs_check_method=unknown + ;; + +openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi + ;; + +osf3* | osf4* | osf5*) + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' + lt_cv_file_magic_test_file=/shlib/libc.so + lt_cv_deplibs_check_method=pass_all + ;; + +sco3.2v5*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + lt_cv_file_magic_test_file=/lib/libc.so + ;; + +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown +])# AC_DEPLIBS_CHECK_METHOD + + +# AC_PROG_NM +# ---------- +# find the path to a BSD-compatible name lister +AC_DEFUN([AC_PROG_NM], +[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/${ac_tool_prefix}nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + esac + fi + done + IFS="$lt_save_ifs" + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +fi]) +NM="$lt_cv_path_NM" +])# AC_PROG_NM + + +# AC_CHECK_LIBM +# ------------- +# check for math library +AC_DEFUN([AC_CHECK_LIBM], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; +esac +])# AC_CHECK_LIBM + + +# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) +# ----------------------------------- +# sets LIBLTDL to the link flags for the libltdl convenience library and +# LTDLINCL to the include flags for the libltdl header and adds +# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL +# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will +# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with +# '${top_srcdir}/' (note the single quotes!). If your package is not +# flat and you're not using automake, define top_builddir and +# top_srcdir appropriately in the Makefiles. +AC_DEFUN([AC_LIBLTDL_CONVENIENCE], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + case $enable_ltdl_convenience in + no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; + "") enable_ltdl_convenience=yes + ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; + esac + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" +])# AC_LIBLTDL_CONVENIENCE + + +# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) +# ----------------------------------- +# sets LIBLTDL to the link flags for the libltdl installable library and +# LTDLINCL to the include flags for the libltdl header and adds +# --enable-ltdl-install to the configure arguments. Note that LIBLTDL +# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +# DIRECTORY is not provided and an installed libltdl is not found, it is +# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' +# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single +# quotes!). If your package is not flat and you're not using automake, +# define top_builddir and top_srcdir appropriately in the Makefiles. +# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +AC_DEFUN([AC_LIBLTDL_INSTALLABLE], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_CHECK_LIB(ltdl, lt_dlinit, + [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], + [if test x"$enable_ltdl_install" = xno; then + AC_MSG_WARN([libltdl not installed, but installation disabled]) + else + enable_ltdl_install=yes + fi + ]) + if test x"$enable_ltdl_install" = x"yes"; then + ac_configure_args="$ac_configure_args --enable-ltdl-install" + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + else + ac_configure_args="$ac_configure_args --enable-ltdl-install=no" + LIBLTDL="-lltdl" + LTDLINCL= + fi + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" +])# AC_LIBLTDL_INSTALLABLE + + +# AC_LIBTOOL_CXX +# -------------- +# enable support for C++ libraries +AC_DEFUN([AC_LIBTOOL_CXX], +[AC_REQUIRE([_LT_AC_LANG_CXX]) +])# AC_LIBTOOL_CXX + + +# _LT_AC_LANG_CXX +# --------------- +AC_DEFUN([_LT_AC_LANG_CXX], +[AC_REQUIRE([AC_PROG_CXX]) +AC_REQUIRE([AC_PROG_CXXCPP]) +_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`]) +])# _LT_AC_LANG_CXX + + +# AC_LIBTOOL_F77 +# -------------- +# enable support for Fortran 77 libraries +AC_DEFUN([AC_LIBTOOL_F77], +[AC_REQUIRE([_LT_AC_LANG_F77]) +])# AC_LIBTOOL_F77 + + +# _LT_AC_LANG_F77 +# --------------- +AC_DEFUN([_LT_AC_LANG_F77], +[AC_REQUIRE([AC_PROG_F77]) +_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,F77" | sed 's/^,//'`]) +])# _LT_AC_LANG_F77 + + +# AC_LIBTOOL_GCJ +# -------------- +# enable support for GCJ libraries +AC_DEFUN([AC_LIBTOOL_GCJ], +[AC_REQUIRE([_LT_AC_LANG_GCJ]) +])# AC_LIBTOOL_GCJ + + +# _LT_AC_LANG_GCJ +# --------------- +AC_DEFUN([_LT_AC_LANG_GCJ], +[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], + [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], + [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], + [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`]) +])# _LT_AC_LANG_GCJ + + +# AC_LIBTOOL_RC +# -------------- +# enable support for Windows resource files +AC_DEFUN([AC_LIBTOOL_RC], +[AC_REQUIRE([LT_AC_PROG_RC]) +_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,RC" | sed 's/^,//'`]) +])# AC_LIBTOOL_RC + + +# AC_LIBTOOL_LANG_C_CONFIG +# ------------------------ +# Ensure that the configuration vars for the C compiler are +# suitably defined. Those variables are subsequently used by +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +AC_DEFUN([_LT_AC_LANG_C_CONFIG], +[lt_save_CC="$CC" +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_AC_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}\n' + +_LT_AC_SYS_COMPILER + +# +# Check for any special shared library compilation flags. +# +_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= +if test "$GCC" = no; then + case $host_os in + sco3.2v5*) + _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' + ;; + esac +fi +if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then + AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) + if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : + else + AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) + _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no + fi +fi + + +# +# Check to make sure the static flag actually works. +# +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) + + +AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +AC_LIBTOOL_PROG_COMPILER_PIC($1) +AC_LIBTOOL_PROG_CC_C_O($1) +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +AC_LIBTOOL_PROG_LD_SHLIBS($1) +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_LIBTOOL_SYS_LIB_STRIP +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +AC_LIBTOOL_DLOPEN_SELF($1) + +# Report which librarie types wil actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -2838,6 +3362,34 @@ aix4*) test "$enable_shared" = yes && enable_static=no fi ;; + darwin* | rhapsody*) + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case "$host_os" in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' + ;; + *) # Darwin 1.3 on + test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + ;; + esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + fi + ;; esac AC_MSG_RESULT([$enable_shared]) @@ -2846,111 +3398,1292 @@ AC_MSG_CHECKING([whether to build static libraries]) test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless +AC_LIBTOOL_CONFIG($1) + +AC_LANG_POP +CC="$lt_save_CC" +])# AC_LIBTOOL_LANG_C_CONFIG + + +# AC_LIBTOOL_LANG_CXX_CONFIG +# -------------------------- +# Ensure that the configuration vars for the C compiler are +# suitably defined. Those variables are subsequently used by +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) +AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], +[AC_LANG_PUSH(C++) +AC_REQUIRE([AC_PROG_CXX]) +AC_REQUIRE([AC_PROG_CXXCPP]) + +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_AC_TAGVAR(allow_undefined_flag, $1)= +_LT_AC_TAGVAR(always_export_symbols, $1)=no +_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_AC_TAGVAR(hardcode_direct, $1)=no +_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +_LT_AC_TAGVAR(hardcode_automatic, $1)=no +_LT_AC_TAGVAR(module_cmds, $1)= +_LT_AC_TAGVAR(module_expsym_cmds, $1)= +_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_AC_TAGVAR(no_undefined_flag, $1)= +_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Dependencies to place before and after the object being linked: +_LT_AC_TAGVAR(predep_objects, $1)= +_LT_AC_TAGVAR(postdep_objects, $1)= +_LT_AC_TAGVAR(predeps, $1)= +_LT_AC_TAGVAR(postdeps, $1)= +_LT_AC_TAGVAR(compiler_lib_search_path, $1)= + +# Source file extension for C++ test sources. +ac_ext=cc + +# Object file extension for compiled C++ test sources. +objext=o +_LT_AC_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_AC_SYS_COMPILER + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_LD=$LD +lt_save_GCC=$GCC +GCC=$GXX +lt_save_with_gnu_ld=$with_gnu_ld +lt_save_path_LD=$lt_cv_path_LD +if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +else + unset lt_cv_prog_gnu_ld +fi +if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX +else + unset lt_cv_path_LD +fi +test -z "${LDCXX+set}" || LD=$LDCXX +CC=${CXX-"c++"} +compiler=$CC +_LT_AC_TAGVAR(compiler, $1)=$CC +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` + +# We don't want -fno-exception wen compiling C++ code, so set the +# no_builtin_flag separately +if test "$GXX" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +else + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi +if test "$GXX" = yes; then + # Set up default GNU C++ configuration -AC_LIBTOOL_DLOPEN_SELF + AC_PROG_LD -if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - AC_CACHE_VAL([lt_cv_archive_cmds_need_lc], - [$rm conftest* - echo 'static int dummy;' > conftest.$ac_ext + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - if AC_TRY_EVAL(ac_compile); then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_cv_prog_cc_wl - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$save_allow_undefined_flag + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ + grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' else - cat conftest.err 1>&5 - fi]) - AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc]) - ;; - esac -fi -need_lc=${lt_cv_archive_cmds_need_lc-yes} + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= -# The second clause should only fire when bootstrapping the + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +else + GXX=no + with_gnu_ld=no + wlarc= +fi + +# PORTME: fill in a description of your system's C++ link characteristics +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +_LT_AC_TAGVAR(ld_shlibs, $1)=yes +case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_AC_TAGVAR(archive_cmds, $1)='' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GXX" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + else + # We have old collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + # Exported symbols can be pulled into shared objects from archives + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds it's shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + darwin* | rhapsody*) + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case "$host_os" in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' + ;; + *) # Darwin 1.3 on + test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + fi + ;; + + dgux*) + case $cc_basename in + ec++) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + freebsd[12]*) + # C++ shared libraries reported to be fairly broken before switch to ELF + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + freebsd-elf*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + freebsd*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_AC_TAGVAR(ld_shlibs, $1)=yes + ;; + gnu*) + ;; + hpux9*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + aCC) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + case "$host_cpu" in + hppa*64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + *) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case "$host_cpu" in + hppa*64*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + ia64*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + *) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + aCC) + case "$host_cpu" in + hppa*64*|ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case "$host_cpu" in + ia64*|hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + irix5* | irix6*) + case $cc_basename in + CC) + # SGI C++ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + fi + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + linux*) + case $cc_basename in + KCC) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc) + # Intel C++ + with_gnu_ld=yes + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + cxx) + # Compaq C++ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac + ;; + lynxos*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + m88k*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + mvs*) + case $cc_basename in + cxx) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + osf3*) + case $cc_basename in + KCC) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + + ;; + RCC) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + cxx) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + osf4* | osf5*) + case $cc_basename in + KCC) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' + ;; + RCC) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + cxx) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ + $rm $lib.exp' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + psos*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + sco*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case $cc_basename in + CC) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + lcc) + # Lucid + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + solaris*) + case $cc_basename in + CC) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The C++ compiler is used as linker so we must use $wl + # flag to pass the commands to the underlying system + # linker. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | grep -v '^2\.7' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + fi + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + fi + ;; + esac + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + tandem*) + case $cc_basename in + NCC) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + vxworks*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +esac +AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +_LT_AC_TAGVAR(GCC, $1)="$GXX" +_LT_AC_TAGVAR(LD, $1)="$LD" + +AC_LIBTOOL_POSTDEP_PREDEP($1) +AC_LIBTOOL_PROG_COMPILER_PIC($1) +AC_LIBTOOL_PROG_CC_C_O($1) +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +AC_LIBTOOL_PROG_LD_SHLIBS($1) +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_LIBTOOL_SYS_LIB_STRIP +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +AC_LIBTOOL_DLOPEN_SELF($1) + +AC_LIBTOOL_CONFIG($1) + +AC_LANG_POP +CC=$lt_save_CC +LDCXX=$LD +LD=$lt_save_LD +GCC=$lt_save_GCC +with_gnu_ldcxx=$with_gnu_ld +with_gnu_ld=$lt_save_with_gnu_ld +lt_cv_path_LDCXX=$lt_cv_path_LD +lt_cv_path_LD=$lt_save_path_LD +lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +])# AC_LIBTOOL_LANG_CXX_CONFIG + +# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +# ------------------------ +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < "${ofile}T" -#! $SHELL + case $lt_echo in + *'\[$]0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` + ;; + esac -# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +ifelse([$1], [], + [cfgfile="${ofile}T" + trap "$rm \"$cfgfile\"; exit 1" 1 2 15 + $rm -f "$cfgfile" + AC_MSG_NOTICE([creating $ofile])], + [cfgfile="$ofile"]) + + cat <<__EOF__ >> "$cfgfile" +ifelse([$1], [], +[#! $SHELL + +# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996-2000 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# +# This file is part of GNU Libtool: # Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify @@ -2989,14 +4739,21 @@ if test -f "$ltmain"; then # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# A sed program that does not truncate output. +SED=$lt_SED + # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" +Xsed="$SED -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -# ### BEGIN LIBTOOL CONFIG +# The names of the tagged configurations supported by this script. +available_tags= + +# ### BEGIN LIBTOOL CONFIG], +[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: @@ -3010,7 +4767,10 @@ build_libtool_libs=$enable_shared build_old_libs=$enable_static # Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$need_lc +build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) # Whether or not to optimize for fast installation. fast_install=$enable_fast_install @@ -3026,14 +4786,20 @@ echo=$lt_echo AR=$lt_AR AR_FLAGS=$lt_AR_FLAGS -# The default C compiler. -CC=$lt_CC +# A C compiler. +LTCC=$lt_LTCC + +# A language-specific compiler. +CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) # Is the compiler the GNU C compiler? -with_gcc=$GCC +with_gcc=$_LT_AC_TAGVAR(GCC, $1) + +# An ERE matcher. +EGREP=$lt_EGREP # The linker used to build libraries. -LD=$lt_LD +LD=$lt_[]_LT_AC_TAGVAR(LD, $1) # Whether we need hard or soft links. LN_S=$lt_LN_S @@ -3064,7 +4830,7 @@ reload_flag=$lt_reload_flag reload_cmds=$lt_reload_cmds # How to pass a linker flag through the compiler. -wl=$lt_wl +wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) # Object file suffix (normally "o"). objext="$ac_objext" @@ -3072,18 +4838,21 @@ objext="$ac_objext" # Old archive suffix (normally "a"). libext="$libext" +# Shared library suffix (normally ".so"). +shrext='$shrext' + # Executable file suffix (normally ""). exeext="$exeext" # Additional compiler flags for building library objects. -pic_flag=$lt_pic_flag +pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) pic_mode=$pic_mode -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_compiler_c_o +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len -# Can we write directly to a .lo ? -compiler_o_lo=$lt_compiler_o_lo +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) # Must we lock files when doing compilation ? need_locks=$lt_need_locks @@ -3104,19 +4873,19 @@ dlopen_self=$enable_dlopen_self dlopen_self_static=$enable_dlopen_self_static # Compiler flag to prevent dynamic linking. -link_static_flag=$lt_link_static_flag +link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) # Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_no_builtin_flag +no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) # Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec +export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) # Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec +whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) # Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec +thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) # Library versioning type. version_type=$version_type @@ -3133,26 +4902,50 @@ soname_spec=$lt_soname_spec # Commands used to build and install an old-style archive. RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds +old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds # Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds +old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) # Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) # Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds +archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) +archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) postinstall_cmds=$lt_postinstall_cmds postuninstall_cmds=$lt_postuninstall_cmds +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) +module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) + # Commands to strip libraries. old_striplib=$lt_old_striplib striplib=$lt_striplib +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) + # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -3160,10 +4953,10 @@ deplibs_check_method=$lt_deplibs_check_method file_magic_cmd=$lt_file_magic_cmd # Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag +allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) # Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag +no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) # Commands used to finish a libtool library installation in a directory. finish_cmds=$lt_finish_cmds @@ -3172,13 +4965,13 @@ finish_cmds=$lt_finish_cmds finish_eval=$lt_finish_eval # Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_global_symbol_pipe +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe # Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_global_symbol_to_cdecl +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl # Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # This is the shared library runtime path variable. runpath_var=$runpath_var @@ -3190,36 +4983,45 @@ shlibpath_var=$shlibpath_var shlibpath_overrides_runpath=$shlibpath_overrides_runpath # How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action +hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) # Whether we should hardcode library paths into libraries. hardcode_into_libs=$hardcode_into_libs # Flag to hardcode \$libdir into a binary during linking. # This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) # Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator +hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) -# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the # resulting binary. -hardcode_direct=$hardcode_direct +hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) # Set to yes if using the -LDIR flag during linking hardcodes DIR into the # resulting binary. -hardcode_minus_L=$hardcode_minus_L +hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into # the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var +hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) # Variables whose values should be saved in libtool wrapper scripts and # restored at relink time. variables_saved_for_relink="$variables_saved_for_relink" # Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs +link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries sys_lib_search_path_spec=$lt_sys_lib_search_path_spec @@ -3228,30 +5030,33 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" +fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" # Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols +always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) # The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds +export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) # The commands to extract the exported symbol list from a shared archive. extract_expsyms_cmds=$lt_extract_expsyms_cmds # Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms +exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) # Symbols that must always be exported. -include_expsyms=$lt_include_expsyms +include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) -# ### END LIBTOOL CONFIG +ifelse([$1],[], +[# ### END LIBTOOL CONFIG], +[# ### END LIBTOOL TAG CONFIG: $tagname]) __EOF__ +ifelse([$1],[], [ case $host_os in aix3*) - cat <<\EOF >> "${ofile}T" + cat <<\EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems @@ -3264,11 +5069,1493 @@ EOF ;; esac + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || \ + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +]) +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + test -f Makefile && make "$ltmain" +fi +])# AC_LIBTOOL_CONFIG + + +# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------------------- +AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], +[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + +_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test "$GCC" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + + AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI + + +# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +# --------------------------------- +AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], +[AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([AC_PROG_NM]) +AC_REQUIRE([AC_OBJEXT]) +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Transform the above into a raw symbol and a C symbol. +symxfrm='\1 \2\3 \3' + +# Transform an extracted symbol line into a proper C declaration +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) # Its linker distinguishes data from code symbols + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris* | sysv5*) + symcode='[[BDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGISTW]]' ;; +esac + +# Try without a prefix undercore, then with it. +for ac_symprfx in "" "_"; do + + # Write the raw and C identifiers. + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if grep ' nm_test_var$' "$nlist" >/dev/null; then + if grep ' nm_test_func$' "$nlist" >/dev/null; then + cat < conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif + +EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + + cat <> conftest.$ac_ext +#if defined (__STDC__) && __STDC__ +# define lt_ptr_t void * +#else +# define lt_ptr_t char * +# define const +#endif + +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + lt_ptr_t address; +} +lt_preloaded_symbols[[]] = +{ +EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext + cat <<\EOF >> conftest.$ac_ext + {0, (lt_ptr_t) 0} +}; + +#ifdef __cplusplus +} +#endif +EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -f conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi +]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + + +# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) +# --------------------------------------- +AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], +[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= + +AC_MSG_CHECKING([for $compiler option to produce PIC]) + ifelse([$1],[CXX],[ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | os2* | pw32*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case "$host_cpu" in + hppa*64*|ia64*) + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix4* | aix5*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68) + # Green Hills C++ Compiler + # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + dgux*) + case $cc_basename in + ec++) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + case "$host_cpu" in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux*) + case $cc_basename in + KCC) + # KAI C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + icpc) + # Intel C++ + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + cxx) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd*) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC) + # Rational C++ 2.4.1 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx) + # Digital/Compaq C++ + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + sco*) + case $cc_basename in + CC) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + *) + ;; + esac + ;; + solaris*) + case $cc_basename in + CC) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC) + # Sun C++ 4.x + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc) + # Lucid + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC) + # NonStop-UX NCC 3.20 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + unixware*) + ;; + vxworks*) + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test "$GCC" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case "$host_cpu" in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case "$host_cpu" in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + newsos6) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + linux*) + case $CC in + icc|ecc) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + ccc) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + esac + ;; + + osf3* | osf4* | osf5*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + sco3.2v5*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' + ;; + + solaris*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sunos4*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + uts4*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then + AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], + _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +case "$host_os" in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" + ;; +esac +]) + + +# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +# ------------------------------------ +# See if the linker supports building shared libraries. +AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +ifelse([$1],[CXX],[ + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - cygwin* | mingw* | pw32* | os2*) - cat <<'EOF' >> "${ofile}T" - # This is a source program that is used to create dlls on Windows - # Don't remove nor modify the starting and closing comments + aix4* | aix5*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + else + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw*) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; + *) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +],[ + runpath_var= + _LT_AC_TAGVAR(allow_undefined_flag, $1)= + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)= + _LT_AC_TAGVAR(archive_expsym_cmds, $1)= + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= + _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_minus_L, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown + _LT_AC_TAGVAR(hardcode_automatic, $1)=no + _LT_AC_TAGVAR(module_cmds, $1)= + _LT_AC_TAGVAR(module_expsym_cmds, $1)= + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_AC_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + _LT_AC_TAGVAR(ld_shlibs, $1)=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +EOF + fi + ;; + + amigaos*) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can't use + # them. + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + else + ld_shlibs=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris* | sysv5*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sunos4*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$link_static_flag"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + else + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_AC_TAGVAR(archive_cmds, $1)='' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + else + # We have old collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + # Exported symbols can be pulled into shared objects from archives + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds it's shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + # see comment about different semantics on the GNU ld section + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + + bsdi4*) + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + darwin* | rhapsody*) + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + case "$host_os" in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' + ;; + *) # Darwin 1.3 on + test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' + ;; + esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + fi + ;; + + dgux*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + freebsd1*) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + + hpux10* | hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*|ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case "$host_cpu" in + hppa*64*|ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + ;; + *) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + openbsd*) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + + os2*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + sco3.2v5*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + + solaris*) + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_AC_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4.2uw2*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + runpath_var='LD_RUN_PATH' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv5*) + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + ;; + + uts4*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi +]) +AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +# +# Do we need to explicitly link libc? +# +case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_AC_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) + _LT_AC_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) + then + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + else + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) + ;; + esac + fi + ;; +esac +])# AC_LIBTOOL_PROG_LD_SHLIBS + + +# _LT_AC_FILE_LTDLL_C +# ------------------- +# Be careful that the start marker always follows a newline. +AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ # /* ltdll.c starts here */ # #define WIN32_LEAN_AND_MEAN # #include @@ -3302,741 +6589,13 @@ EOF # return TRUE; # } # /* ltdll.c ends here */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments -# /* impgen.c starts here */ -# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. -# -# This file is part of GNU libtool. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# */ -# -# #include /* for printf() */ -# #include /* for open(), lseek(), read() */ -# #include /* for O_RDONLY, O_BINARY */ -# #include /* for strdup() */ -# -# /* O_BINARY isn't required (or even defined sometimes) under Unix */ -# #ifndef O_BINARY -# #define O_BINARY 0 -# #endif -# -# static unsigned int -# pe_get16 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[2]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 2); -# return b[0] + (b[1]<<8); -# } -# -# static unsigned int -# pe_get32 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[4]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 4); -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# static unsigned int -# pe_as32 (ptr) -# void *ptr; -# { -# unsigned char *b = ptr; -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# int -# main (argc, argv) -# int argc; -# char *argv[]; -# { -# int dll; -# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; -# unsigned long export_rva, export_size, nsections, secptr, expptr; -# unsigned long name_rvas, nexp; -# unsigned char *expdata, *erva; -# char *filename, *dll_name; -# -# filename = argv[1]; -# -# dll = open(filename, O_RDONLY|O_BINARY); -# if (dll < 1) -# return 1; -# -# dll_name = filename; -# -# for (i=0; filename[i]; i++) -# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') -# dll_name = filename + i +1; -# -# pe_header_offset = pe_get32 (dll, 0x3c); -# opthdr_ofs = pe_header_offset + 4 + 20; -# num_entries = pe_get32 (dll, opthdr_ofs + 92); -# -# if (num_entries < 1) /* no exports */ -# return 1; -# -# export_rva = pe_get32 (dll, opthdr_ofs + 96); -# export_size = pe_get32 (dll, opthdr_ofs + 100); -# nsections = pe_get16 (dll, pe_header_offset + 4 +2); -# secptr = (pe_header_offset + 4 + 20 + -# pe_get16 (dll, pe_header_offset + 4 + 16)); -# -# expptr = 0; -# for (i = 0; i < nsections; i++) -# { -# char sname[8]; -# unsigned long secptr1 = secptr + 40 * i; -# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); -# unsigned long vsize = pe_get32 (dll, secptr1 + 16); -# unsigned long fptr = pe_get32 (dll, secptr1 + 20); -# lseek(dll, secptr1, SEEK_SET); -# read(dll, sname, 8); -# if (vaddr <= export_rva && vaddr+vsize > export_rva) -# { -# expptr = fptr + (export_rva - vaddr); -# if (export_rva + export_size > vaddr + vsize) -# export_size = vsize - (export_rva - vaddr); -# break; -# } -# } -# -# expdata = (unsigned char*)malloc(export_size); -# lseek (dll, expptr, SEEK_SET); -# read (dll, expdata, export_size); -# erva = expdata - export_rva; -# -# nexp = pe_as32 (expdata+24); -# name_rvas = pe_as32 (expdata+32); -# -# printf ("EXPORTS\n"); -# for (i = 0; i> "${ofile}T" || (rm -f "${ofile}T"; exit 1) - - mv -f "${ofile}T" "$ofile" || \ - (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") - chmod +x "$ofile" -fi - -])# _LT_AC_LTCONFIG_HACK - -# AC_LIBTOOL_DLOPEN - enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) - -# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) - -# AC_ENABLE_SHARED - implement the --enable-shared flag -# Usage: AC_ENABLE_SHARED[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(shared, -changequote(<<, >>)dnl -<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl -]) - -# AC_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no)]) - -# AC_ENABLE_STATIC - implement the --enable-static flag -# Usage: AC_ENABLE_STATIC[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(static, -changequote(<<, >>)dnl -<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_static=AC_ENABLE_STATIC_DEFAULT)dnl -]) - -# AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no)]) +])# _LT_AC_FILE_LTDLL_C -# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag -# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(fast-install, -changequote(<<, >>)dnl -<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_fast_install=yes ;; -no) enable_fast_install=no ;; -*) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl -]) +# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +# --------------------------------- +AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no)]) - -# AC_LIBTOOL_PICMODE - implement the --with-pic flag -# Usage: AC_LIBTOOL_PICMODE[(MODE)] -# Where MODE is either `yes' or `no'. If omitted, it defaults to -# `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default)]) - - -# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in - /*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; - ?:/*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - egrep "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$ac_save_ifs" - MAGIC_CMD="$ac_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -]) - - -# AC_PATH_MAGIC - find a file program which can recognise a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl -AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH) - else - MAGIC_CMD=: - fi -fi -]) - - -# AC_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | [[A-Za-z]]:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$lt_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_PROG_LD_GNU -]) - -# AC_PROG_LD_GNU - -AC_DEFUN([AC_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - lt_cv_prog_gnu_ld=yes -else - lt_cv_prog_gnu_ld=no -fi]) -with_gnu_ld=$lt_cv_prog_gnu_ld -]) - -# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker -# -- PORTME Some linkers may need a different reload flag. -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], -[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag, -[lt_cv_ld_reload_flag='-r']) -reload_flag=$lt_cv_ld_reload_flag -test -n "$reload_flag" && reload_flag=" $reload_flag" -]) - -# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependant libraries], -lt_cv_deplibs_check_method, -[lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given egrep regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix4* | aix5*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi4*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin* | mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[[012]]) - lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac - ;; - -freebsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20*|hpux11*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - -irix5* | irix6*) - case $host_os in - irix5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -openbsd*) - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' - else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' - fi - ;; - -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so - ;; - -sysv5uw[[78]]* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - esac - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -]) - - -# AC_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl -AC_MSG_CHECKING([for BSD-compatible nm]) -AC_CACHE_VAL(lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - test -z "$ac_dir" && ac_dir=. - tmp_nm=$ac_dir/${ac_tool_prefix}nm - if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then - lt_cv_path_NM="$tmp_nm -B" - break - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - lt_cv_path_NM="$tmp_nm -p" - break - else - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - fi - fi - done - IFS="$ac_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -AC_MSG_RESULT([$NM]) -]) - -# AC_CHECK_LIBM - check for math library -AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32*) - # These system don't have libm - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, main, LIBM="-lm") - ;; -esac -]) - -# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-convenience to the -# configure arguments. Note that LIBLTDL and INCLTDL are not -# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not -# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed -# with '${top_builddir}/' and INCLTDL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -]) - -# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-install to the configure -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is -# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed -# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed -# with '${top_srcdir}/' (note the single quotes!). If your package is -# not flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, main, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - INCLTDL= - fi -]) # old names AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) @@ -4050,7 +6609,126 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) -#serial 1 +AC_DEFUN([LT_AC_PROG_GCJ], +[AC_CHECK_TOOL(GCJ, gcj, no) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS) +]) + +AC_DEFUN([LT_AC_PROG_RC], +[AC_CHECK_TOOL(RC, windres, no) +]) + +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +# LT_AC_PROG_SED +# -------------- +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && break + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +SED=$lt_cv_path_SED +]) +AC_MSG_RESULT([$SED]) +]) + +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +# isc-posix.m4 serial 2 (gettext-0.11.2) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. + # This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro # because gettext's gettext.m4 (distributed in the automake package) @@ -4069,7 +6747,24 @@ AC_DEFUN([AC_ISC_POSIX], ) -# serial 1 +# Copyright 1996, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 AC_DEFUN([AM_C_PROTOTYPES], [AC_REQUIRE([AM_PROG_CC_STDC]) @@ -4090,8 +6785,27 @@ AC_SUBST(U)dnl AC_SUBST(ANSI2KNR)dnl ]) +AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) -# serial 1 + +# Copyright 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 # @defmac AC_PROG_CC_STDC # @maindex PROG_CC_STDC @@ -4179,30 +6893,47 @@ case "x$am_cv_prog_cc_stdc" in esac ]) -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License or the GNU Library General Public License but which still want -# to provide support for the GNU gettext functionality. -# Please note that the actual code of the GNU gettext library is covered -# by the GNU Library General Public License, and the rest of the GNU -# gettext package package is covered by the GNU General Public License. -# They are *not* in the public domain. +AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC]) -# serial 10 +# gettext.m4 serial 20 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. -dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]). -dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +dnl Macro to add for using GNU gettext. + +dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). +dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The +dnl default (if it is not specified or empty) is 'no-libtool'. +dnl INTLSYMBOL should be 'external' for packages with no intl directory, +dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. +dnl If INTLSYMBOL is 'use-libtool', then a libtool library dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). Otherwise, a static library +dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library dnl $(top_builddir)/intl/libintl.a will be created. dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. -dnl LIBDIR is used to find the intl libraries. If empty, +dnl will be ignored. If NEEDSYMBOL is specified and is +dnl 'need-formatstring-macros', then GNU gettext implementations that don't +dnl support the ISO C 99 formatstring macros will be ignored. +dnl INTLDIR is used to find the intl libraries. If empty, dnl the value `$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: @@ -4216,29 +6947,63 @@ dnl Catalog extension: .mo after installation, .gmo in source tree dnl 3) No internationalization, always use English msgid. dnl Catalog format: none dnl Catalog extension: none +dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. dnl The use of .gmo is historical (it was needed to avoid overwriting the dnl GNU format catalogs when building on a platform with an X/Open gettext), dnl but we keep it in order not to force irrelevant filename changes on the dnl maintainers. dnl -AC_DEFUN([AM_WITH_NLS], - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) +AC_DEFUN([AM_GNU_GETTEXT], +[ + dnl Argument checking. + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT +])])])])]) + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT +])])])]) + define(gt_included_intl, ifelse([$1], [external], [no], [yes])) + define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) + AC_REQUIRE([AM_PO_SUBDIRS])dnl + ifelse(gt_included_intl, yes, [ + AC_REQUIRE([AM_INTL_SUBDIR])dnl + ]) + + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Sometimes libintl requires libiconv, so first search for libiconv. + dnl Ideally we would do this search only after the + dnl if test "$USE_NLS" = "yes"; then + dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT + dnl the configure script would need to contain the same shell code + dnl again, outside any 'if'. There are two solutions: + dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. + dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. + dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not + dnl documented, we avoid it. + ifelse(gt_included_intl, yes, , [ + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + ]) + + dnl Set USE_NLS. + AM_NLS + + ifelse(gt_included_intl, yes, [ BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no - INTLLIBS= + ]) + LIBINTL= + LTLIBINTL= + POSUB= - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], @@ -4248,214 +7013,192 @@ AC_DEFUN([AM_WITH_NLS], nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + ]) dnl User does not insist on using GNU NLS library. Figure out what dnl to use. If GNU gettext is available we use this. Else we have dnl to fall back to GNU NLS library. - CATOBJEXT=NONE dnl Add a version number to the cache macros. - define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc]) - define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl]) + define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) + define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) + define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, + [AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings;], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], + gt_cv_func_gnugettext_libc=yes, + gt_cv_func_gnugettext_libc=no)]) - if test "$gt_cv_func_gnugettext_libc" != "yes"; then - AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $LIBICONV" - AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) - LIBS="$gt_save_LIBS"]) - fi + if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl Sometimes libintl requires libiconv, so first search for libiconv. + ifelse(gt_included_intl, yes, , [ + AM_ICONV_LINK + ]) + dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL + dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) + dnl because that would add "-liconv" to LIBINTL and LTLIBINTL + dnl even if libiconv doesn't exist. + AC_LIB_LINKFLAGS_BODY([intl]) + AC_CACHE_CHECK([for GNU gettext in libintl], + gt_cv_func_gnugettext_libintl, + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + dnl Now see whether libintl exists and does not depend on libiconv. + AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], + gt_cv_func_gnugettext_libintl=yes, + gt_cv_func_gnugettext_libintl=no) + dnl Now see whether libintl exists and depends on libiconv. + if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + gt_cv_func_gnugettext_libintl=yes + ]) + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + fi - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) + dnl If an already present or preinstalled GNU gettext() is found, + dnl use it. But if this macro is used in GNU gettext, and GNU + dnl gettext is already preinstalled in libintl, we update this + dnl libintl. (Cf. the install rule in intl/Makefile.in.) + if test "$gt_cv_func_gnugettext_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + dnl Reset the values set by searching for libintl. + LIBINTL= + LTLIBINTL= + INCINTL= + fi - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - dnl If iconv() is in a separate libiconv library, then anyone - dnl linking with libintl{.a,.so} also needs to link with - dnl libiconv. - INTLLIBS="-lintl $LIBICONV" - fi - - gt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - LIBS="$gt_save_LIBS" - - dnl Search for GNU msgfmt in the PATH. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Search for GNU xgettext in the PATH. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) - - CATOBJEXT=.gmo - fi - ]) - - if test "$CATOBJEXT" = "NONE"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=yes + ifelse(gt_included_intl, yes, [ + if test "$gt_use_preinstalled_gnugettext" != "yes"; then + dnl GNU gettext is not found in the C library. + dnl Fall back on included GNU gettext library. + nls_cv_use_gnu_gettext=yes fi fi if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) - AC_SUBST(MSGFMT) - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions to use GNU gettext tools. CATOBJEXT=.gmo - INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi + ]) - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU msgfmt. - if test "$GMSGFMT" != ":"; then - dnl If it is no GNU msgfmt we define it as : so that the - dnl Makefiles still can work. - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else - AC_MSG_RESULT( - [found msgfmt program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - fi - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - dnl We need to process the po/ directory. - POSUB=po + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, + [Define to 1 if translation of program messages to the user's native language + is requested.]) + else + USE_NLS=no fi - AC_OUTPUT_COMMANDS( - [for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - fi - ;; - esac - done]) + fi + AC_MSG_CHECKING([whether to use NLS]) + AC_MSG_RESULT([$USE_NLS]) + if test "$USE_NLS" = "yes"; then + AC_MSG_CHECKING([where the gettext function comes from]) + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + AC_MSG_RESULT([$gt_source]) + fi + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + AC_MSG_CHECKING([how to link with libintl]) + AC_MSG_RESULT([$LIBINTL]) + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) + fi + + dnl For backward compatibility. Some packages may be using this. + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + AC_DEFINE(HAVE_DCGETTEXT, 1, + [Define if the GNU dcgettext() function is already present or preinstalled.]) + fi + + dnl We need to process the po/ directory. + POSUB=po + fi + + ifelse(gt_included_intl, yes, [ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext; then + if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then BUILD_INCLUDED_LIBINTL=yes fi - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - dnl Make all variables we use known to autoconf. AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATALOGS) AC_SUBST(CATOBJEXT) - AC_SUBST(GMOFILES) - AC_SUBST(INTLLIBS) - AC_SUBST(INTLOBJS) - AC_SUBST(POFILES) - AC_SUBST(POSUB) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= @@ -4472,126 +7215,432 @@ changequote([,])dnl dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat AC_SUBST(GENCAT) + + dnl For backward compatibility. Some Makefiles may be using this. + if test "$USE_INCLUDED_LIBINTL" = yes; then + INTLOBJS="\$(GETTOBJS)" + fi + AC_SUBST(INTLOBJS) + + dnl Enable libtool support if the surrounding package wishes it. + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix + AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) ]) -dnl Usage: Just like AM_WITH_NLS, which see. -AC_DEFUN([AM_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST(INTLLIBS) - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ + dnl Make all documented variables known to autoconf. + AC_SUBST(LIBINTL) + AC_SUBST(LTLIBINTL) + AC_SUBST(POSUB) +]) + + +dnl Checks for all prerequisites of the intl subdirectory, +dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, +dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. +AC_DEFUN([AM_INTL_SUBDIR], +[ + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + AC_REQUIRE([jm_GLIBC21])dnl + AC_REQUIRE([gt_INTDIV0])dnl + AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl + AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl + AC_REQUIRE([gt_INTTYPES_PRI])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) + AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ +geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ +strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \ +__fsetlocking]) - AM_ICONV - AM_LANGINFO_CODESET - AM_LC_MESSAGES - AM_WITH_NLS([$1],[$2],[$3]) + AM_ICONV + AM_LANGINFO_CODESET + if test $ac_cv_header_locale_h = yes; then + AM_LC_MESSAGES + fi - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi + dnl intl/plural.c is generated from intl/plural.y. It requires bison, + dnl because plural.y uses bison specific features. It requires at least + dnl bison-1.26 because earlier versions generate a plural.c that doesn't + dnl compile. + dnl bison is only needed for the maintainer (who touches plural.y). But in + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put + dnl the rule in general Makefile. Now, some people carelessly touch the + dnl files or have a broken "make" program, hence the plural.c rule will + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not + dnl present or too old. + AC_CHECK_PROGS([INTLBISON], [bison]) + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + dnl Found it, now check the version. + AC_MSG_CHECKING([version of bison]) +changequote(<<,>>)dnl + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) +changequote([,])dnl + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + AC_MSG_RESULT([$ac_prog_version]) + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi +]) - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but $(top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) - ]) +# po.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +dnl Checks for all prerequisites of the po subdirectory. +AC_DEFUN([AM_PO_SUBDIRS], +[ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AM_NLS])dnl + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. + + dnl Search for GNU msgfmt in the PATH. + dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. + dnl The second test excludes FreeBSD msgfmt. + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + + dnl Search for GNU xgettext 0.12 or newer in the PATH. + dnl The first test excludes Solaris xgettext and early GNU xgettext versions. + dnl The second test excludes FreeBSD xgettext. + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + + dnl Search for GNU msgmerge 0.11 or newer in the PATH. + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU msgfmt. + if test "$GMSGFMT" != ":"; then + dnl If it is no GNU msgfmt we define it as : so that the + dnl Makefiles still can work. + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + AC_MSG_RESULT( + [found $GMSGFMT program is not GNU msgfmt; ignore it]) + GMSGFMT=":" + fi + fi + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + fi + + AC_OUTPUT_COMMANDS([ + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assigment from automake. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' + fi + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + GMOFILES= + UPDATEPOFILES= + DUMMYPOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done], + [# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it + # from automake. + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" + ]) +]) + +# nls.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) +]) + +AC_DEFUN([AM_MKINSTALLDIRS], +[ + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but $(top_srcdir). + dnl Try to locate it. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) +]) + +# progtest.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1996. # Search path for a program which passes the given test. -# Ulrich Drepper , 1996. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License or the GNU Library General Public License but which still want -# to provide support for the GNU gettext functionality. -# Please note that the actual code of the GNU gettext library is covered -# by the GNU Library General Public License, and the rest of the GNU -# gettext package package is covered by the GNU General Public License. -# They are *not* in the public domain. - -# serial 2 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. +[ +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) AC_CACHE_VAL(ac_cv_path_$1, [case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; + [[\\/]]* | ?:[[\\/]]*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in ifelse([$5], , $PATH, [$5]); do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" dnl If no 4th arg is given, leave the cache variable unset, dnl so AC_PATH_PROGS will keep looking. ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ])dnl - ;; + ;; esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then @@ -4602,7 +7651,936 @@ fi AC_SUBST($1)dnl ]) -#serial 2 +# lib-prefix.m4 serial 2 (gettext-0.12) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed +dnl to access previously installed libraries. The basic assumption is that +dnl a user will want packages to use other packages he previously installed +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_LIB_ARG_WITH([lib-prefix], +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) + +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +]) + +# lib-link.m4 serial 4 (gettext-0.12) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and +dnl augments the CPPFLAGS variable. +AC_DEFUN([AC_LIB_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + define([Name],[translit([$1],[./-], [___])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + ac_cv_lib[]Name[]_libs="$LIB[]NAME" + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ]) + LIB[]NAME="$ac_cv_lib[]Name[]_libs" + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the + dnl results of this search when this library appears as a dependency. + HAVE_LIB[]NAME=yes + undefine([Name]) + undefine([NAME]) +]) + +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl searches for libname and the libraries corresponding to explicit and +dnl implicit dependencies, together with the specified include files and +dnl the ability to compile and link the specified testcode. If found, it +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + define([Name],[translit([$1],[./-], [___])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, + dnl because if the user has installed lib[]Name and not disabled its use + dnl via --without-lib[]Name-prefix, he wants to use it. + ac_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LIB[]NAME" + AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) + LIBS="$ac_save_LIBS" + ]) + if test "$ac_cv_lib[]Name" = yes; then + HAVE_LIB[]NAME=yes + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) + AC_MSG_CHECKING([how to link with lib[]$1]) + AC_MSG_RESULT([$LIB[]NAME]) + else + HAVE_LIB[]NAME=no + dnl If $LIB[]NAME didn't lead to a usable library, we don't need + dnl $INC[]NAME either. + CPPFLAGS="$ac_save_CPPFLAGS" + LIB[]NAME= + LTLIB[]NAME= + fi + AC_SUBST([HAVE_LIB]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + undefine([Name]) + undefine([NAME]) +]) + +dnl Determine the platform dependent parameters needed to use rpath: +dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, +dnl hardcode_direct, hardcode_minus_L. +AC_DEFUN([AC_LIB_RPATH], +[ + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir + AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + ]) + wl="$acl_cv_wl" + libext="$acl_cv_libext" + shlibext="$acl_cv_shlibext" + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + hardcode_direct="$acl_cv_hardcode_direct" + hardcode_minus_L="$acl_cv_hardcode_minus_L" + dnl Determine whether the user wants rpath handling at all. + AC_ARG_ENABLE(rpath, + [ --disable-rpath do not hardcode runtime library paths], + :, enable_rpath=yes) +]) + +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +[ + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_LIB_ARG_WITH([lib$1-prefix], +[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib + --without-lib$1-prefix don't search for lib$1 in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Using breadth-first-seach. + LIB[]NAME= + LTLIB[]NAME= + INC[]NAME= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='$1 $2' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. + : + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + dnl and the already constructed $LIBNAME/$LTLIBNAME. + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + dnl No hardcoding is needed. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + dnl The hardcoding into $LIBNAME is system dependent. + if test "$hardcode_direct" = yes; then + dnl Using DIR/libNAME.so during linking hardcodes DIR into the + dnl resulting binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + dnl or the already constructed $LIBNAME + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl Potentially add $additional_includedir to $INCNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl constructed $INCNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INC[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $INCNAME. + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl constructed $LIBNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LIBNAME. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LTLIBNAME. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dnl Handle this in the next round. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + dnl single library, but not when more than one $LIBNAMEs are used. + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" + done + fi +]) + +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, +dnl unless already present in VAR. +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes +dnl contains two or three consecutive elements that belong together. +AC_DEFUN([AC_LIB_APPENDTOVAR], +[ + for element in [$2]; do + haveit= + for x in $[$1]; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + [$1]="${[$1]}${[$1]:+ }$element" + fi + done +]) + +# lib-ld.m4 serial 2 (gettext-0.12) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl Subroutines of libtool.m4, +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision +dnl with libtool.m4. + +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +AC_DEFUN([AC_LIB_PROG_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +if $LD -v 2>&1 &5; then + acl_cv_prog_gnu_ld=yes +else + acl_cv_prog_gnu_ld=no +fi]) +with_gnu_ld=$acl_cv_prog_gnu_ld +]) + +dnl From libtool-1.4. Sets the variable LD. +AC_DEFUN([AC_LIB_PROG_LD], +[AC_ARG_WITH(gnu-ld, +[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], +test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by GCC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]* | [A-Za-z]:[\\/]*)] + [re_direlt='/[^/][^/]*/\.\./'] + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(acl_cv_path_LD, +[if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then + test "$with_gnu_ld" != no && break + else + test "$with_gnu_ld" != yes && break + fi + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi]) +LD="$acl_cv_path_LD" +if test -n "$LD"; then + AC_MSG_RESULT($LD) +else + AC_MSG_RESULT(no) +fi +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_LIB_PROG_LD_GNU +]) + +# iconv.m4 serial AM4 (gettext-0.11.3) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], +[ + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([iconv]) +]) + +AC_DEFUN([AM_ICONV_LINK], +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable GNU libiconv installed). + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + + dnl Add $INCICONV to CPPFLAGS before performing the following checks, + dnl because if the user has installed libiconv and not disabled its use + dnl via --without-libiconv-prefix, he wants to use it. The first + dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + am_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) + + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_func_iconv=yes) + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_lib_iconv=yes + am_cv_func_iconv=yes) + LIBS="$am_save_LIBS" + fi + ]) + if test "$am_cv_func_iconv" = yes; then + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + fi + if test "$am_cv_lib_iconv" = yes; then + AC_MSG_CHECKING([how to link with libiconv]) + AC_MSG_RESULT([$LIBICONV]) + else + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV + dnl either. + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + AC_SUBST(LIBICONV) + AC_SUBST(LTLIBICONV) +]) + +AC_DEFUN([AM_ICONV], +[ + AM_ICONV_LINK + if test "$am_cv_func_iconv" = yes; then + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_TRY_COMPILE([ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + AC_MSG_RESULT([$]{ac_t:- + }[$]am_cv_proto_iconv) + AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + [Define as const if the declaration of iconv() needs const.]) + fi +]) + +# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. # Test for the GNU C Library, version 2.1 or newer. # From Bruno Haible. @@ -4629,77 +8607,262 @@ AC_DEFUN([jm_GLIBC21], ] ) -#serial AM2 +# intdiv0.m4 serial 1 (gettext-0.11.3) +dnl Copyright (C) 2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. -AC_DEFUN([AM_ICONV], +AC_DEFUN([gt_INTDIV0], [ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_ARG_WITH([libiconv-prefix], -[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi - done - ]) - - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS -liconv" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ + AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], + gt_cv_int_divbyzero_sigfpe, + [ + AC_TRY_RUN([ #include -#include -extern +#include + +static void #ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +sigfpe_handler (int sig) #else -size_t iconv(); +sigfpe_handler (sig) int sig; #endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi - LIBICONV= - if test "$am_cv_lib_iconv" = yes; then - LIBICONV="-liconv" - fi - AC_SUBST(LIBICONV) +{ + /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ + exit (sig != SIGFPE); +} + +int x = 1; +int y = 0; +int z; +int nan; + +int main () +{ + signal (SIGFPE, sigfpe_handler); +/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ +#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) + signal (SIGTRAP, sigfpe_handler); +#endif +/* Linux/SPARC yields signal SIGILL. */ +#if defined (__sparc__) && defined (__linux__) + signal (SIGILL, sigfpe_handler); +#endif + + z = x / y; + nan = y / y; + exit (1); +} +], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, + [ + # Guess based on the CPU. + case "$host_cpu" in + alpha* | i[34567]86 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; + esac + ]) + ]) + case "$gt_cv_int_divbyzero_sigfpe" in + *yes) value=1;; + *) value=0;; + esac + AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, + [Define if integer division by zero raises signal SIGFPE.]) ]) -#serial AM1 +# uintmax_t.m4 serial 7 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +AC_PREREQ(2.13) + +# Define uintmax_t to 'unsigned long' or 'unsigned long long' +# if it is not already defined in or . + +AC_DEFUN([jm_AC_TYPE_UINTMAX_T], +[ + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then + AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + test $ac_cv_type_unsigned_long_long = yes \ + && ac_type='unsigned long long' \ + || ac_type='unsigned long' + AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, + [Define to unsigned long or unsigned long long + if and don't define.]) + else + AC_DEFINE(HAVE_UINTMAX_T, 1, + [Define if you have the 'uintmax_t' type in or .]) + fi +]) + +# inttypes_h.m4 serial 5 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, +# doesn't clash with , and declares uintmax_t. + +AC_DEFUN([jm_AC_HEADER_INTTYPES_H], +[ + AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, + [AC_TRY_COMPILE( + [#include +#include ], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_inttypes_h=yes, + jm_ac_cv_header_inttypes_h=no)]) + if test $jm_ac_cv_header_inttypes_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, + [Define if exists, doesn't clash with , + and declares uintmax_t. ]) + fi +]) + +# stdint_h.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_STDINT_H_WITH_UINTMAX if exists, +# doesn't clash with , and declares uintmax_t. + +AC_DEFUN([jm_AC_HEADER_STDINT_H], +[ + AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, + [AC_TRY_COMPILE( + [#include +#include ], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_stdint_h=yes, + jm_ac_cv_header_stdint_h=no)]) + if test $jm_ac_cv_header_stdint_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, + [Define if exists, doesn't clash with , + and declares uintmax_t. ]) + fi +]) + +# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) +dnl Copyright (C) 1999-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], +[ + AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, + [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], + [unsigned long long ullmax = (unsigned long long) -1; + return ull << i | ull >> i | ullmax / ull | ullmax % ull;], + ac_cv_type_unsigned_long_long=yes, + ac_cv_type_unsigned_long_long=no)]) + if test $ac_cv_type_unsigned_long_long = yes; then + AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, + [Define if you have the unsigned long long type.]) + fi +]) + +# inttypes.m4 serial 1 (gettext-0.11.4) +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_INTTYPES_H if exists and doesn't clash with +# . + +AC_DEFUN([gt_HEADER_INTTYPES_H], +[ + AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, + [ + AC_TRY_COMPILE( + [#include +#include ], + [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) + ]) + if test $gt_cv_header_inttypes_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, + [Define if exists and doesn't clash with .]) + fi +]) + +# inttypes-pri.m4 serial 1 (gettext-0.11.4) +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +# Define PRI_MACROS_BROKEN if exists and defines the PRI* +# macros to non-string values. This is the case on AIX 4.3.3. + +AC_DEFUN([gt_INTTYPES_PRI], +[ + AC_REQUIRE([gt_HEADER_INTTYPES_H]) + if test $gt_cv_header_inttypes_h = yes; then + AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], + gt_cv_inttypes_pri_broken, + [ + AC_TRY_COMPILE([#include +#ifdef PRId32 +char *p = PRId32; +#endif +], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) + ]) + fi + if test "$gt_cv_inttypes_pri_broken" = yes; then + AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, + [Define if exists and defines unusable PRI* macros.]) + fi +]) + +# codeset.m4 serial AM1 (gettext-0.10.40) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. @@ -4717,28 +8880,36 @@ AC_DEFUN([AM_LANGINFO_CODESET], fi ]) -# Check whether LC_MESSAGES is available in . -# Ulrich Drepper , 1995. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License or the GNU Library General Public License but which still want -# to provide support for the GNU gettext functionality. -# Please note that the actual code of the GNU gettext library is covered -# by the GNU Library General Public License, and the rest of the GNU -# gettext package package is covered by the GNU General Public License. -# They are *not* in the public domain. +# lcmessage.m4 serial 3 (gettext-0.11.3) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. -# serial 2 +dnl Authors: +dnl Ulrich Drepper , 1995. + +# Check whether LC_MESSAGES is available in . AC_DEFUN([AM_LC_MESSAGES], - [if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], +[ + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi +]) diff --git a/config.guess b/config.guess index dff9e481..500ee74b 100755 --- a/config.guess +++ b/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2001-09-04' +timestamp='2003-10-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,8 +24,9 @@ timestamp='2001-09-04' # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# Please send patches to . +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -87,30 +88,42 @@ if test $# != 0; then exit 1 fi +trap 'exit 1' 1 2 15 -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. -# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c ; - for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; - if test $? = 0 ; then +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -127,29 +140,30 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or + # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null @@ -166,75 +180,112 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mipseb-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` fi + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - eval $set_cc_for_build - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - esac - fi - rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -247,29 +298,11 @@ EOF Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -291,6 +324,13 @@ EOF NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -319,7 +359,7 @@ EOF echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -333,12 +373,6 @@ EOF aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - sparc*:NetBSD:*) - echo `uname -p`-unknown-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -365,18 +399,6 @@ EOF *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -415,15 +437,20 @@ EOF exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; @@ -496,8 +523,7 @@ EOF exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -506,7 +532,7 @@ EOF fi exit 0 ;; *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -546,10 +572,8 @@ EOF 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - case "${HPUX_REV}" in - 11.[0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -558,13 +582,13 @@ EOF case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi ;; - esac - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -597,11 +621,21 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -635,8 +669,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -664,9 +697,6 @@ EOF parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -685,9 +715,6 @@ EOF C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; @@ -700,27 +727,21 @@ EOF CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -730,11 +751,22 @@ EOF *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) + # Determine whether the default compiler uses glibc. + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #if __GLIBC__ >= 2 + LIBC=gnu + #else + LIBC= + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + # GNU/FreeBSD systems have a "k" prefix to indicate we are using + # FreeBSD's kernel, but not the complete OS. + case ${LIBC} in gnu) kernel_only='k' ;; esac + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -745,11 +777,17 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix + echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin @@ -769,17 +807,52 @@ EOF arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in - big) echo mips-unknown-linux-gnu && exit 0 ;; - little) echo mipsel-unknown-linux-gnu && exit 0 ;; - esac + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu @@ -815,6 +888,9 @@ EOF s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -828,7 +904,8 @@ EOF # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - ld_supported_targets=`cd /; ld --help 2>&1 \ + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// @@ -840,7 +917,7 @@ EOF ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; @@ -852,32 +929,31 @@ EOF esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build - cat >$dummy.c < -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-pc-linux-gnu\n", argv[1]); -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-pc-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) @@ -894,6 +970,23 @@ EOF # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -915,22 +1008,19 @@ EOF UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -954,9 +1044,15 @@ EOF # "miniframe" echo m68010-convergent-sysv exit 0 ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -973,9 +1069,6 @@ EOF mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1047,6 +1140,9 @@ EOF SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; @@ -1054,18 +1150,24 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo `uname -p`-${UNAME_MACHINE}-nto-qnx + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[KW]:NONSTOP_KERNEL:*:*) + NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1088,11 +1190,6 @@ EOF fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; @@ -1111,11 +1208,8 @@ EOF *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; esac @@ -1237,8 +1331,7 @@ main () } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. diff --git a/config.h.in b/config.h.in index 1a831ac5..90f3c948 100644 --- a/config.h.in +++ b/config.h.in @@ -1,53 +1,14 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ -/* $Id: acconfig.h,v 1.15 2001/07/27 13:26:04 kloczek Exp $ */ +/* config.h.in. Generated from configure.in by autoheader. */ +/* $Id: acconfig.h,v 1.21 2003/12/17 01:46:59 kloczek Exp $ */ -/* Define to enable password aging. */ -#undef AGING - -/* Define if struct passwd has pw_age. */ -#undef ATT_AGE - -/* Define if struct passwd has pw_comment. */ -#undef ATT_COMMENT - -/* Define to support JFH's auth. methods. UNTESTED. */ -#undef AUTH_METHODS - -/* Define if struct passwd has pw_quota. */ -#undef BSD_QUOTA - /* Define if you have secure RPC. */ #undef DES_RPC -/* Define to support 16-character passwords. */ -#undef DOUBLESIZE - -/* Define to 1 if NLS is requested. */ -#undef ENABLE_NLS - /* Path for faillog file. */ #undef FAILLOG_FILE -/* Define if you want my getgrent routines. */ -#undef GETGRENT - -/* Define to libshadow_getpass to use our own version of getpass(). */ -#undef getpass - -/* Define if you want my getpwent routines. */ -#undef GETPWENT - -/* Define as 1 if you have catgets and don't want to use GNU gettext. */ -#undef HAVE_CATGETS - -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -#undef HAVE_GETTEXT - -/* Define if your locale.h file contains LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - /* Defined if you have libcrack. */ #undef HAVE_LIBCRACK @@ -66,12 +27,6 @@ /* Working shadow group support in libc? */ #undef HAVE_SHADOWGRP -/* Define to 1 if you have the stpcpy function. */ -#undef HAVE_STPCPY - -/* Define to support TCFS. */ -#undef HAVE_TCFS - /* Path for lastlog file. */ #undef LASTLOG_FILE @@ -84,24 +39,12 @@ /* Name of user's mail spool file if stored in user's home directory. */ #undef MAIL_SPOOL_FILE -/* Define to support the MD5-based password hashing algorithm. */ -#undef MD5_CRYPT - -/* Define to use ndbm. */ -#undef NDBM - /* Define to support OPIE one-time password logins. */ #undef OPIE -/* Package name. */ -#undef PACKAGE - /* Path to passwd program. */ #undef PASSWD_PROGRAM -/* Define if the compiler understands function prototypes. */ -#undef PROTOTYPES - /* Define if login should support the -r flag for rlogind. */ #undef RLOGIN @@ -120,43 +63,26 @@ /* Define to support /etc/suauth su access control. */ #undef SU_ACCESS -/* Define to support SecureWare(tm) long passwords. */ -#undef SW_CRYPT - -/* Define if you want gdbm for TCFS. */ -#undef TCFS_GDBM_SUPPORT - -/* Define to support Pluggable Authentication Modules. */ -#undef USE_PAM - /* Define to use syslog(). */ #undef USE_SYSLOG +/* Define to support USG (Unix Systems Group?) behavior. */ +#undef USG + /* Define if you have ut_host in struct utmp. */ #undef UT_HOST /* Path for utmp file. */ #undef _UTMP_FILE -/* Define to ut_name if struct utmp has ut_name (not ut_user). */ -#undef ut_user - -/* Version. */ -#undef VERSION - /* Path for wtmp file. */ #undef _WTMP_FILE -/* */ -#undef USG +/* Define to libshadow_getpass to use our own version of getpass(). */ +#undef getpass -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -#undef CRAY_STACKSEG_END - -/* Define if using `alloca.c'. */ -#undef C_ALLOCA +/* Define to ut_name if struct utmp has ut_name (not ut_user). */ +#undef ut_user /* Define to 1 if translation of program messages to the user's native language is requested. */ @@ -166,372 +92,292 @@ this is either `int' or `gid_t'. */ #undef GETGROUPS_T -/* Define if you have the `a64l' function. */ +/* Define to 1 if you have the `a64l' function. */ #undef HAVE_A64L -/* Define if you have `alloca', as a function or macro. */ -#undef HAVE_ALLOCA - -/* Define if you have and it should be used (not on Ultrix). */ -#undef HAVE_ALLOCA_H - -/* Define if you have the header file. */ -#undef HAVE_ARGZ_H - -/* Define if you have the `dcgettext' function. */ +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ #undef HAVE_DCGETTEXT -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ #undef HAVE_DIRENT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_ERRNO_H -/* Define if you have the `fchmod' function. */ +/* Define to 1 if you have the `fchmod' function. */ #undef HAVE_FCHMOD -/* Define if you have the `fchown' function. */ +/* Define to 1 if you have the `fchown' function. */ #undef HAVE_FCHOWN -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H -/* Define if you have the `feof_unlocked' function. */ -#undef HAVE_FEOF_UNLOCKED - -/* Define if you have the `fgets_unlocked' function. */ -#undef HAVE_FGETS_UNLOCKED - -/* Define if you have the `fsync' function. */ +/* Define to 1 if you have the `fsync' function. */ #undef HAVE_FSYNC -/* Define if you have the `getcwd' function. */ -#undef HAVE_GETCWD - -/* Define if you have the `getegid' function. */ -#undef HAVE_GETEGID - -/* Define if you have the `geteuid' function. */ -#undef HAVE_GETEUID - -/* Define if you have the `getgid' function. */ -#undef HAVE_GETGID - -/* Define if you have the `getgroups' function. */ +/* Define to 1 if you have the `getgroups' function. */ #undef HAVE_GETGROUPS -/* Define if you have the `gethostname' function. */ +/* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME -/* Define if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE - -/* Define if you have the `getspnam' function. */ +/* Define to 1 if you have the `getspnam' function. */ #undef HAVE_GETSPNAM /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define if you have the `gettimeofday' function. */ +/* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY -/* Define if you have the `getuid' function. */ -#undef HAVE_GETUID - -/* Define if you have the `getusershell' function. */ +/* Define to 1 if you have the `getusershell' function. */ #undef HAVE_GETUSERSHELL -/* Define if you have the `getutent' function. */ +/* Define to 1 if you have the `getutent' function. */ #undef HAVE_GETUTENT -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_GSHADOW_H /* Define if you have the iconv() function. */ #undef HAVE_ICONV -/* Define if you have the `initgroups' function. */ +/* Define to 1 if you have the `initgroups' function. */ #undef HAVE_INITGROUPS -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define if you have and nl_langinfo(CODESET). */ -#undef HAVE_LANGINFO_CODESET - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_LASTLOG_H -/* Define if you have the `lchown' function. */ +/* Define to 1 if you have the `lchown' function. */ #undef HAVE_LCHOWN -/* Define if you have the `lckpwdf' function. */ +/* Define to 1 if you have the `lckpwdf' function. */ #undef HAVE_LCKPWDF -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - -/* Define if you have the `inet' library (-linet). */ +/* Define to 1 if you have the `inet' library (-linet). */ #undef HAVE_LIBINET -/* Define if you have the `nsl' library (-lnsl). */ +/* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL -/* Define if you have the `socket' library (-lsocket). */ +/* Define to 1 if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H -/* Define if you have the `lstat' function. */ +/* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT -/* Define if you have the header file. */ -#undef HAVE_MALLOC_H - -/* Define if you have the `memcpy' function. */ +/* Define to 1 if you have the `memcpy' function. */ #undef HAVE_MEMCPY -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define if you have the `mempcpy' function. */ -#undef HAVE_MEMPCPY - -/* Define if you have the `memset' function. */ +/* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET -/* Define if you have the `mkdir' function. */ +/* Define to 1 if you have the `mkdir' function. */ #undef HAVE_MKDIR -/* Define if you have the `mkstemp' function. */ +/* Define to 1 if you have the `mkstemp' function. */ #undef HAVE_MKSTEMP -/* Define if you have a working `mmap' system call. */ -#undef HAVE_MMAP - -/* Define if you have the `munmap' function. */ -#undef HAVE_MUNMAP - -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_NDIR_H -/* Define if you have the header file. */ -#undef HAVE_NL_TYPES_H - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_PATHS_H -/* Define if you have the `putenv' function. */ -#undef HAVE_PUTENV - -/* Define if you have the `putgrent' function. */ +/* Define to 1 if you have the `putgrent' function. */ #undef HAVE_PUTGRENT -/* Define if you have the `putpwent' function. */ +/* Define to 1 if you have the `putpwent' function. */ #undef HAVE_PUTPWENT -/* Define if you have the `putspent' function. */ +/* Define to 1 if you have the `putspent' function. */ #undef HAVE_PUTSPENT -/* Define if you have the `rename' function. */ +/* Define to 1 if you have the `rename' function. */ #undef HAVE_RENAME -/* Define if you have the `rmdir' function. */ +/* Define to 1 if you have the `rmdir' function. */ #undef HAVE_RMDIR -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_RPC_KEY_PROT_H -/* Define if you have the `setenv' function. */ -#undef HAVE_SETENV - -/* Define if you have the `setgroups' function. */ +/* Define to 1 if you have the `setgroups' function. */ #undef HAVE_SETGROUPS -/* Define if you have the `setlocale' function. */ -#undef HAVE_SETLOCALE - -/* Define if you have the `sgetgrent' function. */ +/* Define to 1 if you have the `sgetgrent' function. */ #undef HAVE_SGETGRENT -/* Define if you have the `sgetpwent' function. */ +/* Define to 1 if you have the `sgetpwent' function. */ #undef HAVE_SGETPWENT -/* Define if you have the `sgetspent' function. */ +/* Define to 1 if you have the `sgetspent' function. */ #undef HAVE_SGETSPENT -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SGTTY_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SHADOW_H -/* Define if you have the `sigaction' function. */ +/* Define to 1 if you have the `sigaction' function. */ #undef HAVE_SIGACTION -/* Define if you have the `snprintf' function. */ +/* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF -/* Define if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define if you have the `stpcpy' function. */ -#undef HAVE_STPCPY - -/* Define if you have the `strcasecmp' function. */ +/* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP -/* Define if you have the `strchr' function. */ +/* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR -/* Define if you have the `strdup' function. */ +/* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define if you have the `strerror' function. */ +/* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR -/* Define if you have the `strftime' function. */ +/* Define to 1 if you have the `strftime' function. */ #undef HAVE_STRFTIME -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define if you have the `strstr' function. */ +/* Define to 1 if you have the `strstr' function. */ #undef HAVE_STRSTR -/* Define if you have the `strtoul' function. */ -#undef HAVE_STRTOUL - -/* Define if `st_rdev' is member of `struct stat'. */ +/* Define to 1 if `st_rdev' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_RDEV -/* Define if your `struct stat' has `st_rdev'. Deprecated, use - `HAVE_STRUCT_STAT_ST_RDEV' instead. */ -#undef HAVE_ST_RDEV - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYSLOG_H -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ #undef HAVE_SYS_DIR_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_IOCTL_H -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ #undef HAVE_SYS_NDIR_H -/* Define if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_RESOURCE_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* Define if you have that is POSIX.1 compatible. */ +/* Define to 1 if you have that is POSIX.1 compatible. */ #undef HAVE_SYS_WAIT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_TERMIOS_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_TERMIO_H -/* Define if you have the `tsearch' function. */ -#undef HAVE_TSEARCH - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_ULIMIT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if you have the `updwtmp' function. */ +/* Define to 1 if you have the `updwtmp' function. */ #undef HAVE_UPDWTMP -/* Define if you have the `updwtmpx' function. */ +/* Define to 1 if you have the `updwtmpx' function. */ #undef HAVE_UPDWTMPX -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_UTIME_H -/* Define if `utime(file, NULL)' sets file's timestamp to the present. */ +/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ #undef HAVE_UTIME_NULL -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_UTMPX_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_UTMP_H -/* Define if you have the `__argz_count' function. */ -#undef HAVE___ARGZ_COUNT - -/* Define if you have the `__argz_next' function. */ -#undef HAVE___ARGZ_NEXT - -/* Define if you have the `__argz_stringify' function. */ -#undef HAVE___ARGZ_STRINGIFY - -/* Define as const if the declaration of iconv() needs const. */ -#undef ICONV_CONST - /* Name of package */ #undef PACKAGE +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + /* Define if compiler has function prototypes */ #undef PROTOTYPES /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE -/* Define if the `setpgrp' function takes no argument. */ +/* Define to 1 if the `setpgrp' function takes no argument. */ #undef SETPGRP_VOID -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -#undef STACK_DIRECTION - -/* Define if the `S_IS*' macros in do not work properly. */ +/* Define to 1 if the `S_IS*' macros in do not work properly. */ #undef STAT_MACROS_BROKEN -/* Define if you have the ANSI C header files. */ +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define if you can safely include both and . */ +/* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME -/* Define if your declares `struct tm'. */ +/* Define to 1 if your declares `struct tm'. */ #undef TM_IN_SYS_TIME +/* Define to support Pluggable Authentication Modules */ +#undef USE_PAM + /* Version number of package */ #undef VERSION @@ -541,10 +387,6 @@ /* Define to `int' if doesn't define. */ #undef gid_t -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -#undef inline - /* Define to `int' if does not define. */ #undef mode_t @@ -554,8 +396,5 @@ /* Define to `int' if does not define. */ #undef pid_t -/* Define to `unsigned' if does not define. */ -#undef size_t - /* Define to `int' if doesn't define. */ #undef uid_t diff --git a/config.rpath b/config.rpath new file mode 100755 index 00000000..fa24bfc2 --- /dev/null +++ b/config.rpath @@ -0,0 +1,548 @@ +#! /bin/sh +# Output a system dependent set of variables, describing how to set the +# run time search path of shared libraries in an executable. +# +# Copyright 1996-2003 Free Software Foundation, Inc. +# Taken from GNU libtool, 2001 +# Originally by Gordon Matzigkeit , 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. +# +# The first argument passed to this file is the canonical host specification, +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld +# should be set by the caller. +# +# The set of defined variables is at the end of this script. + +# Known limitations: +# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer +# than 256 bytes, otherwise the compiler driver will dump core. The only +# known workaround is to choose shorter directory names for the build +# directory and/or the installation directory. + +# All known linkers require a `.a' archive for static linking (except M$VC, +# which needs '.lib'). +libext=a +shrext=.so + +host="$1" +host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. + +wl= +if test "$GCC" = yes; then + wl='-Wl,' +else + case "$host_os" in + aix*) + wl='-Wl,' + ;; + mingw* | pw32* | os2*) + ;; + hpux9* | hpux10* | hpux11*) + wl='-Wl,' + ;; + irix5* | irix6* | nonstopux*) + wl='-Wl,' + ;; + newsos6) + ;; + linux*) + case $CC in + icc|ecc) + wl='-Wl,' + ;; + ccc) + wl='-Wl,' + ;; + esac + ;; + osf3* | osf4* | osf5*) + wl='-Wl,' + ;; + sco3.2v5*) + ;; + solaris*) + wl='-Wl,' + ;; + sunos4*) + wl='-Qoption ld ' + ;; + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + wl='-Wl,' + ;; + sysv4*MP*) + ;; + uts4*) + ;; + esac +fi + +# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. + +hardcode_libdir_flag_spec= +hardcode_libdir_separator= +hardcode_direct=no +hardcode_minus_L=no + +case "$host_os" in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + openbsd*) + with_gnu_ld=no + ;; +esac + +ld_shlibs=yes +if test "$with_gnu_ld" = yes; then + case "$host_os" in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + fi + ;; + amigaos*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can use + # them. + ld_shlibs=no + ;; + beos*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + cygwin* | mingw* | pw32*) + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + netbsd*) + ;; + solaris* | sysv5*) + if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + sunos4*) + hardcode_direct=yes + ;; + *) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + esac + if test "$ld_shlibs" = yes; then + # Unlike libtool, we use -rpath here, not --rpath, since the documented + # option of GNU ld is called -rpath, not --rpath. + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + fi +else + case "$host_os" in + aix3*) + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + else + aix_use_runtimelinking=no + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + esac + fi + hardcode_direct=yes + hardcode_libdir_separator=':' + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + esac + fi + # Begin _LT_AC_SYS_LIBPATH_AIX. + echo 'int main () { return 0; }' > conftest.c + ${CC} ${LDFLAGS} conftest.c -o conftest + aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` + fi + if test -z "$aix_libpath"; then + aix_libpath="/usr/lib:/lib" + fi + rm -f conftest.c conftest + # End _LT_AC_SYS_LIBPATH_AIX. + if test "$aix_use_runtimelinking" = yes; then + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + else + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + fi + fi + ;; + amigaos*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # see comment about different semantics on the GNU ld section + ld_shlibs=no + ;; + bsdi4*) + ;; + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + libext=lib + ;; + darwin* | rhapsody*) + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + hardcode_direct=no + fi + ;; + dgux*) + hardcode_libdir_flag_spec='-L$libdir' + ;; + freebsd1*) + ld_shlibs=no + ;; + freebsd2.2*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + freebsd2*) + hardcode_direct=yes + hardcode_minus_L=yes + ;; + freebsd*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + hpux9*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + hpux10* | hpux11*) + if test "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=no + ;; + ia64*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=no + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + *) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + irix5* | irix6* | nonstopux*) + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + netbsd*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + newsos6) + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + openbsd*) + hardcode_direct=yes + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + else + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + osf3*) + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + osf4* | osf5*) + if test "$GCC" = yes; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + # Both cc and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + hardcode_libdir_separator=: + ;; + sco3.2v5*) + ;; + solaris*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + sunos4*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + ;; + sysv4) + case $host_vendor in + sni) + hardcode_direct=yes # is this really true??? + ;; + siemens) + hardcode_direct=no + ;; + motorola) + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + ;; + sysv4.3*) + ;; + sysv4*MP*) + if test -d /usr/nec; then + ld_shlibs=yes + fi + ;; + sysv4.2uw2*) + hardcode_direct=yes + hardcode_minus_L=no + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + ;; + sysv5*) + hardcode_libdir_flag_spec= + ;; + uts4*) + hardcode_libdir_flag_spec='-L$libdir' + ;; + *) + ld_shlibs=no + ;; + esac +fi + +# Check dynamic linker characteristics +# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +libname_spec='lib$name' +case "$host_os" in + aix3*) + ;; + aix4* | aix5*) + ;; + amigaos*) + ;; + beos*) + ;; + bsdi4*) + ;; + cygwin* | mingw* | pw32*) + shrext=.dll + ;; + darwin* | rhapsody*) + shrext=.dylib + ;; + dgux*) + ;; + freebsd1*) + ;; + freebsd*) + ;; + gnu*) + ;; + hpux9* | hpux10* | hpux11*) + case "$host_cpu" in + ia64*) + shrext=.so + ;; + hppa*64*) + shrext=.sl + ;; + *) + shrext=.sl + ;; + esac + ;; + irix5* | irix6* | nonstopux*) + case "$host_os" in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; + *) libsuff= shlibsuff= ;; + esac + ;; + esac + ;; + linux*oldld* | linux*aout* | linux*coff*) + ;; + linux*) + ;; + netbsd*) + ;; + newsos6) + ;; + nto-qnx) + ;; + openbsd*) + ;; + os2*) + libname_spec='$name' + shrext=.dll + ;; + osf3* | osf4* | osf5*) + ;; + sco3.2v5*) + ;; + solaris*) + ;; + sunos4*) + ;; + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + ;; + sysv4*MP*) + ;; + uts4*) + ;; +esac + +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' +escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` +shlibext=`echo "$shrext" | sed -e 's,^\.,,'` +escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` + +sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <. +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -117,7 +118,7 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) + nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -226,32 +227,46 @@ case $basic_machine in 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ - | d10v | d30v | dsp16xx \ - | fr30 \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ | m32r | m68000 | m68k | m88k | mcore \ - | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el | mips64vr4300 \ - | mips64vr4300el | mips64vr5000 | mips64vr5000el \ - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ - | mipsisa32 \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | msp430 \ | ns16k | ns32k \ - | openrisc \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ - | sh | sh[34] | sh[34]eb | shbe | shle \ - | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ - | stormy16 | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ | we32k \ - | x86 | xscale \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -278,38 +293,56 @@ case $basic_machine in 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alphapca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armv*-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c54x-* \ - | clipper-* | cray2-* | cydra-* \ - | d10v-* | d30v-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ | m32r-* \ - | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | msp430-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | s390-* | s390x-* \ - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ - | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ - | v850-* | vax-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -343,6 +376,9 @@ case $basic_machine in basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -374,6 +410,10 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -394,16 +434,8 @@ case $basic_machine in basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray - os=-unicos - ;; - cray2) - basic_machine=cray2-cray - os=-unicos - ;; - [cjt]90) - basic_machine=${basic_machine}-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; crds | unos) @@ -418,6 +450,14 @@ case $basic_machine in decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -598,14 +638,6 @@ case $basic_machine in basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -620,6 +652,10 @@ case $basic_machine in basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos @@ -692,6 +728,10 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -699,6 +739,10 @@ case $basic_machine in basic_machine=hppa1.1-oki os=-proelf ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -721,49 +765,55 @@ case $basic_machine in pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexgen) + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86 | athlon) + pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown - ;; + ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown - ;; + ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; @@ -784,10 +834,26 @@ case $basic_machine in rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -795,7 +861,10 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -862,19 +931,35 @@ case $basic_machine in os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; @@ -899,8 +984,8 @@ case $basic_machine in os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -921,17 +1006,13 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt - ;; - xmp) - basic_machine=xmp-cray - os=-unicos - ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim @@ -952,13 +1033,6 @@ case $basic_machine in op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; @@ -978,13 +1052,16 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; + sh64) + basic_machine=sh64-unknown + ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -999,10 +1076,6 @@ case $basic_machine in pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1058,17 +1131,19 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos*) + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1080,8 +1155,10 @@ case $os in ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ @@ -1090,6 +1167,9 @@ case $os in -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1120,14 +1200,20 @@ case $os in -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1166,8 +1252,14 @@ case $os in -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos ;; -none) ;; @@ -1200,10 +1292,14 @@ case $basic_machine in arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1230,6 +1326,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1293,19 +1392,19 @@ case $basic_machine in *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1377,7 +1476,7 @@ case $basic_machine in -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) diff --git a/configure b/configure index 21f04f60..8f434a46 100755 --- a/configure +++ b/configure @@ -1,23 +1,245 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.57a. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## -# Find the correct PATH separator. Usually this is `:', but -# DJGPP uses `;' like DOS. -if test "X${PATH_SEPARATOR+set}" != Xset; then - UNAME=${UNAME-`uname 2>/dev/null`} - case X$UNAME in - *-DOS) lt_cv_sys_path_separator=';' ;; - *) lt_cv_sys_path_separator=':' ;; - esac - PATH_SEPARATOR=$lt_cv_sys_path_separator +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix fi +# Support unset when possible. +if (as_foo=foo; unset as_foo) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + as_mkdir_p=false +fi + +as_executable_p="test -f" + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH + + + # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -35,7 +257,7 @@ if test "X$1" = X--no-reexec; then elif test "X$1" = X--fallback-echo; then # Avoid inline document here, it may be left over : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then # Yippee, $echo works! : else @@ -47,7 +269,7 @@ if test "X$1" = X--fallback-echo; then # used as fallback echo shift cat </dev/null`" = 'X\t' && echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && @@ -91,7 +314,7 @@ else break fi done - IFS="$save_ifs" + IFS="$lt_save_ifs" if test "X$echo" = Xecho; then # We didn't find a better echo, so look for alternatives. @@ -163,81 +386,12 @@ if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi +tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +tagnames=`echo "$tagnames,F77" | sed 's/^,//'` # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -250,9 +404,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -260,7 +416,13 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} -ac_unique_file="lib/dialchk.c" +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + # Factoring default headers for most tests. ac_includes_default="\ #include @@ -298,6 +460,9 @@ ac_includes_default="\ # include #endif" +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S YACC CPP EGREP U ANSI2KNR build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LIBCRYPT LIBCRACK LIBSKEY LIBMD LIBPAM MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB LTLIBOBJS' +ac_subst_files='' + # Initialize some variables set by options. ac_init_help= ac_init_version=false @@ -325,23 +490,16 @@ x_libraries=NONE # Use braces instead of parens because sh, perl, etc. also accept them. bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/lib' +libexecdir='${exec_prefix}/libexec' datadir='${prefix}/share' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' -localstatedir='/var/lib' +localstatedir='${prefix}/var' libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/share/info' -mandir='${prefix}/share/man' - -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +infodir='${prefix}/info' +mandir='${prefix}/man' ac_prev= for ac_option @@ -475,7 +633,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -654,30 +812,31 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -693,13 +852,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -709,13 +878,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -749,6 +921,26 @@ ac_env_CPP_set=${CPP+set} ac_env_CPP_value=$CPP ac_cv_env_CPP_set=${CPP+set} ac_cv_env_CPP_value=$CPP +ac_env_CXX_set=${CXX+set} +ac_env_CXX_value=$CXX +ac_cv_env_CXX_set=${CXX+set} +ac_cv_env_CXX_value=$CXX +ac_env_CXXFLAGS_set=${CXXFLAGS+set} +ac_env_CXXFLAGS_value=$CXXFLAGS +ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} +ac_cv_env_CXXFLAGS_value=$CXXFLAGS +ac_env_CXXCPP_set=${CXXCPP+set} +ac_env_CXXCPP_value=$CXXCPP +ac_cv_env_CXXCPP_set=${CXXCPP+set} +ac_cv_env_CXXCPP_value=$CXXCPP +ac_env_F77_set=${F77+set} +ac_env_F77_value=$F77 +ac_cv_env_F77_set=${F77+set} +ac_cv_env_F77_value=$F77 +ac_env_FFLAGS_set=${FFLAGS+set} +ac_env_FFLAGS_value=$FFLAGS +ac_cv_env_FFLAGS_set=${FFLAGS+set} +ac_cv_env_FFLAGS_value=$FFLAGS # # Report the --help message. @@ -756,7 +948,7 @@ ac_cv_env_CPP_value=$CPP if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat < if you have headers in a nonstandard directory CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CXXCPP C++ preprocessor + F77 Fortran 77 compiler command + FFLAGS Fortran 77 compiler flags Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -EOF +_ACEOF fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. ac_popdir=`pwd` - for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue - cd $ac_subdir - # A "../" for each directory in /$ac_subdir. - ac_dots=`echo $ac_subdir | - sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d $ac_dir || continue + ac_builddir=. - case $srcdir in - .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_subdir ;; - *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; - esac +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + + cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure.gnu; then + if test -f $ac_srcdir/configure.gnu; then echo - $SHELL $ac_sub_srcdir/configure.gnu --help=recursive - elif test -f $ac_sub_srcdir/configure; then + $SHELL $ac_srcdir/configure.gnu --help=recursive + elif test -f $ac_srcdir/configure; then echo - $SHELL $ac_sub_srcdir/configure --help=recursive - elif test -f $ac_sub_srcdir/configure.ac || - test -f $ac_sub_srcdir/configure.in; then + $SHELL $ac_srcdir/configure --help=recursive + elif test -f $ac_srcdir/configure.ac || + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else - echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -905,33 +1131,32 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF configure -generated by GNU Autoconf 2.52 +generated by GNU Autoconf 2.57a -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.57a. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -950,79 +1175,156 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -1035,6 +1337,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -1046,9 +1375,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1049: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -1057,7 +1386,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1060: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1065,7 +1394,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1068: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1074,49 +1403,49 @@ fi # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1084: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1088: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1094: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:1096: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1098: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:1117: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1119: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1127,27 +1456,25 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:1139: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:1142: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + +am__api_version="1.7" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1165,7 +1492,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1168: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1184,44 +1511,51 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:1188: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 fi fi done - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1234,7 +1568,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1237: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1245,7 +1579,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1248: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1269,7 +1603,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1272: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1282,13 +1616,13 @@ then # Ok. : else - { { echo "$as_me:1285: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1291: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1303,8 +1637,9 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL @@ -1312,16 +1647,15 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - am_backtick='`' - { echo "$as_me:1316: WARNING: ${am_backtick}missing' script is too old or missing" >&5 -echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -for ac_prog in awk mawk gawk nawk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1324: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1329,41 +1663,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1339: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1347: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1350: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1357: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1374,147 +1711,251 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1377: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1381: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" - -fi; -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - -if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. else - AMDEP_TRUE='#' - AMDEP_FALSE= + am__leading_dot=_ fi +rmdir .tst 2>/dev/null -rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null - -# test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && + # test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1417: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + # Define the identity of the package. -PACKAGE=shadow -VERSION=4.0.3 + PACKAGE=shadow + VERSION=4.0.4 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. - -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. - -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} +_ACEOF # Some tools Automake needs. -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + STRIP=$ac_ct_STRIP +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. - ac_config_headers="$ac_config_headers config.h" + + + ac_config_headers="$ac_config_headers config.h" + test "$prefix" = "NONE" && prefix="/usr" test "$prefix" = "/usr" && exec_prefix="" -test "$CFLAGS" = "" && CFLAGS="-O2 -Wall" -test "$LDFLAGS" = "" && LDFLAGS="-s" # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" p=${PACKAGE-default} -case $enableval in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else enable_shared=no fi; + + # Check whether --enable-static or --disable-static was given. if test "${enable_static+set}" = set; then enableval="$enable_static" p=${PACKAGE-default} -case $enableval in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else enable_static=yes fi; + +echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi; + echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1523,7 +1964,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1526: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1531,25 +1972,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1541: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1549: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1552: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1558,7 +2002,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1561: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1566,25 +2010,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1576: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1584: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1587: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1597,7 +2044,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1600: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1605,25 +2052,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1615: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1623: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1626: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1632,7 +2082,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1635: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1640,25 +2090,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1650: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1658: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1661: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1671,7 +2124,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1674: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1680,19 +2133,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1694: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1704,19 +2160,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1716: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1719: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1727,7 +2181,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1730: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1735,25 +2189,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1745: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1753: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1756: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1766,7 +2223,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1769: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1774,25 +2231,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1784: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1792: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1795: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1804,33 +2264,39 @@ fi fi -test -z "$CC" && { { echo "$as_me:1807: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1812:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1815: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1818: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1820: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1823: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1825: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1828: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1832 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1841,127 +2307,152 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1848: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1851: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1854: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1877: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1883: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1888: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1894: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1897: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1904: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1912: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1919: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1921: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1924: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1926: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1929: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done else - { { echo "$as_me:1945: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1951: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1957: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1963 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1972,40 +2463,46 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1975: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1978: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1990: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1997: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:2001: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2007 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -2019,41 +2516,45 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2022: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2025: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2028: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2031: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:2043: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:2049: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2055 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -2064,26 +2565,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2070: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2073: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2076: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2086: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -2100,5333 +2602,7 @@ else CFLAGS= fi fi -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2113: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2116: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2119: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2122: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -#line 2134 "configure" -#include "confdefs.h" -#include -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2147: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2150: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2153: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2156: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 2166 "configure" -#include "confdefs.h" -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2178: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2181: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2184: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2187: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_config_commands="$ac_config_commands default-1" - -am_make=${MAKE-make} -cat > confinc << 'END' -doit: - @echo done -END -# If we don't find an include directive, just comment out the code. -echo "$as_me:2222: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -am__include='#' -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote='"' - _am_result=BSD - fi -fi - -echo "$as_me:2249: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 -rm -f confinc confmf - -depcc="$CC" am_compiler_list= - -echo "$as_me:2255: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && - grep conftest.h conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -echo "$as_me:2317: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" - - echo "$as_me:2321: checking for strerror in -lcposix" >&5 -echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 -if test "${ac_cv_lib_cposix_strerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 2329 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char strerror (); -int -main () -{ -strerror (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2348: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2351: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2354: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2357: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_cposix_strerror=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_cposix_strerror=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:2368: result: $ac_cv_lib_cposix_strerror" >&5 -echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 -if test $ac_cv_lib_cposix_strerror = yes; then - LIBS="$LIBS -lcposix" -fi - -echo "$as_me:2374: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - echo "$as_me:2378: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:2381: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 -fi - -for ac_prog in 'bison -y' byacc -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:2389: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_YACC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_YACC="$ac_prog" -echo "$as_me:2404: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -YACC=$ac_cv_prog_YACC -if test -n "$YACC"; then - echo "$as_me:2412: result: $YACC" >&5 -echo "${ECHO_T}$YACC" >&6 -else - echo "$as_me:2415: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$YACC" && break -done -test -n "$YACC" || YACC="yacc" - -echo "$as_me:2423: checking for ${CC-cc} option to accept ANSI C" >&5 -echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 -if test "${am_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - am_cv_prog_cc_stdc=no -ac_save_CC="$CC" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - cat >conftest.$ac_ext <<_ACEOF -#line 2441 "configure" -#include "confdefs.h" -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; - -int -main () -{ - -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2483: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2486: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2489: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2492: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - am_cv_prog_cc_stdc="$ac_arg"; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -CC="$ac_save_CC" - -fi - -if test -z "$am_cv_prog_cc_stdc"; then - echo "$as_me:2506: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 -else - echo "$as_me:2509: result: $am_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6 -fi -case "x$am_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $am_cv_prog_cc_stdc" ;; -esac - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2522: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 2543 "configure" -#include "confdefs.h" -#include - Syntax error -_ACEOF -if { (eval echo "$as_me:2548: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2554: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 2577 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:2581: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2587: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:2624: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 2634 "configure" -#include "confdefs.h" -#include - Syntax error -_ACEOF -if { (eval echo "$as_me:2639: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2645: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 2668 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:2672: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2678: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:2706: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -echo "$as_me:2717: checking for function prototypes" >&5 -echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6 -if test "$am_cv_prog_cc_stdc" != no; then - echo "$as_me:2720: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -cat >>confdefs.h <<\EOF -#define PROTOTYPES 1 -EOF - - U= ANSI2KNR= -else - echo "$as_me:2729: result: no" >&5 -echo "${ECHO_T}no" >&6 - U=_ ANSI2KNR=./ansi2knr -fi -# Ensure some checks needed by ansi2knr itself. -echo "$as_me:2734: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2740 "configure" -#include "confdefs.h" -#include -#include -#include -#include - -_ACEOF -if { (eval echo "$as_me:2748: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2754: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no -fi -rm -f conftest.err conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 2776 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 2794 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -#line 2815 "configure" -#include "confdefs.h" -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:2841: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2844: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2846: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2849: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_stdc=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:2862: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - -fi - -for ac_header in string.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:2875: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2881 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:2885: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2891: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:2910: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h </dev/null 2>&1 || - { { echo "$as_me:2944: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:2948: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:2957: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:2961: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:2966: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -echo "$as_me:2973: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:2982: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:2987: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -# Find the correct PATH separator. Usually this is `:', but -# DJGPP uses `;' like DOS. -if test "X${PATH_SEPARATOR+set}" != Xset; then - UNAME=${UNAME-`uname 2>/dev/null`} - case X$UNAME in - *-DOS) lt_cv_sys_path_separator=';' ;; - *) lt_cv_sys_path_separator=':' ;; - esac - PATH_SEPARATOR=$lt_cv_sys_path_separator -fi - -# Check whether --with-gnu-ld or --without-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi; -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:3015: checking for ld used by GCC" >&5 -echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - echo "$as_me:3045: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 -else - echo "$as_me:3048: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 -fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi -fi - -LD="$lt_cv_path_LD" -if test -n "$LD"; then - echo "$as_me:3078: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 -else - echo "$as_me:3081: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -test -z "$LD" && { { echo "$as_me:3084: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -echo "$as_me:3087: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - lt_cv_prog_gnu_ld=yes -else - lt_cv_prog_gnu_ld=no -fi -fi -echo "$as_me:3099: result: $lt_cv_prog_gnu_ld" >&5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 -with_gnu_ld=$lt_cv_prog_gnu_ld - -echo "$as_me:3103: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 -if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_ld_reload_flag='-r' -fi -echo "$as_me:3110: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 -reload_flag=$lt_cv_ld_reload_flag -test -n "$reload_flag" && reload_flag=" $reload_flag" - -echo "$as_me:3115: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 -if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - test -z "$ac_dir" && ac_dir=. - tmp_nm=$ac_dir/${ac_tool_prefix}nm - if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then - lt_cv_path_NM="$tmp_nm -B" - break - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - lt_cv_path_NM="$tmp_nm -p" - break - else - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - fi - fi - done - IFS="$ac_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi -fi - -NM="$lt_cv_path_NM" -echo "$as_me:3151: result: $NM" >&5 -echo "${ECHO_T}$NM" >&6 - -echo "$as_me:3154: checking how to recognise dependant libraries" >&5 -echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given egrep regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix4* | aix5*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi4*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin* | mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[012]) - lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac - ;; - -freebsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20*|hpux11*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - -irix5* | irix6*) - case $host_os in - irix5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -openbsd*) - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' - else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' - fi - ;; - -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so - ;; - -sysv5uw[78]* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - esac - ;; -esac - -fi -echo "$as_me:3332: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method - -# Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:3338: checking command to parse $NM output" >&5 -echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - -# Transform an extracted symbol line into a proper C declaration -lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32*) - symcode='[ABCDGISTW]' - ;; -hpux*) # Its linker distinguishes data from code symbols - lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -irix*) - symcode='[BCDEGRST]' - ;; -solaris* | sysv5*) - symcode='[BDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $host_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - symcode='[ABCDGISTW]' -fi - -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do - - # Write the raw and C identifiers. -lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no - rm -f conftest* - cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:3422: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { (eval echo "$as_me:3426: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 - ac_status=$? - echo "$as_me:3429: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if egrep ' nm_test_var$' "$nlist" >/dev/null; then - if egrep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' - - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[] = -{ -EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo "$as_me:3481: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3484: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest; then - pipe_works=yes - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -f conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done - -fi - -global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" -if test -z "$lt_cv_sys_global_symbol_pipe"; then - global_symbol_to_cdecl= - global_symbol_to_c_name_address= -else - global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" - global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" -fi -if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; -then - echo "$as_me:3525: result: failed" >&5 -echo "${ECHO_T}failed" >&6 -else - echo "$as_me:3528: result: ok" >&5 -echo "${ECHO_T}ok" >&6 -fi - -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3535: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3541 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:3545: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:3551: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:3570: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in - /*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; - ?:/*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="/usr/bin:$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - egrep "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$ac_save_ifs" - MAGIC_CMD="$ac_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - echo "$as_me:3639: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 -else - echo "$as_me:3642: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - echo "$as_me:3648: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in - /*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; - ?:/*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="/usr/bin:$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - egrep "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$ac_save_ifs" - MAGIC_CMD="$ac_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - echo "$as_me:3703: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 -else - echo "$as_me:3706: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - else - MAGIC_CMD=: - fi -fi - - fi - ;; -esac - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3722: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3737: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:3745: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:3748: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:3757: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:3772: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3781: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:3784: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:3796: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_STRIP="${ac_tool_prefix}strip" -echo "$as_me:3811: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - echo "$as_me:3819: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 -else - echo "$as_me:3822: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo "$as_me:3831: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_STRIP="strip" -echo "$as_me:3846: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - echo "$as_me:3855: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 -else - echo "$as_me:3858: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - STRIP=$ac_ct_STRIP -else - STRIP="$ac_cv_prog_STRIP" -fi - -enable_dlopen=no -enable_win32_dll=no - -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" - -fi; -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 3882 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:3883: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:3886: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - echo "$as_me:3907: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 -if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -#line 3920 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3932: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3935: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3938: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3941: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - lt_cv_cc_needs_belf=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -lt_cv_cc_needs_belf=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -echo "$as_me:3957: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; - -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except M$VC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" -need_locks="$enable_libtool_lock" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -if test x"$host" != x"$build"; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= -fi - -# Transform linux* to *-*-linux-gnu*, to support old configure scripts. -case $host_os in -linux-gnu*) ;; -linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` -esac - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" - ;; - *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -# Allow CC to be a program name with arguments. -set dummy $CC -compiler="$2" - -echo "$as_me:4057: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 -rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - objdir=_libs -fi -rmdir .libs 2>/dev/null -echo "$as_me:4068: result: $objdir" >&5 -echo "${ECHO_T}$objdir" >&6 - -# Check whether --with-pic or --without-pic was given. -if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" -else - pic_mode=default -fi; -test -z "$pic_mode" && pic_mode=default - -# We assume here that the value for lt_cv_prog_cc_pic will not be cached -# in isolation, and that seeing it set (from the cache) indicates that -# the associated values are set (in the cache) correctly too. -echo "$as_me:4083: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 -if test "${lt_cv_prog_cc_pic+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_cc_pic= - lt_cv_prog_cc_shlib= - lt_cv_prog_cc_wl= - lt_cv_prog_cc_static= - lt_cv_prog_cc_no_builtin= - lt_cv_prog_cc_can_build_shared=$can_build_shared - - if test "$GCC" = yes; then - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-static' - - case $host_os in - aix*) - # Below there is a dirty hack to force normal static linking with -ldl - # The problem is because libdl dynamically linked with both libc and - # libC (AIX C++ library), which obviously doesn't included in libraries - # list by gcc. This cause undefined symbols with -static flags. - # This hack allows C programs to be linked with "-static -ldl", but - # not sure about C++ programs. - lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_cv_prog_cc_pic='-fno-common' - ;; - cygwin* | mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_cv_prog_cc_pic='-DDLL_EXPORT' - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_cv_prog_cc_pic=-Kconform_pic - fi - ;; - *) - lt_cv_prog_cc_pic='-fPIC' - ;; - esac - else - # PORTME Check for PIC flags for the system compiler. - case $host_os in - aix3* | aix4* | aix5*) - lt_cv_prog_cc_wl='-Wl,' - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - hpux9* | hpux10* | hpux11*) - # Is there a better lt_cv_prog_cc_static that works with the bundled CC? - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" - lt_cv_prog_cc_pic='+Z' - ;; - - irix5* | irix6*) - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - # PIC (with -KPIC) is the default. - ;; - - cygwin* | mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_cv_prog_cc_pic='-DDLL_EXPORT' - ;; - - newsos6) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - ;; - - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - ;; - - sco3.2v5*) - lt_cv_prog_cc_pic='-Kpic' - lt_cv_prog_cc_static='-dn' - lt_cv_prog_cc_shlib='-belf' - ;; - - solaris*) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' - ;; - - sunos4*) - lt_cv_prog_cc_pic='-PIC' - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Qoption ld ' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi - ;; - - uts4*) - lt_cv_prog_cc_pic='-pic' - lt_cv_prog_cc_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_cv_prog_cc_pic='-Kconform_pic' - lt_cv_prog_cc_static='-Bstatic' - fi - ;; - - *) - lt_cv_prog_cc_can_build_shared=no - ;; - esac - fi - -fi - -if test -z "$lt_cv_prog_cc_pic"; then - echo "$as_me:4230: result: none" >&5 -echo "${ECHO_T}none" >&6 -else - echo "$as_me:4233: result: $lt_cv_prog_cc_pic" >&5 -echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 - - # Check to make sure the pic_flag actually works. - echo "$as_me:4237: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 - if test "${lt_cv_prog_cc_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" - cat >conftest.$ac_ext <<_ACEOF -#line 4245 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4257: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4260: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4263: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4266: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - case $host_os in - hpux9* | hpux10* | hpux11*) - # On HP-UX, both CC and GCC only warn that PIC is supported... then - # they create non-PIC objects. So, if there were any warnings, we - # assume that PIC is not supported. - if test -s conftest.err; then - lt_cv_prog_cc_pic_works=no - else - lt_cv_prog_cc_pic_works=yes - fi - ;; - *) - lt_cv_prog_cc_pic_works=yes - ;; - esac - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - lt_cv_prog_cc_pic_works=no - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$save_CFLAGS" - -fi - - if test "X$lt_cv_prog_cc_pic_works" = Xno; then - lt_cv_prog_cc_pic= - lt_cv_prog_cc_can_build_shared=no - else - lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" - fi - - echo "$as_me:4302: result: $lt_cv_prog_cc_pic_works" >&5 -echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 -fi - -# Check for any special shared library compilation flags. -if test -n "$lt_cv_prog_cc_shlib"; then - { echo "$as_me:4308: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 -echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} - if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : - else - { echo "$as_me:4312: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 -echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} - lt_cv_prog_cc_can_build_shared=no - fi -fi - -echo "$as_me:4318: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 -if test "${lt_cv_prog_cc_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_cc_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" - cat >conftest.$ac_ext <<_ACEOF -#line 4327 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4339: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4342: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4345: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4348: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - lt_cv_prog_cc_static_works=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - -fi - -# Belt *and* braces to stop my trousers falling down: -test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -echo "$as_me:4362: result: $lt_cv_prog_cc_static_works" >&5 -echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 - -pic_flag="$lt_cv_prog_cc_pic" -special_shlib_compile_flags="$lt_cv_prog_cc_shlib" -wl="$lt_cv_prog_cc_wl" -link_static_flag="$lt_cv_prog_cc_static" -no_builtin_flag="$lt_cv_prog_cc_no_builtin" -can_build_shared="$lt_cv_prog_cc_can_build_shared" - -# Check to see if options -o and -c are simultaneously supported by compiler -echo "$as_me:4373: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -if test "${lt_cv_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -$rm -r conftest 2>/dev/null -mkdir conftest -cd conftest -echo "int some_variable = 0;" > conftest.$ac_ext -mkdir out -# According to Tom Tromey, Ian Lance Taylor reported there are C compilers -# that will create temporary files in the current directory regardless of -# the output directory. Thus, making CWD read-only will cause this test -# to fail, enabling locking or at least warning the user not to do parallel -# builds. -chmod -w . -save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" -compiler_c_o=no -if { (eval echo configure:4393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s out/conftest.err; then - lt_cv_compiler_c_o=no - else - lt_cv_compiler_c_o=yes - fi -else - # Append any errors to the config.log. - cat out/conftest.err 1>&5 - lt_cv_compiler_c_o=no -fi -CFLAGS="$save_CFLAGS" -chmod u+w . -$rm conftest* out/* -rmdir out -cd .. -rmdir conftest -$rm -r conftest 2>/dev/null - -fi - -compiler_c_o=$lt_cv_compiler_c_o -echo "$as_me:4417: result: $compiler_c_o" >&5 -echo "${ECHO_T}$compiler_c_o" >&6 - -if test x"$compiler_c_o" = x"yes"; then - # Check to see if we can write to a .lo - echo "$as_me:4422: checking if $compiler supports -c -o file.lo" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 - if test "${lt_cv_compiler_o_lo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - lt_cv_compiler_o_lo=no - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -c -o conftest.lo" - save_objext="$ac_objext" - ac_objext=lo - cat >conftest.$ac_ext <<_ACEOF -#line 4434 "configure" -#include "confdefs.h" - -int -main () -{ -int some_variable = 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4446: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4449: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4452: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4455: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - lt_cv_compiler_o_lo=no - else - lt_cv_compiler_o_lo=yes - fi - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext - ac_objext="$save_objext" - CFLAGS="$save_CFLAGS" - -fi - - compiler_o_lo=$lt_cv_compiler_o_lo - echo "$as_me:4476: result: $compiler_o_lo" >&5 -echo "${ECHO_T}$compiler_o_lo" >&6 -else - compiler_o_lo=no -fi - -# Check to see if we can do hard links to lock some files if needed -hard_links="nottested" -if test "$compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo "$as_me:4486: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:4494: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 - if test "$hard_links" = no; then - { echo "$as_me:4497: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -if test "$GCC" = yes; then - # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo "$as_me:4507: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 - echo "int some_variable = 0;" > conftest.$ac_ext - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" - compiler_rtti_exceptions=no - cat >conftest.$ac_ext <<_ACEOF -#line 4514 "configure" -#include "confdefs.h" - -int -main () -{ -int some_variable = 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4529: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4532: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4535: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - compiler_rtti_exceptions=no - else - compiler_rtti_exceptions=yes - fi - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$save_CFLAGS" - echo "$as_me:4551: result: $compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$compiler_rtti_exceptions" >&6 - - if test "$compiler_rtti_exceptions" = "yes"; then - no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' - else - no_builtin_flag=' -fno-builtin' - fi -fi - -# See if the linker supports building shared libraries. -echo "$as_me:4562: checking whether the linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 - -allow_undefined_flag= -no_undefined_flag= -need_lib_prefix=unknown -need_version=unknown -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -archive_cmds= -archive_expsym_cmds= -old_archive_from_new_cmds= -old_archive_from_expsyms_cmds= -export_dynamic_flag_spec= -whole_archive_flag_spec= -thread_safe_flag_spec= -hardcode_into_libs=no -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no -hardcode_shlibpath_var=unsupported -runpath_var= -link_all_deplibs=unknown -always_export_symbols=no -export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' -# include_expsyms should be a list of space-separated symbols to be *always* -# included in the symbol list -include_expsyms= -# exclude_expsyms can be an egrep regular expression of symbols to exclude -# it will be wrapped by ` (' and `)$', so one must not match beginning or -# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -# as well as any symbol that contains `d'. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" -# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -# platforms (ab)use it in PIC code, but their linkers get confused if -# the symbol is explicitly referenced. Since portable code cannot -# rely on this symbol name, it's probably fine to never include it in -# preloaded symbol tables. -extract_expsyms_cmds= - -case $host_os in -cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; -openbsd*) - with_gnu_ld=no - ;; -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX, the GNU linker is very broken - # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. - ld_shlibs=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - ;; - - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can use - # them. - ld_shlibs=no - ;; - - beos*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=yes - - extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ - sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ - test -f $output_objdir/impgen.exe || (cd $output_objdir && \ - if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ - else $CC -o impgen impgen.c ; fi)~ - $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' - - old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' - - # cygwin and mingw dlls have different entry points and sets of symbols - # to exclude. - # FIXME: what about values for MSVC? - dll_entry=__cygwin_dll_entry@12 - dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ - case $host_os in - mingw*) - # mingw values - dll_entry=_DllMainCRTStartup@12 - dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ - ;; - esac - - # mingw and cygwin differ, and it's simplest to just exclude the union - # of the two symbol sets. - dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one (in ltdll.c) - if test "x$lt_cv_need_dllmain" = "xyes"; then - ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ - test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' - else - ltdll_obj= - ltdll_cmds= - fi - - # Extract the symbol export list from an `--export-all' def file, - # then regenerate the def file from the symbol export list, so that - # the compiled dll only exports the symbol export list. - # Be careful not to strip the DATA tag left be newer dlltools. - export_symbols_cmds="$ltdll_cmds"' - $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ - sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' - - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is. - # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname-def; - else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \$# in - 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; - fi~ - '"$ltdll_cmds"' - $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ - $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ - $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris* | sysv5*) - if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw* | pw32*) - # dlltool doesn't understand --whole-archive et. al. - whole_archive_flag_spec= - ;; - *) - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - ;; - esac - fi -else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - hardcode_direct=yes - archive_cmds='' - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - esac - - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - shared_flag='${wl}-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall can do strange things, so it is better to - # generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" - else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok' - # This is a bit strange, but is similar to how AIX traditionally builds - # it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' - fi - fi - ;; - - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - ;; - - darwin* | rhapsody*) - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag='-undefined suppress' - ;; - *) # Darwin 1.3 on - allow_undefined_flag='-flat_namespace -undefined suppress' - ;; - esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' - # We need to add '_' to the symbols in $export_symbols first - #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' - hardcode_direct=yes - hardcode_shlibpath_var=no - whole_archive_flag_spec='-all_load $convenience' - ;; - - freebsd1*) - ld_shlibs=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9* | hpux10* | hpux11*) - case $host_os in - hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; - esac - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_minus_L=yes # Not in the search PATH, but as the default - # location of the library. - export_dynamic_flag_spec='${wl}-E' - ;; - - irix5* | irix6*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - openbsd*) - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - #Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - export_dynamic_flag_spec='${wl}-Bexport' - ;; - - solaris*) - # gcc --version < 3.0 without binutils cannot create self contained - # shared libraries reliably, requiring libgcc.a to resolve some of - # the object symbols generated in some cases. Libraries that use - # assert need libgcc.a to resolve __eprintf, for example. Linking - # a copy of libgcc.a into every shared library to guarantee resolving - # such symbols causes other problems: According to Tim Van Holder - # , C++ libraries end up with a separate - # (to the application) exception stack for one thing. - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - case `$CC --version 2>/dev/null` in - [12].*) - cat <&2 - -*** Warning: Releases of GCC earlier than version 3.0 cannot reliably -*** create self contained shared libraries on Solaris systems, without -*** introducing a dependency on libgcc.a. Therefore, libtool is disabling -*** -no-undefined support, which will at least allow you to build shared -*** libraries. However, you may find that when you link such libraries -*** into an application without using GCC, you have to manually add -*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to -*** upgrade to a newer version of GCC. Another option is to rebuild your -*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. - -EOF - no_undefined_flag= - ;; - esac - fi - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - else - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv5*) - no_undefined_flag=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec= - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4.2uw2*) - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=no - hardcode_shlibpath_var=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; - - sysv5uw7* | unixware7*) - no_undefined_flag='${wl}-z ${wl}text' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac -fi -echo "$as_me:5242: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 -test "$ld_shlibs" = no && can_build_shared=no - -# Check hardcoding attributes. -echo "$as_me:5247: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var"; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$hardcode_shlibpath_var" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -echo "$as_me:5271: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 - -striplib= -old_striplib= -echo "$as_me:5276: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:5281: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:5284: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -reload_cmds='$LD$reload_flag -o $output$reload_objs' -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -# PORTME Fill in your ld.so characteristics -echo "$as_me:5292: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -library_names_spec= -libname_spec='lib$name' -soname_spec= -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}.so$major' - ;; - -aix4* | aix5*) - version_type=linux - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can - # not hardcode correct soname into executable. Probably we can - # add versioning support to collect2, so additional links can - # be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}.so$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}.so' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi4*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - export_dynamic_flag_spec=-rdynamic - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - need_version=no - need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin*) - library_names_spec='$libname.dll.a' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog .libs/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - ;; - yes,mingw*) - library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` - ;; - yes,pw32*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' - ;; - *) - library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' - soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - *) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' - soname_spec='${libname}${release}.sl$major' - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6*) - version_type=irix - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' - case $host_os in - irix5*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' - soname_spec='${libname}${release}.so$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case "$host_os" in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; - -os2*) - libname_spec='$name' - need_lib_prefix=no - library_names_spec='$libname.dll $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' - soname_spec='$libname.so.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -*) - dynamic_linker=no - ;; -esac -echo "$as_me:5685: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 -test "$dynamic_linker" = no && can_build_shared=no - -# Report the final consequences. -echo "$as_me:5690: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:5692: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 - -echo "$as_me:5695: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case "$host_os" in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix4*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -echo "$as_me:5716: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 - -echo "$as_me:5719: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -echo "$as_me:5723: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 - -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - cygwin* | mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - *) - echo "$as_me:5761: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5767 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -char (*f) (); - -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -f = shl_load; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5798: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5801: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5804: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5807: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_shl_load=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:5817: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - echo "$as_me:5822: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5830 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -int -main () -{ -shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5849: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5852: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5855: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5858: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_load=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:5869: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -else - echo "$as_me:5874: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5880 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -char (*f) (); - -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -f = dlopen; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5911: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5914: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5917: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5920: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_dlopen=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:5930: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - echo "$as_me:5935: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5943 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5962: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5965: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5968: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5971: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:5982: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$as_me:5987: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5995 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6014: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:6017: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6020: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:6023: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_svld_dlopen=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:6034: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - echo "$as_me:6039: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6047 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dld_link (); -int -main () -{ -dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6066: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:6069: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6072: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:6075: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dld_dld_link=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:6086: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -fi - -fi - -fi - -fi - -fi - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo "$as_me:6122: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:6194: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:6197: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - -fi -echo "$as_me:6214: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 - - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:6219: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:6291: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:6294: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - -fi -echo "$as_me:6311: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - -if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo "$as_me:6341: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 - if test "${lt_cv_archive_cmds_need_lc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - $rm conftest* - echo 'static int dummy;' > conftest.$ac_ext - - if { (eval echo "$as_me:6349: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:6352: \$? = $ac_status" >&5 - (exit $ac_status); }; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_cv_prog_cc_wl - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:6366: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:6369: \$? = $ac_status" >&5 - (exit $ac_status); } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi -fi - - echo "$as_me:6382: result: $lt_cv_archive_cmds_need_lc" >&5 -echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 - ;; - esac -fi -need_lc=${lt_cv_archive_cmds_need_lc-yes} - -# The second clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - : -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - test -f Makefile && make "$ltmain" -fi - -if test -f "$ltmain"; then - trap "$rm \"${ofile}T\"; exit 1" 1 2 15 - $rm -f "${ofile}T" - - echo creating $ofile - - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS \ - AR AR_FLAGS CC LD LN_S NM SHELL \ - reload_flag reload_cmds wl \ - pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ - thread_safe_flag_spec whole_archive_flag_spec libname_spec \ - library_names_spec soname_spec \ - RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ - old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \ - postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \ - old_striplib striplib file_magic_cmd export_symbols_cmds \ - deplibs_check_method allow_undefined_flag no_undefined_flag \ - finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ - global_symbol_to_c_name_address \ - hardcode_libdir_flag_spec hardcode_libdir_separator \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do - - case $var in - reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ - extract_expsyms_cmds | old_archive_from_expsyms_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - cat <<__EOF__ > "${ofile}T" -#! $SHELL - -# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996-2000 Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$need_lc - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# The default C compiler. -CC=$lt_CC - -# Is the compiler the GNU C compiler? -with_gcc=$GCC - -# The linker used to build libraries. -LD=$lt_LD - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_wl - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_pic_flag -pic_mode=$pic_mode - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_compiler_c_o - -# Can we write directly to a .lo ? -compiler_o_lo=$lt_compiler_o_lo - -# Must we lock files when doing compilation ? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_link_static_flag - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_no_builtin_flag - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# ### END LIBTOOL CONFIG - -__EOF__ - - case $host_os in - aix3*) - cat <<\EOF >> "${ofile}T" - -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - - case $host_os in - cygwin* | mingw* | pw32* | os2*) - cat <<'EOF' >> "${ofile}T" - # This is a source program that is used to create dlls on Windows - # Don't remove nor modify the starting and closing comments -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include -# #undef WIN32_LEAN_AND_MEAN -# #include -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments -# /* impgen.c starts here */ -# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. -# -# This file is part of GNU libtool. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# */ -# -# #include /* for printf() */ -# #include /* for open(), lseek(), read() */ -# #include /* for O_RDONLY, O_BINARY */ -# #include /* for strdup() */ -# -# /* O_BINARY isn't required (or even defined sometimes) under Unix */ -# #ifndef O_BINARY -# #define O_BINARY 0 -# #endif -# -# static unsigned int -# pe_get16 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[2]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 2); -# return b[0] + (b[1]<<8); -# } -# -# static unsigned int -# pe_get32 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[4]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 4); -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# static unsigned int -# pe_as32 (ptr) -# void *ptr; -# { -# unsigned char *b = ptr; -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# int -# main (argc, argv) -# int argc; -# char *argv[]; -# { -# int dll; -# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; -# unsigned long export_rva, export_size, nsections, secptr, expptr; -# unsigned long name_rvas, nexp; -# unsigned char *expdata, *erva; -# char *filename, *dll_name; -# -# filename = argv[1]; -# -# dll = open(filename, O_RDONLY|O_BINARY); -# if (dll < 1) -# return 1; -# -# dll_name = filename; -# -# for (i=0; filename[i]; i++) -# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') -# dll_name = filename + i +1; -# -# pe_header_offset = pe_get32 (dll, 0x3c); -# opthdr_ofs = pe_header_offset + 4 + 20; -# num_entries = pe_get32 (dll, opthdr_ofs + 92); -# -# if (num_entries < 1) /* no exports */ -# return 1; -# -# export_rva = pe_get32 (dll, opthdr_ofs + 96); -# export_size = pe_get32 (dll, opthdr_ofs + 100); -# nsections = pe_get16 (dll, pe_header_offset + 4 +2); -# secptr = (pe_header_offset + 4 + 20 + -# pe_get16 (dll, pe_header_offset + 4 + 16)); -# -# expptr = 0; -# for (i = 0; i < nsections; i++) -# { -# char sname[8]; -# unsigned long secptr1 = secptr + 40 * i; -# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); -# unsigned long vsize = pe_get32 (dll, secptr1 + 16); -# unsigned long fptr = pe_get32 (dll, secptr1 + 20); -# lseek(dll, secptr1, SEEK_SET); -# read(dll, sname, 8); -# if (vaddr <= export_rva && vaddr+vsize > export_rva) -# { -# expptr = fptr + (export_rva - vaddr); -# if (export_rva + export_size > vaddr + vsize) -# export_size = vsize - (export_rva - vaddr); -# break; -# } -# } -# -# expdata = (unsigned char*)malloc(export_size); -# lseek (dll, expptr, SEEK_SET); -# read (dll, expdata, export_size); -# erva = expdata - export_rva; -# -# nexp = pe_as32 (expdata+24); -# name_rvas = pe_as32 (expdata+32); -# -# printf ("EXPORTS\n"); -# for (i = 0; i> "${ofile}T" || (rm -f "${ofile}T"; exit 1) - - mv -f "${ofile}T" "$ofile" || \ - (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") - chmod +x "$ofile" -fi - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -# Prevent multiple expansion - -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:6950: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 6956 "configure" -#include "confdefs.h" -#include -#include <$ac_hdr> - -int -main () -{ -if ((DIR *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6971: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:6974: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6977: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:6980: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:6990: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 -if test "${ac_cv_lib_dir_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldir $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7011 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7030: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:7033: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7036: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7039: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dir_opendir=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:7050: result: $ac_cv_lib_dir_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 -if test $ac_cv_lib_dir_opendir = yes; then - LIBS="$LIBS -ldir" -fi - -else - echo "$as_me:7057: checking for opendir in -lx" >&5 -echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 -if test "${ac_cv_lib_x_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lx $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7065 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7084: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:7087: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7090: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7093: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_x_opendir=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:7104: result: $ac_cv_lib_x_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 -if test $ac_cv_lib_x_opendir = yes; then - LIBS="$LIBS -lx" -fi - -fi - -echo "$as_me:7112: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 7118 "configure" -#include "confdefs.h" -#include -#include -#include -#include - -_ACEOF -if { (eval echo "$as_me:7126: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:7132: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no -fi -rm -f conftest.err conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 7154 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 7172 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -#line 7193 "configure" -#include "confdefs.h" -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:7219: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:7222: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7224: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7227: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_stdc=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:7240: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - -fi - -echo "$as_me:7250: checking for sys/wait.h that is POSIX.1 compatible" >&5 -echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 -if test "${ac_cv_header_sys_wait_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 7256 "configure" -#include "confdefs.h" -#include -#include -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif - -int -main () -{ - int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7278: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7281: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7284: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7287: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_sys_wait_h=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_sys_wait_h=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:7297: result: $ac_cv_header_sys_wait_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 -if test $ac_cv_header_sys_wait_h = yes; then - -cat >>confdefs.h <<\EOF -#define HAVE_SYS_WAIT_H 1 -EOF - -fi - -for ac_header in errno.h fcntl.h limits.h unistd.h sys/time.h utmp.h utmpx.h \ - termios.h termio.h sgtty.h sys/ioctl.h syslog.h paths.h \ - utime.h ulimit.h sys/resource.h gshadow.h shadow.h lastlog.h \ - rpc/key_prot.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7313: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 7319 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:7323: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:7329: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:7348: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 7369 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); - -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7400: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:7403: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7406: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7409: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:7419: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7434,8 +2610,11 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 7437 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #include @@ -7483,22 +2662,23 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:7486: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7489: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7492: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7495: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext done @@ -7509,22 +2689,16777 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:7512: result: none needed" >&5 + echo "$as_me:$LINENO: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:7515: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:7520: checking for an ANSI C-conforming const" >&5 +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi + + +echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6 +rm -f confinc confmf + +# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval="$enable_dependency_tracking" + +fi; +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + + +if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + + + +depcc="$CC" am_compiler_list= + +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # (even with -Werror). So we grep stderr for any message + # that says an option was ignored. + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + + +if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + + + + echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 +echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 +if test "${ac_cv_lib_cposix_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcposix $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strerror (); +int +main () +{ +strerror (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_cposix_strerror=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_cposix_strerror=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 +echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 +if test $ac_cv_lib_cposix_strerror = yes; then + LIBS="$LIBS -lcposix" +fi + + + +echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6 +fi + +for ac_prog in 'bison -y' byacc +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_YACC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_YACC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +YACC=$ac_cv_prog_YACC +if test -n "$YACC"; then + echo "$as_me:$LINENO: result: $YACC" >&5 +echo "${ECHO_T}$YACC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$YACC" && break +done +test -n "$YACC" || YACC="yacc" + + + + +echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 +echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 +if test "${am_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + am_cv_prog_cc_stdc=no +ac_save_CC="$CC" +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; + +int +main () +{ + +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_prog_cc_stdc="$ac_arg"; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +CC="$ac_save_CC" + +fi + +if test -z "$am_cv_prog_cc_stdc"; then + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 +else + echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6 +fi +case "x$am_cv_prog_cc_stdc" in + x|xno) ;; + *) CC="$CC $am_cv_prog_cc_stdc" ;; +esac + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + +echo "$as_me:$LINENO: checking for function prototypes" >&5 +echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6 +if test "$am_cv_prog_cc_stdc" != no; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +cat >>confdefs.h <<\_ACEOF +#define PROTOTYPES 1 +_ACEOF + + U= ANSI2KNR= +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + U=_ ANSI2KNR=./ansi2knr +fi +# Ensure some checks needed by ansi2knr itself. +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + + +for ac_header in string.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +# Check whether --enable-fast-install or --disable-fast-install was given. +if test "${enable_fast_install+set}" = set; then + enableval="$enable_fast_install" + p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_fast_install=yes +fi; + +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 +host=$ac_cv_host +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + +echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 +if test "${lt_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && break + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +SED=$lt_cv_path_SED + +fi + +echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6 + + +# Check whether --with-gnu-ld or --without-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval="$with_gnu_ld" + test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi; +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 +else + echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 +fi +if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +echo "${ECHO_T}$LD" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +if test "${lt_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # I'd rather use --version here, but apparently some GNU ld's only accept -v. +case `"$LD" -v 2>&1 &5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +with_gnu_ld=$lt_cv_prog_gnu_ld + + +echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 +if test "${lt_cv_ld_reload_flag+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_ld_reload_flag='-r' +fi +echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' + +echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +if test "${lt_cv_path_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/${ac_tool_prefix}nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + esac + fi + done + IFS="$lt_save_ifs" + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +fi +fi +echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6 +NM="$lt_cv_path_NM" + +echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 +if test "${lt_cv_deplibs_check_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. + +case $host_os in +aix4* | aix5*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi4*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin* | mingw* | pw32*) + # win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='win32_libid' + ;; + +darwin* | rhapsody*) + # this will be overwritten by pass_all, but leave it in just in case + lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' + lt_cv_file_magic_cmd='/usr/bin/file -L' + case "$host_os" in + rhapsody* | darwin1.[012]) + lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` + ;; + *) # Darwin 1.3 on + lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' + ;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case "$host_cpu" in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + irix5* | nonstopux*) + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" + ;; + *) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" + ;; + esac + lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be Linux ELF. +linux*) + case $host_cpu in + alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + ;; + +netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +nto-qnx) + lt_cv_deplibs_check_method=unknown + ;; + +openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi + ;; + +osf3* | osf4* | osf5*) + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' + lt_cv_file_magic_test_file=/shlib/libc.so + lt_cv_deplibs_check_method=pass_all + ;; + +sco3.2v5*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + lt_cv_file_magic_test_file=/lib/libc.so + ;; + +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac + +fi +echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# Allow CC to be a program name with arguments. +compiler=$CC + +# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then + enableval="$enable_libtool_lock" + +fi; +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line 4373 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case "`/usr/bin/file conftest.o`" in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 +if test "${lt_cv_cc_needs_belf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + lt_cv_cc_needs_belf=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +lt_cv_cc_needs_belf=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; + +esac + +need_locks="$enable_libtool_lock" + + + +for ac_header in dlfcn.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_CXX" && break +done +test -n "$ac_ct_CXX" || ac_ct_CXX="g++" + + CXX=$ac_ct_CXX +fi + + +# Provide some information about the compiler. +echo "$as_me:$LINENO:" \ + "checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_compiler_gnu=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +GXX=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cxx_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_prog_cxx_g=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +depcc="$CXX" am_compiler_list= + +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # (even with -Werror). So we grep stderr for any message + # that says an option was ignored. + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + + +if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + + +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6 +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +ac_ext=f +ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_f77_compiler_gnu +if test -n "$ac_tool_prefix"; then + for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$F77"; then + ac_cv_prog_F77="$F77" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +F77=$ac_cv_prog_F77 +if test -n "$F77"; then + echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$F77" && break + done +fi +if test -z "$F77"; then + ac_ct_F77=$F77 + for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_F77"; then + ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_F77="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +ac_ct_F77=$ac_cv_prog_ac_ct_F77 +if test -n "$ac_ct_F77"; then + echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_F77" && break +done + + F77=$ac_ct_F77 +fi + + +# Provide some information about the compiler. +echo "$as_me:5399:" \ + "checking for Fortran 77 compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +# If we don't use `.F' as extension, the preprocessor is not run on the +# input file. +ac_save_ext=$ac_ext +ac_ext=F +echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 +if test "${ac_cv_f77_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF + program main +#ifndef __GNUC__ + choke me +#endif + + end +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_compiler_gnu=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_cv_f77_compiler_gnu=$ac_compiler_gnu + +fi +echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 +ac_ext=$ac_save_ext +G77=`test $ac_compiler_gnu = yes && echo yes` +ac_test_FFLAGS=${FFLAGS+set} +ac_save_FFLAGS=$FFLAGS +FFLAGS= +echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_f77_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + FFLAGS=-g +cat >conftest.$ac_ext <<_ACEOF + program main + + end +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_f77_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_prog_f77_g=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 +if test "$ac_test_FFLAGS" = set; then + FFLAGS=$ac_save_FFLAGS +elif test $ac_cv_prog_f77_g = yes; then + if test "$G77" = yes; then + FFLAGS="-g -O2" + else + FFLAGS="-g" + fi +else + if test "$G77" = yes; then + FFLAGS="-O2" + else + FFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! + +# find the maximum length of command line arguments +echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 +if test "${lt_cv_sys_max_cmd_len+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + i=0 + testring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + *) + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ + = "XX$testring") >/dev/null 2>&1 && + new_result=`expr "X$testring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + testring=$testring$testring + done + testring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + ;; + esac + +fi + +if test -n $lt_cv_sys_max_cmd_len ; then + echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 +else + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 +fi + + + + +# Check for command to grab the raw symbol name followed by C symbol from nm. +echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Transform the above into a raw symbol and a C symbol. +symxfrm='\1 \2\3 \3' + +# Transform an extracted symbol line into a proper C declaration +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[BCDT]' + ;; +cygwin* | mingw* | pw32*) + symcode='[ABCDGISTW]' + ;; +hpux*) # Its linker distinguishes data from code symbols + if test "$host_cpu" = ia64; then + symcode='[ABCDEGRST]' + fi + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; +osf*) + symcode='[BCDEGQRST]' + ;; +solaris* | sysv5*) + symcode='[BDT]' + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGISTW]' ;; +esac + +# Try without a prefix undercore, then with it. +for ac_symprfx in "" "_"; do + + # Write the raw and C identifiers. + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if grep ' nm_test_var$' "$nlist" >/dev/null; then + if grep ' nm_test_func$' "$nlist" >/dev/null; then + cat < conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif + +EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + + cat <> conftest.$ac_ext +#if defined (__STDC__) && __STDC__ +# define lt_ptr_t void * +#else +# define lt_ptr_t char * +# define const +#endif + +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + lt_ptr_t address; +} +lt_preloaded_symbols[] = +{ +EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext + cat <<\EOF >> conftest.$ac_ext + {0, (lt_ptr_t) 0} +}; + +#ifdef __cplusplus +} +#endif +EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi + else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done + +fi + +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6 +else + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 +fi + +echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +if test "${lt_cv_objdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6 +objdir=$lt_cv_objdir + + + + + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e s/^X//' +sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except M$VC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + AR=$ac_ct_AR +else + AR="$ac_cv_prog_AR" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + RANLIB=$ac_ct_RANLIB +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + STRIP=$ac_ct_STRIP +else + STRIP="$ac_cv_prog_STRIP" +fi + + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + +# Only perform the check for file, if the check method requires it +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + else + MAGIC_CMD=: + fi +fi + + fi + ;; +esac + +enable_dlopen=no +enable_win32_dll=no + +# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then + enableval="$enable_libtool_lock" + +fi; +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + +# Check whether --with-pic or --without-pic was given. +if test "${with_pic+set}" = set; then + withval="$with_pic" + pic_mode="$withval" +else + pic_mode=default +fi; +test -z "$pic_mode" && pic_mode=default + +# Use C for the default configuration in the libtool script +tagname= +lt_save_CC="$CC" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +objext=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}\n' + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# +# Check for any special shared library compilation flags. +# +lt_prog_cc_shlib= +if test "$GCC" = no; then + case $host_os in + sco3.2v5*) + lt_prog_cc_shlib='-belf' + ;; + esac +fi +if test -n "$lt_prog_cc_shlib"; then + { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 +echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} + if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : + else + { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 +echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} + lt_cv_prog_cc_can_build_shared=no + fi +fi + + +# +# Check to make sure the static flag actually works. +# +echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6 +if test "${lt_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_prog_compiler_static" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + else + lt_prog_compiler_static_works=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 + +if test x"$lt_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + + + +lt_prog_compiler_no_builtin_flag= + +if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:6404: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:6408: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s conftest.err; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $rm conftest* + +fi +echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 + +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : +fi + +fi + +lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= + +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case "$host_cpu" in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; + + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case "$host_cpu" in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; + + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + linux*) + case $CC in + icc|ecc) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + ccc) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + esac + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + + sco3.2v5*) + lt_prog_compiler_pic='-Kpic' + lt_prog_compiler_static='-dn' + ;; + + solaris*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; + + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi + +echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6 + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 +if test "${lt_prog_compiler_pic_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:6636: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:6640: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s conftest.err; then + lt_prog_compiler_pic_works=yes + fi + fi + $rm conftest* + +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 + +if test x"$lt_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac +else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no +fi + +fi +case "$host_os" in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac + +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +if test "${lt_cv_prog_compiler_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_c_o=no + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + # According to Tom Tromey, Ian Lance Taylor reported there are C compilers + # that will create temporary files in the current directory regardless of + # the output directory. Thus, making CWD read-only will cause this test + # to fail, enabling locking or at least warning the user not to do parallel + # builds. + chmod -w . + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:6703: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:6707: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s out/conftest.err; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . + $rm conftest* out/* + rmdir out + cd .. + rmdir conftest + $rm conftest* + +fi +echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6 + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + +echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 + + runpath_var= + allow_undefined_flag= + enable_shared_with_static_runtimes=no + archive_cmds= + archive_expsym_cmds= + old_archive_From_new_cmds= + old_archive_from_expsyms_cmds= + export_dynamic_flag_spec= + whole_archive_flag_spec= + thread_safe_flag_spec= + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= + hardcode_libdir_separator= + hardcode_direct=no + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + link_all_deplibs=unknown + hardcode_automatic=no + module_cmds= + module_expsym_cmds= + always_export_symbols=no + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + ld_shlibs=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +EOF + fi + ;; + + amigaos*) + archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can't use + # them. + ld_shlibs=no + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + else + ld_shlibs=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris* | sysv5*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + + if test "$ld_shlibs" = yes; then + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$link_static_flag"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds='' + hardcode_direct=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + + if test "$GCC" = yes; then + case $host_os in aix4.012|aix4.012.*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + esac + shared_flag='-shared' + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols=yes + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec=' ' + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # see comment about different semantics on the GNU ld section + ld_shlibs=no + ;; + + bsdi4*) + export_dynamic_flag_spec=-rdynamic + ;; + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; + + darwin* | rhapsody*) + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + archive_cmds_need_lc=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='-all_load $convenience' + link_all_deplibs=yes + fi + ;; + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + freebsd1*) + ld_shlibs=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; + + hpux10* | hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + ;; + *) + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + ia64*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=no + hardcode_shlibpath_var=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + *) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_ld='-rpath $libdir' + fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + link_all_deplibs=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + openbsd*) + hardcode_direct=yes + hardcode_shlibpath_var=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + hardcode_libdir_separator=: + ;; + + sco3.2v5*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + + solaris*) + no_undefined_flag=' -z text' + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; + esac + link_all_deplibs=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + + sysv4.2uw2*) + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=no + hardcode_shlibpath_var=no + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + no_undefined_flag='${wl}-z ${wl}text' + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv5*) + no_undefined_flag=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + hardcode_libdir_flag_spec= + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; + esac + fi + +echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6 +test "$ld_shlibs" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc=no + else + archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +echo "${ECHO_T}$archive_cmds_need_lc" >&6 + ;; + esac + fi + ;; +esac + +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var " || \ + test "X$hardcode_automatic"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6 + +if test "$hardcode_action" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # sanitize + new_sys_lib_search_path_spec= + for d in $sys_lib_search_path_spec ; do + # check if exists + if test -d $d -a -x $d ; then + # normalize + new_d=$(cd $d ; pwd) + # uniq + if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then + new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d " + fi + fi + done + # compress spaces + sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi4*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32*) + version_type=windows + shrext=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd1*) + dynamic_linker=no + ;; + +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.01* | freebsdelf3.01*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + *) # from 3.2 on + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case "$host_cpu" in + ia64*) + shrext='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +openbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6 +test "$dynamic_linker" = no && can_build_shared=no + +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case declares shl_load. + For example, HP-UX 11i declares gettimeofday. */ +#define shl_load innocuous_shl_load + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef shl_load + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != shl_load; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_shl_load=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" +else + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +int +main () +{ +shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_shl_load=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +else + echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case declares dlopen. + For example, HP-UX 11i declares gettimeofday. */ +#define dlopen innocuous_dlopen + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef dlopen + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != dlopen; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" +else + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_svld_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_svld_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dld_link (); +int +main () +{ +dld_link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_dld_link=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_dld_link=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6 + + if test "x$lt_cv_dlopen_self" = xyes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + +# Report which librarie types wil actually be built +echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6 + +echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case "$host_os" in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + +aix4*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + darwin* | rhapsody*) + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + archive_cmds_need_lc=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + output_verbose_link_cmd='echo' + archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' + module_cmds='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='-all_load $convenience' + link_all_deplibs=yes + fi + ;; +esac +echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6 + +echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6 + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler \ + CC \ + LD \ + lt_prog_compiler_wl \ + lt_prog_compiler_pic \ + lt_prog_compiler_static \ + lt_prog_compiler_no_builtin_flag \ + export_dynamic_flag_spec \ + thread_safe_flag_spec \ + whole_archive_flag_spec \ + enable_shared_with_static_runtimes \ + old_archive_cmds \ + old_archive_from_new_cmds \ + predep_objects \ + postdep_objects \ + predeps \ + postdeps \ + compiler_lib_search_path \ + archive_cmds \ + archive_expsym_cmds \ + postinstall_cmds \ + postuninstall_cmds \ + old_archive_from_expsyms_cmds \ + allow_undefined_flag \ + no_undefined_flag \ + export_symbols_cmds \ + hardcode_libdir_flag_spec \ + hardcode_libdir_flag_spec_ld \ + hardcode_libdir_separator \ + hardcode_automatic \ + module_cmds \ + module_expsym_cmds \ + lt_cv_prog_compiler_c_o \ + exclude_expsyms \ + include_expsyms; do + + case $var in + old_archive_cmds | \ + old_archive_from_new_cmds | \ + archive_cmds | \ + archive_expsym_cmds | \ + module_cmds | \ + module_expsym_cmds | \ + old_archive_from_expsyms_cmds | \ + export_symbols_cmds | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac + +cfgfile="${ofile}T" + trap "$rm \"$cfgfile\"; exit 1" 1 2 15 + $rm -f "$cfgfile" + { echo "$as_me:$LINENO: creating $ofile" >&5 +echo "$as_me: creating $ofile" >&6;} + + cat <<__EOF__ >> "$cfgfile" +#! $SHELL + +# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# +# This file is part of GNU Libtool: +# Originally by Gordon Matzigkeit , 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# A sed program that does not truncate output. +SED=$lt_SED + +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="$SED -e s/^X//" + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi + +# The names of the tagged configurations supported by this script. +available_tags= + +# ### BEGIN LIBTOOL CONFIG + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# A language-specific compiler. +CC=$lt_compiler + +# Is the compiler the GNU C compiler? +with_gcc=$GCC + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_LD + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext='$shrext' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o + +# Must we lock files when doing compilation ? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path" + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms + +# ### END LIBTOOL CONFIG + +__EOF__ + + + case $host_os in + aix3*) + cat <<\EOF >> "$cfgfile" + +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +EOF + ;; + esac + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || \ + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + test -f Makefile && make "$ltmain" +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + +# Check whether --with-tags or --without-tags was given. +if test "${with_tags+set}" = set; then + withval="$with_tags" + tagnames="$withval" +fi; + +if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then + { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 +echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} + fi + + if test -z "$LTCC"; then + eval "`$SHELL ${ofile} --config | grep '^LTCC='`" + if test -z "$LTCC"; then + { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 +echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} + else + { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 +echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} + fi + fi + + # Extract list of available tagged configurations in $ofile. + # Note that this assumes the entire list is on one line. + available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for tagname in $tagnames; do + IFS="$lt_save_ifs" + # Check whether tagname contains only valid characters + case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in + "") ;; + *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 +echo "$as_me: error: invalid tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null + then + { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 +echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} + { (exit 1); exit 1; }; } + fi + + # Update the list of available tags. + if test -n "$tagname"; then + echo appending configuration tag \"$tagname\" to $ofile + + case $tagname in + CXX) + if test -n "$CXX" && test "X$CXX" != "Xno"; then + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + + +archive_cmds_need_lc_CXX=no +allow_undefined_flag_CXX= +always_export_symbols_CXX=no +archive_expsym_cmds_CXX= +export_dynamic_flag_spec_CXX= +hardcode_direct_CXX=no +hardcode_libdir_flag_spec_CXX= +hardcode_libdir_flag_spec_ld_CXX= +hardcode_libdir_separator_CXX= +hardcode_minus_L_CXX=no +hardcode_automatic_CXX=no +module_cmds_CXX= +module_expsym_cmds_CXX= +link_all_deplibs_CXX=unknown +old_archive_cmds_CXX=$old_archive_cmds +no_undefined_flag_CXX= +whole_archive_flag_spec_CXX= +enable_shared_with_static_runtimes_CXX=no + +# Dependencies to place before and after the object being linked: +predep_objects_CXX= +postdep_objects_CXX= +predeps_CXX= +postdeps_CXX= +compiler_lib_search_path_CXX= + +# Source file extension for C++ test sources. +ac_ext=cc + +# Object file extension for compiled C++ test sources. +objext=o +objext_CXX=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(int, char *) { return(0); }\n' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_LD=$LD +lt_save_GCC=$GCC +GCC=$GXX +lt_save_with_gnu_ld=$with_gnu_ld +lt_save_path_LD=$lt_cv_path_LD +if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +else + unset lt_cv_prog_gnu_ld +fi +if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX +else + unset lt_cv_path_LD +fi +test -z "${LDCXX+set}" || LD=$LDCXX +CC=${CXX-"c++"} +compiler=$CC +compiler_CXX=$CC +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` + +# We don't want -fno-exception wen compiling C++ code, so set the +# no_builtin_flag separately +if test "$GXX" = yes; then + lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' +else + lt_prog_compiler_no_builtin_flag_CXX= +fi + +if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + +# Check whether --with-gnu-ld or --without-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval="$with_gnu_ld" + test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi; +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 +else + echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 +fi +if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +echo "${ECHO_T}$LD" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +if test "${lt_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # I'd rather use --version here, but apparently some GNU ld's only accept -v. +case `"$LD" -v 2>&1 &5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ + grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_CXX= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +else + GXX=no + with_gnu_ld=no + wlarc= +fi + +# PORTME: fill in a description of your system's C++ link characteristics +echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +ld_shlibs_CXX=yes +case $host_os in + aix3*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_CXX='' + hardcode_direct_CXX=yes + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + + if test "$GXX" = yes; then + case $host_os in aix4.012|aix4.012.*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct_CXX=yes + else + # We have old collect2 + hardcode_direct_CXX=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_CXX=yes + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_libdir_separator_CXX= + fi + esac + shared_flag='-shared' + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_CXX=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_CXX='-berok' + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + + archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_CXX="-z nodefs" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_CXX=' ${wl}-bernotok' + allow_undefined_flag_CXX=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols_CXX=yes + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX=' ' + archive_cmds_need_lc_CXX=yes + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + else + ld_shlibs_CXX=no + fi + ;; + + darwin* | rhapsody*) + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + archive_cmds_need_lc_CXX=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag_CXX='-undefined suppress' + ;; + *) # Darwin 1.3 on + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + ;; + esac + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_CXX='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='-all_load $convenience' + link_all_deplibs_CXX=yes + fi + ;; + + dgux*) + case $cc_basename in + ec++) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + ghcx) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + freebsd12*) + # C++ shared libraries reported to be fairly broken before switch to ELF + ld_shlibs_CXX=no + ;; + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; + freebsd*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes + ;; + gnu*) + ;; + hpux9*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_direct_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC) + archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes; then + archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld_CXX='+b $libdir' + hardcode_libdir_separator_CXX=: + ;; + ia64*) + hardcode_libdir_flag_spec_CXX='-L$libdir' + ;; + *) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + export_dynamic_flag_spec_CXX='${wl}-E' + ;; + esac + fi + case "$host_cpu" in + hppa*64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + ;; + ia64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + *) + hardcode_direct_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC) + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + ;; + *) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case "$host_cpu" in + ia64*|hppa*64*) + archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + ;; + *) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + irix5* | irix6*) + case $cc_basename in + CC) + # SGI C++ + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + else + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + fi + fi + link_all_deplibs_CXX=yes + ;; + esac + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + ;; + linux*) + case $cc_basename in + KCC) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + + hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc) + # Intel C++ + with_gnu_ld=yes + archive_cmds_need_lc_CXX=no + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + cxx) + # Compaq C++ + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac + ;; + lynxos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + m88k*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + mvs*) + case $cc_basename in + cxx) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + osf3*) + case $cc_basename in + KCC) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' + + ;; + RCC) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + cxx) + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + osf4* | osf5*) + case $cc_basename in + KCC) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' + ;; + RCC) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + cxx) + allow_undefined_flag_CXX=' -expect_unresolved \*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ + $rm $lib.exp' + + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + psos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + sco*) + archive_cmds_need_lc_CXX=no + case $cc_basename in + CC) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + lcc) + # Lucid + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + solaris*) + case $cc_basename in + CC) + # Sun C++ 4.2, 5.x and Centerline C++ + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_shlibpath_var_CXX=no + case $host_os in + solaris2.0-5 | solaris2.0-5.*) ;; + *) + # The C++ compiler is used as linker so we must use $wl + # flag to pass the commands to the underlying system + # linker. + # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + link_all_deplibs_CXX=yes + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + gcx) + # Green Hills C++ Compiler + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if $CC --version | grep -v '^2\.7' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + fi + ;; + esac + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + archive_cmds_need_lc_CXX=no + ;; + tandem*) + case $cc_basename in + NCC) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + vxworks*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; +esac +echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6 +test "$ld_shlibs_CXX" = no && can_build_shared=no + +GCC_CXX="$GXX" +LD_CXX="$LD" + + +cat > conftest.$ac_ext <&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + # The `*' in the case matches for architectures that use `case' in + # $output_verbose_cmd can trigger glob expansion during the loop + # eval without this substitution. + output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" + + for p in `eval $output_verbose_link_cmd`; do + case $p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" \ + || test $p = "-R"; then + prev=$p + continue + else + prev= + fi + + if test "$pre_test_object_deps_done" = no; then + case $p in + -L* | -R*) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$compiler_lib_search_path_CXX"; then + compiler_lib_search_path_CXX="${prev}${p}" + else + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$postdeps_CXX"; then + postdeps_CXX="${prev}${p}" + else + postdeps_CXX="${postdeps_CXX} ${prev}${p}" + fi + fi + ;; + + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$predep_objects_CXX"; then + predep_objects_CXX="$p" + else + predep_objects_CXX="$predep_objects_CXX $p" + fi + else + if test -z "$postdep_objects_CXX"; then + postdep_objects_CXX="$p" + else + postdep_objects_CXX="$postdep_objects_CXX $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling CXX test program" +fi + +$rm -f confest.$objext + +case " $postdeps_CXX " in +*" -lc "*) archive_cmds_need_lc_CXX=no ;; +esac + +lt_prog_compiler_wl_CXX= +lt_prog_compiler_pic_CXX= +lt_prog_compiler_static_CXX= + +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + fi + ;; + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | os2* | pw32*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_CXX='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_CXX=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case "$host_cpu" in + hppa*64*|ia64*) + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + else + case $host_os in + aix4* | aix5*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + else + lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68) + # Green Hills C++ Compiler + # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + dgux*) + case $cc_basename in + ec++) + lt_prog_compiler_pic_CXX='-KPIC' + ;; + ghcx) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + freebsd*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + if test "$host_cpu" != ia64; then + lt_prog_compiler_pic_CXX='+Z' + fi + ;; + aCC) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + case "$host_cpu" in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_CXX='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux*) + case $cc_basename in + KCC) + # KAI C++ Compiler + lt_prog_compiler_wl_CXX='--backend -Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + ;; + icpc) + # Intel C++ + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-static' + ;; + cxx) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx) + lt_prog_compiler_pic_CXX='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd*) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC) + lt_prog_compiler_wl_CXX='--backend -Wl,' + ;; + RCC) + # Rational C++ 2.4.1 + lt_prog_compiler_pic_CXX='-pic' + ;; + cxx) + # Digital/Compaq C++ + lt_prog_compiler_wl_CXX='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + sco*) + case $cc_basename in + CC) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + *) + ;; + esac + ;; + solaris*) + case $cc_basename in + CC) + # Sun C++ 4.2, 5.x and Centerline C++ + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + gcx) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC) + # Sun C++ 4.x + lt_prog_compiler_pic_CXX='-pic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + lcc) + # Lucid + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC) + # NonStop-UX NCC 3.20 + lt_prog_compiler_pic_CXX='-KPIC' + ;; + *) + ;; + esac + ;; + unixware*) + ;; + vxworks*) + ;; + *) + lt_prog_compiler_can_build_shared_CXX=no + ;; + esac + fi + +echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_CXX"; then + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 +if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:10965: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:10969: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s conftest.err; then + lt_prog_compiler_pic_works_CXX=yes + fi + fi + $rm conftest* + +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 + +if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; + esac +else + lt_prog_compiler_pic_CXX= + lt_prog_compiler_can_build_shared_CXX=no +fi + +fi +case "$host_os" in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_CXX= + ;; + *) + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" + ;; +esac + +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + # According to Tom Tromey, Ian Lance Taylor reported there are C compilers + # that will create temporary files in the current directory regardless of + # the output directory. Thus, making CWD read-only will cause this test + # to fail, enabling locking or at least warning the user not to do parallel + # builds. + chmod -w . + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:11032: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:11036: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s out/conftest.err; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . + $rm conftest* out/* + rmdir out + cd .. + rmdir conftest + $rm conftest* + +fi +echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6 + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + +echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix4* | aix5*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX="$ltdll_cmds" + ;; + cygwin* | mingw*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + +echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6 +test "$ld_shlibs_CXX" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_CXX" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_CXX=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_CXX in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_CXX=no + else + archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 + ;; + esac + fi + ;; +esac + +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var CXX" || \ + test "X$hardcode_automatic_CXX"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6 + +if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # sanitize + new_sys_lib_search_path_spec= + for d in $sys_lib_search_path_spec ; do + # check if exists + if test -d $d -a -x $d ; then + # normalize + new_d=$(cd $d ; pwd) + # uniq + if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then + new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d " + fi + fi + done + # compress spaces + sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi4*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32*) + version_type=windows + shrext=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd1*) + dynamic_linker=no + ;; + +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.01* | freebsdelf3.01*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + *) # from 3.2 on + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case "$host_cpu" in + ia64*) + shrext='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +openbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6 +test "$dynamic_linker" = no && can_build_shared=no + +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case declares shl_load. + For example, HP-UX 11i declares gettimeofday. */ +#define shl_load innocuous_shl_load + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef shl_load + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != shl_load; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_shl_load=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" +else + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +int +main () +{ +shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_shl_load=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +else + echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case declares dlopen. + For example, HP-UX 11i declares gettimeofday. */ +#define dlopen innocuous_dlopen + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef dlopen + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != dlopen; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" +else + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_svld_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_svld_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dld_link (); +int +main () +{ +dld_link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_dld_link=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_dld_link=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6 + + if test "x$lt_cv_dlopen_self" = xyes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_CXX \ + CC_CXX \ + LD_CXX \ + lt_prog_compiler_wl_CXX \ + lt_prog_compiler_pic_CXX \ + lt_prog_compiler_static_CXX \ + lt_prog_compiler_no_builtin_flag_CXX \ + export_dynamic_flag_spec_CXX \ + thread_safe_flag_spec_CXX \ + whole_archive_flag_spec_CXX \ + enable_shared_with_static_runtimes_CXX \ + old_archive_cmds_CXX \ + old_archive_from_new_cmds_CXX \ + predep_objects_CXX \ + postdep_objects_CXX \ + predeps_CXX \ + postdeps_CXX \ + compiler_lib_search_path_CXX \ + archive_cmds_CXX \ + archive_expsym_cmds_CXX \ + postinstall_cmds_CXX \ + postuninstall_cmds_CXX \ + old_archive_from_expsyms_cmds_CXX \ + allow_undefined_flag_CXX \ + no_undefined_flag_CXX \ + export_symbols_cmds_CXX \ + hardcode_libdir_flag_spec_CXX \ + hardcode_libdir_flag_spec_ld_CXX \ + hardcode_libdir_separator_CXX \ + hardcode_automatic_CXX \ + module_cmds_CXX \ + module_expsym_cmds_CXX \ + lt_cv_prog_compiler_c_o_CXX \ + exclude_expsyms_CXX \ + include_expsyms_CXX; do + + case $var in + old_archive_cmds_CXX | \ + old_archive_from_new_cmds_CXX | \ + archive_cmds_CXX | \ + archive_expsym_cmds_CXX | \ + module_cmds_CXX | \ + module_expsym_cmds_CXX | \ + old_archive_from_expsyms_cmds_CXX | \ + export_symbols_cmds_CXX | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac + +cfgfile="$ofile" + + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# A language-specific compiler. +CC=$lt_compiler_CXX + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_CXX + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_LD_CXX + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext='$shrext' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX + +# Must we lock files when doing compilation ? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_CXX +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_CXX + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_CXX + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_CXX + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_CXX + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_CXX + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct_CXX + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L_CXX + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_CXX + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_CXX + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path_CXX" + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_CXX + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_CXX + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_CXX + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_CXX + +# ### END LIBTOOL TAG CONFIG: $tagname + +__EOF__ + + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + test -f Makefile && make "$ltmain" +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC=$lt_save_CC +LDCXX=$LD +LD=$lt_save_LD +GCC=$lt_save_GCC +with_gnu_ldcxx=$with_gnu_ld +with_gnu_ld=$lt_save_with_gnu_ld +lt_cv_path_LDCXX=$lt_cv_path_LD +lt_cv_path_LD=$lt_save_path_LD +lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld + + else + tagname="" + fi + ;; + + F77) + if test -n "$F77" && test "X$F77" != "Xno"; then + +ac_ext=f +ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_f77_compiler_gnu + + +archive_cmds_need_lc_F77=no +allow_undefined_flag_F77= +always_export_symbols_F77=no +archive_expsym_cmds_F77= +export_dynamic_flag_spec_F77= +hardcode_direct_F77=no +hardcode_libdir_flag_spec_F77= +hardcode_libdir_flag_spec_ld_F77= +hardcode_libdir_separator_F77= +hardcode_minus_L_F77=no +hardcode_automatic_F77=no +module_cmds_F77= +module_expsym_cmds_F77= +link_all_deplibs_F77=unknown +old_archive_cmds_F77=$old_archive_cmds +no_undefined_flag_F77= +whole_archive_flag_spec_F77= +enable_shared_with_static_runtimes_F77=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +objext_F77=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code=" subroutine t\n return\n end\n" + +# Code to be used in simple link tests +lt_simple_link_test_code=" program t\n end\n" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +CC=${F77-"f77"} +compiler=$CC +compiler_F77=$CC +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` + +echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6 + +echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case "$host_os" in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; +aix4*) + test "$enable_shared" = yes && enable_static=no + ;; +esac +echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6 + +echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6 + +test "$ld_shlibs_F77" = no && can_build_shared=no + +GCC_F77="$G77" +LD_F77="$LD" + +lt_prog_compiler_wl_F77= +lt_prog_compiler_pic_F77= +lt_prog_compiler_static_F77= + +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 + + if test "$GCC" = yes; then + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_static_F77='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_F77='-Bstatic' + fi + ;; + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; + + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_F77='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_F77='-fno-common' + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared_F77=no + enable_shared=no + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_F77=-Kconform_pic + fi + ;; + + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case "$host_cpu" in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_F77='-fPIC' + ;; + esac + ;; + + *) + lt_prog_compiler_pic_F77='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl_F77='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_F77='-Bstatic' + else + lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_F77='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl_F77='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case "$host_cpu" in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_F77='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static_F77='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl_F77='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static_F77='-non_shared' + ;; + + newsos6) + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + linux*) + case $CC in + icc|ecc) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-static' + ;; + ccc) + lt_prog_compiler_wl_F77='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static_F77='-non_shared' + ;; + esac + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl_F77='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static_F77='-non_shared' + ;; + + sco3.2v5*) + lt_prog_compiler_pic_F77='-Kpic' + lt_prog_compiler_static_F77='-dn' + ;; + + solaris*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + sunos4*) + lt_prog_compiler_wl_F77='-Qoption ld ' + lt_prog_compiler_pic_F77='-PIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic_F77='-Kconform_pic' + lt_prog_compiler_static_F77='-Bstatic' + fi + ;; + + uts4*) + lt_prog_compiler_pic_F77='-pic' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared_F77=no + ;; + esac + fi + +echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_F77"; then + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +if test "${lt_prog_compiler_pic_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_F77" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:13219: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:13223: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s conftest.err; then + lt_prog_compiler_pic_works_F77=yes + fi + fi + $rm conftest* + +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 + +if test x"$lt_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in + "" | " "*) ;; + *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; + esac +else + lt_prog_compiler_pic_F77= + lt_prog_compiler_can_build_shared_F77=no +fi + +fi +case "$host_os" in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_F77= + ;; + *) + lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" + ;; +esac + +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_c_o_F77=no + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + # According to Tom Tromey, Ian Lance Taylor reported there are C compilers + # that will create temporary files in the current directory regardless of + # the output directory. Thus, making CWD read-only will cause this test + # to fail, enabling locking or at least warning the user not to do parallel + # builds. + chmod -w . + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:13286: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:13290: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s out/conftest.err; then + lt_cv_prog_compiler_c_o_F77=yes + fi + fi + chmod u+w . + $rm conftest* out/* + rmdir out + cd .. + rmdir conftest + $rm conftest* + +fi +echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6 + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + +echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 + + runpath_var= + allow_undefined_flag_F77= + enable_shared_with_static_runtimes_F77=no + archive_cmds_F77= + archive_expsym_cmds_F77= + old_archive_From_new_cmds_F77= + old_archive_from_expsyms_cmds_F77= + export_dynamic_flag_spec_F77= + whole_archive_flag_spec_F77= + thread_safe_flag_spec_F77= + hardcode_libdir_flag_spec_F77= + hardcode_libdir_flag_spec_ld_F77= + hardcode_libdir_separator_F77= + hardcode_direct_F77=no + hardcode_minus_L_F77=no + hardcode_shlibpath_var_F77=unsupported + link_all_deplibs_F77=unknown + hardcode_automatic_F77=no + module_cmds_F77= + module_expsym_cmds_F77= + always_export_symbols_F77=no + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms_F77= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + ld_shlibs_F77=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_F77=no + cat <&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +EOF + fi + ;; + + amigaos*) + archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes + + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can't use + # them. + ld_shlibs_F77=no + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_F77=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_F77=no + fi + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_F77='-L$libdir' + allow_undefined_flag_F77=unsupported + always_export_symbols_F77=no + enable_shared_with_static_runtimes_F77=yes + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + else + ld_shlibs=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris* | sysv5*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs_F77=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs_F77=no + fi + ;; + + sunos4*) + archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs_F77=no + fi + ;; + esac + + if test "$ld_shlibs_F77" = yes; then + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_F77='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_F77= + fi + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag_F77=unsupported + always_export_symbols_F77=yes + archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L_F77=yes + if test "$GCC" = yes && test -z "$link_static_flag"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct_F77=unsupported + fi + ;; + + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_F77='' + hardcode_direct_F77=yes + hardcode_libdir_separator_F77=':' + link_all_deplibs_F77=yes + + if test "$GCC" = yes; then + case $host_os in aix4.012|aix4.012.*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct_F77=yes + else + # We have old collect2 + hardcode_direct_F77=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_F77=yes + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_libdir_separator_F77= + fi + esac + shared_flag='-shared' + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_F77=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_F77='-berok' + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF + program main + + end +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_F77="-z nodefs" + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF + program main + + end +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_F77=' ${wl}-bernotok' + allow_undefined_flag_F77=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols_F77=yes + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_F77=' ' + archive_cmds_need_lc_F77=yes + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes + # see comment about different semantics on the GNU ld section + ld_shlibs_F77=no + ;; + + bsdi4*) + export_dynamic_flag_spec_F77=-rdynamic + ;; + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_F77=' ' + allow_undefined_flag_F77=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds_F77='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_F77=yes + ;; + + darwin* | rhapsody*) + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + archive_cmds_need_lc_F77=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag_F77='-undefined suppress' + ;; + *) # Darwin 1.3 on + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' + ;; + esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_F77='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + hardcode_direct_F77=no + hardcode_automatic_F77=yes + hardcode_shlibpath_var_F77=unsupported + whole_archive_flag_spec_F77='-all_load $convenience' + link_all_deplibs_F77=yes + fi + ;; + + dgux*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_shlibpath_var_F77=no + ;; + + freebsd1*) + ld_shlibs_F77=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes + hardcode_minus_L_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + hardcode_direct_F77=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' + ;; + + hpux10* | hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + ;; + *) + archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld_F77='+b $libdir' + hardcode_libdir_separator_F77=: + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + ;; + ia64*) + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + ;; + *) + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + hardcode_direct_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' + fi + hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_F77=: + link_all_deplibs_F77=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + newsos6) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes + hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_F77=: + hardcode_shlibpath_var_F77=no + ;; + + openbsd*) + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + ;; + *) + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + + os2*) + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes + allow_undefined_flag_F77=unsupported + archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag_F77=' -expect_unresolved \*' + archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + fi + hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_F77=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag_F77=' -expect_unresolved \*' + archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec_F77='-rpath $libdir' + fi + hardcode_libdir_separator_F77=: + ;; + + sco3.2v5*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_F77=no + export_dynamic_flag_spec_F77='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + + solaris*) + no_undefined_flag_F77=' -z text' + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else + archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + fi + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_shlibpath_var_F77=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; + esac + link_all_deplibs_F77=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_direct_F77=yes + hardcode_minus_L_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds_F77='$CC -r -o $output$reload_objs' + hardcode_direct_F77=no + ;; + motorola) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_F77=no + ;; + + sysv4.3*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_F77=no + export_dynamic_flag_spec_F77='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_F77=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs_F77=yes + fi + ;; + + sysv4.2uw2*) + archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes + hardcode_minus_L_F77=no + hardcode_shlibpath_var_F77=no + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + no_undefined_flag_F77='${wl}-z ${wl}text' + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_F77=no + ;; + + sysv5*) + no_undefined_flag_F77=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + hardcode_libdir_flag_spec_F77= + hardcode_shlibpath_var_F77=no + runpath_var='LD_RUN_PATH' + ;; + + uts4*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_shlibpath_var_F77=no + ;; + + *) + ld_shlibs_F77=no + ;; + esac + fi + +echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +echo "${ECHO_T}$ld_shlibs_F77" >&6 +test "$ld_shlibs_F77" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_F77" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_F77=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_F77 in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_F77 + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_F77 + allow_undefined_flag_F77= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_F77=no + else + archive_cmds_need_lc_F77=yes + fi + allow_undefined_flag_F77=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 + ;; + esac + fi + ;; +esac + +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_F77= +if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var F77" || \ + test "X$hardcode_automatic_F77"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_F77" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && + test "$hardcode_minus_L_F77" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_F77=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_F77=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_F77=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6 + +if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # sanitize + new_sys_lib_search_path_spec= + for d in $sys_lib_search_path_spec ; do + # check if exists + if test -d $d -a -x $d ; then + # normalize + new_d=$(cd $d ; pwd) + # uniq + if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then + new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d " + fi + fi + done + # compress spaces + sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi4*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32*) + version_type=windows + shrext=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd1*) + dynamic_linker=no + ;; + +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.01* | freebsdelf3.01*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + *) # from 3.2 on + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case "$host_cpu" in + ia64*) + shrext='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +openbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6 +test "$dynamic_linker" = no && can_build_shared=no + + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_F77 \ + CC_F77 \ + LD_F77 \ + lt_prog_compiler_wl_F77 \ + lt_prog_compiler_pic_F77 \ + lt_prog_compiler_static_F77 \ + lt_prog_compiler_no_builtin_flag_F77 \ + export_dynamic_flag_spec_F77 \ + thread_safe_flag_spec_F77 \ + whole_archive_flag_spec_F77 \ + enable_shared_with_static_runtimes_F77 \ + old_archive_cmds_F77 \ + old_archive_from_new_cmds_F77 \ + predep_objects_F77 \ + postdep_objects_F77 \ + predeps_F77 \ + postdeps_F77 \ + compiler_lib_search_path_F77 \ + archive_cmds_F77 \ + archive_expsym_cmds_F77 \ + postinstall_cmds_F77 \ + postuninstall_cmds_F77 \ + old_archive_from_expsyms_cmds_F77 \ + allow_undefined_flag_F77 \ + no_undefined_flag_F77 \ + export_symbols_cmds_F77 \ + hardcode_libdir_flag_spec_F77 \ + hardcode_libdir_flag_spec_ld_F77 \ + hardcode_libdir_separator_F77 \ + hardcode_automatic_F77 \ + module_cmds_F77 \ + module_expsym_cmds_F77 \ + lt_cv_prog_compiler_c_o_F77 \ + exclude_expsyms_F77 \ + include_expsyms_F77; do + + case $var in + old_archive_cmds_F77 | \ + old_archive_from_new_cmds_F77 | \ + archive_cmds_F77 | \ + archive_expsym_cmds_F77 | \ + module_cmds_F77 | \ + module_expsym_cmds_F77 | \ + old_archive_from_expsyms_cmds_F77 | \ + export_symbols_cmds_F77 | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac + +cfgfile="$ofile" + + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_F77 + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# A language-specific compiler. +CC=$lt_compiler_F77 + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_F77 + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_LD_F77 + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_F77 + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext='$shrext' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_F77 +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 + +# Must we lock files when doing compilation ? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_F77 + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_F77 +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_F77 +archive_expsym_cmds=$lt_archive_expsym_cmds_F77 +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_F77 +module_expsym_cmds=$lt_module_expsym_cmds_F77 + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_F77 + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_F77 + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_F77 + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_F77 + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_F77 + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_F77 + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_F77 + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_F77 + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct_F77 + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L_F77 + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_F77 + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_F77 + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path_F77" + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_F77 + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_F77 + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_F77 + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_F77 + +# ### END LIBTOOL TAG CONFIG: $tagname + +__EOF__ + + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + test -f Makefile && make "$ltmain" +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + else + tagname="" + fi + ;; + + GCJ) + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then + + + +# Source file extension for Java test sources. +ac_ext=java + +# Object file extension for compiled Java test sources. +objext=o +objext_GCJ=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +CC=${GCJ-"gcj"} +compiler=$CC +compiler_GCJ=$CC + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +archive_cmds_need_lc_GCJ=no + + +lt_prog_compiler_no_builtin_flag_GCJ= + +if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' + + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:15241: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:15245: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s conftest.err; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $rm conftest* + +fi +echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 + +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +else + : +fi + +fi + +lt_prog_compiler_wl_GCJ= +lt_prog_compiler_pic_GCJ= +lt_prog_compiler_static_GCJ= + +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 + + if test "$GCC" = yes; then + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_static_GCJ='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_GCJ='-Bstatic' + fi + ;; + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; + + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_GCJ='-fno-common' + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared_GCJ=no + enable_shared=no + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_GCJ=-Kconform_pic + fi + ;; + + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case "$host_cpu" in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_GCJ='-fPIC' + ;; + esac + ;; + + *) + lt_prog_compiler_pic_GCJ='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl_GCJ='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_GCJ='-Bstatic' + else + lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl_GCJ='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case "$host_cpu" in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_GCJ='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl_GCJ='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static_GCJ='-non_shared' + ;; + + newsos6) + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + linux*) + case $CC in + icc|ecc) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-static' + ;; + ccc) + lt_prog_compiler_wl_GCJ='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static_GCJ='-non_shared' + ;; + esac + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl_GCJ='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static_GCJ='-non_shared' + ;; + + sco3.2v5*) + lt_prog_compiler_pic_GCJ='-Kpic' + lt_prog_compiler_static_GCJ='-dn' + ;; + + solaris*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + sunos4*) + lt_prog_compiler_wl_GCJ='-Qoption ld ' + lt_prog_compiler_pic_GCJ='-PIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic_GCJ='-Kconform_pic' + lt_prog_compiler_static_GCJ='-Bstatic' + fi + ;; + + uts4*) + lt_prog_compiler_pic_GCJ='-pic' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared_GCJ=no + ;; + esac + fi + +echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_GCJ"; then + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 +if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_GCJ" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:15473: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:15477: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s conftest.err; then + lt_prog_compiler_pic_works_GCJ=yes + fi + fi + $rm conftest* + +fi +echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 + +if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in + "" | " "*) ;; + *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; + esac +else + lt_prog_compiler_pic_GCJ= + lt_prog_compiler_can_build_shared_GCJ=no +fi + +fi +case "$host_os" in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_GCJ= + ;; + *) + lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" + ;; +esac + +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_c_o_GCJ=no + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + # According to Tom Tromey, Ian Lance Taylor reported there are C compilers + # that will create temporary files in the current directory regardless of + # the output directory. Thus, making CWD read-only will cause this test + # to fail, enabling locking or at least warning the user not to do parallel + # builds. + chmod -w . + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:15540: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:15544: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test ! -s out/conftest.err; then + lt_cv_prog_compiler_c_o_GCJ=yes + fi + fi + chmod u+w . + $rm conftest* out/* + rmdir out + cd .. + rmdir conftest + $rm conftest* + +fi +echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6 + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + +echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 + + runpath_var= + allow_undefined_flag_GCJ= + enable_shared_with_static_runtimes_GCJ=no + archive_cmds_GCJ= + archive_expsym_cmds_GCJ= + old_archive_From_new_cmds_GCJ= + old_archive_from_expsyms_cmds_GCJ= + export_dynamic_flag_spec_GCJ= + whole_archive_flag_spec_GCJ= + thread_safe_flag_spec_GCJ= + hardcode_libdir_flag_spec_GCJ= + hardcode_libdir_flag_spec_ld_GCJ= + hardcode_libdir_separator_GCJ= + hardcode_direct_GCJ=no + hardcode_minus_L_GCJ=no + hardcode_shlibpath_var_GCJ=unsupported + link_all_deplibs_GCJ=unknown + hardcode_automatic_GCJ=no + module_cmds_GCJ= + module_expsym_cmds_GCJ= + always_export_symbols_GCJ=no + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms_GCJ= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + ld_shlibs_GCJ=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_GCJ=no + cat <&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +EOF + fi + ;; + + amigaos*) + archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_minus_L_GCJ=yes + + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can't use + # them. + ld_shlibs_GCJ=no + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_GCJ=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_GCJ='-L$libdir' + allow_undefined_flag_GCJ=unsupported + always_export_symbols_GCJ=no + enable_shared_with_static_runtimes_GCJ=yes + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + else + ld_shlibs=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris* | sysv5*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs_GCJ=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + + sunos4*) + archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + esac + + if test "$ld_shlibs_GCJ" = yes; then + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_GCJ= + fi + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag_GCJ=unsupported + always_export_symbols_GCJ=yes + archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L_GCJ=yes + if test "$GCC" = yes && test -z "$link_static_flag"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct_GCJ=unsupported + fi + ;; + + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_GCJ='' + hardcode_direct_GCJ=yes + hardcode_libdir_separator_GCJ=':' + link_all_deplibs_GCJ=yes + + if test "$GCC" = yes; then + case $host_os in aix4.012|aix4.012.*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct_GCJ=yes + else + # We have old collect2 + hardcode_direct_GCJ=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_GCJ=yes + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_libdir_separator_GCJ= + fi + esac + shared_flag='-shared' + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_GCJ=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_GCJ='-berok' + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_GCJ="-z nodefs" + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_GCJ=' ${wl}-bernotok' + allow_undefined_flag_GCJ=' ${wl}-berok' + # -bexpall does not export symbols beginning with underscore (_) + always_export_symbols_GCJ=yes + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_GCJ=' ' + archive_cmds_need_lc_GCJ=yes + # This is similar to how AIX traditionally builds it's shared libraries. + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_minus_L_GCJ=yes + # see comment about different semantics on the GNU ld section + ld_shlibs_GCJ=no + ;; + + bsdi4*) + export_dynamic_flag_spec_GCJ=-rdynamic + ;; + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_GCJ=' ' + allow_undefined_flag_GCJ=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds_GCJ='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_GCJ=yes + ;; + + darwin* | rhapsody*) + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + archive_cmds_need_lc_GCJ=no + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag_GCJ='-undefined suppress' + ;; + *) # Darwin 1.3 on + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + ;; + esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_GCJ='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + hardcode_direct_GCJ=no + hardcode_automatic_GCJ=yes + hardcode_shlibpath_var_GCJ=unsupported + whole_archive_flag_spec_GCJ='-all_load $convenience' + link_all_deplibs_GCJ=yes + fi + ;; + + dgux*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_shlibpath_var_GCJ=no + ;; + + freebsd1*) + ld_shlibs_GCJ=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=yes + hardcode_minus_L_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + hardcode_direct_GCJ=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + ;; + + hpux10* | hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case "$host_cpu" in + hppa*64*|ia64*) + archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + ;; + *) + archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' + hardcode_libdir_separator_GCJ=: + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + ;; + ia64*) + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + ;; + *) + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' + fi + hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + link_all_deplibs_GCJ=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + newsos6) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=yes + hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + hardcode_shlibpath_var_GCJ=no + ;; + + openbsd*) + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + ;; + *) + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + + os2*) + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_minus_L_GCJ=yes + allow_undefined_flag_GCJ=unsupported + archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag_GCJ=' -expect_unresolved \*' + archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + fi + hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag_GCJ=' -expect_unresolved \*' + archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec_GCJ='-rpath $libdir' + fi + hardcode_libdir_separator_GCJ=: + ;; + + sco3.2v5*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_GCJ=no + export_dynamic_flag_spec_GCJ='${wl}-Bexport' + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ;; + + solaris*) + no_undefined_flag_GCJ=' -z text' + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else + archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + fi + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_shlibpath_var_GCJ=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; + esac + link_all_deplibs_GCJ=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_direct_GCJ=yes + hardcode_minus_L_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds_GCJ='$CC -r -o $output$reload_objs' + hardcode_direct_GCJ=no + ;; + motorola) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_GCJ=no + ;; + + sysv4.3*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_GCJ=no + export_dynamic_flag_spec_GCJ='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_GCJ=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs_GCJ=yes + fi + ;; + + sysv4.2uw2*) + archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=yes + hardcode_minus_L_GCJ=no + hardcode_shlibpath_var_GCJ=no + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH + ;; + + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + no_undefined_flag_GCJ='${wl}-z ${wl}text' + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_GCJ=no + ;; + + sysv5*) + no_undefined_flag_GCJ=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + hardcode_libdir_flag_spec_GCJ= + hardcode_shlibpath_var_GCJ=no + runpath_var='LD_RUN_PATH' + ;; + + uts4*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_shlibpath_var_GCJ=no + ;; + + *) + ld_shlibs_GCJ=no + ;; + esac + fi + +echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6 +test "$ld_shlibs_GCJ" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_GCJ" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_GCJ=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_GCJ in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_GCJ + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ + allow_undefined_flag_GCJ= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_GCJ=no + else + archive_cmds_need_lc_GCJ=yes + fi + allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 + ;; + esac + fi + ;; +esac + +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var GCJ" || \ + test "X$hardcode_automatic_GCJ"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6 + +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # sanitize + new_sys_lib_search_path_spec= + for d in $sys_lib_search_path_spec ; do + # check if exists + if test -d $d -a -x $d ; then + # normalize + new_d=$(cd $d ; pwd) + # uniq + if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then + new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d " + fi + fi + done + # compress spaces + sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi4*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32*) + version_type=windows + shrext=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd1*) + dynamic_linker=no + ;; + +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.01* | freebsdelf3.01*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + *) # from 3.2 on + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case "$host_cpu" in + ia64*) + shrext='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +openbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6 +test "$dynamic_linker" = no && can_build_shared=no + +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case declares shl_load. + For example, HP-UX 11i declares gettimeofday. */ +#define shl_load innocuous_shl_load + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef shl_load + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != shl_load; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_shl_load=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" +else + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +int +main () +{ +shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_shl_load=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +else + echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case declares dlopen. + For example, HP-UX 11i declares gettimeofday. */ +#define dlopen innocuous_dlopen + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef dlopen + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != dlopen; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" +else + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_svld_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_svld_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dld_link (); +int +main () +{ +dld_link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_dld_link=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dld_dld_link=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6 + + if test "x$lt_cv_dlopen_self" = xyes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_GCJ \ + CC_GCJ \ + LD_GCJ \ + lt_prog_compiler_wl_GCJ \ + lt_prog_compiler_pic_GCJ \ + lt_prog_compiler_static_GCJ \ + lt_prog_compiler_no_builtin_flag_GCJ \ + export_dynamic_flag_spec_GCJ \ + thread_safe_flag_spec_GCJ \ + whole_archive_flag_spec_GCJ \ + enable_shared_with_static_runtimes_GCJ \ + old_archive_cmds_GCJ \ + old_archive_from_new_cmds_GCJ \ + predep_objects_GCJ \ + postdep_objects_GCJ \ + predeps_GCJ \ + postdeps_GCJ \ + compiler_lib_search_path_GCJ \ + archive_cmds_GCJ \ + archive_expsym_cmds_GCJ \ + postinstall_cmds_GCJ \ + postuninstall_cmds_GCJ \ + old_archive_from_expsyms_cmds_GCJ \ + allow_undefined_flag_GCJ \ + no_undefined_flag_GCJ \ + export_symbols_cmds_GCJ \ + hardcode_libdir_flag_spec_GCJ \ + hardcode_libdir_flag_spec_ld_GCJ \ + hardcode_libdir_separator_GCJ \ + hardcode_automatic_GCJ \ + module_cmds_GCJ \ + module_expsym_cmds_GCJ \ + lt_cv_prog_compiler_c_o_GCJ \ + exclude_expsyms_GCJ \ + include_expsyms_GCJ; do + + case $var in + old_archive_cmds_GCJ | \ + old_archive_from_new_cmds_GCJ | \ + archive_cmds_GCJ | \ + archive_expsym_cmds_GCJ | \ + module_cmds_GCJ | \ + module_expsym_cmds_GCJ | \ + old_archive_from_expsyms_cmds_GCJ | \ + export_symbols_cmds_GCJ | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac + +cfgfile="$ofile" + + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_GCJ + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# A language-specific compiler. +CC=$lt_compiler_GCJ + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_GCJ + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_LD_GCJ + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_GCJ + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext='$shrext' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_GCJ +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ + +# Must we lock files when doing compilation ? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_GCJ + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_GCJ +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_GCJ +archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_GCJ +module_expsym_cmds=$lt_module_expsym_cmds_GCJ + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_GCJ + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_GCJ + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_GCJ + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_GCJ + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_GCJ + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_GCJ + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_GCJ + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct_GCJ + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L_GCJ + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_GCJ + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_GCJ + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path_GCJ" + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_GCJ + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_GCJ + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_GCJ + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_GCJ + +# ### END LIBTOOL TAG CONFIG: $tagname + +__EOF__ + + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + test -f Makefile && make "$ltmain" +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + else + tagname="" + fi + ;; + + RC) + + + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +objext_RC=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' + +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +CC=${RC-"windres"} +compiler=$CC +compiler_RC=$CC +lt_cv_prog_compiler_c_o_RC=yes + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_RC \ + CC_RC \ + LD_RC \ + lt_prog_compiler_wl_RC \ + lt_prog_compiler_pic_RC \ + lt_prog_compiler_static_RC \ + lt_prog_compiler_no_builtin_flag_RC \ + export_dynamic_flag_spec_RC \ + thread_safe_flag_spec_RC \ + whole_archive_flag_spec_RC \ + enable_shared_with_static_runtimes_RC \ + old_archive_cmds_RC \ + old_archive_from_new_cmds_RC \ + predep_objects_RC \ + postdep_objects_RC \ + predeps_RC \ + postdeps_RC \ + compiler_lib_search_path_RC \ + archive_cmds_RC \ + archive_expsym_cmds_RC \ + postinstall_cmds_RC \ + postuninstall_cmds_RC \ + old_archive_from_expsyms_cmds_RC \ + allow_undefined_flag_RC \ + no_undefined_flag_RC \ + export_symbols_cmds_RC \ + hardcode_libdir_flag_spec_RC \ + hardcode_libdir_flag_spec_ld_RC \ + hardcode_libdir_separator_RC \ + hardcode_automatic_RC \ + module_cmds_RC \ + module_expsym_cmds_RC \ + lt_cv_prog_compiler_c_o_RC \ + exclude_expsyms_RC \ + include_expsyms_RC; do + + case $var in + old_archive_cmds_RC | \ + old_archive_from_new_cmds_RC | \ + archive_cmds_RC | \ + archive_expsym_cmds_RC | \ + module_cmds_RC | \ + module_expsym_cmds_RC | \ + old_archive_from_expsyms_cmds_RC | \ + export_symbols_cmds_RC | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac + +cfgfile="$ofile" + + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_RC + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# A language-specific compiler. +CC=$lt_compiler_RC + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_RC + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_LD_RC + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_RC + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext='$shrext' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_RC +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC + +# Must we lock files when doing compilation ? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_RC + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_RC +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_RC +archive_expsym_cmds=$lt_archive_expsym_cmds_RC +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_RC +module_expsym_cmds=$lt_module_expsym_cmds_RC + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_RC + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_RC + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_RC + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_RC + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_RC + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_RC + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_RC + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_RC + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct_RC + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L_RC + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_RC + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_RC + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_RC + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path_RC" + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_RC + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_RC + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_RC + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_RC + +# ### END LIBTOOL TAG CONFIG: $tagname + +__EOF__ + + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + test -f Makefile && make "$ltmain" +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + ;; + + *) + { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 +echo "$as_me: error: Unsupported tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + # Append the new tag name to the list of available tags. + if test -n "$tagname" ; then + available_tags="$available_tags $tagname" + fi + fi + done + IFS="$lt_save_ifs" + + # Now substitute the updated list of available tags. + if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then + mv "${ofile}T" "$ofile" + chmod +x "$ofile" + else + rm -f "${ofile}T" + { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 +echo "$as_me: error: unable to update list of available tagged configurations." >&2;} + { (exit 1); exit 1; }; } + fi +fi + + + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' + +# Prevent multiple expansion + + + + + + + + + + + + + + + + + + + + + + + + + + + +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include <$ac_hdr> + +int +main () +{ +if ((DIR *) 0) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +_ACEOF + +ac_header_dirent=$ac_hdr; break +fi + +done +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +if test $ac_header_dirent = dirent.h; then + echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 +if test "${ac_cv_search_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_opendir=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_opendir" = no; then + for ac_lib in dir; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6 +if test "$ac_cv_search_opendir" != no; then + test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + +fi + +else + echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 +if test "${ac_cv_search_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_opendir=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_opendir" = no; then + for ac_lib in x; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6 +if test "$ac_cv_search_opendir" != no; then + test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + +fi + +fi + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 +if test "${ac_cv_header_sys_wait_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#ifndef WEXITSTATUS +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +#endif +#ifndef WIFEXITED +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif + +int +main () +{ + int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_sys_wait_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_sys_wait_h=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 +if test $ac_cv_header_sys_wait_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SYS_WAIT_H 1 +_ACEOF + +fi + + + + + + + + + + + + + + + + + + + + + + + +for ac_header in errno.h fcntl.h limits.h unistd.h sys/time.h utmp.h utmpx.h \ + termios.h termio.h sgtty.h sys/ioctl.h syslog.h paths.h \ + utime.h ulimit.h sys/resource.h gshadow.h shadow.h lastlog.h \ + locale.h rpc/key_prot.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + + + + + + + + + + + + + + + + + + + + + +for ac_func in a64l fchmod fchown fsync getgroups gethostname getspnam \ + gettimeofday getusershell getutent initgroups lchown lckpwdf lstat \ + memcpy memset mkstemp setgroups sigaction strchr updwtmp updwtmpx +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + +echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7526 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -7581,48 +19516,52 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7584: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7587: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7590: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7593: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7603: result: $ac_cv_c_const" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define const -EOF +_ACEOF fi -echo "$as_me:7613: checking for uid_t in sys/types.h" >&5 +echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 if test "${ac_cv_type_uid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7619 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "uid_t" >/dev/null 2>&1; then + $EGREP "uid_t" >/dev/null 2>&1; then ac_cv_type_uid_t=yes else ac_cv_type_uid_t=no @@ -7630,75 +19569,32 @@ fi rm -f conftest* fi -echo "$as_me:7633: result: $ac_cv_type_uid_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 echo "${ECHO_T}$ac_cv_type_uid_t" >&6 if test $ac_cv_type_uid_t = no; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define uid_t int -EOF - -cat >>confdefs.h <<\EOF -#define gid_t int -EOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7653: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 7659 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7665: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7668: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7671: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7674: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:7684: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\_ACEOF +#define gid_t int +_ACEOF fi -done -echo "$as_me:7694: checking for off_t" >&5 +echo "$as_me:$LINENO: checking for off_t" >&5 echo $ECHO_N "checking for off_t... $ECHO_C" >&6 if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7700 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -7712,45 +19608,49 @@ if (sizeof (off_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7715: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7718: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7721: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7724: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_off_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_off_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7734: result: $ac_cv_type_off_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 if test $ac_cv_type_off_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define off_t long -EOF +_ACEOF fi -echo "$as_me:7746: checking for pid_t" >&5 +echo "$as_me:$LINENO: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7752 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -7764,45 +19664,49 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7767: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7770: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7773: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7776: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7786: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test $ac_cv_type_pid_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define pid_t int -EOF +_ACEOF fi -echo "$as_me:7798: checking for mode_t" >&5 +echo "$as_me:$LINENO: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7804 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -7816,98 +19720,49 @@ if (sizeof (mode_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7819: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7822: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7825: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7828: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_mode_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_mode_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7838: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 echo "${ECHO_T}$ac_cv_type_mode_t" >&6 if test $ac_cv_type_mode_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define mode_t int -EOF - -fi - -echo "$as_me:7850: checking for struct stat.st_rdev" >&5 -echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6 -if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 7856 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -static struct stat ac_aggr; -if (ac_aggr.st_rdev) -return 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7870: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7873: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7876: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7879: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_member_struct_stat_st_rdev=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_member_struct_stat_st_rdev=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:7889: result: $ac_cv_member_struct_stat_st_rdev" >&5 -echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6 -if test $ac_cv_member_struct_stat_st_rdev = yes; then - -cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_ST_RDEV 1 -EOF fi -echo "$as_me:7903: checking whether stat file-mode macros are broken" >&5 +echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 if test "${ac_cv_header_stat_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7909 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include @@ -7937,7 +19792,7 @@ You lose. _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "You lose" >/dev/null 2>&1; then + $EGREP "You lose" >/dev/null 2>&1; then ac_cv_header_stat_broken=yes else ac_cv_header_stat_broken=no @@ -7945,24 +19800,117 @@ fi rm -f conftest* fi -echo "$as_me:7948: result: $ac_cv_header_stat_broken" >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6 if test $ac_cv_header_stat_broken = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define STAT_MACROS_BROKEN 1 -EOF +_ACEOF fi -echo "$as_me:7958: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5 +echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6 +if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static struct stat ac_aggr; +if (ac_aggr.st_rdev) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_stat_st_rdev=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static struct stat ac_aggr; +if (sizeof ac_aggr.st_rdev) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_stat_st_rdev=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_stat_st_rdev=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6 +if test $ac_cv_member_struct_stat_st_rdev = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_RDEV 1 +_ACEOF + + +fi + +echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7964 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #include @@ -7977,43 +19925,47 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7980: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7983: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7986: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7989: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7999: result: $ac_cv_header_time" >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define TIME_WITH_SYS_TIME 1 -EOF +_ACEOF fi -echo "$as_me:8009: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 if test "${ac_cv_struct_tm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8015 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include @@ -8026,322 +19978,204 @@ struct tm *tp; tp->tm_sec; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8029: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8032: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8035: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8038: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_struct_tm=time.h else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_struct_tm=sys/time.h fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8048: result: $ac_cv_struct_tm" >&5 +echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 echo "${ECHO_T}$ac_cv_struct_tm" >&6 if test $ac_cv_struct_tm = sys/time.h; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define TM_IN_SYS_TIME 1 -EOF - -fi - -echo "$as_me:8058: checking for pw_age in struct passwd" >&5 -echo $ECHO_N "checking for pw_age in struct passwd... $ECHO_C" >&6 -if test "${ac_cv_struct_passwd_pw_age+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 8064 "configure" -#include "confdefs.h" -#include -int -main () -{ - struct passwd pw; pw.pw_age = ""; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8076: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8079: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8082: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8085: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_struct_passwd_pw_age=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_struct_passwd_pw_age=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:8095: result: $ac_cv_struct_passwd_pw_age" >&5 -echo "${ECHO_T}$ac_cv_struct_passwd_pw_age" >&6 - -if test "$ac_cv_struct_passwd_pw_age" = "yes"; then - cat >>confdefs.h <<\EOF -#define ATT_AGE 1 -EOF fi -echo "$as_me:8105: checking for pw_comment in struct passwd" >&5 -echo $ECHO_N "checking for pw_comment in struct passwd... $ECHO_C" >&6 -if test "${ac_cv_struct_passwd_pw_comment+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 8111 "configure" -#include "confdefs.h" -#include -int -main () -{ - struct passwd pw; pw.pw_comment = ""; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8123: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8126: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8129: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8132: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_struct_passwd_pw_comment=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_struct_passwd_pw_comment=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:8142: result: $ac_cv_struct_passwd_pw_comment" >&5 -echo "${ECHO_T}$ac_cv_struct_passwd_pw_comment" >&6 - -if test "$ac_cv_struct_passwd_pw_comment" = "yes"; then - cat >>confdefs.h <<\EOF -#define ATT_COMMENT 1 -EOF - -fi - -echo "$as_me:8152: checking for pw_quota in struct passwd" >&5 -echo $ECHO_N "checking for pw_quota in struct passwd... $ECHO_C" >&6 -if test "${ac_cv_struct_passwd_pw_quota+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 8158 "configure" -#include "confdefs.h" -#include -int -main () -{ - struct passwd pw; pw.pw_quota = 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8173: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8176: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8179: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_struct_passwd_pw_quota=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_struct_passwd_pw_quota=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:8189: result: $ac_cv_struct_passwd_pw_quota" >&5 -echo "${ECHO_T}$ac_cv_struct_passwd_pw_quota" >&6 - -if test "$ac_cv_struct_passwd_pw_quota" = "yes"; then - cat >>confdefs.h <<\EOF -#define BSD_QUOTA 1 -EOF - -fi if test "$ac_cv_header_utmp_h" = "yes"; then - echo "$as_me:8200: checking for ut_host in struct utmp" >&5 + echo "$as_me:$LINENO: checking for ut_host in struct utmp" >&5 echo $ECHO_N "checking for ut_host in struct utmp... $ECHO_C" >&6 if test "${ac_cv_struct_utmp_ut_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8206 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include int main () { - struct utmp ut; char *cp = ut.ut_host; +struct utmp ut; char *cp = ut.ut_host; + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8218: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8221: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8224: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8227: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_struct_utmp_ut_host=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_struct_utmp_ut_host=no + fi rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:8237: result: $ac_cv_struct_utmp_ut_host" >&5 +echo "$as_me:$LINENO: result: $ac_cv_struct_utmp_ut_host" >&5 echo "${ECHO_T}$ac_cv_struct_utmp_ut_host" >&6 if test "$ac_cv_struct_utmp_ut_host" = "yes"; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define UT_HOST 1 -EOF +_ACEOF fi - echo "$as_me:8247: checking for ut_user in struct utmp" >&5 + echo "$as_me:$LINENO: checking for ut_user in struct utmp" >&5 echo $ECHO_N "checking for ut_user in struct utmp... $ECHO_C" >&6 if test "${ac_cv_struct_utmp_ut_user+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8253 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include int main () { - struct utmp ut; char *cp = ut.ut_user; +struct utmp ut; char *cp = ut.ut_user; + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8265: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8268: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8271: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8274: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_struct_utmp_ut_user=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_struct_utmp_ut_user=no + fi rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:8284: result: $ac_cv_struct_utmp_ut_user" >&5 +echo "$as_me:$LINENO: result: $ac_cv_struct_utmp_ut_user" >&5 echo "${ECHO_T}$ac_cv_struct_utmp_ut_user" >&6 if test "$ac_cv_struct_utmp_ut_user" = "no"; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define ut_user ut_name -EOF +_ACEOF fi fi if test "$ac_cv_header_lastlog_h" = "yes"; then - echo "$as_me:8296: checking for ll_host in struct lastlog" >&5 + echo "$as_me:$LINENO: checking for ll_host in struct lastlog" >&5 echo $ECHO_N "checking for ll_host in struct lastlog... $ECHO_C" >&6 if test "${ac_cv_struct_lastlog_ll_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8302 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include int main () { - struct lastlog ll; char *cp = ll.ll_host; +struct lastlog ll; char *cp = ll.ll_host; + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8314: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8317: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8320: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8323: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_struct_lastlog_ll_host=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_struct_lastlog_ll_host=no + fi rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:8333: result: $ac_cv_struct_lastlog_ll_host" >&5 +echo "$as_me:$LINENO: result: $ac_cv_struct_lastlog_ll_host" >&5 echo "${ECHO_T}$ac_cv_struct_lastlog_ll_host" >&6 if test "$ac_cv_struct_lastlog_ll_host" = "yes"; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_LL_HOST 1 -EOF +_ACEOF fi fi -echo "$as_me:8344: checking type of array argument to getgroups" >&5 +echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6 if test "${ac_cv_type_getgroups+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8350,8 +20184,11 @@ else ac_cv_type_getgroups=cross else cat >conftest.$ac_ext <<_ACEOF -#line 8353 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Thanks to Mike Rendell for this test. */ #include #define NGID 256 @@ -8369,41 +20206,46 @@ main () for (i = 0; i < NGID; i++) gidset[i] = val.gval; n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1, - gidset); + gidset); /* Exit non-zero if getgroups seems to require an array of ints. This happens when gid_t is short but getgroups modifies an array of ints. */ exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8379: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8382: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8384: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8387: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_getgroups=gid_t else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_type_getgroups=int fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_type_getgroups = cross; then cat >conftest.$ac_ext <<_ACEOF -#line 8400 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "getgroups.*int.*gid_t" >/dev/null 2>&1; then + $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then ac_cv_type_getgroups=gid_t else ac_cv_type_getgroups=int @@ -8412,64 +20254,75 @@ rm -f conftest* fi fi -echo "$as_me:8415: result: $ac_cv_type_getgroups" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5 echo "${ECHO_T}$ac_cv_type_getgroups" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define GETGROUPS_T $ac_cv_type_getgroups -EOF +_ACEOF + if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:8423: checking whether $CC needs -traditional" >&5 + echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >conftest.$ac_ext <<_ACEOF -#line 8430 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include Autoconf TIOCGETP _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes else ac_cv_prog_gcc_traditional=no fi rm -f conftest* + if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF -#line 8445 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include Autoconf TCGETA _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi rm -f conftest* fi fi -echo "$as_me:8458: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:8465: checking return type of signal handlers" >&5 +echo "$as_me:$LINENO: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8471 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #ifdef signal @@ -8490,33 +20343,35 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8493: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8496: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8499: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8502: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8512: result: $ac_cv_type_signal" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -EOF +_ACEOF -echo "$as_me:8519: checking whether utime accepts a null argument" >&5 + +echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5 echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6 if test "${ac_cv_func_utime_null+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8527,124 +20382,151 @@ if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else cat >conftest.$ac_ext <<_ACEOF -#line 8530 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () { struct stat s, t; exit (!(stat ("conftest.data", &s) == 0 - && utime ("conftest.data", (long *)0) == 0 - && stat ("conftest.data", &t) == 0 - && t.st_mtime >= s.st_mtime - && t.st_mtime - s.st_mtime < 120)); + && utime ("conftest.data", (long *)0) == 0 + && stat ("conftest.data", &t) == 0 + && t.st_mtime >= s.st_mtime + && t.st_mtime - s.st_mtime < 120)); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8547: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8550: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8552: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8555: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_utime_null=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_func_utime_null=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core core.* *.core fi -echo "$as_me:8568: result: $ac_cv_func_utime_null" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5 echo "${ECHO_T}$ac_cv_func_utime_null" >&6 if test $ac_cv_func_utime_null = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_UTIME_NULL 1 -EOF +_ACEOF fi rm -f conftest.data + for ac_func in strftime do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8582: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8588 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8619: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8622: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8625: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8628: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8638: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else # strftime is in -lintl on SCO UNIX. -echo "$as_me:8647: checking for strftime in -lintl" >&5 +echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_strftime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8652,8 +20534,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8655 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -8671,32 +20556,33 @@ strftime (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8674: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8677: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8680: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8683: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_intl_strftime=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_intl_strftime=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8694: result: $ac_cv_lib_intl_strftime" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6 if test $ac_cv_lib_intl_strftime = yes; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_STRFTIME 1 -EOF +_ACEOF LIBS="-lintl $LIBS" fi @@ -8704,291 +20590,396 @@ fi fi done + + + + + + for ac_func in mkdir putgrent putpwent putspent rename rmdir do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8710: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8716 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8747: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8750: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8753: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8756: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8766: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else LIBOBJS="$LIBOBJS $ac_func.$ac_objext" fi done + + + + for ac_func in sgetgrent sgetpwent sgetspent do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8781: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8787 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8818: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8821: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8824: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8827: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8837: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else LIBOBJS="$LIBOBJS $ac_func.$ac_objext" fi done + + + + + + for ac_func in snprintf strcasecmp strdup strerror strstr do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8852: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8858 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8889: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8892: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8895: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8898: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8908: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else LIBOBJS="$LIBOBJS $ac_func.$ac_objext" fi done -echo "$as_me:8920: checking for setpgrp" >&5 + + +echo "$as_me:$LINENO: checking for setpgrp" >&5 echo $ECHO_N "checking for setpgrp... $ECHO_C" >&6 if test "${ac_cv_func_setpgrp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8926 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define setpgrp to an innocuous variant, in case declares setpgrp. + For example, HP-UX 11i declares gettimeofday. */ +#define setpgrp innocuous_setpgrp + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setpgrp (); below. */ -#include + which can conflict with char setpgrp (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef setpgrp + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setpgrp (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_setpgrp) || defined (__stub___setpgrp) choke me #else -f = setpgrp; +char (*f) () = setpgrp; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != setpgrp; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8957: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8960: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8963: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8966: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setpgrp=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_setpgrp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8976: result: $ac_cv_func_setpgrp" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp" >&5 echo "${ECHO_T}$ac_cv_func_setpgrp" >&6 -echo "$as_me:8979: checking whether setpgrp takes no argument" >&5 +echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5 echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6 if test "${ac_cv_func_setpgrp_void+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { { echo "$as_me:8985: error: cannot check setpgrp if cross compiling" >&5 -echo "$as_me: error: cannot check setpgrp if cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5 +echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 8990 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #if HAVE_UNISTD_H # include #endif @@ -8996,208 +20987,221 @@ else int main () { -/* If this system has a BSD-style setpgrp, which takes arguments, exit - successfully. */ - exit (setpgrp (1,1) == -1); +/* If this system has a BSD-style setpgrp which takes arguments, + setpgrp(1, 1) will fail with ESRCH and return -1, in that case + exit successfully. */ + exit (setpgrp (1,1) == -1 ? 0 : 1); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9007: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9010: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9012: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9015: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setpgrp_void=no else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_func_setpgrp_void=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:9027: result: $ac_cv_func_setpgrp_void" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5 echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6 if test $ac_cv_func_setpgrp_void = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define SETPGRP_VOID 1 -EOF +_ACEOF fi + if test "$ac_cv_header_shadow_h" = "yes"; then -echo "$as_me:9038: checking for working shadow group support" >&5 +echo "$as_me:$LINENO: checking for working shadow group support" >&5 echo $ECHO_N "checking for working shadow group support... $ECHO_C" >&6 if test "${ac_cv_libc_shadowgrp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then ac_cv_libc_shadowgrp=no + else cat >conftest.$ac_ext <<_ACEOF -#line 9047 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#include -main() -{ - struct sgrp *sg = sgetsgent("test:x::"); - /* NYS libc on Red Hat 3.0.3 has broken shadow group support */ - return !sg || !sg->sg_adm || !sg->sg_mem; -} + #include + main() + { + struct sgrp *sg = sgetsgent("test:x::"); + /* NYS libc on Red Hat 3.0.3 has broken shadow group support */ + return !sg || !sg->sg_adm || !sg->sg_mem; + } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9060: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9063: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9065: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9068: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_libc_shadowgrp=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_libc_shadowgrp=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + fi -echo "$as_me:9080: result: $ac_cv_libc_shadowgrp" >&5 +echo "$as_me:$LINENO: result: $ac_cv_libc_shadowgrp" >&5 echo "${ECHO_T}$ac_cv_libc_shadowgrp" >&6 if test "$ac_cv_libc_shadowgrp" = "yes"; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SHADOWGRP 1 -EOF +_ACEOF fi fi -echo "$as_me:9091: checking location of shared mail directory" >&5 +echo "$as_me:$LINENO: checking location of shared mail directory" >&5 echo $ECHO_N "checking location of shared mail directory... $ECHO_C" >&6 -for maildir in /var/spool/mail /var/mail /usr/spool/mail /usr/mail NONE; do +for maildir in /var/mail /var/spool/mail /usr/spool/mail /usr/mail NONE; do if test "$maildir" = "NONE"; then - echo "$as_me:9095: result: None" >&5 + echo "$as_me:$LINENO: result: None" >&5 echo "${ECHO_T}None" >&6 elif test -d $maildir; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define MAIL_SPOOL_DIR "$maildir" -EOF +_ACEOF - echo "$as_me:9102: result: $maildir" >&5 + echo "$as_me:$LINENO: result: $maildir" >&5 echo "${ECHO_T}$maildir" >&6 break fi done -echo "$as_me:9108: checking location of user mail file" >&5 +echo "$as_me:$LINENO: checking location of user mail file" >&5 echo $ECHO_N "checking location of user mail file... $ECHO_C" >&6 for mailfile in Mailbox mailbox Mail mail .mail NONE; do if test "$mailfile" = "NONE"; then - echo "$as_me:9112: result: None" >&5 + echo "$as_me:$LINENO: result: None" >&5 echo "${ECHO_T}None" >&6 elif test -f $HOME/$mailfile; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define MAIL_SPOOL_FILE "$mailfile" -EOF +_ACEOF - echo "$as_me:9119: result: $mailfile" >&5 + echo "$as_me:$LINENO: result: $mailfile" >&5 echo "${ECHO_T}$mailfile" >&6 break fi done -echo "$as_me:9125: checking location of utmp" >&5 +echo "$as_me:$LINENO: checking location of utmp" >&5 echo $ECHO_N "checking location of utmp... $ECHO_C" >&6 for utmpdir in /var/run /var/adm /usr/adm /etc NONE; do if test "$utmpdir" = "NONE"; then - { echo "$as_me:9129: WARNING: utmp file not found" >&5 + { echo "$as_me:$LINENO: WARNING: utmp file not found" >&5 echo "$as_me: WARNING: utmp file not found" >&2;} elif test -f $utmpdir/utmp; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define _UTMP_FILE "$utmpdir/utmp" -EOF +_ACEOF - echo "$as_me:9136: result: $utmpdir" >&5 + echo "$as_me:$LINENO: result: $utmpdir" >&5 echo "${ECHO_T}$utmpdir" >&6 break fi done -echo "$as_me:9142: checking location of faillog/lastlog/wtmp" >&5 +echo "$as_me:$LINENO: checking location of faillog/lastlog/wtmp" >&5 echo $ECHO_N "checking location of faillog/lastlog/wtmp... $ECHO_C" >&6 for logdir in /var/log /var/adm /usr/adm /etc; do if test -d $logdir; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define _WTMP_FILE "$logdir/wtmp" -EOF +_ACEOF - cat >>confdefs.h <>confdefs.h <<_ACEOF #define LASTLOG_FILE "$logdir/lastlog" -EOF +_ACEOF - cat >>confdefs.h <>confdefs.h <<_ACEOF #define FAILLOG_FILE "$logdir/faillog" -EOF +_ACEOF - echo "$as_me:9158: result: $logdir" >&5 + echo "$as_me:$LINENO: result: $logdir" >&5 echo "${ECHO_T}$logdir" >&6 break fi done -echo "$as_me:9164: checking location of the passwd program" >&5 +echo "$as_me:$LINENO: checking location of the passwd program" >&5 echo $ECHO_N "checking location of the passwd program... $ECHO_C" >&6 if test -f /usr/bin/passwd; then passwd_dir=/usr/bin else passwd_dir=/bin fi -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PASSWD_PROGRAM "$passwd_dir/passwd" -EOF +_ACEOF -echo "$as_me:9175: result: $passwd_dir" >&5 +echo "$as_me:$LINENO: result: $passwd_dir" >&5 echo "${ECHO_T}$passwd_dir" >&6 -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define SHADOWPWD 1 -EOF +_ACEOF -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define USG 1 -EOF +_ACEOF -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define USE_SYSLOG 1 -EOF +_ACEOF -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define RLOGIN 1 -EOF +_ACEOF -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define RUSEROK 0 -EOF +_ACEOF -cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define getpass libshadow_getpass -EOF +_ACEOF + # Check whether --enable-desrpc or --disable-desrpc was given. if test "${enable_desrpc+set}" = set; then @@ -9210,6 +21214,7 @@ if test "${enable_shadowgrp+set}" = set; then fi; + # Check whether --with-libcrack or --without-libcrack was given. if test "${with_libcrack+set}" = set; then withval="$with_libcrack" @@ -9240,75 +21245,91 @@ if test "${with_libskey+set}" = set; then fi; -# Check whether --with-libtcfs or --without-libtcfs was given. -if test "${with_libtcfs+set}" = set; then - withval="$with_libtcfs" -fi; - -echo "$as_me:9249: checking for inet_ntoa" >&5 +echo "$as_me:$LINENO: checking for inet_ntoa" >&5 echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6 if test "${ac_cv_func_inet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9255 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define inet_ntoa to an innocuous variant, in case declares inet_ntoa. + For example, HP-UX 11i declares gettimeofday. */ +#define inet_ntoa innocuous_inet_ntoa + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char inet_ntoa (); below. */ -#include + which can conflict with char inet_ntoa (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef inet_ntoa + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char inet_ntoa (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa) choke me #else -f = inet_ntoa; +char (*f) () = inet_ntoa; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != inet_ntoa; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9286: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9289: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9292: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9295: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_inet_ntoa=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_inet_ntoa=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9305: result: $ac_cv_func_inet_ntoa" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5 echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6 if test $ac_cv_func_inet_ntoa = yes; then : else -echo "$as_me:9311: checking for inet_ntoa in -linet" >&5 +echo "$as_me:$LINENO: checking for inet_ntoa in -linet" >&5 echo $ECHO_N "checking for inet_ntoa in -linet... $ECHO_C" >&6 if test "${ac_cv_lib_inet_inet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9316,8 +21337,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9319 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -9335,32 +21359,33 @@ inet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9338: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9341: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9344: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9347: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_inet_ntoa=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_inet_inet_ntoa=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9358: result: $ac_cv_lib_inet_inet_ntoa" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_inet_inet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_inet_inet_ntoa" >&6 if test $ac_cv_lib_inet_inet_ntoa = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_LIBINET 1 -EOF +_ACEOF LIBS="-linet $LIBS" @@ -9368,69 +21393,90 @@ fi fi -echo "$as_me:9371: checking for socket" >&5 +echo "$as_me:$LINENO: checking for socket" >&5 echo $ECHO_N "checking for socket... $ECHO_C" >&6 if test "${ac_cv_func_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9377 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define socket to an innocuous variant, in case declares socket. + For example, HP-UX 11i declares gettimeofday. */ +#define socket innocuous_socket + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char socket (); below. */ -#include + which can conflict with char socket (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef socket + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char socket (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_socket) || defined (__stub___socket) choke me #else -f = socket; +char (*f) () = socket; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != socket; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9408: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9411: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9414: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9417: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_socket=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_socket=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9427: result: $ac_cv_func_socket" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5 echo "${ECHO_T}$ac_cv_func_socket" >&6 if test $ac_cv_func_socket = yes; then : else -echo "$as_me:9433: checking for socket in -lsocket" >&5 +echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9438,8 +21484,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9441 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -9457,32 +21506,33 @@ socket (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9460: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9463: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9466: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9469: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_socket=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_socket_socket=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9480: result: $ac_cv_lib_socket_socket" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 if test $ac_cv_lib_socket_socket = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 -EOF +_ACEOF LIBS="-lsocket $LIBS" @@ -9490,69 +21540,90 @@ fi fi -echo "$as_me:9493: checking for gethostbyname" >&5 +echo "$as_me:$LINENO: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9499 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. + For example, HP-UX 11i declares gettimeofday. */ +#define gethostbyname innocuous_gethostbyname + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. */ -#include + which can conflict with char gethostbyname (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef gethostbyname + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) choke me #else -f = gethostbyname; +char (*f) () = gethostbyname; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != gethostbyname; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9530: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9533: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9536: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9539: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9549: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = yes; then : else -echo "$as_me:9555: checking for gethostbyname in -lnsl" >&5 +echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9560,8 +21631,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9563 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -9579,32 +21653,33 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9582: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9585: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9588: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9591: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_nsl_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9602: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 -EOF +_ACEOF LIBS="-lnsl $LIBS" @@ -9612,72 +21687,95 @@ fi fi + + if test "$enable_desrpc" != "no" -a "$ac_cv_header_rpc_key_prot_h" = "yes" ; then - echo "$as_me:9616: checking for getsecretkey" >&5 + echo "$as_me:$LINENO: checking for getsecretkey" >&5 echo $ECHO_N "checking for getsecretkey... $ECHO_C" >&6 if test "${ac_cv_func_getsecretkey+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9622 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define getsecretkey to an innocuous variant, in case declares getsecretkey. + For example, HP-UX 11i declares gettimeofday. */ +#define getsecretkey innocuous_getsecretkey + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getsecretkey (); below. */ -#include + which can conflict with char getsecretkey (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef getsecretkey + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getsecretkey (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_getsecretkey) || defined (__stub___getsecretkey) choke me #else -f = getsecretkey; +char (*f) () = getsecretkey; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != getsecretkey; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9653: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9656: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9659: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9662: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getsecretkey=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_getsecretkey=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9672: result: $ac_cv_func_getsecretkey" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_getsecretkey" >&5 echo "${ECHO_T}$ac_cv_func_getsecretkey" >&6 if test $ac_cv_func_getsecretkey = yes; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define DES_RPC 1 -EOF +_ACEOF else - echo "$as_me:9680: checking for getsecretkey in -lrpcsvc" >&5 + echo "$as_me:$LINENO: checking for getsecretkey in -lrpcsvc" >&5 echo $ECHO_N "checking for getsecretkey in -lrpcsvc... $ECHO_C" >&6 if test "${ac_cv_lib_rpcsvc_getsecretkey+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9685,8 +21783,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lrpcsvc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9688 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -9704,32 +21805,33 @@ getsecretkey (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9707: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9710: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9713: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9716: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_rpcsvc_getsecretkey=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_rpcsvc_getsecretkey=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9727: result: $ac_cv_lib_rpcsvc_getsecretkey" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_rpcsvc_getsecretkey" >&5 echo "${ECHO_T}$ac_cv_lib_rpcsvc_getsecretkey" >&6 if test $ac_cv_lib_rpcsvc_getsecretkey = yes; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define DES_RPC 1 -EOF +_ACEOF fi @@ -9738,14 +21840,15 @@ fi fi if test "$enable_shadowgrp" != "no"; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SHADOWGRP 1 -EOF +_ACEOF fi + if test "$with_libcrypt" != "no"; then - echo "$as_me:9748: checking for crypt in -lcrypt" >&5 + echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 if test "${ac_cv_lib_crypt_crypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9753,8 +21856,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9756 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -9772,40 +21878,42 @@ crypt (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9775: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9778: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9781: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9784: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_crypt_crypt=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_crypt_crypt=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9795: result: $ac_cv_lib_crypt_crypt" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 if test $ac_cv_lib_crypt_crypt = yes; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_LIBCRYPT 1 -EOF +_ACEOF LIBCRYPT=-lcrypt fi fi + if test "$with_libcrack" != "no"; then echo "checking cracklib flavour, don't be surprised by the results" - echo "$as_me:9808: checking for FascistCheck in -lcrack" >&5 + echo "$as_me:$LINENO: checking for FascistCheck in -lcrack" >&5 echo $ECHO_N "checking for FascistCheck in -lcrack... $ECHO_C" >&6 if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9813,8 +21921,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrack $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9816 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -9832,36 +21943,37 @@ FascistCheck (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9835: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9838: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9841: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9844: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_crack_FascistCheck=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_crack_FascistCheck=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9855: result: $ac_cv_lib_crack_FascistCheck" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_crack_FascistCheck" >&5 echo "${ECHO_T}$ac_cv_lib_crack_FascistCheck" >&6 if test $ac_cv_lib_crack_FascistCheck = yes; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_LIBCRACK 1 -EOF +_ACEOF LIBCRACK=-lcrack fi - echo "$as_me:9864: checking for FascistHistory in -lcrack" >&5 + echo "$as_me:$LINENO: checking for FascistHistory in -lcrack" >&5 echo $ECHO_N "checking for FascistHistory in -lcrack... $ECHO_C" >&6 if test "${ac_cv_lib_crack_FascistHistory+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9869,8 +21981,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrack $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9872 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -9888,36 +22003,37 @@ FascistHistory (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9891: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9894: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9897: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9900: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_crack_FascistHistory=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_crack_FascistHistory=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9911: result: $ac_cv_lib_crack_FascistHistory" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_crack_FascistHistory" >&5 echo "${ECHO_T}$ac_cv_lib_crack_FascistHistory" >&6 if test $ac_cv_lib_crack_FascistHistory = yes; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_LIBCRACK_HIST 1 -EOF +_ACEOF fi - echo "$as_me:9920: checking for FascistHistoryPw in -lcrack" >&5 + echo "$as_me:$LINENO: checking for FascistHistoryPw in -lcrack" >&5 echo $ECHO_N "checking for FascistHistoryPw in -lcrack... $ECHO_C" >&6 if test "${ac_cv_lib_crack_FascistHistoryPw+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9925,8 +22041,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrack $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9928 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -9944,39 +22063,42 @@ FascistHistoryPw (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9947: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9950: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9953: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9956: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_crack_FascistHistoryPw=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_crack_FascistHistoryPw=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9967: result: $ac_cv_lib_crack_FascistHistoryPw" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_crack_FascistHistoryPw" >&5 echo "${ECHO_T}$ac_cv_lib_crack_FascistHistoryPw" >&6 if test $ac_cv_lib_crack_FascistHistoryPw = yes; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_LIBCRACK_PW 1 -EOF +_ACEOF fi fi + + if test "$with_libskey" = "yes"; then - echo "$as_me:9979: checking for MD5Init in -lmd" >&5 + echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5 echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6 if test "${ac_cv_lib_md_MD5Init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9984,8 +22106,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9987 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -10003,33 +22128,34 @@ MD5Init (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10006: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10009: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10012: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10015: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_md_MD5Init=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_md_MD5Init=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10026: result: $ac_cv_lib_md_MD5Init" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5 echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6 if test $ac_cv_lib_md_MD5Init = yes; then LIBMD=-lmd fi - echo "$as_me:10032: checking for skeychallenge in -lskey" >&5 + echo "$as_me:$LINENO: checking for skeychallenge in -lskey" >&5 echo $ECHO_N "checking for skeychallenge in -lskey... $ECHO_C" >&6 if test "${ac_cv_lib_skey_skeychallenge+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10037,8 +22163,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lskey $LIBMD $LIBCRYPT $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10040 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -10056,37 +22185,38 @@ skeychallenge (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10059: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10062: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10065: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10068: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_skey_skeychallenge=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_skey_skeychallenge=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10079: result: $ac_cv_lib_skey_skeychallenge" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_skey_skeychallenge" >&5 echo "${ECHO_T}$ac_cv_lib_skey_skeychallenge" >&6 if test $ac_cv_lib_skey_skeychallenge = yes; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SKEY 1 -EOF +_ACEOF LIBSKEY=-lskey fi elif test "$with_libopie" = "yes"; then - echo "$as_me:10089: checking for opiechallenge in -lopie" >&5 + echo "$as_me:$LINENO: checking for opiechallenge in -lopie" >&5 echo $ECHO_N "checking for opiechallenge in -lopie... $ECHO_C" >&6 if test "${ac_cv_lib_opie_opiechallenge+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10094,8 +22224,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lopie $LIBCRYPT $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10097 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -10113,101 +22246,41 @@ opiechallenge (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10116: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10119: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10122: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10125: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_opie_opiechallenge=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_opie_opiechallenge=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10136: result: $ac_cv_lib_opie_opiechallenge" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_opie_opiechallenge" >&5 echo "${ECHO_T}$ac_cv_lib_opie_opiechallenge" >&6 if test $ac_cv_lib_opie_opiechallenge = yes; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define OPIE 1 -EOF +_ACEOF LIBSKEY=-lopie fi fi -if test "$with_libtcfs" = "yes"; then - echo "$as_me:10148: checking for tcfs_encrypt_key in -ltcfs" >&5 -echo $ECHO_N "checking for tcfs_encrypt_key in -ltcfs... $ECHO_C" >&6 -if test "${ac_cv_lib_tcfs_tcfs_encrypt_key+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltcfs -lgdbm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 10156 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tcfs_encrypt_key (); -int -main () -{ -tcfs_encrypt_key (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10175: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10178: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10181: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10184: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_tcfs_tcfs_encrypt_key=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_tcfs_tcfs_encrypt_key=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:10195: result: $ac_cv_lib_tcfs_tcfs_encrypt_key" >&5 -echo "${ECHO_T}$ac_cv_lib_tcfs_tcfs_encrypt_key" >&6 -if test $ac_cv_lib_tcfs_tcfs_encrypt_key = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_TCFS 1 -EOF - cat >>confdefs.h <<\EOF -#define TCFS_GDBM_SUPPORT 1 -EOF - LIBTCFS="-ltcfs -lgdbm" -fi - -fi if test "$with_libpam" = "yes"; then - echo "$as_me:10210: checking for pam_start in -lpam" >&5 + echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6 if test "${ac_cv_lib_pam_pam_start+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10215,8 +22288,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpam $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10218 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -10234,35 +22310,37 @@ pam_start (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10237: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10240: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10243: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10246: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pam_pam_start=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_pam_pam_start=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10257: result: $ac_cv_lib_pam_pam_start" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6 if test $ac_cv_lib_pam_pam_start = yes; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define USE_PAM 1 -EOF +_ACEOF LIBPAM="-lpam" - echo "$as_me:10265: checking for main in -lpam_misc" >&5 + echo "$as_me:$LINENO: checking for main in -lpam_misc" >&5 echo $ECHO_N "checking for main in -lpam_misc... $ECHO_C" >&6 if test "${ac_cv_lib_pam_misc_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10270,8 +22348,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpam_misc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10273 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + int main () @@ -10282,980 +22364,1041 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10285: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10288: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10291: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10294: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pam_misc_main=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_pam_misc_main=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10305: result: $ac_cv_lib_pam_misc_main" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_pam_misc_main" >&5 echo "${ECHO_T}$ac_cv_lib_pam_misc_main" >&6 if test $ac_cv_lib_pam_misc_main = yes; then LIBPAM="$LIBPAM -lpam_misc" else - { { echo "$as_me:10310: error: libpam_misc is missing" >&5 + { { echo "$as_me:$LINENO: error: libpam_misc is missing" >&5 echo "$as_me: error: libpam_misc is missing" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:10316: checking use login access checking if PAM not used" >&5 + echo "$as_me:$LINENO: checking use login access checking if PAM not used" >&5 echo $ECHO_N "checking use login access checking if PAM not used... $ECHO_C" >&6 - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define LOGIN_ACCESS 1 -EOF +_ACEOF - echo "$as_me:10322: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 fi - echo "$as_me:10327: checking use login and su access checking if PAM not used" >&5 + echo "$as_me:$LINENO: checking use login and su access checking if PAM not used" >&5 echo $ECHO_N "checking use login and su access checking if PAM not used... $ECHO_C" >&6 - echo "$as_me:10329: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 else - echo "$as_me:10332: checking use login and su access checking if PAM not used" >&5 + echo "$as_me:$LINENO: checking use login and su access checking if PAM not used" >&5 echo $ECHO_N "checking use login and su access checking if PAM not used... $ECHO_C" >&6 - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define LOGIN_ACCESS 1 -EOF +_ACEOF - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SU_ACCESS 1 -EOF +_ACEOF - echo "$as_me:10342: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 fi -ALL_LINGUAS="cs de el fr ja ko pl sv uk" -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:10350: checking for $ac_word" >&5 + + + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + + + + echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 + # Check whether --enable-nls or --disable-nls was given. +if test "${enable_nls+set}" = set; then + enableval="$enable_nls" + USE_NLS=$enableval +else + USE_NLS=yes +fi; + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 + + + + + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then +if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:10365: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:10373: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:10376: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:10385: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:10400: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:10409: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:10412: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -echo "$as_me:10421: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -#line 10429 "configure" -#include "confdefs.h" -#ifndef __cplusplus -static $ac_kw int static_foo () {return 0; } -$ac_kw int foo () {return 0; } -#endif - -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10438: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:10441: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10444: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10447: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done - -fi -echo "$as_me:10458: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 -case $ac_cv_c_inline in - inline | yes) ;; - no) -cat >>confdefs.h <<\EOF -#define inline -EOF - ;; - *) cat >>confdefs.h </dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + echo "$as_me:$LINENO: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -echo "$as_me:10473: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 10479 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10494: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:10497: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10500: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10503: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_size_t=yes + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT + +if test -n "$GMSGFMT"; then + echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_size_t=no + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -f conftest.$ac_objext conftest.$ac_ext + + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -echo "$as_me:10513: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XGETTEXT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case "$XGETTEXT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + rm -f messages.po + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSGMERGE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case "$MSGMERGE" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" + ;; +esac +fi +MSGMERGE="$ac_cv_path_MSGMERGE" +if test "$MSGMERGE" != ":"; then + echo "$as_me:$LINENO: result: $MSGMERGE" >&5 +echo "${ECHO_T}$MSGMERGE" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + + if test "$GMSGFMT" != ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 +echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6 + GMSGFMT=":" + fi + fi + + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 + XGETTEXT=":" + fi + rm -f messages.po + fi + + ac_config_commands="$ac_config_commands default-1" + + + + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" + + +# Check whether --with-gnu-ld or --without-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval="$with_gnu_ld" + test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi; +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo "$as_me:$LINENO: checking for ld used by GCC" >&5 +echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | [A-Za-z]:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 +else + echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 +fi +if test "${acl_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then + test "$with_gnu_ld" != no && break + else + test "$with_gnu_ld" != yes && break + fi + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi +fi + +LD="$acl_cv_path_LD" +if test -n "$LD"; then + echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +if test "${acl_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # I'd rather use --version here, but apparently some GNU ld's only accept -v. +if $LD -v 2>&1 &5; then + acl_cv_prog_gnu_ld=yes +else + acl_cv_prog_gnu_ld=no +fi +fi +echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 +with_gnu_ld=$acl_cv_prog_gnu_ld + + + + echo "$as_me:$LINENO: checking for shared library run path origin" >&5 +echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 +if test "${acl_cv_rpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + +fi +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 +echo "${ECHO_T}$acl_cv_rpath" >&6 + wl="$acl_cv_wl" + libext="$acl_cv_libext" + shlibext="$acl_cv_shlibext" + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + hardcode_direct="$acl_cv_hardcode_direct" + hardcode_minus_L="$acl_cv_hardcode_minus_L" + # Check whether --enable-rpath or --disable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval="$enable_rpath" : else + enable_rpath=yes +fi; -cat >>confdefs.h <&5 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 -if test "${ac_cv_working_alloca_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 10533 "configure" -#include "confdefs.h" -#include -int -main () -{ -char *p = (char *) alloca (2 * sizeof (int)); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10545: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10548: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10551: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10554: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_working_alloca_h=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_working_alloca_h=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:10564: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 -if test $ac_cv_working_alloca_h = yes; then -cat >>confdefs.h <<\EOF -#define HAVE_ALLOCA_H 1 -EOF -fi -echo "$as_me:10574: checking for alloca" >&5 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6 -if test "${ac_cv_func_alloca_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 10580 "configure" -#include "confdefs.h" -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif -#endif -int -main () -{ -char *p = (char *) alloca (1); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10612: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10615: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10618: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10621: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_alloca_works=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_alloca_works=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:10631: result: $ac_cv_func_alloca_works" >&5 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 + use_additional=yes -if test $ac_cv_func_alloca_works = yes; then + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" -cat >>confdefs.h <<\EOF -#define HAVE_ALLOCA 1 -EOF + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" -else - # The SVR3 libPW and SVR4 libucb both contain incompatible functions -# that cause trouble. Some versions do not even contain alloca or -# contain a buggy version. If you still want to use their alloca, -# use ar to extract alloca.o from them instead of compiling alloca.c. + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" -ALLOCA=alloca.$ac_objext - -cat >>confdefs.h <<\EOF -#define C_ALLOCA 1 -EOF - -echo "$as_me:10652: checking whether \`alloca.c' needs Cray hooks" >&5 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 -if test "${ac_cv_os_cray+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 10658 "configure" -#include "confdefs.h" -#if defined(CRAY) && ! defined(CRAY2) -webecray -#else -wenotbecray -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -f conftest* - -fi -echo "$as_me:10676: result: $ac_cv_os_cray" >&5 -echo "${ECHO_T}$ac_cv_os_cray" >&6 -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:10681: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 10687 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); - -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10718: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10721: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10724: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10727: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:10737: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - -cat >>confdefs.h <&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 -if test "${ac_cv_c_stack_direction+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -else - cat >conftest.$ac_ext <<_ACEOF -#line 10760 "configure" -#include "confdefs.h" -int -find_stack_direction () -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} - -int -main () -{ - exit (find_stack_direction () < 0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:10783: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10786: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10788: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10791: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_stack_direction=1 -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_stack_direction=-1 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -echo "$as_me:10803: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 - -cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 10821 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:10825: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:10831: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:10850: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 10869 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); - -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10900: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10903: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10906: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10909: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:10919: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_mmap_fixed_mapped=no -else - cat >conftest.$ac_ext <<_ACEOF -#line 10938 "configure" -#include "confdefs.h" -$ac_includes_default -/* Thanks to Mike Haertel and Jim Avera for this test. - Here is a matrix of mmap possibilities: - mmap private not fixed - mmap private fixed at somewhere currently unmapped - mmap private fixed at somewhere already mapped - mmap shared not fixed - mmap shared fixed at somewhere currently unmapped - mmap shared fixed at somewhere already mapped - For private mappings, we should verify that changes cannot be read() - back from the file, nor mmap's back from the file at a different - address. (There have been systems where private was not correctly - implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the file system buffer cache - like early versions of FreeBSD and possibly contemporary NetBSD.) - For shared mappings, we should conversely verify that changes get - propogated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ - -#include -#include - -#if !STDC_HEADERS && !HAVE_STDLIB_H -char *malloc (); -#endif - -/* This mess was copied from the GNU getpagesize.h. */ -#if !HAVE_GETPAGESIZE -/* Assume that all systems that can run configure have sys/param.h. */ -# if !HAVE_SYS_PARAM_H -# define HAVE_SYS_PARAM_H 1 -# endif - -# ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ -# if HAVE_SYS_PARAM_H -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else /* no EXEC_PAGESIZE */ -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif /* no CLSIZE */ -# else /* no NBPG */ -# ifdef NBPC -# define getpagesize() NBPC -# else /* no NBPC */ -# ifdef PAGESIZE -# define getpagesize() PAGESIZE -# endif /* PAGESIZE */ -# endif /* no NBPC */ -# endif /* no NBPG */ -# endif /* no EXEC_PAGESIZE */ -# else /* no HAVE_SYS_PARAM_H */ -# define getpagesize() 8192 /* punt totally */ -# endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ - -#endif /* no HAVE_GETPAGESIZE */ - -int -main () -{ - char *data, *data2, *data3; - int i, pagesize; - int fd; - - pagesize = getpagesize (); - - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) - exit (1); - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) - exit (1); - if (write (fd, data, pagesize) != pagesize) - exit (1); - close (fd); - - /* Next, try to mmap the file at a fixed address which already has - something else allocated at it. If we can, also make sure that - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) - exit (1); - data2 = (char *) malloc (2 * pagesize); - if (!data2) - exit (1); - data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - exit (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - exit (1); - - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on - some variants of i386 svr4.0.) */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) - exit (1); - if (read (fd, data3, pagesize) != pagesize) - exit (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - exit (1); - close (fd); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:11065: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11068: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11070: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11073: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mmap_fixed_mapped=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_mmap_fixed_mapped=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -echo "$as_me:11085: result: $ac_cv_func_mmap_fixed_mapped" >&5 -echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 -if test $ac_cv_func_mmap_fixed_mapped = yes; then - -cat >>confdefs.h <<\EOF -#define HAVE_MMAP 1 -EOF - -fi -rm -f conftest.mmap - - echo "$as_me:11096: checking whether we are using the GNU C Library 2.1 or newer" >&5 -echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 -if test "${ac_cv_gnu_library_2_1+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11102 "configure" -#include "confdefs.h" - -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "Lucky GNU user" >/dev/null 2>&1; then - ac_cv_gnu_library_2_1=yes -else - ac_cv_gnu_library_2_1=no -fi -rm -f conftest* - -fi -echo "$as_me:11122: result: $ac_cv_gnu_library_2_1" >&5 -echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 - - GLIBC21="$ac_cv_gnu_library_2_1" - -for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11131: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11137 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:11141: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11147: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:11166: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11187 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); - -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11218: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11221: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11224: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11227: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:11237: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" = yes; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" + ;; + esac + done + fi + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" + done + fi + + + + + + + + + + + + + + + + + + + echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 + # Check whether --enable-nls or --disable-nls was given. +if test "${enable_nls+set}" = set; then + enableval="$enable_nls" + USE_NLS=$enableval +else + USE_NLS=yes +fi; + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 + + + + + LIBINTL= + LTLIBINTL= + POSUB= + + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + + + + + + + echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 +echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 +if test "${gt_cv_func_gnugettext1_libc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +int +main () +{ +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gt_cv_func_gnugettext1_libc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gt_cv_func_gnugettext1_libc=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 +echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 + + if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + + + + + + am_save_CPPFLAGS="$CPPFLAGS" + + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + + echo "$as_me:$LINENO: checking for iconv" >&5 echo $ECHO_N "checking for iconv... $ECHO_C" >&6 if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11264,8 +23407,11 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat >conftest.$ac_ext <<_ACEOF -#line 11267 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -11279,29 +23425,33 @@ iconv_t cd = iconv_open("",""); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11282: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11285: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11288: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11291: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_func_iconv=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" - LIBS="$LIBS -liconv" + LIBS="$LIBS $LIBICONV" cat >conftest.$ac_ext <<_ACEOF -#line 11303 "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -11315,833 +23465,640 @@ iconv_t cd = iconv_open("",""); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11318: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11321: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11324: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11327: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_lib_iconv=yes am_cv_func_iconv=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi fi -echo "$as_me:11340: result: $am_cv_func_iconv" >&5 +echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 echo "${ECHO_T}$am_cv_func_iconv" >&6 if test "$am_cv_func_iconv" = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_ICONV 1 -EOF - - echo "$as_me:11348: checking for iconv declaration" >&5 -echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6 - if test "${am_cv_proto_iconv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -#line 11355 "configure" -#include "confdefs.h" - -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif - -int -main () -{ - - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11379: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11382: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11385: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11388: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - am_cv_proto_iconv_arg1="" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -am_cv_proto_iconv_arg1="const" -fi -rm -f conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -fi - - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - echo "$as_me:11401: result: ${ac_t:- - }$am_cv_proto_iconv" >&5 -echo "${ECHO_T}${ac_t:- - }$am_cv_proto_iconv" >&6 - -cat >>confdefs.h <&5 +echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $LIBICONV" >&5 +echo "${ECHO_T}$LIBICONV" >&6 + else + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= fi - echo "$as_me:11416: checking for nl_langinfo and CODESET" >&5 -echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 -if test "${am_cv_langinfo_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11422 "configure" -#include "confdefs.h" -#include -int -main () -{ -char* cs = nl_langinfo(CODESET); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11434: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11437: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11440: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11443: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - am_cv_langinfo_codeset=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -am_cv_langinfo_codeset=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:11454: result: $am_cv_langinfo_codeset" >&5 -echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 - if test $am_cv_langinfo_codeset = yes; then -cat >>confdefs.h <<\EOF -#define HAVE_LANGINFO_CODESET 1 -EOF - fi - if test $ac_cv_header_locale_h = yes; then - echo "$as_me:11465: checking for LC_MESSAGES" >&5 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 -if test "${am_cv_val_LC_MESSAGES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11471 "configure" -#include "confdefs.h" -#include -int -main () -{ -return LC_MESSAGES - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11483: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11486: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11489: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11492: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - am_cv_val_LC_MESSAGES=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -am_cv_val_LC_MESSAGES=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:11502: result: $am_cv_val_LC_MESSAGES" >&5 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 - if test $am_cv_val_LC_MESSAGES = yes; then -cat >>confdefs.h <<\EOF -#define HAVE_LC_MESSAGES 1 -EOF + use_additional=yes + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + +# Check whether --with-libintl-prefix or --without-libintl-prefix was given. +if test "${with_libintl_prefix+set}" = set; then + withval="$with_libintl_prefix" + + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi + +fi; + LIBINTL= + LTLIBINTL= + INCINTL= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='intl ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" = yes; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" + ;; + esac + done + fi + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + done fi fi - echo "$as_me:11512: checking whether NLS is requested" >&5 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 - # Check whether --enable-nls or --disable-nls was given. -if test "${enable_nls+set}" = set; then - enableval="$enable_nls" - USE_NLS=$enableval -else - USE_NLS=yes -fi; - echo "$as_me:11521: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6 - - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - INTLLIBS= - - if test "$USE_NLS" = "yes"; then - -cat >>confdefs.h <<\EOF -#define ENABLE_NLS 1 -EOF - - echo "$as_me:11534: checking whether included gettext is requested" >&5 -echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 - -# Check whether --with-included-gettext or --without-included-gettext was given. -if test "${with_included_gettext+set}" = set; then - withval="$with_included_gettext" - nls_cv_force_use_gnu_gettext=$withval -else - nls_cv_force_use_gnu_gettext=no -fi; - echo "$as_me:11544: result: $nls_cv_force_use_gnu_gettext" >&5 -echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - CATOBJEXT=NONE - - echo "$as_me:11551: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11557 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:11561: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11567: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" + done fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_libintl_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_libintl_h=no -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:11586: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 -if test $ac_cv_header_libintl_h = yes; then - echo "$as_me:11589: checking for GNU gettext in libc" >&5 -echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 -if test "${gt_cv_func_gnugettext1_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11595 "configure" -#include "confdefs.h" -#include -extern int _nl_msg_cat_cntr; -int -main () -{ -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11609: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11612: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11615: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11618: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - gt_cv_func_gnugettext1_libc=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -gt_cv_func_gnugettext1_libc=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:11628: result: $gt_cv_func_gnugettext1_libc" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then - echo "$as_me:11632: checking for GNU gettext in libintl" >&5 + echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6 if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $LIBICONV" - cat >conftest.$ac_ext <<_ACEOF -#line 11640 "configure" -#include "confdefs.h" + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (); int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11654: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11657: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11660: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11663: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_func_gnugettext1_libintl=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_func_gnugettext1_libintl=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" -fi -echo "$as_me:11674: result: $gt_cv_func_gnugettext1_libintl" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 - fi - - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then - -cat >>confdefs.h <<\EOF -#define HAVE_GETTEXT 1 -EOF - - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then - INTLLIBS="-lintl $LIBICONV" - fi - - gt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - -for ac_func in dcgettext -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:11696: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11702 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ + if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +extern int _nl_msg_cat_cntr; +extern #ifdef __cplusplus -extern "C" +"C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); - +const char *_nl_expand_alias (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; -#endif - +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11733: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11736: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11739: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11742: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + gt_cv_func_gnugettext1_libintl=yes + else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" fi -echo "$as_me:11752: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - echo "$as_me:11793: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 -else - echo "$as_me:11796: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -echo "$as_me:11802: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:11819: found $ac_dir/$ac_word" >&5 - break -fi -done - - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT - -if test -n "$GMSGFMT"; then - echo "$as_me:11831: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 -else - echo "$as_me:11834: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -echo "$as_me:11840: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - echo "$as_me:11867: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 -else - echo "$as_me:11870: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CATOBJEXT=.gmo - fi - -fi - - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=yes +echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 +echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 fi - fi - if test "$nls_cv_use_gnu_gettext" = "yes"; then - INTLOBJS="\$(GETTOBJS)" - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -echo "$as_me:11888: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - echo "$as_me:11915: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 -else - echo "$as_me:11918: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + if test "$gt_cv_func_gnugettext1_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= + LTLIBINTL= + INCINTL= + fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -echo "$as_me:11924: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:11941: found $ac_dir/$ac_word" >&5 - break -fi -done - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - echo "$as_me:11953: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 -else - echo "$as_me:11956: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -echo "$as_me:11962: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - echo "$as_me:11989: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 -else - echo "$as_me:11992: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +cat >>confdefs.h <<\_ACEOF +#define ENABLE_NLS 1 +_ACEOF - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.gmo - INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - - if test "$GMSGFMT" != ":"; then - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else - echo "$as_me:12007: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 -echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 - GMSGFMT=":" - fi - fi - - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then - : ; - else - echo "$as_me:12017: result: found xgettext program is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 - XGETTEXT=":" - fi - fi - - POSUB=po - fi - ac_config_commands="$ac_config_commands default-2" - - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes - fi - - for ac_prog in bison -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:12035: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_INTLBISON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$INTLBISON"; then - ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_INTLBISON="$ac_prog" -echo "$as_me:12050: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -INTLBISON=$ac_cv_prog_INTLBISON -if test -n "$INTLBISON"; then - echo "$as_me:12058: result: $INTLBISON" >&5 -echo "${ECHO_T}$INTLBISON" >&6 -else - echo "$as_me:12061: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$INTLBISON" && break -done - - if test -z "$INTLBISON"; then - ac_verc_fail=yes else - echo "$as_me:12071: checking version of bison" >&5 -echo $ECHO_N "checking version of bison... $ECHO_C" >&6 - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - echo "$as_me:12080: result: $ac_prog_version" >&5 -echo "${ECHO_T}$ac_prog_version" >&6 - fi - if test $ac_verc_fail = yes; then - INTLBISON=: + USE_NLS=no fi + fi - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" + echo "$as_me:$LINENO: checking whether to use NLS" >&5 +echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 + if test "$USE_NLS" = "yes"; then + echo "$as_me:$LINENO: checking where the gettext function comes from" >&5 +echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6 + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + echo "$as_me:$LINENO: result: $gt_source" >&5 +echo "${ECHO_T}$gt_source" >&6 + fi + + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + echo "$as_me:$LINENO: checking how to link with libintl" >&5 +echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $LIBINTL" >&5 +echo "${ECHO_T}$LIBINTL" >&6 + + for element in $INCINTL; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done - nls_cv_header_intl= - nls_cv_header_libgt= + fi - DATADIRNAME=share - INSTOBJEXT=.mo +cat >>confdefs.h <<\_ACEOF +#define HAVE_GETTEXT 1 +_ACEOF - GENCAT=gencat - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - echo "$as_me:12105: checking for catalogs to be installed" >&5 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - echo "$as_me:12125: result: $LINGUAS" >&5 -echo "${ECHO_T}$LINGUAS" >&6 - fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_DCGETTEXT 1 +_ACEOF - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi + fi - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi + POSUB=po + fi - INTL_LIBTOOL_SUFFIX_PREFIX= -ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in doc/Makefile man/Makefile man/cs/Makefile man/de/Makefile man/fr/Makefile man/hu/Makefile man/id/Makefile man/it/Makefile man/ja/Makefile man/ko/Makefile man/pl/Makefile man/pt_BR/Makefile libmisc/Makefile lib/Makefile src/Makefile contrib/Makefile debian/Makefile etc/Makefile etc/pam.d/Makefile shadow.spec" + + INTLLIBS="$LIBINTL" + + + + + + + + ac_config_files="$ac_config_files Makefile po/Makefile.in doc/Makefile man/Makefile man/cs/Makefile man/de/Makefile man/es/Makefile man/fr/Makefile man/hu/Makefile man/id/Makefile man/it/Makefile man/ja/Makefile man/ko/Makefile man/pl/Makefile man/pt_BR/Makefile man/ru/Makefile man/zh_CN/Makefile man/zh_TW/Makefile libmisc/Makefile lib/Makefile src/Makefile contrib/Makefile etc/Makefile etc/pam.d/Makefile shadow.spec" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -12152,7 +24109,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -12170,13 +24127,13 @@ _ACEOF # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -12187,7 +24144,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -12206,47 +24163,267 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi DEFS=-DHAVE_CONFIG_H +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:12224: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# Support unset when possible. +if (as_foo=foo; unset as_foo) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -12272,24 +24449,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +as_executable_p="test -f" + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -12298,10 +24471,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.57a. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -12321,7 +24518,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -12331,12 +24528,13 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + instantiate the configuration header FILE Configuration files: $config_files @@ -12348,23 +24546,22 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.57a, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -12374,30 +24571,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:12400: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -12407,16 +24604,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:12419: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -12428,46 +24628,52 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## - -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi _ACEOF -EOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # -AMDEP_TRUE="$AMDEP_TRUE" -ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it + # from automake. + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF + + + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;; "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "man/cs/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/cs/Makefile" ;; "man/de/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/de/Makefile" ;; + "man/es/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/es/Makefile" ;; "man/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/fr/Makefile" ;; "man/hu/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/hu/Makefile" ;; "man/id/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/id/Makefile" ;; @@ -12476,18 +24682,20 @@ do "man/ko/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/ko/Makefile" ;; "man/pl/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/pl/Makefile" ;; "man/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/pt_BR/Makefile" ;; + "man/ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/ru/Makefile" ;; + "man/zh_CN/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/zh_CN/Makefile" ;; + "man/zh_TW/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/zh_TW/Makefile" ;; "libmisc/Makefile" ) CONFIG_FILES="$CONFIG_FILES libmisc/Makefile" ;; "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; - "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;; "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; "etc/pam.d/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/pam.d/Makefile" ;; "shadow.spec" ) CONFIG_FILES="$CONFIG_FILES shadow.spec" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:12490: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -12503,6 +24711,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -12511,23 +24722,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -12540,6 +24751,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -12555,27 +24772,20 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@CYGPATH_W@,$CYGPATH_W,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t s,@ACLOCAL@,$ACLOCAL,;t t s,@AUTOCONF@,$AUTOCONF,;t t s,@AUTOMAKE@,$AUTOMAKE,;t t @@ -12583,24 +24793,35 @@ s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t s,@AMTAR@,$AMTAR,;t t s,@install_sh@,$install_sh,;t t +s,@STRIP@,$STRIP,;t t +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@DEPDIR@,$DEPDIR,;t t +s,@am__leading_dot@,$am__leading_dot,;t t +s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t +s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t +s,@MAINT@,$MAINT,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@DEPDIR@,$DEPDIR,;t t s,@am__include@,$am__include,;t t s,@am__quote@,$am__quote,;t t +s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t +s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t +s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t +s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t +s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@LN_S@,$LN_S,;t t s,@YACC@,$YACC,;t t s,@CPP@,$CPP,;t t +s,@EGREP@,$EGREP,;t t s,@U@,$U,;t t s,@ANSI2KNR@,$ANSI2KNR,;t t s,@build@,$build,;t t @@ -12612,45 +24833,45 @@ s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t s,@host_os@,$host_os,;t t s,@ECHO@,$ECHO,;t t +s,@AR@,$AR,;t t +s,@ac_ct_AR@,$ac_ct_AR,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t +s,@CXX@,$CXX,;t t +s,@CXXFLAGS@,$CXXFLAGS,;t t +s,@ac_ct_CXX@,$ac_ct_CXX,;t t +s,@CXXDEPMODE@,$CXXDEPMODE,;t t +s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t +s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t +s,@CXXCPP@,$CXXCPP,;t t +s,@F77@,$F77,;t t +s,@FFLAGS@,$FFLAGS,;t t +s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LIBCRYPT@,$LIBCRYPT,;t t s,@LIBCRACK@,$LIBCRACK,;t t s,@LIBSKEY@,$LIBSKEY,;t t s,@LIBMD@,$LIBMD,;t t -s,@LIBTCFS@,$LIBTCFS,;t t s,@LIBPAM@,$LIBPAM,;t t -s,@ALLOCA@,$ALLOCA,;t t -s,@GLIBC21@,$GLIBC21,;t t -s,@LIBICONV@,$LIBICONV,;t t +s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t s,@USE_NLS@,$USE_NLS,;t t s,@MSGFMT@,$MSGFMT,;t t s,@GMSGFMT@,$GMSGFMT,;t t s,@XGETTEXT@,$XGETTEXT,;t t -s,@INTLBISON@,$INTLBISON,;t t -s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t -s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t -s,@CATALOGS@,$CATALOGS,;t t -s,@CATOBJEXT@,$CATOBJEXT,;t t -s,@GMOFILES@,$GMOFILES,;t t +s,@MSGMERGE@,$MSGMERGE,;t t +s,@LIBICONV@,$LIBICONV,;t t +s,@LTLIBICONV@,$LTLIBICONV,;t t s,@INTLLIBS@,$INTLLIBS,;t t -s,@INTLOBJS@,$INTLOBJS,;t t -s,@POFILES@,$POFILES,;t t +s,@LIBINTL@,$LIBINTL,;t t +s,@LTLIBINTL@,$LTLIBINTL,;t t s,@POSUB@,$POSUB,;t t -s,@DATADIRNAME@,$DATADIRNAME,;t t -s,@INSTOBJEXT@,$INSTOBJEXT,;t t -s,@GENCAT@,$GENCAT,;t t -s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t -s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -12675,9 +24896,9 @@ EOF (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -12689,86 +24910,111 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; *) # Relative path. - ac_srcdir=$ac_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:12763: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -12777,37 +25023,43 @@ echo "$as_me: creating $ac_file" >&6;} case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:12781: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:12794: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -12819,8 +25071,8 @@ s,@INSTALL@,$ac_INSTALL,;t t fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_HEADER section. @@ -12830,12 +25082,12 @@ cat >>$CONFIG_STATUS <<\EOF # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' ac_dC=' ' ac_dD=',;t' # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' ac_uB='$,\1#\2define\3' ac_uC=' ' ac_uD=',;t' @@ -12844,15 +25096,15 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:12855: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -12862,30 +25114,31 @@ echo "$as_me: creating $ac_file" >&6;} case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:12866: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:12879: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -EOF +_ACEOF # Transform confdefs.h into two sed scripts, `conftest.defines' and # `conftest.undefs', that substitutes the proper values into @@ -12901,16 +25154,16 @@ rm -f conftest.defines conftest.undefs # `end' is used to avoid that the second main sed command (meant for # 0-ary CPP macros) applies to n-ary macro definitions. # See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\EOF +cat >confdef2sed.sed <<\_ACEOF s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end -EOF +_ACEOF # If some macros were called several times there might be several times # the same #defines, which is useless. Nevertheless, we may not want to # sort them, since we want the *last* AC-DEFINE to be honored. @@ -12921,14 +25174,14 @@ rm -f confdef2sed.sed # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\EOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -EOF +cat >>conftest.undefs <<\_ACEOF +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +_ACEOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@ -12937,7 +25190,7 @@ do # Write a limited-size here document to $tmp/defines.sed. echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -12952,7 +25205,7 @@ do mv conftest.tail conftest.defines done rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS +echo ' fi # grep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size @@ -12964,7 +25217,7 @@ do # Write a limited-size here document to $tmp/undefs.sed. echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -12980,51 +25233,59 @@ do done rm -f conftest.undefs -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ + # /* config.h. Generated by config.status. */ if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h + echo "/* Generated by configure. */" >$tmp/config.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h fi cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:12996: $ac_file is unchanged" >&5 + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } - fi rm -f $ac_file mv $tmp/config.h $ac_file fi @@ -13032,15 +25293,31 @@ done; } cat $tmp/config.h rm -f $tmp/config.h fi - # Run the commands associated with the file. - case $ac_file in - config.h ) # update the timestamp -echo timestamp >"./stamp-h1" - ;; +# Compute $ac_file's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $ac_file | $ac_file:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -EOF -cat >>$CONFIG_STATUS <<\EOF +echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'`/stamp-h$_am_stamp_count +done +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -13048,16 +25325,79 @@ cat >>$CONFIG_STATUS <<\EOF for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ac_dest=`echo "$ac_file" | sed 's,:.*,,'` ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_dir=`(dirname "$ac_dest") 2>/dev/null || +$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_dest" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + ac_builddir=. +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in - default-1 ) -test x"$AMDEP_TRUE" != x"" || -for mf in $CONFIG_FILES; do - case "$mf" in - Makefile) dirpart=.;; - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`(dirname "$mf") 2>/dev/null || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + else + continue + fi grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. @@ -13082,53 +25422,161 @@ for mf in $CONFIG_FILES; do sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`echo "$file" | sed -e 's|/[^/]*$||'` - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + fdir=`(dirname "$file") 2>/dev/null || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p $dirpart/$fdir + else + as_dir=$dirpart/$fdir + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; }; } + # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; - default-2 ) for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + default-1 ) + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assigment from automake. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi - ;; - esac - done ;; + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + GMOFILES= + UPDATEPOFILES= + DUMMYPOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -13139,8 +25587,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/configure.in b/configure.in index 7faa8b9a..26964e86 100644 --- a/configure.in +++ b/configure.in @@ -1,17 +1,17 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lib/dialchk.c) -AM_INIT_AUTOMAKE(shadow, 4.0.3) -AM_CONFIG_HEADER(config.h) +AC_INIT +AM_INIT_AUTOMAKE(shadow, 4.0.4) +AC_CONFIG_HEADERS([config.h]) dnl Some hacks... test "$prefix" = "NONE" && prefix="/usr" test "$prefix" = "/usr" && exec_prefix="" -test "$CFLAGS" = "" && CFLAGS="-O2 -Wall" -test "$LDFLAGS" = "" && LDFLAGS="-s" AM_DISABLE_SHARED AM_ENABLE_STATIC +AM_MAINTAINER_MODE + dnl Checks for programs. AC_PROG_CC AC_ISC_POSIX @@ -30,7 +30,7 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(errno.h fcntl.h limits.h unistd.h sys/time.h utmp.h utmpx.h \ termios.h termio.h sgtty.h sys/ioctl.h syslog.h paths.h \ utime.h ulimit.h sys/resource.h gshadow.h shadow.h lastlog.h \ - rpc/key_prot.h) + locale.h rpc/key_prot.h) AC_CHECK_FUNCS(a64l fchmod fchown fsync getgroups gethostname getspnam \ gettimeofday getusershell getutent initgroups lchown lckpwdf lstat \ @@ -42,52 +42,36 @@ AC_TYPE_UID_T AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_MODE_T -AC_STRUCT_ST_RDEV AC_HEADER_STAT +AC_CHECK_MEMBERS([struct stat.st_rdev]) AC_HEADER_TIME AC_STRUCT_TM -AC_CACHE_CHECK(for pw_age in struct passwd, -ac_cv_struct_passwd_pw_age, AC_TRY_COMPILE([#include ], -[ struct passwd pw; pw.pw_age = ""; ], -ac_cv_struct_passwd_pw_age=yes, ac_cv_struct_passwd_pw_age=no)) - -if test "$ac_cv_struct_passwd_pw_age" = "yes"; then - AC_DEFINE(ATT_AGE) -fi - -AC_CACHE_CHECK(for pw_comment in struct passwd, -ac_cv_struct_passwd_pw_comment, AC_TRY_COMPILE([#include ], -[ struct passwd pw; pw.pw_comment = ""; ], -ac_cv_struct_passwd_pw_comment=yes, ac_cv_struct_passwd_pw_comment=no)) - -if test "$ac_cv_struct_passwd_pw_comment" = "yes"; then - AC_DEFINE(ATT_COMMENT) -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 = 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 - AC_DEFINE(BSD_QUOTA) -fi - if test "$ac_cv_header_utmp_h" = "yes"; then AC_CACHE_CHECK(for ut_host in struct utmp, - ac_cv_struct_utmp_ut_host, AC_TRY_COMPILE([#include ], - [ struct utmp ut; char *cp = ut.ut_host; ], - ac_cv_struct_utmp_ut_host=yes, ac_cv_struct_utmp_ut_host=no)) + ac_cv_struct_utmp_ut_host, + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#include ], + [struct utmp ut; char *cp = ut.ut_host;] + )], + [ac_cv_struct_utmp_ut_host=yes], + [ac_cv_struct_utmp_ut_host=no] + ) + ) if test "$ac_cv_struct_utmp_ut_host" = "yes"; then AC_DEFINE(UT_HOST) fi AC_CACHE_CHECK(for ut_user in struct utmp, - ac_cv_struct_utmp_ut_user, AC_TRY_COMPILE([#include ], - [ struct utmp ut; char *cp = ut.ut_user; ], - ac_cv_struct_utmp_ut_user=yes, ac_cv_struct_utmp_ut_user=no)) + ac_cv_struct_utmp_ut_user, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [struct utmp ut; char *cp = ut.ut_user;] + )], + [ac_cv_struct_utmp_ut_user=yes], + [ac_cv_struct_utmp_ut_user=no] + ) + ) if test "$ac_cv_struct_utmp_ut_user" = "no"; then AC_DEFINE(ut_user, ut_name) @@ -96,9 +80,14 @@ fi if test "$ac_cv_header_lastlog_h" = "yes"; then AC_CACHE_CHECK(for ll_host in struct lastlog, - ac_cv_struct_lastlog_ll_host, AC_TRY_COMPILE([#include ], - [ struct lastlog ll; char *cp = ll.ll_host; ], - ac_cv_struct_lastlog_ll_host=yes, ac_cv_struct_lastlog_ll_host=no)) + ac_cv_struct_lastlog_ll_host, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [struct lastlog ll; char *cp = ll.ll_host;] + )], + [ac_cv_struct_lastlog_ll_host=yes], + [ac_cv_struct_lastlog_ll_host=no] + ) + ) if test "$ac_cv_struct_lastlog_ll_host" = "yes"; then AC_DEFINE(HAVE_LL_HOST) @@ -120,17 +109,21 @@ AC_FUNC_SETPGRP if test "$ac_cv_header_shadow_h" = "yes"; then AC_CACHE_CHECK(for working shadow group support, -ac_cv_libc_shadowgrp, AC_TRY_RUN( -[ -#include -main() -{ - struct sgrp *sg = sgetsgent("test:x::"); - /* NYS libc on Red Hat 3.0.3 has broken shadow group support */ - return !sg || !sg->sg_adm || !sg->sg_mem; -} -], -ac_cv_libc_shadowgrp=yes,ac_cv_libc_shadowgrp=no,ac_cv_libc_shadowgrp=no)) + ac_cv_libc_shadowgrp, + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #include + main() + { + struct sgrp *sg = sgetsgent("test:x::"); + /* NYS libc on Red Hat 3.0.3 has broken shadow group support */ + return !sg || !sg->sg_adm || !sg->sg_mem; + }] + )], + [ac_cv_libc_shadowgrp=yes], + [ac_cv_libc_shadowgrp=no], + [ac_cv_libc_shadowgrp=no] + ) +) if test "$ac_cv_libc_shadowgrp" = "yes"; then AC_DEFINE(HAVE_SHADOWGRP) @@ -138,7 +131,7 @@ fi fi AC_MSG_CHECKING(location of shared mail directory) -for maildir in /var/spool/mail /var/mail /usr/spool/mail /usr/mail NONE; do +for maildir in /var/mail /var/spool/mail /usr/spool/mail /usr/mail NONE; do if test "$maildir" = "NONE"; then AC_MSG_RESULT(None) elif test -d $maildir; then @@ -210,7 +203,6 @@ AC_ARG_WITH(libcrypt, [ --with-libcrypt try to use libcrypt (default if AC_ARG_WITH(libopie, [ --with-libopie use libopie for OPIE support]) AC_ARG_WITH(libpam, [ --with-libpam use libpam for PAM support]) AC_ARG_WITH(libskey, [ --with-libskey use libskey for S/Key support]) -AC_ARG_WITH(libtcfs, [ --with-libtcfs use libtcfs for TCFS support]) dnl Check for some functions in libc first, only if not found check for dnl other libraries. This should prevent linking libnsl if not really @@ -250,20 +242,15 @@ AC_SUBST(LIBSKEY) AC_SUBST(LIBMD) if test "$with_libskey" = "yes"; then AC_CHECK_LIB(md, MD5Init, LIBMD=-lmd) - AC_CHECK_LIB(skey, skeychallenge, AC_DEFINE(SKEY) LIBSKEY=-lskey, , $LIBMD $LIBCRYPT) + AC_CHECK_LIB(skey, skeychallenge, AC_DEFINE(SKEY) LIBSKEY=-lskey, [], $LIBMD $LIBCRYPT) elif test "$with_libopie" = "yes"; then - AC_CHECK_LIB(opie, opiechallenge, AC_DEFINE(OPIE) LIBSKEY=-lopie, , $LIBCRYPT) -fi - -AC_SUBST(LIBTCFS) -if test "$with_libtcfs" = "yes"; then - AC_CHECK_LIB(tcfs, tcfs_encrypt_key, AC_DEFINE(HAVE_TCFS) AC_DEFINE(TCFS_GDBM_SUPPORT) LIBTCFS="-ltcfs -lgdbm", , -lgdbm) + AC_CHECK_LIB(opie, opiechallenge, AC_DEFINE(OPIE) LIBSKEY=-lopie, [], $LIBCRYPT) fi AC_SUBST(LIBPAM) if test "$with_libpam" = "yes"; then AC_CHECK_LIB(pam, pam_start, - [AC_DEFINE(USE_PAM) + [AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules]) LIBPAM="-lpam" AC_CHECK_LIB(pam_misc, main, [LIBPAM="$LIBPAM -lpam_misc"], @@ -282,17 +269,17 @@ else AC_MSG_RESULT(yes) fi -ALL_LINGUAS="cs de el fr ja ko pl sv uk" -AM_GNU_GETTEXT +AM_GNU_GETTEXT_VERSION(0.12.1) +AM_GNU_GETTEXT([external]) -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile - intl/Makefile po/Makefile.in doc/Makefile man/Makefile man/cs/Makefile man/de/Makefile + man/es/Makefile man/fr/Makefile man/hu/Makefile man/id/Makefile @@ -301,11 +288,15 @@ AC_OUTPUT([ man/ko/Makefile man/pl/Makefile man/pt_BR/Makefile + man/ru/Makefile + man/zh_CN/Makefile + man/zh_TW/Makefile libmisc/Makefile lib/Makefile src/Makefile contrib/Makefile - debian/Makefile etc/Makefile etc/pam.d/Makefile - shadow.spec]) + shadow.spec +]) +AC_OUTPUT diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 8eda788a..1dcb7496 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,113 +17,163 @@ # This is a dummy Makefile.am to get automake work flawlessly, # and also cooperate to make a distribution for `make dist' -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ EXTRA_DIST = README adduser.c adduser-old.c adduser.sh adduser2.sh \ atudel groupmems.shar pwdauth.c shadow-anonftp.patch \ udbachk.tgz subdir = contrib +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = -DIST_COMMON = README Makefile.am Makefile.in +DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu contrib/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -132,17 +183,12 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu contrib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -150,15 +196,26 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -170,7 +227,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -182,6 +238,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -189,7 +246,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -199,7 +256,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -221,13 +278,21 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ @@ -237,7 +302,8 @@ uninstall-am: uninstall-info-am install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool uninstall uninstall-am uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/debian/Makefile.am b/debian/Makefile.am deleted file mode 100644 index bc78ef14..00000000 --- a/debian/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -# This is a dummy Makefile.am to get automake work flawlessly, -# and also cooperate to make a distribution for `make dist' - -EXTRA_DIST = changelog checksums control control.gnu control.linux \ - login.conffiles login.copyright login.postinst login.postrm login.preinst \ - login.prerm logoutd.init passwd.conffiles passwd.copyright \ - passwd.cron passwd.init passwd.postinst passwd.postrm porttime rules \ - secure-su.README secure-su.conffiles secure-su.copyright secure-su.postrm \ - secure-su.preinst securetty shadowconfig.sh diff --git a/debian/Makefile.in b/debian/Makefile.in deleted file mode 100644 index 95b6fbb5..00000000 --- a/debian/Makefile.in +++ /dev/null @@ -1,247 +0,0 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# This is a dummy Makefile.am to get automake work flawlessly, -# and also cooperate to make a distribution for `make dist' - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AMTAR = @AMTAR@ -AS = @AS@ -AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -LIBCRACK = @LIBCRACK@ -LIBCRYPT = @LIBCRYPT@ -LIBICONV = @LIBICONV@ -LIBMD = @LIBMD@ -LIBPAM = @LIBPAM@ -LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -STRIP = @STRIP@ -U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -YACC = @YACC@ -am__include = @am__include@ -am__quote = @am__quote@ -install_sh = @install_sh@ - -EXTRA_DIST = changelog checksums control control.gnu control.linux \ - login.conffiles login.copyright login.postinst login.postrm login.preinst \ - login.prerm logoutd.init passwd.conffiles passwd.copyright \ - passwd.cron passwd.init passwd.postinst passwd.postrm porttime rules \ - secure-su.README secure-su.conffiles secure-su.copyright secure-su.postrm \ - secure-su.preinst securetty shadowconfig.sh - -subdir = debian -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in -all: all-am - -.SUFFIXES: - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu debian/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status -uninstall-info-am: -tags: TAGS -TAGS: - - -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ - fi; \ - if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile - -installdirs: - -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool uninstall uninstall-am uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index b1548b5e..00000000 --- a/debian/changelog +++ /dev/null @@ -1,175 +0,0 @@ -shadow (19990827) unstable; urgency=low - - * upstream upgrade, see CHANGES for more details. Note: this is - not the official Debian changelog entry - it is here only for - dpkg-buildpackage to work (so I can build and test this package - on my system). To the Debian maintainers: please feel free to - replace this entry with your own, and put your name (instead of - mine) in the debian/control Maintainer field. Thanks, and keep - up the good work! - - -- Marek Michalkiewicz Fri, 27 Aug 1999 21:00:00 +0200 - -shadow (980403-0.3.2) unstable; urgency=low - - * configure.in patched for utmpx.h (for arm) - - -- Jim Pick Sun, 4 Oct 1998 19:06:15 -0700 - -shadow (980403-0.3.1) frozen unstable; urgency=low - - * Non maintainer upload. - changes.{guess,sub} changed to recognize a Arm architecture. - - -- Turbo Fredriksson Fri, 14 Aug 1998 22:37:58 -0400 - -shadow (980403-0.3) frozen unstable; urgency=high - - * Non maintainer upload. - * src/login.c: Applied patch from to - fix security hole of login not checking the return code from setgid(), - initgroups() or setuid(). [#24710] - - -- James Troup Fri, 17 Jul 1998 18:56:31 +0100 - -shadow (980403-0.2) frozen unstable; urgency=low - - * (login.defs): fixed UMASK - (thanks to James Troup for noticing my screwup :) - * Pruned non-Debian changelog entries. - - -- Joel Klecker Mon, 11 May 1998 11:25:22 -0700 - -shadow (980403-0.1) frozen unstable; urgency=low - - * Non-maintainer release. - * New upstream release (18225). - * (debian/login.postinst) - * Use 'touch' instead of 'cat >' when creating /var/log/faillog - (15998,16187,21687). - * No longer fails if no previous configured version exists (11433). - * (gpasswd): now checks which user invoked it before calling setuid() (18132). - * (debian/passwd.postinst): removed bashism (13753). - * (groupmod): NULL dereference fixed upstream, as a result, it no longer - dumps core when changing group name (16893,17894). - * (useradd): no longer segfaults if /etc/default/useradd is missing (18628). - * (login.defs.1): now documents more options (13485). - * (source): includes 'missing' (13815,18133,21280). - * (login.1): - * Removed mention of "d_passwd(5)", which doesn't exist, - and login.defs.5 now documents /etc/dialups (15176). - * Added /etc/nologin to FILES section and reference nologin(5) (21695). - * The URL mentioned in Bug#15391 is no longer valid. - * (login.defs): no longer sets ULIMIT (17529). - * (login): - * No longer uses static buffers for group lines (17532). - * Doesn't seem to make assumptions about gid_t any longer (21767). - * (faillog.8): s-/usr/adm-/var/log-g (19974). - * (lastlog.8): notes that "some systems" use /var/log instead of - /usr/adm (21746). - * Install upstream changelog as 'changelog.gz' as per policy (20052). - * (secure-su): Changed /etc/suauth to reference the group 'root' - instead of 'wheel' (17593). - - -- Joel Klecker Thu, 30 Apr 1998 18:32:12 -0700 - -shadow (970616-1) unstable; urgency=low - - * Upstream upgrade. - * chage works (10561). - * Fix NIS behavior (5634,8734,10032,10545,10984,11160,12064). - * Wrote pwconv,pwunconv,grpconv,grpunconv manpage (10940). - * vipw fixes (10521,10696,11618,11924,12184,13001) - * Fixes for new automake. - * Compile with glibc2. (8627,8777,9824,11713,11719,12082,12108,11442). - * debian/rules fixes (8876,12468). - * /etc/login.defs: UMASK=002 (9102). - * chown /dev/vcs* on login (9421,13255). - * Added tty9-tty12 to /etc/securetty (11644). - * Provide template and manpage for /etc/limits (12289). - * Fix security hole in postinst (11769). - * login fills out ut_addr field in utmp (10701). - * shadowconfig.sh fixes (9189,9328,9386,10968,12452,12469). - * Overcome postinst bug in old shadow-passwd package (9939,12120). - * useradd default GROUP=100 (9244). - * Allow 8 bit chars in chfn (12367). - * secure-su - set HOME, use SHELL if set (11003,11189). - - -- Guy Maor Fri, 26 Sep 1997 19:23:42 -0500 - -shadow (970616) unstable; urgency=low - - * vipw preserves permissions on edited files (10521). - * various other bug fixes. - - -- Marek Michalkiewicz Mon, 16 Jun 1997 02:02:00 +0200 - -shadow (970601) unstable; urgency=low - - * Fix typo in libmisc/mail.c causing login to segfault. - - -- Marek Michalkiewicz Mon, 2 Jun 1997 07:33:00 +0200 - -shadow (970502-2) unstable; urgency=low - - * Fixes to shadow group support (grpconv didn't work). - - -- Marek Michalkiewicz Fri, 2 May 1997 15:48:00 +0200 - -shadow (970502-1) unstable; urgency=low - - * Upstream upgrade. - - -- Marek Michalkiewicz Fri, 2 May 1997 03:18:00 +0200 - -shadow (961025-2) frozen unstable; urgency=medium - - * Fix useradd -D segfault (8098, 8152, 8733). - * Fix shadowconfig - permfix only on xlock; /etc/init.d/xdm rewrite, chmod - (8102, 8320, 8333, 8708). - * Remove HOWTO from usr/doc/passwd as it's in linux-doc (8150). - * Fixes to su.1 (8153). - * login, passwd, su each conflict and replace with the old shadow-* - version. (8269, 8290, 8393, 8394). - * Put /etc/shells back in passwd (8328). - * Fixed login.postinst for upgrade from shadow-login (8392). - * Added -e to pwck for use in shadowconfig: reports only errors, no - warnings (8542). - * Wrote shadowconfig.8 (8588). - - -- Guy Maor Sat, 19 Apr 1997 02:34:59 -0500 - -shadow (961025-1) unstable; urgency=low - - * Upstream upgrade, new source format. - - -- Guy Maor Mon, 10 Feb 1997 02:56:56 -0600 - -shadow (960530-1) experimental; urgency=LOW - - * Added grpunconv script - * Changed prerm/postinst scripts to remove/create shadowed group - file - * Added vipw/vigr binaries - * Renamed package to shadow-passwd - * Added packages shadow-su and shadow-login - * Added 'Essential: yes' to be able to replace passwd and login - * Section now base for shadow-passwd and shadow-login - * Added /etc/shell conffile - * Added /etc/securetty conffile - * Added new conffile /etc/suauth. Set it up so only users in group 0 - can su to root. - -shadow (960810-1) base; urgency=LOW - - * Added useradd default file so that default group is no longer 1 - * Also corrected the useradd manpage - * Replaced grpunconv script by real binary which does correct - locking. - * Added 'source' field control file to control files - * Changed version naming in debian.rules - * New upstream version - -Local variables: -mode: debian-changelog -End: diff --git a/debian/checksums b/debian/checksums deleted file mode 100755 index 9d227c30..00000000 --- a/debian/checksums +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# This script is run from debian/rules to generate MD5 checksums -# for all files in the package. -# $Id: checksums,v 1.1 1997/12/14 21:05:37 marekm Exp $ -set -e -cd $1 -md5sum `find * -type f ! -regex "DEBIAN/.*"` >DEBIAN/md5sums -Standards-Version: 2.3.0.0 - -Package: login -Architecture: any -Pre-Depends: ${shlibs:Depends} -Conflicts: shadow-login -Replaces: shadow-login, shadow-passwd -Essential: yes -Section: base -Priority: required -Description: Sign on to the system. - login and newgrp change the user and group. - -Package: passwd -Architecture: any -Depends: ${shlibs:Depends}, login (>= 970502-1) -Conflicts: shadow-passwd -Replaces: shadow-passwd -Replaces: manpages (<=1.15-2) -Section: base -Priority: required -Description: Change and administer password and group data. - This package includes passwd, chsh, chfn, and many other programs to - maintain password and group data. - . - Shadow passwords are supported. See /usr/doc/passwd/README.Debian - -Package: secure-su -Architecture: any -Depends: ${shlibs:Depends}, login (>= 970502-1) -Conflicts: shadow-su -Replaces: shadow-su -Section: admin -Priority: optional -Description: su with more security options - secure-su offers more security options than the normal su, such as a - wheel group, and from-user and to-user specific restrictions. diff --git a/debian/control.gnu b/debian/control.gnu deleted file mode 100644 index 5b052739..00000000 --- a/debian/control.gnu +++ /dev/null @@ -1,16 +0,0 @@ -Source: shadow -Section: base -Priority: required -Maintainer: Guy Maor -Standards-Version: 2.3.0.0 - -Package: passwd -Architecture: any -Depends: ${shlibs:Depends} -Section: base -Priority: required -Description: Change and administer password and group data. - This package includes passwd, chsh, chfn, and many other programs to - maintain password and group data. - . - Shadow passwords are supported. See /usr/doc/passwd/README.Debian diff --git a/debian/control.linux b/debian/control.linux deleted file mode 100644 index 430c4b3a..00000000 --- a/debian/control.linux +++ /dev/null @@ -1,41 +0,0 @@ -Source: shadow -Section: base -Priority: required -Maintainer: Marek Michalkiewicz -Standards-Version: 2.3.0.0 - -Package: login -Architecture: any -Pre-Depends: ${shlibs:Depends} -Conflicts: shadow-login -Replaces: shadow-login, shadow-passwd -Essential: yes -Section: base -Priority: required -Description: Sign on to the system. - login and newgrp change the user and group. - -Package: passwd -Architecture: any -Depends: ${shlibs:Depends}, login (>= 970502-1) -Conflicts: shadow-passwd -Replaces: shadow-passwd -Replaces: manpages (<=1.15-2) -Section: base -Priority: required -Description: Change and administer password and group data. - This package includes passwd, chsh, chfn, and many other programs to - maintain password and group data. - . - Shadow passwords are supported. See /usr/doc/passwd/README.Debian - -Package: secure-su -Architecture: any -Depends: ${shlibs:Depends}, login (>= 970502-1) -Conflicts: shadow-su -Replaces: shadow-su -Section: admin -Priority: optional -Description: su with more security options - secure-su offers more security options than the normal su, such as a - wheel group, and from-user and to-user specific restrictions. diff --git a/debian/login.conffiles b/debian/login.conffiles deleted file mode 100644 index c1d83cba..00000000 --- a/debian/login.conffiles +++ /dev/null @@ -1,6 +0,0 @@ -/etc/login.defs -/etc/login.access -/etc/securetty -/etc/porttime -/etc/limits -/etc/init.d/logoutd diff --git a/debian/login.copyright b/debian/login.copyright deleted file mode 100644 index adf5dfb7..00000000 --- a/debian/login.copyright +++ /dev/null @@ -1,76 +0,0 @@ -This is Debian/GNU Linux's prepackaged version of login and related -utilities. - -It was downloaded from: . - -This software is copyright 1988 - 1994, Julianne Frances Haugh. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of Julianne F. Haugh nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -This source code is currently archived on ftp.uu.net in the -comp.sources.misc portion of the USENET archives. You may also contact -the author, Julianne F. Haugh, at jockgrrl@ix.netcom.com if you have -any questions regarding this package. - -THIS SOFTWARE IS BEING DISTRIBUTED AS-IS. THE AUTHORS DISCLAIM ALL -LIABILITY FOR ANY CONSEQUENCES OF USE. THE USER IS SOLELY RESPONSIBLE -FOR THE MAINTENANCE OF THIS SOFTWARE PACKAGE. THE AUTHORS ARE UNDER NO -OBLIGATION TO PROVIDE MODIFICATIONS OR IMPROVEMENTS. THE USER IS -ENCOURAGED TO TAKE ANY AND ALL STEPS NEEDED TO PROTECT AGAINST ACCIDENTAL -LOSS OF INFORMATION OR MACHINE RESOURCES. - -Special thanks are due to Chip Rosenthal for his fine testing efforts; -to Steve Simmons for his work in porting this code to BSD; and to Bill -Kennedy for his contributions of LaserJet printer time and energies. -Also, thanks for Dennis L. Mumaugh for the initial shadow password -information and to Tony Walton (olapw@olgb1.oliv.co.uk) for the System -V Release 4 changes. Effort in porting to SunOS has been contributed -by Dr. Michael Newberry (miken@cs.adfa.oz.au) and Micheal J. Miller, Jr. -(mke@kaberd.rain.com). Effort in porting to AT&T UNIX System V Release -4 has been provided by Andrew Herbert (andrew@werple.pub.uu.oz.au). -Special thanks to Marek Michalkiewicz (marekm@i17linuxb.ists.pwr.wroc.pl) -for taking over the Linux port of this software. - -Source files: login_access.c, login_desrpc.c, login_krb.c are derived -from the logdaemon-5.0 package, which is under the following license: - -/************************************************************************ -* Copyright 1995 by Wietse Venema. All rights reserved. Individual files -* may be covered by other copyrights (as noted in the file itself.) -* -* This material was originally written and compiled by Wietse Venema at -* Eindhoven University of Technology, The Netherlands, in 1990, 1991, -* 1992, 1993, 1994 and 1995. -* -* Redistribution and use in source and binary forms are permitted -* provided that this entire copyright notice is duplicated in all such -* copies. -* -* This software is provided "as is" and without any expressed or implied -* warranties, including, without limitation, the implied warranties of -* merchantibility and fitness for any particular purpose. -************************************************************************/ - diff --git a/debian/login.postinst b/debian/login.postinst deleted file mode 100644 index 32b19a06..00000000 --- a/debian/login.postinst +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -set -e - -[ "$1" = configure -a "$2" ] \ - && dpkg --compare-versions $2 lt 961025 \ - || [ -z "$2" ] \ - || exit 0 - -if [ -f /etc/usertty ] ; then - cat > /etc/usertty$$ <> /etc/usertty$$ - mv -f /etc/usertty$$ /etc/usertty - - if egrep -vqn '^#|^ *$' /etc/usertty ; then cat < /dev/null diff --git a/debian/login.postrm b/debian/login.postrm deleted file mode 100644 index ccfa914f..00000000 --- a/debian/login.postrm +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -e - -if [ "$1" = "purge" ] ; then - update-rc.d logoutd remove >/dev/null -fi diff --git a/debian/login.preinst b/debian/login.preinst deleted file mode 100644 index 96637b51..00000000 --- a/debian/login.preinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -e -dpkg --assert-support-predepends || -( echo -e "\nPlease upgrade to a newer version of dpkg\n"; exit 1; ) diff --git a/debian/login.prerm b/debian/login.prerm deleted file mode 100644 index ba1301b3..00000000 --- a/debian/login.prerm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -case $1 in - remove|upgrade|deconfigure) - /etc/init.d/logoutd stop - ;; -esac diff --git a/debian/logoutd.init b/debian/logoutd.init deleted file mode 100644 index 60594465..00000000 --- a/debian/logoutd.init +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh -# start/stop logoutd - -set -e - -DAEMON=/usr/sbin/logoutd -test -f $DAEMON || exit 0 - -# Most people won't need logoutd(8) running, so we'll only run it if -# /etc/porttime has non-comment lines. -egrep -vq '^#|^ *$' /etc/porttime || exit 0 - -case "$1" in - start) - echo -n "Starting login time and port restriction enforcer: logoutd" - start-stop-daemon --start --quiet --exec $DAEMON - echo "." - ;; - stop) - echo -n "Stopping login time and port restriction enforcer: logoutd" - start-stop-daemon --stop --quiet --exec $DAEMON - echo "." - ;; - force-reload|restart) - $0 stop - $0 start - ;; - reload) - ;; - *) - echo "Usage: /etc/init.d/logoutd start|stop|restart" - exit 1 - ;; -esac - -exit 0 diff --git a/debian/passwd.conffiles b/debian/passwd.conffiles deleted file mode 100644 index 48979eaf..00000000 --- a/debian/passwd.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/cron.daily/passwd -/etc/init.d/passwd -/etc/shells diff --git a/debian/passwd.copyright b/debian/passwd.copyright deleted file mode 100644 index 6b76e3ad..00000000 --- a/debian/passwd.copyright +++ /dev/null @@ -1,55 +0,0 @@ -This is Debian/GNU Linux's prepackaged version of the passwd -utilities. - -It was downloaded from: . - -This software is copyright 1988 - 1994, Julianne Frances Haugh. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of Julianne F. Haugh nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -This source code is currently archived on ftp.uu.net in the -comp.sources.misc portion of the USENET archives. You may also contact -the author, Julianne F. Haugh, at jockgrrl@ix.netcom.com if you have -any questions regarding this package. - -THIS SOFTWARE IS BEING DISTRIBUTED AS-IS. THE AUTHORS DISCLAIM ALL -LIABILITY FOR ANY CONSEQUENCES OF USE. THE USER IS SOLELY RESPONSIBLE -FOR THE MAINTENANCE OF THIS SOFTWARE PACKAGE. THE AUTHORS ARE UNDER NO -OBLIGATION TO PROVIDE MODIFICATIONS OR IMPROVEMENTS. THE USER IS -ENCOURAGED TO TAKE ANY AND ALL STEPS NEEDED TO PROTECT AGAINST ACCIDENTAL -LOSS OF INFORMATION OR MACHINE RESOURCES. - -Special thanks are due to Chip Rosenthal for his fine testing efforts; -to Steve Simmons for his work in porting this code to BSD; and to Bill -Kennedy for his contributions of LaserJet printer time and energies. -Also, thanks for Dennis L. Mumaugh for the initial shadow password -information and to Tony Walton (olapw@olgb1.oliv.co.uk) for the System -V Release 4 changes. Effort in porting to SunOS has been contributed -by Dr. Michael Newberry (miken@cs.adfa.oz.au) and Micheal J. Miller, Jr. -(mke@kaberd.rain.com). Effort in porting to AT&T UNIX System V Release -4 has been provided by Andrew Herbert (andrew@werple.pub.uu.oz.au). -Special thanks to Marek Michalkiewicz (marekm@i17linuxb.ists.pwr.wroc.pl) -for taking over the Linux port of this software. diff --git a/debian/passwd.cron b/debian/passwd.cron deleted file mode 100644 index 4bc868ef..00000000 --- a/debian/passwd.cron +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# cron.daily script to check integrity of the password and group files - -test -f /usr/sbin/pwck || exit 0 - -pwck -q -r -grpck -r diff --git a/debian/passwd.init b/debian/passwd.init deleted file mode 100755 index 83ef2071..00000000 --- a/debian/passwd.init +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/passwd -# script to check integrity of the password and group files at system startup -# - -set -e -test -f /usr/sbin/pwck || exit 0 - -case "$1" in - start) - echo -n 'Checking password and group files... ' - pwck -q -r - grpck -r - echo "done." - ;; - stop|restart|reload|force-reload) - ;; - *) - echo "Usage: /etc/init.d/passwd start" - exit 1 - ;; -esac - -exit 0 diff --git a/debian/passwd.postinst b/debian/passwd.postinst deleted file mode 100644 index bb8ed870..00000000 --- a/debian/passwd.postinst +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -set -e - -if [ configure != "$1" ] ; then - exit 0 -fi - -# passwd 961025-1 incorrectly did permfix on sulogin and xdm-shadow in -# shadowconfig -permfix () { - [ -f $1 ] || return 0 - chown root:root $1 - chmod 755 $1 -} -permfix /sbin/sulogin -permfix /usr/X11R6/bin/xdm-shadow - -# check password and group files at boot time -update-rc.d passwd start 60 S . >/dev/null - -grep -q '^shadow:[^:]*:42' /etc/group && exit 0 -groupadd -g 42 shadow || ( - cat </dev/null -fi diff --git a/debian/porttime b/debian/porttime deleted file mode 100644 index 5888d63a..00000000 --- a/debian/porttime +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/porttime contains user time restrictions. -# See porttime(5). - -# If you add restrictions to this file, be sure that -# PORTTIME_CHECKS_ENAB is set to `yes' in /etc/login.defs. logoutd(8) -# will be started automatically on bootup if this file contains -# non-comment lines. You may also start it manually with -# `/etc/init.d/logoutd start'. diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 63284d78..00000000 --- a/debian/rules +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/make -f - -# FIXME - this is out of date, please update for current Debian - -package = shadow - -# see dpkg-architecture(8) -DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture) -DEB_BUILD_GNU_CPU := $(patsubst hurd-%,%,$(DEB_BUILD_ARCH)) -ifeq ($(filter-out hurd-%,$(DEB_BUILD_ARCH)),) - DEB_BUILD_GNU_SYSTEM := gnu -else - DEB_BUILD_GNU_SYSTEM := linux -endif -DEB_BUILD_GNU_TYPE=$(DEB_BUILD_GNU_CPU)-$(DEB_BUILD_GNU_SYSTEM) - -DEB_HOST_GNU_SYSTEM=$(DEB_BUILD_GNU_SYSTEM) -DEB_HOST_GNU_TYPE=$(DEB_BUILD_GNU_TYPE) - -ifeq ($(DEB_HOST_GNU_SYSTEM),linux) -package-list = binary-login binary-passwd binary-su -else -package-list = binary-passwd -endif - -# 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 - -build: - $(checkdir) - cp -a debian/control.$(DEB_HOST_GNU_SYSTEM) debian/control - # shared lib support is untested, so... - ./configure --disable-shared --disable-desrpc \ - --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) - $(MAKE) - touch build - -clean: - $(checkdir) - rm -f build debian/tar - -$(MAKE) -i distclean - rm -rf {libmisc,lib,src}/.deps - rm -rf debian/tmp{-l,-p,-s} debian/{files*,substvars} - cp -a debian/control.linux debian/control - find . -name '*~' -print0 | xargs -0 rm -f - -binary-indep: checkroot build - $(checkdir) - -binary-arch: $(package-list) - -binary-login: checkroot build - $(checkdir) - -rm -rf debian/tmp-l - install -d debian/tmp-l/{DEBIAN,bin,etc/init.d,usr/{bin,man/man{1,5,8},doc/login,sbin}} - install -s -m$(LOGIN_PERM) src/login debian/tmp-l/bin/ - install -s -m4755 src/newgrp debian/tmp-l/usr/bin/ - install -s src/{faillog,lastlog} debian/tmp-l/usr/bin/ - install -s src/logoutd debian/tmp-l/usr/sbin/ - install -m644 man/{login.1,newgrp.1} debian/tmp-l/usr/man/man1/ - install -m644 man/{login.defs.5,login.access.5,porttime.5,faillog.5,limits.5} debian/tmp-l/usr/man/man5/ - install -m644 man/{faillog.8,logoutd.8,lastlog.8} debian/tmp-l/usr/man/man8/ - ln -s newgrp debian/tmp-l/usr/bin/sg - ln -s newgrp.1.gz debian/tmp-l/usr/man/man1/sg.1.gz - install -m600 etc/login.defs.linux debian/tmp-l/etc/login.defs - install -m600 etc/{login.access,limits} debian/{securetty,porttime} debian/tmp-l/etc/ - install debian/logoutd.init debian/tmp-l/etc/init.d/logoutd - install -m644 debian/changelog debian/tmp-l/usr/doc/login/changelog.Debian - install -m644 doc/CHANGES debian/tmp-l/usr/doc/login/changelog - find debian/tmp-l/usr/{doc,man} -type f | xargs gzip -9 - install -m644 debian/login.copyright debian/tmp-l/usr/doc/login/copyright - install debian/login.preinst debian/tmp-l/DEBIAN/preinst - install debian/login.postinst debian/tmp-l/DEBIAN/postinst - install debian/login.prerm debian/tmp-l/DEBIAN/prerm - install debian/login.postrm debian/tmp-l/DEBIAN/postrm - install -m644 debian/login.conffiles debian/tmp-l/DEBIAN/conffiles - dpkg-shlibdeps debian/tmp-l/{bin/*,usr/bin/*,usr/sbin/*} - dpkg-gencontrol -isp -plogin -Pdebian/tmp-l - ./debian/checksums debian/tmp-l - -binary-passwd: checkroot build - $(checkdir) - -rm -rf debian/tmp-p - install -d debian/tmp-p/{DEBIAN,etc/{cron.daily,init.d},usr/{sbin,bin,man/{man1,man5,man8},doc/passwd}} - install -m644 etc/shells debian/tmp-p/etc/ - install debian/passwd.cron debian/tmp-p/etc/cron.daily/passwd - install debian/passwd.init debian/tmp-p/etc/init.d/passwd - install -s -m4755 src/{chage,chfn,chsh,expiry,gpasswd,passwd} debian/tmp-p/usr/bin/ - install -s src/{chpasswd,groupadd,groupdel,groupmod,grpck,grpconv,grpunconv} \ - src/{newusers,pwck,pwconv,pwunconv,useradd,userdel} \ - src/{dpasswd,usermod,vipw} debian/tmp-p/usr/sbin/ - install -m644 man/{chage.1,chfn.1,chsh.1,gpasswd.1,passwd.1} \ - debian/tmp-p/usr/man/man1/ - install -m644 man/{chpasswd.8,groupadd.8,groupdel.8,groupmod.8,grpck.8} \ - man/{newusers.8,pwck.8,dpasswd.8} \ - man/{useradd.8,userdel.8,usermod.8,vipw.8,shadowconfig.8,pwconv.8} \ - debian/tmp-p/usr/man/man8/ - install -m644 man/{passwd.5,shadow.5} debian/tmp-p/usr/man/man5/ - ln -s vipw debian/tmp-p/usr/sbin/vigr - ln -s vipw.8.gz debian/tmp-p/usr/man/man8/vigr.8.gz - for i in pwunconv.8.gz grpconv.8.gz grpunconv.8.gz ; do \ - ln -s pwconv.8.gz debian/tmp-p/usr/man/man8/$$i ; done - install -m644 debian/changelog debian/tmp-p/usr/doc/passwd/changelog.Debian - install -m644 doc/{CHANGES,README,README.limits,README.linux,README.debian} \ - debian/tmp-p/usr/doc/passwd/ - find debian/tmp-p/usr/{doc,man} -type f | xargs gzip -9f - install -m644 debian/passwd.copyright debian/tmp-p/usr/doc/passwd/copyright - install debian/login.preinst debian/tmp-p/DEBIAN/preinst - install debian/passwd.postinst debian/tmp-p/DEBIAN/postinst - install debian/passwd.postrm debian/tmp-p/DEBIAN/postrm - install -m644 debian/passwd.conffiles debian/tmp-p/DEBIAN/conffiles - dpkg-shlibdeps debian/tmp-p/usr/{bin/*,sbin/*} - # dpkg-shlibdeps fails on scripts, so install them now... - install src/shadowconfig.sh debian/tmp-p/usr/sbin/shadowconfig -ifeq ($(DEB_HOST_GNU_SYSTEM),gnu) - install etc/login.defs.hurd debian/tmp-p/etc/login.defs - echo "/etc/login.defs" >> debian/tmp-p/DEBIAN/conffiles -endif - dpkg-gencontrol -isp -ppasswd -Pdebian/tmp-p - ./debian/checksums debian/tmp-p - -binary-su: checkroot build - $(checkdir) - -rm -rf debian/tmp-s - install -d debian/tmp-s/{DEBIAN,etc,bin,usr/{doc/secure-su,man/man{1,5}}} - install -s -m4755 src/su debian/tmp-s/bin/ - install -m644 etc/suauth debian/tmp-s/etc/ - install -m644 man/suauth.5 debian/tmp-s/usr/man/man5/ - install -m644 man/su.1 debian/tmp-s/usr/man/man1/ - install -m644 debian/secure-su.README debian/tmp-s/usr/doc/secure-su/README - install -m644 debian/changelog debian/tmp-s/usr/doc/secure-su/ - find debian/tmp-s/usr/{doc,man} -type f | xargs gzip -9f - install -m644 debian/secure-su.copyright debian/tmp-s/usr/doc/secure-su/copyright - install debian/secure-su.preinst debian/tmp-s/DEBIAN/preinst - install debian/secure-su.postrm debian/tmp-s/DEBIAN/postrm - install -m644 debian/secure-su.conffiles debian/tmp-s/DEBIAN/conffiles - dpkg-shlibdeps debian/tmp-s/bin/su - dpkg-gencontrol -isp -psecure-su -Pdebian/tmp-s - ./debian/checksums debian/tmp-s - -define checkdir - test -f lib/shadow.c -a -f debian/rules -endef - - -binary: binary-indep binary-arch - -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -checkroot: - $(checkdir) -# test root = "`whoami`" - -.PHONY: binary binary-arch binary-indep clean checkroot - -# Local Variables: -# mode:Makefile diff --git a/debian/secure-su.README b/debian/secure-su.README deleted file mode 100644 index 723f37a0..00000000 --- a/debian/secure-su.README +++ /dev/null @@ -1,4 +0,0 @@ -The su from shellutils is diverted into /bin/secure-su. That -directory MUST be owned by root and have permissions 700. Otherwise -you will lost any security advantages you will gain by installing -secure-su as users can still invoke the old su. diff --git a/debian/secure-su.conffiles b/debian/secure-su.conffiles deleted file mode 100644 index 2853262a..00000000 --- a/debian/secure-su.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/suauth diff --git a/debian/secure-su.copyright b/debian/secure-su.copyright deleted file mode 100644 index 94db3b18..00000000 --- a/debian/secure-su.copyright +++ /dev/null @@ -1,54 +0,0 @@ -This is Debian/GNU Linux's prepackaged version of secure-su. - -It was downloaded from: . - -This software is copyright 1988 - 1994, Julianne Frances Haugh. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of Julianne F. Haugh nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -This source code is currently archived on ftp.uu.net in the -comp.sources.misc portion of the USENET archives. You may also contact -the author, Julianne F. Haugh, at jockgrrl@ix.netcom.com if you have -any questions regarding this package. - -THIS SOFTWARE IS BEING DISTRIBUTED AS-IS. THE AUTHORS DISCLAIM ALL -LIABILITY FOR ANY CONSEQUENCES OF USE. THE USER IS SOLELY RESPONSIBLE -FOR THE MAINTENANCE OF THIS SOFTWARE PACKAGE. THE AUTHORS ARE UNDER NO -OBLIGATION TO PROVIDE MODIFICATIONS OR IMPROVEMENTS. THE USER IS -ENCOURAGED TO TAKE ANY AND ALL STEPS NEEDED TO PROTECT AGAINST ACCIDENTAL -LOSS OF INFORMATION OR MACHINE RESOURCES. - -Special thanks are due to Chip Rosenthal for his fine testing efforts; -to Steve Simmons for his work in porting this code to BSD; and to Bill -Kennedy for his contributions of LaserJet printer time and energies. -Also, thanks for Dennis L. Mumaugh for the initial shadow password -information and to Tony Walton (olapw@olgb1.oliv.co.uk) for the System -V Release 4 changes. Effort in porting to SunOS has been contributed -by Dr. Michael Newberry (miken@cs.adfa.oz.au) and Micheal J. Miller, Jr. -(mke@kaberd.rain.com). Effort in porting to AT&T UNIX System V Release -4 has been provided by Andrew Herbert (andrew@werple.pub.uu.oz.au). -Special thanks to Marek Michalkiewicz (marekm@i17linuxb.ists.pwr.wroc.pl) -for taking over the Linux port of this software. diff --git a/debian/secure-su.postrm b/debian/secure-su.postrm deleted file mode 100644 index aef1e6ab..00000000 --- a/debian/secure-su.postrm +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -if [ remove = "$1" ] ; then - dpkg-divert --package secure-su --remove --rename \ - --divert /bin/secure-su/su /bin/su - dpkg-divert --package secure-su --remove --rename \ - --divert /usr/man/man1/gnu-su.1.gz /usr/man/man1/su.1.gz - rm /bin/secure-su/README.gz - rmdir /bin/secure-su || true -fi diff --git a/debian/secure-su.preinst b/debian/secure-su.preinst deleted file mode 100644 index d5522c2e..00000000 --- a/debian/secure-su.preinst +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ install = "$1" ] ; then - # dpkg-divert uses rename so can't do cross-device diversions. bleah. - [ -d /bin/secure-su ] || mkdir /bin/secure-su - chmod 700 /bin/secure-su - ln -sf ../../usr/doc/secure-su/README.gz /bin/secure-su/README.gz - dpkg-divert --package secure-su --add --rename \ - --divert /bin/secure-su/su /bin/su - dpkg-divert --package secure-su --add --rename \ - --divert /usr/man/man1/gnu-su.1.gz /usr/man/man1/su.1.gz -fi diff --git a/debian/securetty b/debian/securetty deleted file mode 100644 index d66d2a63..00000000 --- a/debian/securetty +++ /dev/null @@ -1,14 +0,0 @@ -# /etc/securetty: list of terminals on which root is allowed to login. -# See securetty(5) and login(1). -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -tty7 -tty8 -tty9 -tty10 -tty11 -tty12 diff --git a/debian/shadowconfig.sh b/debian/shadowconfig.sh deleted file mode 100755 index 17b8aa9e..00000000 --- a/debian/shadowconfig.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# turn shadow passwords on or off on a Debian system - -set -e - -permfix () { - [ -f $1 ] || return 0 - chown root:shadow $1 - chmod 2755 $1 -} -export -f permfix - -shadowon () { -bash<<- EOF - set -e - - permfix /usr/X11R6/bin/xlock - permfix /usr/X11R6/bin/xtrlock - permfix /bin/vlock - - pwck -q - grpck - pwconv - grpconv - cd /etc - chown root:root passwd group - chmod 644 passwd group - chown root:shadow shadow gshadow - chmod 640 shadow gshadow -EOF -} - -shadowoff () { -bash<<- EOF - set -e - pwck -q - grpck - pwunconv - grpunconv - cd /etc - # sometimes the passwd perms get munged - chown root:root passwd group - chmod 644 passwd group -EOF -} - -case "$1" in - "on") - if shadowon ; then - echo Shadow passwords are now on. - else - echo Please correct the error and rerun \`$0 on\' - exit 1 - fi - ;; - "off") - if shadowoff ; then - echo Shadow passwords are now off. - else - echo Please correct the error and rerun \`$0 off\' - exit 1 - fi - ;; - *) - echo Usage: $0 on \| off - ;; -esac diff --git a/depcomp b/depcomp index 65899658..edb5d38e 100755 --- a/depcomp +++ b/depcomp @@ -1,7 +1,7 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. +# Copyright 1999, 2000, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,7 +31,16 @@ if test -z "$depmode" || test -z "$source" || test -z "$object"; then fi # `libtool' can also be set to `yes' or `no'. -depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} +if test -z "$depfile"; then + base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` + dir=`echo "$object" | sed 's,/.*$,/,'` + if test "$dir" = "$object"; then + dir= + fi + # FIXME: should be _deps on DOS. + depfile="$dir.deps/$base" +fi + tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" @@ -163,19 +172,25 @@ sgi) aix) # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" - outname="$stripped.o" if test "$libtool" = yes; then "$@" -Wc,-M else "$@" -M fi - stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + if test $stat -eq 0; then : else rm -f "$tmpdepfile" @@ -183,6 +198,7 @@ aix) fi if test -f "$tmpdepfile"; then + outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. @@ -197,18 +213,61 @@ aix) rm -f "$tmpdepfile" ;; +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + tru64) - # The Tru64 AIX compiler uses -MD to generate dependencies as a side + # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put # dependencies in `foo.d' instead, so we check for that too. # Subdirectories are respected. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - tmpdepfile1="$object.d" - tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` if test "$libtool" = yes; then + tmpdepfile1="$dir.libs/$base.lo.d" + tmpdepfile2="$dir.libs/$base.d" "$@" -Wc,-MD else + tmpdepfile1="$dir$base.o.d" + tmpdepfile2="$dir$base.d" "$@" -MD fi @@ -226,8 +285,8 @@ tru64) fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -240,34 +299,42 @@ tru64) dashmstdout) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - test -z "$dashmflag" && dashmflag=-M - ( IFS=" " - case " $* " in - *" --mode=compile "*) # this is libtool, let us make it quiet - for arg - do # cycle over the arguments - case "$arg" in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg ;; esac - "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" tr ' ' ' @@ -285,36 +352,40 @@ dashXmstdout) ;; makedepend) - # X makedepend - ( - shift - cleared=no - for arg in "$@"; do - case $cleared in no) - set ""; shift - cleared=yes - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift;; - -*) - ;; - *) - set fnord "$@" "$arg"; shift;; - esac + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi + shift + fi + # X makedepend + shift + cleared=no + for arg in "$@"; do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tail +3 "$tmpdepfile" | tr ' ' ' + sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. @@ -324,35 +395,39 @@ makedepend) cpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg ;; esac - "$@" -E | + done + + "$@" -E | sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -362,34 +437,27 @@ cpp) msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, + # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac + "$@" || exit $? + IFS=" " + for arg + do + case "$arg" in + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; + shift + shift + ;; esac - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi + done + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" diff --git a/doc/ANNOUNCE b/doc/ANNOUNCE deleted file mode 100644 index 36a75156..00000000 --- a/doc/ANNOUNCE +++ /dev/null @@ -1,48 +0,0 @@ -$Id: ANNOUNCE,v 1.5 2000/10/16 21:34:39 kloczek Exp $ - -[ This is the original comp.os.linux.announce posting (only the - author's name and e-mail address has been updated), kept here - for historical reasons. Many things have changed since then. - Linux distributions are using it, and the mailing list address - has been changed. See README.linux (in the same directory) - for more up to date information. --marekm ] - -This is a new beta release of the Shadow Password Suite for Linux. -Many bugs have been reported (and fixed!), and the package is now -under a BSD-style copyright. It was written by Julianne F. Haugh -, and the Linux port is now maintained by me. - -Again, this is beta software which may still have some bugs, please -treat it as such. Please don't install it if you don't know what -you're doing. Please test it as much as you can, and report any -bugs - if you report them, they will be fixed! If all goes well, -Shadow should be stable enough for general use within a few months. -Once it is stable, Linux distributions can start using it - there -are no copyright problems anymore. - -Thanks to Greg Gallagher there is now -a developers mailing list, shadow-list@neptune.cin.net. Send the -command "subscribe" to shadow-list-request@neptune.cin.net (NOT to -the mailing list itself!) to subscribe if you are interested. - - -LSM entry follows: - -Begin3 -Title: Shadow Password Suite -Version: 3.3.3-951218 -Entered-date: 18DEC95 -Description: -Keywords: login passwd security shadow -Author: jfh@austin.ibm.com (Julianne Frances Haugh) -Maintained-by: marekm@i17linuxb.ists.pwr.wroc.pl (Marek Michalkiewicz) -Primary-site: sunsite.unc.edu /pub/Linux/system/Admin - 220K shadow-951218.tar.gz -Alternate-site: ftp.ists.pwr.wroc.pl /pub/linux/shadow -Original-site: ftp.uu.net ? -Platforms: -Copying-policy: BSD-like -End - -Marek Michalkiewicz -marekm@i17linuxb.ists.pwr.wroc.pl diff --git a/doc/Makefile.am b/doc/Makefile.am index c6869979..ade72e0d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # This is a dummy Makefile.am to get automake work flawlessly, # and also cooperate to make a distribution for `make dist' -EXTRA_DIST = ANNOUNCE HOWTO LICENSE LSM README \ +EXTRA_DIST = HOWTO LICENSE LSM README \ README.limits README.linux README.mirrors README.nls README.pam \ README.platforms README.sun4 WISHLIST console.c.spec.txt cracklib26.diff diff --git a/doc/Makefile.in b/doc/Makefile.in index 2ff3887d..1a2cf02d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,113 +17,163 @@ # This is a dummy Makefile.am to get automake work flawlessly, # and also cooperate to make a distribution for `make dist' -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ -EXTRA_DIST = ANNOUNCE HOWTO LICENSE LSM README \ +EXTRA_DIST = HOWTO LICENSE LSM README \ README.limits README.linux README.mirrors README.nls README.pam \ README.platforms README.sun4 WISHLIST console.c.spec.txt cracklib26.diff subdir = doc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = -DIST_COMMON = README INSTALL Makefile.am Makefile.in +DIST_COMMON = README $(srcdir)/Makefile.in INSTALL Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -132,17 +183,12 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -150,15 +196,26 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -170,7 +227,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -182,6 +238,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -189,7 +246,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -199,7 +256,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -221,13 +278,21 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ @@ -237,7 +302,8 @@ uninstall-am: uninstall-info-am install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool uninstall uninstall-am uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/doc/README.pam b/doc/README.pam index 4a873640..645cc734 100644 --- a/doc/README.pam +++ b/doc/README.pam @@ -21,7 +21,6 @@ login: passwd: - administrator defined authentication methods - - TCFS support - password expiration - password strength checks diff --git a/etc/Makefile.in b/etc/Makefile.in index 76e10098..a4f7cf08 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,99 +17,143 @@ # This is a dummy Makefile.am to get automake work flawlessly, # and also cooperate to make a distribution for `make dist' -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ EXTRA_DIST = \ limits \ @@ -121,20 +166,27 @@ EXTRA_DIST = \ SUBDIRS = pam.d subdir = etc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = -RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in +RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + ps-recursive install-info-recursive uninstall-info-recursive \ + all-recursive install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu etc/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -144,13 +196,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu etc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd @@ -160,7 +205,7 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -180,7 +225,7 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -207,66 +252,108 @@ tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ETAGS = etags +ETAGSFLAGS = + +CTAGS = ctags +CTAGSFLAGS = tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ @@ -296,6 +383,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -303,7 +391,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -313,7 +401,7 @@ clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool \ distclean-tags @@ -336,30 +424,40 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive distclean \ - distclean-generic distclean-libtool distclean-recursive \ - distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ - info-recursive install install-am install-data install-data-am \ - install-data-recursive install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-man install-recursive \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive mostlyclean \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - tags tags-recursive uninstall uninstall-am uninstall-info-am \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ + clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ + install-exec install-exec-am install-exec-recursive \ + install-info install-info-am install-info-recursive install-man \ + install-recursive install-strip installcheck installcheck-am \ + installdirs installdirs-am installdirs-recursive \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ + pdf-recursive ps ps-am ps-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/etc/login.defs b/etc/login.defs index 7af8d118..976f92bb 100644 --- a/etc/login.defs +++ b/etc/login.defs @@ -1,7 +1,7 @@ # # /etc/login.defs - Configuration control definitions for the login package. # -# $Id: login.defs,v 1.2 1997/05/01 23:14:35 marekm Exp $ +# $Id: login.defs,v 1.5 2003/05/04 20:09:43 kloczek Exp $ # # Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. # If unspecified, some arbitrary (and possibly incorrect) value will @@ -17,12 +17,7 @@ FAIL_DELAY 5 # -# Enable additional passwords upon dialup lines specified in /etc/dialups. -# -DIALUPS_CHECK_ENAB yes - -# -# Enable logging and display of /usr/adm/faillog login failure info. +# Enable logging and display of /var/log/faillog login failure info. # FAILLOG_ENAB yes @@ -32,7 +27,7 @@ FAILLOG_ENAB yes LOG_UNKFAIL_ENAB yes # -# Enable logging and display of /usr/adm/lastlog login time info. +# Enable logging and display of /var/log/lastlog login time info. # LASTLOG_ENAB yes @@ -74,7 +69,7 @@ CONSOLE /etc/consoles # # If defined, all su activity is logged to this file. # -SULOG_FILE /usr/adm/sulog +SULOG_FILE /var/log/sulog # # If defined, ":" delimited list of "message of the day" files to @@ -121,7 +116,7 @@ SU_NAME su # MAILDIR is for Qmail # #MAILDIR Maildir -MAIL_DIR /usr/spool/mail +MAIL_DIR /var/mail #MAIL_FILE .mail # @@ -154,8 +149,8 @@ ENV_HZ HZ=50 # # *REQUIRED* The default PATH settings, for superuser and normal users. # -ENV_SUPATH PATH=/etc/local:/etc:/local/bin:/usr/bin:/bin -ENV_PATH PATH=/local/bin:/usr/bin:/bin +ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin +ENV_PATH PATH=/bin:/usr/bin # # Terminal permissions @@ -212,3 +207,7 @@ SU_WHEEL_ONLY no # If compiled with cracklib support, where are the dictionaries # #CRACKLIB_DICTPATH /usr/share/lib/pw_dict + +# chkpasswd uses this one +MD5_CRYPT_ENAB yes + diff --git a/etc/login.defs.linux b/etc/login.defs.linux index 94402934..5ea0376c 100644 --- a/etc/login.defs.linux +++ b/etc/login.defs.linux @@ -1,7 +1,7 @@ # # /etc/login.defs - Configuration control definitions for the login package. # -# $Id: login.defs.linux,v 1.12 2000/08/26 18:27:10 marekm Exp $ +# $Id: login.defs.linux,v 1.14 2003/05/04 20:09:43 kloczek Exp $ # # Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. # If unspecified, some arbitrary (and possibly incorrect) value will @@ -17,11 +17,6 @@ # FAIL_DELAY 3 -# -# Enable additional passwords upon dialup lines specified in /etc/dialups. -# -DIALUPS_CHECK_ENAB yes - # # Enable logging and display of /var/log/faillog login failure info. # @@ -331,13 +326,6 @@ ENVIRON_FILE /etc/environment # #USERDEL_CMD /usr/sbin/userdel_local -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. No password is required to log in -# as a non-root user on these devices. -# -#NO_PASSWORD_CONSOLE tty1:tty2:tty3:tty4:tty5:tty6 - # # When prompting for password without echo, getpass() can optionally # display a random number (in the range 1 to GETPASS_ASTERISKS) of '*' diff --git a/etc/pam.d/Makefile.in b/etc/pam.d/Makefile.in index c43e8d19..ed15e32e 100644 --- a/etc/pam.d/Makefile.in +++ b/etc/pam.d/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,110 +17,160 @@ # This is a dummy Makefile.am to get automake work flawlessly, # and also cooperate to make a distribution for `make dist' -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ EXTRA_DIST = passwd su shadow useradd subdir = etc/pam.d +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu etc/pam.d/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -129,17 +180,12 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu etc/pam.d/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -147,15 +193,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -167,7 +224,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -179,6 +235,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -186,7 +243,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -196,7 +253,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -218,13 +275,21 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ @@ -234,7 +299,8 @@ uninstall-am: uninstall-info-am install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool uninstall uninstall-am uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/etc/useradd b/etc/useradd index 0a28b4e4..7d6f65e6 100644 --- a/etc/useradd +++ b/etc/useradd @@ -5,3 +5,4 @@ INACTIVE=-1 EXPIRE= SHELL=/bin/bash SKEL=/etc/skel +CREATE_MAIL_SPOOL=yes diff --git a/install-sh b/install-sh index e9de2384..6ce63b9f 100755 --- a/install-sh +++ b/install-sh @@ -1,19 +1,37 @@ #!/bin/sh # # install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). # -# Copyright 1991 by the Massachusetts Institute of Technology +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. # -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it @@ -56,7 +74,7 @@ dir_arg="" while [ x"$1" != x ]; do case $1 in - -c) instcmd="$cpprog" + -c) instcmd=$cpprog shift continue;; @@ -79,7 +97,7 @@ while [ x"$1" != x ]; do shift continue;; - -s) stripcmd="$stripprog" + -s) stripcmd=$stripprog shift continue;; @@ -106,128 +124,132 @@ done if [ x"$src" = x ] then - echo "install: no input file specified" + echo "$0: no input file specified" >&2 exit 1 else - true + : fi if [ x"$dir_arg" != x ]; then dst=$src src="" - - if [ -d $dst ]; then + + if [ -d "$dst" ]; then instcmd=: chmodcmd="" else - instcmd=mkdir + instcmd=$mkdirprog fi else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad +# might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. - if [ -f $src -o -d $src ] + if [ -f "$src" ] || [ -d "$src" ] then - true + : else - echo "install: $src does not exist" + echo "$0: $src does not exist" >&2 exit 1 fi - + if [ x"$dst" = x ] then - echo "install: no destination specified" + echo "$0: no destination specified" >&2 exit 1 else - true + : fi # If destination is a directory, append the input filename; if your system # does not like double slashes in filenames, you may need to add some logic - if [ -d $dst ] + if [ -d "$dst" ] then - dst="$dst"/`basename $src` + dst=$dst/`basename "$src"` else - true + : fi fi ## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` +dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. # this part is taken from Noah Friedman's mkinstalldirs script # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" +defaultIFS=' + ' +IFS="${IFS-$defaultIFS}" -oIFS="${IFS}" +oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" +set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +IFS=$oIFS pathcomp='' while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" + pathcomp=$pathcomp$1 shift - if [ ! -d "${pathcomp}" ] ; + if [ ! -d "$pathcomp" ] ; then - $mkdirprog "${pathcomp}" + $mkdirprog "$pathcomp" else - true + : fi - pathcomp="${pathcomp}/" + pathcomp=$pathcomp/ done fi if [ x"$dir_arg" != x ] then - $doit $instcmd $dst && + $doit $instcmd "$dst" && - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi + if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi else # If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] + if [ x"$transformarg" = x ] then - dstfile=`basename $dst` + dstfile=`basename "$dst"` else - dstfile=`basename $dst $transformbasename | + dstfile=`basename "$dst" $transformbasename | sed $transformarg`$transformbasename fi # don't allow the sed command to completely eliminate the filename - if [ x"$dstfile" = x ] + if [ x"$dstfile" = x ] then - dstfile=`basename $dst` + dstfile=`basename "$dst"` else - true + : fi -# Make a temp file name in the proper directory. +# Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/#inst.$$# + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + +# Trap to clean up temp files at exit. + + trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 + trap '(exit $?); exit' 1 2 13 15 # Move or copy the file name to the temp name - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && + $doit $instcmd "$src" "$dsttmp" && # and set any options; do chmod last to preserve setuid bits @@ -235,17 +257,38 @@ else # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && + if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && + +# Now remove or move aside any old file at destination location. We try this +# two ways since rm can't unlink itself on some systems and the destination +# file might be busy for other reasons. In this case, the final cleanup +# might fail but the new file should still install successfully. + +{ + if [ -f "$dstdir/$dstfile" ] + then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || + $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || + { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi +} && # Now rename the file to the real destination. - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" fi && +# The final little trick to "correctly" pass the exit status to the exit trap. -exit 0 +{ + (exit 0); exit +} diff --git a/intl/ChangeLog b/intl/ChangeLog deleted file mode 100644 index 84e2b37e..00000000 --- a/intl/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2001-09-13 GNU - - * Version 0.10.40 released. - diff --git a/intl/Makefile.in b/intl/Makefile.in deleted file mode 100644 index 19ed4a7e..00000000 --- a/intl/Makefile.in +++ /dev/null @@ -1,313 +0,0 @@ -# Makefile for directory with message catalog handling in GNU NLS Utilities. -# Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published -# by the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -# USA. - -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = /bin/sh - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -transform = @program_transform_name@ -libdir = @libdir@ -includedir = @includedir@ -datadir = @datadir@ -localedir = $(datadir)/locale -gettextsrcdir = $(datadir)/gettext/intl -aliaspath = $(localedir) -subdir = intl - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` - -l = @INTL_LIBTOOL_SUFFIX_PREFIX@ - -AR = ar -CC = @CC@ -LIBTOOL = @LIBTOOL@ -RANLIB = @RANLIB@ -YACC = @INTLBISON@ -y -d -YFLAGS = --name-prefix=__gettext - -DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ --DLIBDIR=\"$(libdir)\" @DEFS@ -CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ - -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) - -HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h -COMHDRS = gettext.h gettextP.h hash-string.h -SOURCES = $(COMSRCS) intl-compat.c -COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ -finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \ -localcharset.c -OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ -finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \ -plural.$lo localcharset.$lo -GETTOBJS = intl-compat.$lo -DISTFILES.common = Makefile.in \ -config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) -DISTFILES.generated = plural.c -DISTFILES.normal = VERSION -DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc -DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c - -# Libtool's library version information for libintl. -# Before making a gettext release, the gettext maintainer must change this -# according to the libtool documentation, section "Library interface versions". -# Maintainers of other packages that include the intl directory must *not* -# change these values. -LTV_CURRENT=1 -LTV_REVISION=1 -LTV_AGE=0 - -.SUFFIXES: -.SUFFIXES: .c .y .o .lo .sin .sed -.c.o: - $(COMPILE) $< -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) $< - -.y.c: - $(YACC) $(YFLAGS) --output $@ $< - rm -f $*.h - -.sin.sed: - sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@ - mv t-$@ $@ - -INCLUDES = -I.. -I. -I$(top_srcdir)/intl - -all: all-@USE_INCLUDED_LIBINTL@ -all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed -all-no: all-no-@BUILD_INCLUDED_LIBINTL@ -all-no-yes: libgnuintl.$la -all-no-no: - -libintl.a libgnuintl.a: $(OBJECTS) - rm -f $@ - $(AR) cru $@ $(OBJECTS) - $(RANLIB) $@ - -libintl.la libgnuintl.la: $(OBJECTS) - $(LIBTOOL) --mode=link \ - $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ - $(OBJECTS) @LIBICONV@ \ - -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ - -rpath $(libdir) \ - -no-undefined - -libintl.h: libgnuintl.h - cp $(srcdir)/libgnuintl.h libintl.h - -charset.alias: config.charset - $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ - mv t-$@ $@ - -check: all - -# This installation goal is only used in GNU gettext. Packages which -# only use the library should use install instead. - -# We must not install the libintl.h/libintl.a files if we are on a -# system which has the GNU gettext() function in its C library or in a -# separate library. -# If you want to use the one which comes with this version of the -# package, you have to use `configure --with-included-gettext'. -install: install-exec install-data -install-exec: all - if test "$(PACKAGE)" = "gettext" \ - && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ - $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ - $(LIBTOOL) --mode=install \ - $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ - else \ - : ; \ - fi - if test '@USE_INCLUDED_LIBINTL@' = yes; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir); \ - temp=$(DESTDIR)$(libdir)/t-charset.alias; \ - dest=$(DESTDIR)$(libdir)/charset.alias; \ - if test -f $(DESTDIR)$(libdir)/charset.alias; then \ - orig=$(DESTDIR)$(libdir)/charset.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - else \ - if test @GLIBC21@ = no; then \ - orig=charset.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - fi; \ - fi; \ - $(mkinstalldirs) $(DESTDIR)$(localedir); \ - test -f $(DESTDIR)$(localedir)/locale.alias \ - && orig=$(DESTDIR)$(localedir)/locale.alias \ - || orig=$(srcdir)/locale.alias; \ - temp=$(DESTDIR)$(localedir)/t-locale.alias; \ - dest=$(DESTDIR)$(localedir)/locale.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - else \ - : ; \ - fi -install-data: all - if test "$(PACKAGE)" = "gettext"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ - $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ - dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \ - for file in $$dists; do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \ - dists="$(DISTFILES.generated)"; \ - for file in $$dists; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - $(INSTALL_DATA) $$dir/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - dists="$(DISTFILES.obsolete)"; \ - for file in $$dists; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi - -# Define this as empty until I found a useful application. -installcheck: - -uninstall: - if test "$(PACKAGE)" = "gettext" \ - && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ - rm -f $(DESTDIR)$(includedir)/libintl.h; \ - $(LIBTOOL) --mode=uninstall \ - rm -f $(DESTDIR)$(libdir)/libintl.$la; \ - else \ - : ; \ - fi - if test '@USE_INCLUDED_LIBINTL@' = yes; then \ - if test -f $(DESTDIR)$(libdir)/charset.alias; then \ - temp=$(DESTDIR)$(libdir)/t-charset.alias; \ - dest=$(DESTDIR)$(libdir)/charset.alias; \ - sed -f ref-del.sed $$dest > $$temp; \ - if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ - rm -f $$dest; \ - else \ - $(INSTALL_DATA) $$temp $$dest; \ - fi; \ - rm -f $$temp; \ - fi; \ - if test -f $(DESTDIR)$(localedir)/locale.alias; then \ - temp=$(DESTDIR)$(localedir)/t-locale.alias; \ - dest=$(DESTDIR)$(localedir)/locale.alias; \ - sed -f ref-del.sed $$dest > $$temp; \ - if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ - rm -f $$dest; \ - else \ - $(INSTALL_DATA) $$temp $$dest; \ - fi; \ - rm -f $$temp; \ - fi; \ - else \ - : ; \ - fi - if test "$(PACKAGE)" = "gettext"; then \ - for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi - -info dvi: - -$(OBJECTS): ../config.h libgnuintl.h -bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h -dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h - -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) - here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) - -id: ID - -ID: $(HEADERS) $(SOURCES) - here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) - - -mostlyclean: - rm -f *.a *.la *.o *.lo core core.* - rm -f libintl.h charset.alias ref-add.sed ref-del.sed - rm -f -r .libs _libs - -clean: mostlyclean - -distclean: clean - rm -f Makefile ID TAGS - if test "$(PACKAGE)" = gettext; then \ - rm -f ChangeLog.inst $(DISTFILES.normal); \ - else \ - : ; \ - fi - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - - -# GNU gettext needs not contain the file `VERSION' but contains some -# other files which should not be distributed in other packages. -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: Makefile - if test "$(PACKAGE)" = gettext; then \ - additional="$(DISTFILES.gettext)"; \ - else \ - additional="$(DISTFILES.normal)"; \ - fi; \ - $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ - for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - ln $$dir/$$file $(distdir) 2> /dev/null \ - || cp -p $$dir/$$file $(distdir); \ - done - -Makefile: Makefile.in ../config.status - cd .. \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/intl/VERSION b/intl/VERSION deleted file mode 100644 index cb8a01a7..00000000 --- a/intl/VERSION +++ /dev/null @@ -1 +0,0 @@ -GNU gettext library from gettext-0.10.40 diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c deleted file mode 100644 index c6a9bd16..00000000 --- a/intl/bindtextdom.c +++ /dev/null @@ -1,369 +0,0 @@ -/* Implementation of the bindtextdomain(3) function - Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include - -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif -#include "gettextP.h" - -#ifdef _LIBC -/* We have to handle multi-threaded applications. */ -# include -#else -/* Provide dummy implementation if this is outside glibc. */ -# define __libc_rwlock_define(CLASS, NAME) -# define __libc_rwlock_wrlock(NAME) -# define __libc_rwlock_unlock(NAME) -#endif - -/* The internal variables in the standalone libintl.a must have different - names than the internal variables in GNU libc, otherwise programs - using libintl.a cannot be linked statically. */ -#if !defined _LIBC -# define _nl_default_dirname _nl_default_dirname__ -# define _nl_domain_bindings _nl_domain_bindings__ -#endif - -/* Some compilers, like SunOS4 cc, don't have offsetof in . */ -#ifndef offsetof -# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) -#endif - -/* @@ end of prolog @@ */ - -/* Contains the default location of the message catalogs. */ -extern const char _nl_default_dirname[]; - -/* List with bindings of specific domains. */ -extern struct binding *_nl_domain_bindings; - -/* Lock variable to protect the global data in the gettext implementation. */ -__libc_rwlock_define (extern, _nl_state_lock) - - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define BINDTEXTDOMAIN __bindtextdomain -# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset -# ifndef strdup -# define strdup(str) __strdup (str) -# endif -#else -# define BINDTEXTDOMAIN bindtextdomain__ -# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__ -#endif - -/* Prototypes for local functions. */ -static void set_binding_values PARAMS ((const char *domainname, - const char **dirnamep, - const char **codesetp)); - -/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP - to be used for the DOMAINNAME message catalog. - If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not - modified, only the current value is returned. - If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither - modified nor returned. */ -static void -set_binding_values (domainname, dirnamep, codesetp) - const char *domainname; - const char **dirnamep; - const char **codesetp; -{ - struct binding *binding; - int modified; - - /* Some sanity checks. */ - if (domainname == NULL || domainname[0] == '\0') - { - if (dirnamep) - *dirnamep = NULL; - if (codesetp) - *codesetp = NULL; - return; - } - - __libc_rwlock_wrlock (_nl_state_lock); - - modified = 0; - - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) - { - int compare = strcmp (domainname, binding->domainname); - if (compare == 0) - /* We found it! */ - break; - if (compare < 0) - { - /* It is not in the list. */ - binding = NULL; - break; - } - } - - if (binding != NULL) - { - if (dirnamep) - { - const char *dirname = *dirnamep; - - if (dirname == NULL) - /* The current binding has be to returned. */ - *dirnamep = binding->dirname; - else - { - /* The domain is already bound. If the new value and the old - one are equal we simply do nothing. Otherwise replace the - old binding. */ - char *result = binding->dirname; - if (strcmp (dirname, result) != 0) - { - if (strcmp (dirname, _nl_default_dirname) == 0) - result = (char *) _nl_default_dirname; - else - { -#if defined _LIBC || defined HAVE_STRDUP - result = strdup (dirname); -#else - size_t len = strlen (dirname) + 1; - result = (char *) malloc (len); - if (__builtin_expect (result != NULL, 1)) - memcpy (result, dirname, len); -#endif - } - - if (__builtin_expect (result != NULL, 1)) - { - if (binding->dirname != _nl_default_dirname) - free (binding->dirname); - - binding->dirname = result; - modified = 1; - } - } - *dirnamep = result; - } - } - - if (codesetp) - { - const char *codeset = *codesetp; - - if (codeset == NULL) - /* The current binding has be to returned. */ - *codesetp = binding->codeset; - else - { - /* The domain is already bound. If the new value and the old - one are equal we simply do nothing. Otherwise replace the - old binding. */ - char *result = binding->codeset; - if (result == NULL || strcmp (codeset, result) != 0) - { -#if defined _LIBC || defined HAVE_STRDUP - result = strdup (codeset); -#else - size_t len = strlen (codeset) + 1; - result = (char *) malloc (len); - if (__builtin_expect (result != NULL, 1)) - memcpy (result, codeset, len); -#endif - - if (__builtin_expect (result != NULL, 1)) - { - if (binding->codeset != NULL) - free (binding->codeset); - - binding->codeset = result; - binding->codeset_cntr++; - modified = 1; - } - } - *codesetp = result; - } - } - } - else if ((dirnamep == NULL || *dirnamep == NULL) - && (codesetp == NULL || *codesetp == NULL)) - { - /* Simply return the default values. */ - if (dirnamep) - *dirnamep = _nl_default_dirname; - if (codesetp) - *codesetp = NULL; - } - else - { - /* We have to create a new binding. */ - size_t len = strlen (domainname) + 1; - struct binding *new_binding = - (struct binding *) malloc (offsetof (struct binding, domainname) + len); - - if (__builtin_expect (new_binding == NULL, 0)) - goto failed; - - memcpy (new_binding->domainname, domainname, len); - - if (dirnamep) - { - const char *dirname = *dirnamep; - - if (dirname == NULL) - /* The default value. */ - dirname = _nl_default_dirname; - else - { - if (strcmp (dirname, _nl_default_dirname) == 0) - dirname = _nl_default_dirname; - else - { - char *result; -#if defined _LIBC || defined HAVE_STRDUP - result = strdup (dirname); - if (__builtin_expect (result == NULL, 0)) - goto failed_dirname; -#else - size_t len = strlen (dirname) + 1; - result = (char *) malloc (len); - if (__builtin_expect (result == NULL, 0)) - goto failed_dirname; - memcpy (result, dirname, len); -#endif - dirname = result; - } - } - *dirnamep = dirname; - new_binding->dirname = (char *) dirname; - } - else - /* The default value. */ - new_binding->dirname = (char *) _nl_default_dirname; - - new_binding->codeset_cntr = 0; - - if (codesetp) - { - const char *codeset = *codesetp; - - if (codeset != NULL) - { - char *result; - -#if defined _LIBC || defined HAVE_STRDUP - result = strdup (codeset); - if (__builtin_expect (result == NULL, 0)) - goto failed_codeset; -#else - size_t len = strlen (codeset) + 1; - result = (char *) malloc (len); - if (__builtin_expect (result == NULL, 0)) - goto failed_codeset; - memcpy (result, codeset, len); -#endif - codeset = result; - new_binding->codeset_cntr++; - } - *codesetp = codeset; - new_binding->codeset = (char *) codeset; - } - else - new_binding->codeset = NULL; - - /* Now enqueue it. */ - if (_nl_domain_bindings == NULL - || strcmp (domainname, _nl_domain_bindings->domainname) < 0) - { - new_binding->next = _nl_domain_bindings; - _nl_domain_bindings = new_binding; - } - else - { - binding = _nl_domain_bindings; - while (binding->next != NULL - && strcmp (domainname, binding->next->domainname) > 0) - binding = binding->next; - - new_binding->next = binding->next; - binding->next = new_binding; - } - - modified = 1; - - /* Here we deal with memory allocation failures. */ - if (0) - { - failed_codeset: - if (new_binding->dirname != _nl_default_dirname) - free (new_binding->dirname); - failed_dirname: - free (new_binding); - failed: - if (dirnamep) - *dirnamep = NULL; - if (codesetp) - *codesetp = NULL; - } - } - - /* If we modified any binding, we flush the caches. */ - if (modified) - ++_nl_msg_cat_cntr; - - __libc_rwlock_unlock (_nl_state_lock); -} - -/* Specify that the DOMAINNAME message catalog will be found - in DIRNAME rather than in the system locale data base. */ -char * -BINDTEXTDOMAIN (domainname, dirname) - const char *domainname; - const char *dirname; -{ - set_binding_values (domainname, &dirname, NULL); - return (char *) dirname; -} - -/* Specify the character encoding in which the messages from the - DOMAINNAME message catalog will be returned. */ -char * -BIND_TEXTDOMAIN_CODESET (domainname, codeset) - const char *domainname; - const char *codeset; -{ - set_binding_values (domainname, NULL, &codeset); - return (char *) codeset; -} - -#ifdef _LIBC -/* Aliases for function names in GNU C Library. */ -weak_alias (__bindtextdomain, bindtextdomain); -weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset); -#endif diff --git a/intl/config.charset b/intl/config.charset deleted file mode 100644 index f4f2611c..00000000 --- a/intl/config.charset +++ /dev/null @@ -1,438 +0,0 @@ -#! /bin/sh -# Output a system dependent table of character encoding aliases. -# -# Copyright (C) 2000-2001 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published -# by the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -# USA. -# -# The table consists of lines of the form -# ALIAS CANONICAL -# -# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)". -# ALIAS is compared in a case sensitive way. -# -# CANONICAL is the GNU canonical name for this character encoding. -# It must be an encoding supported by libiconv. Support by GNU libc is -# also desirable. CANONICAL is case insensitive. Usually an upper case -# MIME charset name is preferred. -# The current list of GNU canonical charset names is as follows. -# -# name used by which systems a MIME name? -# ASCII, ANSI_X3.4-1968 glibc solaris freebsd -# ISO-8859-1 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-2 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-3 glibc yes -# ISO-8859-4 osf solaris freebsd yes -# ISO-8859-5 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-6 glibc aix hpux solaris yes -# ISO-8859-7 glibc aix hpux irix osf solaris yes -# ISO-8859-8 glibc aix hpux osf solaris yes -# ISO-8859-9 glibc aix hpux irix osf solaris yes -# ISO-8859-13 glibc -# ISO-8859-15 glibc aix osf solaris freebsd -# KOI8-R glibc solaris freebsd yes -# KOI8-U glibc freebsd yes -# CP437 dos -# CP775 dos -# CP850 aix osf dos -# CP852 dos -# CP855 dos -# CP856 aix -# CP857 dos -# CP861 dos -# CP862 dos -# CP864 dos -# CP865 dos -# CP866 freebsd dos -# CP869 dos -# CP874 win32 dos -# CP922 aix -# CP932 aix win32 dos -# CP943 aix -# CP949 osf win32 dos -# CP950 win32 dos -# CP1046 aix -# CP1124 aix -# CP1129 aix -# CP1250 win32 -# CP1251 glibc win32 -# CP1252 aix win32 -# CP1253 win32 -# CP1254 win32 -# CP1255 win32 -# CP1256 win32 -# CP1257 win32 -# GB2312 glibc aix hpux irix solaris freebsd yes -# EUC-JP glibc aix hpux irix osf solaris freebsd yes -# EUC-KR glibc aix hpux irix osf solaris freebsd yes -# EUC-TW glibc aix hpux irix osf solaris -# BIG5 glibc aix hpux osf solaris freebsd yes -# BIG5-HKSCS glibc -# GBK aix osf win32 dos -# GB18030 glibc -# SHIFT_JIS hpux osf solaris freebsd yes -# JOHAB glibc win32 -# TIS-620 glibc aix hpux osf solaris -# VISCII glibc yes -# HP-ROMAN8 hpux -# HP-ARABIC8 hpux -# HP-GREEK8 hpux -# HP-HEBREW8 hpux -# HP-TURKISH8 hpux -# HP-KANA8 hpux -# DEC-KANJI osf -# DEC-HANYU osf -# UTF-8 glibc aix hpux osf solaris yes -# -# Note: Names which are not marked as being a MIME name should not be used in -# Internet protocols for information interchange (mail, news, etc.). -# -# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications -# must understand both names and treat them as equivalent. -# -# The first argument passed to this file is the canonical host specification, -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - -host="$1" -os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'` -echo "# This file contains a table of character encoding aliases," -echo "# suitable for operating system '${os}'." -echo "# It was automatically generated from config.charset." -# List of references, updated during installation: -echo "# Packages using this file: " -case "$os" in - linux* | *-gnu*) - # With glibc-2.1 or newer, we don't need any canonicalization, - # because glibc has iconv and both glibc and libiconv support all - # GNU canonical names directly. Therefore, the Makefile does not - # need to install the alias file at all. - # The following applies only to glibc-2.0.x and older libcs. - echo "ISO_646.IRV:1983 ASCII" - ;; - aix*) - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-6 ISO-8859-6" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-8 ISO-8859-8" - echo "ISO8859-9 ISO-8859-9" - echo "ISO8859-15 ISO-8859-15" - echo "IBM-850 CP850" - echo "IBM-856 CP856" - echo "IBM-921 ISO-8859-13" - echo "IBM-922 CP922" - echo "IBM-932 CP932" - echo "IBM-943 CP943" - echo "IBM-1046 CP1046" - echo "IBM-1124 CP1124" - echo "IBM-1129 CP1129" - echo "IBM-1252 CP1252" - echo "IBM-eucCN GB2312" - echo "IBM-eucJP EUC-JP" - echo "IBM-eucKR EUC-KR" - echo "IBM-eucTW EUC-TW" - echo "big5 BIG5" - echo "GBK GBK" - echo "TIS-620 TIS-620" - echo "UTF-8 UTF-8" - ;; - hpux*) - echo "iso88591 ISO-8859-1" - echo "iso88592 ISO-8859-2" - echo "iso88595 ISO-8859-5" - echo "iso88596 ISO-8859-6" - echo "iso88597 ISO-8859-7" - echo "iso88598 ISO-8859-8" - echo "iso88599 ISO-8859-9" - echo "iso885915 ISO-8859-15" - echo "roman8 HP-ROMAN8" - echo "arabic8 HP-ARABIC8" - echo "greek8 HP-GREEK8" - echo "hebrew8 HP-HEBREW8" - echo "turkish8 HP-TURKISH8" - echo "kana8 HP-KANA8" - echo "tis620 TIS-620" - echo "big5 BIG5" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "eucTW EUC-TW" - echo "hp15CN GB2312" - #echo "ccdc ?" # what is this? - echo "SJIS SHIFT_JIS" - echo "utf8 UTF-8" - ;; - irix*) - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-9 ISO-8859-9" - echo "eucCN GB2312" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "eucTW EUC-TW" - ;; - osf*) - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-4 ISO-8859-4" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-8 ISO-8859-8" - echo "ISO8859-9 ISO-8859-9" - echo "ISO8859-15 ISO-8859-15" - echo "cp850 CP850" - echo "big5 BIG5" - echo "dechanyu DEC-HANYU" - echo "dechanzi GB2312" - echo "deckanji DEC-KANJI" - echo "deckorean EUC-KR" - echo "eucJP EUC-JP" - echo "eucKR EUC-KR" - echo "eucTW EUC-TW" - echo "GBK GBK" - echo "KSC5601 CP949" - echo "sdeckanji EUC-JP" - echo "SJIS SHIFT_JIS" - echo "TACTIS TIS-620" - echo "UTF-8 UTF-8" - ;; - solaris*) - echo "646 ASCII" - echo "ISO8859-1 ISO-8859-1" - echo "ISO8859-2 ISO-8859-2" - echo "ISO8859-4 ISO-8859-4" - echo "ISO8859-5 ISO-8859-5" - echo "ISO8859-6 ISO-8859-6" - echo "ISO8859-7 ISO-8859-7" - echo "ISO8859-8 ISO-8859-8" - echo "ISO8859-9 ISO-8859-9" - echo "ISO8859-15 ISO-8859-15" - echo "koi8-r KOI8-R" - echo "BIG5 BIG5" - echo "gb2312 GB2312" - echo "cns11643 EUC-TW" - echo "5601 EUC-KR" - echo "eucJP EUC-JP" - echo "PCK SHIFT_JIS" - echo "TIS620.2533 TIS-620" - #echo "sun_eu_greek ?" # what is this? - echo "UTF-8 UTF-8" - ;; - freebsd*) - # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore - # localcharset.c falls back to using the full locale name - # from the environment variables. - echo "C ASCII" - echo "US-ASCII ASCII" - for l in la_LN lt_LN; do - echo "$l.ASCII ASCII" - done - for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ - fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \ - lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do - echo "$l.ISO_8859-1 ISO-8859-1" - echo "$l.DIS_8859-15 ISO-8859-15" - done - for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do - echo "$l.ISO_8859-2 ISO-8859-2" - done - for l in la_LN lt_LT; do - echo "$l.ISO_8859-4 ISO-8859-4" - done - for l in ru_RU ru_SU; do - echo "$l.KOI8-R KOI8-R" - echo "$l.ISO_8859-5 ISO-8859-5" - echo "$l.CP866 CP866" - done - echo "uk_UA.KOI8-U KOI8-U" - echo "zh_TW.BIG5 BIG5" - echo "zh_TW.Big5 BIG5" - echo "zh_CN.EUC GB2312" - echo "ja_JP.EUC EUC-JP" - echo "ja_JP.SJIS SHIFT_JIS" - echo "ja_JP.Shift_JIS SHIFT_JIS" - echo "ko_KR.EUC EUC-KR" - ;; - beos*) - # BeOS has a single locale, and it has UTF-8 encoding. - echo "* UTF-8" - ;; - msdosdjgpp*) - # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore - # localcharset.c falls back to using the full locale name - # from the environment variables. - echo "#" - echo "# The encodings given here may not all be correct." - echo "# If you find that the encoding given for your language and" - echo "# country is not the one your DOS machine actually uses, just" - echo "# correct it in this file, and send a mail to" - echo "# Juan Manuel Guerrero " - echo "# and Bruno Haible ." - echo "#" - echo "C ASCII" - # ISO-8859-1 languages - echo "ca CP850" - echo "ca_ES CP850" - echo "da CP865" # not CP850 ?? - echo "da_DK CP865" # not CP850 ?? - echo "de CP850" - echo "de_AT CP850" - echo "de_CH CP850" - echo "de_DE CP850" - echo "en CP850" - echo "en_AU CP850" # not CP437 ?? - echo "en_CA CP850" - echo "en_GB CP850" - echo "en_NZ CP437" - echo "en_US CP437" - echo "en_ZA CP850" # not CP437 ?? - echo "es CP850" - echo "es_AR CP850" - echo "es_BO CP850" - echo "es_CL CP850" - echo "es_CO CP850" - echo "es_CR CP850" - echo "es_CU CP850" - echo "es_DO CP850" - echo "es_EC CP850" - echo "es_ES CP850" - echo "es_GT CP850" - echo "es_HN CP850" - echo "es_MX CP850" - echo "es_NI CP850" - echo "es_PA CP850" - echo "es_PY CP850" - echo "es_PE CP850" - echo "es_SV CP850" - echo "es_UY CP850" - echo "es_VE CP850" - echo "et CP850" - echo "et_EE CP850" - echo "eu CP850" - echo "eu_ES CP850" - echo "fi CP850" - echo "fi_FI CP850" - echo "fr CP850" - echo "fr_BE CP850" - echo "fr_CA CP850" - echo "fr_CH CP850" - echo "fr_FR CP850" - echo "ga CP850" - echo "ga_IE CP850" - echo "gd CP850" - echo "gd_GB CP850" - echo "gl CP850" - echo "gl_ES CP850" - echo "id CP850" # not CP437 ?? - echo "id_ID CP850" # not CP437 ?? - echo "is CP861" # not CP850 ?? - echo "is_IS CP861" # not CP850 ?? - echo "it CP850" - echo "it_CH CP850" - echo "it_IT CP850" - echo "lt CP775" - echo "lt_LT CP775" - echo "lv CP775" - echo "lv_LV CP775" - echo "nb CP865" # not CP850 ?? - echo "nb_NO CP865" # not CP850 ?? - echo "nl CP850" - echo "nl_BE CP850" - echo "nl_NL CP850" - echo "nn CP865" # not CP850 ?? - echo "nn_NO CP865" # not CP850 ?? - echo "no CP865" # not CP850 ?? - echo "no_NO CP865" # not CP850 ?? - echo "pt CP850" - echo "pt_BR CP850" - echo "pt_PT CP850" - echo "sv CP850" - echo "sv_SE CP850" - # ISO-8859-2 languages - echo "cs CP852" - echo "cs_CZ CP852" - echo "hr CP852" - echo "hr_HR CP852" - echo "hu CP852" - echo "hu_HU CP852" - echo "pl CP852" - echo "pl_PL CP852" - echo "ro CP852" - echo "ro_RO CP852" - echo "sk CP852" - echo "sk_SK CP852" - echo "sl CP852" - echo "sl_SI CP852" - echo "sq CP852" - echo "sq_AL CP852" - echo "sr CP852" # CP852 or CP866 or CP855 ?? - echo "sr_YU CP852" # CP852 or CP866 or CP855 ?? - # ISO-8859-3 languages - echo "mt CP850" - echo "mt_MT CP850" - # ISO-8859-5 languages - echo "be CP866" - echo "be_BE CP866" - echo "bg CP866" # not CP855 ?? - echo "bg_BG CP866" # not CP855 ?? - echo "mk CP866" # not CP855 ?? - echo "mk_MK CP866" # not CP855 ?? - echo "ru KOI8-R" # not CP866 ?? - echo "ru_RU KOI8-R" # not CP866 ?? - # ISO-8859-6 languages - echo "ar CP864" - echo "ar_AE CP864" - echo "ar_DZ CP864" - echo "ar_EG CP864" - echo "ar_IQ CP864" - echo "ar_IR CP864" - echo "ar_JO CP864" - echo "ar_KW CP864" - echo "ar_MA CP864" - echo "ar_OM CP864" - echo "ar_QA CP864" - echo "ar_SA CP864" - echo "ar_SY CP864" - # ISO-8859-7 languages - echo "el CP869" - echo "el_GR CP869" - # ISO-8859-8 languages - echo "he CP862" - echo "he_IL CP862" - # ISO-8859-9 languages - echo "tr CP857" - echo "tr_TR CP857" - # Japanese - echo "ja CP932" - echo "ja_JP CP932" - # Chinese - echo "zh_CN GBK" - echo "zh_TW CP950" # not CP938 ?? - # Korean - echo "kr CP949" # not CP934 ?? - echo "kr_KR CP949" # not CP934 ?? - # Thai - echo "th CP874" - echo "th_TH CP874" - # Other - echo "eo CP850" - echo "eo_EO CP850" - ;; -esac diff --git a/intl/dcgettext.c b/intl/dcgettext.c deleted file mode 100644 index b7c96523..00000000 --- a/intl/dcgettext.c +++ /dev/null @@ -1,58 +0,0 @@ -/* Implementation of the dcgettext(3) function. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define DCGETTEXT __dcgettext -# define DCIGETTEXT __dcigettext -#else -# define DCGETTEXT dcgettext__ -# define DCIGETTEXT dcigettext__ -#endif - -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -char * -DCGETTEXT (domainname, msgid, category) - const char *domainname; - const char *msgid; - int category; -{ - return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__dcgettext, dcgettext); -#endif diff --git a/intl/dcigettext.c b/intl/dcigettext.c deleted file mode 100644 index 6acde195..00000000 --- a/intl/dcigettext.c +++ /dev/null @@ -1,1259 +0,0 @@ -/* Implementation of the internal dcigettext function. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -/* Tell glibc's to provide a prototype for mempcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#ifdef __GNUC__ -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include -#ifndef errno -extern int errno; -#endif -#ifndef __set_errno -# define __set_errno(val) errno = (val) -#endif - -#include -#include - -#include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif - -#if defined HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#include - -#if defined HAVE_SYS_PARAM_H || defined _LIBC -# include -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif -#include "hash-string.h" - -/* Thread safetyness. */ -#ifdef _LIBC -# include -#else -/* Provide dummy implementation if this is outside glibc. */ -# define __libc_lock_define_initialized(CLASS, NAME) -# define __libc_lock_lock(NAME) -# define __libc_lock_unlock(NAME) -# define __libc_rwlock_define_initialized(CLASS, NAME) -# define __libc_rwlock_rdlock(NAME) -# define __libc_rwlock_unlock(NAME) -#endif - -/* Alignment of types. */ -#if defined __GNUC__ && __GNUC__ >= 2 -# define alignof(TYPE) __alignof__ (TYPE) -#else -# define alignof(TYPE) \ - ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2) -#endif - -/* The internal variables in the standalone libintl.a must have different - names than the internal variables in GNU libc, otherwise programs - using libintl.a cannot be linked statically. */ -#if !defined _LIBC -# define _nl_default_default_domain _nl_default_default_domain__ -# define _nl_current_default_domain _nl_current_default_domain__ -# define _nl_default_dirname _nl_default_dirname__ -# define _nl_domain_bindings _nl_domain_bindings__ -#endif - -/* Some compilers, like SunOS4 cc, don't have offsetof in . */ -#ifndef offsetof -# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) -#endif - -/* @@ end of prolog @@ */ - -#ifdef _LIBC -/* Rename the non ANSI C functions. This is required by the standard - because some ANSI C functions will require linking with this object - file and the name space must not be polluted. */ -# define getcwd __getcwd -# ifndef stpcpy -# define stpcpy __stpcpy -# endif -# define tfind __tfind -#else -# if !defined HAVE_GETCWD -char *getwd (); -# define getcwd(buf, max) getwd (buf) -# else -char *getcwd (); -# endif -# ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); -# endif -# ifndef HAVE_MEMPCPY -static void *mempcpy PARAMS ((void *dest, const void *src, size_t n)); -# endif -#endif - -/* Amount to increase buffer size by in each try. */ -#define PATH_INCR 32 - -/* The following is from pathmax.h. */ -/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define - PATH_MAX but might cause redefinition warnings when sys/param.h is - later included (as on MORE/BSD 4.3). */ -#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__) -# include -#endif - -#ifndef _POSIX_PATH_MAX -# define _POSIX_PATH_MAX 255 -#endif - -#if !defined PATH_MAX && defined _PC_PATH_MAX -# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) -#endif - -/* Don't include sys/param.h if it already has been. */ -#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN -# include -#endif - -#if !defined PATH_MAX && defined MAXPATHLEN -# define PATH_MAX MAXPATHLEN -#endif - -#ifndef PATH_MAX -# define PATH_MAX _POSIX_PATH_MAX -#endif - -/* Pathname support. - ISSLASH(C) tests whether C is a directory separator character. - IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, - it may be concatenated to a directory pathname. - IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. - */ -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ - /* Win32, OS/2, DOS */ -# define ISSLASH(C) ((C) == '/' || (C) == '\\') -# define HAS_DEVICE(P) \ - ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ - && (P)[1] == ':') -# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) -# define IS_PATH_WITH_DIR(P) \ - (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) -#else - /* Unix */ -# define ISSLASH(C) ((C) == '/') -# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) -# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) -#endif - -/* XPG3 defines the result of `setlocale (category, NULL)' as: - ``Directs `setlocale()' to query `category' and return the current - setting of `local'.'' - However it does not specify the exact format. Neither do SUSV2 and - ISO C 99. So we can use this feature only on selected systems (e.g. - those using GNU C Library). */ -#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2) -# define HAVE_LOCALE_NULL -#endif - -/* This is the type used for the search tree where known translations - are stored. */ -struct known_translation_t -{ - /* Domain in which to search. */ - char *domainname; - - /* The category. */ - int category; - - /* State of the catalog counter at the point the string was found. */ - int counter; - - /* Catalog where the string was found. */ - struct loaded_l10nfile *domain; - - /* And finally the translation. */ - const char *translation; - size_t translation_length; - - /* Pointer to the string in question. */ - char msgid[ZERO]; -}; - -/* Root of the search tree with known translations. We can use this - only if the system provides the `tsearch' function family. */ -#if defined HAVE_TSEARCH || defined _LIBC -# include - -static void *root; - -# ifdef _LIBC -# define tsearch __tsearch -# endif - -/* Function to compare two entries in the table of known translations. */ -static int transcmp PARAMS ((const void *p1, const void *p2)); -static int -transcmp (p1, p2) - const void *p1; - const void *p2; -{ - const struct known_translation_t *s1; - const struct known_translation_t *s2; - int result; - - s1 = (const struct known_translation_t *) p1; - s2 = (const struct known_translation_t *) p2; - - result = strcmp (s1->msgid, s2->msgid); - if (result == 0) - { - result = strcmp (s1->domainname, s2->domainname); - if (result == 0) - /* We compare the category last (though this is the cheapest - operation) since it is hopefully always the same (namely - LC_MESSAGES). */ - result = s1->category - s2->category; - } - - return result; -} -#endif - -/* Name of the default domain used for gettext(3) prior any call to - textdomain(3). The default value for this is "messages". */ -const char _nl_default_default_domain[] = "messages"; - -/* Value used as the default domain for gettext(3). */ -const char *_nl_current_default_domain = _nl_default_default_domain; - -/* Contains the default location of the message catalogs. */ -const char _nl_default_dirname[] = LOCALEDIR; - -/* List with bindings of specific domains created by bindtextdomain() - calls. */ -struct binding *_nl_domain_bindings; - -/* Prototypes for local functions. */ -static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain, - unsigned long int n, - const char *translation, - size_t translation_len)) - internal_function; -static unsigned long int plural_eval PARAMS ((struct expression *pexp, - unsigned long int n)) - internal_function; -static const char *category_to_name PARAMS ((int category)) internal_function; -static const char *guess_category_value PARAMS ((int category, - const char *categoryname)) - internal_function; - - -/* For those loosing systems which don't have `alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA -/* Nothing has to be done. */ -# define ADD_BLOCK(list, address) /* nothing */ -# define FREE_BLOCKS(list) /* nothing */ -#else -struct block_list -{ - void *address; - struct block_list *next; -}; -# define ADD_BLOCK(list, addr) \ - do { \ - struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ - /* If we cannot get a free block we cannot add the new element to \ - the list. */ \ - if (newp != NULL) { \ - newp->address = (addr); \ - newp->next = (list); \ - (list) = newp; \ - } \ - } while (0) -# define FREE_BLOCKS(list) \ - do { \ - while (list != NULL) { \ - struct block_list *old = list; \ - list = list->next; \ - free (old); \ - } \ - } while (0) -# undef alloca -# define alloca(size) (malloc (size)) -#endif /* have alloca */ - - -#ifdef _LIBC -/* List of blocks allocated for translations. */ -typedef struct transmem_list -{ - struct transmem_list *next; - char data[ZERO]; -} transmem_block_t; -static struct transmem_list *transmem_list; -#else -typedef unsigned char transmem_block_t; -#endif - - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define DCIGETTEXT __dcigettext -#else -# define DCIGETTEXT dcigettext__ -#endif - -/* Lock variable to protect the global data in the gettext implementation. */ -#ifdef _LIBC -__libc_rwlock_define_initialized (, _nl_state_lock) -#endif - -/* Checking whether the binaries runs SUID must be done and glibc provides - easier methods therefore we make a difference here. */ -#ifdef _LIBC -# define ENABLE_SECURE __libc_enable_secure -# define DETERMINE_SECURE -#else -# ifndef HAVE_GETUID -# define getuid() 0 -# endif -# ifndef HAVE_GETGID -# define getgid() 0 -# endif -# ifndef HAVE_GETEUID -# define geteuid() getuid() -# endif -# ifndef HAVE_GETEGID -# define getegid() getgid() -# endif -static int enable_secure; -# define ENABLE_SECURE (enable_secure == 1) -# define DETERMINE_SECURE \ - if (enable_secure == 0) \ - { \ - if (getuid () != geteuid () || getgid () != getegid ()) \ - enable_secure = 1; \ - else \ - enable_secure = -1; \ - } -#endif - -/* Look up MSGID in the DOMAINNAME message catalog for the current - CATEGORY locale and, if PLURAL is nonzero, search over string - depending on the plural form determined by N. */ -char * -DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - int plural; - unsigned long int n; - int category; -{ -#ifndef HAVE_ALLOCA - struct block_list *block_list = NULL; -#endif - struct loaded_l10nfile *domain; - struct binding *binding; - const char *categoryname; - const char *categoryvalue; - char *dirname, *xdomainname; - char *single_locale; - char *retval; - size_t retlen; - int saved_errno; -#if defined HAVE_TSEARCH || defined _LIBC - struct known_translation_t *search; - struct known_translation_t **foundp = NULL; - size_t msgid_len; -#endif - size_t domainname_len; - - /* If no real MSGID is given return NULL. */ - if (msgid1 == NULL) - return NULL; - - __libc_rwlock_rdlock (_nl_state_lock); - - /* If DOMAINNAME is NULL, we are interested in the default domain. If - CATEGORY is not LC_MESSAGES this might not make much sense but the - definition left this undefined. */ - if (domainname == NULL) - domainname = _nl_current_default_domain; - -#if defined HAVE_TSEARCH || defined _LIBC - msgid_len = strlen (msgid1) + 1; - - /* Try to find the translation among those which we found at - some time. */ - search = (struct known_translation_t *) - alloca (offsetof (struct known_translation_t, msgid) + msgid_len); - memcpy (search->msgid, msgid1, msgid_len); - search->domainname = (char *) domainname; - search->category = category; - - foundp = (struct known_translation_t **) tfind (search, &root, transcmp); - if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr) - { - /* Now deal with plural. */ - if (plural) - retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation, - (*foundp)->translation_length); - else - retval = (char *) (*foundp)->translation; - - __libc_rwlock_unlock (_nl_state_lock); - return retval; - } -#endif - - /* Preserve the `errno' value. */ - saved_errno = errno; - - /* See whether this is a SUID binary or not. */ - DETERMINE_SECURE; - - /* First find matching binding. */ - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) - { - int compare = strcmp (domainname, binding->domainname); - if (compare == 0) - /* We found it! */ - break; - if (compare < 0) - { - /* It is not in the list. */ - binding = NULL; - break; - } - } - - if (binding == NULL) - dirname = (char *) _nl_default_dirname; - else if (IS_ABSOLUTE_PATH (binding->dirname)) - dirname = binding->dirname; - else - { - /* We have a relative path. Make it absolute now. */ - size_t dirname_len = strlen (binding->dirname) + 1; - size_t path_max; - char *ret; - - path_max = (unsigned int) PATH_MAX; - path_max += 2; /* The getcwd docs say to do this. */ - - for (;;) - { - dirname = (char *) alloca (path_max + dirname_len); - ADD_BLOCK (block_list, dirname); - - __set_errno (0); - ret = getcwd (dirname, path_max); - if (ret != NULL || errno != ERANGE) - break; - - path_max += path_max / 2; - path_max += PATH_INCR; - } - - if (ret == NULL) - { - /* We cannot get the current working directory. Don't signal an - error but simply return the default string. */ - FREE_BLOCKS (block_list); - __libc_rwlock_unlock (_nl_state_lock); - __set_errno (saved_errno); - return (plural == 0 - ? (char *) msgid1 - /* Use the Germanic plural rule. */ - : n == 1 ? (char *) msgid1 : (char *) msgid2); - } - - stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); - } - - /* Now determine the symbolic name of CATEGORY and its value. */ - categoryname = category_to_name (category); - categoryvalue = guess_category_value (category, categoryname); - - domainname_len = strlen (domainname); - xdomainname = (char *) alloca (strlen (categoryname) - + domainname_len + 5); - ADD_BLOCK (block_list, xdomainname); - - stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), - domainname, domainname_len), - ".mo"); - - /* Creating working area. */ - single_locale = (char *) alloca (strlen (categoryvalue) + 1); - ADD_BLOCK (block_list, single_locale); - - - /* Search for the given string. This is a loop because we perhaps - got an ordered list of languages to consider for the translation. */ - while (1) - { - /* Make CATEGORYVALUE point to the next element of the list. */ - while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') - ++categoryvalue; - if (categoryvalue[0] == '\0') - { - /* The whole contents of CATEGORYVALUE has been searched but - no valid entry has been found. We solve this situation - by implicitly appending a "C" entry, i.e. no translation - will take place. */ - single_locale[0] = 'C'; - single_locale[1] = '\0'; - } - else - { - char *cp = single_locale; - while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') - *cp++ = *categoryvalue++; - *cp = '\0'; - - /* When this is a SUID binary we must not allow accessing files - outside the dedicated directories. */ - if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale)) - /* Ingore this entry. */ - continue; - } - - /* If the current locale value is C (or POSIX) we don't load a - domain. Return the MSGID. */ - if (strcmp (single_locale, "C") == 0 - || strcmp (single_locale, "POSIX") == 0) - { - FREE_BLOCKS (block_list); - __libc_rwlock_unlock (_nl_state_lock); - __set_errno (saved_errno); - return (plural == 0 - ? (char *) msgid1 - /* Use the Germanic plural rule. */ - : n == 1 ? (char *) msgid1 : (char *) msgid2); - } - - - /* Find structure describing the message catalog matching the - DOMAINNAME and CATEGORY. */ - domain = _nl_find_domain (dirname, single_locale, xdomainname, binding); - - if (domain != NULL) - { - retval = _nl_find_msg (domain, binding, msgid1, &retlen); - - if (retval == NULL) - { - int cnt; - - for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) - { - retval = _nl_find_msg (domain->successor[cnt], binding, - msgid1, &retlen); - - if (retval != NULL) - { - domain = domain->successor[cnt]; - break; - } - } - } - - if (retval != NULL) - { - /* Found the translation of MSGID1 in domain DOMAIN: - starting at RETVAL, RETLEN bytes. */ - FREE_BLOCKS (block_list); - __set_errno (saved_errno); -#if defined HAVE_TSEARCH || defined _LIBC - if (foundp == NULL) - { - /* Create a new entry and add it to the search tree. */ - struct known_translation_t *newp; - - newp = (struct known_translation_t *) - malloc (offsetof (struct known_translation_t, msgid) - + msgid_len + domainname_len + 1); - if (newp != NULL) - { - newp->domainname = - mempcpy (newp->msgid, msgid1, msgid_len); - memcpy (newp->domainname, domainname, domainname_len + 1); - newp->category = category; - newp->counter = _nl_msg_cat_cntr; - newp->domain = domain; - newp->translation = retval; - newp->translation_length = retlen; - - /* Insert the entry in the search tree. */ - foundp = (struct known_translation_t **) - tsearch (newp, &root, transcmp); - if (foundp == NULL - || __builtin_expect (*foundp != newp, 0)) - /* The insert failed. */ - free (newp); - } - } - else - { - /* We can update the existing entry. */ - (*foundp)->counter = _nl_msg_cat_cntr; - (*foundp)->domain = domain; - (*foundp)->translation = retval; - (*foundp)->translation_length = retlen; - } -#endif - /* Now deal with plural. */ - if (plural) - retval = plural_lookup (domain, n, retval, retlen); - - __libc_rwlock_unlock (_nl_state_lock); - return retval; - } - } - } - /* NOTREACHED */ -} - - -char * -internal_function -_nl_find_msg (domain_file, domainbinding, msgid, lengthp) - struct loaded_l10nfile *domain_file; - struct binding *domainbinding; - const char *msgid; - size_t *lengthp; -{ - struct loaded_domain *domain; - size_t act; - char *result; - size_t resultlen; - - if (domain_file->decided == 0) - _nl_load_domain (domain_file, domainbinding); - - if (domain_file->data == NULL) - return NULL; - - domain = (struct loaded_domain *) domain_file->data; - - /* Locate the MSGID and its translation. */ - if (domain->hash_size > 2 && domain->hash_tab != NULL) - { - /* Use the hashing table. */ - nls_uint32 len = strlen (msgid); - nls_uint32 hash_val = hash_string (msgid); - nls_uint32 idx = hash_val % domain->hash_size; - nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); - - while (1) - { - nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); - - if (nstr == 0) - /* Hash table entry is empty. */ - return NULL; - - /* Compare msgid with the original string at index nstr-1. - We compare the lengths with >=, not ==, because plural entries - are represented by strings with an embedded NUL. */ - if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) >= len - && (strcmp (msgid, - domain->data + W (domain->must_swap, - domain->orig_tab[nstr - 1].offset)) - == 0)) - { - act = nstr - 1; - goto found; - } - - if (idx >= domain->hash_size - incr) - idx -= domain->hash_size - incr; - else - idx += incr; - } - /* NOTREACHED */ - } - else - { - /* Try the default method: binary search in the sorted array of - messages. */ - size_t top, bottom; - - bottom = 0; - top = domain->nstrings; - while (bottom < top) - { - int cmp_val; - - act = (bottom + top) / 2; - cmp_val = strcmp (msgid, (domain->data - + W (domain->must_swap, - domain->orig_tab[act].offset))); - if (cmp_val < 0) - top = act; - else if (cmp_val > 0) - bottom = act + 1; - else - goto found; - } - /* No translation was found. */ - return NULL; - } - - found: - /* The translation was found at index ACT. If we have to convert the - string to use a different character set, this is the time. */ - result = ((char *) domain->data - + W (domain->must_swap, domain->trans_tab[act].offset)); - resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1; - -#if defined _LIBC || HAVE_ICONV - if (domain->codeset_cntr - != (domainbinding != NULL ? domainbinding->codeset_cntr : 0)) - { - /* The domain's codeset has changed through bind_textdomain_codeset() - since the message catalog was initialized or last accessed. We - have to reinitialize the converter. */ - _nl_free_domain_conv (domain); - _nl_init_domain_conv (domain_file, domain, domainbinding); - } - - if ( -# ifdef _LIBC - domain->conv != (__gconv_t) -1 -# else -# if HAVE_ICONV - domain->conv != (iconv_t) -1 -# endif -# endif - ) - { - /* We are supposed to do a conversion. First allocate an - appropriate table with the same structure as the table - of translations in the file, where we can put the pointers - to the converted strings in. - There is a slight complication with plural entries. They - are represented by consecutive NUL terminated strings. We - handle this case by converting RESULTLEN bytes, including - NULs. */ - - if (domain->conv_tab == NULL - && ((domain->conv_tab = (char **) calloc (domain->nstrings, - sizeof (char *))) - == NULL)) - /* Mark that we didn't succeed allocating a table. */ - domain->conv_tab = (char **) -1; - - if (__builtin_expect (domain->conv_tab == (char **) -1, 0)) - /* Nothing we can do, no more memory. */ - goto converted; - - if (domain->conv_tab[act] == NULL) - { - /* We haven't used this string so far, so it is not - translated yet. Do this now. */ - /* We use a bit more efficient memory handling. - We allocate always larger blocks which get used over - time. This is faster than many small allocations. */ - __libc_lock_define_initialized (static, lock) -# define INITIAL_BLOCK_SIZE 4080 - static unsigned char *freemem; - static size_t freemem_size; - - const unsigned char *inbuf; - unsigned char *outbuf; - int malloc_count; -# ifndef _LIBC - transmem_block_t *transmem_list = NULL; -# endif - - __libc_lock_lock (lock); - - inbuf = (const unsigned char *) result; - outbuf = freemem + sizeof (size_t); - - malloc_count = 0; - while (1) - { - transmem_block_t *newmem; -# ifdef _LIBC - size_t non_reversible; - int res; - - if (freemem_size < sizeof (size_t)) - goto resize_freemem; - - res = __gconv (domain->conv, - &inbuf, inbuf + resultlen, - &outbuf, - outbuf + freemem_size - sizeof (size_t), - &non_reversible); - - if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT) - break; - - if (res != __GCONV_FULL_OUTPUT) - { - __libc_lock_unlock (lock); - goto converted; - } - - inbuf = result; -# else -# if HAVE_ICONV - const char *inptr = (const char *) inbuf; - size_t inleft = resultlen; - char *outptr = (char *) outbuf; - size_t outleft; - - if (freemem_size < sizeof (size_t)) - goto resize_freemem; - - outleft = freemem_size - sizeof (size_t); - if (iconv (domain->conv, - (ICONV_CONST char **) &inptr, &inleft, - &outptr, &outleft) - != (size_t) (-1)) - { - outbuf = (unsigned char *) outptr; - break; - } - if (errno != E2BIG) - { - __libc_lock_unlock (lock); - goto converted; - } -# endif -# endif - - resize_freemem: - /* We must allocate a new buffer or resize the old one. */ - if (malloc_count > 0) - { - ++malloc_count; - freemem_size = malloc_count * INITIAL_BLOCK_SIZE; - newmem = (transmem_block_t *) realloc (transmem_list, - freemem_size); -# ifdef _LIBC - if (newmem != NULL) - transmem_list = transmem_list->next; - else - { - struct transmem_list *old = transmem_list; - - transmem_list = transmem_list->next; - free (old); - } -# endif - } - else - { - malloc_count = 1; - freemem_size = INITIAL_BLOCK_SIZE; - newmem = (transmem_block_t *) malloc (freemem_size); - } - if (__builtin_expect (newmem == NULL, 0)) - { - freemem = NULL; - freemem_size = 0; - __libc_lock_unlock (lock); - goto converted; - } - -# ifdef _LIBC - /* Add the block to the list of blocks we have to free - at some point. */ - newmem->next = transmem_list; - transmem_list = newmem; - - freemem = newmem->data; - freemem_size -= offsetof (struct transmem_list, data); -# else - transmem_list = newmem; - freemem = newmem; -# endif - - outbuf = freemem + sizeof (size_t); - } - - /* We have now in our buffer a converted string. Put this - into the table of conversions. */ - *(size_t *) freemem = outbuf - freemem - sizeof (size_t); - domain->conv_tab[act] = (char *) freemem; - /* Shrink freemem, but keep it aligned. */ - freemem_size -= outbuf - freemem; - freemem = outbuf; - freemem += freemem_size & (alignof (size_t) - 1); - freemem_size = freemem_size & ~ (alignof (size_t) - 1); - - __libc_lock_unlock (lock); - } - - /* Now domain->conv_tab[act] contains the translation of all - the plural variants. */ - result = domain->conv_tab[act] + sizeof (size_t); - resultlen = *(size_t *) domain->conv_tab[act]; - } - - converted: - /* The result string is converted. */ - -#endif /* _LIBC || HAVE_ICONV */ - - *lengthp = resultlen; - return result; -} - - -/* Look up a plural variant. */ -static char * -internal_function -plural_lookup (domain, n, translation, translation_len) - struct loaded_l10nfile *domain; - unsigned long int n; - const char *translation; - size_t translation_len; -{ - struct loaded_domain *domaindata = (struct loaded_domain *) domain->data; - unsigned long int index; - const char *p; - - index = plural_eval (domaindata->plural, n); - if (index >= domaindata->nplurals) - /* This should never happen. It means the plural expression and the - given maximum value do not match. */ - index = 0; - - /* Skip INDEX strings at TRANSLATION. */ - p = translation; - while (index-- > 0) - { -#ifdef _LIBC - p = __rawmemchr (p, '\0'); -#else - p = strchr (p, '\0'); -#endif - /* And skip over the NUL byte. */ - p++; - - if (p >= translation + translation_len) - /* This should never happen. It means the plural expression - evaluated to a value larger than the number of variants - available for MSGID1. */ - return (char *) translation; - } - return (char *) p; -} - - -/* Function to evaluate the plural expression and return an index value. */ -static unsigned long int -internal_function -plural_eval (pexp, n) - struct expression *pexp; - unsigned long int n; -{ - switch (pexp->nargs) - { - case 0: - switch (pexp->operation) - { - case var: - return n; - case num: - return pexp->val.num; - default: - break; - } - /* NOTREACHED */ - break; - case 1: - { - /* pexp->operation must be lnot. */ - unsigned long int arg = plural_eval (pexp->val.args[0], n); - return ! arg; - } - case 2: - { - unsigned long int leftarg = plural_eval (pexp->val.args[0], n); - if (pexp->operation == lor) - return leftarg || plural_eval (pexp->val.args[1], n); - else if (pexp->operation == land) - return leftarg && plural_eval (pexp->val.args[1], n); - else - { - unsigned long int rightarg = plural_eval (pexp->val.args[1], n); - - switch (pexp->operation) - { - case mult: - return leftarg * rightarg; - case divide: - return leftarg / rightarg; - case module: - return leftarg % rightarg; - case plus: - return leftarg + rightarg; - case minus: - return leftarg - rightarg; - case less_than: - return leftarg < rightarg; - case greater_than: - return leftarg > rightarg; - case less_or_equal: - return leftarg <= rightarg; - case greater_or_equal: - return leftarg >= rightarg; - case equal: - return leftarg == rightarg; - case not_equal: - return leftarg != rightarg; - default: - break; - } - } - /* NOTREACHED */ - break; - } - case 3: - { - /* pexp->operation must be qmop. */ - unsigned long int boolarg = plural_eval (pexp->val.args[0], n); - return plural_eval (pexp->val.args[boolarg ? 1 : 2], n); - } - } - /* NOTREACHED */ - return 0; -} - - -/* Return string representation of locale CATEGORY. */ -static const char * -internal_function -category_to_name (category) - int category; -{ - const char *retval; - - switch (category) - { -#ifdef LC_COLLATE - case LC_COLLATE: - retval = "LC_COLLATE"; - break; -#endif -#ifdef LC_CTYPE - case LC_CTYPE: - retval = "LC_CTYPE"; - break; -#endif -#ifdef LC_MONETARY - case LC_MONETARY: - retval = "LC_MONETARY"; - break; -#endif -#ifdef LC_NUMERIC - case LC_NUMERIC: - retval = "LC_NUMERIC"; - break; -#endif -#ifdef LC_TIME - case LC_TIME: - retval = "LC_TIME"; - break; -#endif -#ifdef LC_MESSAGES - case LC_MESSAGES: - retval = "LC_MESSAGES"; - break; -#endif -#ifdef LC_RESPONSE - case LC_RESPONSE: - retval = "LC_RESPONSE"; - break; -#endif -#ifdef LC_ALL - case LC_ALL: - /* This might not make sense but is perhaps better than any other - value. */ - retval = "LC_ALL"; - break; -#endif - default: - /* If you have a better idea for a default value let me know. */ - retval = "LC_XXX"; - } - - return retval; -} - -/* Guess value of current locale from value of the environment variables. */ -static const char * -internal_function -guess_category_value (category, categoryname) - int category; - const char *categoryname; -{ - const char *language; - const char *retval; - - /* The highest priority value is the `LANGUAGE' environment - variable. But we don't use the value if the currently selected - locale is the C locale. This is a GNU extension. */ - language = getenv ("LANGUAGE"); - if (language != NULL && language[0] == '\0') - language = NULL; - - /* We have to proceed with the POSIX methods of looking to `LC_ALL', - `LC_xxx', and `LANG'. On some systems this can be done by the - `setlocale' function itself. */ -#if defined _LIBC || (defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL) - retval = setlocale (category, NULL); -#else - /* Setting of LC_ALL overwrites all other. */ - retval = getenv ("LC_ALL"); - if (retval == NULL || retval[0] == '\0') - { - /* Next comes the name of the desired category. */ - retval = getenv (categoryname); - if (retval == NULL || retval[0] == '\0') - { - /* Last possibility is the LANG environment variable. */ - retval = getenv ("LANG"); - if (retval == NULL || retval[0] == '\0') - /* We use C as the default domain. POSIX says this is - implementation defined. */ - return "C"; - } - } -#endif - - return language != NULL && strcmp (retval, "C") != 0 ? language : retval; -} - -/* @@ begin of epilog @@ */ - -/* We don't want libintl.a to depend on any other library. So we - avoid the non-standard function stpcpy. In GNU C Library this - function is available, though. Also allow the symbol HAVE_STPCPY - to be defined. */ -#if !_LIBC && !HAVE_STPCPY -static char * -stpcpy (dest, src) - char *dest; - const char *src; -{ - while ((*dest++ = *src++) != '\0') - /* Do nothing. */ ; - return dest - 1; -} -#endif - -#if !_LIBC && !HAVE_MEMPCPY -static void * -mempcpy (dest, src, n) - void *dest; - const void *src; - size_t n; -{ - return (void *) ((char *) memcpy (dest, src, n) + n); -} -#endif - - -#ifdef _LIBC -/* If we want to free all resources we have to do some work at - program's end. */ -static void __attribute__ ((unused)) -free_mem (void) -{ - void *old; - - while (_nl_domain_bindings != NULL) - { - struct binding *oldp = _nl_domain_bindings; - _nl_domain_bindings = _nl_domain_bindings->next; - if (oldp->dirname != _nl_default_dirname) - /* Yes, this is a pointer comparison. */ - free (oldp->dirname); - free (oldp->codeset); - free (oldp); - } - - if (_nl_current_default_domain != _nl_default_default_domain) - /* Yes, again a pointer comparison. */ - free ((char *) _nl_current_default_domain); - - /* Remove the search tree with the known translations. */ - __tdestroy (root, free); - root = NULL; - - while (transmem_list != NULL) - { - old = transmem_list; - transmem_list = transmem_list->next; - free (old); - } -} - -text_set_element (__libc_subfreeres, free_mem); -#endif diff --git a/intl/dcngettext.c b/intl/dcngettext.c deleted file mode 100644 index c16af212..00000000 --- a/intl/dcngettext.c +++ /dev/null @@ -1,60 +0,0 @@ -/* Implementation of the dcngettext(3) function. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define DCNGETTEXT __dcngettext -# define DCIGETTEXT __dcigettext -#else -# define DCNGETTEXT dcngettext__ -# define DCIGETTEXT dcigettext__ -#endif - -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -char * -DCNGETTEXT (domainname, msgid1, msgid2, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; - int category; -{ - return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__dcngettext, dcngettext); -#endif diff --git a/intl/dgettext.c b/intl/dgettext.c deleted file mode 100644 index 3651207a..00000000 --- a/intl/dgettext.c +++ /dev/null @@ -1,59 +0,0 @@ -/* Implementation of the dgettext(3) function. - Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define DGETTEXT __dgettext -# define DCGETTEXT __dcgettext -#else -# define DGETTEXT dgettext__ -# define DCGETTEXT dcgettext__ -#endif - -/* Look up MSGID in the DOMAINNAME message catalog of the current - LC_MESSAGES locale. */ -char * -DGETTEXT (domainname, msgid) - const char *domainname; - const char *msgid; -{ - return DCGETTEXT (domainname, msgid, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__dgettext, dgettext); -#endif diff --git a/intl/dngettext.c b/intl/dngettext.c deleted file mode 100644 index f214e95b..00000000 --- a/intl/dngettext.c +++ /dev/null @@ -1,61 +0,0 @@ -/* Implementation of the dngettext(3) function. - Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define DNGETTEXT __dngettext -# define DCNGETTEXT __dcngettext -#else -# define DNGETTEXT dngettext__ -# define DCNGETTEXT dcngettext__ -#endif - -/* Look up MSGID in the DOMAINNAME message catalog of the current - LC_MESSAGES locale and skip message according to the plural form. */ -char * -DNGETTEXT (domainname, msgid1, msgid2, n) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; -{ - return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__dngettext, dngettext); -#endif diff --git a/intl/explodename.c b/intl/explodename.c deleted file mode 100644 index 2985064c..00000000 --- a/intl/explodename.c +++ /dev/null @@ -1,192 +0,0 @@ -/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. - Contributed by Ulrich Drepper , 1995. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include - -#include "loadinfo.h" - -/* On some strange systems still no definition of NULL is found. Sigh! */ -#ifndef NULL -# if defined __STDC__ && __STDC__ -# define NULL ((void *) 0) -# else -# define NULL 0 -# endif -#endif - -/* @@ end of prolog @@ */ - -char * -_nl_find_language (name) - const char *name; -{ - while (name[0] != '\0' && name[0] != '_' && name[0] != '@' - && name[0] != '+' && name[0] != ',') - ++name; - - return (char *) name; -} - - -int -_nl_explode_name (name, language, modifier, territory, codeset, - normalized_codeset, special, sponsor, revision) - char *name; - const char **language; - const char **modifier; - const char **territory; - const char **codeset; - const char **normalized_codeset; - const char **special; - const char **sponsor; - const char **revision; -{ - enum { undecided, xpg, cen } syntax; - char *cp; - int mask; - - *modifier = NULL; - *territory = NULL; - *codeset = NULL; - *normalized_codeset = NULL; - *special = NULL; - *sponsor = NULL; - *revision = NULL; - - /* Now we determine the single parts of the locale name. First - look for the language. Termination symbols are `_' and `@' if - we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ - mask = 0; - syntax = undecided; - *language = cp = name; - cp = _nl_find_language (*language); - - if (*language == cp) - /* This does not make sense: language has to be specified. Use - this entry as it is without exploding. Perhaps it is an alias. */ - cp = strchr (*language, '\0'); - else if (cp[0] == '_') - { - /* Next is the territory. */ - cp[0] = '\0'; - *territory = ++cp; - - while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@' - && cp[0] != '+' && cp[0] != ',' && cp[0] != '_') - ++cp; - - mask |= TERRITORY; - - if (cp[0] == '.') - { - /* Next is the codeset. */ - syntax = xpg; - cp[0] = '\0'; - *codeset = ++cp; - - while (cp[0] != '\0' && cp[0] != '@') - ++cp; - - mask |= XPG_CODESET; - - if (*codeset != cp && (*codeset)[0] != '\0') - { - *normalized_codeset = _nl_normalize_codeset (*codeset, - cp - *codeset); - if (strcmp (*codeset, *normalized_codeset) == 0) - free ((char *) *normalized_codeset); - else - mask |= XPG_NORM_CODESET; - } - } - } - - if (cp[0] == '@' || (syntax != xpg && cp[0] == '+')) - { - /* Next is the modifier. */ - syntax = cp[0] == '@' ? xpg : cen; - cp[0] = '\0'; - *modifier = ++cp; - - while (syntax == cen && cp[0] != '\0' && cp[0] != '+' - && cp[0] != ',' && cp[0] != '_') - ++cp; - - mask |= XPG_MODIFIER | CEN_AUDIENCE; - } - - if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_')) - { - syntax = cen; - - if (cp[0] == '+') - { - /* Next is special application (CEN syntax). */ - cp[0] = '\0'; - *special = ++cp; - - while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_') - ++cp; - - mask |= CEN_SPECIAL; - } - - if (cp[0] == ',') - { - /* Next is sponsor (CEN syntax). */ - cp[0] = '\0'; - *sponsor = ++cp; - - while (cp[0] != '\0' && cp[0] != '_') - ++cp; - - mask |= CEN_SPONSOR; - } - - if (cp[0] == '_') - { - /* Next is revision (CEN syntax). */ - cp[0] = '\0'; - *revision = ++cp; - - mask |= CEN_REVISION; - } - } - - /* For CEN syntax values it might be important to have the - separator character in the file name, not for XPG syntax. */ - if (syntax == xpg) - { - if (*territory != NULL && (*territory)[0] == '\0') - mask &= ~TERRITORY; - - if (*codeset != NULL && (*codeset)[0] == '\0') - mask &= ~XPG_CODESET; - - if (*modifier != NULL && (*modifier)[0] == '\0') - mask &= ~XPG_MODIFIER; - } - - return mask; -} diff --git a/intl/finddomain.c b/intl/finddomain.c deleted file mode 100644 index 2f103d55..00000000 --- a/intl/finddomain.c +++ /dev/null @@ -1,198 +0,0 @@ -/* Handle list of needed message catalogs - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include - -#if defined HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ -/* List of already loaded domains. */ -static struct loaded_l10nfile *_nl_loaded_domains; - - -/* Return a data structure describing the message catalog described by - the DOMAINNAME and CATEGORY parameters with respect to the currently - established bindings. */ -struct loaded_l10nfile * -internal_function -_nl_find_domain (dirname, locale, domainname, domainbinding) - const char *dirname; - char *locale; - const char *domainname; - struct binding *domainbinding; -{ - struct loaded_l10nfile *retval; - const char *language; - const char *modifier; - const char *territory; - const char *codeset; - const char *normalized_codeset; - const char *special; - const char *sponsor; - const char *revision; - const char *alias_value; - int mask; - - /* LOCALE can consist of up to four recognized parts for the XPG syntax: - - language[_territory[.codeset]][@modifier] - - and six parts for the CEN syntax: - - language[_territory][+audience][+special][,[sponsor][_revision]] - - Beside the first part all of them are allowed to be missing. If - the full specified locale is not found, the less specific one are - looked for. The various parts will be stripped off according to - the following order: - (1) revision - (2) sponsor - (3) special - (4) codeset - (5) normalized codeset - (6) territory - (7) audience/modifier - */ - - /* If we have already tested for this locale entry there has to - be one data set in the list of loaded domains. */ - retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, - strlen (dirname) + 1, 0, locale, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, domainname, 0); - if (retval != NULL) - { - /* We know something about this locale. */ - int cnt; - - if (retval->decided == 0) - _nl_load_domain (retval, domainbinding); - - if (retval->data != NULL) - return retval; - - for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) - { - if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt], domainbinding); - - if (retval->successor[cnt]->data != NULL) - break; - } - return cnt >= 0 ? retval : NULL; - /* NOTREACHED */ - } - - /* See whether the locale value is an alias. If yes its value - *overwrites* the alias name. No test for the original value is - done. */ - alias_value = _nl_expand_alias (locale); - if (alias_value != NULL) - { -#if defined _LIBC || defined HAVE_STRDUP - locale = strdup (alias_value); - if (locale == NULL) - return NULL; -#else - size_t len = strlen (alias_value) + 1; - locale = (char *) malloc (len); - if (locale == NULL) - return NULL; - - memcpy (locale, alias_value, len); -#endif - } - - /* Now we determine the single parts of the locale name. First - look for the language. Termination symbols are `_' and `@' if - we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ - mask = _nl_explode_name (locale, &language, &modifier, &territory, - &codeset, &normalized_codeset, &special, - &sponsor, &revision); - - /* Create all possible locale entries which might be interested in - generalization. */ - retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, - strlen (dirname) + 1, mask, language, territory, - codeset, normalized_codeset, modifier, special, - sponsor, revision, domainname, 1); - if (retval == NULL) - /* This means we are out of core. */ - return NULL; - - if (retval->decided == 0) - _nl_load_domain (retval, domainbinding); - if (retval->data == NULL) - { - int cnt; - for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) - { - if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt], domainbinding); - if (retval->successor[cnt]->data != NULL) - break; - } - } - - /* The room for an alias was dynamically allocated. Free it now. */ - if (alias_value != NULL) - free (locale); - - /* The space for normalized_codeset is dynamically allocated. Free it. */ - if (mask & XPG_NORM_CODESET) - free ((void *) normalized_codeset); - - return retval; -} - - -#ifdef _LIBC -static void __attribute__ ((unused)) -free_mem (void) -{ - struct loaded_l10nfile *runp = _nl_loaded_domains; - - while (runp != NULL) - { - struct loaded_l10nfile *here = runp; - if (runp->data != NULL) - _nl_unload_domain ((struct loaded_domain *) runp->data); - runp = runp->next; - free ((char *) here->filename); - free (here); - } -} - -text_set_element (__libc_subfreeres, free_mem); -#endif diff --git a/intl/gettext.c b/intl/gettext.c deleted file mode 100644 index 22a6c245..00000000 --- a/intl/gettext.c +++ /dev/null @@ -1,64 +0,0 @@ -/* Implementation of gettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#ifdef _LIBC -# define __need_NULL -# include -#else -# include /* Just for NULL. */ -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define GETTEXT __gettext -# define DCGETTEXT __dcgettext -#else -# define GETTEXT gettext__ -# define DCGETTEXT dcgettext__ -#endif - -/* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -char * -GETTEXT (msgid) - const char *msgid; -{ - return DCGETTEXT (NULL, msgid, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__gettext, gettext); -#endif diff --git a/intl/gettext.h b/intl/gettext.h deleted file mode 100644 index 6f5d7605..00000000 --- a/intl/gettext.h +++ /dev/null @@ -1,102 +0,0 @@ -/* Description of GNU message catalog format: general file layout. - Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifndef _GETTEXT_H -#define _GETTEXT_H 1 - -#if HAVE_LIMITS_H || _LIBC -# include -#endif - -/* @@ end of prolog @@ */ - -/* The magic number of the GNU message catalog format. */ -#define _MAGIC 0x950412de -#define _MAGIC_SWAPPED 0xde120495 - -/* Revision number of the currently used .mo (binary) file format. */ -#define MO_REVISION_NUMBER 0 - -/* The following contortions are an attempt to use the C preprocessor - to determine an unsigned integral type that is 32 bits wide. An - alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but - as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work - when cross-compiling. */ - -#if __STDC__ -# define UINT_MAX_32_BITS 4294967295U -#else -# define UINT_MAX_32_BITS 0xFFFFFFFF -#endif - -/* If UINT_MAX isn't defined, assume it's a 32-bit type. - This should be valid for all systems GNU cares about because - that doesn't include 16-bit systems, and only modern systems - (that certainly have ) have 64+-bit integral types. */ - -#ifndef UINT_MAX -# define UINT_MAX UINT_MAX_32_BITS -#endif - -#if UINT_MAX == UINT_MAX_32_BITS -typedef unsigned nls_uint32; -#else -# if USHRT_MAX == UINT_MAX_32_BITS -typedef unsigned short nls_uint32; -# else -# if ULONG_MAX == UINT_MAX_32_BITS -typedef unsigned long nls_uint32; -# else - /* The following line is intended to throw an error. Using #error is - not portable enough. */ - "Cannot determine unsigned 32-bit data type." -# endif -# endif -#endif - - -/* Header for binary .mo file format. */ -struct mo_file_header -{ - /* The magic number. */ - nls_uint32 magic; - /* The revision number of the file format. */ - nls_uint32 revision; - /* The number of strings pairs. */ - nls_uint32 nstrings; - /* Offset of table with start offsets of original strings. */ - nls_uint32 orig_tab_offset; - /* Offset of table with start offsets of translation strings. */ - nls_uint32 trans_tab_offset; - /* Size of hashing table. */ - nls_uint32 hash_tab_size; - /* Offset of first hashing entry. */ - nls_uint32 hash_tab_offset; -}; - -struct string_desc -{ - /* Length of addressed string. */ - nls_uint32 length; - /* Offset of string in file. */ - nls_uint32 offset; -}; - -/* @@ begin of epilog @@ */ - -#endif /* gettext.h */ diff --git a/intl/gettextP.h b/intl/gettextP.h deleted file mode 100644 index 43de1cd4..00000000 --- a/intl/gettextP.h +++ /dev/null @@ -1,252 +0,0 @@ -/* Header describing internals of libintl library. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifndef _GETTEXTP_H -#define _GETTEXTP_H - -#include /* Get size_t. */ - -#ifdef _LIBC -# include "../iconv/gconv_int.h" -#else -# if HAVE_ICONV -# include -# endif -#endif - -#include "loadinfo.h" - -#include "gettext.h" /* Get nls_uint32. */ - -/* @@ end of prolog @@ */ - -#ifndef PARAMS -# if __STDC__ -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - -#ifndef internal_function -# define internal_function -#endif - -/* Tell the compiler when a conditional or integer expression is - almost always true or almost always false. */ -#ifndef HAVE_BUILTIN_EXPECT -# define __builtin_expect(expr, val) (expr) -#endif - -#ifndef W -# define W(flag, data) ((flag) ? SWAP (data) : (data)) -#endif - - -#ifdef _LIBC -# include -# define SWAP(i) bswap_32 (i) -#else -static inline nls_uint32 -SWAP (i) - nls_uint32 i; -{ - return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); -} -#endif - - -/* This is the representation of the expressions to determine the - plural form. */ -struct expression -{ - int nargs; /* Number of arguments. */ - enum operator - { - /* Without arguments: */ - var, /* The variable "n". */ - num, /* Decimal number. */ - /* Unary operators: */ - lnot, /* Logical NOT. */ - /* Binary operators: */ - mult, /* Multiplication. */ - divide, /* Division. */ - module, /* Module operation. */ - plus, /* Addition. */ - minus, /* Subtraction. */ - less_than, /* Comparison. */ - greater_than, /* Comparison. */ - less_or_equal, /* Comparison. */ - greater_or_equal, /* Comparison. */ - equal, /* Comparision for equality. */ - not_equal, /* Comparision for inequality. */ - land, /* Logical AND. */ - lor, /* Logical OR. */ - /* Ternary operators: */ - qmop /* Question mark operator. */ - } operation; - union - { - unsigned long int num; /* Number value for `num'. */ - struct expression *args[3]; /* Up to three arguments. */ - } val; -}; - -/* This is the data structure to pass information to the parser and get - the result in a thread-safe way. */ -struct parse_args -{ - const char *cp; - struct expression *res; -}; - - -/* The representation of an opened message catalog. */ -struct loaded_domain -{ - const char *data; - int use_mmap; - size_t mmap_size; - int must_swap; - nls_uint32 nstrings; - struct string_desc *orig_tab; - struct string_desc *trans_tab; - nls_uint32 hash_size; - nls_uint32 *hash_tab; - int codeset_cntr; -#ifdef _LIBC - __gconv_t conv; -#else -# if HAVE_ICONV - iconv_t conv; -# endif -#endif - char **conv_tab; - - struct expression *plural; - unsigned long int nplurals; -}; - -/* We want to allocate a string at the end of the struct. But ISO C - doesn't allow zero sized arrays. */ -#ifdef __GNUC__ -# define ZERO 0 -#else -# define ZERO 1 -#endif - -/* A set of settings bound to a message domain. Used to store settings - from bindtextdomain() and bind_textdomain_codeset(). */ -struct binding -{ - struct binding *next; - char *dirname; - int codeset_cntr; /* Incremented each time codeset changes. */ - char *codeset; - char domainname[ZERO]; -}; - -/* A counter which is incremented each time some previous translations - become invalid. - This variable is part of the external ABI of the GNU libintl. */ -extern int _nl_msg_cat_cntr; - -struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, - char *__locale, - const char *__domainname, - struct binding *__domainbinding)) - internal_function; -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain, - struct binding *__domainbinding)) - internal_function; -void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) - internal_function; -const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file, - struct loaded_domain *__domain, - struct binding *__domainbinding)) - internal_function; -void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain)) - internal_function; - -char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file, - struct binding *domainbinding, - const char *msgid, size_t *lengthp)) - internal_function; - -#ifdef _LIBC -extern char *__gettext PARAMS ((const char *__msgid)); -extern char *__dgettext PARAMS ((const char *__domainname, - const char *__msgid)); -extern char *__dcgettext PARAMS ((const char *__domainname, - const char *__msgid, int __category)); -extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2, - unsigned long int __n)); -extern char *__dngettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int n)); -extern char *__dcngettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category)); -extern char *__dcigettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - int __plural, unsigned long int __n, - int __category)); -extern char *__textdomain PARAMS ((const char *__domainname)); -extern char *__bindtextdomain PARAMS ((const char *__domainname, - const char *__dirname)); -extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname, - const char *__codeset)); -#else -extern char *gettext__ PARAMS ((const char *__msgid)); -extern char *dgettext__ PARAMS ((const char *__domainname, - const char *__msgid)); -extern char *dcgettext__ PARAMS ((const char *__domainname, - const char *__msgid, int __category)); -extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2, - unsigned long int __n)); -extern char *dngettext__ PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n)); -extern char *dcngettext__ PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category)); -extern char *dcigettext__ PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - int __plural, unsigned long int __n, - int __category)); -extern char *textdomain__ PARAMS ((const char *__domainname)); -extern char *bindtextdomain__ PARAMS ((const char *__domainname, - const char *__dirname)); -extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname, - const char *__codeset)); -#endif - -#ifdef _LIBC -extern void __gettext_free_exp PARAMS ((struct expression *exp)) - internal_function; -extern int __gettextparse PARAMS ((void *arg)); -#else -extern void gettext_free_exp__ PARAMS ((struct expression *exp)) - internal_function; -extern int gettextparse__ PARAMS ((void *arg)); -#endif - -/* @@ begin of epilog @@ */ - -#endif /* gettextP.h */ diff --git a/intl/hash-string.h b/intl/hash-string.h deleted file mode 100644 index ccb7acca..00000000 --- a/intl/hash-string.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Description of GNU message catalog format: string hashing function. - Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -/* @@ end of prolog @@ */ - -#ifndef PARAMS -# if __STDC__ -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - -/* We assume to have `unsigned long int' value with at least 32 bits. */ -#define HASHWORDBITS 32 - - -/* Defines the so called `hashpjw' function by P.J. Weinberger - [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, - 1986, 1987 Bell Telephone Laboratories, Inc.] */ -static unsigned long int hash_string PARAMS ((const char *__str_param)); - -static inline unsigned long int -hash_string (str_param) - const char *str_param; -{ - unsigned long int hval, g; - const char *str = str_param; - - /* Compute the hash value for the given string. */ - hval = 0; - while (*str != '\0') - { - hval <<= 4; - hval += (unsigned long int) *str++; - g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); - if (g != 0) - { - hval ^= g >> (HASHWORDBITS - 8); - hval ^= g; - } - } - return hval; -} diff --git a/intl/intl-compat.c b/intl/intl-compat.c deleted file mode 100644 index 0a06ce94..00000000 --- a/intl/intl-compat.c +++ /dev/null @@ -1,166 +0,0 @@ -/* intl-compat.c - Stub functions to call gettext functions from GNU gettext - Library. - Copyright (C) 1995, 2000, 2001 Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "libgnuintl.h" -#include "gettextP.h" - -/* @@ end of prolog @@ */ - -/* This file redirects the gettext functions (without prefix or suffix) to - those defined in the included GNU gettext library (with "__" suffix). - It is compiled into libintl when the included GNU gettext library is - configured --with-included-gettext. - - This redirection works also in the case that the system C library or - the system libintl library contain gettext/textdomain/... functions. - If it didn't, we would need to add preprocessor level redirections to - libgnuintl.h of the following form: - -# define gettext gettext__ -# define dgettext dgettext__ -# define dcgettext dcgettext__ -# define ngettext ngettext__ -# define dngettext dngettext__ -# define dcngettext dcngettext__ -# define textdomain textdomain__ -# define bindtextdomain bindtextdomain__ -# define bind_textdomain_codeset bind_textdomain_codeset__ - - How does this redirection work? There are two cases. - A. When libintl.a is linked into an executable, it works because - functions defined in the executable always override functions in - the shared libraries. - B. When libintl.so is used, it works because - 1. those systems defining gettext/textdomain/... in the C library - (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are - ELF systems and define these symbols as weak, thus explicitly - letting other shared libraries override it. - 2. those systems defining gettext/textdomain/... in a standalone - libintl.so library (namely, Solaris 2.3 and newer) have this - shared library in /usr/lib, and the linker will search /usr/lib - *after* the directory where the GNU gettext library is installed. - - A third case, namely when libintl.a is linked into a shared library - whose name is not libintl.so, is not supported. In this case, on - Solaris, when -lintl precedes the linker option for the shared library - containing GNU gettext, the system's gettext would indeed override - the GNU gettext. Anyone doing this kind of stuff must be clever enough - to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker - command line. */ - - -#undef gettext -#undef dgettext -#undef dcgettext -#undef ngettext -#undef dngettext -#undef dcngettext -#undef textdomain -#undef bindtextdomain -#undef bind_textdomain_codeset - - -char * -gettext (msgid) - const char *msgid; -{ - return gettext__ (msgid); -} - - -char * -dgettext (domainname, msgid) - const char *domainname; - const char *msgid; -{ - return dgettext__ (domainname, msgid); -} - - -char * -dcgettext (domainname, msgid, category) - const char *domainname; - const char *msgid; - int category; -{ - return dcgettext__ (domainname, msgid, category); -} - - -char * -ngettext (msgid1, msgid2, n) - const char *msgid1; - const char *msgid2; - unsigned long int n; -{ - return ngettext__ (msgid1, msgid2, n); -} - - -char * -dngettext (domainname, msgid1, msgid2, n) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; -{ - return dngettext__ (domainname, msgid1, msgid2, n); -} - - -char * -dcngettext (domainname, msgid1, msgid2, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; - int category; -{ - return dcngettext__ (domainname, msgid1, msgid2, n, category); -} - - -char * -textdomain (domainname) - const char *domainname; -{ - return textdomain__ (domainname); -} - - -char * -bindtextdomain (domainname, dirname) - const char *domainname; - const char *dirname; -{ - return bindtextdomain__ (domainname, dirname); -} - - -char * -bind_textdomain_codeset (domainname, codeset) - const char *domainname; - const char *codeset; -{ - return bind_textdomain_codeset__ (domainname, codeset); -} diff --git a/intl/l10nflist.c b/intl/l10nflist.c deleted file mode 100644 index 533e94be..00000000 --- a/intl/l10nflist.c +++ /dev/null @@ -1,405 +0,0 @@ -/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - Contributed by Ulrich Drepper , 1995. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -/* Tell glibc's to provide a prototype for stpcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif - -#if defined _LIBC || defined HAVE_ARGZ_H -# include -#endif -#include -#include -#include - -#include "loadinfo.h" - -/* On some strange systems still no definition of NULL is found. Sigh! */ -#ifndef NULL -# if defined __STDC__ && __STDC__ -# define NULL ((void *) 0) -# else -# define NULL 0 -# endif -#endif - -/* @@ end of prolog @@ */ - -#ifdef _LIBC -/* Rename the non ANSI C functions. This is required by the standard - because some ANSI C functions will require linking with this object - file and the name space must not be polluted. */ -# ifndef stpcpy -# define stpcpy(dest, src) __stpcpy(dest, src) -# endif -#else -# ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); -# endif -#endif - -/* Define function which are usually not available. */ - -#if !defined _LIBC && !defined HAVE___ARGZ_COUNT -/* Returns the number of strings in ARGZ. */ -static size_t argz_count__ PARAMS ((const char *argz, size_t len)); - -static size_t -argz_count__ (argz, len) - const char *argz; - size_t len; -{ - size_t count = 0; - while (len > 0) - { - size_t part_len = strlen (argz); - argz += part_len + 1; - len -= part_len + 1; - count++; - } - return count; -} -# undef __argz_count -# define __argz_count(argz, len) argz_count__ (argz, len) -#endif /* !_LIBC && !HAVE___ARGZ_COUNT */ - -#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY -/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's - except the last into the character SEP. */ -static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); - -static void -argz_stringify__ (argz, len, sep) - char *argz; - size_t len; - int sep; -{ - while (len > 0) - { - size_t part_len = strlen (argz); - argz += part_len; - len -= part_len + 1; - if (len > 0) - *argz++ = sep; - } -} -# undef __argz_stringify -# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) -#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ - -#if !defined _LIBC && !defined HAVE___ARGZ_NEXT -static char *argz_next__ PARAMS ((char *argz, size_t argz_len, - const char *entry)); - -static char * -argz_next__ (argz, argz_len, entry) - char *argz; - size_t argz_len; - const char *entry; -{ - if (entry) - { - if (entry < argz + argz_len) - entry = strchr (entry, '\0') + 1; - - return entry >= argz + argz_len ? NULL : (char *) entry; - } - else - if (argz_len > 0) - return argz; - else - return 0; -} -# undef __argz_next -# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) -#endif /* !_LIBC && !HAVE___ARGZ_NEXT */ - - -/* Return number of bits set in X. */ -static int pop PARAMS ((int x)); - -static inline int -pop (x) - int x; -{ - /* We assume that no more than 16 bits are used. */ - x = ((x & ~0x5555) >> 1) + (x & 0x5555); - x = ((x & ~0x3333) >> 2) + (x & 0x3333); - x = ((x >> 4) + x) & 0x0f0f; - x = ((x >> 8) + x) & 0xff; - - return x; -} - - -struct loaded_l10nfile * -_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, - territory, codeset, normalized_codeset, modifier, special, - sponsor, revision, filename, do_allocate) - struct loaded_l10nfile **l10nfile_list; - const char *dirlist; - size_t dirlist_len; - int mask; - const char *language; - const char *territory; - const char *codeset; - const char *normalized_codeset; - const char *modifier; - const char *special; - const char *sponsor; - const char *revision; - const char *filename; - int do_allocate; -{ - char *abs_filename; - struct loaded_l10nfile *last = NULL; - struct loaded_l10nfile *retval; - char *cp; - size_t entries; - int cnt; - - /* Allocate room for the full file name. */ - abs_filename = (char *) malloc (dirlist_len - + strlen (language) - + ((mask & TERRITORY) != 0 - ? strlen (territory) + 1 : 0) - + ((mask & XPG_CODESET) != 0 - ? strlen (codeset) + 1 : 0) - + ((mask & XPG_NORM_CODESET) != 0 - ? strlen (normalized_codeset) + 1 : 0) - + (((mask & XPG_MODIFIER) != 0 - || (mask & CEN_AUDIENCE) != 0) - ? strlen (modifier) + 1 : 0) - + ((mask & CEN_SPECIAL) != 0 - ? strlen (special) + 1 : 0) - + (((mask & CEN_SPONSOR) != 0 - || (mask & CEN_REVISION) != 0) - ? (1 + ((mask & CEN_SPONSOR) != 0 - ? strlen (sponsor) + 1 : 0) - + ((mask & CEN_REVISION) != 0 - ? strlen (revision) + 1 : 0)) : 0) - + 1 + strlen (filename) + 1); - - if (abs_filename == NULL) - return NULL; - - retval = NULL; - last = NULL; - - /* Construct file name. */ - memcpy (abs_filename, dirlist, dirlist_len); - __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR); - cp = abs_filename + (dirlist_len - 1); - *cp++ = '/'; - cp = stpcpy (cp, language); - - if ((mask & TERRITORY) != 0) - { - *cp++ = '_'; - cp = stpcpy (cp, territory); - } - if ((mask & XPG_CODESET) != 0) - { - *cp++ = '.'; - cp = stpcpy (cp, codeset); - } - if ((mask & XPG_NORM_CODESET) != 0) - { - *cp++ = '.'; - cp = stpcpy (cp, normalized_codeset); - } - if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) - { - /* This component can be part of both syntaces but has different - leading characters. For CEN we use `+', else `@'. */ - *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; - cp = stpcpy (cp, modifier); - } - if ((mask & CEN_SPECIAL) != 0) - { - *cp++ = '+'; - cp = stpcpy (cp, special); - } - if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0) - { - *cp++ = ','; - if ((mask & CEN_SPONSOR) != 0) - cp = stpcpy (cp, sponsor); - if ((mask & CEN_REVISION) != 0) - { - *cp++ = '_'; - cp = stpcpy (cp, revision); - } - } - - *cp++ = '/'; - stpcpy (cp, filename); - - /* Look in list of already loaded domains whether it is already - available. */ - last = NULL; - for (retval = *l10nfile_list; retval != NULL; retval = retval->next) - if (retval->filename != NULL) - { - int compare = strcmp (retval->filename, abs_filename); - if (compare == 0) - /* We found it! */ - break; - if (compare < 0) - { - /* It's not in the list. */ - retval = NULL; - break; - } - - last = retval; - } - - if (retval != NULL || do_allocate == 0) - { - free (abs_filename); - return retval; - } - - retval = (struct loaded_l10nfile *) - malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len) - * (1 << pop (mask)) - * sizeof (struct loaded_l10nfile *))); - if (retval == NULL) - return NULL; - - retval->filename = abs_filename; - retval->decided = (__argz_count (dirlist, dirlist_len) != 1 - || ((mask & XPG_CODESET) != 0 - && (mask & XPG_NORM_CODESET) != 0)); - retval->data = NULL; - - if (last == NULL) - { - retval->next = *l10nfile_list; - *l10nfile_list = retval; - } - else - { - retval->next = last->next; - last->next = retval; - } - - entries = 0; - /* If the DIRLIST is a real list the RETVAL entry corresponds not to - a real file. So we have to use the DIRLIST separation mechanism - of the inner loop. */ - cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask; - for (; cnt >= 0; --cnt) - if ((cnt & ~mask) == 0 - && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0) - && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0)) - { - /* Iterate over all elements of the DIRLIST. */ - char *dir = NULL; - - while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) - != NULL) - retval->successor[entries++] - = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt, - language, territory, codeset, - normalized_codeset, modifier, special, - sponsor, revision, filename, 1); - } - retval->successor[entries] = NULL; - - return retval; -} - -/* Normalize codeset name. There is no standard for the codeset - names. Normalization allows the user to use any of the common - names. The return value is dynamically allocated and has to be - freed by the caller. */ -const char * -_nl_normalize_codeset (codeset, name_len) - const char *codeset; - size_t name_len; -{ - int len = 0; - int only_digit = 1; - char *retval; - char *wp; - size_t cnt; - - for (cnt = 0; cnt < name_len; ++cnt) - if (isalnum (codeset[cnt])) - { - ++len; - - if (isalpha (codeset[cnt])) - only_digit = 0; - } - - retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); - - if (retval != NULL) - { - if (only_digit) - wp = stpcpy (retval, "iso"); - else - wp = retval; - - for (cnt = 0; cnt < name_len; ++cnt) - if (isalpha (codeset[cnt])) - *wp++ = tolower (codeset[cnt]); - else if (isdigit (codeset[cnt])) - *wp++ = codeset[cnt]; - - *wp = '\0'; - } - - return (const char *) retval; -} - - -/* @@ begin of epilog @@ */ - -/* We don't want libintl.a to depend on any other library. So we - avoid the non-standard function stpcpy. In GNU C Library this - function is available, though. Also allow the symbol HAVE_STPCPY - to be defined. */ -#if !_LIBC && !HAVE_STPCPY -static char * -stpcpy (dest, src) - char *dest; - const char *src; -{ - while ((*dest++ = *src++) != '\0') - /* Do nothing. */ ; - return dest - 1; -} -#endif diff --git a/intl/libgettext.h b/intl/libgettext.h deleted file mode 100644 index c5be54a8..00000000 --- a/intl/libgettext.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifndef _LIBGETTEXT_H -#define _LIBGETTEXT_H 1 - -/* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS - -/* Get declarations of GNU message catalog functions. */ -# include - -#else - -# define gettext(Msgid) (Msgid) -# define dgettext(Domainname, Msgid) (Msgid) -# define dcgettext(Domainname, Msgid, Category) (Msgid) -# define ngettext(Msgid1, Msgid2, N) \ - ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) -# define dngettext(Domainname, Msgid1, Msgid2, N) \ - ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) -# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ - ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) -# define textdomain(Domainname) ((char *) (Domainname)) -# define bindtextdomain(Domainname, Dirname) ((char *) (Dirname)) -# define bind_textdomain_codeset(Domainname, Codeset) ((char *) (Codeset)) - -#endif - -/* For automatical extraction of messages sometimes no real - translation is needed. Instead the string itself is the result. */ -#define gettext_noop(Str) (Str) - -#endif /* _LIBGETTEXT_H */ diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h deleted file mode 100644 index f891deb9..00000000 --- a/intl/libgnuintl.h +++ /dev/null @@ -1,128 +0,0 @@ -/* Message catalogs for internationalization. - Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifndef _LIBINTL_H -#define _LIBINTL_H 1 - -#include - -/* The LC_MESSAGES locale category is the category used by the functions - gettext() and dgettext(). It is specified in POSIX, but not in ANSI C. - On systems that don't define it, use an arbitrary value instead. - On Solaris, defines __LOCALE_H then includes (i.e. - this file!) and then only defines LC_MESSAGES. To avoid a redefinition - warning, don't define LC_MESSAGES in this case. */ -#if !defined LC_MESSAGES && !defined __LOCALE_H -# define LC_MESSAGES 1729 -#endif - -/* We define an additional symbol to signal that we use the GNU - implementation of gettext. */ -#define __USE_GNU_GETTEXT 1 - -/* Resolve a platform specific conflict on DJGPP. GNU gettext takes - precedence over _conio_gettext. */ -#ifdef __DJGPP__ -# undef gettext -# define gettext gettext -#endif - -#ifndef PARAMS -# if __STDC__ || defined __cplusplus -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -extern char *gettext PARAMS ((const char *__msgid)); - -/* Look up MSGID in the DOMAINNAME message catalog for the current - LC_MESSAGES locale. */ -extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); - -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, - int __category)); - - -/* Similar to `gettext' but select the plural form corresponding to the - number N. */ -extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2, - unsigned long int __n)); - -/* Similar to `dgettext' but select the plural form corresponding to the - number N. */ -extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1, - const char *__msgid2, unsigned long int __n)); - -/* Similar to `dcgettext' but select the plural form corresponding to the - number N. */ -extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1, - const char *__msgid2, unsigned long int __n, - int __category)); - - -/* Set the current default message catalog to DOMAINNAME. - If DOMAINNAME is null, return the current default. - If DOMAINNAME is "", reset to the default of "messages". */ -extern char *textdomain PARAMS ((const char *__domainname)); - -/* Specify that the DOMAINNAME message catalog will be found - in DIRNAME rather than in the system locale data base. */ -extern char *bindtextdomain PARAMS ((const char *__domainname, - const char *__dirname)); - -/* Specify the character encoding in which the messages from the - DOMAINNAME message catalog will be returned. */ -extern char *bind_textdomain_codeset PARAMS ((const char *__domainname, - const char *__codeset)); - - -/* Optimized version of the functions above. */ -#if defined __OPTIMIZED -/* These are macros, but could also be inline functions. */ - -# define gettext(msgid) \ - dgettext (NULL, msgid) - -# define dgettext(domainname, msgid) \ - dcgettext (domainname, msgid, LC_MESSAGES) - -# define ngettext(msgid1, msgid2, n) \ - dngettext (NULL, msgid1, msgid2, n) - -# define dngettext(domainname, msgid1, msgid2, n) \ - dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES) - -#endif /* Optimizing. */ - - -#ifdef __cplusplus -} -#endif - -#endif /* libintl.h */ diff --git a/intl/loadinfo.h b/intl/loadinfo.h deleted file mode 100644 index b8612607..00000000 --- a/intl/loadinfo.h +++ /dev/null @@ -1,109 +0,0 @@ -/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifndef _LOADINFO_H -#define _LOADINFO_H 1 - -#ifndef PARAMS -# if __STDC__ -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - -#ifndef internal_function -# define internal_function -#endif - -/* Tell the compiler when a conditional or integer expression is - almost always true or almost always false. */ -#ifndef HAVE_BUILTIN_EXPECT -# define __builtin_expect(expr, val) (expr) -#endif - -/* Separator in PATH like lists of pathnames. */ -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ - /* Win32, OS/2, DOS */ -# define PATH_SEPARATOR ';' -#else - /* Unix */ -# define PATH_SEPARATOR ':' -#endif - -/* Encoding of locale name parts. */ -#define CEN_REVISION 1 -#define CEN_SPONSOR 2 -#define CEN_SPECIAL 4 -#define XPG_NORM_CODESET 8 -#define XPG_CODESET 16 -#define TERRITORY 32 -#define CEN_AUDIENCE 64 -#define XPG_MODIFIER 128 - -#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE) -#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER) - - -struct loaded_l10nfile -{ - const char *filename; - int decided; - - const void *data; - - struct loaded_l10nfile *next; - struct loaded_l10nfile *successor[1]; -}; - - -/* Normalize codeset name. There is no standard for the codeset - names. Normalization allows the user to use any of the common - names. The return value is dynamically allocated and has to be - freed by the caller. */ -extern const char *_nl_normalize_codeset PARAMS ((const char *codeset, - size_t name_len)); - -extern struct loaded_l10nfile * -_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, - const char *dirlist, size_t dirlist_len, int mask, - const char *language, const char *territory, - const char *codeset, - const char *normalized_codeset, - const char *modifier, const char *special, - const char *sponsor, const char *revision, - const char *filename, int do_allocate)); - - -extern const char *_nl_expand_alias PARAMS ((const char *name)); - -/* normalized_codeset is dynamically allocated and has to be freed by - the caller. */ -extern int _nl_explode_name PARAMS ((char *name, const char **language, - const char **modifier, - const char **territory, - const char **codeset, - const char **normalized_codeset, - const char **special, - const char **sponsor, - const char **revision)); - -extern char *_nl_find_language PARAMS ((const char *name)); - -#endif /* loadinfo.h */ diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c deleted file mode 100644 index f99ebee3..00000000 --- a/intl/loadmsgcat.c +++ /dev/null @@ -1,567 +0,0 @@ -/* Load needed message catalogs. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -/* Tell glibc's to provide a prototype for mempcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include - -#ifdef __GNUC__ -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include -#include - -#if defined HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#ifdef _LIBC -# include -# include -#endif - -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ - || (defined _LIBC && defined _POSIX_MAPPED_FILES) -# include -# undef HAVE_MMAP -# define HAVE_MMAP 1 -#else -# undef HAVE_MMAP -#endif - -#include "gettext.h" -#include "gettextP.h" - -#ifdef _LIBC -# include "../locale/localeinfo.h" -#endif - -/* @@ end of prolog @@ */ - -#ifdef _LIBC -/* Rename the non ISO C functions. This is required by the standard - because some ISO C functions will require linking with this object - file and the name space must not be polluted. */ -# define open __open -# define close __close -# define read __read -# define mmap __mmap -# define munmap __munmap -#endif - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define PLURAL_PARSE __gettextparse -#else -# define PLURAL_PARSE gettextparse__ -#endif - -/* For those losing systems which don't have `alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA -# define freea(p) /* nothing */ -#else -# define alloca(n) malloc (n) -# define freea(p) free (p) -#endif - -/* For systems that distinguish between text and binary I/O. - O_BINARY is usually declared in . */ -#if !defined O_BINARY && defined _O_BINARY - /* For MSC-compatible compilers. */ -# define O_BINARY _O_BINARY -# define O_TEXT _O_TEXT -#endif -#ifdef __BEOS__ - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ -# undef O_BINARY -# undef O_TEXT -#endif -/* On reasonable systems, binary I/O is the default. */ -#ifndef O_BINARY -# define O_BINARY 0 -#endif - -/* We need a sign, whether a new catalog was loaded, which can be associated - with all translations. This is important if the translations are - cached by one of GCC's features. */ -int _nl_msg_cat_cntr; - -#if (defined __GNUC__ && !defined __APPLE_CC__) \ - || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) - -/* These structs are the constant expression for the germanic plural - form determination. It represents the expression "n != 1". */ -static const struct expression plvar = -{ - .nargs = 0, - .operation = var, -}; -static const struct expression plone = -{ - .nargs = 0, - .operation = num, - .val = - { - .num = 1 - } -}; -static struct expression germanic_plural = -{ - .nargs = 2, - .operation = not_equal, - .val = - { - .args = - { - [0] = (struct expression *) &plvar, - [1] = (struct expression *) &plone - } - } -}; - -# define INIT_GERMANIC_PLURAL() - -#else - -/* For compilers without support for ISO C 99 struct/union initializers: - Initialization at run-time. */ - -static struct expression plvar; -static struct expression plone; -static struct expression germanic_plural; - -static void -init_germanic_plural () -{ - if (plone.val.num == 0) - { - plvar.nargs = 0; - plvar.operation = var; - - plone.nargs = 0; - plone.operation = num; - plone.val.num = 1; - - germanic_plural.nargs = 2; - germanic_plural.operation = not_equal; - germanic_plural.val.args[0] = &plvar; - germanic_plural.val.args[1] = &plone; - } -} - -# define INIT_GERMANIC_PLURAL() init_germanic_plural () - -#endif - - -/* Initialize the codeset dependent parts of an opened message catalog. - Return the header entry. */ -const char * -internal_function -_nl_init_domain_conv (domain_file, domain, domainbinding) - struct loaded_l10nfile *domain_file; - struct loaded_domain *domain; - struct binding *domainbinding; -{ - /* Find out about the character set the file is encoded with. - This can be found (in textual form) in the entry "". If this - entry does not exist or if this does not contain the `charset=' - information, we will assume the charset matches the one the - current locale and we don't have to perform any conversion. */ - char *nullentry; - size_t nullentrylen; - - /* Preinitialize fields, to avoid recursion during _nl_find_msg. */ - domain->codeset_cntr = - (domainbinding != NULL ? domainbinding->codeset_cntr : 0); -#ifdef _LIBC - domain->conv = (__gconv_t) -1; -#else -# if HAVE_ICONV - domain->conv = (iconv_t) -1; -# endif -#endif - domain->conv_tab = NULL; - - /* Get the header entry. */ - nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen); - - if (nullentry != NULL) - { -#if defined _LIBC || HAVE_ICONV - const char *charsetstr; - - charsetstr = strstr (nullentry, "charset="); - if (charsetstr != NULL) - { - size_t len; - char *charset; - const char *outcharset; - - charsetstr += strlen ("charset="); - len = strcspn (charsetstr, " \t\n"); - - charset = (char *) alloca (len + 1); -# if defined _LIBC || HAVE_MEMPCPY - *((char *) mempcpy (charset, charsetstr, len)) = '\0'; -# else - memcpy (charset, charsetstr, len); - charset[len] = '\0'; -# endif - - /* The output charset should normally be determined by the - locale. But sometimes the locale is not used or not correctly - set up, so we provide a possibility for the user to override - this. Moreover, the value specified through - bind_textdomain_codeset overrides both. */ - if (domainbinding != NULL && domainbinding->codeset != NULL) - outcharset = domainbinding->codeset; - else - { - outcharset = getenv ("OUTPUT_CHARSET"); - if (outcharset == NULL || outcharset[0] == '\0') - { -# ifdef _LIBC - outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string; -# else -# if HAVE_ICONV - extern const char *locale_charset (void); - outcharset = locale_charset (); -# endif -# endif - } - } - -# ifdef _LIBC - /* We always want to use transliteration. */ - outcharset = norm_add_slashes (outcharset, "TRANSLIT"); - charset = norm_add_slashes (charset, NULL); - if (__gconv_open (outcharset, charset, &domain->conv, - GCONV_AVOID_NOCONV) - != __GCONV_OK) - domain->conv = (__gconv_t) -1; -# else -# if HAVE_ICONV - /* When using GNU libiconv, we want to use transliteration. */ -# if _LIBICONV_VERSION >= 0x0105 - len = strlen (outcharset); - { - char *tmp = (char *) alloca (len + 10 + 1); - memcpy (tmp, outcharset, len); - memcpy (tmp + len, "//TRANSLIT", 10 + 1); - outcharset = tmp; - } -# endif - domain->conv = iconv_open (outcharset, charset); -# if _LIBICONV_VERSION >= 0x0105 - freea (outcharset); -# endif -# endif -# endif - - freea (charset); - } -#endif /* _LIBC || HAVE_ICONV */ - } - - return nullentry; -} - -/* Frees the codeset dependent parts of an opened message catalog. */ -void -internal_function -_nl_free_domain_conv (domain) - struct loaded_domain *domain; -{ - if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1) - free (domain->conv_tab); - -#ifdef _LIBC - if (domain->conv != (__gconv_t) -1) - __gconv_close (domain->conv); -#else -# if HAVE_ICONV - if (domain->conv != (iconv_t) -1) - iconv_close (domain->conv); -# endif -#endif -} - -/* Load the message catalogs specified by FILENAME. If it is no valid - message catalog do nothing. */ -void -internal_function -_nl_load_domain (domain_file, domainbinding) - struct loaded_l10nfile *domain_file; - struct binding *domainbinding; -{ - int fd; - size_t size; -#ifdef _LIBC - struct stat64 st; -#else - struct stat st; -#endif - struct mo_file_header *data = (struct mo_file_header *) -1; - int use_mmap = 0; - struct loaded_domain *domain; - const char *nullentry; - - domain_file->decided = 1; - domain_file->data = NULL; - - /* Note that it would be useless to store domainbinding in domain_file - because domainbinding might be == NULL now but != NULL later (after - a call to bind_textdomain_codeset). */ - - /* If the record does not represent a valid locale the FILENAME - might be NULL. This can happen when according to the given - specification the locale file name is different for XPG and CEN - syntax. */ - if (domain_file->filename == NULL) - return; - - /* Try to open the addressed file. */ - fd = open (domain_file->filename, O_RDONLY | O_BINARY); - if (fd == -1) - return; - - /* We must know about the size of the file. */ - if ( -#ifdef _LIBC - __builtin_expect (fstat64 (fd, &st) != 0, 0) -#else - __builtin_expect (fstat (fd, &st) != 0, 0) -#endif - || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0) - || __builtin_expect (size < sizeof (struct mo_file_header), 0)) - { - /* Something went wrong. */ - close (fd); - return; - } - -#ifdef HAVE_MMAP - /* Now we are ready to load the file. If mmap() is available we try - this first. If not available or it failed we try to load it. */ - data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, - MAP_PRIVATE, fd, 0); - - if (__builtin_expect (data != (struct mo_file_header *) -1, 1)) - { - /* mmap() call was successful. */ - close (fd); - use_mmap = 1; - } -#endif - - /* If the data is not yet available (i.e. mmap'ed) we try to load - it manually. */ - if (data == (struct mo_file_header *) -1) - { - size_t to_read; - char *read_ptr; - - data = (struct mo_file_header *) malloc (size); - if (data == NULL) - return; - - to_read = size; - read_ptr = (char *) data; - do - { - long int nb = (long int) read (fd, read_ptr, to_read); - if (nb <= 0) - { -#ifdef EINTR - if (nb == -1 && errno == EINTR) - continue; -#endif - close (fd); - return; - } - read_ptr += nb; - to_read -= nb; - } - while (to_read > 0); - - close (fd); - } - - /* Using the magic number we can test whether it really is a message - catalog file. */ - if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED, - 0)) - { - /* The magic number is wrong: not a message catalog file. */ -#ifdef HAVE_MMAP - if (use_mmap) - munmap ((caddr_t) data, size); - else -#endif - free (data); - return; - } - - domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); - if (domain == NULL) - return; - domain_file->data = domain; - - domain->data = (char *) data; - domain->use_mmap = use_mmap; - domain->mmap_size = size; - domain->must_swap = data->magic != _MAGIC; - - /* Fill in the information about the available tables. */ - switch (W (domain->must_swap, data->revision)) - { - case 0: - domain->nstrings = W (domain->must_swap, data->nstrings); - domain->orig_tab = (struct string_desc *) - ((char *) data + W (domain->must_swap, data->orig_tab_offset)); - domain->trans_tab = (struct string_desc *) - ((char *) data + W (domain->must_swap, data->trans_tab_offset)); - domain->hash_size = W (domain->must_swap, data->hash_tab_size); - domain->hash_tab = (nls_uint32 *) - ((char *) data + W (domain->must_swap, data->hash_tab_offset)); - break; - default: - /* This is an invalid revision. */ -#ifdef HAVE_MMAP - if (use_mmap) - munmap ((caddr_t) data, size); - else -#endif - free (data); - free (domain); - domain_file->data = NULL; - return; - } - - /* Now initialize the character set converter from the character set - the file is encoded with (found in the header entry) to the domain's - specified character set or the locale's character set. */ - nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding); - - /* Also look for a plural specification. */ - if (nullentry != NULL) - { - const char *plural; - const char *nplurals; - - plural = strstr (nullentry, "plural="); - nplurals = strstr (nullentry, "nplurals="); - if (plural == NULL || nplurals == NULL) - goto no_plural; - else - { - /* First get the number. */ - char *endp; - unsigned long int n; - struct parse_args args; - - nplurals += 9; - while (*nplurals != '\0' && isspace (*nplurals)) - ++nplurals; -#if defined HAVE_STRTOUL || defined _LIBC - n = strtoul (nplurals, &endp, 10); -#else - for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++) - n = n * 10 + (*endp - '0'); -#endif - domain->nplurals = n; - if (nplurals == endp) - goto no_plural; - - /* Due to the restrictions bison imposes onto the interface of the - scanner function we have to put the input string and the result - passed up from the parser into the same structure which address - is passed down to the parser. */ - plural += 7; - args.cp = plural; - if (PLURAL_PARSE (&args) != 0) - goto no_plural; - domain->plural = args.res; - } - } - else - { - /* By default we are using the Germanic form: singular form only - for `one', the plural form otherwise. Yes, this is also what - English is using since English is a Germanic language. */ - no_plural: - INIT_GERMANIC_PLURAL (); - domain->plural = &germanic_plural; - domain->nplurals = 2; - } -} - - -#ifdef _LIBC -void -internal_function -_nl_unload_domain (domain) - struct loaded_domain *domain; -{ - if (domain->plural != &germanic_plural) - __gettext_free_exp (domain->plural); - - _nl_free_domain_conv (domain); - -# ifdef _POSIX_MAPPED_FILES - if (domain->use_mmap) - munmap ((caddr_t) domain->data, domain->mmap_size); - else -# endif /* _POSIX_MAPPED_FILES */ - free ((void *) domain->data); - - free (domain); -} -#endif diff --git a/intl/localcharset.c b/intl/localcharset.c deleted file mode 100644 index 61f8f3e8..00000000 --- a/intl/localcharset.c +++ /dev/null @@ -1,271 +0,0 @@ -/* Determine a canonical name for the current locale's character encoding. - - Copyright (C) 2000-2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -/* Written by Bruno Haible . */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#if HAVE_STDDEF_H -# include -#endif - -#include -#if HAVE_STRING_H -# include -#else -# include -#endif -#if HAVE_STDLIB_H -# include -#endif - -#if defined _WIN32 || defined __WIN32__ -# undef WIN32 /* avoid warning on mingw32 */ -# define WIN32 -#endif - -#ifndef WIN32 -# if HAVE_LANGINFO_CODESET -# include -# else -# if HAVE_SETLOCALE -# include -# endif -# endif -#else /* WIN32 */ -# define WIN32_LEAN_AND_MEAN -# include -#endif - -#ifndef DIRECTORY_SEPARATOR -# define DIRECTORY_SEPARATOR '/' -#endif - -#ifndef ISSLASH -# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) -#endif - -/* The following static variable is declared 'volatile' to avoid a - possible multithread problem in the function get_charset_aliases. If we - are running in a threaded environment, and if two threads initialize - 'charset_aliases' simultaneously, both will produce the same value, - and everything will be ok if the two assignments to 'charset_aliases' - are atomic. But I don't know what will happen if the two assignments mix. */ -#if __STDC__ != 1 -# define volatile /* empty */ -#endif -/* Pointer to the contents of the charset.alias file, if it has already been - read, else NULL. Its format is: - ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ -static const char * volatile charset_aliases; - -/* Return a pointer to the contents of the charset.alias file. */ -static const char * -get_charset_aliases () -{ - const char *cp; - - cp = charset_aliases; - if (cp == NULL) - { -#ifndef WIN32 - FILE *fp; - const char *dir = LIBDIR; - const char *base = "charset.alias"; - char *file_name; - - /* Concatenate dir and base into freshly allocated file_name. */ - { - size_t dir_len = strlen (dir); - size_t base_len = strlen (base); - int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1])); - file_name = (char *) malloc (dir_len + add_slash + base_len + 1); - if (file_name != NULL) - { - memcpy (file_name, dir, dir_len); - if (add_slash) - file_name[dir_len] = DIRECTORY_SEPARATOR; - memcpy (file_name + dir_len + add_slash, base, base_len + 1); - } - } - - if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL) - /* Out of memory or file not found, treat it as empty. */ - cp = ""; - else - { - /* Parse the file's contents. */ - int c; - char buf1[50+1]; - char buf2[50+1]; - char *res_ptr = NULL; - size_t res_size = 0; - size_t l1, l2; - - for (;;) - { - c = getc (fp); - if (c == EOF) - break; - if (c == '\n' || c == ' ' || c == '\t') - continue; - if (c == '#') - { - /* Skip comment, to end of line. */ - do - c = getc (fp); - while (!(c == EOF || c == '\n')); - if (c == EOF) - break; - continue; - } - ungetc (c, fp); - if (fscanf(fp, "%50s %50s", buf1, buf2) < 2) - break; - l1 = strlen (buf1); - l2 = strlen (buf2); - if (res_size == 0) - { - res_size = l1 + 1 + l2 + 1; - res_ptr = malloc (res_size + 1); - } - else - { - res_size += l1 + 1 + l2 + 1; - res_ptr = realloc (res_ptr, res_size + 1); - } - if (res_ptr == NULL) - { - /* Out of memory. */ - res_size = 0; - break; - } - strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1); - strcpy (res_ptr + res_size - (l2 + 1), buf2); - } - fclose (fp); - if (res_size == 0) - cp = ""; - else - { - *(res_ptr + res_size) = '\0'; - cp = res_ptr; - } - } - - if (file_name != NULL) - free (file_name); - -#else /* WIN32 */ - - /* To avoid the troubles of installing a separate file in the same - directory as the DLL and of retrieving the DLL's directory at - runtime, simply inline the aliases here. */ - - cp = "CP936" "\0" "GBK" "\0" - "CP1361" "\0" "JOHAB" "\0"; -#endif - - charset_aliases = cp; - } - - return cp; -} - -/* Determine the current locale's character encoding, and canonicalize it - into one of the canonical names listed in config.charset. - The result must not be freed; it is statically allocated. - If the canonical name cannot be determined, the result is a non-canonical - name. */ - -#ifdef STATIC -STATIC -#endif -const char * -locale_charset () -{ - const char *codeset; - const char *aliases; - -#ifndef WIN32 - -# if HAVE_LANGINFO_CODESET - - /* Most systems support nl_langinfo (CODESET) nowadays. */ - codeset = nl_langinfo (CODESET); - -# else - - /* On old systems which lack it, use setlocale or getenv. */ - const char *locale = NULL; - - /* But most old systems don't have a complete set of locales. Some - (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't - use setlocale here; it would return "C" when it doesn't support the - locale name the user has set. */ -# if HAVE_SETLOCALE && 0 - locale = setlocale (LC_CTYPE, NULL); -# endif - if (locale == NULL || locale[0] == '\0') - { - locale = getenv ("LC_ALL"); - if (locale == NULL || locale[0] == '\0') - { - locale = getenv ("LC_CTYPE"); - if (locale == NULL || locale[0] == '\0') - locale = getenv ("LANG"); - } - } - - /* On some old systems, one used to set locale = "iso8859_1". On others, - you set it to "language_COUNTRY.charset". In any case, we resolve it - through the charset.alias file. */ - codeset = locale; - -# endif - -#else /* WIN32 */ - - static char buf[2 + 10 + 1]; - - /* Win32 has a function returning the locale's codepage as a number. */ - sprintf (buf, "CP%u", GetACP ()); - codeset = buf; - -#endif - - if (codeset == NULL) - /* The canonical name cannot be determined. */ - codeset = ""; - - /* Resolve alias. */ - for (aliases = get_charset_aliases (); - *aliases != '\0'; - aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1) - if (strcmp (codeset, aliases) == 0 - || (aliases[0] == '*' && aliases[1] == '\0')) - { - codeset = aliases + strlen (aliases) + 1; - break; - } - - return codeset; -} diff --git a/intl/locale.alias b/intl/locale.alias deleted file mode 100644 index bd7b9b31..00000000 --- a/intl/locale.alias +++ /dev/null @@ -1,78 +0,0 @@ -# Locale name alias data base. -# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published -# by the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -# USA. - -# The format of this file is the same as for the corresponding file of -# the X Window System, which normally can be found in -# /usr/lib/X11/locale/locale.alias -# A single line contains two fields: an alias and a substitution value. -# All entries are case independent. - -# Note: This file is far from being complete. If you have a value for -# your own site which you think might be useful for others too, share -# it with the rest of us. Send it using the `glibcbug' script to -# bugs@gnu.org. - -# Packages using this file: - -bokmal no_NO.ISO-8859-1 -bokm嶚 no_NO.ISO-8859-1 -catalan ca_ES.ISO-8859-1 -croatian hr_HR.ISO-8859-2 -czech cs_CZ.ISO-8859-2 -danish da_DK.ISO-8859-1 -dansk da_DK.ISO-8859-1 -deutsch de_DE.ISO-8859-1 -dutch nl_NL.ISO-8859-1 -eesti et_EE.ISO-8859-1 -estonian et_EE.ISO-8859-1 -finnish fi_FI.ISO-8859-1 -fran蓷is fr_FR.ISO-8859-1 -french fr_FR.ISO-8859-1 -galego gl_ES.ISO-8859-1 -galician gl_ES.ISO-8859-1 -german de_DE.ISO-8859-1 -greek el_GR.ISO-8859-7 -hebrew he_IL.ISO-8859-8 -hrvatski hr_HR.ISO-8859-2 -hungarian hu_HU.ISO-8859-2 -icelandic is_IS.ISO-8859-1 -italian it_IT.ISO-8859-1 -japanese ja_JP.eucJP -japanese.euc ja_JP.eucJP -ja_JP ja_JP.eucJP -ja_JP.ujis ja_JP.eucJP -japanese.sjis ja_JP.SJIS -korean ko_KR.eucKR -korean.euc ko_KR.eucKR -ko_KR ko_KR.eucKR -lithuanian lt_LT.ISO-8859-13 -nb_NO no_NO.ISO-8859-1 -nb_NO.ISO-8859-1 no_NO.ISO-8859-1 -norwegian no_NO.ISO-8859-1 -nynorsk nn_NO.ISO-8859-1 -polish pl_PL.ISO-8859-2 -portuguese pt_PT.ISO-8859-1 -romanian ro_RO.ISO-8859-2 -russian ru_RU.ISO-8859-5 -slovak sk_SK.ISO-8859-2 -slovene sl_SI.ISO-8859-2 -slovenian sl_SI.ISO-8859-2 -spanish es_ES.ISO-8859-1 -swedish sv_SE.ISO-8859-1 -thai th_TH.TIS-620 -turkish tr_TR.ISO-8859-9 diff --git a/intl/localealias.c b/intl/localealias.c deleted file mode 100644 index 91e7acc9..00000000 --- a/intl/localealias.c +++ /dev/null @@ -1,404 +0,0 @@ -/* Handle aliases for locale names. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -/* Tell glibc's to provide a prototype for mempcpy(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include - -#ifdef __GNUC__ -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include - -#include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif - -#include "gettextP.h" - -/* @@ end of prolog @@ */ - -#ifdef _LIBC -/* Rename the non ANSI C functions. This is required by the standard - because some ANSI C functions will require linking with this object - file and the name space must not be polluted. */ -# define strcasecmp __strcasecmp - -# ifndef mempcpy -# define mempcpy __mempcpy -# endif -# define HAVE_MEMPCPY 1 - -/* We need locking here since we can be called from different places. */ -# include - -__libc_lock_define_initialized (static, lock); -#endif - -#ifndef internal_function -# define internal_function -#endif - -/* For those losing systems which don't have `alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA -# define freea(p) /* nothing */ -#else -# define alloca(n) malloc (n) -# define freea(p) free (p) -#endif - -#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED -# undef fgets -# define fgets(buf, len, s) fgets_unlocked (buf, len, s) -#endif -#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED -# undef feof -# define feof(s) feof_unlocked (s) -#endif - - -struct alias_map -{ - const char *alias; - const char *value; -}; - - -static char *string_space; -static size_t string_space_act; -static size_t string_space_max; -static struct alias_map *map; -static size_t nmap; -static size_t maxmap; - - -/* Prototypes for local functions. */ -static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) - internal_function; -static int extend_alias_table PARAMS ((void)); -static int alias_compare PARAMS ((const struct alias_map *map1, - const struct alias_map *map2)); - - -const char * -_nl_expand_alias (name) - const char *name; -{ - static const char *locale_alias_path = LOCALE_ALIAS_PATH; - struct alias_map *retval; - const char *result = NULL; - size_t added; - -#ifdef _LIBC - __libc_lock_lock (lock); -#endif - - do - { - struct alias_map item; - - item.alias = name; - - if (nmap > 0) - retval = (struct alias_map *) bsearch (&item, map, nmap, - sizeof (struct alias_map), - (int (*) PARAMS ((const void *, - const void *)) - ) alias_compare); - else - retval = NULL; - - /* We really found an alias. Return the value. */ - if (retval != NULL) - { - result = retval->value; - break; - } - - /* Perhaps we can find another alias file. */ - added = 0; - while (added == 0 && locale_alias_path[0] != '\0') - { - const char *start; - - while (locale_alias_path[0] == PATH_SEPARATOR) - ++locale_alias_path; - start = locale_alias_path; - - while (locale_alias_path[0] != '\0' - && locale_alias_path[0] != PATH_SEPARATOR) - ++locale_alias_path; - - if (start < locale_alias_path) - added = read_alias_file (start, locale_alias_path - start); - } - } - while (added != 0); - -#ifdef _LIBC - __libc_lock_unlock (lock); -#endif - - return result; -} - - -static size_t -internal_function -read_alias_file (fname, fname_len) - const char *fname; - int fname_len; -{ - FILE *fp; - char *full_fname; - size_t added; - static const char aliasfile[] = "/locale.alias"; - - full_fname = (char *) alloca (fname_len + sizeof aliasfile); -#ifdef HAVE_MEMPCPY - mempcpy (mempcpy (full_fname, fname, fname_len), - aliasfile, sizeof aliasfile); -#else - memcpy (full_fname, fname, fname_len); - memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); -#endif - - fp = fopen (full_fname, "r"); - freea (full_fname); - if (fp == NULL) - return 0; - - added = 0; - while (!feof (fp)) - { - /* It is a reasonable approach to use a fix buffer here because - a) we are only interested in the first two fields - b) these fields must be usable as file names and so must not - be that long - */ - char buf[BUFSIZ]; - char *alias; - char *value; - char *cp; - - if (fgets (buf, sizeof buf, fp) == NULL) - /* EOF reached. */ - break; - - /* Possibly not the whole line fits into the buffer. Ignore - the rest of the line. */ - if (strchr (buf, '\n') == NULL) - { - char altbuf[BUFSIZ]; - do - if (fgets (altbuf, sizeof altbuf, fp) == NULL) - /* Make sure the inner loop will be left. The outer loop - will exit at the `feof' test. */ - break; - while (strchr (altbuf, '\n') == NULL); - } - - cp = buf; - /* Ignore leading white space. */ - while (isspace (cp[0])) - ++cp; - - /* A leading '#' signals a comment line. */ - if (cp[0] != '\0' && cp[0] != '#') - { - alias = cp++; - while (cp[0] != '\0' && !isspace (cp[0])) - ++cp; - /* Terminate alias name. */ - if (cp[0] != '\0') - *cp++ = '\0'; - - /* Now look for the beginning of the value. */ - while (isspace (cp[0])) - ++cp; - - if (cp[0] != '\0') - { - size_t alias_len; - size_t value_len; - - value = cp++; - while (cp[0] != '\0' && !isspace (cp[0])) - ++cp; - /* Terminate value. */ - if (cp[0] == '\n') - { - /* This has to be done to make the following test - for the end of line possible. We are looking for - the terminating '\n' which do not overwrite here. */ - *cp++ = '\0'; - *cp = '\n'; - } - else if (cp[0] != '\0') - *cp++ = '\0'; - - if (nmap >= maxmap) - if (__builtin_expect (extend_alias_table (), 0)) - return added; - - alias_len = strlen (alias) + 1; - value_len = strlen (value) + 1; - - if (string_space_act + alias_len + value_len > string_space_max) - { - /* Increase size of memory pool. */ - size_t new_size = (string_space_max - + (alias_len + value_len > 1024 - ? alias_len + value_len : 1024)); - char *new_pool = (char *) realloc (string_space, new_size); - if (new_pool == NULL) - return added; - - if (__builtin_expect (string_space != new_pool, 0)) - { - size_t i; - - for (i = 0; i < nmap; i++) - { - map[i].alias += new_pool - string_space; - map[i].value += new_pool - string_space; - } - } - - string_space = new_pool; - string_space_max = new_size; - } - - map[nmap].alias = memcpy (&string_space[string_space_act], - alias, alias_len); - string_space_act += alias_len; - - map[nmap].value = memcpy (&string_space[string_space_act], - value, value_len); - string_space_act += value_len; - - ++nmap; - ++added; - } - } - } - - /* Should we test for ferror()? I think we have to silently ignore - errors. --drepper */ - fclose (fp); - - if (added > 0) - qsort (map, nmap, sizeof (struct alias_map), - (int (*) PARAMS ((const void *, const void *))) alias_compare); - - return added; -} - - -static int -extend_alias_table () -{ - size_t new_size; - struct alias_map *new_map; - - new_size = maxmap == 0 ? 100 : 2 * maxmap; - new_map = (struct alias_map *) realloc (map, (new_size - * sizeof (struct alias_map))); - if (new_map == NULL) - /* Simply don't extend: we don't have any more core. */ - return -1; - - map = new_map; - maxmap = new_size; - return 0; -} - - -#ifdef _LIBC -static void __attribute__ ((unused)) -free_mem (void) -{ - if (string_space != NULL) - free (string_space); - if (map != NULL) - free (map); -} -text_set_element (__libc_subfreeres, free_mem); -#endif - - -static int -alias_compare (map1, map2) - const struct alias_map *map1; - const struct alias_map *map2; -{ -#if defined _LIBC || defined HAVE_STRCASECMP - return strcasecmp (map1->alias, map2->alias); -#else - const unsigned char *p1 = (const unsigned char *) map1->alias; - const unsigned char *p2 = (const unsigned char *) map2->alias; - unsigned char c1, c2; - - if (p1 == p2) - return 0; - - do - { - /* I know this seems to be odd but the tolower() function in - some systems libc cannot handle nonalpha characters. */ - c1 = isupper (*p1) ? tolower (*p1) : *p1; - c2 = isupper (*p2) ? tolower (*p2) : *p2; - if (c1 == '\0') - break; - ++p1; - ++p2; - } - while (c1 == c2); - - return c1 - c2; -#endif -} diff --git a/intl/ngettext.c b/intl/ngettext.c deleted file mode 100644 index fb3ec5a9..00000000 --- a/intl/ngettext.c +++ /dev/null @@ -1,68 +0,0 @@ -/* Implementation of ngettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#ifdef _LIBC -# define __need_NULL -# include -#else -# include /* Just for NULL. */ -#endif - -#include "gettextP.h" -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif - -#include - -/* @@ end of prolog @@ */ - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define NGETTEXT __ngettext -# define DCNGETTEXT __dcngettext -#else -# define NGETTEXT ngettext__ -# define DCNGETTEXT dcngettext__ -#endif - -/* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -char * -NGETTEXT (msgid1, msgid2, n) - const char *msgid1; - const char *msgid2; - unsigned long int n; -{ - return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES); -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__ngettext, ngettext); -#endif diff --git a/intl/plural.c b/intl/plural.c deleted file mode 100644 index 640d43cc..00000000 --- a/intl/plural.c +++ /dev/null @@ -1,1326 +0,0 @@ - -/* A Bison parser, made from plural.y - by GNU Bison version 1.28 */ - -#define YYBISON 1 /* Identify Bison output. */ - -#define yyparse __gettextparse -#define yylex __gettextlex -#define yyerror __gettexterror -#define yylval __gettextlval -#define yychar __gettextchar -#define yydebug __gettextdebug -#define yynerrs __gettextnerrs -#define EQUOP2 257 -#define CMPOP2 258 -#define ADDOP2 259 -#define MULOP2 260 -#define NUMBER 261 - -#line 1 "plural.y" - -/* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 2000. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -/* The bison generated parser uses alloca. AIX 3 forces us to put this - declaration at the beginning of the file. The declaration in bison's - skeleton file comes too late. This must come before - because may include arbitrary system headers. */ -#if defined _AIX && !defined __GNUC__ - #pragma alloca -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include "gettextP.h" - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define FREE_EXPRESSION __gettext_free_exp -#else -# define FREE_EXPRESSION gettext_free_exp__ -# define __gettextparse gettextparse__ -#endif - -#define YYLEX_PARAM &((struct parse_args *) arg)->cp -#define YYPARSE_PARAM arg - -#line 53 "plural.y" -typedef union { - unsigned long int num; - enum operator op; - struct expression *exp; -} YYSTYPE; -#line 59 "plural.y" - -/* Prototypes for local functions. */ -static struct expression *new_exp PARAMS ((int nargs, enum operator op, - struct expression * const *args)); -static inline struct expression *new_exp_0 PARAMS ((enum operator op)); -static inline struct expression *new_exp_1 PARAMS ((enum operator op, - struct expression *right)); -static struct expression *new_exp_2 PARAMS ((enum operator op, - struct expression *left, - struct expression *right)); -static inline struct expression *new_exp_3 PARAMS ((enum operator op, - struct expression *bexp, - struct expression *tbranch, - struct expression *fbranch)); -static int yylex PARAMS ((YYSTYPE *lval, const char **pexp)); -static void yyerror PARAMS ((const char *str)); - -/* Allocation of expressions. */ - -static struct expression * -new_exp (nargs, op, args) - int nargs; - enum operator op; - struct expression * const *args; -{ - int i; - struct expression *newp; - - /* If any of the argument could not be malloc'ed, just return NULL. */ - for (i = nargs - 1; i >= 0; i--) - if (args[i] == NULL) - goto fail; - - /* Allocate a new expression. */ - newp = (struct expression *) malloc (sizeof (*newp)); - if (newp != NULL) - { - newp->nargs = nargs; - newp->operation = op; - for (i = nargs - 1; i >= 0; i--) - newp->val.args[i] = args[i]; - return newp; - } - - fail: - for (i = nargs - 1; i >= 0; i--) - FREE_EXPRESSION (args[i]); - - return NULL; -} - -static inline struct expression * -new_exp_0 (op) - enum operator op; -{ - return new_exp (0, op, NULL); -} - -static inline struct expression * -new_exp_1 (op, right) - enum operator op; - struct expression *right; -{ - struct expression *args[1]; - - args[0] = right; - return new_exp (1, op, args); -} - -static struct expression * -new_exp_2 (op, left, right) - enum operator op; - struct expression *left; - struct expression *right; -{ - struct expression *args[2]; - - args[0] = left; - args[1] = right; - return new_exp (2, op, args); -} - -static inline struct expression * -new_exp_3 (op, bexp, tbranch, fbranch) - enum operator op; - struct expression *bexp; - struct expression *tbranch; - struct expression *fbranch; -{ - struct expression *args[3]; - - args[0] = bexp; - args[1] = tbranch; - args[2] = fbranch; - return new_exp (3, op, args); -} - -#include - -#ifndef __cplusplus -#ifndef __STDC__ -#define const -#endif -#endif - - - -#define YYFINAL 27 -#define YYFLAG -32768 -#define YYNTBASE 16 - -#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18) - -static const char yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 10, 2, 2, 2, 2, 5, 2, 14, - 15, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 12, 2, 2, - 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 13, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 4, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 6, 7, 8, 9, - 11 -}; - -#if YYDEBUG != 0 -static const short yyprhs[] = { 0, - 0, 2, 8, 12, 16, 20, 24, 28, 32, 35, - 37, 39 -}; - -static const short yyrhs[] = { 17, - 0, 17, 3, 17, 12, 17, 0, 17, 4, 17, - 0, 17, 5, 17, 0, 17, 6, 17, 0, 17, - 7, 17, 0, 17, 8, 17, 0, 17, 9, 17, - 0, 10, 17, 0, 13, 0, 11, 0, 14, 17, - 15, 0 -}; - -#endif - -#if YYDEBUG != 0 -static const short yyrline[] = { 0, - 178, 186, 190, 194, 198, 202, 206, 210, 214, 218, - 222, 227 -}; -#endif - - -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE) - -static const char * const yytname[] = { "$","error","$undefined.","'?'","'|'", -"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'", -"start","exp", NULL -}; -#endif - -static const short yyr1[] = { 0, - 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, - 17, 17 -}; - -static const short yyr2[] = { 0, - 1, 5, 3, 3, 3, 3, 3, 3, 2, 1, - 1, 3 -}; - -static const short yydefact[] = { 0, - 0, 11, 10, 0, 1, 9, 0, 0, 0, 0, - 0, 0, 0, 0, 12, 0, 3, 4, 5, 6, - 7, 8, 0, 2, 0, 0, 0 -}; - -static const short yydefgoto[] = { 25, - 5 -}; - -static const short yypact[] = { -9, - -9,-32768,-32768, -9, 34,-32768, 11, -9, -9, -9, - -9, -9, -9, -9,-32768, 24, 39, 43, 16, 26, - -3,-32768, -9, 34, 21, 53,-32768 -}; - -static const short yypgoto[] = {-32768, - -1 -}; - - -#define YYLAST 53 - - -static const short yytable[] = { 6, - 1, 2, 7, 3, 4, 14, 16, 17, 18, 19, - 20, 21, 22, 8, 9, 10, 11, 12, 13, 14, - 26, 24, 12, 13, 14, 15, 8, 9, 10, 11, - 12, 13, 14, 13, 14, 23, 8, 9, 10, 11, - 12, 13, 14, 10, 11, 12, 13, 14, 11, 12, - 13, 14, 27 -}; - -static const short yycheck[] = { 1, - 10, 11, 4, 13, 14, 9, 8, 9, 10, 11, - 12, 13, 14, 3, 4, 5, 6, 7, 8, 9, - 0, 23, 7, 8, 9, 15, 3, 4, 5, 6, - 7, 8, 9, 8, 9, 12, 3, 4, 5, 6, - 7, 8, 9, 5, 6, 7, 8, 9, 6, 7, - 8, 9, 0 -}; -#define YYPURE 1 - -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" -/* This file comes from bison-1.28. */ - -/* Skeleton output parser for bison, - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -#ifndef YYSTACK_USE_ALLOCA -#ifdef alloca -#define YYSTACK_USE_ALLOCA -#else /* alloca not defined */ -#ifdef __GNUC__ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) -#define YYSTACK_USE_ALLOCA -#include -#else /* not sparc */ -/* We think this test detects Watcom and Microsoft C. */ -/* This used to test MSDOS, but that is a bad idea - since that symbol is in the user namespace. */ -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) -#if 0 /* No need for malloc.h, which pollutes the namespace; - instead, just don't use alloca. */ -#include -#endif -#else /* not MSDOS, or __TURBOC__ */ -#if defined(_AIX) -/* I don't know what this was needed for, but it pollutes the namespace. - So I turned it off. rms, 2 May 1997. */ -/* #include */ - #pragma alloca -#define YYSTACK_USE_ALLOCA -#else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif -#endif /* not _AIX */ -#endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc */ -#endif /* not GNU C */ -#endif /* alloca not defined */ -#endif /* YYSTACK_USE_ALLOCA not defined */ - -#ifdef YYSTACK_USE_ALLOCA -#define YYSTACK_ALLOC alloca -#else -#define YYSTACK_ALLOC malloc -#endif - -/* Note: there must be only one dollar sign in this file. - It is replaced by the list of actions, each action - as one case of the switch. */ - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY -2 -#define YYEOF 0 -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 -/* Like YYERROR except do call yyerror. - This remains here temporarily to ease the - transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ -#define YYFAIL goto yyerrlab -#define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(token, value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { yychar = (token), yylval = (value); \ - yychar1 = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ - goto yybackup; \ - } \ - else \ - { yyerror ("syntax error: cannot back up"); YYERROR; } \ -while (0) - -#define YYTERROR 1 -#define YYERRCODE 256 - -#ifndef YYPURE -#define YYLEX yylex() -#endif - -#ifdef YYPURE -#ifdef YYLSP_NEEDED -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval, &yylloc) -#endif -#else /* not YYLSP_NEEDED */ -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval) -#endif -#endif /* not YYLSP_NEEDED */ -#endif - -/* If nonreentrant, generate the variables here */ - -#ifndef YYPURE - -int yychar; /* the lookahead symbol */ -YYSTYPE yylval; /* the semantic value of the */ - /* lookahead symbol */ - -#ifdef YYLSP_NEEDED -YYLTYPE yylloc; /* location data for the lookahead */ - /* symbol */ -#endif - -int yynerrs; /* number of parse errors so far */ -#endif /* not YYPURE */ - -#if YYDEBUG != 0 -int yydebug; /* nonzero means print parse trace */ -/* Since this is uninitialized, it does not stop multiple parsers - from coexisting. */ -#endif - -/* YYINITDEPTH indicates the initial size of the parser's stacks */ - -#ifndef YYINITDEPTH -#define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH is the maximum size the stacks can grow to - (effective only if the built-in stack extension method is used). */ - -#if YYMAXDEPTH == 0 -#undef YYMAXDEPTH -#endif - -#ifndef YYMAXDEPTH -#define YYMAXDEPTH 10000 -#endif - -/* Define __yy_memcpy. Note that the size argument - should be passed with type unsigned int, because that is what the non-GCC - definitions require. With GCC, __builtin_memcpy takes an arg - of type size_t, but it can handle unsigned int. */ - -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) -#else /* not GNU C or C++ */ -#ifndef __cplusplus - -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (to, from, count) - char *to; - char *from; - unsigned int count; -{ - register char *f = from; - register char *t = to; - register int i = count; - - while (i-- > 0) - *t++ = *f++; -} - -#else /* __cplusplus */ - -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (char *to, char *from, unsigned int count) -{ - register char *t = to; - register char *f = from; - register int i = count; - - while (i-- > 0) - *t++ = *f++; -} - -#endif -#endif - -#line 217 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" - -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ - -#ifdef YYPARSE_PARAM -#ifdef __cplusplus -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -#define YYPARSE_PARAM_DECL -#else /* not __cplusplus */ -#define YYPARSE_PARAM_ARG YYPARSE_PARAM -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -#endif /* not __cplusplus */ -#else /* not YYPARSE_PARAM */ -#define YYPARSE_PARAM_ARG -#define YYPARSE_PARAM_DECL -#endif /* not YYPARSE_PARAM */ - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -#ifdef YYPARSE_PARAM -int yyparse (void *); -#else -int yyparse (void); -#endif -#endif - -int -yyparse(YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL -{ - register int yystate; - register int yyn; - register short *yyssp; - register YYSTYPE *yyvsp; - int yyerrstatus; /* number of tokens to shift before error messages enabled */ - int yychar1 = 0; /* lookahead token as an internal (translated) token number */ - - short yyssa[YYINITDEPTH]; /* the state stack */ - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ - - short *yyss = yyssa; /* refer to the stacks thru separate pointers */ - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ - -#ifdef YYLSP_NEEDED - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; - -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) -#else -#define YYPOPSTACK (yyvsp--, yyssp--) -#endif - - int yystacksize = YYINITDEPTH; - int yyfree_stacks = 0; - -#ifdef YYPURE - int yychar; - YYSTYPE yylval; - int yynerrs; -#ifdef YYLSP_NEEDED - YYLTYPE yylloc; -#endif -#endif - - YYSTYPE yyval; /* the variable used to return */ - /* semantic values from the action */ - /* routines */ - - int yylen; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Starting parse\n"); -#endif - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss - 1; - yyvsp = yyvs; -#ifdef YYLSP_NEEDED - yylsp = yyls; -#endif - -/* Push a new state, which is found in yystate . */ -/* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. */ -yynewstate: - - *++yyssp = yystate; - - if (yyssp >= yyss + yystacksize - 1) - { - /* Give user a chance to reallocate the stack */ - /* Use copies of these so that the &'s don't force the real ones into memory. */ - YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; -#ifdef YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; -#endif - - /* Get the current used size of the three stacks, in elements. */ - int size = yyssp - yyss + 1; - -#ifdef yyoverflow - /* Each stack pointer address is followed by the size of - the data in use in that stack, in bytes. */ -#ifdef YYLSP_NEEDED - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yyls1, size * sizeof (*yylsp), - &yystacksize); -#else - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yystacksize); -#endif - - yyss = yyss1; yyvs = yyvs1; -#ifdef YYLSP_NEEDED - yyls = yyls1; -#endif -#else /* no yyoverflow */ - /* Extend the stack our own way. */ - if (yystacksize >= YYMAXDEPTH) - { - yyerror("parser stack overflow"); - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 2; - } - yystacksize *= 2; - if (yystacksize > YYMAXDEPTH) - yystacksize = YYMAXDEPTH; -#ifndef YYSTACK_USE_ALLOCA - yyfree_stacks = 1; -#endif - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, - size * (unsigned int) sizeof (*yyssp)); - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, - size * (unsigned int) sizeof (*yyvsp)); -#ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, - size * (unsigned int) sizeof (*yylsp)); -#endif -#endif /* no yyoverflow */ - - yyssp = yyss + size - 1; - yyvsp = yyvs + size - 1; -#ifdef YYLSP_NEEDED - yylsp = yyls + size - 1; -#endif - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Stack size increased to %d\n", yystacksize); -#endif - - if (yyssp >= yyss + yystacksize - 1) - YYABORT; - } - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Entering state %d\n", yystate); -#endif - - goto yybackup; - yybackup: - -/* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ -/* yyresume: */ - - /* First try to decide what to do without reference to lookahead token. */ - - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yydefault; - - /* Not known => get a lookahead token if don't already have one. */ - - /* yychar is either YYEMPTY or YYEOF - or a valid token in external form. */ - - if (yychar == YYEMPTY) - { -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Reading a token: "); -#endif - yychar = YYLEX; - } - - /* Convert token to internal form (in yychar1) for indexing tables with */ - - if (yychar <= 0) /* This means end of input. */ - { - yychar1 = 0; - yychar = YYEOF; /* Don't call YYLEX any more */ - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Now at end of input.\n"); -#endif - } - else - { - yychar1 = YYTRANSLATE(yychar); - -#if YYDEBUG != 0 - if (yydebug) - { - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise meaning - of a token, for further debugging info. */ -#ifdef YYPRINT - YYPRINT (stderr, yychar, yylval); -#endif - fprintf (stderr, ")\n"); - } -#endif - } - - yyn += yychar1; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) - goto yydefault; - - yyn = yytable[yyn]; - - /* yyn is what to do for this token type in this state. - Negative => reduce, -yyn is rule number. - Positive => shift, yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - else if (yyn == 0) - goto yyerrlab; - - if (yyn == YYFINAL) - YYACCEPT; - - /* Shift the lookahead token. */ - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); -#endif - - /* Discard the token being shifted unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - *++yyvsp = yylval; -#ifdef YYLSP_NEEDED - *++yylsp = yylloc; -#endif - - /* count tokens shifted since error; after three, turn off error status. */ - if (yyerrstatus) yyerrstatus--; - - yystate = yyn; - goto yynewstate; - -/* Do the default action for the current state. */ -yydefault: - - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - -/* Do a reduction. yyn is the number of a rule to reduce with. */ -yyreduce: - yylen = yyr2[yyn]; - if (yylen > 0) - yyval = yyvsp[1-yylen]; /* implement default value of the action */ - -#if YYDEBUG != 0 - if (yydebug) - { - int i; - - fprintf (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); - - /* Print the symbols being reduced, and their result. */ - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) - fprintf (stderr, "%s ", yytname[yyrhs[i]]); - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } -#endif - - - switch (yyn) { - -case 1: -#line 179 "plural.y" -{ - if (yyvsp[0].exp == NULL) - YYABORT; - ((struct parse_args *) arg)->res = yyvsp[0].exp; - ; - break;} -case 2: -#line 187 "plural.y" -{ - yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 3: -#line 191 "plural.y" -{ - yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 4: -#line 195 "plural.y" -{ - yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 5: -#line 199 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 6: -#line 203 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 7: -#line 207 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 8: -#line 211 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} -case 9: -#line 215 "plural.y" -{ - yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); - ; - break;} -case 10: -#line 219 "plural.y" -{ - yyval.exp = new_exp_0 (var); - ; - break;} -case 11: -#line 223 "plural.y" -{ - if ((yyval.exp = new_exp_0 (num)) != NULL) - yyval.exp->val.num = yyvsp[0].num; - ; - break;} -case 12: -#line 228 "plural.y" -{ - yyval.exp = yyvsp[-1].exp; - ; - break;} -} - /* the action file gets copied in in place of this dollarsign */ -#line 543 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" - - yyvsp -= yylen; - yyssp -= yylen; -#ifdef YYLSP_NEEDED - yylsp -= yylen; -#endif - -#if YYDEBUG != 0 - if (yydebug) - { - short *ssp1 = yyss - 1; - fprintf (stderr, "state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif - - *++yyvsp = yyval; - -#ifdef YYLSP_NEEDED - yylsp++; - if (yylen == 0) - { - yylsp->first_line = yylloc.first_line; - yylsp->first_column = yylloc.first_column; - yylsp->last_line = (yylsp-1)->last_line; - yylsp->last_column = (yylsp-1)->last_column; - yylsp->text = 0; - } - else - { - yylsp->last_line = (yylsp+yylen-1)->last_line; - yylsp->last_column = (yylsp+yylen-1)->last_column; - } -#endif - - /* Now "shift" the result of the reduction. - Determine what state that goes to, - based on the state we popped back to - and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTBASE] + *yyssp; - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTBASE]; - - goto yynewstate; - -yyerrlab: /* here on detecting error */ - - if (! yyerrstatus) - /* If not already recovering from an error, report this error. */ - { - ++yynerrs; - -#ifdef YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (yyn > YYFLAG && yyn < YYLAST) - { - int size = 0; - char *msg; - int x, count; - - count = 0; - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - size += strlen(yytname[x]) + 15, count++; - msg = (char *) malloc(size + 15); - if (msg != 0) - { - strcpy(msg, "parse error"); - - if (count < 5) - { - count = 0; - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - { - strcat(msg, count == 0 ? ", expecting `" : " or `"); - strcat(msg, yytname[x]); - strcat(msg, "'"); - count++; - } - } - yyerror(msg); - free(msg); - } - else - yyerror ("parse error; also virtual memory exceeded"); - } - else -#endif /* YYERROR_VERBOSE */ - yyerror("parse error"); - } - - goto yyerrlab1; -yyerrlab1: /* here on error raised explicitly by an action */ - - if (yyerrstatus == 3) - { - /* if just tried and failed to reuse lookahead token after an error, discard it. */ - - /* return failure if at end of input */ - if (yychar == YYEOF) - YYABORT; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); -#endif - - yychar = YYEMPTY; - } - - /* Else will try to reuse lookahead token - after shifting the error token. */ - - yyerrstatus = 3; /* Each real token shifted decrements this */ - - goto yyerrhandle; - -yyerrdefault: /* current state does not do anything special for the error token. */ - -#if 0 - /* This is wrong; only states that explicitly want error tokens - should shift them. */ - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ - if (yyn) goto yydefault; -#endif - -yyerrpop: /* pop the current state because it cannot handle the error token */ - - if (yyssp == yyss) YYABORT; - yyvsp--; - yystate = *--yyssp; -#ifdef YYLSP_NEEDED - yylsp--; -#endif - -#if YYDEBUG != 0 - if (yydebug) - { - short *ssp1 = yyss - 1; - fprintf (stderr, "Error: state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif - -yyerrhandle: - - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yyerrdefault; - - yyn += YYTERROR; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) - goto yyerrdefault; - - yyn = yytable[yyn]; - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrpop; - yyn = -yyn; - goto yyreduce; - } - else if (yyn == 0) - goto yyerrpop; - - if (yyn == YYFINAL) - YYACCEPT; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting error token, "); -#endif - - *++yyvsp = yylval; -#ifdef YYLSP_NEEDED - *++yylsp = yylloc; -#endif - - yystate = yyn; - goto yynewstate; - - yyacceptlab: - /* YYACCEPT comes here. */ - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 0; - - yyabortlab: - /* YYABORT comes here. */ - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 1; -} -#line 233 "plural.y" - - -void -internal_function -FREE_EXPRESSION (exp) - struct expression *exp; -{ - if (exp == NULL) - return; - - /* Handle the recursive case. */ - switch (exp->nargs) - { - case 3: - FREE_EXPRESSION (exp->val.args[2]); - /* FALLTHROUGH */ - case 2: - FREE_EXPRESSION (exp->val.args[1]); - /* FALLTHROUGH */ - case 1: - FREE_EXPRESSION (exp->val.args[0]); - /* FALLTHROUGH */ - default: - break; - } - - free (exp); -} - - -static int -yylex (lval, pexp) - YYSTYPE *lval; - const char **pexp; -{ - const char *exp = *pexp; - int result; - - while (1) - { - if (exp[0] == '\0') - { - *pexp = exp; - return YYEOF; - } - - if (exp[0] != ' ' && exp[0] != '\t') - break; - - ++exp; - } - - result = *exp++; - switch (result) - { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - { - unsigned long int n = result - '0'; - while (exp[0] >= '0' && exp[0] <= '9') - { - n *= 10; - n += exp[0] - '0'; - ++exp; - } - lval->num = n; - result = NUMBER; - } - break; - - case '=': - if (exp[0] == '=') - { - ++exp; - lval->op = equal; - result = EQUOP2; - } - else - result = YYERRCODE; - break; - - case '!': - if (exp[0] == '=') - { - ++exp; - lval->op = not_equal; - result = EQUOP2; - } - break; - - case '&': - case '|': - if (exp[0] == result) - ++exp; - else - result = YYERRCODE; - break; - - case '<': - if (exp[0] == '=') - { - ++exp; - lval->op = less_or_equal; - } - else - lval->op = less_than; - result = CMPOP2; - break; - - case '>': - if (exp[0] == '=') - { - ++exp; - lval->op = greater_or_equal; - } - else - lval->op = greater_than; - result = CMPOP2; - break; - - case '*': - lval->op = mult; - result = MULOP2; - break; - - case '/': - lval->op = divide; - result = MULOP2; - break; - - case '%': - lval->op = module; - result = MULOP2; - break; - - case '+': - lval->op = plus; - result = ADDOP2; - break; - - case '-': - lval->op = minus; - result = ADDOP2; - break; - - case 'n': - case '?': - case ':': - case '(': - case ')': - /* Nothing, just return the character. */ - break; - - case ';': - case '\n': - case '\0': - /* Be safe and let the user call this function again. */ - --exp; - result = YYEOF; - break; - - default: - result = YYERRCODE; -#if YYDEBUG != 0 - --exp; -#endif - break; - } - - *pexp = exp; - - return result; -} - - -static void -yyerror (str) - const char *str; -{ - /* Do nothing. We don't print error messages here. */ -} diff --git a/intl/plural.y b/intl/plural.y deleted file mode 100644 index be049a6d..00000000 --- a/intl/plural.y +++ /dev/null @@ -1,413 +0,0 @@ -%{ -/* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. - Written by Ulrich Drepper , 2000. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -/* The bison generated parser uses alloca. AIX 3 forces us to put this - declaration at the beginning of the file. The declaration in bison's - skeleton file comes too late. This must come before - because may include arbitrary system headers. */ -#if defined _AIX && !defined __GNUC__ - #pragma alloca -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include "gettextP.h" - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define FREE_EXPRESSION __gettext_free_exp -#else -# define FREE_EXPRESSION gettext_free_exp__ -# define __gettextparse gettextparse__ -#endif - -#define YYLEX_PARAM &((struct parse_args *) arg)->cp -#define YYPARSE_PARAM arg -%} -%pure_parser -%expect 10 - -%union { - unsigned long int num; - enum operator op; - struct expression *exp; -} - -%{ -/* Prototypes for local functions. */ -static struct expression *new_exp PARAMS ((int nargs, enum operator op, - struct expression * const *args)); -static inline struct expression *new_exp_0 PARAMS ((enum operator op)); -static inline struct expression *new_exp_1 PARAMS ((enum operator op, - struct expression *right)); -static struct expression *new_exp_2 PARAMS ((enum operator op, - struct expression *left, - struct expression *right)); -static inline struct expression *new_exp_3 PARAMS ((enum operator op, - struct expression *bexp, - struct expression *tbranch, - struct expression *fbranch)); -static int yylex PARAMS ((YYSTYPE *lval, const char **pexp)); -static void yyerror PARAMS ((const char *str)); - -/* Allocation of expressions. */ - -static struct expression * -new_exp (nargs, op, args) - int nargs; - enum operator op; - struct expression * const *args; -{ - int i; - struct expression *newp; - - /* If any of the argument could not be malloc'ed, just return NULL. */ - for (i = nargs - 1; i >= 0; i--) - if (args[i] == NULL) - goto fail; - - /* Allocate a new expression. */ - newp = (struct expression *) malloc (sizeof (*newp)); - if (newp != NULL) - { - newp->nargs = nargs; - newp->operation = op; - for (i = nargs - 1; i >= 0; i--) - newp->val.args[i] = args[i]; - return newp; - } - - fail: - for (i = nargs - 1; i >= 0; i--) - FREE_EXPRESSION (args[i]); - - return NULL; -} - -static inline struct expression * -new_exp_0 (op) - enum operator op; -{ - return new_exp (0, op, NULL); -} - -static inline struct expression * -new_exp_1 (op, right) - enum operator op; - struct expression *right; -{ - struct expression *args[1]; - - args[0] = right; - return new_exp (1, op, args); -} - -static struct expression * -new_exp_2 (op, left, right) - enum operator op; - struct expression *left; - struct expression *right; -{ - struct expression *args[2]; - - args[0] = left; - args[1] = right; - return new_exp (2, op, args); -} - -static inline struct expression * -new_exp_3 (op, bexp, tbranch, fbranch) - enum operator op; - struct expression *bexp; - struct expression *tbranch; - struct expression *fbranch; -{ - struct expression *args[3]; - - args[0] = bexp; - args[1] = tbranch; - args[2] = fbranch; - return new_exp (3, op, args); -} - -%} - -/* This declares that all operators have the same associativity and the - precedence order as in C. See [Harbison, Steele: C, A Reference Manual]. - There is no unary minus and no bitwise operators. - Operators with the same syntactic behaviour have been merged into a single - token, to save space in the array generated by bison. */ -%right '?' /* ? */ -%left '|' /* || */ -%left '&' /* && */ -%left EQUOP2 /* == != */ -%left CMPOP2 /* < > <= >= */ -%left ADDOP2 /* + - */ -%left MULOP2 /* * / % */ -%right '!' /* ! */ - -%token EQUOP2 CMPOP2 ADDOP2 MULOP2 -%token NUMBER -%type exp - -%% - -start: exp - { - if ($1 == NULL) - YYABORT; - ((struct parse_args *) arg)->res = $1; - } - ; - -exp: exp '?' exp ':' exp - { - $$ = new_exp_3 (qmop, $1, $3, $5); - } - | exp '|' exp - { - $$ = new_exp_2 (lor, $1, $3); - } - | exp '&' exp - { - $$ = new_exp_2 (land, $1, $3); - } - | exp EQUOP2 exp - { - $$ = new_exp_2 ($2, $1, $3); - } - | exp CMPOP2 exp - { - $$ = new_exp_2 ($2, $1, $3); - } - | exp ADDOP2 exp - { - $$ = new_exp_2 ($2, $1, $3); - } - | exp MULOP2 exp - { - $$ = new_exp_2 ($2, $1, $3); - } - | '!' exp - { - $$ = new_exp_1 (lnot, $2); - } - | 'n' - { - $$ = new_exp_0 (var); - } - | NUMBER - { - if (($$ = new_exp_0 (num)) != NULL) - $$->val.num = $1; - } - | '(' exp ')' - { - $$ = $2; - } - ; - -%% - -void -internal_function -FREE_EXPRESSION (exp) - struct expression *exp; -{ - if (exp == NULL) - return; - - /* Handle the recursive case. */ - switch (exp->nargs) - { - case 3: - FREE_EXPRESSION (exp->val.args[2]); - /* FALLTHROUGH */ - case 2: - FREE_EXPRESSION (exp->val.args[1]); - /* FALLTHROUGH */ - case 1: - FREE_EXPRESSION (exp->val.args[0]); - /* FALLTHROUGH */ - default: - break; - } - - free (exp); -} - - -static int -yylex (lval, pexp) - YYSTYPE *lval; - const char **pexp; -{ - const char *exp = *pexp; - int result; - - while (1) - { - if (exp[0] == '\0') - { - *pexp = exp; - return YYEOF; - } - - if (exp[0] != ' ' && exp[0] != '\t') - break; - - ++exp; - } - - result = *exp++; - switch (result) - { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - { - unsigned long int n = result - '0'; - while (exp[0] >= '0' && exp[0] <= '9') - { - n *= 10; - n += exp[0] - '0'; - ++exp; - } - lval->num = n; - result = NUMBER; - } - break; - - case '=': - if (exp[0] == '=') - { - ++exp; - lval->op = equal; - result = EQUOP2; - } - else - result = YYERRCODE; - break; - - case '!': - if (exp[0] == '=') - { - ++exp; - lval->op = not_equal; - result = EQUOP2; - } - break; - - case '&': - case '|': - if (exp[0] == result) - ++exp; - else - result = YYERRCODE; - break; - - case '<': - if (exp[0] == '=') - { - ++exp; - lval->op = less_or_equal; - } - else - lval->op = less_than; - result = CMPOP2; - break; - - case '>': - if (exp[0] == '=') - { - ++exp; - lval->op = greater_or_equal; - } - else - lval->op = greater_than; - result = CMPOP2; - break; - - case '*': - lval->op = mult; - result = MULOP2; - break; - - case '/': - lval->op = divide; - result = MULOP2; - break; - - case '%': - lval->op = module; - result = MULOP2; - break; - - case '+': - lval->op = plus; - result = ADDOP2; - break; - - case '-': - lval->op = minus; - result = ADDOP2; - break; - - case 'n': - case '?': - case ':': - case '(': - case ')': - /* Nothing, just return the character. */ - break; - - case ';': - case '\n': - case '\0': - /* Be safe and let the user call this function again. */ - --exp; - result = YYEOF; - break; - - default: - result = YYERRCODE; -#if YYDEBUG != 0 - --exp; -#endif - break; - } - - *pexp = exp; - - return result; -} - - -static void -yyerror (str) - const char *str; -{ - /* Do nothing. We don't print error messages here. */ -} diff --git a/intl/ref-add.sin b/intl/ref-add.sin deleted file mode 100644 index 167374e3..00000000 --- a/intl/ref-add.sin +++ /dev/null @@ -1,31 +0,0 @@ -# Add this package to a list of references stored in a text file. -# -# Copyright (C) 2000 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published -# by the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -# USA. -# -# Written by Bruno Haible . -# -/^# Packages using this file: / { - s/# Packages using this file:// - ta - :a - s/ @PACKAGE@ / @PACKAGE@ / - tb - s/ $/ @PACKAGE@ / - :b - s/^/# Packages using this file:/ -} diff --git a/intl/ref-del.sin b/intl/ref-del.sin deleted file mode 100644 index 613cf37f..00000000 --- a/intl/ref-del.sin +++ /dev/null @@ -1,26 +0,0 @@ -# Remove this package from a list of references stored in a text file. -# -# Copyright (C) 2000 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published -# by the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -# USA. -# -# Written by Bruno Haible . -# -/^# Packages using this file: / { - s/# Packages using this file:// - s/ @PACKAGE@ / / - s/^/# Packages using this file:/ -} diff --git a/intl/textdomain.c b/intl/textdomain.c deleted file mode 100644 index 2e420ad7..00000000 --- a/intl/textdomain.c +++ /dev/null @@ -1,142 +0,0 @@ -/* Implementation of the textdomain(3) function. - Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include - -#ifdef _LIBC -# include -#else -# include "libgnuintl.h" -#endif -#include "gettextP.h" - -#ifdef _LIBC -/* We have to handle multi-threaded applications. */ -# include -#else -/* Provide dummy implementation if this is outside glibc. */ -# define __libc_rwlock_define(CLASS, NAME) -# define __libc_rwlock_wrlock(NAME) -# define __libc_rwlock_unlock(NAME) -#endif - -/* The internal variables in the standalone libintl.a must have different - names than the internal variables in GNU libc, otherwise programs - using libintl.a cannot be linked statically. */ -#if !defined _LIBC -# define _nl_default_default_domain _nl_default_default_domain__ -# define _nl_current_default_domain _nl_current_default_domain__ -#endif - -/* @@ end of prolog @@ */ - -/* Name of the default text domain. */ -extern const char _nl_default_default_domain[]; - -/* Default text domain in which entries for gettext(3) are to be found. */ -extern const char *_nl_current_default_domain; - - -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define TEXTDOMAIN __textdomain -# ifndef strdup -# define strdup(str) __strdup (str) -# endif -#else -# define TEXTDOMAIN textdomain__ -#endif - -/* Lock variable to protect the global data in the gettext implementation. */ -__libc_rwlock_define (extern, _nl_state_lock) - -/* Set the current default message catalog to DOMAINNAME. - If DOMAINNAME is null, return the current default. - If DOMAINNAME is "", reset to the default of "messages". */ -char * -TEXTDOMAIN (domainname) - const char *domainname; -{ - char *new_domain; - char *old_domain; - - /* A NULL pointer requests the current setting. */ - if (domainname == NULL) - return (char *) _nl_current_default_domain; - - __libc_rwlock_wrlock (_nl_state_lock); - - old_domain = (char *) _nl_current_default_domain; - - /* If domain name is the null string set to default domain "messages". */ - if (domainname[0] == '\0' - || strcmp (domainname, _nl_default_default_domain) == 0) - { - _nl_current_default_domain = _nl_default_default_domain; - new_domain = (char *) _nl_current_default_domain; - } - else if (strcmp (domainname, old_domain) == 0) - /* This can happen and people will use it to signal that some - environment variable changed. */ - new_domain = old_domain; - else - { - /* If the following malloc fails `_nl_current_default_domain' - will be NULL. This value will be returned and so signals we - are out of core. */ -#if defined _LIBC || defined HAVE_STRDUP - new_domain = strdup (domainname); -#else - size_t len = strlen (domainname) + 1; - new_domain = (char *) malloc (len); - if (new_domain != NULL) - memcpy (new_domain, domainname, len); -#endif - - if (new_domain != NULL) - _nl_current_default_domain = new_domain; - } - - /* We use this possibility to signal a change of the loaded catalogs - since this is most likely the case and there is no other easy we - to do it. Do it only when the call was successful. */ - if (new_domain != NULL) - { - ++_nl_msg_cat_cntr; - - if (old_domain != new_domain && old_domain != _nl_default_default_domain) - free (old_domain); - } - - __libc_rwlock_unlock (_nl_state_lock); - - return new_domain; -} - -#ifdef _LIBC -/* Alias for function name in GNU C Library. */ -weak_alias (__textdomain, textdomain); -#endif diff --git a/lib/Makefile.am b/lib/Makefile.am index f3f1fa82..bd11e972 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,22 +2,18 @@ AUTOMAKE_OPTIONS = 1.0 foreign DEFS = -INCLUDES = -I$(top_srcdir) +INCLUDES = lib_LTLIBRARIES = libshadow.la libshadow_la_LDFLAGS = -version-info 0:0:0 -libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBTCFS) $(LIBSKEY) $(LIBMD) \ +libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD) \ $(top_builddir)/libmisc/libmisc.la libshadow_la_SOURCES = \ commonio.c \ commonio.h \ defines.h \ - dialchk.c \ - dialchk.h \ - dialup.c \ - dialup.h \ encrypt.c \ faillog.h \ fputsx.c \ @@ -29,6 +25,8 @@ libshadow_la_SOURCES = \ gshadow.c \ lockpw.c \ md5.h \ + nscd.c \ + nscd.h \ pam_defs.h \ port.c \ port.h \ @@ -47,8 +45,6 @@ libshadow_la_SOURCES = \ shadowio.c \ shadowio.h \ snprintf.h \ - tcfsio.c \ - tcfsio.h \ utent.c EXTRA_libshadow_la_SOURCESS = grent.c pwent.c mkdir.c rename.c rmdir.c \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 8d45e4af..1699cbc5 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,109 +14,152 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ + +DEFS = DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.0 foreign - -DEFS = -INCLUDES = -I$(top_srcdir) +INCLUDES = lib_LTLIBRARIES = libshadow.la libshadow_la_LDFLAGS = -version-info 0:0:0 -libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBTCFS) $(LIBSKEY) $(LIBMD) \ +libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD) \ $(top_builddir)/libmisc/libmisc.la @@ -123,10 +167,6 @@ libshadow_la_SOURCES = \ commonio.c \ commonio.h \ defines.h \ - dialchk.c \ - dialchk.h \ - dialup.c \ - dialup.h \ encrypt.c \ faillog.h \ fputsx.c \ @@ -138,6 +178,8 @@ libshadow_la_SOURCES = \ gshadow.c \ lockpw.c \ md5.h \ + nscd.c \ + nscd.h \ pam_defs.h \ port.c \ port.h \ @@ -156,8 +198,6 @@ libshadow_la_SOURCES = \ shadowio.c \ shadowio.h \ snprintf.h \ - tcfsio.c \ - tcfsio.h \ utent.c @@ -182,33 +222,32 @@ EXTRA_DIST = \ gshadow_.h shadow_.h lastlog_.h snprintf.h subdir = lib +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) libshadow_la_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la -am_libshadow_la_OBJECTS = commonio.lo dialchk.lo dialup.lo encrypt.lo \ - fputsx.lo getdef.lo getpass.lo groupio.lo gshadow.lo lockpw.lo \ - port.lo pwauth.lo pwio.lo rad64.lo sgetgrent.lo sgetpwent.lo \ - sgroupio.lo shadow.lo shadowio.lo tcfsio.lo utent.lo +am_libshadow_la_OBJECTS = commonio.lo encrypt.lo fputsx.lo getdef.lo \ + getpass.lo groupio.lo gshadow.lo lockpw.lo nscd.lo port.lo \ + pwauth.lo pwio.lo rad64.lo sgetgrent.lo sgetpwent.lo \ + sgroupio.lo shadow.lo shadowio.lo utent.lo libshadow_la_OBJECTS = $(am_libshadow_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commonio.Plo $(DEPDIR)/dialchk.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/dialup.Plo $(DEPDIR)/encrypt.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/fputsx.Plo $(DEPDIR)/getdef.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/getpass.Plo $(DEPDIR)/groupio.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/gshadow.Plo $(DEPDIR)/lockpw.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/port.Plo $(DEPDIR)/pwauth.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/pwio.Plo $(DEPDIR)/rad64.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/sgetgrent.Plo $(DEPDIR)/sgetpwent.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/sgroupio.Plo $(DEPDIR)/shadow.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/shadowio.Plo $(DEPDIR)/tcfsio.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/utent.Plo +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commonio.Plo ./$(DEPDIR)/encrypt.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/fputsx.Plo ./$(DEPDIR)/getdef.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/getpass.Plo ./$(DEPDIR)/groupio.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/gshadow.Plo ./$(DEPDIR)/lockpw.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/nscd.Plo ./$(DEPDIR)/port.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/pwauth.Plo ./$(DEPDIR)/pwio.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/rad64.Plo ./$(DEPDIR)/sgetgrent.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/sgetpwent.Plo ./$(DEPDIR)/sgroupio.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/shadow.Plo ./$(DEPDIR)/shadowio.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/utent.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -216,50 +255,47 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -CFLAGS = @CFLAGS@ DIST_SOURCES = $(libshadow_la_SOURCES) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(libshadow_la_SOURCES) all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +libLTLIBRARIES_INSTALL = $(INSTALL) install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done libshadow.la: $(libshadow_la_OBJECTS) $(libshadow_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libshadow_la_LDFLAGS) $(libshadow_la_OBJECTS) $(libshadow_la_LIBADD) $(LIBS) @@ -269,98 +305,148 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/commonio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dialchk.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dialup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/encrypt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fputsx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdef.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getpass.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groupio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gshadow.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lockpw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/port.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwauth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rad64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sgetgrent.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sgetpwent.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sgroupio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shadow.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shadowio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tcfsio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/utent.Plo@am__quote@ - -distclean-depend: - -rm -rf $(DEPDIR) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commonio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/encrypt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fputsx.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdef.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpass.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gshadow.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lockpw.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nscd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/port.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwauth.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rad64.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgetgrent.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgetpwent.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgroupio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadow.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utent.Plo@am__quote@ .c.o: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .c.lo: -@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -CCDEPMODE = @CCDEPMODE@ +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + +CTAGS = ctags +CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -373,7 +459,6 @@ all-am: Makefile $(LTLIBRARIES) installdirs: $(mkinstalldirs) $(DESTDIR)$(libdir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -385,6 +470,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -392,7 +478,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -403,9 +489,10 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am @@ -426,7 +513,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -434,19 +522,28 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES -.PHONY: GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ - distclean-depend distclean-generic distclean-libtool \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libLTLIBRARIES install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool tags uninstall \ - uninstall-am uninstall-info-am uninstall-libLTLIBRARIES + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am \ + uninstall-libLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/commonio.c b/lib/commonio.c index 66618a7d..78cf54be 100644 --- a/lib/commonio.c +++ b/lib/commonio.c @@ -2,7 +2,7 @@ #include #include "rcsid.h" -RCSID("$Id: commonio.c,v 1.22 2001/11/17 13:15:52 malekith Exp $") +RCSID("$Id: commonio.c,v 1.23 2003/05/12 06:12:06 kloczek Exp $") #include "defines.h" #include @@ -12,6 +12,7 @@ RCSID("$Id: commonio.c,v 1.22 2001/11/17 13:15:52 malekith Exp $") #include #include #include +#include #ifdef HAVE_SHADOW_H #include #endif diff --git a/lib/defines.h b/lib/defines.h index 5114e0b2..ba456686 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -1,4 +1,4 @@ -/* $Id: defines.h,v 1.20 2001/11/19 09:23:52 kloczek Exp $ */ +/* $Id: defines.h,v 1.21 2003/05/03 16:14:23 kloczek Exp $ */ /* some useful defines */ #ifndef _DEFINES_H_ @@ -47,14 +47,6 @@ char *strchr(), *strrchr(), *strtok(); # include #endif -/* Solaris 2.4 defines __SVR4, but not SVR4 -j. */ - -#ifdef __SVR4 -# ifndef SVR4 -# define SVR4 __SVR4 -# endif -#endif - #include #include #if HAVE_SYS_WAIT_H @@ -283,7 +275,7 @@ char *strchr(), *strrchr(), *strtok(); /* get rid of a few ugly repeated #ifdefs in pwent.c and grent.c */ /* XXX - this is ugly too, configure should test it and not check for any hardcoded system names, if possible. --marekm */ -#if defined(SVR4) || defined(AIX) || defined(__linux__) +#if defined(AIX) || defined(__linux__) #define SETXXENT_TYPE void #define SETXXENT_RET(x) return #define SETXXENT_TEST(x) x; if (0) /* compiler should optimize this away */ diff --git a/lib/dialchk.c b/lib/dialchk.c deleted file mode 100644 index 92b4ce7e..00000000 --- a/lib/dialchk.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 1989 - 1991, Julianne Frances Haugh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Julianne F. Haugh nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#include "rcsid.h" -RCSID("$Id: dialchk.c,v 1.6 1999/08/27 19:02:51 marekm Exp $") - -#include -#include "defines.h" -#include "prototypes.h" -#include "dialup.h" -#include "dialchk.h" - -/* - * Check for dialup password - * - * dialcheck tests to see if tty is listed as being a dialup - * line. If so, a dialup password may be required if the shell - * is listed as one which requires a second password. - */ - -int -dialcheck(const char *tty, const char *sh) -{ - struct dialup *dialup; - char *pass; - char *cp; - - setduent (); - - if (! isadialup (tty)) { - endduent (); - return (1); - } - if (! (dialup = getdushell (sh))) { - endduent (); - return (1); - } - endduent (); - - if (dialup->du_passwd[0] == '\0') - return (1); - - if (! (pass = getpass(_("Dialup Password: ")))) - return (0); - - cp = pw_encrypt (pass, dialup->du_passwd); - strzero(pass); - return (strcmp (cp, dialup->du_passwd) == 0); -} diff --git a/lib/dialchk.h b/lib/dialchk.h deleted file mode 100644 index 75f1829e..00000000 --- a/lib/dialchk.h +++ /dev/null @@ -1,16 +0,0 @@ -/* $Id: dialchk.h,v 1.2 2000/08/26 18:27:17 marekm Exp $ */ -#ifndef _DIALCHK_H_ -#define _DIALCHK_H_ - -#include "defines.h" - -/* - * Check for dialup password - * - * dialcheck tests to see if tty is listed as being a dialup - * line. If so, a dialup password may be required if the shell - * is listed as one which requires a second password. - */ -extern int dialcheck(const char *, const char *); - -#endif diff --git a/lib/dialup.c b/lib/dialup.c deleted file mode 100644 index 7965c1ae..00000000 --- a/lib/dialup.c +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright 1989 - 1991, Julianne Frances Haugh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Julianne F. Haugh nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#include "rcsid.h" -RCSID("$Id: dialup.c,v 1.3 1997/12/07 23:26:50 marekm Exp $") - -#include -#include "prototypes.h" -#include "defines.h" -#include "dialup.h" - -static FILE *dialpwd; - -void -setduent(void) -{ - if (dialpwd) - rewind (dialpwd); - else - dialpwd = fopen (DIALPWD, "r"); -} - -void -endduent(void) -{ - if (dialpwd) - fclose (dialpwd); - - dialpwd = (FILE *) 0; -} - -struct dialup * -fgetduent(FILE *fp) -{ - static struct dialup dialup; /* static structure to point to */ - static char sh[128]; /* some space for a login shell */ - static char passwd[128]; /* some space for dialup password */ - char buf[BUFSIZ]; - char *cp; - char *cp2; - - if (! fp) - return 0; - - if (! fp || feof (fp)) - return ((struct dialup *) 0); - - while (fgets (buf, sizeof buf, fp) == buf && buf[0] == '#') - ; - - if (feof (fp)) - return ((struct dialup *) 0); - - if ((cp = strchr (buf, '\n'))) - *cp = '\0'; - - if (! (cp = strchr (buf, ':'))) - return ((struct dialup *) 0); - - if (cp - buf > sizeof sh) /* something is fishy ... */ - return ((struct dialup *) 0); - - *cp++ = '\0'; - (void) strcpy (sh, buf); - sh[cp - buf] = '\0'; - - if ((cp2 = strchr (cp, ':'))) - *cp2 = '\0'; - - if (strlen (cp) + 1 > sizeof passwd) /* something is REALLY fishy */ - return ((struct dialup *) 0); - - (void) strcpy (passwd, cp); - - dialup.du_shell = sh; - dialup.du_passwd = passwd; - - return (&dialup); -} - -struct dialup * -getduent(void) -{ - if (! dialpwd) - setduent (); - - return fgetduent (dialpwd); -} - -struct dialup * -getdushell(const char *sh) -{ - struct dialup *dialup; - - while ((dialup = getduent ())) { - if (strcmp (sh, dialup->du_shell) == 0) - return (dialup); - - if (strcmp (dialup->du_shell, "*") == 0) - return (dialup); - } - return ((struct dialup *) 0); -} - -int -isadialup(const char *tty) -{ - FILE *fp; - char buf[BUFSIZ]; - int dialup = 0; - - if (! (fp = fopen (DIALUPS, "r"))) - return (0); - - while (fgets (buf, sizeof buf, fp) == buf) { - if (buf[0] == '#') - continue; - - buf[strlen (buf) - 1] = '\0'; - - if (strcmp (buf, tty) == 0) { - dialup = 1; - break; - } - } - fclose (fp); - - return (dialup); -} - -int -putduent(const struct dialup *dial, FILE *fp) -{ - if (! fp || ! dial) - return -1; - - if (fprintf (fp, "%s:%s\n", dial->du_shell, dial->du_passwd) == EOF) - return -1; - - return 0; -} diff --git a/lib/dialup.h b/lib/dialup.h deleted file mode 100644 index 2b3892bd..00000000 --- a/lib/dialup.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 1989 - 1991, Julianne Frances Haugh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Julianne F. Haugh nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Structure of the /etc/d_passwd file - * - * The d_passwd file contains the names of login shells which require - * dialup passwords. Each line contains the fully qualified path name - * for the shell, followed by an optional password. Each field is - * separated by a ':'. - * - * Structure of the /etc/dialups file - * - * The dialups file contains the names of ports which may be dialup - * lines. Each line consists of the last component of the path - * name. The leading "/dev/" string is removed. - * - * $Id: dialup.h,v 1.3 2000/08/26 18:27:17 marekm Exp $ - */ - -#ifndef _DIALUP_H -#define _DIALUP_H - -struct dialup { - char *du_shell; - char *du_passwd; -}; - -extern void setduent(void); -extern void endduent(void); -extern struct dialup *fgetduent(FILE *); -extern struct dialup *getduent(void); -extern struct dialup *getdushell(const char *); -extern int putduent(const struct dialup *, FILE *); -extern int isadialup(const char *); - -#define DIALPWD "/etc/d_passwd" -#define DIALUPS "/etc/dialups" - -#endif diff --git a/lib/getdef.c b/lib/getdef.c index 10125562..1ed28318 100644 --- a/lib/getdef.c +++ b/lib/getdef.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID("$Id: getdef.c,v 1.15 2002/01/06 14:08:00 kloczek Exp $") +RCSID("$Id: getdef.c,v 1.18 2003/05/12 02:40:08 kloczek Exp $") #include "prototypes.h" #include "defines.h" @@ -63,7 +63,6 @@ static struct itemdef def_table[] = { { "CRACKLIB_DICTPATH", NULL }, { "CREATE_HOME", NULL }, { "DEFAULT_HOME", NULL }, - { "DIALUPS_CHECK_ENAB", NULL }, { "ENVIRON_FILE", NULL }, { "ENV_HZ", NULL }, { "ENV_PATH", NULL }, @@ -94,7 +93,6 @@ static struct itemdef def_table[] = { { "MOTD_FILE", NULL }, { "NOLOGINS_FILE", NULL }, { "NOLOGIN_STR", NULL }, - { "NO_PASSWORD_CONSOLE", NULL }, { "OBSCURE_CHECKS_ENAB", NULL }, { "PASS_ALWAYS_WARN", NULL }, { "PASS_CHANGE_TRIES", NULL }, @@ -406,15 +404,11 @@ main(int argc, char **argv) char *cp; struct itemdef *d; - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - def_load (); for (i = 0 ; i < NUMDEFS ; ++i) { if ((d = def_find(def_table[i].name)) == NULL) - printf(_("error - lookup '%s' failed\n"), def_table[i].name); + printf("error - lookup '%s' failed\n", def_table[i].name); else printf("%4d %-24s %s\n", i+1, d->name, d->value); } @@ -422,7 +416,7 @@ main(int argc, char **argv) if ((cp = getdef_str (argv[1])) != NULL) printf ("%s `%s'\n", argv[1], cp); else - printf (_("%s not found\n"), argv[1]); + printf ("%s not found\n", argv[1]); } exit(0); } diff --git a/lib/getpass.c b/lib/getpass.c index d311f92a..761d280d 100644 --- a/lib/getpass.c +++ b/lib/getpass.c @@ -31,7 +31,7 @@ #include #include "rcsid.h" -RCSID("$Id: getpass.c,v 1.11 2001/11/16 14:53:48 kloczek Exp $") +RCSID("$Id: getpass.c,v 1.12 2003/05/05 21:44:12 kloczek Exp $") #include "defines.h" @@ -197,10 +197,6 @@ prompt_password(const char *prompt, int with_echo) is_tty = 1; if (GTTY(fileno(ifp), &old_modes)) { is_tty = 0; -#if 0 /* to make getpass work with redirected stdin */ - return_value = NULL; - goto out2; -#endif } #ifdef USE_SETJMP @@ -266,9 +262,6 @@ out: (void) sigaction (SIGINT, &old_sigact, NULL); #else (void) signal (SIGINT, old_signal); -#endif -#if 0 -out2: #endif if (tty_opened) (void) fclose(ifp); diff --git a/lib/lastlog_.h b/lib/lastlog_.h index 8d459de6..80821b99 100644 --- a/lib/lastlog_.h +++ b/lib/lastlog_.h @@ -30,7 +30,7 @@ /* * lastlog.h - structure of lastlog file * - * $Id: lastlog_.h,v 1.2 1997/05/01 23:14:42 marekm Exp $ + * $Id: lastlog_.h,v 1.3 2003/12/17 12:52:25 kloczek Exp $ * * This file defines a lastlog file structure which should be sufficient * to hold the information required by login. It should only be used if @@ -40,8 +40,23 @@ #ifndef __LASTLOG_H #define __LASTLOG_H +#if defined(__GLIBC__) +#error "glibc shall have fixed already, which is " +#endif + +#if __WORDSIZE == 64 && defined __WORDSIZE_COMPAT32 +/* Recent dietlibc will support those conditionnals */ +#define LASTLOG_NEEDS_32BIT_LL_TIME 1 +#elif defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc_v9__) +#error "I don't know what to do here, what kind of C library are you using?" +#endif + struct lastlog { +#if LASTLOG_NEEDS_32BIT_LL_TIME + unsigned int ll_time; +#else time_t ll_time; +#endif char ll_line[12]; char ll_host[16]; }; diff --git a/lib/nscd.c b/lib/nscd.c new file mode 100644 index 00000000..69a4ba10 --- /dev/null +++ b/lib/nscd.c @@ -0,0 +1,92 @@ +/* Copyright (c) 1999 SuSE GmbH Nuerenberg, Germany + Author: Thorsten Kukuk */ + +#include +#include +#include +#include +#include +#include +#include +#include + +/* Version number of the daemon interface */ +#define NSCD_VERSION 2 +/* Path for the Unix domain socket. */ +#define _PATH_NSCDSOCKET "/var/run/.nscd_socket" + +/* Available services. */ +typedef enum { + GETPWBYNAME, + GETPWBYUID, + GETGRBYNAME, + GETGRBYGID, + GETHOSTBYNAME, + GETHOSTBYNAMEv6, + GETHOSTBYADDR, + GETHOSTBYADDRv6, + LASTDBREQ = GETHOSTBYADDRv6, + SHUTDOWN, /* Shut the server down. */ + GETSTAT, /* Get the server statistic. */ + INVALIDATE, /* Invalidate one special cache. */ + LASTREQ +} request_type; + +/* Header common to all requests */ +typedef struct { + int version; /* Version number of the daemon interface. */ + request_type type; /* Service requested. */ +#if defined(__alpha__) + int64_t key_len; /* Key length is 64bit on Alpha. */ +#else + int32_t key_len; /* Key length, 32bit on most plattforms. */ +#endif +} request_header; + +/* Create a socket connected to a name. */ +static int nscd_open_socket (void) +{ + struct sockaddr_un addr; + int sock; + + sock = socket (PF_UNIX, SOCK_STREAM, 0); + if (sock < 0) + return -1; + + addr.sun_family = AF_UNIX; + assert (sizeof (addr.sun_path) >= sizeof (_PATH_NSCDSOCKET)); + strcpy (addr.sun_path, _PATH_NSCDSOCKET); + if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0) { + close (sock); + return -1; + } + + return sock; +} + +/* + * nscd_flush_cache - flush specyfied service bufor in nscd cache + */ +int nscd_flush_cache (char *service) +{ + int sock = nscd_open_socket (); + request_header req; + ssize_t nbytes; + + if (sock == -1) + return -1; + + req.version = NSCD_VERSION; + req.type = INVALIDATE; + req.key_len = strlen (service) + 1; + nbytes = write (sock, &req, sizeof (request_header)); + if (nbytes != sizeof (request_header)) { + close (sock); + return -1; + } + + nbytes = write (sock, (void *) service, req.key_len); + + close (sock); + return (nbytes != req.key_len ? (-1) : 0); +} diff --git a/lib/nscd.h b/lib/nscd.h new file mode 100644 index 00000000..27e818af --- /dev/null +++ b/lib/nscd.h @@ -0,0 +1,12 @@ +/* Copyright (c) 1999 SuSE GmbH Nuerenberg, Germany + Author: Thorsten Kukuk */ + +#ifndef _FAILURE_H_ +#define _FAILURE_H_ + +/* + * nscd_flush_cache - flush specyfied service bufor in nscd cache + */ +extern int nscd_flush_cache (char *service); + +#endif diff --git a/lib/prototypes.h b/lib/prototypes.h index 20436dcf..0358a2bd 100644 --- a/lib/prototypes.h +++ b/lib/prototypes.h @@ -6,7 +6,7 @@ * Juha Virtanen, ; November 1995 */ /* - * $Id: prototypes.h,v 1.14 2000/08/26 18:27:17 marekm Exp $ + * $Id: prototypes.h,v 1.15 2003/04/25 21:33:47 kloczek Exp $ * * Added a macro to work around ancient (non-ANSI) compilers, just in case * someone ever tries to compile this with SunOS cc... --marekm @@ -16,7 +16,11 @@ #define _PROTOTYPES_H #include +#if HAVE_UTMPX_H +#include +#else #include +#endif #include #include diff --git a/lib/pwauth.c b/lib/pwauth.c index bce32f22..6b1ae525 100644 --- a/lib/pwauth.c +++ b/lib/pwauth.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID("$Id: pwauth.c,v 1.11 2000/08/26 18:27:17 marekm Exp $") +RCSID("$Id: pwauth.c,v 1.14 2003/05/12 04:58:56 kloczek Exp $") #include #include @@ -59,42 +59,19 @@ static const char *PROMPT = gettext_noop("%s's Password: "); extern char *getpass(); extern char *getpass_with_echo(); -#ifdef AUTH_METHODS -/* - * Look-up table for bound-in methods. Put the name that the - * method is known by in the password field as "name" and a - * pointer to the function - */ - -struct method { - char *name; - int (*func)(const char *, int, const char *); -}; - -#ifdef PAD_AUTH -int pad_auth(); -#endif -static struct method methods[] = { -#ifdef PAD_AUTH - { "pad", pad_auth }, -#endif - { "", 0 } -}; -#endif /* AUTH_METHODS */ - int wipe_clear_pass = 1; char *clear_pass = NULL; /* - * _old_auth - perform getpass/crypt authentication + * pw_auth - perform getpass/crypt authentication * - * _old_auth gets the user's cleartext password and encrypts it - * using the salt in the encrypted password. The results are + * pw_auth gets the user's cleartext password and encrypts it + * using the salt in the encrypted password. The results are * compared. */ -static int -_old_auth(const char *cipher, const char *user, int reason, const char *input) +int +pw_auth(const char *cipher, const char *user, int reason, const char *input) { char prompt[1024]; char *clear = NULL; @@ -283,12 +260,8 @@ _old_auth(const char *cipher, const char *user, int reason, const char *input) if (retval && use_skey) { int passcheck = -1; -#if 0 /* some skey libs don't have skey_passcheck. --marekm */ - passcheck = skey_passcheck(user, input); -#else if (skeyverify(&skey, input) == 0) passcheck = skey.n; -#endif /* if 0 */ if (passcheck > 0) retval = 0; } @@ -313,266 +286,3 @@ _old_auth(const char *cipher, const char *user, int reason, const char *input) strzero(clear); return retval; } - -#ifdef AUTH_METHODS -/* - * _pw_auth - perform alternate password authentication - * - * pw_auth executes the alternate password authentication method - * described in the user's password entry. _pw_auth does the real - * work, pw_auth splits the authentication string into individual - * command names. - */ - -static int -_pw_auth(const char *command, const char *user, int reason, const char *input) -{ - RETSIGTYPE (*sigint)(); - RETSIGTYPE (*sigquit)(); -#ifdef SIGTSTP - RETSIGTYPE (*sigtstp)(); -#endif - int pid; - int status; - int i; - char * const argv[5]; - int argc = 0; - int pipes[2]; - char *empty_env = NULL; - int use_pipe; - - /* - * Start with a quick sanity check. ALL command names must - * be fully-qualified path names. - */ - - if (command[0] != '/') - return -1; - - /* - * Set the keyboard signals to be ignored. When the user kills - * the child we don't want the parent dying as well. - */ - - sigint = signal (SIGINT, SIG_IGN); - sigquit = signal (SIGQUIT, SIG_IGN); -#ifdef SIGTSTP - sigtstp = signal (SIGTSTP, SIG_IGN); -#endif - - /* - * FTP and REXEC reasons don't give the program direct access - * to the user. This means that the program can only get input - * from this function. So we set up a pipe for that purpose. - */ - - use_pipe = (reason == PW_FTP || reason == PW_REXEC); - if (use_pipe) - if (pipe (pipes)) - return -1; - - /* - * The program will be forked off with the parent process waiting - * on the child to tell it how successful it was. - */ - - switch (pid = fork ()) { - - /* - * The fork() failed completely. Clean up as needed and - * return to the caller. - */ - case -1: - if (use_pipe) { - close (pipes[0]); - close (pipes[1]); - } - return -1; - case 0: - - /* - * Let the child catch the SIGINT and SIGQUIT - * signals. The parent, however, will continue - * to ignore them. - */ - signal (SIGINT, SIG_DFL); - signal (SIGQUIT, SIG_DFL); - - /* - * Set up the command line. The first argument is - * the name of the command being executed. The - * second is the command line option for the reason, - * and the third is the user name. - */ - argv[argc++] = command; - switch (reason) { - case PW_SU: argv[argc++] = "-s"; break; - case PW_LOGIN: argv[argc++] = "-l"; break; - case PW_ADD: argv[argc++] = "-a"; break; - case PW_CHANGE: argv[argc++] = "-c"; break; - case PW_DELETE: argv[argc++] = "-d"; break; - case PW_TELNET: argv[argc++] = "-t"; break; - case PW_RLOGIN: argv[argc++] = "-r"; break; - case PW_FTP: argv[argc++] = "-f"; break; - case PW_REXEC: argv[argc++] = "-x"; break; - } - if (reason == PW_CHANGE && input) - argv[argc++] = input; - - argv[argc++] = user; - argv[argc] = (char *) 0; - - /* - * The FTP and REXEC reasons use a pipe to communicate - * with the parent. The other standard I/O descriptors - * are closed and re-opened as /dev/null. - */ - if (use_pipe) { - close (0); - close (1); - close (2); - - if (dup (pipes[0]) != 0) - exit (1); - - close (pipes[0]); - close (pipes[1]); - - if (open ("/dev/null", O_WRONLY) != 1) - exit (1); - - if (open ("/dev/null", O_WRONLY) != 2) - exit (1); - } - - /* - * Now we execute the command directly. - * Do it with empty environment for safety. --marekm - */ - execve(command, argv, &empty_env); - _exit((errno == ENOENT) ? 127 : 126); - /*NOTREACHED*/ - default: - /* - * FTP and REXEC cause a single line of text to be - * sent to the child over a pipe that was set up - * earlier. - */ - if (use_pipe) { - close (pipes[0]); - - if (input) - write (pipes[1], input, strlen (input)); - - write (pipes[1], "\n", 1); - close (pipes[1]); - } - - /* - * Wait on the child to die. When it does you will - * get the exit status and use that to determine if - * the authentication program was successful. - */ - while ((i = wait (&status)) != pid && i != -1) - ; - - /* - * Re-set the signals to their earlier values. - */ - signal (SIGINT, sigint); - signal (SIGQUIT, sigquit); -#ifdef SIGTSTP - signal (SIGTSTP, sigtstp); -#endif - - /* - * Make sure we found the right process! - */ - if (i == -1) - return -1; - - if (status == 0) - return 0; - else - return -1; - } - /*NOTREACHED*/ -} - -/* - * _builtin_auth - lookup routine in table and execute - */ - -static int -_builtin_auth(const char *command, const char *user, int reason, const char *input) -{ - int i; - - /* - * Scan the table, looking for a match. If we fall off - * the end, it must mean that this method isn't supported, - * so we fail the authentication. - */ - - for (i = 0;methods[i].name[0];i++) { - if (! strcmp (command, methods[i].name)) - break; - } - if (methods[i].name[0] == '\0') - return -1; - - /* - * Call the pointed to function with the other three - * arguments. - */ - - return (methods[i].func) (user, reason, input); -} -#endif /* AUTH_METHODS */ - -/* - * This function does the real work. It splits the list of program names - * up into individual programs and executes them one at a time. - */ - -int -pw_auth(const char *command, const char *user, int reason, const char *input) -{ -#ifdef AUTH_METHODS - char buf[256]; - char *cmd, *end; - int rc; - - /* - * Quick little sanity check ... - */ - - if (strlen (command) >= sizeof buf) - return -1; - - strcpy(buf, command); /* safe (because of the above check) --marekm */ - - /* - * Find each command and make sure it is NUL-terminated. Then - * invoke _pw_auth to actually run the program. The first - * failing program ends the whole mess. - */ - - for (cmd = buf;cmd;cmd = end) { - if ((end = strchr (cmd, ';'))) - *end++ = '\0'; - - if (cmd[0] != '@') - rc = _old_auth (cmd, user, reason, input); - else if (cmd[1] == '/') - rc = _pw_auth (cmd + 1, user, reason, input); - else - rc = _builtin_auth (cmd + 1, user, reason, input); - if (rc) - return -1; - } - return 0; -#else - return _old_auth(command, user, reason, input); -#endif -} diff --git a/lib/pwauth.h b/lib/pwauth.h index ab6017b4..a6aa77fe 100644 --- a/lib/pwauth.h +++ b/lib/pwauth.h @@ -26,14 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pwauth.h,v 1.2 1997/05/01 23:14:44 marekm Exp $ + * $Id: pwauth.h,v 1.3 2003/05/12 06:08:31 kloczek Exp $ */ -#if __STDC__ -int pw_auth(const char *program,const char *user,int flag,const char *input); -#else -int pw_auth (); -#endif +int pw_auth(const char *cipher,const char *user,int flag,const char *input); /* * Local access diff --git a/lib/pwio.c b/lib/pwio.c index a0f2d3ad..6d5a300f 100644 --- a/lib/pwio.c +++ b/lib/pwio.c @@ -2,7 +2,7 @@ #include #include "rcsid.h" -RCSID("$Id: pwio.c,v 1.12 2001/08/14 21:10:36 malekith Exp $") +RCSID("$Id: pwio.c,v 1.13 2003/05/03 16:14:23 kloczek Exp $") #include "prototypes.h" #include "defines.h" @@ -27,14 +27,6 @@ __pw_dup(const struct passwd *pwent) return NULL; if (!(pw->pw_passwd = strdup(pwent->pw_passwd))) return NULL; -#ifdef ATT_AGE - if (!(pw->pw_age = strdup(pwent->pw_age))) - return NULL; -#endif -#ifdef ATT_COMMENT - if (!(pw->pw_comment = strdup(pwent->pw_comment))) - return NULL; -#endif if (!(pw->pw_gecos = strdup(pwent->pw_gecos))) return NULL; if (!(pw->pw_dir = strdup(pwent->pw_dir))) @@ -58,12 +50,6 @@ passwd_free(void *ent) free(pw->pw_name); free(pw->pw_passwd); -#ifdef ATT_AGE - free(pw->pw_age); -#endif -#ifdef ATT_COMMENT - free(pw->pw_comment); -#endif free(pw->pw_gecos); free(pw->pw_dir); free(pw->pw_shell); diff --git a/lib/pwpack.c b/lib/pwpack.c index 67053baf..a08640c0 100644 --- a/lib/pwpack.c +++ b/lib/pwpack.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID("$Id: pwpack.c,v 1.4 1998/04/16 19:57:42 marekm Exp $") +RCSID("$Id: pwpack.c,v 1.6 2003/12/17 01:33:28 kloczek Exp $") #include #include "defines.h" @@ -53,12 +53,6 @@ pw_pack(const struct passwd *passwd, char *buf) cp += strlen (cp) + 1; strcpy (cp, passwd->pw_passwd); -#ifdef ATT_AGE - if (passwd->pw_age[0]) { - *cp++ = ','; - strcat (cp, passwd->pw_age); - } -#endif cp += strlen (cp) + 1; memcpy (cp, (const char *) &passwd->pw_uid, sizeof passwd->pw_uid); @@ -66,17 +60,7 @@ pw_pack(const struct passwd *passwd, char *buf) memcpy (cp, (const char *) &passwd->pw_gid, sizeof passwd->pw_gid); cp += sizeof passwd->pw_gid; -#ifdef BSD_QUOTA - memcpy (cp, (const char *) &passwd->pw_quota, sizeof passwd->pw_quota); - cp += sizeof passwd->pw_quota; -#endif -#ifdef ATT_COMMENT - if (passwd->pw_comment) { - strcpy (cp, passwd->pw_comment); - cp += strlen (cp) + 1; - } else - *cp++ = '\0'; -#endif + strcpy (cp, passwd->pw_gecos); cp += strlen (cp) + 1; @@ -97,9 +81,6 @@ int pw_unpack(char *buf, int len, struct passwd *passwd) { char *org = buf; -#ifdef ATT_AGE - char *cp; -#endif memzero(passwd, sizeof *passwd); @@ -113,14 +94,6 @@ pw_unpack(char *buf, int len, struct passwd *passwd) if (buf - org > len) return -1; -#ifdef ATT_AGE - if (cp = strchr (passwd->pw_passwd, ',')) { - *cp++ = '\0'; - passwd->pw_age = cp; - } else - passwd->pw_age = ""; -#endif - memcpy ((void *) &passwd->pw_uid, (void *) buf, sizeof passwd->pw_uid); buf += sizeof passwd->pw_uid; if (buf - org > len) @@ -131,19 +104,6 @@ pw_unpack(char *buf, int len, struct passwd *passwd) if (buf - org > len) return -1; -#ifdef BSD_QUOTA - memcpy ((void *) &passwd->pw_quota, (void *) buf, - sizeof passwd->pw_quota); - buf += sizeof passwd->pw_quota; - if (buf - org > len) - return -1; -#endif -#ifdef ATT_COMMENT - passwd->pw_comment = buf; - buf += strlen (buf) + 1; - if (buf - org > len) - return -1; -#endif passwd->pw_gecos = buf; buf += strlen (buf) + 1; if (buf - org > len) diff --git a/lib/sgetpwent.c b/lib/sgetpwent.c index 993f3c97..b3aa54b7 100644 --- a/lib/sgetpwent.c +++ b/lib/sgetpwent.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID("$Id: sgetpwent.c,v 1.5 1998/04/02 21:51:46 marekm Exp $") +RCSID("$Id: sgetpwent.c,v 1.6 2003/05/03 16:14:23 kloczek Exp $") #include #include "defines.h" @@ -112,23 +112,7 @@ sgetpwent(const char *buf) ((pwent.pw_gid = strtol (fields[3], &ep, 10)) == 0 && *ep)) { return 0; } -#ifdef ATT_AGE - cp = pwent.pw_passwd; - while (*cp && *cp != ',') - ++cp; - - if (*cp) { - *cp++ = '\0'; - pwent.pw_age = cp; - } else { - cp = 0; - pwent.pw_age = ""; - } -#endif pwent.pw_gecos = fields[4]; -#ifdef ATT_COMMENT - pwent.pw_comment = ""; -#endif pwent.pw_dir = fields[5]; pwent.pw_shell = fields[6]; diff --git a/lib/shadow.c b/lib/shadow.c index 76179d3a..2b21e23f 100644 --- a/lib/shadow.c +++ b/lib/shadow.c @@ -33,7 +33,7 @@ #if defined(SHADOWPWD) && !defined(HAVE_GETSPNAM) /*{*/ #include "rcsid.h" -RCSID("$Id: shadow.c,v 1.6 1998/01/29 23:22:32 marekm Exp $") +RCSID("$Id: shadow.c,v 1.7 2003/05/03 16:14:24 kloczek Exp $") #include #include "prototypes.h" @@ -199,12 +199,6 @@ my_sgetspent(const char *string) *cp++ = '\0'; } - /* - * It is acceptable for the last SVR4 field to be blank. This - * results in the loop being terminated early. In which case, - * we just make the last field be blank and be done with it. - */ - if (i == (FIELDS-1)) fields[i++] = cp; @@ -280,23 +274,12 @@ my_sgetspent(const char *string) * formatted file), initialize the other field members to -1. */ -#if 0 /* SVR4 */ - if (i == OFIELDS) - return 0; -#else if (i == OFIELDS) { spwd.sp_warn = spwd.sp_inact = spwd.sp_expire = spwd.sp_flag = -1; return &spwd; } -#endif - - /* - * The rest of the fields are mandatory for SVR4, but optional - * for anything else. However, if one is present the others - * must be as well. - */ /* * Get the number of days of password expiry warning. diff --git a/lib/tcfsio.c b/lib/tcfsio.c deleted file mode 100644 index 2649e0be..00000000 --- a/lib/tcfsio.c +++ /dev/null @@ -1,90 +0,0 @@ - -#include - -#ifdef HAVE_TCFS - -#include "prototypes.h" -#include "defines.h" - -#ifdef TCFS_GDBM_SUPPORT -#undef GDBM_SUPPORT -#define GDBM_SUPPORT -#endif - -#include -#include - -#include "commonio.h" -#include "tcfsio.h" - -static struct commonio_db tcfs_db = { - TCFSPWDFILE, /* filename */ - NULL, /* ops */ - NULL, - NULL, - NULL, - NULL, - 0, - 0, - 0, - 0, - 1 -}; - -int -tcfs_file_present(void) -{ - return commonio_present(&tcfs_db); -} - -int -tcfs_lock(void) -{ - return commonio_lock(&tcfs_db); -} - -int -tcfs_open(int mode) -{ - return 1; -/* return tcfs_open(); */ -} - -tcfspwdb * -tcfs_locate(char *name) -{ - return tcfs_getpwnam(name, NULL); -} - -int -tcfs_update(char *user, struct tcfspwd *tcfspword) -{ - char *o, *p; - - o=(char*)calloc(128,sizeof(char)); - p=(char*)calloc(128,sizeof(char)); - strcpy (o, tcfspword->tcfsorig); - strcpy (p, tcfspword->tcfspass); - return tcfs_chgkey(user,o,p); -} - -int -tcfs_remove(char *name) -{ - return tcfs_putpwnam(name, NULL, U_DEL); -} - -int -tcfs_close(void) -{ - return 1; -/* return tcfs_close(&shadow_db); */ -} - -int -tcfs_unlock(void) -{ - return commonio_unlock(&tcfs_db); -} - -#endif diff --git a/lib/tcfsio.h b/lib/tcfsio.h deleted file mode 100644 index 3f53fca5..00000000 --- a/lib/tcfsio.h +++ /dev/null @@ -1,14 +0,0 @@ -struct tcfspwd { - char tcfspass[200]; /* new password */ - char tcfsorig[200]; /* old password */ -}; - -extern int tcfs_close(void); -extern int tcfs_file_present(void); -extern tcfspwdb *tcfs_locate(char *); -extern int tcfs_lock(void); -extern int tcfs_name(char *); -extern int tcfs_open(int); -extern int tcfs_remove(char *); -extern int tcfs_unlock(void); -extern int tcfs_update(char *, struct tcfspwd *); diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am index dc9f3195..d8fb1cdc 100644 --- a/libmisc/Makefile.am +++ b/libmisc/Makefile.am @@ -3,7 +3,7 @@ EXTRA_DOST = .indent.pro DEFS = -DHAVE_CONFIG_H -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib +INCLUDES = -I$(top_srcdir)/lib lib_LTLIBRARIES = libmisc.la @@ -36,7 +36,6 @@ libmisc_la_SOURCES = \ mail.c \ motd.c \ myname.c \ - nscd.c \ obscure.c \ pam_pass.c \ pwd2spwd.c \ diff --git a/libmisc/Makefile.in b/libmisc/Makefile.in index 30ea10a0..3bec25ab 100644 --- a/libmisc/Makefile.in +++ b/libmisc/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,105 +14,148 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ + +DEFS = -DHAVE_CONFIG_H DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ EXTRA_DOST = .indent.pro -DEFS = -DHAVE_CONFIG_H - -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib +INCLUDES = -I$(top_srcdir)/lib lib_LTLIBRARIES = libmisc.la @@ -144,7 +188,6 @@ libmisc_la_SOURCES = \ mail.c \ motd.c \ myname.c \ - nscd.c \ obscure.c \ pam_pass.c \ pwd2spwd.c \ @@ -169,6 +212,7 @@ libmisc_la_SOURCES = \ libmisc_la_LIBADD = $(LIBCRACK) subdir = libmisc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -181,40 +225,39 @@ am_libmisc_la_OBJECTS = addgrps.lo age.lo basename.lo chkname.lo \ entry.lo env.lo failure.lo fields.lo getdate.lo hushed.lo \ isexpired.lo limits.lo list.lo log.lo login_access.lo \ login_desrpc.lo login_krb.lo loginprompt.lo mail.lo motd.lo \ - myname.lo nscd.lo obscure.lo pam_pass.lo pwd2spwd.lo \ - pwdcheck.lo pwd_init.lo rlogin.lo salt.lo setugid.lo setup.lo \ - setupenv.lo shell.lo strtoday.lo sub.lo sulog.lo ttytype.lo \ - tz.lo ulimit.lo utmp.lo valid.lo xmalloc.lo + myname.lo obscure.lo pam_pass.lo pwd2spwd.lo pwdcheck.lo \ + pwd_init.lo rlogin.lo salt.lo setugid.lo setup.lo setupenv.lo \ + shell.lo strtoday.lo sub.lo sulog.lo ttytype.lo tz.lo ulimit.lo \ + utmp.lo valid.lo xmalloc.lo libmisc_la_OBJECTS = $(am_libmisc_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/addgrps.Plo $(DEPDIR)/age.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/basename.Plo $(DEPDIR)/chkname.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/chkshell.Plo $(DEPDIR)/chowndir.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/chowntty.Plo $(DEPDIR)/console.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/copydir.Plo $(DEPDIR)/entry.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/env.Plo $(DEPDIR)/failure.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/fields.Plo $(DEPDIR)/getdate.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/hushed.Plo $(DEPDIR)/isexpired.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/limits.Plo $(DEPDIR)/list.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/log.Plo $(DEPDIR)/login_access.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/login_desrpc.Plo $(DEPDIR)/login_krb.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/loginprompt.Plo $(DEPDIR)/mail.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/motd.Plo $(DEPDIR)/myname.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/nscd.Plo $(DEPDIR)/obscure.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/pam_pass.Plo $(DEPDIR)/pwd2spwd.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/pwd_init.Plo $(DEPDIR)/pwdcheck.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/rlogin.Plo $(DEPDIR)/salt.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/setugid.Plo $(DEPDIR)/setup.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/setupenv.Plo $(DEPDIR)/shell.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/strtoday.Plo $(DEPDIR)/sub.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/sulog.Plo $(DEPDIR)/ttytype.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/tz.Plo $(DEPDIR)/ulimit.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/utmp.Plo $(DEPDIR)/valid.Plo \ -@AMDEP_TRUE@ $(DEPDIR)/xmalloc.Plo +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/addgrps.Plo ./$(DEPDIR)/age.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/basename.Plo ./$(DEPDIR)/chkname.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/chkshell.Plo ./$(DEPDIR)/chowndir.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/chowntty.Plo ./$(DEPDIR)/console.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/copydir.Plo ./$(DEPDIR)/entry.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/env.Plo ./$(DEPDIR)/failure.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/fields.Plo ./$(DEPDIR)/getdate.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/hushed.Plo ./$(DEPDIR)/isexpired.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/limits.Plo ./$(DEPDIR)/list.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/log.Plo ./$(DEPDIR)/login_access.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/login_desrpc.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/login_krb.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/loginprompt.Plo ./$(DEPDIR)/mail.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/motd.Plo ./$(DEPDIR)/myname.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/obscure.Plo ./$(DEPDIR)/pam_pass.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/pwd2spwd.Plo ./$(DEPDIR)/pwd_init.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/pwdcheck.Plo ./$(DEPDIR)/rlogin.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/salt.Plo ./$(DEPDIR)/setugid.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/setup.Plo ./$(DEPDIR)/setupenv.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/shell.Plo ./$(DEPDIR)/strtoday.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/sub.Plo ./$(DEPDIR)/sulog.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/ttytype.Plo ./$(DEPDIR)/tz.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/ulimit.Plo ./$(DEPDIR)/utmp.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/valid.Plo ./$(DEPDIR)/xmalloc.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -222,52 +265,49 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -CFLAGS = @CFLAGS@ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS) DIST_SOURCES = $(libmisc_la_SOURCES) -DIST_COMMON = Makefile.am Makefile.in getdate.c +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am getdate.c SOURCES = $(libmisc_la_SOURCES) all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj .y - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu libmisc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +libLTLIBRARIES_INSTALL = $(INSTALL) install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done libmisc.la: $(libmisc_la_OBJECTS) $(libmisc_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libmisc_la_LDFLAGS) $(libmisc_la_OBJECTS) $(libmisc_la_LIBADD) $(LIBS) @@ -277,134 +317,195 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/addgrps.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/age.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/basename.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chkname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chkshell.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chowndir.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chowntty.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/console.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/copydir.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/entry.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/env.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/failure.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fields.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hushed.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/isexpired.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/limits.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/list.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/log.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/login_access.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/login_desrpc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/login_krb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/loginprompt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mail.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/motd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/myname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nscd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/obscure.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pam_pass.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwd2spwd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwd_init.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwdcheck.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rlogin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/salt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setugid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setupenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shell.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoday.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sub.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sulog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ttytype.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tz.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ulimit.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/utmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/valid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xmalloc.Plo@am__quote@ - -distclean-depend: - -rm -rf $(DEPDIR) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addgrps.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/age.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chkname.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chkshell.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chowndir.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chowntty.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/console.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copydir.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/entry.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/failure.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fields.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hushed.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isexpired.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/limits.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login_access.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login_desrpc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login_krb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loginprompt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myname.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obscure.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_pass.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwd2spwd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwd_init.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwdcheck.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rlogin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/salt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setugid.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setup.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setupenv.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoday.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sub.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sulog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttytype.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tz.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ulimit.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utmp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/valid.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Plo@am__quote@ .c.o: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .c.lo: -@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -CCDEPMODE = @CCDEPMODE@ +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .y.c: - $(YACCCOMPILE) $< && mv y.tab.c $@ + $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$< if test -f y.tab.h; then \ - if cmp -s y.tab.h $*.h; then \ - rm -f y.tab.h; \ + to=`echo "$*_H" | sed \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ + -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ + sed "/^#/ s/Y_TAB_H/$$to/g" y.tab.h >$*.ht; \ + rm -f y.tab.h; \ + if cmp -s $*.ht $*.h; then \ + rm -f $*.ht ;\ else \ - mv y.tab.h $*.h; \ + mv $*.ht $*.h; \ fi; \ fi + if test -f y.output; then \ + mv y.output $*.output; \ + fi + sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@ + rm -f y.tab.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + +CTAGS = ctags +CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -417,7 +518,6 @@ all-am: Makefile $(LTLIBRARIES) installdirs: $(mkinstalldirs) $(DESTDIR)$(libdir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -429,6 +529,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -436,20 +537,22 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -rm -f getdate.c clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am @@ -470,7 +573,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -478,19 +582,28 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES -.PHONY: GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ - distclean-depend distclean-generic distclean-libtool \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libLTLIBRARIES install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool tags uninstall \ - uninstall-am uninstall-info-am uninstall-libLTLIBRARIES + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am \ + uninstall-libLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libmisc/addgrps.c b/libmisc/addgrps.c index 3a57d5c6..c505d382 100644 --- a/libmisc/addgrps.c +++ b/libmisc/addgrps.c @@ -10,18 +10,14 @@ #include #include "rcsid.h" -RCSID("$Id: addgrps.c,v 1.5 2001/09/01 04:19:15 kloczek Exp $") - +RCSID ("$Id: addgrps.c,v 1.6 2003/04/22 10:59:21 kloczek Exp $") #define SEP ",:" - /* * Add groups with names from LIST (separated by commas or colons) * to the supplementary group set. Silently ignore groups which are * already there. Warning: uses strtok(). */ - -int -add_groups(const char *list) +int add_groups (const char *list) { GETGROUPS_T *grouplist, *tmp; int i, ngroups, added; @@ -29,51 +25,54 @@ add_groups(const char *list) char *token; char buf[1024]; - if (strlen(list) >= sizeof(buf)) { + if (strlen (list) >= sizeof (buf)) { errno = EINVAL; return -1; } - strcpy(buf, list); + strcpy (buf, list); i = 16; for (;;) { - grouplist = malloc(i * sizeof(GETGROUPS_T)); + grouplist = malloc (i * sizeof (GETGROUPS_T)); if (!grouplist) return -1; - ngroups = getgroups(i, grouplist); + ngroups = getgroups (i, grouplist); if (i > ngroups) break; /* not enough room, so try allocating a larger buffer */ - free(grouplist); + free (grouplist); i *= 2; } if (ngroups < 0) { - free(grouplist); + free (grouplist); return -1; } added = 0; - for (token = strtok(buf, SEP); token; token = strtok(NULL, SEP)) { + for (token = strtok (buf, SEP); token; token = strtok (NULL, SEP)) { - grp = getgrnam(token); + grp = getgrnam (token); if (!grp) { - fprintf(stderr, _("Warning: unknown group %s\n"), token); + fprintf (stderr, _("Warning: unknown group %s\n"), + token); continue; } - for (i = 0; i < ngroups && grouplist[i] != grp->gr_gid; i++) - ; + for (i = 0; i < ngroups && grouplist[i] != grp->gr_gid; + i++); if (i < ngroups) continue; - if (ngroups >= sysconf(_SC_NGROUPS_MAX)) { - fprintf(stderr, _("Warning: too many groups\n")); + if (ngroups >= sysconf (_SC_NGROUPS_MAX)) { + fprintf (stderr, _("Warning: too many groups\n")); break; } - tmp = realloc(grouplist, (ngroups + 1) * sizeof(GETGROUPS_T)); + tmp = + realloc (grouplist, + (ngroups + 1) * sizeof (GETGROUPS_T)); if (!tmp) { - free(grouplist); + free (grouplist); return -1; } tmp[ngroups++] = grp->gr_gid; @@ -82,7 +81,7 @@ add_groups(const char *list) } if (added) - return setgroups(ngroups, grouplist); + return setgroups (ngroups, grouplist); return 0; } diff --git a/libmisc/age.c b/libmisc/age.c index 01846066..2c55a57c 100644 --- a/libmisc/age.c +++ b/libmisc/age.c @@ -41,27 +41,23 @@ #if defined(SHADOWPWD) #include "rcsid.h" -RCSID("$Id: age.c,v 1.7 2001/12/22 06:59:30 kloczek Exp $") - +RCSID ("$Id: age.c,v 1.8 2003/04/22 10:59:21 kloczek Exp $") #ifndef PASSWD_PROGRAM #define PASSWD_PROGRAM "/bin/passwd" #endif - /* * expire - force password change if password expired * * expire() calls /bin/passwd to change the user's password * if it has expired. */ - -int -expire(const struct passwd *pw, const struct spwd *sp) +int expire (const struct passwd *pw, const struct spwd *sp) { - int status; - int child; - int pid; + int status; + int child; + int pid; - if (! sp) + if (!sp) sp = pwd_to_spwd (pw); /* @@ -69,19 +65,18 @@ expire(const struct passwd *pw, const struct spwd *sp) * force them to change their password. */ - switch (status = isexpired (pw, sp)) - { - case 0: - return 0; - case 1: - printf(_("Your password has expired.")); - break; - case 2: - printf(_("Your password is inactive.")); - break; - case 3: - printf(_("Your login has expired.")); - break; + switch (status = isexpired (pw, sp)) { + case 0: + return 0; + case 1: + printf (_("Your password has expired.")); + break; + case 2: + printf (_("Your password is inactive.")); + break; + case 3: + printf (_("Your login has expired.")); + break; } /* @@ -91,12 +86,11 @@ expire(const struct passwd *pw, const struct spwd *sp) * change that password. */ - if (status > 1 || sp->sp_max < sp->sp_min) - { - puts(_(" Contact the system administrator.\n")); - exit(1); + if (status > 1 || sp->sp_max < sp->sp_min) { + puts (_(" Contact the system administrator.\n")); + exit (1); } - puts(_(" Choose a new password.\n")); + puts (_(" Choose a new password.\n")); fflush (stdout); /* @@ -125,26 +119,25 @@ expire(const struct passwd *pw, const struct spwd *sp) * passwd to work just like it would had they executed * it from the command line while logged in. */ - if (setup_uid_gid(pw, 0)) - _exit(126); + if (setup_uid_gid (pw, 0)) + _exit (126); - execl(PASSWD_PROGRAM, PASSWD_PROGRAM, pw->pw_name, (char *)0); + execl (PASSWD_PROGRAM, PASSWD_PROGRAM, pw->pw_name, + (char *) 0); err = errno; - perror("Can't execute " PASSWD_PROGRAM); - _exit((err == ENOENT) ? 127 : 126); + perror ("Can't execute " PASSWD_PROGRAM); + _exit ((err == ENOENT) ? 127 : 126); } else if (pid == -1) { - perror("fork"); - exit(1); + perror ("fork"); + exit (1); } - while ((child = wait (&status)) != pid && child != -1) - ; + while ((child = wait (&status)) != pid && child != -1); if (child == pid && status == 0) return 1; exit (1); - /*NOTREACHED*/ -} + /*NOTREACHED*/} /* * agecheck - see if warning is needed for password expiration @@ -153,13 +146,12 @@ expire(const struct passwd *pw, const struct spwd *sp) * to expire and warns the user of the pending password expiration. */ -void -agecheck(const struct passwd *pw, const struct spwd *sp) +void agecheck (const struct passwd *pw, const struct spwd *sp) { - long now = time ((long *) 0) / SCALE; - long remain; + long now = time ((long *) 0) / SCALE; + long remain; - if (! sp) + if (!sp) sp = pwd_to_spwd (pw); /* @@ -169,15 +161,17 @@ agecheck(const struct passwd *pw, const struct spwd *sp) if (sp->sp_lstchg == -1 || sp->sp_max == -1 || sp->sp_warn == -1) return; - if ((remain = (sp->sp_lstchg + sp->sp_max) - now) <= sp->sp_warn) - { - remain /= DAY/SCALE; + if ((remain = (sp->sp_lstchg + sp->sp_max) - now) <= sp->sp_warn) { + remain /= DAY / SCALE; if (remain > 1) - printf(_("Your password will expire in %ld days.\n"), remain); + printf (_ + ("Your password will expire in %ld days.\n"), + remain); else if (remain == 1) - printf(_("Your password will expire tomorrow.\n")); + printf (_ + ("Your password will expire tomorrow.\n")); else if (remain == 0) - printf(_("Your password will expire today.\n")); + printf (_("Your password will expire today.\n")); } } -#endif /* SHADOWPWD */ +#endif /* SHADOWPWD */ diff --git a/libmisc/basename.c b/libmisc/basename.c index caf3ccdd..ae8432f6 100644 --- a/libmisc/basename.c +++ b/libmisc/basename.c @@ -8,15 +8,12 @@ #include #include "rcsid.h" -RCSID("$Id: basename.c,v 1.2 1997/12/07 23:27:00 marekm Exp $") - +RCSID ("$Id: basename.c,v 1.3 2003/04/22 10:59:21 kloczek Exp $") #include "defines.h" #include "prototypes.h" - -char * -Basename(char *str) +char *Basename (char *str) { - char *cp = strrchr(str, '/'); + char *cp = strrchr (str, '/'); - return cp ? cp+1 : str; + return cp ? cp + 1 : str; } diff --git a/libmisc/chkname.c b/libmisc/chkname.c index 4c35a00c..1d6f90d9 100644 --- a/libmisc/chkname.c +++ b/libmisc/chkname.c @@ -6,20 +6,16 @@ #include #include "rcsid.h" -RCSID("$Id: chkname.c,v 1.6 2002/01/10 13:04:34 kloczek Exp $") - +RCSID ("$Id: chkname.c,v 1.8 2003/05/12 05:29:14 kloczek Exp $") #include #include "defines.h" #include "chkname.h" - #if HAVE_UTMPX_H #include #else #include #endif - -static int -good_name(const char *name) +static int good_name (const char *name) { /* * User/group names must match [a-z_][a-z0-9_-]* @@ -29,17 +25,16 @@ good_name(const char *name) while (*++name) { if (!((*name >= 'a' && *name <= 'z') || - (*name >= '0' && *name <= '9') || - *name == '_' || *name == '-' || - (*name == '$' && *(name+1) == NULL))) + (*name >= '0' && *name <= '9') || + *name == '_' || *name == '-' || + (*name == '$' && *(name + 1) == '\0'))) return 0; } return 1; } -int -check_user_name(const char *name) +int check_user_name (const char *name) { #if HAVE_UTMPX_H struct utmpx ut; @@ -51,21 +46,20 @@ check_user_name(const char *name) * User names are limited by whatever utmp can * handle (usually max 8 characters). */ - if (strlen(name) > sizeof(ut.ut_user)) + if (strlen (name) > sizeof (ut.ut_user)) return 0; - return good_name(name); + return good_name (name); } -int -check_group_name(const char *name) +int check_group_name (const char *name) { /* * Arbitrary limit for group names - max 16 * characters (same as on HP-UX 10). */ - if (strlen(name) > 16) + if (strlen (name) > 16) return 0; - return good_name(name); + return good_name (name); } diff --git a/libmisc/chkshell.c b/libmisc/chkshell.c index d2a45d6f..da8c60e8 100644 --- a/libmisc/chkshell.c +++ b/libmisc/chkshell.c @@ -30,18 +30,15 @@ #include #include "rcsid.h" -RCSID("$Id: chkshell.c,v 1.1 1997/12/07 23:27:00 marekm Exp $") - +RCSID ("$Id: chkshell.c,v 1.2 2003/04/22 10:59:21 kloczek Exp $") #include #include #include #include "prototypes.h" #include "defines.h" - #ifndef SHELLS_FILE #define SHELLS_FILE "/etc/shells" #endif - /* * check_shell - see if the user's login shell is listed in /etc/shells * @@ -52,35 +49,34 @@ RCSID("$Id: chkshell.c,v 1.1 1997/12/07 23:27:00 marekm Exp $") * If getusershell() is available (Linux, *BSD, possibly others), use it * instead of re-implementing it. */ - -int -check_shell(const char *sh) +int check_shell (const char *sh) { - char *cp; + char *cp; int found = 0; + #ifndef HAVE_GETUSERSHELL - char buf[BUFSIZ]; - FILE *fp; + char buf[BUFSIZ]; + FILE *fp; #endif #ifdef HAVE_GETUSERSHELL - setusershell(); - while ((cp = getusershell())) { + setusershell (); + while ((cp = getusershell ())) { if (*cp == '#') continue; - if (strcmp(cp, sh) == 0) { + if (strcmp (cp, sh) == 0) { found = 1; break; } } - endusershell(); + endusershell (); #else if ((fp = fopen (SHELLS_FILE, "r")) == (FILE *) 0) return 0; - while (fgets (buf, sizeof(buf), fp)) { - if ((cp = strrchr(buf, '\n'))) + while (fgets (buf, sizeof (buf), fp)) { + if ((cp = strrchr (buf, '\n'))) *cp = '\0'; if (buf[0] == '#') @@ -95,4 +91,3 @@ check_shell(const char *sh) #endif return found; } - diff --git a/libmisc/chowndir.c b/libmisc/chowndir.c index b89c5973..7ed1cf61 100644 --- a/libmisc/chowndir.c +++ b/libmisc/chowndir.c @@ -30,38 +30,35 @@ #include #include "rcsid.h" -RCSID("$Id: chowndir.c,v 1.6 2000/08/26 18:27:17 marekm Exp $") - +RCSID ("$Id: chowndir.c,v 1.7 2003/04/22 10:59:21 kloczek Exp $") #include #include #include "prototypes.h" #include "defines.h" - #include #include - /* * chown_tree - change ownership of files in a directory tree * * chown_dir() walks a directory tree and changes the ownership * of all files owned by the provided user ID. */ - int -chown_tree(const char *root, uid_t old_uid, uid_t new_uid, gid_t old_gid, gid_t new_gid) +chown_tree (const char *root, uid_t old_uid, uid_t new_uid, gid_t old_gid, + gid_t new_gid) { - char new_name[1024]; - int rc = 0; - struct DIRECT *ent; - struct stat sb; - DIR *dir; + char new_name[1024]; + int rc = 0; + struct DIRECT *ent; + struct stat sb; + DIR *dir; /* * Make certain the directory exists. This routine is called * directory by the invoker, or recursively. */ - if (access(root, F_OK) != 0) + if (access (root, F_OK) != 0) return -1; /* @@ -71,7 +68,7 @@ chown_tree(const char *root, uid_t old_uid, uid_t new_uid, gid_t old_gid, gid_t * old user ID. */ - if (! (dir = opendir (root))) + if (!(dir = opendir (root))) return -1; while ((ent = readdir (dir))) { @@ -81,7 +78,7 @@ chown_tree(const char *root, uid_t old_uid, uid_t new_uid, gid_t old_gid, gid_t */ if (strcmp (ent->d_name, ".") == 0 || - strcmp (ent->d_name, "..") == 0) + strcmp (ent->d_name, "..") == 0) continue; /* @@ -89,16 +86,18 @@ chown_tree(const char *root, uid_t old_uid, uid_t new_uid, gid_t old_gid, gid_t * destination files. */ - if (strlen (root) + strlen (ent->d_name) + 2 > sizeof new_name) + if (strlen (root) + strlen (ent->d_name) + 2 > + sizeof new_name) break; - snprintf(new_name, sizeof new_name, "%s/%s", root, ent->d_name); + snprintf (new_name, sizeof new_name, "%s/%s", root, + ent->d_name); /* Don't follow symbolic links! */ - if (LSTAT(new_name, &sb) == -1) + if (LSTAT (new_name, &sb) == -1) continue; - if (S_ISDIR(sb.st_mode) && !S_ISLNK(sb.st_mode)) { + if (S_ISDIR (sb.st_mode) && !S_ISLNK (sb.st_mode)) { /* * Do the entire subdirectory. @@ -110,12 +109,13 @@ chown_tree(const char *root, uid_t old_uid, uid_t new_uid, gid_t old_gid, gid_t } #ifndef HAVE_LCHOWN /* don't use chown (follows symbolic links!) */ - if (S_ISLNK(sb.st_mode)) + if (S_ISLNK (sb.st_mode)) continue; #endif if (sb.st_uid == old_uid) - LCHOWN(new_name, new_uid, - sb.st_gid == old_gid ? new_gid:sb.st_gid); + LCHOWN (new_name, new_uid, + sb.st_gid == + old_gid ? new_gid : sb.st_gid); } closedir (dir); @@ -123,10 +123,11 @@ chown_tree(const char *root, uid_t old_uid, uid_t new_uid, gid_t old_gid, gid_t * Now do the root of the tree */ - if (! stat (root, &sb)) { + if (!stat (root, &sb)) { if (sb.st_uid == old_uid) - LCHOWN(root, new_uid, - sb.st_gid == old_gid ? new_gid:sb.st_gid); + LCHOWN (root, new_uid, + sb.st_gid == + old_gid ? new_gid : sb.st_gid); } return rc; } diff --git a/libmisc/chowntty.c b/libmisc/chowntty.c index 05598138..74765d26 100644 --- a/libmisc/chowntty.c +++ b/libmisc/chowntty.c @@ -30,28 +30,22 @@ #include #include "rcsid.h" -RCSID("$Id: chowntty.c,v 1.9 2001/06/23 11:09:02 marekm Exp $") - +RCSID ("$Id: chowntty.c,v 1.10 2003/04/22 10:59:21 kloczek Exp $") #include #include - #include #include #include - #include "prototypes.h" #include "defines.h" #include #include "getdef.h" - /* * is_my_tty -- determine if "tty" is the same as TTY stdin is using */ - -static int -is_my_tty(const char *tty) +static int is_my_tty (const char *tty) { - struct stat by_name, by_fd; + struct stat by_name, by_fd; if (stat (tty, &by_name) || fstat (0, &by_fd)) return 0; @@ -67,12 +61,11 @@ is_my_tty(const char *tty) * with TTYPERM modes */ -void -chown_tty(const char *tty, const struct passwd *info) +void chown_tty (const char *tty, const struct passwd *info) { char buf[200], full_tty[200]; - char *group; /* TTY group name or number */ - struct group *grent; + char *group; /* TTY group name or number */ + struct group *grent; gid_t gid; /* @@ -80,7 +73,7 @@ chown_tty(const char *tty, const struct passwd *info) * ID. Otherwise, use the user's primary group ID. */ - if (! (group = getdef_str ("TTYGROUP"))) + if (!(group = getdef_str ("TTYGROUP"))) gid = info->pw_gid; else if (group[0] >= '0' && group[0] <= '9') gid = atoi (group); @@ -95,31 +88,32 @@ chown_tty(const char *tty, const struct passwd *info) */ if (*tty != '/') { - snprintf(full_tty, sizeof full_tty, "/dev/%s", tty); + snprintf (full_tty, sizeof full_tty, "/dev/%s", tty); tty = full_tty; } - if (! is_my_tty (tty)) { - SYSLOG((LOG_WARN, "unable to determine TTY name, got %s\n", - tty)); - closelog(); + if (!is_my_tty (tty)) { + SYSLOG ((LOG_WARN, + "unable to determine TTY name, got %s\n", tty)); + closelog (); exit (1); } - - if (chown(tty, info->pw_uid, gid) || - chmod(tty, getdef_num("TTYPERM", 0600))) { + + if (chown (tty, info->pw_uid, gid) || + chmod (tty, getdef_num ("TTYPERM", 0600))) { int err = errno; - snprintf(buf, sizeof buf, _("Unable to change tty %s"), tty); - perror(buf); - SYSLOG((LOG_WARN, "unable to change tty `%s' for user `%s'\n", - tty, info->pw_name)); - closelog(); + snprintf (buf, sizeof buf, _("Unable to change tty %s"), + tty); + perror (buf); + SYSLOG ((LOG_WARN, + "unable to change tty `%s' for user `%s'\n", tty, + info->pw_name)); + closelog (); if (!(err == EROFS && info->pw_uid == 0)) - exit(1); + exit (1); } - #ifdef __linux__ /* * Please don't add code to chown /dev/vcs* to the user logging in - diff --git a/libmisc/console.c b/libmisc/console.c index 75e69074..d73b423e 100644 --- a/libmisc/console.c +++ b/libmisc/console.c @@ -33,15 +33,14 @@ #include "getdef.h" #include "rcsid.h" -RCSID("$Id: console.c,v 1.5 1998/12/28 20:34:44 marekm Exp $") +RCSID ("$Id: console.c,v 1.6 2003/04/22 10:59:21 kloczek Exp $") /* * This is now rather generic function which decides if "tty" is listed * under "cfgin" in config (directly or indirectly). Fallback to default if * something is bad. */ -int -is_listed(const char *cfgin, const char *tty, int def) +int is_listed (const char *cfgin, const char *tty, int def) { FILE *fp; char buf[200], *cons, *s; @@ -51,7 +50,7 @@ is_listed(const char *cfgin, const char *tty, int def) * fallback to default. */ - if ((cons = getdef_str(cfgin)) == NULL) + if ((cons = getdef_str (cfgin)) == NULL) return def; /* @@ -60,9 +59,9 @@ is_listed(const char *cfgin, const char *tty, int def) */ if (*cons != '/') { - cons = strcpy(buf, cons); - while ((s = strtok(cons, ":")) != NULL) { - if (strcmp(s, tty) == 0) + cons = strcpy (buf, cons); + while ((s = strtok (cons, ":")) != NULL) { + if (strcmp (s, tty) == 0) return 1; cons = NULL; @@ -75,17 +74,17 @@ is_listed(const char *cfgin, const char *tty, int def) * console - otherwise root will never be allowed to login. */ - if ((fp = fopen(cons, "r")) == NULL) + if ((fp = fopen (cons, "r")) == NULL) return def; /* * See if this tty is listed in the console file. */ - while (fgets(buf, sizeof(buf), fp) != NULL) { - buf[strlen(buf) - 1] = '\0'; - if (strcmp(buf, tty) == 0) { - (void) fclose(fp); + while (fgets (buf, sizeof (buf), fp) != NULL) { + buf[strlen (buf) - 1] = '\0'; + if (strcmp (buf, tty) == 0) { + (void) fclose (fp); return 1; } } @@ -94,7 +93,7 @@ is_listed(const char *cfgin, const char *tty, int def) * This tty isn't a console. */ - (void) fclose(fp); + (void) fclose (fp); return 0; } @@ -108,8 +107,7 @@ is_listed(const char *cfgin, const char *tty, int def) * that would allow an unauthorized root login. */ -int -console(const char *tty) +int console (const char *tty) { - return is_listed("CONSOLE", tty, 1); + return is_listed ("CONSOLE", tty, 1); } diff --git a/libmisc/copydir.c b/libmisc/copydir.c index abbb9a03..3cf83076 100644 --- a/libmisc/copydir.c +++ b/libmisc/copydir.c @@ -30,36 +30,31 @@ #include #include "rcsid.h" -RCSID("$Id: copydir.c,v 1.8 2001/06/28 18:27:29 marekm Exp $") - +RCSID ("$Id: copydir.c,v 1.9 2003/04/22 10:59:21 kloczek Exp $") #include - #include #include #include - #include "prototypes.h" #include "defines.h" - static const char *src_orig; static const char *dst_orig; -struct link_name { - dev_t ln_dev; - ino_t ln_ino; - int ln_count; - char *ln_name; - struct link_name *ln_next; +struct link_name { + dev_t ln_dev; + ino_t ln_ino; + int ln_count; + char *ln_name; + struct link_name *ln_next; }; -static struct link_name *links; +static struct link_name *links; /* * remove_link - delete a link from the link list */ -static void -remove_link(struct link_name *ln) +static void remove_link (struct link_name *ln) { struct link_name *lp; @@ -69,11 +64,11 @@ remove_link(struct link_name *ln) free (ln); return; } - for (lp = links;lp;lp = lp->ln_next) + for (lp = links; lp; lp = lp->ln_next) if (lp->ln_next == ln) break; - if (! lp) + if (!lp) return; lp->ln_next = lp->ln_next->ln_next; @@ -85,16 +80,16 @@ remove_link(struct link_name *ln) * check_link - see if a file is really a link */ -static struct link_name * -check_link(const char *name, const struct stat *sb) +static struct link_name *check_link (const char *name, + const struct stat *sb) { - struct link_name *lp; - int src_len; - int dst_len; - int name_len; + struct link_name *lp; + int src_len; + int dst_len; + int name_len; int len; - for (lp = links;lp;lp = lp->ln_next) + for (lp = links; lp; lp = lp->ln_next) if (lp->ln_dev == sb->st_dev && lp->ln_ino == sb->st_ino) return lp; @@ -109,8 +104,8 @@ check_link(const char *name, const struct stat *sb) lp->ln_ino = sb->st_ino; lp->ln_count = sb->st_nlink; len = name_len - src_len + dst_len + 1; - lp->ln_name = xmalloc(len); - snprintf(lp->ln_name, len, "%s%s", dst_orig, name + src_len); + lp->ln_name = xmalloc (len); + snprintf (lp->ln_name, len, "%s%s", dst_orig, name + src_len); lp->ln_next = links; links = lp; @@ -125,20 +120,21 @@ check_link(const char *name, const struct stat *sb) */ int -copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) +copy_tree (const char *src_root, const char *dst_root, uid_t uid, + gid_t gid) { - char src_name[1024]; - char dst_name[1024]; - char buf[1024]; - int ifd; - int ofd; - int err = 0; - int cnt; - int set_orig = 0; - struct DIRECT *ent; - struct stat sb; - struct link_name *lp; - DIR *dir; + char src_name[1024]; + char dst_name[1024]; + char buf[1024]; + int ifd; + int ofd; + int err = 0; + int cnt; + int set_orig = 0; + struct DIRECT *ent; + struct stat sb; + struct link_name *lp; + DIR *dir; /* * Make certain both directories exist. This routine is called @@ -146,7 +142,7 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) * target is created. It assumes the target directory exists. */ - if (access(src_root, F_OK) != 0 || access(dst_root, F_OK) != 0) + if (access (src_root, F_OK) != 0 || access (dst_root, F_OK) != 0) return -1; /* @@ -157,7 +153,7 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) * is made set-ID. */ - if (! (dir = opendir (src_root))) + if (!(dir = opendir (src_root))) return -1; if (src_orig == 0) { @@ -172,7 +168,7 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) */ if (strcmp (ent->d_name, ".") == 0 || - strcmp (ent->d_name, "..") == 0) + strcmp (ent->d_name, "..") == 0) continue; /* @@ -180,22 +176,26 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) * destination files. */ - if (strlen (src_root) + strlen (ent->d_name) + 2 > sizeof src_name) { + if (strlen (src_root) + strlen (ent->d_name) + 2 > + sizeof src_name) { err++; break; } - snprintf(src_name, sizeof src_name, "%s/%s", src_root, ent->d_name); + snprintf (src_name, sizeof src_name, "%s/%s", src_root, + ent->d_name); - if (strlen (dst_root) + strlen (ent->d_name) + 2 > sizeof dst_name) { + if (strlen (dst_root) + strlen (ent->d_name) + 2 > + sizeof dst_name) { err++; break; } - snprintf(dst_name, sizeof dst_name, "%s/%s", dst_root, ent->d_name); + snprintf (dst_name, sizeof dst_name, "%s/%s", dst_root, + ent->d_name); - if (LSTAT(src_name, &sb) == -1) + if (LSTAT (src_name, &sb) == -1) continue; - if (S_ISDIR(sb.st_mode)) { + if (S_ISDIR (sb.st_mode)) { /* * Create a new target directory, make it owned by @@ -203,8 +203,9 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) */ mkdir (dst_name, sb.st_mode & 0777); - chown (dst_name, uid == (uid_t) -1 ? sb.st_uid:uid, - gid == (gid_t) -1 ? sb.st_gid:gid); + chown (dst_name, + uid == (uid_t) - 1 ? sb.st_uid : uid, + gid == (gid_t) - 1 ? sb.st_gid : gid); if (copy_tree (src_name, dst_name, uid, gid)) { err++; @@ -217,10 +218,10 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) * Copy any symbolic links */ - if (S_ISLNK(sb.st_mode)) { - char oldlink[1024]; - char dummy[1024]; - int len; + if (S_ISLNK (sb.st_mode)) { + char oldlink[1024]; + char dummy[1024]; + int len; /* * Get the name of the file which the link points @@ -230,17 +231,21 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) * destinateion directory name. */ - if ((len = readlink(src_name, oldlink, sizeof(oldlink) - 1)) < 0) { + if ((len = + readlink (src_name, oldlink, + sizeof (oldlink) - 1)) < 0) { err++; break; } - oldlink[len] = '\0'; /* readlink() does not NUL-terminate */ - if (!strncmp(oldlink, src_orig, strlen(src_orig))) { - snprintf(dummy, sizeof dummy, "%s%s", - dst_orig, oldlink + strlen(src_orig)); - strcpy(oldlink, dummy); + oldlink[len] = '\0'; /* readlink() does not NUL-terminate */ + if (!strncmp + (oldlink, src_orig, strlen (src_orig))) { + snprintf (dummy, sizeof dummy, "%s%s", + dst_orig, + oldlink + strlen (src_orig)); + strcpy (oldlink, dummy); } - if (symlink(oldlink, dst_name)) { + if (symlink (oldlink, dst_name)) { err++; break; } @@ -273,11 +278,13 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) * would be nice to copy everything ... */ - if (!S_ISREG(sb.st_mode)) { - if (mknod (dst_name, sb.st_mode & ~07777, sb.st_rdev) || - chown (dst_name, uid == (uid_t) -1 ? sb.st_uid:uid, - gid == (gid_t) -1 ? sb.st_gid:gid) || - chmod (dst_name, sb.st_mode & 07777)) { + if (!S_ISREG (sb.st_mode)) { + if (mknod + (dst_name, sb.st_mode & ~07777, sb.st_rdev) + || chown (dst_name, + uid == (uid_t) - 1 ? sb.st_uid : uid, + gid == (gid_t) - 1 ? sb.st_gid : gid) + || chmod (dst_name, sb.st_mode & 07777)) { err++; break; } @@ -293,10 +300,12 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) err++; break; } - if ((ofd = open (dst_name, O_WRONLY|O_CREAT|O_TRUNC, 0)) < 0 || - chown (dst_name, uid == (uid_t) -1 ? sb.st_uid:uid, - gid == (gid_t) -1 ? sb.st_gid:gid) || - chmod (dst_name, sb.st_mode & 07777)) { + if ((ofd = + open (dst_name, O_WRONLY | O_CREAT | O_TRUNC, 0)) < 0 + || chown (dst_name, + uid == (uid_t) - 1 ? sb.st_uid : uid, + gid == (gid_t) - 1 ? sb.st_gid : gid) + || chmod (dst_name, sb.st_mode & 07777)) { close (ifd); err++; break; @@ -321,7 +330,7 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) src_orig = 0; dst_orig = 0; } - return err ? -1:0; + return err ? -1 : 0; } /* @@ -331,20 +340,19 @@ copy_tree(const char *src_root, const char *dst_root, uid_t uid, gid_t gid) * and directories. */ -int -remove_tree(const char *root) +int remove_tree (const char *root) { - char new_name[1024]; - int err = 0; - struct DIRECT *ent; - struct stat sb; - DIR *dir; + char new_name[1024]; + int err = 0; + struct DIRECT *ent; + struct stat sb; + DIR *dir; /* * Make certain the directory exists. */ - if (access(root, F_OK) != 0) + if (access (root, F_OK) != 0) return -1; /* @@ -364,22 +372,24 @@ remove_tree(const char *root) */ if (strcmp (ent->d_name, ".") == 0 || - strcmp (ent->d_name, "..") == 0) + strcmp (ent->d_name, "..") == 0) continue; /* * Make the filename for the current entry. */ - if (strlen (root) + strlen (ent->d_name) + 2 > sizeof new_name) { + if (strlen (root) + strlen (ent->d_name) + 2 > + sizeof new_name) { err++; break; } - snprintf(new_name, sizeof new_name, "%s/%s", root, ent->d_name); - if (LSTAT(new_name, &sb) == -1) + snprintf (new_name, sizeof new_name, "%s/%s", root, + ent->d_name); + if (LSTAT (new_name, &sb) == -1) continue; - if (S_ISDIR(sb.st_mode)) { + if (S_ISDIR (sb.st_mode)) { /* * Recursively delete this directory. @@ -399,5 +409,5 @@ remove_tree(const char *root) } closedir (dir); - return err ? -1:0; + return err ? -1 : 0; } diff --git a/libmisc/entry.c b/libmisc/entry.c index 746dfb0a..435c2fbe 100644 --- a/libmisc/entry.c +++ b/libmisc/entry.c @@ -30,38 +30,29 @@ #include #include "rcsid.h" -RCSID("$Id: entry.c,v 1.4 2000/08/26 18:27:17 marekm Exp $") - +RCSID ("$Id: entry.c,v 1.6 2003/05/03 16:14:33 kloczek Exp $") #include #include #include "prototypes.h" #include "defines.h" #include +extern struct passwd *fgetpwent (); -extern struct passwd *fgetpwent (); - -void -pw_entry(const char *name, struct passwd *pwent) +void pw_entry (const char *name, struct passwd *pwent) { - struct passwd *passwd; + struct passwd *passwd; + #ifdef SHADOWPWD - struct spwd *spwd; -#ifdef ATT_AGE - char *l64a (); - char *cp; -#endif + struct spwd *spwd; #endif - if (! (passwd = getpwnam (name))) { + if (!(passwd = getpwnam (name))) { pwent->pw_name = (char *) 0; return; - } else { + } else { pwent->pw_name = xstrdup (passwd->pw_name); pwent->pw_uid = passwd->pw_uid; pwent->pw_gid = passwd->pw_gid; -#ifdef ATT_COMMENT - pwent->pw_comment = xstrdup (passwd->pw_comment); -#endif pwent->pw_gecos = xstrdup (passwd->pw_gecos); pwent->pw_dir = xstrdup (passwd->pw_dir); pwent->pw_shell = xstrdup (passwd->pw_shell); @@ -69,31 +60,11 @@ pw_entry(const char *name, struct passwd *pwent) setspent (); if ((spwd = getspnam (name))) { pwent->pw_passwd = xstrdup (spwd->sp_pwdp); -#ifdef ATT_AGE - pwent->pw_age = (char *) xmalloc (5); - - if (spwd->sp_max > (63*7)) - spwd->sp_max = (63*7); - if (spwd->sp_min > (63*7)) - spwd->sp_min = (63*7); - - pwent->pw_age[0] = i64c (spwd->sp_max / 7); - pwent->pw_age[1] = i64c (spwd->sp_min / 7); - - cp = l64a (spwd->sp_lstchg / 7); - pwent->pw_age[2] = cp[0]; - pwent->pw_age[3] = cp[1]; - - pwent->pw_age[4] = '\0'; -#endif endspent (); return; } endspent (); #endif pwent->pw_passwd = xstrdup (passwd->pw_passwd); -#ifdef ATT_AGE - pwent->pw_age = xstrdup (passwd->pw_age); -#endif } } diff --git a/libmisc/env.c b/libmisc/env.c index 8d7b2a11..e4d9270b 100644 --- a/libmisc/env.c +++ b/libmisc/env.c @@ -30,33 +30,30 @@ #include #include "rcsid.h" -RCSID("$Id: env.c,v 1.9 1999/03/07 19:14:38 marekm Exp $") - +RCSID ("$Id: env.c,v 1.10 2003/04/22 10:59:22 kloczek Exp $") #include #include #include #include "prototypes.h" #include "defines.h" - /* * NEWENVP_STEP must be a power of two. This is the number * of (char *) pointers to allocate at a time, to avoid using * realloc() too often. - */ + */ #define NEWENVP_STEP 16 - size_t newenvc = 0; char **newenvp = NULL; extern char **environ; static const char *forbid[] = { "_RLD_=", - "BASH_ENV=", /* GNU creeping featurism strikes again... */ + "BASH_ENV=", /* GNU creeping featurism strikes again... */ "ENV=", "HOME=", "IFS=", "KRB_CONF=", - "LD_", /* anything with the LD_ prefix */ + "LD_", /* anything with the LD_ prefix */ "LIBPATH=", "MAIL=", "NLSPATH=", @@ -71,33 +68,31 @@ static const char *forbid[] = { static const char *noslash[] = { "LANG=", "LANGUAGE=", - "LC_", /* anything with the LC_ prefix */ + "LC_", /* anything with the LC_ prefix */ (char *) 0 }; /* * initenv() must be called once before using addenv(). */ -void -initenv(void) +void initenv (void) { - newenvp = (char **)xmalloc(NEWENVP_STEP * sizeof(char *)); + newenvp = (char **) xmalloc (NEWENVP_STEP * sizeof (char *)); *newenvp = NULL; } -void -addenv(const char *string, const char *value) +void addenv (const char *string, const char *value) { char *cp, *newstring; size_t i; size_t n; if (value) { - newstring = xmalloc(strlen(string) + strlen(value) + 2); - sprintf(newstring, "%s=%s", string, value); + newstring = xmalloc (strlen (string) + strlen (value) + 2); + sprintf (newstring, "%s=%s", string, value); } else { - newstring = xstrdup(string); + newstring = xstrdup (string); } /* @@ -105,22 +100,22 @@ addenv(const char *string, const char *value) * just ignore the whole string. */ - cp = strchr(newstring, '='); + cp = strchr (newstring, '='); if (!cp) { - free(newstring); + free (newstring); return; } - n = (size_t)(cp - newstring); + n = (size_t) (cp - newstring); for (i = 0; i < newenvc; i++) { - if (strncmp(newstring, newenvp[i], n) == 0 && + if (strncmp (newstring, newenvp[i], n) == 0 && (newenvp[i][n] == '=' || newenvp[i][n] == '\0')) break; } if (i < newenvc) { - free(newenvp[i]); + free (newenvp[i]); newenvp[i] = newstring; return; } @@ -144,8 +139,8 @@ addenv(const char *string, const char *value) * happily go on, else print a message. */ - newsize = (newenvc + NEWENVP_STEP) * sizeof(char *); - __newenvp = (char **)realloc(newenvp, newsize); + newsize = (newenvc + NEWENVP_STEP) * sizeof (char *); + __newenvp = (char **) realloc (newenvp, newsize); if (__newenvp) { /* @@ -157,8 +152,8 @@ addenv(const char *string, const char *value) environ = __newenvp; newenvp = __newenvp; } else { - fprintf(stderr, _("Environment overflow\n")); - free(newenvp[--newenvc]); + fprintf (stderr, _("Environment overflow\n")); + free (newenvp[--newenvc]); } } @@ -173,35 +168,36 @@ addenv(const char *string, const char *value) /* * set_env - copy command line arguments into the environment */ -void -set_env(int argc, char * const *argv) +void set_env (int argc, char *const *argv) { - int noname = 1; - char variable[1024]; - char *cp; + int noname = 1; + char variable[1024]; + char *cp; - for ( ; argc > 0; argc--, argv++) { - if (strlen(*argv) >= sizeof variable) + for (; argc > 0; argc--, argv++) { + if (strlen (*argv) >= sizeof variable) continue; /* ignore long entries */ - if (! (cp = strchr (*argv, '='))) { - snprintf(variable, sizeof variable, "L%d", noname++); - addenv(variable, *argv); + if (!(cp = strchr (*argv, '='))) { + snprintf (variable, sizeof variable, "L%d", + noname++); + addenv (variable, *argv); } else { const char **p; for (p = forbid; *p; p++) - if (strncmp(*argv, *p, strlen(*p)) == 0) + if (strncmp (*argv, *p, strlen (*p)) == 0) break; if (*p) { - strncpy(variable, *argv, cp - *argv); + strncpy (variable, *argv, cp - *argv); variable[cp - *argv] = '\0'; - printf(_("You may not change $%s\n"), variable); + printf (_("You may not change $%s\n"), + variable); continue; } - addenv(*argv, NULL); + addenv (*argv, NULL); } } } @@ -215,8 +211,7 @@ set_env(int argc, char * const *argv) * but... I feel better with that silly precaution. -j. */ -void -sanitize_env(void) +void sanitize_env (void) { char **envp = environ; const char **bad; @@ -225,7 +220,7 @@ sanitize_env(void) for (cur = envp; *cur; cur++) { for (bad = forbid; *bad; bad++) { - if (strncmp(*cur, *bad, strlen(*bad)) == 0) { + if (strncmp (*cur, *bad, strlen (*bad)) == 0) { for (move = cur; *move; move++) *move = *(move + 1); cur--; @@ -236,10 +231,10 @@ sanitize_env(void) for (cur = envp; *cur; cur++) { for (bad = noslash; *bad; bad++) { - if (strncmp(*cur, *bad, strlen(*bad)) != 0) + if (strncmp (*cur, *bad, strlen (*bad)) != 0) continue; - if (!strchr(*cur, '/')) - continue; /* OK */ + if (!strchr (*cur, '/')) + continue; /* OK */ for (move = cur; *move; move++) *move = *(move + 1); cur--; @@ -247,4 +242,3 @@ sanitize_env(void) } } } - diff --git a/libmisc/failure.c b/libmisc/failure.c index 6f62ef1f..7bfde829 100644 --- a/libmisc/failure.c +++ b/libmisc/failure.c @@ -30,8 +30,7 @@ #include #include "rcsid.h" -RCSID("$Id: failure.c,v 1.6 1998/12/28 20:34:46 marekm Exp $") - +RCSID ("$Id: failure.c,v 1.9 2003/04/25 21:11:08 kloczek Exp $") #include #include #include "defines.h" @@ -39,19 +38,14 @@ RCSID("$Id: failure.c,v 1.6 1998/12/28 20:34:46 marekm Exp $") #include "getdef.h" #include "failure.h" -#include - #define YEAR (365L*DAY) - /* * failure - make failure entry * * failure() creates a new (struct faillog) entry or updates an * existing one with the current failed login information. */ - -void -failure(uid_t uid, const char *tty, struct faillog *fl) +void failure (uid_t uid, const char *tty, struct faillog *fl) { int fd; @@ -59,7 +53,7 @@ failure(uid_t uid, const char *tty, struct faillog *fl) * Don't do anything if failure logging isn't set up. */ - if ((fd = open(FAILLOG_FILE, O_RDWR)) < 0) + if ((fd = open (FAILLOG_FILE, O_RDWR)) < 0) return; /* @@ -68,9 +62,9 @@ failure(uid_t uid, const char *tty, struct faillog *fl) * share just about everything else ... */ - lseek(fd, (off_t) (sizeof *fl) * uid, SEEK_SET); - if (read(fd, (char *) fl, sizeof *fl) != sizeof *fl) - memzero(fl, sizeof *fl); + lseek (fd, (off_t) (sizeof *fl) * uid, SEEK_SET); + if (read (fd, (char *) fl, sizeof *fl) != sizeof *fl) + memzero (fl, sizeof *fl); /* * Update the record. We increment the failure count to log the @@ -82,8 +76,8 @@ failure(uid_t uid, const char *tty, struct faillog *fl) if (fl->fail_cnt + 1 > 0) fl->fail_cnt++; - strncpy(fl->fail_line, tty, sizeof fl->fail_line); - time(&fl->fail_time); + strncpy (fl->fail_line, tty, sizeof fl->fail_line); + time (&fl->fail_time); /* * Seek back to the correct position in the file and write the @@ -92,13 +86,12 @@ failure(uid_t uid, const char *tty, struct faillog *fl) * seem that great. */ - lseek(fd, (off_t) (sizeof *fl) * uid, SEEK_SET); - write(fd, (char *) fl, sizeof *fl); - close(fd); + lseek (fd, (off_t) (sizeof *fl) * uid, SEEK_SET); + write (fd, (char *) fl, sizeof *fl); + close (fd); } -static int -too_many_failures(const struct faillog *fl) +static int too_many_failures (const struct faillog *fl) { time_t now; @@ -106,11 +99,11 @@ too_many_failures(const struct faillog *fl) return 0; if (fl->fail_locktime == 0) - return 1; /* locked until reset manually */ + return 1; /* locked until reset manually */ - time(&now); - if (fl->fail_time + fl->fail_locktime > now) - return 0; /* enough time since last failure */ + time (&now); + if (fl->fail_time + fl->fail_locktime < now) + return 0; /* enough time since last failure */ return 1; } @@ -124,17 +117,16 @@ too_many_failures(const struct faillog *fl) * the password is valid. */ -int -failcheck(uid_t uid, struct faillog *fl, int failed) +int failcheck (uid_t uid, struct faillog *fl, int failed) { - int fd; - struct faillog fail; + int fd; + struct faillog fail; /* * Suppress the check if the log file isn't there. */ - if ((fd = open(FAILLOG_FILE, O_RDWR)) < 0) + if ((fd = open (FAILLOG_FILE, O_RDWR)) < 0) return 1; /* @@ -150,13 +142,13 @@ failcheck(uid_t uid, struct faillog *fl, int failed) */ lseek (fd, (off_t) (sizeof *fl) * uid, SEEK_SET); - if (read(fd, (char *) fl, sizeof *fl) != sizeof *fl) { - close(fd); + if (read (fd, (char *) fl, sizeof *fl) != sizeof *fl) { + close (fd); return 1; } - if (too_many_failures(fl)) { - close(fd); + if (too_many_failures (fl)) { + close (fd); return 0; } @@ -185,16 +177,16 @@ failcheck(uid_t uid, struct faillog *fl, int failed) * message which is displayed at login time. */ -void -failprint(const struct faillog *fail) +void failprint (const struct faillog *fail) { - struct tm *tp; + struct tm *tp; + #if HAVE_STRFTIME - char lasttimeb[256]; - char *lasttime = lasttimeb; + char lasttimeb[256]; + char *lasttime = lasttimeb; const char *fmt; #else - char *lasttime; + char *lasttime; #endif time_t NOW; @@ -202,7 +194,7 @@ failprint(const struct faillog *fail) return; tp = localtime (&(fail->fail_time)); - time(&NOW); + time (&NOW); #if HAVE_STRFTIME /* @@ -216,7 +208,7 @@ failprint(const struct faillog *fail) fmt = "%A %T"; else fmt = "%T"; - strftime(lasttimeb, sizeof lasttimeb, fmt, tp); + strftime (lasttimeb, sizeof lasttimeb, fmt, tp); #else /* @@ -236,7 +228,8 @@ failprint(const struct faillog *fail) lasttime++; #endif printf (_("%d %s since last login. Last was %s on %s.\n"), - fail->fail_cnt, fail->fail_cnt > 1 ? _("failures"):_("failure"), + fail->fail_cnt, + fail->fail_cnt > 1 ? _("failures") : _("failure"), lasttime, fail->fail_line); } @@ -247,8 +240,7 @@ failprint(const struct faillog *fail) * maintains a record of all login failures. */ -void -failtmp(const struct utmp *failent) +void failtmp (const struct utmp *failent) { char *ftmp; int fd; @@ -258,7 +250,7 @@ failtmp(const struct utmp *failent) * in login.defs, don't do this. */ - if (!(ftmp = getdef_str("FTMP_FILE"))) + if (!(ftmp = getdef_str ("FTMP_FILE"))) return; /* @@ -266,13 +258,13 @@ failtmp(const struct utmp *failent) * feature to be used. */ - if ((fd = open(ftmp, O_WRONLY|O_APPEND)) == -1) + if ((fd = open (ftmp, O_WRONLY | O_APPEND)) == -1) return; /* * Output the new failure record and close the log file. */ - write(fd, (const char *) failent, sizeof *failent); - close(fd); + write (fd, (const char *) failent, sizeof *failent); + close (fd); } diff --git a/libmisc/fields.c b/libmisc/fields.c index a645ec59..16b044b5 100644 --- a/libmisc/fields.c +++ b/libmisc/fields.c @@ -30,13 +30,11 @@ #include #include "rcsid.h" -RCSID("$Id: fields.c,v 1.5 1997/12/07 23:27:04 marekm Exp $") - +RCSID ("$Id: fields.c,v 1.6 2003/04/22 10:59:22 kloczek Exp $") #include #include #include #include "prototypes.h" - /* * valid_field - insure that a field contains all legal characters * @@ -44,14 +42,12 @@ RCSID("$Id: fields.c,v 1.5 1997/12/07 23:27:04 marekm Exp $") * characters. If any illegal characters are found, valid_field * returns -1. Zero is returned for success. */ - -int -valid_field(const char *field, const char *illegal) +int valid_field (const char *field, const char *illegal) { const char *cp; - for (cp = field; *cp && isprint(*cp & 0x7F) && !strchr(illegal, *cp); cp++) - ; + for (cp = field; + *cp && isprint (*cp & 0x7F) && !strchr (illegal, *cp); cp++); if (*cp) return -1; @@ -66,20 +62,19 @@ valid_field(const char *field, const char *illegal) * current value. */ -void -change_field(char *buf, size_t maxsize, const char *prompt) +void change_field (char *buf, size_t maxsize, const char *prompt) { char newf[200]; char *cp; - if (maxsize > sizeof(newf)) - maxsize = sizeof(newf); + if (maxsize > sizeof (newf)) + maxsize = sizeof (newf); printf ("\t%s [%s]: ", prompt, buf); - if (fgets(newf, maxsize, stdin) != newf) + if (fgets (newf, maxsize, stdin) != newf) return; - if (!(cp = strchr(newf, '\n'))) + if (!(cp = strchr (newf, '\n'))) return; *cp = '\0'; @@ -90,15 +85,14 @@ change_field(char *buf, size_t maxsize, const char *prompt) * entering a space. --marekm */ - while (--cp >= newf && isspace(*cp)) - ; + while (--cp >= newf && isspace (*cp)); *++cp = '\0'; cp = newf; - while (*cp && isspace(*cp)) + while (*cp && isspace (*cp)) cp++; - strncpy(buf, cp, maxsize - 1); + strncpy (buf, cp, maxsize - 1); buf[maxsize - 1] = '\0'; } } diff --git a/libmisc/getdate.c b/libmisc/getdate.c index 559add3a..fd9ab632 100644 --- a/libmisc/getdate.c +++ b/libmisc/getdate.c @@ -1,26 +1,24 @@ - -/* A Bison parser, made from getdate.y - by GNU Bison version 1.25 - */ +/* A Bison parser, made from getdate.y + by GNU bison 1.35. */ #define YYBISON 1 /* Identify Bison output. */ -#define tAGO 258 -#define tDAY 259 -#define tDAY_UNIT 260 -#define tDAYZONE 261 -#define tDST 262 -#define tHOUR_UNIT 263 -#define tID 264 -#define tMERIDIAN 265 -#define tMINUTE_UNIT 266 -#define tMONTH 267 -#define tMONTH_UNIT 268 -#define tSEC_UNIT 269 -#define tSNUMBER 270 -#define tUNUMBER 271 -#define tYEAR_UNIT 272 -#define tZONE 273 +# define tAGO 257 +# define tDAY 258 +# define tDAY_UNIT 259 +# define tDAYZONE 260 +# define tDST 261 +# define tHOUR_UNIT 262 +# define tID 263 +# define tMERIDIAN 264 +# define tMINUTE_UNIT 265 +# define tMONTH 266 +# define tMONTH_UNIT 267 +# define tSEC_UNIT 268 +# define tSNUMBER 269 +# define tUNUMBER 270 +# define tYEAR_UNIT 271 +# define tZONE 272 #line 1 "getdate.y" @@ -197,16 +195,16 @@ static int yyRelYear; #line 175 "getdate.y" +#ifndef YYSTYPE typedef union { int Number; enum _MERIDIAN Meridian; -} YYSTYPE; -#include - -#ifndef __cplusplus -#ifndef __STDC__ -#define const +} yystype; +# define YYSTYPE yystype +# define YYSTYPE_IS_TRIVIAL 1 #endif +#ifndef YYDEBUG +# define YYDEBUG 0 #endif @@ -215,159 +213,187 @@ typedef union { #define YYFLAG -32768 #define YYNTBASE 22 -#define YYTRANSLATE(x) ((unsigned)(x) <= 273 ? yytranslate[x] : 32) +/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */ +#define YYTRANSLATE(x) ((unsigned)(x) <= 272 ? yytranslate[x] : 32) -static const char yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 20, 2, 2, 21, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 19, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18 +/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */ +static const char yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 20, 2, 2, 21, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 19, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18 }; -#if YYDEBUG != 0 -static const short yyprhs[] = { 0, - 0, 1, 4, 6, 8, 10, 12, 14, 16, 19, - 24, 29, 36, 43, 45, 47, 50, 52, 55, 58, - 62, 68, 72, 76, 79, 84, 87, 91, 94, 96, - 99, 102, 104, 107, 110, 112, 115, 118, 120, 123, - 126, 128, 131, 134, 136, 139, 142, 144, 146, 147 +#if YYDEBUG +static const short yyprhs[] = +{ + 0, 0, 1, 4, 6, 8, 10, 12, 14, 16, + 19, 24, 29, 36, 43, 45, 47, 50, 52, 55, + 58, 62, 68, 72, 76, 79, 84, 87, 91, 94, + 96, 99, 102, 104, 107, 110, 112, 115, 118, 120, + 123, 126, 128, 131, 134, 136, 139, 142, 144, 146, + 147 }; - -static const short yyrhs[] = { -1, - 22, 23, 0, 24, 0, 25, 0, 27, 0, 26, - 0, 28, 0, 30, 0, 16, 10, 0, 16, 19, - 16, 31, 0, 16, 19, 16, 15, 0, 16, 19, - 16, 19, 16, 31, 0, 16, 19, 16, 19, 16, - 15, 0, 18, 0, 6, 0, 18, 7, 0, 4, - 0, 4, 20, 0, 16, 4, 0, 16, 21, 16, - 0, 16, 21, 16, 21, 16, 0, 16, 15, 15, - 0, 16, 12, 15, 0, 12, 16, 0, 12, 16, - 20, 16, 0, 16, 12, 0, 16, 12, 16, 0, - 29, 3, 0, 29, 0, 16, 17, 0, 15, 17, - 0, 17, 0, 16, 13, 0, 15, 13, 0, 13, - 0, 16, 5, 0, 15, 5, 0, 5, 0, 16, - 8, 0, 15, 8, 0, 8, 0, 16, 11, 0, - 15, 11, 0, 11, 0, 16, 14, 0, 15, 14, - 0, 14, 0, 16, 0, 0, 10, 0 +static const short yyrhs[] = +{ + -1, 22, 23, 0, 24, 0, 25, 0, 27, 0, + 26, 0, 28, 0, 30, 0, 16, 10, 0, 16, + 19, 16, 31, 0, 16, 19, 16, 15, 0, 16, + 19, 16, 19, 16, 31, 0, 16, 19, 16, 19, + 16, 15, 0, 18, 0, 6, 0, 18, 7, 0, + 4, 0, 4, 20, 0, 16, 4, 0, 16, 21, + 16, 0, 16, 21, 16, 21, 16, 0, 16, 15, + 15, 0, 16, 12, 15, 0, 12, 16, 0, 12, + 16, 20, 16, 0, 16, 12, 0, 16, 12, 16, + 0, 29, 3, 0, 29, 0, 16, 17, 0, 15, + 17, 0, 17, 0, 16, 13, 0, 15, 13, 0, + 13, 0, 16, 5, 0, 15, 5, 0, 5, 0, + 16, 8, 0, 15, 8, 0, 8, 0, 16, 11, + 0, 15, 11, 0, 11, 0, 16, 14, 0, 15, + 14, 0, 14, 0, 16, 0, 0, 10, 0 }; #endif -#if YYDEBUG != 0 -static const short yyrline[] = { 0, - 191, 192, 195, 198, 201, 204, 207, 210, 213, 219, - 225, 234, 240, 252, 255, 258, 264, 268, 272, 278, - 282, 300, 306, 312, 316, 321, 325, 332, 340, 343, - 346, 349, 352, 355, 358, 361, 364, 367, 370, 373, - 376, 379, 382, 385, 388, 391, 394, 399, 432, 436 +#if YYDEBUG +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const short yyrline[] = +{ + 0, 191, 192, 195, 198, 201, 204, 207, 210, 213, + 219, 225, 234, 240, 252, 255, 258, 264, 268, 272, + 278, 282, 300, 306, 312, 316, 321, 325, 332, 340, + 343, 346, 349, 352, 355, 358, 361, 364, 367, 370, + 373, 376, 379, 382, 385, 388, 391, 394, 399, 432, + 436 }; #endif -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE) +#if (YYDEBUG) || defined YYERROR_VERBOSE -static const char * const yytname[] = { "$","error","$undefined.","tAGO","tDAY", -"tDAY_UNIT","tDAYZONE","tDST","tHOUR_UNIT","tID","tMERIDIAN","tMINUTE_UNIT", -"tMONTH","tMONTH_UNIT","tSEC_UNIT","tSNUMBER","tUNUMBER","tYEAR_UNIT","tZONE", -"':'","','","'/'","spec","item","time","zone","day","date","rel","relunit","number", -"o_merid", NULL +/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ +static const char *const yytname[] = +{ + "$", "error", "$undefined.", "tAGO", "tDAY", "tDAY_UNIT", "tDAYZONE", + "tDST", "tHOUR_UNIT", "tID", "tMERIDIAN", "tMINUTE_UNIT", "tMONTH", + "tMONTH_UNIT", "tSEC_UNIT", "tSNUMBER", "tUNUMBER", "tYEAR_UNIT", + "tZONE", "':'", "','", "'/'", "spec", "item", "time", "zone", "day", + "date", "rel", "relunit", "number", "o_merid", 0 }; #endif -static const short yyr1[] = { 0, - 22, 22, 23, 23, 23, 23, 23, 23, 24, 24, - 24, 24, 24, 25, 25, 25, 26, 26, 26, 27, - 27, 27, 27, 27, 27, 27, 27, 28, 28, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 29, 29, 29, 29, 30, 31, 31 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const short yyr1[] = +{ + 0, 22, 22, 23, 23, 23, 23, 23, 23, 24, + 24, 24, 24, 24, 25, 25, 25, 26, 26, 26, + 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 30, 31, + 31 }; -static const short yyr2[] = { 0, - 0, 2, 1, 1, 1, 1, 1, 1, 2, 4, - 4, 6, 6, 1, 1, 2, 1, 2, 2, 3, - 5, 3, 3, 2, 4, 2, 3, 2, 1, 2, - 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, - 1, 2, 2, 1, 2, 2, 1, 1, 0, 1 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const short yyr2[] = +{ + 0, 0, 2, 1, 1, 1, 1, 1, 1, 2, + 4, 4, 6, 6, 1, 1, 2, 1, 2, 2, + 3, 5, 3, 3, 2, 4, 2, 3, 2, 1, + 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, + 2, 1, 2, 2, 1, 2, 2, 1, 1, 0, + 1 }; -static const short yydefact[] = { 1, - 0, 17, 38, 15, 41, 44, 0, 35, 47, 0, - 48, 32, 14, 2, 3, 4, 6, 5, 7, 29, - 8, 18, 24, 37, 40, 43, 34, 46, 31, 19, - 36, 39, 9, 42, 26, 33, 45, 0, 30, 0, - 0, 16, 28, 0, 23, 27, 22, 49, 20, 25, - 50, 11, 0, 10, 0, 49, 21, 13, 12, 0, - 0 +/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE + doesn't specify something else to do. Zero means the default is an + error. */ +static const short yydefact[] = +{ + 1, 0, 17, 38, 15, 41, 44, 0, 35, 47, + 0, 48, 32, 14, 2, 3, 4, 6, 5, 7, + 29, 8, 18, 24, 37, 40, 43, 34, 46, 31, + 19, 36, 39, 9, 42, 26, 33, 45, 0, 30, + 0, 0, 16, 28, 0, 23, 27, 22, 49, 20, + 25, 50, 11, 0, 10, 0, 49, 21, 13, 12, + 0, 0 }; -static const short yydefgoto[] = { 1, - 14, 15, 16, 17, 18, 19, 20, 21, 54 +static const short yydefgoto[] = +{ + 1, 14, 15, 16, 17, 18, 19, 20, 21, 54 }; -static const short yypact[] = {-32768, - 0, -19,-32768,-32768,-32768,-32768, -13,-32768,-32768, 30, - 15,-32768, 14,-32768,-32768,-32768,-32768,-32768,-32768, 19, --32768,-32768, 4,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, -6,-32768,-32768, 16,-32768, 17, - 23,-32768,-32768, 24,-32768,-32768,-32768, 27, 28,-32768, --32768,-32768, 29,-32768, 32, -8,-32768,-32768,-32768, 50, --32768 +static const short yypact[] = +{ + -32768, 0, -19,-32768,-32768,-32768,-32768, -13,-32768,-32768, + 30, 15,-32768, 14,-32768,-32768,-32768,-32768,-32768,-32768, + 19,-32768,-32768, 4,-32768,-32768,-32768,-32768,-32768,-32768, + -32768,-32768,-32768,-32768,-32768, -6,-32768,-32768, 16,-32768, + 17, 23,-32768,-32768, 24,-32768,-32768,-32768, 27, 28, + -32768,-32768,-32768, 29,-32768, 32, -8,-32768,-32768,-32768, + 50,-32768 }; -static const short yypgoto[] = {-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -5 +static const short yypgoto[] = +{ + -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -5 }; #define YYLAST 51 -static const short yytable[] = { 60, - 22, 51, 23, 2, 3, 4, 58, 5, 45, 46, - 6, 7, 8, 9, 10, 11, 12, 13, 30, 31, - 42, 43, 32, 44, 33, 34, 35, 36, 37, 38, - 47, 39, 48, 40, 24, 41, 51, 25, 49, 50, - 26, 52, 27, 28, 56, 53, 29, 57, 55, 61, - 59 +static const short yytable[] = +{ + 60, 22, 51, 23, 2, 3, 4, 58, 5, 45, + 46, 6, 7, 8, 9, 10, 11, 12, 13, 30, + 31, 42, 43, 32, 44, 33, 34, 35, 36, 37, + 38, 47, 39, 48, 40, 24, 41, 51, 25, 49, + 50, 26, 52, 27, 28, 56, 53, 29, 57, 55, + 61, 59 }; -static const short yycheck[] = { 0, - 20, 10, 16, 4, 5, 6, 15, 8, 15, 16, - 11, 12, 13, 14, 15, 16, 17, 18, 4, 5, - 7, 3, 8, 20, 10, 11, 12, 13, 14, 15, - 15, 17, 16, 19, 5, 21, 10, 8, 16, 16, - 11, 15, 13, 14, 16, 19, 17, 16, 21, 0, - 56 +static const short yycheck[] = +{ + 0, 20, 10, 16, 4, 5, 6, 15, 8, 15, + 16, 11, 12, 13, 14, 15, 16, 17, 18, 4, + 5, 7, 3, 8, 20, 10, 11, 12, 13, 14, + 15, 15, 17, 16, 19, 5, 21, 10, 8, 16, + 16, 11, 15, 13, 14, 16, 19, 17, 16, 21, + 0, 56 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/share/bison.simple" +#line 3 "/usr/share/misc/bison.simple" /* Skeleton output parser for bison, - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -381,183 +407,302 @@ static const short yycheck[] = { 0, You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. This special exception was added by the Free Software Foundation in version 1.24 of Bison. */ -#ifndef alloca -#ifdef __GNUC__ -#define alloca __builtin_alloca -#else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) -#include -#else /* not sparc */ -#if defined (MSDOS) && !defined (__TURBOC__) -#include -#else /* not MSDOS, or __TURBOC__ */ -#if defined(_AIX) -#include - #pragma alloca -#else /* not MSDOS, __TURBOC__, or _AIX */ -#ifdef __hpux -#ifdef __cplusplus -extern "C" { -void *alloca (unsigned int); +/* This is the parser code that is written into each bison parser when + the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE) + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# else +# ifndef YYSTACK_USE_ALLOCA +# if defined (alloca) || defined (_ALLOCA_H) +# define YYSTACK_ALLOC alloca +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) +# else +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +# define YYSTACK_ALLOC malloc +# define YYSTACK_FREE free +# endif +#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */ + + +#if (! defined (yyoverflow) \ + && (! defined (__cplusplus) \ + || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + short yyss; + YYSTYPE yyvs; +# if YYLSP_NEEDED + YYLTYPE yyls; +# endif }; -#else /* not __cplusplus */ -void *alloca (); -#endif /* not __cplusplus */ -#endif /* __hpux */ -#endif /* not _AIX */ -#endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc. */ -#endif /* not GNU C. */ -#endif /* alloca not defined. */ -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1) -/* Note: there must be only one dollar sign in this file. - It is replaced by the list of actions, each action - as one case of the switch. */ +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# if YYLSP_NEEDED +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + + 2 * YYSTACK_GAP_MAX) +# else +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAX) +# endif + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + register YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (0) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) + +#endif + + +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY -2 #define YYEOF 0 -#define YYACCEPT return(0) -#define YYABORT return(1) +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab #define YYERROR goto yyerrlab1 -/* Like YYERROR except do call yyerror. - This remains here temporarily to ease the - transition to the new meaning of YYERROR, for GCC. +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ #define YYFAIL goto yyerrlab #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(token, value) \ +#define YYBACKUP(Token, Value) \ do \ if (yychar == YYEMPTY && yylen == 1) \ - { yychar = (token), yylval = (value); \ + { \ + yychar = (Token); \ + yylval = (Value); \ yychar1 = YYTRANSLATE (yychar); \ YYPOPSTACK; \ goto yybackup; \ } \ else \ - { yyerror ("syntax error: cannot back up"); YYERROR; } \ + { \ + yyerror ("syntax error: cannot back up"); \ + YYERROR; \ + } \ while (0) #define YYTERROR 1 #define YYERRCODE 256 -#ifndef YYPURE -#define YYLEX yylex() + +/* YYLLOC_DEFAULT -- Compute the default location (before the actions + are run). + + When YYLLOC_DEFAULT is run, CURRENT is set the location of the + first token. By default, to implement support for ranges, extend + its range to the last symbol. */ + +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + Current.last_line = Rhs[N].last_line; \ + Current.last_column = Rhs[N].last_column; #endif -#ifdef YYPURE -#ifdef YYLSP_NEEDED -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval, &yylloc) -#endif -#else /* not YYLSP_NEEDED */ -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval) -#endif -#endif /* not YYLSP_NEEDED */ -#endif -/* If nonreentrant, generate the variables here */ +/* YYLEX -- calling `yylex' with the right arguments. */ -#ifndef YYPURE +#if YYPURE +# if YYLSP_NEEDED +# ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) +# else +# define YYLEX yylex (&yylval, &yylloc) +# endif +# else /* !YYLSP_NEEDED */ +# ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, YYLEX_PARAM) +# else +# define YYLEX yylex (&yylval) +# endif +# endif /* !YYLSP_NEEDED */ +#else /* !YYPURE */ +# define YYLEX yylex () +#endif /* !YYPURE */ -int yychar; /* the lookahead symbol */ -YYSTYPE yylval; /* the semantic value of the */ - /* lookahead symbol */ -#ifdef YYLSP_NEEDED -YYLTYPE yylloc; /* location data for the lookahead */ - /* symbol */ -#endif +/* Enable debugging if requested. */ +#if YYDEBUG -int yynerrs; /* number of parse errors so far */ -#endif /* not YYPURE */ +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif -#if YYDEBUG != 0 -int yydebug; /* nonzero means print parse trace */ -/* Since this is uninitialized, it does not stop multiple parsers - from coexisting. */ -#endif - -/* YYINITDEPTH indicates the initial size of the parser's stacks */ +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +#endif /* !YYDEBUG */ +/* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH -#define YYINITDEPTH 200 +# define YYINITDEPTH 200 #endif -/* YYMAXDEPTH is the maximum size the stacks can grow to - (effective only if the built-in stack extension method is used). */ +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). + + Do not make this value too large; the results are undefined if + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ #if YYMAXDEPTH == 0 -#undef YYMAXDEPTH +# undef YYMAXDEPTH #endif #ifndef YYMAXDEPTH -#define YYMAXDEPTH 10000 -#endif - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -int yyparse (void); +# define YYMAXDEPTH 10000 #endif -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) -#else /* not GNU C or C++ */ -#ifndef __cplusplus +#ifdef YYERROR_VERBOSE -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (to, from, count) - char *to; - char *from; - int count; +# ifndef yystrlen +# if defined (__GLIBC__) && defined (_STRING_H) +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +static YYSIZE_T +# if defined (__STDC__) || defined (__cplusplus) +yystrlen (const char *yystr) +# else +yystrlen (yystr) + const char *yystr; +# endif { - register char *f = from; - register char *t = to; - register int i = count; + register const char *yys = yystr; - while (i-- > 0) - *t++ = *f++; + while (*yys++ != '\0') + continue; + + return yys - yystr - 1; } +# endif +# endif -#else /* __cplusplus */ - -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (char *to, char *from, int count) +# ifndef yystpcpy +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +static char * +# if defined (__STDC__) || defined (__cplusplus) +yystpcpy (char *yydest, const char *yysrc) +# else +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +# endif { - register char *f = from; - register char *t = to; - register int i = count; + register char *yyd = yydest; + register const char *yys = yysrc; - while (i-- > 0) - *t++ = *f++; + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; } - -#endif +# endif +# endif #endif -#line 196 "/usr/share/bison.simple" +#line 315 "/usr/share/misc/bison.simple" + /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -566,66 +711,121 @@ __yy_memcpy (char *to, char *from, int count) to the proper pointer type. */ #ifdef YYPARSE_PARAM -#ifdef __cplusplus -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -#define YYPARSE_PARAM_DECL -#else /* not __cplusplus */ -#define YYPARSE_PARAM_ARG YYPARSE_PARAM -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -#endif /* not __cplusplus */ -#else /* not YYPARSE_PARAM */ -#define YYPARSE_PARAM_ARG -#define YYPARSE_PARAM_DECL -#endif /* not YYPARSE_PARAM */ +# if defined (__STDC__) || defined (__cplusplus) +# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM +# define YYPARSE_PARAM_DECL +# else +# define YYPARSE_PARAM_ARG YYPARSE_PARAM +# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; +# endif +#else /* !YYPARSE_PARAM */ +# define YYPARSE_PARAM_ARG +# define YYPARSE_PARAM_DECL +#endif /* !YYPARSE_PARAM */ + +/* Prevent warning if -Wstrict-prototypes. */ +#ifdef __GNUC__ +# ifdef YYPARSE_PARAM +int yyparse (void *); +# else +int yyparse (void); +# endif +#endif + +/* YY_DECL_VARIABLES -- depending whether we use a pure parser, + variables are global, or local to YYPARSE. */ + +#define YY_DECL_NON_LSP_VARIABLES \ +/* The lookahead symbol. */ \ +int yychar; \ + \ +/* The semantic value of the lookahead symbol. */ \ +YYSTYPE yylval; \ + \ +/* Number of parse errors so far. */ \ +int yynerrs; + +#if YYLSP_NEEDED +# define YY_DECL_VARIABLES \ +YY_DECL_NON_LSP_VARIABLES \ + \ +/* Location data for the lookahead symbol. */ \ +YYLTYPE yylloc; +#else +# define YY_DECL_VARIABLES \ +YY_DECL_NON_LSP_VARIABLES +#endif + + +/* If nonreentrant, generate the variables here. */ + +#if !YYPURE +YY_DECL_VARIABLES +#endif /* !YYPURE */ int -yyparse(YYPARSE_PARAM_ARG) +yyparse (YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL { + /* If reentrant, generate the variables here. */ +#if YYPURE + YY_DECL_VARIABLES +#endif /* !YYPURE */ + register int yystate; register int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + /* Lookahead token as an internal (translated) token number. */ + int yychar1 = 0; + + /* Three stacks and their tools: + `yyss': related to states, + `yyvs': related to semantic values, + `yyls': related to locations. + + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; register short *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; register YYSTYPE *yyvsp; - int yyerrstatus; /* number of tokens to shift before error messages enabled */ - int yychar1 = 0; /* lookahead token as an internal (translated) token number */ - short yyssa[YYINITDEPTH]; /* the state stack */ - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ - - short *yyss = yyssa; /* refer to the stacks thru separate pointers */ - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ - -#ifdef YYLSP_NEEDED - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ +#if YYLSP_NEEDED + /* The location stack. */ + YYLTYPE yylsa[YYINITDEPTH]; YYLTYPE *yyls = yylsa; YYLTYPE *yylsp; +#endif -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) +#if YYLSP_NEEDED +# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) #else -#define YYPOPSTACK (yyvsp--, yyssp--) +# define YYPOPSTACK (yyvsp--, yyssp--) #endif - int yystacksize = YYINITDEPTH; + YYSIZE_T yystacksize = YYINITDEPTH; -#ifdef YYPURE - int yychar; - YYSTYPE yylval; - int yynerrs; -#ifdef YYLSP_NEEDED - YYLTYPE yylloc; -#endif + + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; +#if YYLSP_NEEDED + YYLTYPE yyloc; #endif - YYSTYPE yyval; /* the variable used to return */ - /* semantic values from the action */ - /* routines */ - + /* When reducing, the number of symbols on the RHS of the reduced + rule. */ int yylen; -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Starting parse\n"); -#endif + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; @@ -637,96 +837,110 @@ yyparse(YYPARSE_PARAM_ARG) so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss - 1; + yyssp = yyss; yyvsp = yyvs; -#ifdef YYLSP_NEEDED +#if YYLSP_NEEDED yylsp = yyls; #endif + goto yysetstate; -/* Push a new state, which is found in yystate . */ -/* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. */ -yynewstate: +/*------------------------------------------------------------. +| yynewstate -- Push a new state, which is found in yystate. | +`------------------------------------------------------------*/ + yynewstate: + /* In all cases, when you get here, the value and location stacks + have just been pushed. so pushing a state here evens the stacks. + */ + yyssp++; - *++yyssp = yystate; + yysetstate: + *yyssp = yystate; if (yyssp >= yyss + yystacksize - 1) { - /* Give user a chance to reallocate the stack */ - /* Use copies of these so that the &'s don't force the real ones into memory. */ - YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; -#ifdef YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; -#endif - /* Get the current used size of the three stacks, in elements. */ - int size = yyssp - yyss + 1; + YYSIZE_T yysize = yyssp - yyss + 1; #ifdef yyoverflow - /* Each stack pointer address is followed by the size of - the data in use in that stack, in bytes. */ -#ifdef YYLSP_NEEDED - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yyls1, size * sizeof (*yylsp), - &yystacksize); -#else - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yystacksize); -#endif + { + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + short *yyss1 = yyss; - yyss = yyss1; yyvs = yyvs1; -#ifdef YYLSP_NEEDED - yyls = yyls1; -#endif + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. */ +# if YYLSP_NEEDED + YYLTYPE *yyls1 = yyls; + /* This used to be a conditional around just the two extra args, + but that might be undefined if yyoverflow is a macro. */ + yyoverflow ("parser stack overflow", + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yyls1, yysize * sizeof (*yylsp), + &yystacksize); + yyls = yyls1; +# else + yyoverflow ("parser stack overflow", + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); +# endif + yyss = yyss1; + yyvs = yyvs1; + } #else /* no yyoverflow */ +# ifndef YYSTACK_RELOCATE + goto yyoverflowlab; +# else /* Extend the stack our own way. */ if (yystacksize >= YYMAXDEPTH) - { - yyerror("parser stack overflow"); - return 2; - } + goto yyoverflowlab; yystacksize *= 2; if (yystacksize > YYMAXDEPTH) yystacksize = YYMAXDEPTH; - yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp)); - yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp)); -#ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp)); -#endif + + { + short *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyoverflowlab; + YYSTACK_RELOCATE (yyss); + YYSTACK_RELOCATE (yyvs); +# if YYLSP_NEEDED + YYSTACK_RELOCATE (yyls); +# endif +# undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); + } +# endif #endif /* no yyoverflow */ - yyssp = yyss + size - 1; - yyvsp = yyvs + size - 1; -#ifdef YYLSP_NEEDED - yylsp = yyls + size - 1; + yyssp = yyss + yysize - 1; + yyvsp = yyvs + yysize - 1; +#if YYLSP_NEEDED + yylsp = yyls + yysize - 1; #endif -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Stack size increased to %d\n", yystacksize); -#endif + YYDPRINTF ((stderr, "Stack size increased to %lu\n", + (unsigned long int) yystacksize)); if (yyssp >= yyss + yystacksize - 1) YYABORT; } -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Entering state %d\n", yystate); -#endif + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); goto yybackup; - yybackup: + + +/*-----------. +| yybackup. | +`-----------*/ +yybackup: /* Do appropriate processing given the current state. */ /* Read a lookahead token if we need one and don't already have one. */ @@ -745,10 +959,7 @@ yynewstate: if (yychar == YYEMPTY) { -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Reading a token: "); -#endif + YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; } @@ -759,25 +970,25 @@ yynewstate: yychar1 = 0; yychar = YYEOF; /* Don't call YYLEX any more */ -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Now at end of input.\n"); -#endif + YYDPRINTF ((stderr, "Now at end of input.\n")); } else { - yychar1 = YYTRANSLATE(yychar); + yychar1 = YYTRANSLATE (yychar); -#if YYDEBUG != 0 +#if YYDEBUG + /* We have to keep this `#if YYDEBUG', since we use variables + which are defined only if `YYDEBUG' is set. */ if (yydebug) { - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise meaning - of a token, for further debugging info. */ -#ifdef YYPRINT + YYFPRINTF (stderr, "Next token is %d (%s", + yychar, yytname[yychar1]); + /* Give the individual parser a way to print the precise + meaning of a token, for further debugging info. */ +# ifdef YYPRINT YYPRINT (stderr, yychar, yylval); -#endif - fprintf (stderr, ")\n"); +# endif + YYFPRINTF (stderr, ")\n"); } #endif } @@ -809,55 +1020,77 @@ yynewstate: YYACCEPT; /* Shift the lookahead token. */ - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); -#endif + YYDPRINTF ((stderr, "Shifting token %d (%s), ", + yychar, yytname[yychar1])); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) yychar = YYEMPTY; *++yyvsp = yylval; -#ifdef YYLSP_NEEDED +#if YYLSP_NEEDED *++yylsp = yylloc; #endif - /* count tokens shifted since error; after three, turn off error status. */ - if (yyerrstatus) yyerrstatus--; + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; yystate = yyn; goto yynewstate; -/* Do the default action for the current state. */ -yydefault: +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ +yydefault: yyn = yydefact[yystate]; if (yyn == 0) goto yyerrlab; + goto yyreduce; -/* Do a reduction. yyn is the number of a rule to reduce with. */ + +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ yyreduce: + /* yyn is the number of a rule to reduce with. */ yylen = yyr2[yyn]; - if (yylen > 0) - yyval = yyvsp[1-yylen]; /* implement default value of the action */ -#if YYDEBUG != 0 - if (yydebug) - { - int i; + /* If YYLEN is nonzero, implement the default value of the action: + `$$ = $1'. - fprintf (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); + Otherwise, the following line sets YYVAL to the semantic value of + the lookahead token. This behavior is undocumented and Bison + users should not rely upon it. Assigning to YYVAL + unconditionally makes the parser a bit smaller, and it avoids a + GCC warning that YYVAL may be used uninitialized. */ + yyval = yyvsp[1-yylen]; - /* Print the symbols being reduced, and their result. */ - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) - fprintf (stderr, "%s ", yytname[yyrhs[i]]); - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } +#if YYLSP_NEEDED + /* Similarly for the default location. Let the user run additional + commands if for instance locations are ranges. */ + yyloc = yylsp[1-yylen]; + YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); #endif +#if YYDEBUG + /* We have to keep this `#if YYDEBUG', since we use variables which + are defined only if `YYDEBUG' is set. */ + if (yydebug) + { + int yyi; + + YYFPRINTF (stderr, "Reducing via rule %d (line %d), ", + yyn, yyrline[yyn]); + + /* Print the symbols being reduced, and their result. */ + for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++) + YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); + YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]); + } +#endif switch (yyn) { @@ -865,32 +1098,32 @@ case 3: #line 195 "getdate.y" { yyHaveTime++; - ; - break;} + } + break; case 4: #line 198 "getdate.y" { yyHaveZone++; - ; - break;} + } + break; case 5: #line 201 "getdate.y" { yyHaveDate++; - ; - break;} + } + break; case 6: #line 204 "getdate.y" { yyHaveDay++; - ; - break;} + } + break; case 7: #line 207 "getdate.y" { yyHaveRel++; - ; - break;} + } + break; case 9: #line 213 "getdate.y" { @@ -898,8 +1131,8 @@ case 9: yyMinutes = 0; yySeconds = 0; yyMeridian = yyvsp[0].Meridian; - ; - break;} + } + break; case 10: #line 219 "getdate.y" { @@ -907,8 +1140,8 @@ case 10: yyMinutes = yyvsp[-1].Number; yySeconds = 0; yyMeridian = yyvsp[0].Meridian; - ; - break;} + } + break; case 11: #line 225 "getdate.y" { @@ -919,8 +1152,8 @@ case 11: yyTimezone = (yyvsp[0].Number < 0 ? -yyvsp[0].Number % 100 + (-yyvsp[0].Number / 100) * 60 : - (yyvsp[0].Number % 100 + (yyvsp[0].Number / 100) * 60)); - ; - break;} + } + break; case 12: #line 234 "getdate.y" { @@ -928,8 +1161,8 @@ case 12: yyMinutes = yyvsp[-3].Number; yySeconds = yyvsp[-1].Number; yyMeridian = yyvsp[0].Meridian; - ; - break;} + } + break; case 13: #line 240 "getdate.y" { @@ -941,54 +1174,54 @@ case 13: yyTimezone = (yyvsp[0].Number < 0 ? -yyvsp[0].Number % 100 + (-yyvsp[0].Number / 100) * 60 : - (yyvsp[0].Number % 100 + (yyvsp[0].Number / 100) * 60)); - ; - break;} + } + break; case 14: #line 252 "getdate.y" { yyTimezone = yyvsp[0].Number; - ; - break;} + } + break; case 15: #line 255 "getdate.y" { yyTimezone = yyvsp[0].Number - 60; - ; - break;} + } + break; case 16: #line 259 "getdate.y" { yyTimezone = yyvsp[-1].Number - 60; - ; - break;} + } + break; case 17: #line 264 "getdate.y" { yyDayOrdinal = 1; yyDayNumber = yyvsp[0].Number; - ; - break;} + } + break; case 18: #line 268 "getdate.y" { yyDayOrdinal = 1; yyDayNumber = yyvsp[-1].Number; - ; - break;} + } + break; case 19: #line 272 "getdate.y" { yyDayOrdinal = yyvsp[-1].Number; yyDayNumber = yyvsp[0].Number; - ; - break;} + } + break; case 20: #line 278 "getdate.y" { yyMonth = yyvsp[-2].Number; yyDay = yyvsp[0].Number; - ; - break;} + } + break; case 21: #line 282 "getdate.y" { @@ -1008,8 +1241,8 @@ case 21: yyDay = yyvsp[-2].Number; yyYear = yyvsp[0].Number; } - ; - break;} + } + break; case 22: #line 300 "getdate.y" { @@ -1017,8 +1250,8 @@ case 22: yyYear = yyvsp[-2].Number; yyMonth = -yyvsp[-1].Number; yyDay = -yyvsp[0].Number; - ; - break;} + } + break; case 23: #line 306 "getdate.y" { @@ -1026,38 +1259,38 @@ case 23: yyDay = yyvsp[-2].Number; yyMonth = yyvsp[-1].Number; yyYear = -yyvsp[0].Number; - ; - break;} + } + break; case 24: #line 312 "getdate.y" { yyMonth = yyvsp[-1].Number; yyDay = yyvsp[0].Number; - ; - break;} + } + break; case 25: #line 316 "getdate.y" { yyMonth = yyvsp[-3].Number; yyDay = yyvsp[-2].Number; yyYear = yyvsp[0].Number; - ; - break;} + } + break; case 26: #line 321 "getdate.y" { yyMonth = yyvsp[0].Number; yyDay = yyvsp[-1].Number; - ; - break;} + } + break; case 27: #line 325 "getdate.y" { yyMonth = yyvsp[-1].Number; yyDay = yyvsp[-2].Number; yyYear = yyvsp[0].Number; - ; - break;} + } + break; case 28: #line 332 "getdate.y" { @@ -1067,116 +1300,116 @@ case 28: yyRelDay = -yyRelDay; yyRelMonth = -yyRelMonth; yyRelYear = -yyRelYear; - ; - break;} + } + break; case 30: #line 343 "getdate.y" { yyRelYear += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 31: #line 346 "getdate.y" { yyRelYear += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 32: #line 349 "getdate.y" { yyRelYear++; - ; - break;} + } + break; case 33: #line 352 "getdate.y" { yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 34: #line 355 "getdate.y" { yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 35: #line 358 "getdate.y" { yyRelMonth++; - ; - break;} + } + break; case 36: #line 361 "getdate.y" { yyRelDay += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 37: #line 364 "getdate.y" { yyRelDay += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 38: #line 367 "getdate.y" { yyRelDay++; - ; - break;} + } + break; case 39: #line 370 "getdate.y" { yyRelHour += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 40: #line 373 "getdate.y" { yyRelHour += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 41: #line 376 "getdate.y" { yyRelHour++; - ; - break;} + } + break; case 42: #line 379 "getdate.y" { yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 43: #line 382 "getdate.y" { yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 44: #line 385 "getdate.y" { yyRelMinutes++; - ; - break;} + } + break; case 45: #line 388 "getdate.y" { yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 46: #line 391 "getdate.y" { yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} + } + break; case 47: #line 394 "getdate.y" { yyRelSeconds++; - ; - break;} + } + break; case 48: #line 400 "getdate.y" { @@ -1208,64 +1441,50 @@ case 48: yyMeridian = MER24; } } - ; - break;} + } + break; case 49: #line 433 "getdate.y" { yyval.Meridian = MER24; - ; - break;} + } + break; case 50: #line 437 "getdate.y" { yyval.Meridian = yyvsp[0].Meridian; - ; - break;} + } + break; } - /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/share/bison.simple" + +#line 705 "/usr/share/misc/bison.simple" + yyvsp -= yylen; yyssp -= yylen; -#ifdef YYLSP_NEEDED +#if YYLSP_NEEDED yylsp -= yylen; #endif -#if YYDEBUG != 0 +#if YYDEBUG if (yydebug) { - short *ssp1 = yyss - 1; - fprintf (stderr, "state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); + short *yyssp1 = yyss - 1; + YYFPRINTF (stderr, "state stack now"); + while (yyssp1 != yyssp) + YYFPRINTF (stderr, " %d", *++yyssp1); + YYFPRINTF (stderr, "\n"); } #endif *++yyvsp = yyval; - -#ifdef YYLSP_NEEDED - yylsp++; - if (yylen == 0) - { - yylsp->first_line = yylloc.first_line; - yylsp->first_column = yylloc.first_column; - yylsp->last_line = (yylsp-1)->last_line; - yylsp->last_column = (yylsp-1)->last_column; - yylsp->text = 0; - } - else - { - yylsp->last_line = (yylsp+yylen-1)->last_line; - yylsp->last_column = (yylsp+yylen-1)->last_column; - } +#if YYLSP_NEEDED + *++yylsp = yyloc; #endif - /* Now "shift" the result of the reduction. - Determine what state that goes to, - based on the state we popped back to - and the rule number reduced by. */ + /* Now `shift' the result of the reduction. Determine what state + that goes to, based on the state we popped back to and the rule + number reduced by. */ yyn = yyr1[yyn]; @@ -1277,10 +1496,13 @@ case 50: goto yynewstate; -yyerrlab: /* here on detecting error */ - if (! yyerrstatus) - /* If not already recovering from an error, report this error. */ +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ +yyerrlab: + /* If not already recovering from an error, report this error. */ + if (!yyerrstatus) { ++yynerrs; @@ -1289,102 +1511,121 @@ yyerrlab: /* here on detecting error */ if (yyn > YYFLAG && yyn < YYLAST) { - int size = 0; - char *msg; - int x, count; + YYSIZE_T yysize = 0; + char *yymsg; + int yyx, yycount; - count = 0; - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - size += strlen(yytname[x]) + 15, count++; - msg = (char *) malloc(size + 15); - if (msg != 0) + yycount = 0; + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) + if (yycheck[yyx + yyn] == yyx) + yysize += yystrlen (yytname[yyx]) + 15, yycount++; + yysize += yystrlen ("parse error, unexpected ") + 1; + yysize += yystrlen (yytname[YYTRANSLATE (yychar)]); + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg != 0) { - strcpy(msg, "parse error"); + char *yyp = yystpcpy (yymsg, "parse error, unexpected "); + yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]); - if (count < 5) + if (yycount < 5) { - count = 0; - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) + yycount = 0; + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); + yyx++) + if (yycheck[yyx + yyn] == yyx) { - strcat(msg, count == 0 ? ", expecting `" : " or `"); - strcat(msg, yytname[x]); - strcat(msg, "'"); - count++; + const char *yyq = ! yycount ? ", expecting " : " or "; + yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yytname[yyx]); + yycount++; } } - yyerror(msg); - free(msg); + yyerror (yymsg); + YYSTACK_FREE (yymsg); } else - yyerror ("parse error; also virtual memory exceeded"); + yyerror ("parse error; also virtual memory exhausted"); } else -#endif /* YYERROR_VERBOSE */ - yyerror("parse error"); +#endif /* defined (YYERROR_VERBOSE) */ + yyerror ("parse error"); } - goto yyerrlab1; -yyerrlab1: /* here on error raised explicitly by an action */ + +/*--------------------------------------------------. +| yyerrlab1 -- error raised explicitly by an action | +`--------------------------------------------------*/ +yyerrlab1: if (yyerrstatus == 3) { - /* if just tried and failed to reuse lookahead token after an error, discard it. */ + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ /* return failure if at end of input */ if (yychar == YYEOF) YYABORT; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); -#endif - + YYDPRINTF ((stderr, "Discarding token %d (%s).\n", + yychar, yytname[yychar1])); yychar = YYEMPTY; } - /* Else will try to reuse lookahead token - after shifting the error token. */ + /* Else will try to reuse lookahead token after shifting the error + token. */ yyerrstatus = 3; /* Each real token shifted decrements this */ goto yyerrhandle; -yyerrdefault: /* current state does not do anything special for the error token. */ +/*-------------------------------------------------------------------. +| yyerrdefault -- current state does not do anything special for the | +| error token. | +`-------------------------------------------------------------------*/ +yyerrdefault: #if 0 /* This is wrong; only states that explicitly want error tokens should shift them. */ - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ - if (yyn) goto yydefault; + + /* If its default is to accept any token, ok. Otherwise pop it. */ + yyn = yydefact[yystate]; + if (yyn) + goto yydefault; #endif -yyerrpop: /* pop the current state because it cannot handle the error token */ - if (yyssp == yyss) YYABORT; +/*---------------------------------------------------------------. +| yyerrpop -- pop the current state because it cannot handle the | +| error token | +`---------------------------------------------------------------*/ +yyerrpop: + if (yyssp == yyss) + YYABORT; yyvsp--; yystate = *--yyssp; -#ifdef YYLSP_NEEDED +#if YYLSP_NEEDED yylsp--; #endif -#if YYDEBUG != 0 +#if YYDEBUG if (yydebug) { - short *ssp1 = yyss - 1; - fprintf (stderr, "Error: state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); + short *yyssp1 = yyss - 1; + YYFPRINTF (stderr, "Error: state stack now"); + while (yyssp1 != yyssp) + YYFPRINTF (stderr, " %d", *++yyssp1); + YYFPRINTF (stderr, "\n"); } #endif +/*--------------. +| yyerrhandle. | +`--------------*/ yyerrhandle: - yyn = yypact[yystate]; if (yyn == YYFLAG) goto yyerrdefault; @@ -1407,18 +1648,45 @@ yyerrhandle: if (yyn == YYFINAL) YYACCEPT; -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting error token, "); -#endif + YYDPRINTF ((stderr, "Shifting error token, ")); *++yyvsp = yylval; -#ifdef YYLSP_NEEDED +#if YYLSP_NEEDED *++yylsp = yylloc; #endif yystate = yyn; goto yynewstate; + + +/*-------------------------------------. +| yyacceptlab -- YYACCEPT comes here. | +`-------------------------------------*/ +yyacceptlab: + yyresult = 0; + goto yyreturn; + +/*-----------------------------------. +| yyabortlab -- YYABORT comes here. | +`-----------------------------------*/ +yyabortlab: + yyresult = 1; + goto yyreturn; + +/*---------------------------------------------. +| yyoverflowab -- parser overflow comes here. | +`---------------------------------------------*/ +yyoverflowlab: + yyerror ("parser stack overflow"); + yyresult = 2; + /* Fall through. */ + +yyreturn: +#ifndef yyoverflow + if (yyss != yyssa) + YYSTACK_FREE (yyss); +#endif + return yyresult; } #line 442 "getdate.y" @@ -1501,17 +1769,6 @@ static TABLE const TimezoneTable[] = { { "bst", tDAYZONE, HOUR ( 0) }, /* British Summer */ { "wat", tZONE, HOUR ( 1) }, /* West Africa */ { "at", tZONE, HOUR ( 2) }, /* Azores */ -#if 0 - /* For completeness. BST is also British Summer, and GST is - * also Guam Standard. */ - { "bst", tZONE, HOUR ( 3) }, /* Brazil Standard */ - { "gst", tZONE, HOUR ( 3) }, /* Greenland Standard */ -#endif -#if 0 - { "nft", tZONE, HOUR (3.5) }, /* Newfoundland */ - { "nst", tZONE, HOUR (3.5) }, /* Newfoundland Standard */ - { "ndt", tDAYZONE, HOUR (3.5) }, /* Newfoundland Daylight */ -#endif { "ast", tZONE, HOUR ( 4) }, /* Atlantic Standard */ { "adt", tDAYZONE, HOUR ( 4) }, /* Atlantic Daylight */ { "est", tZONE, HOUR ( 5) }, /* Eastern Standard */ @@ -1541,32 +1798,13 @@ static TABLE const TimezoneTable[] = { { "fst", tDAYZONE, -HOUR (1) }, /* French Summer */ { "eet", tZONE, -HOUR (2) }, /* Eastern Europe, USSR Zone 1 */ { "bt", tZONE, -HOUR (3) }, /* Baghdad, USSR Zone 2 */ -#if 0 - { "it", tZONE, -HOUR (3.5) },/* Iran */ -#endif { "zp4", tZONE, -HOUR (4) }, /* USSR Zone 3 */ { "zp5", tZONE, -HOUR (5) }, /* USSR Zone 4 */ -#if 0 - { "ist", tZONE, -HOUR (5.5) },/* Indian Standard */ -#endif { "zp6", tZONE, -HOUR (6) }, /* USSR Zone 5 */ -#if 0 - /* For completeness. NST is also Newfoundland Standard, and SST is - * also Swedish Summer. */ - { "nst", tZONE, -HOUR (6.5) },/* North Sumatra */ - { "sst", tZONE, -HOUR (7) }, /* South Sumatra, USSR Zone 6 */ -#endif /* 0 */ { "wast", tZONE, -HOUR (7) }, /* West Australian Standard */ { "wadt", tDAYZONE, -HOUR (7) }, /* West Australian Daylight */ -#if 0 - { "jt", tZONE, -HOUR (7.5) },/* Java (3pm in Cronusland!) */ -#endif { "cct", tZONE, -HOUR (8) }, /* China Coast, USSR Zone 7 */ { "jst", tZONE, -HOUR (9) }, /* Japan Standard, USSR Zone 8 */ -#if 0 - { "cast", tZONE, -HOUR (9.5) },/* Central Australian Standard */ - { "cadt", tDAYZONE, -HOUR (9.5) },/* Central Australian Daylight */ -#endif { "east", tZONE, -HOUR (10) }, /* Eastern Australian Standard */ { "eadt", tDAYZONE, -HOUR (10) }, /* Eastern Australian Daylight */ { "gst", tZONE, -HOUR (10) }, /* Guam Standard, USSR Zone 9 */ diff --git a/libmisc/getdate.y b/libmisc/getdate.y index d33fa063..637bb15d 100644 --- a/libmisc/getdate.y +++ b/libmisc/getdate.y @@ -519,17 +519,6 @@ static TABLE const TimezoneTable[] = { { "bst", tDAYZONE, HOUR ( 0) }, /* British Summer */ { "wat", tZONE, HOUR ( 1) }, /* West Africa */ { "at", tZONE, HOUR ( 2) }, /* Azores */ -#if 0 - /* For completeness. BST is also British Summer, and GST is - * also Guam Standard. */ - { "bst", tZONE, HOUR ( 3) }, /* Brazil Standard */ - { "gst", tZONE, HOUR ( 3) }, /* Greenland Standard */ -#endif -#if 0 - { "nft", tZONE, HOUR (3.5) }, /* Newfoundland */ - { "nst", tZONE, HOUR (3.5) }, /* Newfoundland Standard */ - { "ndt", tDAYZONE, HOUR (3.5) }, /* Newfoundland Daylight */ -#endif { "ast", tZONE, HOUR ( 4) }, /* Atlantic Standard */ { "adt", tDAYZONE, HOUR ( 4) }, /* Atlantic Daylight */ { "est", tZONE, HOUR ( 5) }, /* Eastern Standard */ @@ -559,32 +548,13 @@ static TABLE const TimezoneTable[] = { { "fst", tDAYZONE, -HOUR (1) }, /* French Summer */ { "eet", tZONE, -HOUR (2) }, /* Eastern Europe, USSR Zone 1 */ { "bt", tZONE, -HOUR (3) }, /* Baghdad, USSR Zone 2 */ -#if 0 - { "it", tZONE, -HOUR (3.5) },/* Iran */ -#endif { "zp4", tZONE, -HOUR (4) }, /* USSR Zone 3 */ { "zp5", tZONE, -HOUR (5) }, /* USSR Zone 4 */ -#if 0 - { "ist", tZONE, -HOUR (5.5) },/* Indian Standard */ -#endif { "zp6", tZONE, -HOUR (6) }, /* USSR Zone 5 */ -#if 0 - /* For completeness. NST is also Newfoundland Standard, and SST is - * also Swedish Summer. */ - { "nst", tZONE, -HOUR (6.5) },/* North Sumatra */ - { "sst", tZONE, -HOUR (7) }, /* South Sumatra, USSR Zone 6 */ -#endif /* 0 */ { "wast", tZONE, -HOUR (7) }, /* West Australian Standard */ { "wadt", tDAYZONE, -HOUR (7) }, /* West Australian Daylight */ -#if 0 - { "jt", tZONE, -HOUR (7.5) },/* Java (3pm in Cronusland!) */ -#endif { "cct", tZONE, -HOUR (8) }, /* China Coast, USSR Zone 7 */ { "jst", tZONE, -HOUR (9) }, /* Japan Standard, USSR Zone 8 */ -#if 0 - { "cast", tZONE, -HOUR (9.5) },/* Central Australian Standard */ - { "cadt", tDAYZONE, -HOUR (9.5) },/* Central Australian Daylight */ -#endif { "east", tZONE, -HOUR (10) }, /* Eastern Australian Standard */ { "eadt", tDAYZONE, -HOUR (10) }, /* Eastern Australian Daylight */ { "gst", tZONE, -HOUR (10) }, /* Guam Standard, USSR Zone 9 */ diff --git a/libmisc/hushed.c b/libmisc/hushed.c index fbc7a19d..eca1d709 100644 --- a/libmisc/hushed.c +++ b/libmisc/hushed.c @@ -30,24 +30,20 @@ #include #include "rcsid.h" -RCSID("$Id: hushed.c,v 1.4 2000/08/26 18:27:17 marekm Exp $") - +RCSID ("$Id: hushed.c,v 1.5 2003/04/22 10:59:22 kloczek Exp $") #include #include #include "defines.h" #include "prototypes.h" #include "getdef.h" #include - /* * hushed - determine if a user receives login messages * * Look in the hushed-logins file (or user's home directory) to see * if the user is to receive the login-time messages. */ - -int -hushed(const struct passwd *pw) +int hushed (const struct passwd *pw) { char *hushfile; char buf[BUFSIZ]; @@ -59,7 +55,7 @@ hushed(const struct passwd *pw) * defined, default to a noisy login. */ - if ( (hushfile=getdef_str("HUSHLOGIN_FILE")) == NULL ) + if ((hushfile = getdef_str ("HUSHLOGIN_FILE")) == NULL) return 0; /* @@ -68,8 +64,9 @@ hushed(const struct passwd *pw) */ if (hushfile[0] != '/') { - snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, hushfile); - return (access(buf, F_OK) == 0); + snprintf (buf, sizeof (buf), "%s/%s", pw->pw_dir, + hushfile); + return (access (buf, F_OK) == 0); } /* @@ -77,14 +74,15 @@ hushed(const struct passwd *pw) * and see if this user is in there. */ - if ((fp = fopen(hushfile, "r")) == NULL) + if ((fp = fopen (hushfile, "r")) == NULL) return 0; - for (found = 0;! found && fgets (buf, sizeof buf, fp);) { + for (found = 0; !found && fgets (buf, sizeof buf, fp);) { buf[strlen (buf) - 1] = '\0'; - found = ! strcmp (buf, - buf[0] == '/' ? pw->pw_shell:pw->pw_name); + found = !strcmp (buf, + buf[0] == + '/' ? pw->pw_shell : pw->pw_name); } - (void) fclose(fp); + (void) fclose (fp); return found; } diff --git a/libmisc/isexpired.c b/libmisc/isexpired.c index 4894dc8a..ad79467c 100644 --- a/libmisc/isexpired.c +++ b/libmisc/isexpired.c @@ -41,7 +41,7 @@ #include #include "rcsid.h" -RCSID("$Id: isexpired.c,v 1.9 2002/01/06 14:02:39 kloczek Exp $") +RCSID ("$Id: isexpired.c,v 1.11 2003/05/03 16:14:33 kloczek Exp $") /* * isexpired - determine if account is expired yet @@ -49,18 +49,16 @@ RCSID("$Id: isexpired.c,v 1.9 2002/01/06 14:02:39 kloczek Exp $") * isexpired calculates the expiration date based on the * password expiration criteria. */ - -/*ARGSUSED*/ - + /*ARGSUSED*/ #ifdef SHADOWPWD -int -isexpired(const struct passwd *pw, const struct spwd *sp) +int isexpired (const struct passwd *pw, const struct spwd *sp) { - long now; + long now; + now = time ((time_t *) 0) / SCALE; if (!sp) - sp = pwd_to_spwd(pw); + sp = pwd_to_spwd (pw); /* * Quick and easy - there is an expired account field @@ -79,11 +77,12 @@ isexpired(const struct passwd *pw, const struct spwd *sp) * if /etc/shadow doesn't exist, getspnam() still succeeds and * returns sp_lstchg==0 (must change password) instead of -1! */ - if (sp->sp_lstchg == 0 && !strcmp(pw->pw_passwd, SHADOW_PASSWD_STRING)) + if (sp->sp_lstchg == 0 + && !strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING)) return 1; if (sp->sp_lstchg > 0 && sp->sp_max >= 0 && sp->sp_inact >= 0 && - now >= sp->sp_lstchg + sp->sp_max + sp->sp_inact) + now >= sp->sp_lstchg + sp->sp_max + sp->sp_inact) return 2; /* @@ -93,12 +92,8 @@ isexpired(const struct passwd *pw, const struct spwd *sp) */ if (sp->sp_lstchg == -1 || - sp->sp_max == -1 || sp->sp_max >= (10000L*DAY/SCALE)) + sp->sp_max == -1 || sp->sp_max >= (10000L * DAY / SCALE)) return 0; -#ifdef ATT_AGE - if (pw->pw_age[0] == '\0' || pw->pw_age[0] == '/') - return 0; -#endif /* * Calculate today's day and the day on which the password @@ -108,10 +103,6 @@ isexpired(const struct passwd *pw, const struct spwd *sp) if (now >= sp->sp_lstchg + sp->sp_max) return 1; -#ifdef ATT_AGE - if (a64l (pw->pw_age + 2) + c64i (pw->pw_age[1]) < now / 7) - return 1; -#endif return 0; } -#endif /* SHADOWPWD */ +#endif /* SHADOWPWD */ diff --git a/libmisc/limits.c b/libmisc/limits.c index e17817ea..458d92b1 100644 --- a/libmisc/limits.c +++ b/libmisc/limits.c @@ -35,32 +35,24 @@ #include #include "rcsid.h" -RCSID("$Id: limits.c,v 1.10 1999/08/27 19:02:51 marekm Exp $") - +RCSID ("$Id: limits.c,v 1.14 2003/05/05 21:44:15 kloczek Exp $") #include #include - #include - #include "prototypes.h" #include "defines.h" #include #include "getdef.h" - #ifdef HAVE_SYS_RESOURCE_H #include #define LIMITS #endif - #ifdef LIMITS - #ifndef LIMITS_FILE #define LIMITS_FILE "/etc/limits" #endif - #define LOGIN_ERROR_RLIMIT 1 #define LOGIN_ERROR_LOGIN 2 - /* Set a limit on a resource */ /* * rlimit - RLIMIT_XXXX @@ -68,94 +60,105 @@ RCSID("$Id: limits.c,v 1.10 1999/08/27 19:02:51 marekm Exp $") * multiplier - value*multiplier is the actual limit */ static int -setrlimit_value(unsigned int rlimit, const char *value, unsigned int multiplier) +setrlimit_value (unsigned int rlimit, const char *value, + unsigned int multiplier) { struct rlimit rlim; long limit; char **endptr = (char **) &value; const char *value_orig = value; - limit = strtol(value, endptr, 10); - if (limit == 0 && value_orig == *endptr) /* no chars read */ + limit = strtol (value, endptr, 10); + if (limit == 0 && value_orig == *endptr) /* no chars read */ return 0; limit *= multiplier; rlim.rlim_cur = limit; rlim.rlim_max = limit; - if (setrlimit(rlimit, &rlim)) + if (setrlimit (rlimit, &rlim)) return LOGIN_ERROR_RLIMIT; return 0; } -static int -set_prio(const char *value) +static int set_prio (const char *value) { int prio; char **endptr = (char **) &value; - prio = strtol(value, endptr, 10); + prio = strtol (value, endptr, 10); if ((prio == 0) && (value == *endptr)) return 0; - if (setpriority(PRIO_PROCESS, 0, prio)) + if (setpriority (PRIO_PROCESS, 0, prio)) return LOGIN_ERROR_RLIMIT; return 0; } -static int -set_umask(const char *value) +static int set_umask (const char *value) { mode_t mask; char **endptr = (char **) &value; - mask = strtol(value, endptr, 8) & 0777; + mask = strtol (value, endptr, 8) & 0777; if ((mask == 0) && (value == *endptr)) return 0; - umask(mask); + umask (mask); return 0; } /* Counts the number of user logins and check against the limit */ -static int -check_logins(const char *name, const char *maxlogins) +static int check_logins (const char *name, const char *maxlogins) { +#if HAVE_UTMPX_H + struct utmpx *ut; +#else struct utmp *ut; +#endif unsigned int limit, count; char **endptr = (char **) &maxlogins; const char *ml_orig = maxlogins; - limit = strtol(maxlogins, endptr, 10); - if (limit == 0 && ml_orig == *endptr) /* no chars read */ + limit = strtol (maxlogins, endptr, 10); + if (limit == 0 && ml_orig == *endptr) /* no chars read */ return 0; - if (limit == 0) /* maximum 0 logins ? */ { - SYSLOG((LOG_WARN, "No logins allowed for `%s'\n", name)); + if (limit == 0) { /* maximum 0 logins ? */ + SYSLOG ((LOG_WARN, "No logins allowed for `%s'\n", name)); return LOGIN_ERROR_LOGIN; } - setutent(); count = 0; - while ((ut = getutent())) { +#if HAVE_UTMPX_H + setutxent (); + while ((ut = getutxent ())) { +#else + setutent (); + while ((ut = getutent ())) { +#endif #ifdef USER_PROCESS if (ut->ut_type != USER_PROCESS) continue; #endif if (ut->ut_user[0] == '\0') continue; - if (strncmp(name, ut->ut_user, sizeof(ut->ut_user)) != 0) + if (strncmp (name, ut->ut_user, sizeof (ut->ut_user)) != 0) continue; if (++count > limit) break; } - endutent(); +#if HAVE_UTMPX_H + endutxent (); +#else + endutent (); +#endif /* * This is called after setutmp(), so the number of logins counted * includes the user who is currently trying to log in. */ if (count > limit) { - SYSLOG((LOG_WARN, "Too many logins (max %d) for %s\n", - limit, name)); + SYSLOG ((LOG_WARN, "Too many logins (max %d) for %s\n", + limit, name)); return LOGIN_ERROR_LOGIN; } return 0; @@ -191,103 +194,103 @@ check_logins(const char *name, const char *maxlogins) * buf - the limits string * name - the username */ -static int -do_user_limits(const char *buf, const char *name) +static int do_user_limits (const char *buf, const char *name) { const char *pp; int retval = 0; pp = buf; - while (*pp != '\0') switch(*pp++) { + while (*pp != '\0') + switch (*pp++) { #ifdef RLIMIT_AS case 'a': case 'A': /* RLIMIT_AS - max address space (KB) */ - retval |= setrlimit_value(RLIMIT_AS, pp, 1024); + retval |= setrlimit_value (RLIMIT_AS, pp, 1024); #endif #ifdef RLIMIT_CPU case 't': case 'T': /* RLIMIT_CPU - max CPU time (MIN) */ - retval |= setrlimit_value(RLIMIT_CPU, pp, 60); + retval |= setrlimit_value (RLIMIT_CPU, pp, 60); break; #endif #ifdef RLIMIT_DATA case 'd': case 'D': /* RLIMIT_DATA - max data size (KB) */ - retval |= setrlimit_value(RLIMIT_DATA, pp, 1024); + retval |= setrlimit_value (RLIMIT_DATA, pp, 1024); break; #endif #ifdef RLIMIT_FSIZE case 'f': case 'F': /* RLIMIT_FSIZE - Maximum filesize (KB) */ - retval |= setrlimit_value(RLIMIT_FSIZE, pp, 1024); + retval |= setrlimit_value (RLIMIT_FSIZE, pp, 1024); break; #endif #ifdef RLIMIT_NPROC case 'u': case 'U': /* RLIMIT_NPROC - max number of processes */ - retval |= setrlimit_value(RLIMIT_NPROC, pp, 1); + retval |= setrlimit_value (RLIMIT_NPROC, pp, 1); break; #endif #ifdef RLIMIT_CORE case 'c': case 'C': /* RLIMIT_CORE - max core file size (KB) */ - retval |= setrlimit_value(RLIMIT_CORE, pp, 1024); + retval |= setrlimit_value (RLIMIT_CORE, pp, 1024); break; #endif #ifdef RLIMIT_MEMLOCK case 'm': case 'M': - /* RLIMIT_MEMLOCK - max locked-in-memory address space (KB) */ - retval |= setrlimit_value(RLIMIT_MEMLOCK, pp, 1024); + /* RLIMIT_MEMLOCK - max locked-in-memory address space (KB) */ + retval |= + setrlimit_value (RLIMIT_MEMLOCK, pp, 1024); break; #endif #ifdef RLIMIT_NOFILE case 'n': case 'N': /* RLIMIT_NOFILE - max number of open files */ - retval |= setrlimit_value(RLIMIT_NOFILE, pp, 1); + retval |= setrlimit_value (RLIMIT_NOFILE, pp, 1); break; #endif #ifdef RLIMIT_RSS case 'r': case 'R': /* RLIMIT_RSS - max resident set size (KB) */ - retval |= setrlimit_value(RLIMIT_RSS, pp, 1024); + retval |= setrlimit_value (RLIMIT_RSS, pp, 1024); break; #endif #ifdef RLIMIT_STACK case 's': case 'S': /* RLIMIT_STACK - max stack size (KB) */ - retval |= setrlimit_value(RLIMIT_STACK, pp, 1024); + retval |= setrlimit_value (RLIMIT_STACK, pp, 1024); break; #endif case 'k': case 'K': - retval |= set_umask(pp); + retval |= set_umask (pp); break; case 'l': case 'L': /* LIMIT the number of concurent logins */ - retval |= check_logins(name, pp); + retval |= check_logins (name, pp); break; case 'p': case 'P': - retval |= set_prio(pp); + retval |= set_prio (pp); break; - } + } return retval; } -static int -setup_user_limits(const char *uname) +static int setup_user_limits (const char *uname) { /* TODO: allow and use @group syntax --cristiang */ FILE *fil; @@ -298,28 +301,25 @@ setup_user_limits(const char *uname) char tempbuf[1024]; /* init things */ - memzero(buf, sizeof(buf)); - memzero(name, sizeof(name)); - memzero(limits, sizeof(limits)); - memzero(deflimits, sizeof(deflimits)); - memzero(tempbuf, sizeof(tempbuf)); + memzero (buf, sizeof (buf)); + memzero (name, sizeof (name)); + memzero (limits, sizeof (limits)); + memzero (deflimits, sizeof (deflimits)); + memzero (tempbuf, sizeof (tempbuf)); /* start the checks */ - fil = fopen(LIMITS_FILE, "r"); + fil = fopen (LIMITS_FILE, "r"); if (fil == NULL) { -#if 0 /* no limits file is ok, not everyone is a BOFH :-). --marekm */ - SYSLOG((LOG_WARN, NO_LIMITS, uname, LIMITS_FILE)); -#endif return 0; } /* The limits file have the following format: * - '#' (comment) chars only as first chars on a line; * - username must start on first column * A better (smarter) checking should be done --cristiang */ - while (fgets(buf, 1024, fil) != NULL) { - if (buf[0]=='#' || buf[0]=='\n') + while (fgets (buf, 1024, fil) != NULL) { + if (buf[0] == '#' || buf[0] == '\n') continue; - memzero(tempbuf, sizeof(tempbuf)); + memzero (tempbuf, sizeof (tempbuf)); /* a valid line should have a username, then spaces, * then limits * we allow the format: @@ -328,30 +328,29 @@ setup_user_limits(const char *uname) * Imposing a limit should be done with care, so a wrong * entry means no care anyway :-). A '-' as a limits * strings means no limits --cristiang */ - if (sscanf(buf, "%s%[ACDFMNRSTULPacdfmnrstulp0-9 \t-]", - name, tempbuf) == 2) { - if (strcmp(name, uname) == 0) { - strcpy(limits, tempbuf); + if (sscanf (buf, "%s%[ACDFMNRSTULPacdfmnrstulp0-9 \t-]", + name, tempbuf) == 2) { + if (strcmp (name, uname) == 0) { + strcpy (limits, tempbuf); break; - } else if (strcmp(name, "*") == 0) { - strcpy(deflimits, tempbuf); + } else if (strcmp (name, "*") == 0) { + strcpy (deflimits, tempbuf); } } } - fclose(fil); + fclose (fil); if (limits[0] == '\0') { /* no user specific limits */ - if (deflimits[0] == '\0') /* no default limits */ + if (deflimits[0] == '\0') /* no default limits */ return 0; - strcpy(limits, deflimits); /* use the default limits */ + strcpy (limits, deflimits); /* use the default limits */ } - return do_user_limits(limits, uname); + return do_user_limits (limits, uname); } -#endif /* LIMITS */ +#endif /* LIMITS */ -static void -setup_usergroups(const struct passwd *info) +static void setup_usergroups (const struct passwd *info) { const struct group *grp; mode_t oldmask; @@ -362,10 +361,10 @@ setup_usergroups(const struct passwd *info) * (examples: 022 -> 002, 077 -> 007). */ if (info->pw_uid != 0 && info->pw_uid == info->pw_gid) { - grp = getgrgid(info->pw_gid); - if (grp && (strcmp(info->pw_name, grp->gr_name) == 0)) { - oldmask = umask(0777); - umask((oldmask & ~070) | ((oldmask >> 3) & 070)); + grp = getgrgid (info->pw_gid); + if (grp && (strcmp (info->pw_name, grp->gr_name) == 0)) { + oldmask = umask (0777); + umask ((oldmask & ~070) | ((oldmask >> 3) & 070)); } } } @@ -374,15 +373,14 @@ setup_usergroups(const struct passwd *info) * set the process nice, ulimit, and umask from the password file entry */ -void -setup_limits(const struct passwd *info) +void setup_limits (const struct passwd *info) { - char *cp; - int i; - long l; + char *cp; + int i; + long l; - if (getdef_bool("USERGROUPS_ENAB")) - setup_usergroups(info); + if (getdef_bool ("USERGROUPS_ENAB")) + setup_usergroups (info); /* * See if the GECOS field contains values for NICE, UMASK or ULIMIT. @@ -390,16 +388,18 @@ setup_limits(const struct passwd *info) * values the defaults for this login session. */ - if (getdef_bool("QUOTAS_ENAB")) { + if (getdef_bool ("QUOTAS_ENAB")) { #ifdef LIMITS if (info->pw_uid != 0) - if (setup_user_limits(info->pw_name) & LOGIN_ERROR_LOGIN) { - fprintf(stderr, _("Too many logins.\n")); - sleep(2); - exit(1); - } + if (setup_user_limits (info->pw_name) & + LOGIN_ERROR_LOGIN) { + fprintf (stderr, _("Too many logins.\n")); + sleep (2); + exit (1); + } #endif - for (cp = info->pw_gecos ; cp != NULL ; cp = strchr (cp, ',')) { + for (cp = info->pw_gecos; cp != NULL; + cp = strchr (cp, ',')) { if (*cp == ',') cp++; @@ -412,7 +412,7 @@ setup_limits(const struct passwd *info) } if (strncmp (cp, "ulimit=", 7) == 0) { l = strtol (cp + 7, (char **) 0, 10); - set_filesize_limit(l); + set_filesize_limit (l); continue; } if (strncmp (cp, "umask=", 6) == 0) { diff --git a/libmisc/list.c b/libmisc/list.c index db63c8dc..2ba0e4b8 100644 --- a/libmisc/list.c +++ b/libmisc/list.c @@ -33,11 +33,9 @@ #include #include "rcsid.h" -RCSID("$Id: list.c,v 1.3 1997/12/07 23:27:05 marekm Exp $") - +RCSID ("$Id: list.c,v 1.4 2003/04/22 10:59:22 kloczek Exp $") #include "prototypes.h" #include "defines.h" - /* * add_list - add a member to a list of group members * @@ -45,19 +43,17 @@ RCSID("$Id: list.c,v 1.3 1997/12/07 23:27:05 marekm Exp $") * name, and if not present it is added to a freshly allocated * list of users. */ - -char ** -add_list(char **list, const char *member) +char **add_list (char **list, const char *member) { - int i; - char **tmp; + int i; + char **tmp; /* * Scan the list for the new name. Return the original list * pointer if it is present. */ - for (i = 0;list[i] != (char *) 0;i++) + for (i = 0; list[i] != (char *) 0; i++) if (strcmp (list[i], member) == 0) return list; @@ -74,7 +70,7 @@ add_list(char **list, const char *member) * is returned to the invoker. */ - for (i = 0;list[i] != (char *) 0;i++) + for (i = 0; list[i] != (char *) 0; i++) tmp[i] = list[i]; tmp[i++] = xstrdup (member); @@ -91,18 +87,17 @@ add_list(char **list, const char *member) * list of users. */ -char ** -del_list(char **list, const char *member) +char **del_list (char **list, const char *member) { - int i, j; - char **tmp; + int i, j; + char **tmp; /* * Scan the list for the old name. Return the original list * pointer if it is not present. */ - for (i = j = 0;list[i] != (char *) 0;i++) + for (i = j = 0; list[i] != (char *) 0; i++) if (strcmp (list[i], member)) j++; @@ -122,7 +117,7 @@ del_list(char **list, const char *member) * is returned to the invoker. */ - for (i = j = 0;list[i] != (char *) 0;i++) + for (i = j = 0; list[i] != (char *) 0; i++) if (strcmp (list[i], member)) tmp[j++] = list[i]; @@ -131,30 +126,27 @@ del_list(char **list, const char *member) return tmp; } -char ** -dup_list(char * const *list) +char **dup_list (char *const *list) { int i; char **tmp; - for (i = 0; list[i]; i++) - ; + for (i = 0; list[i]; i++); - tmp = (char **) xmalloc((i + 1) * sizeof(char *)); + tmp = (char **) xmalloc ((i + 1) * sizeof (char *)); i = 0; while (*list) - tmp[i++] = xstrdup(*list++); + tmp[i++] = xstrdup (*list++); tmp[i] = (char *) 0; return tmp; } -int -is_on_list(char * const *list, const char *member) +int is_on_list (char *const *list, const char *member) { while (*list) { - if (strcmp(*list, member) == 0) + if (strcmp (*list, member) == 0) return 1; list++; } @@ -165,13 +157,12 @@ is_on_list(char * const *list, const char *member) * comma_to_list - convert comma-separated list to (char *) array */ -char ** -comma_to_list(const char *comma) +char **comma_to_list (const char *comma) { - char *members; - char **array; - int i; - char *cp, *cp2; + char *members; + char **array; + int i; + char *cp, *cp2; /* * Make a copy since we are going to be modifying the list @@ -183,7 +174,7 @@ comma_to_list(const char *comma) * Count the number of commas in the list */ - for (cp = members, i = 0;;i++) + for (cp = members, i = 0;; i++) if ((cp2 = strchr (cp, ','))) cp = cp2 + 1; else @@ -215,7 +206,7 @@ comma_to_list(const char *comma) * array of pointers. */ - for (cp = members, i = 0;;i++) { + for (cp = members, i = 0;; i++) { array[i] = cp; if ((cp2 = strchr (cp, ','))) { *cp2++ = '\0'; diff --git a/libmisc/log.c b/libmisc/log.c index a0ee0e1b..1ad2a16c 100644 --- a/libmisc/log.c +++ b/libmisc/log.c @@ -30,8 +30,7 @@ #include #include "rcsid.h" -RCSID("$Id: log.c,v 1.5 1998/04/16 19:57:44 marekm Exp $") - +RCSID ("$Id: log.c,v 1.7 2003/12/17 12:52:25 kloczek Exp $") #include #include #include @@ -42,7 +41,6 @@ RCSID("$Id: log.c,v 1.5 1998/04/16 19:57:44 marekm Exp $") #else #include "lastlog_.h" #endif - /* * dolastlog - create lastlog entry * @@ -50,19 +48,20 @@ RCSID("$Id: log.c,v 1.5 1998/04/16 19:57:44 marekm Exp $") * UID is extracted from the global (struct passwd) entry and the * TTY information is gotten from the (struct utmp). */ - void -dolastlog(struct lastlog *ll, const struct passwd *pw, const char *line, const char *host) +dolastlog (struct lastlog *ll, const struct passwd *pw, const char *line, + const char *host) { - int fd; - off_t offset; - struct lastlog newlog; + int fd; + off_t offset; + struct lastlog newlog; + time_t ll_time; /* * If the file does not exist, don't create it. */ - if ((fd = open(LASTLOG_FILE, O_RDWR)) == -1) + if ((fd = open (LASTLOG_FILE, O_RDWR)) == -1) return; /* @@ -72,8 +71,8 @@ dolastlog(struct lastlog *ll, const struct passwd *pw, const char *line, const c offset = (unsigned long) pw->pw_uid * sizeof newlog; - if (lseek(fd, offset, SEEK_SET) != offset) { - close(fd); + if (lseek (fd, offset, SEEK_SET) != offset) { + close (fd); return; } @@ -83,18 +82,18 @@ dolastlog(struct lastlog *ll, const struct passwd *pw, const char *line, const c * the way we read the old one in. */ - if (read(fd, (char *) &newlog, sizeof newlog) != sizeof newlog) - memzero(&newlog, sizeof newlog); + if (read (fd, (char *) &newlog, sizeof newlog) != sizeof newlog) + memzero (&newlog, sizeof newlog); if (ll) *ll = newlog; - time(&newlog.ll_time); - strncpy(newlog.ll_line, line, sizeof newlog.ll_line); + ll_time = newlog.ll_time; + time (&ll_time); + strncpy (newlog.ll_line, line, sizeof newlog.ll_line); #if HAVE_LL_HOST - strncpy(newlog.ll_host, host, sizeof newlog.ll_host); + strncpy (newlog.ll_host, host, sizeof newlog.ll_host); #endif - if (lseek(fd, offset, SEEK_SET) == offset) - write(fd, (char *) &newlog, sizeof newlog); - close(fd); + if (lseek (fd, offset, SEEK_SET) == offset) + write (fd, (char *) &newlog, sizeof newlog); + close (fd); } - diff --git a/libmisc/login_access.c b/libmisc/login_access.c index 1d06d3e7..8c26ada7 100644 --- a/libmisc/login_access.c +++ b/libmisc/login_access.c @@ -23,18 +23,16 @@ #ifdef LOGIN_ACCESS #include "rcsid.h" -RCSID("$Id: login_access.c,v 1.6 1998/01/29 23:22:34 marekm Exp $") +RCSID ("$Id: login_access.c,v 1.9 2003/05/05 21:44:15 kloczek Exp $") #include "prototypes.h" - - /* - * This module implements a simple but effective form of login access - * control based on login names and on host (or domain) names, internet - * addresses (or network numbers), or on terminal line names in case of - * non-networked logins. Diagnostics are reported through syslog(3). - * - * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. - */ - + /* + * This module implements a simple but effective form of login access + * control based on login names and on host (or domain) names, internet + * addresses (or network numbers), or on terminal line names in case of + * non-networked logins. Diagnostics are reported through syslog(3). + * + * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. + */ #include #include #include @@ -50,13 +48,9 @@ RCSID("$Id: login_access.c,v 1.6 1998/01/29 23:22:34 marekm Exp $") #include #include #include -#include /* for inet_ntoa() */ - -extern struct group *getgrnam(); -extern int innetgr(); -#if 0 /* should be defined by */ -extern int errno; -#endif +#include /* for inet_ntoa() */ +extern struct group *getgrnam (); +extern int innetgr (); #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64) #undef MAXHOSTNAMELEN @@ -71,270 +65,260 @@ extern int errno; /* Delimiters for fields and for lists of users, ttys or hosts. */ -static char fs[] = ":"; /* field separator */ -static char sep[] = ", \t"; /* list-element separator */ +static char fs[] = ":"; /* field separator */ +static char sep[] = ", \t"; /* list-element separator */ /* Constants to be used in assignments only, not in comparisons... */ #define YES 1 #define NO 0 -static int list_match(); -static int user_match(); -static int from_match(); -static int string_match(); +static int list_match (); +static int user_match (); +static int from_match (); +static int string_match (); /* login_access - match username/group and host/tty with access control file */ -int -login_access(const char *user, const char *from) +int login_access (const char *user, const char *from) { - FILE *fp; - char line[BUFSIZ]; - char *perm; /* becomes permission field */ - char *users; /* becomes list of login names */ - char *froms; /* becomes list of terminals or hosts */ - int match = NO; - int end; - int lineno = 0; /* for diagnostics */ + FILE *fp; + char line[BUFSIZ]; + char *perm; /* becomes permission field */ + char *users; /* becomes list of login names */ + char *froms; /* becomes list of terminals or hosts */ + int match = NO; + int end; + int lineno = 0; /* for diagnostics */ - /* - * Process the table one line at a time and stop at the first match. - * Blank lines and lines that begin with a '#' character are ignored. - * Non-comment lines are broken at the ':' character. All fields are - * mandatory. The first field should be a "+" or "-" character. A - * non-existing table means no access control. - */ + /* + * Process the table one line at a time and stop at the first match. + * Blank lines and lines that begin with a '#' character are ignored. + * Non-comment lines are broken at the ':' character. All fields are + * mandatory. The first field should be a "+" or "-" character. A + * non-existing table means no access control. + */ - if ((fp = fopen(TABLE, "r"))) { - while (!match && fgets(line, sizeof(line), fp)) { - lineno++; - if (line[end = strlen(line) - 1] != '\n') { - syslog(LOG_ERR, "%s: line %d: missing newline or line too long", - TABLE, lineno); - continue; - } - if (line[0] == '#') - continue; /* comment line */ - while (end > 0 && isspace(line[end - 1])) - end--; - line[end] = 0; /* strip trailing whitespace */ - if (line[0] == 0) /* skip blank lines */ - continue; - if (!(perm = strtok(line, fs)) - || !(users = strtok((char *) 0, fs)) - || !(froms = strtok((char *) 0, fs)) - || strtok((char *) 0, fs)) { - syslog(LOG_ERR, "%s: line %d: bad field count", TABLE, lineno); - continue; - } - if (perm[0] != '+' && perm[0] != '-') { - syslog(LOG_ERR, "%s: line %d: bad first field", TABLE, lineno); - continue; - } - match = (list_match(froms, from, from_match) - && list_match(users, user, user_match)); + if ((fp = fopen (TABLE, "r"))) { + while (!match && fgets (line, sizeof (line), fp)) { + lineno++; + if (line[end = strlen (line) - 1] != '\n') { + syslog (LOG_ERR, + "%s: line %d: missing newline or line too long", + TABLE, lineno); + continue; + } + if (line[0] == '#') + continue; /* comment line */ + while (end > 0 && isspace (line[end - 1])) + end--; + line[end] = 0; /* strip trailing whitespace */ + if (line[0] == 0) /* skip blank lines */ + continue; + if (!(perm = strtok (line, fs)) + || !(users = strtok ((char *) 0, fs)) + || !(froms = strtok ((char *) 0, fs)) + || strtok ((char *) 0, fs)) { + syslog (LOG_ERR, + "%s: line %d: bad field count", + TABLE, lineno); + continue; + } + if (perm[0] != '+' && perm[0] != '-') { + syslog (LOG_ERR, + "%s: line %d: bad first field", + TABLE, lineno); + continue; + } + match = (list_match (froms, from, from_match) + && list_match (users, user, user_match)); + } + (void) fclose (fp); + } else if (errno != ENOENT) { + syslog (LOG_ERR, "cannot open %s: %m", TABLE); } - (void) fclose(fp); - } else if (errno != ENOENT) { - syslog(LOG_ERR, "cannot open %s: %m", TABLE); - } - return (match == 0 || (line[0] == '+')); + return (match == 0 || (line[0] == '+')); } /* list_match - match an item against a list of tokens with exceptions */ -static int -list_match(char *list, const char *item, int (*match_fn)()) +static int list_match (char *list, const char *item, int (*match_fn) ()) { - char *tok; - int match = NO; + char *tok; + int match = NO; - /* - * Process tokens one at a time. We have exhausted all possible matches - * when we reach an "EXCEPT" token or the end of the list. If we do find - * a match, look for an "EXCEPT" list and recurse to determine whether - * the match is affected by any exceptions. - */ + /* + * Process tokens one at a time. We have exhausted all possible matches + * when we reach an "EXCEPT" token or the end of the list. If we do find + * a match, look for an "EXCEPT" list and recurse to determine whether + * the match is affected by any exceptions. + */ - for (tok = strtok(list, sep); tok != 0; tok = strtok((char *) 0, sep)) { - if (strcasecmp(tok, "EXCEPT") == 0) /* EXCEPT: give up */ - break; - if ((match = (*match_fn) (tok, item))) /* YES */ - break; - } - /* Process exceptions to matches. */ + for (tok = strtok (list, sep); tok != 0; + tok = strtok ((char *) 0, sep)) { + if (strcasecmp (tok, "EXCEPT") == 0) /* EXCEPT: give up */ + break; + if ((match = (*match_fn) (tok, item))) /* YES */ + break; + } + /* Process exceptions to matches. */ - if (match != NO) { - while ((tok = strtok((char *) 0, sep)) && strcasecmp(tok, "EXCEPT")) - /* VOID */ ; - if (tok == 0 || list_match((char *) 0, item, match_fn) == NO) - return (match); - } - return (NO); + if (match != NO) { + while ((tok = strtok ((char *) 0, sep)) + && strcasecmp (tok, "EXCEPT")) + /* VOID */ ; + if (tok == 0 + || list_match ((char *) 0, item, match_fn) == NO) + return (match); + } + return (NO); } /* myhostname - figure out local machine name */ -static char * -myhostname(void) +static char *myhostname (void) { - static char name[MAXHOSTNAMELEN + 1] = ""; + static char name[MAXHOSTNAMELEN + 1] = ""; - if (name[0] == 0) { - gethostname(name, sizeof(name)); - name[MAXHOSTNAMELEN] = 0; - } - return (name); + if (name[0] == 0) { + gethostname (name, sizeof (name)); + name[MAXHOSTNAMELEN] = 0; + } + return (name); } /* netgroup_match - match group against machine or user */ static int -netgroup_match(const char *group, const char *machine, const char *user) +netgroup_match (const char *group, const char *machine, const char *user) { -#if 0 /* original code */ -#ifdef NIS - static char *mydomain = 0; - - if (mydomain == 0) - yp_get_default_domain(&mydomain); - return (innetgr(group, machine, user, mydomain)); -#else - syslog(LOG_ERR, "NIS netgroup support not configured"); - return (NO); -#endif -#else /* works better with glibc? */ static char *mydomain = 0; if (mydomain == 0) { - static char domain[MAXHOSTNAMELEN+1]; + static char domain[MAXHOSTNAMELEN + 1]; - getdomainname(domain, MAXHOSTNAMELEN); + getdomainname (domain, MAXHOSTNAMELEN); mydomain = domain; } - return innetgr(group, machine, user, mydomain); -#endif + return innetgr (group, machine, user, mydomain); } /* user_match - match a username against one token */ -static int -user_match(const char *tok, const char *string) +static int user_match (const char *tok, const char *string) { - struct group *group; + struct group *group; + #ifdef PRIMARY_GROUP_MATCH - struct passwd *userinf; + struct passwd *userinf; #endif - int i; - char *at; + int i; + char *at; - /* - * If a token has the magic value "ALL" the match always succeeds. - * Otherwise, return YES if the token fully matches the username, or if - * the token is a group that contains the username. - */ - - if ((at = strchr(tok + 1, '@')) != 0) { /* split user@host pattern */ - *at = 0; - return (user_match(tok, string) && from_match(at + 1, myhostname())); - } else if (tok[0] == '@') { /* netgroup */ - return (netgroup_match(tok + 1, (char *) 0, string)); - } else if (string_match(tok, string)) { /* ALL or exact match */ - return (YES); - } else if ((group = getgrnam(tok))) { /* try group membership */ - for (i = 0; group->gr_mem[i]; i++) - if (strcasecmp(string, group->gr_mem[i]) == 0) - return (YES); -#ifdef PRIMARY_GROUP_MATCH /* - * If the sting is an user whose initial GID matches the token, - * accept it. May avoid excessively long lines in /etc/group. - * Radu-Adrian Feurdean - * - * XXX - disabled by default for now. Need to verify that - * getpwnam() doesn't have some nasty side effects. --marekm + * If a token has the magic value "ALL" the match always succeeds. + * Otherwise, return YES if the token fully matches the username, or if + * the token is a group that contains the username. */ - if ((userinf = getpwnam(string))) - if (userinf->pw_gid == group->gr_gid) + + if ((at = strchr (tok + 1, '@')) != 0) { /* split user@host pattern */ + *at = 0; + return (user_match (tok, string) + && from_match (at + 1, myhostname ())); + } else if (tok[0] == '@') { /* netgroup */ + return (netgroup_match (tok + 1, (char *) 0, string)); + } else if (string_match (tok, string)) { /* ALL or exact match */ return (YES); + } else if ((group = getgrnam (tok))) { /* try group membership */ + for (i = 0; group->gr_mem[i]; i++) + if (strcasecmp (string, group->gr_mem[i]) == 0) + return (YES); +#ifdef PRIMARY_GROUP_MATCH + /* + * If the sting is an user whose initial GID matches the token, + * accept it. May avoid excessively long lines in /etc/group. + * Radu-Adrian Feurdean + * + * XXX - disabled by default for now. Need to verify that + * getpwnam() doesn't have some nasty side effects. --marekm + */ + if ((userinf = getpwnam (string))) + if (userinf->pw_gid == group->gr_gid) + return (YES); #endif - } - return (NO); + } + return (NO); } -static char * -resolve_hostname(string) - char *string; +static char *resolve_hostname (string) +char *string; { -#if 1 - /* - * Resolve hostname to numeric IP address, as suggested - * by Dave Hagewood . --marekm - */ - struct hostent *hp; + /* + * Resolve hostname to numeric IP address, as suggested + * by Dave Hagewood . --marekm + */ + struct hostent *hp; - hp = gethostbyname(string); - if (hp) - return inet_ntoa(*((struct in_addr *) *(hp->h_addr_list))); + hp = gethostbyname (string); + if (hp) + return + inet_ntoa (*((struct in_addr *) *(hp->h_addr_list))); - syslog(LOG_ERR, "%s - unknown host", string); -#endif - return string; + syslog (LOG_ERR, "%s - unknown host", string); + return string; } /* from_match - match a host or tty against a list of tokens */ -static int -from_match(const char *tok, const char *string) +static int from_match (const char *tok, const char *string) { - int tok_len; - int str_len; + int tok_len; + int str_len; - /* - * If a token has the magic value "ALL" the match always succeeds. Return - * YES if the token fully matches the string. If the token is a domain - * name, return YES if it matches the last fields of the string. If the - * token has the magic value "LOCAL", return YES if the string does not - * contain a "." character. If the token is a network number, return YES - * if it matches the head of the string. - */ + /* + * If a token has the magic value "ALL" the match always succeeds. Return + * YES if the token fully matches the string. If the token is a domain + * name, return YES if it matches the last fields of the string. If the + * token has the magic value "LOCAL", return YES if the string does not + * contain a "." character. If the token is a network number, return YES + * if it matches the head of the string. + */ - if (tok[0] == '@') { /* netgroup */ - return (netgroup_match(tok + 1, string, (char *) 0)); - } else if (string_match(tok, string)) { /* ALL or exact match */ - return (YES); - } else if (tok[0] == '.') { /* domain: match last fields */ - if ((str_len = strlen(string)) > (tok_len = strlen(tok)) - && strcasecmp(tok, string + str_len - tok_len) == 0) - return (YES); - } else if (strcasecmp(tok, "LOCAL") == 0) { /* local: no dots */ - if (strchr(string, '.') == 0) - return (YES); - } else if (tok[(tok_len = strlen(tok)) - 1] == '.' /* network */ - && strncmp(tok, resolve_hostname(string), tok_len) == 0) { - return (YES); - } - return (NO); + if (tok[0] == '@') { /* netgroup */ + return (netgroup_match (tok + 1, string, (char *) 0)); + } else if (string_match (tok, string)) { /* ALL or exact match */ + return (YES); + } else if (tok[0] == '.') { /* domain: match last fields */ + if ((str_len = strlen (string)) > (tok_len = strlen (tok)) + && strcasecmp (tok, string + str_len - tok_len) == 0) + return (YES); + } else if (strcasecmp (tok, "LOCAL") == 0) { /* local: no dots */ + if (strchr (string, '.') == 0) + return (YES); + } else if (tok[(tok_len = strlen (tok)) - 1] == '.' /* network */ + && strncmp (tok, resolve_hostname (string), + tok_len) == 0) { + return (YES); + } + return (NO); } /* string_match - match a string against one token */ -static int -string_match(const char *tok, const char *string) +static int string_match (const char *tok, const char *string) { - /* - * If the token has the magic value "ALL" the match always succeeds. - * Otherwise, return YES if the token fully matches the string. - */ + /* + * If the token has the magic value "ALL" the match always succeeds. + * Otherwise, return YES if the token fully matches the string. + */ - if (strcasecmp(tok, "ALL") == 0) { /* all: always matches */ - return (YES); - } else if (strcasecmp(tok, string) == 0) { /* try exact match */ - return (YES); - } - return (NO); + if (strcasecmp (tok, "ALL") == 0) { /* all: always matches */ + return (YES); + } else if (strcasecmp (tok, string) == 0) { /* try exact match */ + return (YES); + } + return (NO); } -#endif /* LOGIN_ACCESS */ +#endif /* LOGIN_ACCESS */ diff --git a/libmisc/login_desrpc.c b/libmisc/login_desrpc.c index 9767b406..80411853 100644 --- a/libmisc/login_desrpc.c +++ b/libmisc/login_desrpc.c @@ -23,55 +23,52 @@ #ifdef DES_RPC #include "rcsid.h" -RCSID("$Id: login_desrpc.c,v 1.7 1999/06/07 16:40:44 marekm Exp $") - +RCSID ("$Id: login_desrpc.c,v 1.8 2003/04/22 10:59:22 kloczek Exp $") #include "defines.h" - - /* - * Decrypt the user's secret secure RPC key and stores it into the - * keyserver. Returns 0 if successful, -1 on failure. - * - * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. - */ - + /* + * Decrypt the user's secret secure RPC key and stores it into the + * keyserver. Returns 0 if successful, -1 on failure. + * + * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. + */ #include #include #include - #if !(defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 0))) /* these don't seem to be in any header file (libc-5.4.33) */ /* but will be in glibc 2.1 and */ -extern int getnetname(char *); -extern int getsecretkey(const char *, char *, const char *); -extern int key_setsecret(const char *); +extern int getnetname (char *); +extern int getsecretkey (const char *, char *, const char *); +extern int key_setsecret (const char *); #endif -int -login_desrpc(const char *passwd) +int login_desrpc (const char *passwd) { char netname[MAXNETNAMELEN + 1]; char secretkey[HEXKEYBYTES + 1]; - if (getnetname(netname) == 0) + if (getnetname (netname) == 0) return -1; - if (getsecretkey(netname, secretkey, passwd) == 0) + if (getsecretkey (netname, secretkey, passwd) == 0) return -1; if (secretkey[0] == 0) { - fprintf(stderr, - _("Password does not decrypt secret key for %s.\n"), - netname); + fprintf (stderr, + _ + ("Password does not decrypt secret key for %s.\n"), + netname); return -1; } - if (key_setsecret(secretkey) < 0) { - fprintf(stderr, - _("Could not set %s's secret key: is the keyserv daemon running?\n"), - netname); + if (key_setsecret (secretkey) < 0) { + fprintf (stderr, + _ + ("Could not set %s's secret key: is the keyserv daemon running?\n"), + netname); return -1; } return 0; } #else -extern int errno; /* warning: ANSI C forbids an empty source file */ +extern int errno; /* warning: ANSI C forbids an empty source file */ #endif diff --git a/libmisc/login_krb.c b/libmisc/login_krb.c index 001a2163..93ca578f 100644 --- a/libmisc/login_krb.c +++ b/libmisc/login_krb.c @@ -23,39 +23,36 @@ #ifdef KERBEROS #include "rcsid.h" -RCSID("$Id: login_krb.c,v 1.3 1998/01/29 23:22:34 marekm Exp $") - +RCSID ("$Id: login_krb.c,v 1.4 2003/04/22 10:59:22 kloczek Exp $") #include - - /* - * Do an equivalent to kinit here. We need to do the kinit before trying to - * cd to the home directory, because it might be on a remote filesystem that - * uses Kerberos authentication. We also need to do this after we've - * setuid() to the user, or krb_get_pw_in_tkt() won't know where to put the - * ticket. - * - * We don't really care about whether or not it succeeds; if it fails, we'll - * just carry on bravely. - * - * NB: we assume: local realm, same username and password as supplied to login. - * - * Security note: if pp is NULL, login doesn't have the password. This is - * common when it's called by rlogind. Since this is almost always a remote - * connection, we don't want to risk asking for the password by supplying a - * NULL pp to krb_get_pw_in_tkt(), because somebody could be listening. So - * we'll just forget the whole thing. -jdd - */ - -int -login_kerberos(const char *username, const char *password) + /* + * Do an equivalent to kinit here. We need to do the kinit before trying to + * cd to the home directory, because it might be on a remote filesystem that + * uses Kerberos authentication. We also need to do this after we've + * setuid() to the user, or krb_get_pw_in_tkt() won't know where to put the + * ticket. + * + * We don't really care about whether or not it succeeds; if it fails, we'll + * just carry on bravely. + * + * NB: we assume: local realm, same username and password as supplied to login. + * + * Security note: if pp is NULL, login doesn't have the password. This is + * common when it's called by rlogind. Since this is almost always a remote + * connection, we don't want to risk asking for the password by supplying a + * NULL pp to krb_get_pw_in_tkt(), because somebody could be listening. So + * we'll just forget the whole thing. -jdd + */ +int login_kerberos (const char *username, const char *password) { - char realm[REALM_SZ]; + char realm[REALM_SZ]; - (void) krb_get_lrealm(realm, 1); - if (password != 0) - (void) krb_get_pw_in_tkt(username, "", realm, "krbtgt", - realm, DEFAULT_TKT_LIFE, password); + (void) krb_get_lrealm (realm, 1); + if (password != 0) + (void) krb_get_pw_in_tkt (username, "", realm, "krbtgt", + realm, DEFAULT_TKT_LIFE, + password); } #else -extern int errno; /* warning: ANSI C forbids an empty source file */ -#endif /* KERBEROS */ +extern int errno; /* warning: ANSI C forbids an empty source file */ +#endif /* KERBEROS */ diff --git a/libmisc/loginprompt.c b/libmisc/loginprompt.c index abe81d3a..5863259f 100644 --- a/libmisc/loginprompt.c +++ b/libmisc/loginprompt.c @@ -30,19 +30,16 @@ #include #include "rcsid.h" -RCSID("$Id: loginprompt.c,v 1.6 2000/08/26 18:27:17 marekm Exp $") - +RCSID ("$Id: loginprompt.c,v 1.7 2003/04/22 10:59:22 kloczek Exp $") #include #include #include #include "prototypes.h" #include "defines.h" #include "getdef.h" - -static void -login_exit(int sig) +static void login_exit (int sig) { - exit(1); + exit (1); } /* @@ -52,19 +49,20 @@ login_exit(int sig) * is set in login.defs, this file is displayed before the prompt. */ -void -login_prompt(const char *prompt, char *name, int namesize) +void login_prompt (const char *prompt, char *name, int namesize) { - char buf[1024]; + char buf[1024]; + #define MAX_ENV 32 - char *envp[MAX_ENV]; - int envc; - char *cp; - int i; - FILE *fp; - RETSIGTYPE (*sigquit)(int); + char *envp[MAX_ENV]; + int envc; + char *cp; + int i; + FILE *fp; + + RETSIGTYPE (*sigquit) (int); #ifdef SIGTSTP - RETSIGTYPE (*sigtstp)(int); + RETSIGTYPE (*sigtstp) (int); #endif /* @@ -74,9 +72,9 @@ login_prompt(const char *prompt, char *name, int namesize) * thing for that signal. */ - sigquit = signal(SIGQUIT, login_exit); + sigquit = signal (SIGQUIT, login_exit); #ifdef SIGTSTP - sigtstp = signal(SIGTSTP, login_exit); + sigtstp = signal (SIGTSTP, login_exit); #endif /* @@ -85,16 +83,16 @@ login_prompt(const char *prompt, char *name, int namesize) */ if (prompt) { - cp = getdef_str("ISSUE_FILE"); - if (cp && (fp = fopen(cp, "r"))) { - while ((i = getc(fp)) != EOF) - putc(i, stdout); + cp = getdef_str ("ISSUE_FILE"); + if (cp && (fp = fopen (cp, "r"))) { + while ((i = getc (fp)) != EOF) + putc (i, stdout); - fclose(fp); + fclose (fp); } - gethostname(buf, sizeof buf); - printf(prompt, buf); - fflush(stdout); + gethostname (buf, sizeof buf); + printf (prompt, buf); + fflush (stdout); } /* @@ -102,14 +100,14 @@ login_prompt(const char *prompt, char *name, int namesize) * removed. */ - memzero(buf, sizeof buf); - if (fgets(buf, sizeof buf, stdin) != buf) - exit(1); + memzero (buf, sizeof buf); + if (fgets (buf, sizeof buf, stdin) != buf) + exit (1); - cp = strchr(buf, '\n'); + cp = strchr (buf, '\n'); if (!cp) - exit(1); - *cp = '\0'; /* remove \n [ must be there ] */ + exit (1); + *cp = '\0'; /* remove \n [ must be there ] */ /* * Skip leading whitespace. This makes " username" work right. @@ -117,12 +115,10 @@ login_prompt(const char *prompt, char *name, int namesize) * character into the username. */ - for (cp = buf;*cp == ' ' || *cp == '\t';cp++) - ; + for (cp = buf; *cp == ' ' || *cp == '\t'; cp++); - for (i = 0; i < namesize - 1 && isgraph(*cp); name[i++] = *cp++) - ; - while (isgraph(*cp)) + for (i = 0; i < namesize - 1 && isgraph (*cp); name[i++] = *cp++); + while (isgraph (*cp)) cp++; if (*cp) @@ -136,30 +132,31 @@ login_prompt(const char *prompt, char *name, int namesize) * to do this, and I just take the easy way out. */ - if (*cp != '\0') { /* process new variables */ + if (*cp != '\0') { /* process new variables */ char *nvar; int count = 1; for (envc = 0; envc < MAX_ENV; envc++) { - nvar = strtok(envc ? (char *)0 : cp, " \t,"); + nvar = strtok (envc ? (char *) 0 : cp, " \t,"); if (!nvar) break; - if (strchr(nvar, '=')) { + if (strchr (nvar, '=')) { envp[envc] = nvar; } else { - envp[envc] = xmalloc(strlen(nvar) + 32); - sprintf(envp[envc], "L%d=%s", count++, nvar); + envp[envc] = xmalloc (strlen (nvar) + 32); + sprintf (envp[envc], "L%d=%s", count++, + nvar); } } - set_env(envc, envp); + set_env (envc, envp); } /* * Set the SIGQUIT handler back to its original value */ - signal(SIGQUIT, sigquit); + signal (SIGQUIT, sigquit); #ifdef SIGTSTP - signal(SIGTSTP, sigtstp); + signal (SIGTSTP, sigtstp); #endif } diff --git a/libmisc/mail.c b/libmisc/mail.c index 7b24e974..111752c2 100644 --- a/libmisc/mail.c +++ b/libmisc/mail.c @@ -37,43 +37,41 @@ #include "getdef.h" #include "rcsid.h" -RCSID("$Id: mail.c,v 1.7 1998/12/28 20:34:49 marekm Exp $") +RCSID ("$Id: mail.c,v 1.8 2003/04/22 10:59:22 kloczek Exp $") -void -mailcheck(void) +void mailcheck (void) { struct stat statbuf; char *mailbox; - if (!getdef_bool("MAIL_CHECK_ENAB")) + if (!getdef_bool ("MAIL_CHECK_ENAB")) return; /* * Check incoming mail in Maildir format - J. */ - if ((mailbox = getenv("MAILDIR"))) { + if ((mailbox = getenv ("MAILDIR"))) { char *newmail; - newmail = xmalloc(strlen(mailbox) + 5); - sprintf(newmail, "%s/new", mailbox); - if (stat(newmail, &statbuf) != -1 && statbuf.st_size != 0) { + newmail = xmalloc (strlen (mailbox) + 5); + sprintf (newmail, "%s/new", mailbox); + if (stat (newmail, &statbuf) != -1 && statbuf.st_size != 0) { if (statbuf.st_mtime > statbuf.st_atime) { - free(newmail); - puts(_("You have new mail.")); + free (newmail); + puts (_("You have new mail.")); return; } } - free(newmail); + free (newmail); } - if (!(mailbox = getenv("MAIL"))) + if (!(mailbox = getenv ("MAIL"))) return; - if (stat(mailbox, &statbuf) == -1 || statbuf.st_size == 0) - puts(_("No mail.")); + if (stat (mailbox, &statbuf) == -1 || statbuf.st_size == 0) + puts (_("No mail.")); else if (statbuf.st_atime > statbuf.st_mtime) - puts(_("You have mail.")); + puts (_("You have mail.")); else - puts(_("You have new mail.")); + puts (_("You have new mail.")); } - diff --git a/libmisc/motd.c b/libmisc/motd.c index 0ff6973e..2d47f3b7 100644 --- a/libmisc/motd.c +++ b/libmisc/motd.c @@ -30,13 +30,11 @@ #include #include "rcsid.h" -RCSID("$Id: motd.c,v 1.3 1997/12/07 23:27:07 marekm Exp $") - +RCSID ("$Id: motd.c,v 1.4 2003/04/22 10:59:22 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" #include "getdef.h" - /* * motd -- output the /etc/motd file * @@ -44,22 +42,21 @@ RCSID("$Id: motd.c,v 1.3 1997/12/07 23:27:07 marekm Exp $") * it to the user's terminal at login time. The MOTD_FILE configuration * option is a colon-delimited list of filenames. */ - -void -motd(void) +void motd (void) { - FILE *fp; - char motdlist[BUFSIZ], *motdfile, *mb; - register int c; + FILE *fp; + char motdlist[BUFSIZ], *motdfile, *mb; + register int c; - if ((mb = getdef_str("MOTD_FILE")) == NULL) + if ((mb = getdef_str ("MOTD_FILE")) == NULL) return; - strncpy(motdlist, mb, sizeof(motdlist)); - motdlist[sizeof(motdlist)-1] = '\0'; + strncpy (motdlist, mb, sizeof (motdlist)); + motdlist[sizeof (motdlist) - 1] = '\0'; - for (mb = motdlist ; (motdfile = strtok(mb,":")) != NULL ; mb = NULL) { - if ((fp = fopen(motdfile, "r")) != NULL) { + for (mb = motdlist; (motdfile = strtok (mb, ":")) != NULL; + mb = NULL) { + if ((fp = fopen (motdfile, "r")) != NULL) { while ((c = getc (fp)) != EOF) putchar (c); fclose (fp); diff --git a/libmisc/myname.c b/libmisc/myname.c index 66e80e56..bd6d9caa 100644 --- a/libmisc/myname.c +++ b/libmisc/myname.c @@ -11,18 +11,15 @@ #include #include "rcsid.h" -RCSID("$Id: myname.c,v 1.2 1997/12/07 23:27:07 marekm Exp $") - +RCSID ("$Id: myname.c,v 1.3 2003/04/22 10:59:22 kloczek Exp $") #include "defines.h" #include #include "prototypes.h" - -struct passwd * -get_my_pwent(void) +struct passwd *get_my_pwent (void) { struct passwd *pw; - const char *cp = getlogin(); - uid_t ruid = getuid(); + const char *cp = getlogin (); + uid_t ruid = getuid (); /* * Try getlogin() first - if it fails or returns a non-existent @@ -34,8 +31,8 @@ get_my_pwent(void) * XXX - when running from su, will return the current user (not * the original user, like getlogin() does). Does this matter? */ - if (cp && *cp && (pw = getpwnam(cp)) && pw->pw_uid == ruid) + if (cp && *cp && (pw = getpwnam (cp)) && pw->pw_uid == ruid) return pw; - return getpwuid(ruid); + return getpwuid (ruid); } diff --git a/libmisc/nscd.c b/libmisc/nscd.c deleted file mode 100644 index c6862726..00000000 --- a/libmisc/nscd.c +++ /dev/null @@ -1,95 +0,0 @@ -/* Copyright (c) 1999 SuSE GmbH Nuerenberg, Germany - Author: Thorsten Kukuk */ - -#include -#include -#include -#include -#include -#include -#include -#include - -/* Version number of the daemon interface */ -#define NSCD_VERSION 2 -/* Path for the Unix domain socket. */ -#define _PATH_NSCDSOCKET "/var/run/.nscd_socket" - -/* Available services. */ -typedef enum -{ - GETPWBYNAME, - GETPWBYUID, - GETGRBYNAME, - GETGRBYGID, - GETHOSTBYNAME, - GETHOSTBYNAMEv6, - GETHOSTBYADDR, - GETHOSTBYADDRv6, - LASTDBREQ = GETHOSTBYADDRv6, - SHUTDOWN, /* Shut the server down. */ - GETSTAT, /* Get the server statistic. */ - INVALIDATE, /* Invalidate one special cache. */ - LASTREQ -} request_type; - -/* Header common to all requests */ -typedef struct -{ - int version; /* Version number of the daemon interface. */ - request_type type; /* Service requested. */ -#if defined(__alpha__) - int64_t key_len; /* Key length is 64bit on Alpha. */ -#else - int32_t key_len; /* Key length, 32bit on most plattforms. */ -#endif -} request_header; - -/* Create a socket connected to a name. */ -static int -nscd_open_socket (void) -{ - struct sockaddr_un addr; - int sock; - - sock = socket (PF_UNIX, SOCK_STREAM, 0); - if (sock < 0) - return -1; - - addr.sun_family = AF_UNIX; - assert (sizeof (addr.sun_path) >= sizeof (_PATH_NSCDSOCKET)); - strcpy (addr.sun_path, _PATH_NSCDSOCKET); - if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0) - { - close (sock); - return -1; - } - - return sock; -} - -int -nscd_flush_cache (char *service) -{ - int sock = nscd_open_socket (); - request_header req; - ssize_t nbytes; - - if (sock == -1) - return -1; - - req.version = NSCD_VERSION; - req.type = INVALIDATE; - req.key_len = strlen (service) + 1; - nbytes = write (sock, &req, sizeof (request_header)); - if (nbytes != sizeof (request_header)) - { - close (sock); - return -1; - } - - nbytes = write (sock, (void *)service, req.key_len); - - close (sock); - return (nbytes != req.key_len ? (-1) : 0); -} diff --git a/libmisc/obscure.c b/libmisc/obscure.c index 845bd264..e3f8ee28 100644 --- a/libmisc/obscure.c +++ b/libmisc/obscure.c @@ -30,34 +30,28 @@ #include #include "rcsid.h" -RCSID("$Id: obscure.c,v 1.9 1999/03/07 19:14:40 marekm Exp $") +RCSID ("$Id: obscure.c,v 1.11 2003/05/05 21:44:15 kloczek Exp $") /* * This version of obscure.c contains modifications to support "cracklib" * by Alec Muffet (alec.muffett@uk.sun.com). You must obtain the Cracklib * library source code for this function to operate. */ - #include #include #include "prototypes.h" #include "defines.h" - #include "getdef.h" - /* * can't be a palindrome - like `R A D A R' or `M A D A M' */ - -/*ARGSUSED*/ -static int -palindrome(const char *old, const char *new) + /*ARGSUSED*/ static int palindrome (const char *old, const char *new) { - int i, j; + int i, j; i = strlen (new); - for (j = 0;j < i;j++) + for (j = 0; j < i; j++) if (new[i - j - 1] != new[j]) return 0; @@ -68,9 +62,7 @@ palindrome(const char *old, const char *new) * more than half of the characters are different ones. */ -/*ARGSUSED*/ -static int -similar(const char *old, const char *new) + /*ARGSUSED*/ static int similar (const char *old, const char *new) { int i, j; @@ -80,11 +72,11 @@ similar(const char *old, const char *new) * the new password is long enough. Please feel free to suggest * something better... --marekm */ - if (strlen(new) >= 8) + if (strlen (new) >= 8) return 0; for (i = j = 0; new[i] && old[i]; i++) - if (strchr(new, old[i])) + if (strchr (new, old[i])) j++; if (i >= j * 2) @@ -97,18 +89,16 @@ similar(const char *old, const char *new) * a nice mix of characters. */ -/*ARGSUSED*/ -static int -simple(const char *old, const char *new) + /*ARGSUSED*/ static int simple (const char *old, const char *new) { - int digits = 0; - int uppers = 0; - int lowers = 0; - int others = 0; - int size; - int i; + int digits = 0; + int uppers = 0; + int lowers = 0; + int others = 0; + int size; + int i; - for (i = 0;new[i];i++) { + for (i = 0; new[i]; i++) { if (isdigit (new[i])) digits++; else if (isupper (new[i])) @@ -125,10 +115,14 @@ simple(const char *old, const char *new) */ size = 9; - if (digits) size--; - if (uppers) size--; - if (lowers) size--; - if (others) size--; + if (digits) + size--; + if (uppers) + size--; + if (lowers) + size--; + if (others) + size--; if (size <= i) return 0; @@ -136,52 +130,53 @@ simple(const char *old, const char *new) return 1; } -static char * -str_lower(char *string) +static char *str_lower (char *string) { char *cp; for (cp = string; *cp; cp++) - *cp = tolower(*cp); + *cp = tolower (*cp); return string; } -static const char * -password_check(const char *old, const char *new, const struct passwd *pwdp) +static const char *password_check (const char *old, const char *new, + const struct passwd *pwdp) { const char *msg = NULL; char *oldmono, *newmono, *wrapped; + #ifdef HAVE_LIBCRACK char *dictpath; + #ifdef HAVE_LIBCRACK_PW - char *FascistCheckPw(); + char *FascistCheckPw (); #else - char *FascistCheck(); + char *FascistCheck (); #endif #endif - if (strcmp(new, old) == 0) + if (strcmp (new, old) == 0) return "no change"; - newmono = str_lower(xstrdup(new)); - oldmono = str_lower(xstrdup(old)); - wrapped = xmalloc(strlen(oldmono) * 2 + 1); + newmono = str_lower (xstrdup (new)); + oldmono = str_lower (xstrdup (old)); + wrapped = xmalloc (strlen (oldmono) * 2 + 1); strcpy (wrapped, oldmono); strcat (wrapped, oldmono); - if (palindrome(oldmono, newmono)) + if (palindrome (oldmono, newmono)) msg = "a palindrome"; - if (!msg && strcmp(oldmono, newmono) == 0) + if (!msg && strcmp (oldmono, newmono) == 0) msg = "case changes only"; - if (!msg && similar(oldmono, newmono)) + if (!msg && similar (oldmono, newmono)) msg = "too similar"; - if (!msg && simple(old, new)) + if (!msg && simple (old, new)) msg = "too simple"; - if (!msg && strstr(wrapped, newmono)) + if (!msg && strstr (wrapped, newmono)) msg = "rotated"; #ifdef HAVE_LIBCRACK @@ -189,49 +184,44 @@ password_check(const char *old, const char *new, const struct passwd *pwdp) * Invoke Alec Muffett's cracklib routines. */ - if (!msg && (dictpath = getdef_str("CRACKLIB_DICTPATH"))) + if (!msg && (dictpath = getdef_str ("CRACKLIB_DICTPATH"))) #ifdef HAVE_LIBCRACK_PW - msg = FascistCheckPw(new, dictpath, pwdp); + msg = FascistCheckPw (new, dictpath, pwdp); #else - msg = FascistCheck(new, dictpath); + msg = FascistCheck (new, dictpath); #endif #endif - strzero(newmono); - strzero(oldmono); - strzero(wrapped); - free(newmono); - free(oldmono); - free(wrapped); + strzero (newmono); + strzero (oldmono); + strzero (wrapped); + free (newmono); + free (oldmono); + free (wrapped); return msg; } -/*ARGSUSED*/ -static const char * -obscure_msg(const char *old, const char *new, const struct passwd *pwdp) + /*ARGSUSED*/ + static const char *obscure_msg (const char *old, const char *new, + const struct passwd *pwdp) { int maxlen, oldlen, newlen; char *new1, *old1; const char *msg; - oldlen = strlen(old); - newlen = strlen(new); + oldlen = strlen (old); + newlen = strlen (new); -#if 0 /* why not check the password when set for the first time? --marekm */ - if (old[0] == '\0') - return NULL; -#endif - - if ( newlen < getdef_num("PASS_MIN_LEN", 0) ) + if (newlen < getdef_num ("PASS_MIN_LEN", 0)) return "too short"; /* * Remaining checks are optional. */ - if (!getdef_bool("OBSCURE_CHECKS_ENAB")) + if (!getdef_bool ("OBSCURE_CHECKS_ENAB")) return NULL; - msg = password_check(old, new, pwdp); + msg = password_check (old, new, pwdp); if (msg) return msg; @@ -241,26 +231,26 @@ obscure_msg(const char *old, const char *new, const struct passwd *pwdp) Example: "password$%^&*123". So check it again, this time truncated to the maximum length. Idea from npasswd. --marekm */ - if (getdef_bool("MD5_CRYPT_ENAB")) - return NULL; /* unlimited password length */ + if (getdef_bool ("MD5_CRYPT_ENAB")) + return NULL; /* unlimited password length */ - maxlen = getdef_num("PASS_MAX_LEN", 8); + maxlen = getdef_num ("PASS_MAX_LEN", 8); if (oldlen <= maxlen && newlen <= maxlen) return NULL; - new1 = xstrdup(new); - old1 = xstrdup(old); + new1 = xstrdup (new); + old1 = xstrdup (old); if (newlen > maxlen) new1[maxlen] = '\0'; if (oldlen > maxlen) old1[maxlen] = '\0'; - msg = password_check(old1, new1, pwdp); + msg = password_check (old1, new1, pwdp); - memzero(new1, newlen); - memzero(old1, oldlen); - free(new1); - free(old1); + memzero (new1, newlen); + memzero (old1, oldlen); + free (new1); + free (old1); return msg; } @@ -273,14 +263,13 @@ obscure_msg(const char *old, const char *new, const struct passwd *pwdp) * check passwords. */ -int -obscure(const char *old, const char *new, const struct passwd *pwdp) +int obscure (const char *old, const char *new, const struct passwd *pwdp) { - const char *msg = obscure_msg(old, new, pwdp); + const char *msg = obscure_msg (old, new, pwdp); + if (msg) { - printf(_("Bad password: %s. "), msg); + printf (_("Bad password: %s. "), msg); return 0; } return 1; } - diff --git a/libmisc/pam_pass.c b/libmisc/pam_pass.c index 68297aa4..dfd8bdff 100644 --- a/libmisc/pam_pass.c +++ b/libmisc/pam_pass.c @@ -3,7 +3,7 @@ #ifdef USE_PAM #include "rcsid.h" -RCSID("$Id: pam_pass.c,v 1.7 2001/06/28 20:47:06 kloczek Exp $") +RCSID ("$Id: pam_pass.c,v 1.9 2003/07/29 09:05:39 kloczek Exp $") /* * Change the user's password using PAM. Requires libpam and libpam_misc @@ -11,23 +11,18 @@ RCSID("$Id: pam_pass.c,v 1.7 2001/06/28 20:47:06 kloczek Exp $") * so you may have to port it if you want to use this code on non-Linux * systems with PAM (such as Solaris 2.6). --marekm */ - #include #include #include #include - #include "defines.h" - #include "pam_defs.h" - static const struct pam_conv conv = { misc_conv, NULL }; -void -do_pam_passwd(const char *user, int silent, int change_expired) +void do_pam_passwd (const char *user, int silent, int change_expired) { pam_handle_t *pamh = NULL; int flags = 0, ret; @@ -37,22 +32,24 @@ do_pam_passwd(const char *user, int silent, int change_expired) if (change_expired) flags |= PAM_CHANGE_EXPIRED_AUTHTOK; - ret = pam_start("passwd", user, &conv, &pamh); + ret = pam_start ("passwd", user, &conv, &pamh); if (ret != PAM_SUCCESS) { - fprintf(stderr, _("passwd: pam_start() failed, error %d\n"), - ret); - exit(10); /* XXX */ + fprintf (stderr, + _("passwd: pam_start() failed, error %d\n"), ret); + exit (10); /* XXX */ } - ret = pam_chauthtok(pamh, flags); + ret = pam_chauthtok (pamh, flags); if (ret != PAM_SUCCESS) { - fprintf(stderr, _("passwd: %s\n"), pam_strerror(pamh, ret)); - pam_end(pamh, ret); - exit(10); /* XXX */ + fprintf (stderr, _("passwd: %s\n"), + pam_strerror (pamh, ret)); + pam_end (pamh, ret); + exit (10); /* XXX */ } - pam_end(pamh, PAM_SUCCESS); + fputs(_("passwd: password updated successfully\n"), stderr); + pam_end (pamh, PAM_SUCCESS); } -#else /* !USE_PAM */ -extern int errno; /* warning: ANSI C forbids an empty source file */ -#endif /* !USE_PAM */ +#else /* !USE_PAM */ +extern int errno; /* warning: ANSI C forbids an empty source file */ +#endif /* !USE_PAM */ diff --git a/libmisc/pwd2spwd.c b/libmisc/pwd2spwd.c index e53d96ab..ee1c675d 100644 --- a/libmisc/pwd2spwd.c +++ b/libmisc/pwd2spwd.c @@ -32,14 +32,12 @@ #ifdef SHADOWPWD #include "rcsid.h" -RCSID("$Id: pwd2spwd.c,v 1.3 1997/12/07 23:27:07 marekm Exp $") - +RCSID ("$Id: pwd2spwd.c,v 1.5 2003/05/03 16:14:34 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" #include - -extern time_t time (); +extern time_t time (); /* * pwd_to_spwd - create entries for new spwd structure @@ -48,8 +46,7 @@ extern time_t time (); * information in the pointed-to (struct passwd). */ -struct spwd * -pwd_to_spwd(const struct passwd *pw) +struct spwd *pwd_to_spwd (const struct passwd *pw) { static struct spwd sp; @@ -60,33 +57,13 @@ pwd_to_spwd(const struct passwd *pw) sp.sp_namp = pw->pw_name; sp.sp_pwdp = pw->pw_passwd; -#ifdef ATT_AGE - /* - * AT&T-style password aging maps the sp_min, sp_max, and - * sp_lstchg information from the pw_age field, which appears - * after the encrypted password. - */ - if (pw->pw_age[0]) { - sp.sp_max = (c64i(pw->pw_age[0]) * WEEK) / SCALE; - - if (pw->pw_age[1]) - sp.sp_min = (c64i(pw->pw_age[1]) * WEEK) / SCALE; - else - sp.sp_min = (10000L * DAY) / SCALE; - - if (pw->pw_age[1] && pw->pw_age[2]) - sp.sp_lstchg = (a64l(pw->pw_age + 2) * WEEK) / SCALE; - else - sp.sp_lstchg = time((time_t *) 0) / SCALE; - } else -#endif { /* * Defaults used if there is no pw_age information. */ sp.sp_min = 0; sp.sp_max = (10000L * DAY) / SCALE; - sp.sp_lstchg = time((time_t *) 0) / SCALE; + sp.sp_lstchg = time ((time_t *) 0) / SCALE; } /* @@ -100,4 +77,4 @@ pwd_to_spwd(const struct passwd *pw) return &sp; } -#endif /* SHADOWPWD */ +#endif /* SHADOWPWD */ diff --git a/libmisc/pwd_init.c b/libmisc/pwd_init.c index e09f02bd..6930ae46 100644 --- a/libmisc/pwd_init.c +++ b/libmisc/pwd_init.c @@ -2,72 +2,67 @@ #include #include "rcsid.h" -RCSID("$Id: pwd_init.c,v 1.1 1997/12/07 23:27:07 marekm Exp $") - +RCSID ("$Id: pwd_init.c,v 1.2 2003/04/22 10:59:22 kloczek Exp $") #include "defines.h" #include #include #include - #ifdef HAVE_SYS_RESOURCE_H #include #endif - /* * pwd_init - ignore signals, and set resource limits to safe * values. Call this before modifying password files, so that * it is less likely to fail in the middle of operation. */ -void -pwd_init(void) +void pwd_init (void) { #ifdef HAVE_SYS_RESOURCE_H struct rlimit rlim; #ifdef RLIMIT_CORE rlim.rlim_cur = rlim.rlim_max = 0; - setrlimit(RLIMIT_CORE, &rlim); + setrlimit (RLIMIT_CORE, &rlim); #endif rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY; #ifdef RLIMIT_AS - setrlimit(RLIMIT_AS, &rlim); + setrlimit (RLIMIT_AS, &rlim); #endif #ifdef RLIMIT_CPU - setrlimit(RLIMIT_CPU, &rlim); + setrlimit (RLIMIT_CPU, &rlim); #endif #ifdef RLIMIT_DATA - setrlimit(RLIMIT_DATA, &rlim); + setrlimit (RLIMIT_DATA, &rlim); #endif #ifdef RLIMIT_FSIZE - setrlimit(RLIMIT_FSIZE, &rlim); + setrlimit (RLIMIT_FSIZE, &rlim); #endif #ifdef RLIMIT_NOFILE - setrlimit(RLIMIT_NOFILE, &rlim); + setrlimit (RLIMIT_NOFILE, &rlim); #endif #ifdef RLIMIT_RSS - setrlimit(RLIMIT_RSS, &rlim); + setrlimit (RLIMIT_RSS, &rlim); #endif #ifdef RLIMIT_STACK - setrlimit(RLIMIT_STACK, &rlim); + setrlimit (RLIMIT_STACK, &rlim); #endif -#else /* !HAVE_SYS_RESOURCE_H */ - set_filesize_limit(30000); +#else /* !HAVE_SYS_RESOURCE_H */ + set_filesize_limit (30000); /* don't know how to set the other limits... */ -#endif /* !HAVE_SYS_RESOURCE_H */ +#endif /* !HAVE_SYS_RESOURCE_H */ - signal(SIGALRM, SIG_IGN); - signal(SIGHUP, SIG_IGN); - signal(SIGINT, SIG_IGN); - signal(SIGPIPE, SIG_IGN); - signal(SIGQUIT, SIG_IGN); - signal(SIGTERM, SIG_IGN); + signal (SIGALRM, SIG_IGN); + signal (SIGHUP, SIG_IGN); + signal (SIGINT, SIG_IGN); + signal (SIGPIPE, SIG_IGN); + signal (SIGQUIT, SIG_IGN); + signal (SIGTERM, SIG_IGN); #ifdef SIGTSTP - signal(SIGTSTP, SIG_IGN); + signal (SIGTSTP, SIG_IGN); #endif #ifdef SIGTTOU - signal(SIGTTOU, SIG_IGN); + signal (SIGTTOU, SIG_IGN); #endif - - umask(077); -} + umask (077); +} diff --git a/libmisc/pwdcheck.c b/libmisc/pwdcheck.c index 1de0125e..e676c30d 100644 --- a/libmisc/pwdcheck.c +++ b/libmisc/pwdcheck.c @@ -1,69 +1,62 @@ #include #include "rcsid.h" -RCSID("$Id: pwdcheck.c,v 1.1 2000/10/15 17:07:26 kloczek Exp $") - +RCSID ("$Id: pwdcheck.c,v 1.2 2003/04/22 10:59:22 kloczek Exp $") #include "prototypes.h" #include "defines.h" - #include #include "pwauth.h" - #ifdef HAVE_SHADOW_H #include #endif - #ifdef USE_PAM #include "pam_defs.h" #endif - #define WRONGPWD2 "incorrect password for `%s'" - void -passwd_check(const char *user, const char *passwd, const char *progname) +passwd_check (const char *user, const char *passwd, const char *progname) { #ifdef USE_PAM pam_handle_t *pamh = NULL; int retcode; struct pam_conv conv = { misc_conv, NULL }; - if (pam_start(progname, user, &conv, &pamh)) { -bailout: - SYSLOG((LOG_WARN, WRONGPWD2, user)); - sleep(1); - fprintf(stderr, _("Incorrect password for %s.\n"), user); - exit(1); + if (pam_start (progname, user, &conv, &pamh)) { + bailout: + SYSLOG ((LOG_WARN, WRONGPWD2, user)); + sleep (1); + fprintf (stderr, _("Incorrect password for %s.\n"), user); + exit (1); } - if (pam_authenticate(pamh, 0)) + if (pam_authenticate (pamh, 0)) goto bailout; - retcode = pam_acct_mgmt(pamh, 0); + retcode = pam_acct_mgmt (pamh, 0); if (retcode == PAM_NEW_AUTHTOK_REQD) { - retcode = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); + retcode = pam_chauthtok (pamh, PAM_CHANGE_EXPIRED_AUTHTOK); } else if (retcode) goto bailout; - if (pam_setcred(pamh, 0)) + if (pam_setcred (pamh, 0)) goto bailout; /* no need to establish a session; this isn't a session-oriented * activity... */ -#else /* !USE_PAM */ +#else /* !USE_PAM */ #ifdef SHADOWPWD struct spwd *sp; - if ((sp = getspnam(user))) + if ((sp = getspnam (user))) passwd = sp->sp_pwdp; - endspent(); + endspent (); #endif - if (pw_auth(passwd, user, PW_LOGIN, (char *) 0) != 0) { - SYSLOG((LOG_WARN, WRONGPWD2, user)); - sleep(1); - fprintf(stderr, _("Incorrect password for %s.\n"), user); - exit(1); + if (pw_auth (passwd, user, PW_LOGIN, (char *) 0) != 0) { + SYSLOG ((LOG_WARN, WRONGPWD2, user)); + sleep (1); + fprintf (stderr, _("Incorrect password for %s.\n"), user); + exit (1); } -#endif /* !USE_PAM */ +#endif /* !USE_PAM */ } - diff --git a/libmisc/rlogin.c b/libmisc/rlogin.c index d79cc1d9..b266e4f7 100644 --- a/libmisc/rlogin.c +++ b/libmisc/rlogin.c @@ -32,92 +32,105 @@ #ifdef RLOGIN #include "rcsid.h" -RCSID("$Id: rlogin.c,v 1.5 1999/08/27 19:02:51 marekm Exp $") - +RCSID ("$Id: rlogin.c,v 1.6 2003/04/22 10:59:22 kloczek Exp $") #include "prototypes.h" #include "defines.h" - #include #include - -extern int ruserok(); +extern int ruserok (); static struct { - int spd_name; - int spd_baud; -} speed_table [] = { + int spd_name; + int spd_baud; +} speed_table[] = +{ #ifdef B50 - { B50, 50 }, + { + B50, 50}, #endif #ifdef B75 - { B75, 75 }, + { + B75, 75}, #endif #ifdef B110 - { B110, 110 }, + { + B110, 110}, #endif #ifdef B134 - { B134, 134 }, + { + B134, 134}, #endif #ifdef B150 - { B150, 150 }, + { + B150, 150}, #endif #ifdef B200 - { B200, 200 }, + { + B200, 200}, #endif #ifdef B300 - { B300, 300 }, + { + B300, 300}, #endif #ifdef B600 - { B600, 600 }, + { + B600, 600}, #endif #ifdef B1200 - { B1200, 1200 }, + { + B1200, 1200}, #endif #ifdef B1800 - { B1800, 1800 }, + { + B1800, 1800}, #endif #ifdef B2400 - { B2400, 2400 }, + { + B2400, 2400}, #endif #ifdef B4800 - { B4800, 4800 }, + { + B4800, 4800}, #endif #ifdef B9600 - { B9600, 9600 }, + { + B9600, 9600}, #endif #ifdef B19200 - { B19200, 19200 }, + { + B19200, 19200}, #endif #ifdef B38400 - { B38400, 38400 }, + { + B38400, 38400}, #endif - { -1, -1 } + { + -1, -1} }; -static void -get_remote_string(char *buf, int size) +static void get_remote_string (char *buf, int size) { for (;;) { if (read (0, buf, 1) != 1) - exit (1); + exit (1); if (*buf == '\0') return; if (--size > 0) ++buf; } - /*NOTREACHED*/ -} + /*NOTREACHED*/} int -do_rlogin(const char *remote_host, char *name, int namelen, char *term, int termlen) +do_rlogin (const char *remote_host, char *name, int namelen, char *term, + int termlen) { - struct passwd *pwd; - char remote_name[32]; - char *cp; - int remote_speed = 9600; - int speed_name = B9600; - int i; - TERMIO termio; + struct passwd *pwd; + char remote_name[32]; + char *cp; + int remote_speed = 9600; + int speed_name = B9600; + int i; + TERMIO termio; get_remote_string (remote_name, sizeof remote_name); get_remote_string (name, namelen); @@ -126,12 +139,11 @@ do_rlogin(const char *remote_host, char *name, int namelen, char *term, int term if ((cp = strchr (term, '/'))) { *cp++ = '\0'; - if (! (remote_speed = atoi (cp))) + if (!(remote_speed = atoi (cp))) remote_speed = 9600; } - for (i = 0;speed_table[i].spd_baud != remote_speed && - speed_table[i].spd_name != -1;i++) - ; + for (i = 0; speed_table[i].spd_baud != remote_speed && + speed_table[i].spd_name != -1; i++); if (speed_table[i].spd_name != -1) speed_name = speed_table[i].spd_name; @@ -140,18 +152,18 @@ do_rlogin(const char *remote_host, char *name, int namelen, char *term, int term * Put the terminal in cooked mode with echo turned on. */ - GTTY(0, &termio); - termio.c_iflag |= ICRNL|IXON; - termio.c_oflag |= OPOST|ONLCR; - termio.c_lflag |= ICANON|ECHO|ECHOE; + GTTY (0, &termio); + termio.c_iflag |= ICRNL | IXON; + termio.c_oflag |= OPOST | ONLCR; + termio.c_lflag |= ICANON | ECHO | ECHOE; #ifdef CBAUD termio.c_cflag = (termio.c_cflag & ~CBAUD) | speed_name; #else termio.c_cflag = (termio.c_cflag) | speed_name; #endif - STTY(0, &termio); + STTY (0, &termio); - if (! (pwd = getpwnam (name))) + if (!(pwd = getpwnam (name))) return 0; /* @@ -165,7 +177,7 @@ do_rlogin(const char *remote_host, char *name, int namelen, char *term, int term return 0; #else return ruserok (remote_host, pwd->pw_uid == 0, - remote_name, name) == RUSEROK; + remote_name, name) == RUSEROK; #endif } -#endif /* RLOGIN */ +#endif /* RLOGIN */ diff --git a/libmisc/salt.c b/libmisc/salt.c index b5478e45..fafa429e 100644 --- a/libmisc/salt.c +++ b/libmisc/salt.c @@ -8,16 +8,13 @@ #include #include "rcsid.h" -RCSID("$Id: salt.c,v 1.5 1997/12/07 23:27:09 marekm Exp $") - +RCSID ("$Id: salt.c,v 1.6 2003/04/22 10:59:22 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include - #if 1 #include "getdef.h" - -extern char *l64a(); +extern char *l64a (); /* * Generate 8 base64 ASCII characters of random salt. If MD5_CRYPT_ENAB @@ -25,45 +22,42 @@ extern char *l64a(); * (magic) and pw_encrypt() will execute the MD5-based FreeBSD-compatible * version of crypt() instead of the standard one. */ -char * -crypt_make_salt(void) +char *crypt_make_salt (void) { struct timeval tv; static char result[40]; result[0] = '\0'; - if (getdef_bool("MD5_CRYPT_ENAB")) { - strcpy(result, "$1$"); /* magic for the new MD5 crypt() */ + if (getdef_bool ("MD5_CRYPT_ENAB")) { + strcpy (result, "$1$"); /* magic for the new MD5 crypt() */ } /* * Generate 8 chars of salt, the old crypt() will use only first 2. */ - gettimeofday(&tv, (struct timezone *) 0); - strcat(result, l64a(tv.tv_usec)); - strcat(result, l64a(tv.tv_sec + getpid() + clock())); + gettimeofday (&tv, (struct timezone *) 0); + strcat (result, l64a (tv.tv_usec)); + strcat (result, l64a (tv.tv_sec + getpid () + clock ())); - if (strlen(result) > 3 + 8) /* magic+salt */ + if (strlen (result) > 3 + 8) /* magic+salt */ result[11] = '\0'; return result; } #else - /* * This is the old style random salt generator... */ -char * -crypt_make_salt(void) +char *crypt_make_salt (void) { time_t now; static unsigned long x; static char result[3]; - time(&now); - x += now + getpid() + clock(); - result[0] = i64c(((x >> 18) ^ (x >> 6)) & 077); - result[1] = i64c(((x >> 12) ^ x) & 077); + time (&now); + x += now + getpid () + clock (); + result[0] = i64c (((x >> 18) ^ (x >> 6)) & 077); + result[1] = i64c (((x >> 12) ^ x) & 077); result[2] = '\0'; return result; } diff --git a/libmisc/setugid.c b/libmisc/setugid.c index 5dae7659..030975e0 100644 --- a/libmisc/setugid.c +++ b/libmisc/setugid.c @@ -34,35 +34,29 @@ #include #include "rcsid.h" -RCSID("$Id: setugid.c,v 1.6 1998/07/23 22:13:16 marekm Exp $") - +RCSID ("$Id: setugid.c,v 1.7 2003/04/22 10:59:22 kloczek Exp $") #include #include - #include "prototypes.h" #include "defines.h" #include - #include "getdef.h" - /* * setup_uid_gid() split in two functions for PAM support - * pam_setcred() needs to be called after initgroups(), but * before setuid(). */ - -int -setup_groups(const struct passwd *info) +int setup_groups (const struct passwd *info) { /* * Set the real group ID to the primary group ID in the password * file. */ if (setgid (info->pw_gid) == -1) { - perror("setgid"); - SYSLOG((LOG_ERR, "bad group ID `%d' for user `%s': %m\n", - info->pw_gid, info->pw_name)); - closelog(); + perror ("setgid"); + SYSLOG ((LOG_ERR, "bad group ID `%d' for user `%s': %m\n", + info->pw_gid, info->pw_name)); + closelog (); return -1; } #ifdef HAVE_INITGROUPS @@ -70,33 +64,32 @@ setup_groups(const struct passwd *info) * For systems which support multiple concurrent groups, go get * the group set from the /etc/group file. */ - if (initgroups(info->pw_name, info->pw_gid) == -1) { - perror("initgroups"); - SYSLOG((LOG_ERR, "initgroups failed for user `%s': %m\n", - info->pw_name)); - closelog(); + if (initgroups (info->pw_name, info->pw_gid) == -1) { + perror ("initgroups"); + SYSLOG ((LOG_ERR, "initgroups failed for user `%s': %m\n", + info->pw_name)); + closelog (); return -1; } #endif return 0; } -int -change_uid(const struct passwd *info) +int change_uid (const struct passwd *info) { /* * Set the real UID to the UID value in the password file. */ #ifndef BSD - if (setuid(info->pw_uid)) + if (setuid (info->pw_uid)) #else - if (setreuid(info->pw_uid, info->pw_uid)) + if (setreuid (info->pw_uid, info->pw_uid)) #endif { - perror("setuid"); - SYSLOG((LOG_ERR, "bad user ID `%d' for user `%s': %m\n", - (int) info->pw_uid, info->pw_name)); - closelog(); + perror ("setuid"); + SYSLOG ((LOG_ERR, "bad user ID `%d' for user `%s': %m\n", + (int) info->pw_uid, info->pw_name)); + closelog (); return -1; } return 0; @@ -113,21 +106,21 @@ change_uid(const struct passwd *info) * Returns 0 on success, or -1 on failure. */ -int -setup_uid_gid(const struct passwd *info, int is_console) +int setup_uid_gid (const struct passwd *info, int is_console) { - if (setup_groups(info) < 0) + if (setup_groups (info) < 0) return -1; #ifdef HAVE_INITGROUPS if (is_console) { - char *cp = getdef_str("CONSOLE_GROUPS"); - if (cp && add_groups(cp)) - perror("Warning: add_groups"); - } -#endif /* HAVE_INITGROUPS */ + char *cp = getdef_str ("CONSOLE_GROUPS"); - if (change_uid(info) < 0) + if (cp && add_groups (cp)) + perror ("Warning: add_groups"); + } +#endif /* HAVE_INITGROUPS */ + + if (change_uid (info) < 0) return -1; return 0; diff --git a/libmisc/setup.c b/libmisc/setup.c index 7b8df91b..e31a898a 100644 --- a/libmisc/setup.c +++ b/libmisc/setup.c @@ -30,12 +30,10 @@ #include #include "rcsid.h" -RCSID("$Id: setup.c,v 1.3 1997/12/07 23:27:09 marekm Exp $") - +RCSID ("$Id: setup.c,v 1.4 2003/04/22 10:59:22 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include - /* * setup - initialize login environment * @@ -49,24 +47,22 @@ RCSID("$Id: setup.c,v 1.3 1997/12/07 23:27:09 marekm Exp $") * set the HOME, SHELL, MAIL, PATH, and LOGNAME or USER environmental * variables. */ - -void -setup(struct passwd *info) +void setup (struct passwd *info) { /* * Set resource limits. */ - setup_limits(info); + setup_limits (info); /* * Set the real group ID, do initgroups, and set the real user ID * to the value in the password file. */ - if (setup_uid_gid(info, 0)) - exit(1); + if (setup_uid_gid (info, 0)) + exit (1); /* * Change to the home directory, and set up environment. */ - setup_env(info); + setup_env (info); } diff --git a/libmisc/setupenv.c b/libmisc/setupenv.c index 35ffb21e..fff04366 100644 --- a/libmisc/setupenv.c +++ b/libmisc/setupenv.c @@ -34,51 +34,47 @@ #include #include "rcsid.h" -RCSID("$Id: setupenv.c,v 1.11 2001/11/06 15:50:25 kloczek Exp $") - +RCSID ("$Id: setupenv.c,v 1.13 2003/05/05 21:44:15 kloczek Exp $") #include #include - #include #include - #include "prototypes.h" #include "defines.h" #include #include "getdef.h" - static void -addenv_path(const char *varname, const char *dirname, const char *filename) +addenv_path (const char *varname, const char *dirname, + const char *filename) { char *buf; - buf = xmalloc(strlen(dirname) + strlen(filename) + 2); - sprintf(buf, "%s/%s", dirname, filename); - addenv(varname, buf); - free(buf); + buf = xmalloc (strlen (dirname) + strlen (filename) + 2); + sprintf (buf, "%s/%s", dirname, filename); + addenv (varname, buf); + free (buf); } #ifndef USE_PAM -static void -read_env_file(const char *filename) +static void read_env_file (const char *filename) { FILE *fp; char buf[1024]; char *cp, *name, *val; - fp = fopen(filename, "r"); + fp = fopen (filename, "r"); if (!fp) return; - while (fgets(buf, sizeof buf, fp) == buf) { - cp = strrchr(buf, '\n'); + while (fgets (buf, sizeof buf, fp) == buf) { + cp = strrchr (buf, '\n'); if (!cp) break; *cp = '\0'; cp = buf; /* ignore whitespace and comments */ - while (*cp && isspace(*cp)) + while (*cp && isspace (*cp)) cp++; if (*cp == '\0' || *cp == '#') continue; @@ -87,14 +83,14 @@ read_env_file(const char *filename) * (for example, the "export NAME" shell commands) */ name = cp; - while (*cp && !isspace(*cp) && *cp != '=') + while (*cp && !isspace (*cp) && *cp != '=') cp++; if (*cp != '=') continue; /* NUL-terminate the name */ *cp++ = '\0'; val = cp; -#if 0 /* XXX untested, and needs rewrite with fewer goto's :-) */ +#if 0 /* XXX untested, and needs rewrite with fewer goto's :-) */ /* (state, char_type) -> (state, action) @@ -102,28 +98,28 @@ read_env_file(const char *filename) char_type: normal, white, backslash, single, double action: remove_curr, remove_curr_skip_next, remove_prev, finish XXX */ -no_quote: + no_quote: if (*cp == '\\') { /* remove the backslash */ - remove_char(cp); + remove_char (cp); /* skip over the next character */ if (*cp) cp++; goto no_quote; } else if (*cp == '\'') { /* remove the quote */ - remove_char(cp); + remove_char (cp); /* now within single quotes */ goto s_quote; } else if (*cp == '"') { /* remove the quote */ - remove_char(cp); + remove_char (cp); /* now within double quotes */ goto d_quote; } else if (*cp == '\0') { /* end of string */ goto finished; - } else if (isspace(*cp)) { + } else if (isspace (*cp)) { /* unescaped whitespace - end of string */ *cp = '\0'; goto finished; @@ -131,10 +127,10 @@ no_quote: cp++; goto no_quote; } -s_quote: + s_quote: if (*cp == '\'') { /* remove the quote */ - remove_char(cp); + remove_char (cp); /* unquoted again */ goto no_quote; } else if (*cp == '\0') { @@ -145,10 +141,10 @@ s_quote: cp++; goto s_quote; } -d_quote: + d_quote: if (*cp == '\"') { /* remove the quote */ - remove_char(cp); + remove_char (cp); /* unquoted again */ goto no_quote; } else if (*cp == '\\') { @@ -156,28 +152,29 @@ d_quote: /* if backslash followed by double quote, remove backslash else skip over the backslash and following char */ if (*cp == '"') - remove_char(cp - 1); + remove_char (cp - 1); else if (*cp) cp++; goto d_quote; - } eise if (*cp == '\0') { + } + eise if (*cp == '\0') { /* end of string */ goto finished; } else { /* preserve everything within double quotes */ goto d_quote; } -finished: -#endif /* 0 */ + finished: +#endif /* 0 */ /* * XXX - should handle quotes, backslash escapes, etc. * like the shell does. */ - addenv(name, val); + addenv (name, val); } - fclose(fp); + fclose (fp); } -#endif /* USE_PAM */ +#endif /* USE_PAM */ /* @@ -186,8 +183,7 @@ finished: * variables. */ -void -setup_env(struct passwd *info) +void setup_env (struct passwd *info) { #ifndef USE_PAM char *envf; @@ -205,18 +201,19 @@ setup_env(struct passwd *info) * this a configurable option. --marekm */ - if (chdir(info->pw_dir) == -1) { + if (chdir (info->pw_dir) == -1) { static char temp_pw_dir[] = "/"; - if (!getdef_bool("DEFAULT_HOME") || chdir("/") == -1) { - fprintf(stderr, _("Unable to cd to \"%s\"\n"), - info->pw_dir); - SYSLOG((LOG_WARN, - "unable to cd to `%s' for user `%s'\n", - info->pw_dir, info->pw_name)); - closelog(); + + if (!getdef_bool ("DEFAULT_HOME") || chdir ("/") == -1) { + fprintf (stderr, _("Unable to cd to \"%s\"\n"), + info->pw_dir); + SYSLOG ((LOG_WARN, + "unable to cd to `%s' for user `%s'\n", + info->pw_dir, info->pw_name)); + closelog (); exit (1); } - puts(_("No directory, logging in with HOME=/")); + puts (_("No directory, logging in with HOME=/")); info->pw_dir = temp_pw_dir; } @@ -224,67 +221,64 @@ setup_env(struct passwd *info) * Create the HOME environmental variable and export it. */ - addenv("HOME", info->pw_dir); + addenv ("HOME", info->pw_dir); /* * Create the SHELL environmental variable and export it. */ - if (info->pw_shell == (char *) 0 || ! *info->pw_shell) { + if (info->pw_shell == (char *) 0 || !*info->pw_shell) { static char temp_pw_shell[] = "/bin/sh"; + info->pw_shell = temp_pw_shell; } - addenv("SHELL", info->pw_shell); + addenv ("SHELL", info->pw_shell); /* * Create the PATH environmental variable and export it. */ - cp = getdef_str((info->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH"); -#if 0 - addenv(cp ? cp : "PATH=/bin:/usr/bin", NULL); -#else + cp = getdef_str ((info->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH"); if (!cp) { /* not specified, use a minimal default */ - addenv("PATH=/bin:/usr/bin", NULL); - } else if (strchr(cp, '=')) { + addenv ("PATH=/bin:/usr/bin", NULL); + } else if (strchr (cp, '=')) { /* specified as name=value (PATH=...) */ - addenv(cp, NULL); + addenv (cp, NULL); } else { /* only value specified without "PATH=" */ - addenv("PATH", cp); + addenv ("PATH", cp); } -#endif /* * Export the user name. For BSD derived systems, it's "USER", for * all others it's "LOGNAME". We set both of them. */ - addenv("USER", info->pw_name); - addenv("LOGNAME", info->pw_name); + addenv ("USER", info->pw_name); + addenv ("LOGNAME", info->pw_name); /* * MAILDIR environment variable for Qmail */ - if ((cp=getdef_str("QMAIL_DIR"))) - addenv_path("MAILDIR", info->pw_dir, cp); + if ((cp = getdef_str ("QMAIL_DIR"))) + addenv_path ("MAILDIR", info->pw_dir, cp); /* * Create the MAIL environmental variable and export it. login.defs * knows the prefix. */ - if ((cp=getdef_str("MAIL_DIR"))) - addenv_path("MAIL", cp, info->pw_name); - else if ((cp=getdef_str("MAIL_FILE"))) - addenv_path("MAIL", info->pw_dir, cp); + if ((cp = getdef_str ("MAIL_DIR"))) + addenv_path ("MAIL", cp, info->pw_name); + else if ((cp = getdef_str ("MAIL_FILE"))) + addenv_path ("MAIL", info->pw_dir, cp); else { #if defined(MAIL_SPOOL_FILE) - addenv_path("MAIL", info->pw_dir, MAIL_SPOOL_FILE); + addenv_path ("MAIL", info->pw_dir, MAIL_SPOOL_FILE); #elif defined(MAIL_SPOOL_DIR) - addenv_path("MAIL", MAIL_SPOOL_DIR, info->pw_name); + addenv_path ("MAIL", MAIL_SPOOL_DIR, info->pw_name); #endif } @@ -292,7 +286,7 @@ setup_env(struct passwd *info) /* * Read environment from optional config file. --marekm */ - if ((envf = getdef_str("ENVIRON_FILE"))) - read_env_file(envf); + if ((envf = getdef_str ("ENVIRON_FILE"))) + read_env_file (envf); #endif } diff --git a/libmisc/shell.c b/libmisc/shell.c index 23058f37..3ea6e5d1 100644 --- a/libmisc/shell.c +++ b/libmisc/shell.c @@ -30,14 +30,11 @@ #include #include "rcsid.h" -RCSID("$Id: shell.c,v 1.7 1998/12/28 20:34:53 marekm Exp $") - +RCSID ("$Id: shell.c,v 1.9 2003/05/05 21:49:56 kloczek Exp $") #include #include #include "prototypes.h" #include "defines.h" - - extern char **newenvp; extern size_t newenvc; @@ -54,8 +51,7 @@ extern size_t newenvc; * the file. If all that fails, give up in disgust ... */ -void -shell(const char *file, const char *arg) +void shell (const char *file, const char *arg) { char arg0[1024]; int err; @@ -71,11 +67,12 @@ shell(const char *file, const char *arg) */ if (arg == (char *) 0) { - snprintf(arg0, sizeof arg0, "-%s", Basename((char *) file)); + snprintf (arg0, sizeof arg0, "-%s", + Basename ((char *) file)); arg = arg0; } #ifdef DEBUG - printf (_("Executing shell %s\n"), file); + printf ("Executing shell %s\n", file); #endif /* @@ -98,7 +95,7 @@ shell(const char *file, const char *arg) */ if (err == ENOEXEC) { - FILE *fp; + FILE *fp; if ((fp = fopen (file, "r"))) { if (getc (fp) == '#' && getc (fp) == '!') { @@ -119,8 +116,8 @@ shell(const char *file, const char *arg) * up in disgust ... */ - snprintf(arg0, sizeof arg0, _("Cannot execute %s"), file); + snprintf (arg0, sizeof arg0, _("Cannot execute %s"), file); errno = err; - perror(arg0); - exit(1); + perror (arg0); + exit (1); } diff --git a/libmisc/strtoday.c b/libmisc/strtoday.c index 4870f9df..3dd51b8f 100644 --- a/libmisc/strtoday.c +++ b/libmisc/strtoday.c @@ -34,18 +34,13 @@ #include #include "rcsid.h" -RCSID("$Id: strtoday.c,v 1.8 1999/03/07 19:14:42 marekm Exp $") - +RCSID ("$Id: strtoday.c,v 1.9 2003/04/22 10:59:22 kloczek Exp $") #include "defines.h" - #ifndef USE_GETDATE #define USE_GETDATE 1 #endif - #if USE_GETDATE - #include "getdate.h" - /* * strtoday() now uses get_date() (borrowed from GNU shellutils) * which can handle many date formats, for example: @@ -60,8 +55,7 @@ RCSID("$Id: strtoday.c,v 1.8 1999/03/07 19:14:42 marekm Exp $") * 24-sep-72 * 24sep72 */ -long -strtoday(const char *str) +long strtoday (const char *str) { time_t t; @@ -73,20 +67,18 @@ strtoday(const char *str) if (!str || *str == '\0') return -1; - t = get_date(str, (time_t *) 0); - if (t == (time_t) -1) + t = get_date (str, (time_t *) 0); + if (t == (time_t) - 1) return -1; /* convert seconds to days since 1970-01-01 */ - return (t + DAY/2)/DAY; + return (t + DAY / 2) / DAY; } -#else /* !USE_GETDATE */ +#else /* !USE_GETDATE */ /* * Old code, just in case get_date() doesn't work as expected... */ - #include - #ifdef HAVE_STRPTIME /* * for now we allow just one format, but we can define more later @@ -102,14 +94,15 @@ static char *date_formats[] = { * current month, and the cummulative number of days in the preceding * months. they are declared so that january is 1, not 0. */ +static short days[13] = { 0, + 31, 28, 31, 30, 31, 30, /* JAN - JUN */ + 31, 31, 30, 31, 30, 31 +}; /* JUL - DEC */ -static short days[13] = { 0, - 31, 28, 31, 30, 31, 30, /* JAN - JUN */ - 31, 31, 30, 31, 30, 31 }; /* JUL - DEC */ - -static short juldays[13] = { 0, - 0, 31, 59, 90, 120, 151, /* JAN - JUN */ - 181, 212, 243, 273, 304, 334 }; /* JUL - DEC */ +static short juldays[13] = { 0, + 0, 31, 59, 90, 120, 151, /* JAN - JUN */ + 181, 212, 243, 273, 304, 334 +}; /* JUL - DEC */ #endif /* @@ -120,34 +113,33 @@ static short juldays[13] = { 0, * it having a day number of 0. */ -long -strtoday(const char *str) +long strtoday (const char *str) { #ifdef HAVE_STRPTIME struct tm tp; - char * const *fmt; + char *const *fmt; char *cp; time_t result; - memzero(&tp, sizeof tp); + memzero (&tp, sizeof tp); for (fmt = date_formats; *fmt; fmt++) { - cp = strptime((char *) str, *fmt, &tp); + cp = strptime ((char *) str, *fmt, &tp); if (!cp || *cp != '\0') continue; - result = mktime(&tp); - if (result == (time_t) -1) + result = mktime (&tp); + if (result == (time_t) - 1) continue; - return result / DAY; /* success */ + return result / DAY; /* success */ } return -1; #else - char slop[2]; - int month; - int day; - int year; - long total; + char slop[2]; + int month; + int day; + int year; + long total; /* * start by separating the month, day and year. the order @@ -198,10 +190,11 @@ strtoday(const char *str) */ total = (long) ((year - 1970) * 365L) + (((year + 1) - 1970) / 4); - total += (long) juldays[month] + (month > 2 && (year % 4) == 0 ? 1:0); + total += (long) juldays[month] + (month > 2 + && (year % 4) == 0 ? 1 : 0); total += (long) day - 1; return total; -#endif /* HAVE_STRPTIME */ +#endif /* HAVE_STRPTIME */ } -#endif /* !USE_GETDATE */ +#endif /* !USE_GETDATE */ diff --git a/libmisc/sub.c b/libmisc/sub.c index 88f2df03..57c7a574 100644 --- a/libmisc/sub.c +++ b/libmisc/sub.c @@ -30,17 +30,13 @@ #include #include "rcsid.h" -RCSID("$Id: sub.c,v 1.6 1999/03/07 19:14:43 marekm Exp $") - +RCSID ("$Id: sub.c,v 1.7 2003/04/22 10:59:22 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" - #include - #define BAD_SUBROOT2 "invalid root `%s' for user `%s'\n" #define NO_SUBROOT2 "no subsystem root `%s' for user `%s'\n" - /* * subsystem - change to subsystem root * @@ -49,18 +45,16 @@ RCSID("$Id: sub.c,v 1.6 1999/03/07 19:14:43 marekm Exp $") * directory will be used as the root of a new filesystem which * the user is actually logged into. */ - -void -subsystem(const struct passwd *pw) +void subsystem (const struct passwd *pw) { /* * The new root directory must begin with a "/" character. */ if (pw->pw_dir[0] != '/') { - printf(_("Invalid root directory \"%s\"\n"), pw->pw_dir); - SYSLOG((LOG_WARN, BAD_SUBROOT2, pw->pw_dir, pw->pw_name)); - closelog(); + printf (_("Invalid root directory \"%s\"\n"), pw->pw_dir); + SYSLOG ((LOG_WARN, BAD_SUBROOT2, pw->pw_dir, pw->pw_name)); + closelog (); exit (1); } @@ -70,9 +64,10 @@ subsystem(const struct passwd *pw) */ if (chdir (pw->pw_dir) || chroot (pw->pw_dir)) { - printf(_("Can't change root directory to \"%s\"\n"), pw->pw_dir); - SYSLOG((LOG_WARN, NO_SUBROOT2, pw->pw_dir, pw->pw_name)); - closelog(); + printf (_("Can't change root directory to \"%s\"\n"), + pw->pw_dir); + SYSLOG ((LOG_WARN, NO_SUBROOT2, pw->pw_dir, pw->pw_name)); + closelog (); exit (1); } } diff --git a/libmisc/sulog.c b/libmisc/sulog.c index cc7d51fd..3ed429fe 100644 --- a/libmisc/sulog.c +++ b/libmisc/sulog.c @@ -30,8 +30,7 @@ #include #include "rcsid.h" -RCSID("$Id: sulog.c,v 1.6 2001/08/23 23:17:37 kloczek Exp $") - +RCSID ("$Id: sulog.c,v 1.7 2003/04/22 10:59:22 kloczek Exp $") #include #include #include @@ -39,13 +38,11 @@ RCSID("$Id: sulog.c,v 1.6 2001/08/23 23:17:37 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include "getdef.h" - /* * sulog - log a SU command execution result */ - void -sulog(const char *tty, int success, const char *oldname, const char *name) +sulog (const char *tty, int success, const char *oldname, const char *name) { char *sulog_file; time_t now; @@ -53,22 +50,22 @@ sulog(const char *tty, int success, const char *oldname, const char *name) FILE *fp; mode_t oldmask; - if ((sulog_file = getdef_str("SULOG_FILE")) == (char *) 0) + if ((sulog_file = getdef_str ("SULOG_FILE")) == (char *) 0) return; - oldmask = umask(077); - fp = fopen(sulog_file, "a+"); - umask(oldmask); + oldmask = umask (077); + fp = fopen (sulog_file, "a+"); + umask (oldmask); if (fp == (FILE *) 0) - return; /* can't open or create logfile */ + return; /* can't open or create logfile */ - time(&now); - tm = localtime(&now); + time (&now); + tm = localtime (&now); - fprintf(fp, "SU %.02d/%.02d %.02d:%.02d %c %s %s-%s\n", - tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, - success ? '+':'-', tty, oldname, name); + fprintf (fp, "SU %.02d/%.02d %.02d:%.02d %c %s %s-%s\n", + tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, + success ? '+' : '-', tty, oldname, name); - fflush(fp); - fclose(fp); + fflush (fp); + fclose (fp); } diff --git a/libmisc/ttytype.c b/libmisc/ttytype.c index 965dc7f1..de3b9e16 100644 --- a/libmisc/ttytype.c +++ b/libmisc/ttytype.c @@ -30,41 +30,38 @@ #include #include "rcsid.h" -RCSID("$Id: ttytype.c,v 1.5 1997/12/07 23:27:10 marekm Exp $") - +RCSID ("$Id: ttytype.c,v 1.6 2003/04/22 10:59:22 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" #include "getdef.h" - -extern char *getenv(); +extern char *getenv (); /* * ttytype - set ttytype from port to terminal type mapping database */ -void -ttytype(const char *line) +void ttytype (const char *line) { - FILE *fp; - char buf[BUFSIZ]; - char *typefile; - char *cp; - char type[BUFSIZ]; - char port[BUFSIZ]; + FILE *fp; + char buf[BUFSIZ]; + char *typefile; + char *cp; + char type[BUFSIZ]; + char port[BUFSIZ]; if (getenv ("TERM")) return; - if ((typefile=getdef_str("TTYTYPE_FILE")) == NULL ) + if ((typefile = getdef_str ("TTYTYPE_FILE")) == NULL) return; - if (access(typefile, F_OK)) + if (access (typefile, F_OK)) return; - if (! (fp = fopen (typefile, "r"))) { + if (!(fp = fopen (typefile, "r"))) { perror (typefile); return; } - while (fgets(buf, sizeof buf, fp)) { + while (fgets (buf, sizeof buf, fp)) { if (buf[0] == '#') continue; @@ -73,17 +70,17 @@ ttytype(const char *line) #if defined(SUN) || defined(BSD) || defined(SUN4) if ((sscanf (buf, "%s \"%*[^\"]\" %s", port, type) == 2 || - sscanf (buf, "%s %*s %s", port, type) == 2) && - strcmp (line, port) == 0) + sscanf (buf, "%s %*s %s", port, type) == 2) && + strcmp (line, port) == 0) break; -#else /* USG */ +#else /* USG */ if (sscanf (buf, "%s %s", type, port) == 2 && - strcmp (line, port) == 0) + strcmp (line, port) == 0) break; #endif } - if (! feof (fp) && ! ferror (fp)) - addenv("TERM", type); + if (!feof (fp) && !ferror (fp)) + addenv ("TERM", type); fclose (fp); } diff --git a/libmisc/tz.c b/libmisc/tz.c index 9449f6d8..668339fe 100644 --- a/libmisc/tz.c +++ b/libmisc/tz.c @@ -30,38 +30,34 @@ #include #include "rcsid.h" -RCSID("$Id: tz.c,v 1.4 1998/01/29 23:22:36 marekm Exp $") - +RCSID ("$Id: tz.c,v 1.5 2003/04/22 10:59:22 kloczek Exp $") #include #include #include "defines.h" #include "getdef.h" - /* * tz - return local timezone name * * tz() determines the name of the local timezone by reading the * contents of the file named by ``fname''. */ - -char * -tz(const char *fname) +char *tz (const char *fname) { FILE *fp = 0; static char tzbuf[BUFSIZ]; const char *def_tz; - if ((fp = fopen(fname,"r")) == NULL || - fgets (tzbuf, sizeof (tzbuf), fp) == NULL) { - if (! (def_tz = getdef_str ("ENV_TZ")) || def_tz[0] == '/') + if ((fp = fopen (fname, "r")) == NULL || + fgets (tzbuf, sizeof (tzbuf), fp) == NULL) { + if (!(def_tz = getdef_str ("ENV_TZ")) || def_tz[0] == '/') def_tz = "TZ=CST6CDT"; strcpy (tzbuf, def_tz); } else - tzbuf[strlen(tzbuf) - 1] = '\0'; + tzbuf[strlen (tzbuf) - 1] = '\0'; if (fp) - (void) fclose(fp); + (void) fclose (fp); return tzbuf; } diff --git a/libmisc/ulimit.c b/libmisc/ulimit.c index e99dab22..5efb47e6 100644 --- a/libmisc/ulimit.c +++ b/libmisc/ulimit.c @@ -1,11 +1,9 @@ #include #include "rcsid.h" -RCSID("$Id: ulimit.c,v 1.2 1997/12/07 23:27:11 marekm Exp $") - +RCSID ("$Id: ulimit.c,v 1.3 2003/04/22 10:59:22 kloczek Exp $") #if HAVE_ULIMIT_H #include - #ifndef UL_SETFSIZE #ifdef UL_SFILLIM #define UL_SETFSIZE UL_SFILLIM @@ -13,22 +11,19 @@ RCSID("$Id: ulimit.c,v 1.2 1997/12/07 23:27:11 marekm Exp $") #define UL_SETFSIZE 2 #endif #endif - #elif HAVE_SYS_RESOURCE_H -#include /* for struct timeval on sunos4 */ +#include /* for struct timeval on sunos4 */ /* XXX - is the above ok or should it be on ultrix? */ #include #endif - -void -set_filesize_limit(int blocks) +void set_filesize_limit (int blocks) { #if HAVE_ULIMIT_H - ulimit(UL_SETFSIZE, blocks); + ulimit (UL_SETFSIZE, blocks); #elif defined(RLIMIT_FSIZE) struct rlimit rlimit_fsize; rlimit_fsize.rlim_cur = rlimit_fsize.rlim_max = 512L * blocks; - setrlimit(RLIMIT_FSIZE, &rlimit_fsize); + setrlimit (RLIMIT_FSIZE, &rlimit_fsize); #endif } diff --git a/libmisc/utmp.c b/libmisc/utmp.c index 2062a574..dffb69ef 100644 --- a/libmisc/utmp.c +++ b/libmisc/utmp.c @@ -41,17 +41,16 @@ #include #include "rcsid.h" -RCSID("$Id: utmp.c,v 1.10 2002/03/08 04:30:30 kloczek Exp $") - +RCSID ("$Id: utmp.c,v 1.14 2003/12/17 12:52:25 kloczek Exp $") #if HAVE_UTMPX_H struct utmpx utxent; #endif struct utmp utent; -extern struct utmp *getutent(); -extern struct utmp *getutline(); -extern void setutent(); -extern void endutent(); +extern struct utmp *getutent (); +extern struct utmp *getutline (); +extern void setutent (); +extern void endutent (); #define NO_UTENT \ "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" @@ -72,21 +71,21 @@ extern void endutent(); * command line flags. */ -#if defined(__linux__) /* XXX */ +#if defined(__linux__) /* XXX */ -void -checkutmp(int picky) +void checkutmp (int picky) { char *line; struct utmp *ut; - pid_t pid = getpid(); + pid_t pid = getpid (); - setutent(); + setutent (); /* First, try to find a valid utmp entry for this process. */ - while ((ut = getutent())) + while ((ut = getutent ())) if (ut->ut_pid == pid && ut->ut_line[0] && ut->ut_id[0] && - (ut->ut_type==LOGIN_PROCESS || ut->ut_type==USER_PROCESS)) + (ut->ut_type == LOGIN_PROCESS + || ut->ut_type == USER_PROCESS)) break; /* If there is one, just use it, otherwise create a new one. */ @@ -94,54 +93,55 @@ checkutmp(int picky) utent = *ut; } else { if (picky) { - puts(NO_UTENT); - exit(1); + puts (NO_UTENT); + exit (1); } - line = ttyname(0); + line = ttyname (0); if (!line) { - puts(NO_TTY); - exit(1); + puts (NO_TTY); + exit (1); } - if (strncmp(line, "/dev/", 5) == 0) + if (strncmp (line, "/dev/", 5) == 0) line += 5; - memset((void *) &utent, 0, sizeof utent); + memset ((void *) &utent, 0, sizeof utent); utent.ut_type = LOGIN_PROCESS; utent.ut_pid = pid; - strncpy(utent.ut_line, line, sizeof utent.ut_line); + strncpy (utent.ut_line, line, sizeof utent.ut_line); /* XXX - assumes /dev/tty?? */ - strncpy(utent.ut_id, utent.ut_line + 3, sizeof utent.ut_id); - strcpy(utent.ut_user, "LOGIN"); - time(&utent.ut_time); + strncpy (utent.ut_id, utent.ut_line + 3, + sizeof utent.ut_id); + strcpy (utent.ut_user, "LOGIN"); + utent.ut_time = time (NULL); } } #elif defined(LOGIN_PROCESS) -void -checkutmp(int picky) +void checkutmp (int picky) { char *line; struct utmp *ut; + #if HAVE_UTMPX_H struct utmpx *utx; #endif - pid_t pid = getpid(); + pid_t pid = getpid (); #if HAVE_UTMPX_H - setutxent(); + setutxent (); #endif - setutent(); + setutent (); if (picky) { #if HAVE_UTMPX_H - while ((utx = getutxent())) + while ((utx = getutxent ())) if (utx->ut_pid == pid) break; if (utx) utxent = *utx; #endif - while ((ut = getutent())) + while ((ut = getutent ())) if (ut->ut_pid == pid) break; @@ -149,13 +149,13 @@ checkutmp(int picky) utent = *ut; #if HAVE_UTMPX_H - endutxent(); + endutxent (); #endif - endutent(); + endutent (); if (!ut) { - puts(NO_UTENT); - exit(1); + puts (NO_UTENT); + exit (1); } #ifndef UNIXPC @@ -167,53 +167,64 @@ checkutmp(int picky) */ if (utent.ut_line[0] == '\0') -#endif /* !UNIXPC */ +#endif /* !UNIXPC */ { - if (!(line = ttyname(0))) { - puts(NO_TTY); - exit(1); + if (!(line = ttyname (0))) { + puts (NO_TTY); + exit (1); } - if (strncmp(line, "/dev/", 5) == 0) + if (strncmp (line, "/dev/", 5) == 0) line += 5; - strncpy(utent.ut_line, line, sizeof utent.ut_line); + strncpy (utent.ut_line, line, + sizeof utent.ut_line); #if HAVE_UTMPX_H - strncpy(utxent.ut_line, line, sizeof utxent.ut_line); + strncpy (utxent.ut_line, line, + sizeof utxent.ut_line); #endif } } else { - if (!(line = ttyname(0))) { - puts(NO_TTY); - exit(1); + if (!(line = ttyname (0))) { + puts (NO_TTY); + exit (1); } - if (strncmp(line, "/dev/", 5) == 0) + if (strncmp (line, "/dev/", 5) == 0) line += 5; - strncpy (utent.ut_line, line, sizeof utent.ut_line); - if ((ut = getutline(&utent))) - strncpy(utent.ut_id, ut->ut_id, sizeof ut->ut_id); + strncpy (utent.ut_line, line, sizeof utent.ut_line); + if ((ut = getutline (&utent))) + strncpy (utent.ut_id, ut->ut_id, sizeof ut->ut_id); - strcpy(utent.ut_user, "LOGIN"); - utent.ut_pid = getpid(); + strcpy (utent.ut_user, "LOGIN"); + utent.ut_pid = getpid (); utent.ut_type = LOGIN_PROCESS; - time(&utent.ut_time); + utent.ut_time = time (NULL); #if HAVE_UTMPX_H - strncpy(utxent.ut_line, line, sizeof utxent.ut_line); - if ((utx = getutxline(&utxent))) - strncpy(utxent.ut_id, utx->ut_id, sizeof utxent.ut_id); + strncpy (utxent.ut_line, line, sizeof utxent.ut_line); + if ((utx = getutxline (&utxent))) + strncpy (utxent.ut_id, utx->ut_id, + sizeof utxent.ut_id); - strcpy(utxent.ut_user, "LOGIN"); + strcpy (utxent.ut_user, "LOGIN"); utxent.ut_pid = utent.ut_pid; utxent.ut_type = utent.ut_type; - gettimeofday((struct timeval *) &utxent.ut_tv, NULL); + if (sizeof (utxent.ut_tv) == sizeof (struct timeval)) + gettimeofday ((struct timeval *) &utxent.ut_tv, + NULL); + else { + struct timeval tv; + + gettimeofday (&tv, NULL); + utxent.ut_tv.tv_sec = tv.tv_sec; + utxent.ut_tv.tv_usec = tv.tv_usec; + } utent.ut_time = utxent.ut_tv.tv_sec; #endif } } -#else /* !USG */ +#else /* !USG */ -void -checkutmp(int picky) +void checkutmp (int picky) { char *line; @@ -221,8 +232,8 @@ checkutmp(int picky) * Hand-craft a new utmp entry. */ - memzero(&utent, sizeof utent); - if (! (line = ttyname (0))) { + memzero (&utent, sizeof utent); + if (!(line = ttyname (0))) { puts (NO_TTY); exit (1); } @@ -230,10 +241,10 @@ checkutmp(int picky) line += 5; (void) strncpy (utent.ut_line, line, sizeof utent.ut_line); - (void) time (&utent.ut_time); + utent.ut_time = time (NULL); } -#endif /* !USG */ +#endif /* !USG */ /* @@ -242,34 +253,32 @@ checkutmp(int picky) */ #ifndef HAVE_UPDWTMP -static void -updwtmp(const char *filename, const struct utmp *ut) +static void updwtmp (const char *filename, const struct utmp *ut) { int fd; - fd = open(filename, O_APPEND | O_WRONLY, 0); + fd = open (filename, O_APPEND | O_WRONLY, 0); if (fd >= 0) { - write(fd, (const char *) ut, sizeof(*ut)); - close(fd); + write (fd, (const char *) ut, sizeof (*ut)); + close (fd); } } -#endif /* ! HAVE_UPDWTMP */ +#endif /* ! HAVE_UPDWTMP */ #ifdef HAVE_UTMPX_H #ifndef HAVE_UPDWTMPX -static void -updwtmpx(const char *filename, const struct utmpx *utx) +static void updwtmpx (const char *filename, const struct utmpx *utx) { int fd; - fd = open(filename, O_APPEND | O_WRONLY, 0); + fd = open (filename, O_APPEND | O_WRONLY, 0); if (fd >= 0) { - write(fd, (const char *) utx, sizeof(*utx)); - close(fd); + write (fd, (const char *) utx, sizeof (*utx)); + close (fd); } } -#endif /* ! HAVE_UPDWTMPX */ -#endif /* ! HAVE_UTMPX_H */ +#endif /* ! HAVE_UPDWTMPX */ +#endif /* ! HAVE_UTMPX_H */ /* @@ -279,30 +288,28 @@ updwtmpx(const char *filename, const struct utmpx *utx) * USER_PROCESS. the wtmp file will be updated as well. */ -#if defined(__linux__) /* XXX */ +#if defined(__linux__) /* XXX */ -void -setutmp(const char *name, const char *line, const char *host) +void setutmp (const char *name, const char *line, const char *host) { utent.ut_type = USER_PROCESS; - strncpy(utent.ut_user, name, sizeof utent.ut_user); - time(&utent.ut_time); + strncpy (utent.ut_user, name, sizeof utent.ut_user); + utent.ut_time = time (NULL); /* other fields already filled in by checkutmp above */ - setutent(); - pututline(&utent); - endutent(); - updwtmp(_WTMP_FILE, &utent); + setutent (); + pututline (&utent); + endutent (); + updwtmp (_WTMP_FILE, &utent); } #elif HAVE_UTMPX_H -void -setutmp(const char *name, const char *line, const char *host) +void setutmp (const char *name, const char *line, const char *host) { - struct utmp *utmp, utline; - struct utmpx *utmpx, utxline; - pid_t pid = getpid (); - int found_utmpx = 0, found_utmp = 0; + struct utmp *utmp, utline; + struct utmpx *utmpx, utxline; + pid_t pid = getpid (); + int found_utmpx = 0, found_utmp = 0; /* * The canonical device name doesn't include "/dev/"; skip it @@ -338,7 +345,7 @@ setutmp(const char *name, const char *line, const char *host) * entry with the device name in it. */ - if (! found_utmpx) { + if (!found_utmpx) { memset ((void *) &utxline, 0, sizeof utxline); strncpy (utxline.ut_line, line, sizeof utxline.ut_line); utxline.ut_pid = getpid (); @@ -346,20 +353,20 @@ setutmp(const char *name, const char *line, const char *host) utxline = *utmpx; if (strncmp (utxline.ut_line, "/dev/", 5) == 0) { memmove (utxline.ut_line, utxline.ut_line + 5, - sizeof utxline.ut_line - 5); + sizeof utxline.ut_line - 5); utxline.ut_line[sizeof utxline.ut_line - 5] = '\0'; } } - if (! found_utmp) { + if (!found_utmp) { memset ((void *) &utline, 0, sizeof utline); strncpy (utline.ut_line, utxline.ut_line, - sizeof utline.ut_line); + sizeof utline.ut_line); utline.ut_pid = utxline.ut_pid; } else { utline = *utmp; if (strncmp (utline.ut_line, "/dev/", 5) == 0) { memmove (utline.ut_line, utline.ut_line + 5, - sizeof utline.ut_line - 5); + sizeof utline.ut_line - 5); utline.ut_line[sizeof utline.ut_line - 5] = '\0'; } } @@ -375,101 +382,28 @@ setutmp(const char *name, const char *line, const char *host) utline.ut_type = utxline.ut_type = USER_PROCESS; - gettimeofday(&utxline.ut_tv, NULL); + if (sizeof (utxline.ut_tv) == sizeof (struct timeval)) + gettimeofday ((struct timeval *) &utxline.ut_tv, NULL); + else { + struct timeval tv; + + gettimeofday (&tv, NULL); + utxline.ut_tv.tv_sec = tv.tv_sec; + utxline.ut_tv.tv_usec = tv.tv_usec; + } utline.ut_time = utxline.ut_tv.tv_sec; - strncpy(utxline.ut_host, host ? host : "", sizeof utxline.ut_host); + strncpy (utxline.ut_host, host ? host : "", + sizeof utxline.ut_host); pututxline (&utxline); pututline (&utline); - updwtmpx(_WTMP_FILE "x", &utxline); - updwtmp(_WTMP_FILE, &utline); + updwtmpx (_WTMP_FILE "x", &utxline); + updwtmp (_WTMP_FILE, &utline); utxent = utxline; utent = utline; } -#else /* !SVR4 */ - -void -setutmp(const char *name, const char *line) -{ - struct utmp utmp; - int fd; - int found = 0; - - if ((fd = open(_UTMP_FILE, O_RDWR)) < 0) - return; - -#if !defined(SUN) && !defined(BSD) && !defined(SUN4) /* XXX */ - while (!found && read(fd, (char *)&utmp, sizeof utmp) == sizeof utmp) { - if (! strncmp (line, utmp.ut_line, (int) sizeof utmp.ut_line)) - found++; - } #endif - - if (! found) { - - /* - * This is a brand-new entry. Clear it out and fill it in - * later. - */ - - memzero(&utmp, sizeof utmp); - strncpy(utmp.ut_line, line, (int) sizeof utmp.ut_line); - } - - /* - * Fill in the parts of the UTMP entry. BSD has just the name, - * while System V has the name, PID and a type. - */ - - strncpy(utmp.ut_user, name, sizeof utent.ut_user); -#ifdef USER_PROCESS - utmp.ut_type = USER_PROCESS; - utmp.ut_pid = getpid (); -#endif - - /* - * Put in the current time (common to everyone) - */ - - (void) time (&utmp.ut_time); - -#ifdef UT_HOST - /* - * Update the host name field for systems with networking support - */ - - (void) strncpy (utmp.ut_host, utent.ut_host, (int) sizeof utmp.ut_host); -#endif - - /* - * Locate the correct position in the UTMP file for this - * entry. - */ - -#ifdef HAVE_TTYSLOT - (void) lseek (fd, (off_t) (sizeof utmp) * ttyslot (), SEEK_SET); -#else - if (found) /* Back up a splot */ - lseek (fd, (off_t) - sizeof utmp, SEEK_CUR); - else /* Otherwise, go to the end of the file */ - lseek (fd, (off_t) 0, SEEK_END); -#endif - - /* - * Scribble out the new entry and close the file. We're done - * with UTMP, next we do WTMP (which is real easy, put it on - * the end of the file. - */ - - (void) write (fd, (char *) &utmp, sizeof utmp); - (void) close (fd); - - updwtmp(_WTMP_FILE, &utmp); - utent = utmp; -} - -#endif /* SVR4 */ diff --git a/libmisc/valid.c b/libmisc/valid.c index 8559638e..5bde285c 100644 --- a/libmisc/valid.c +++ b/libmisc/valid.c @@ -30,14 +30,12 @@ #include #include "rcsid.h" -RCSID("$Id: valid.c,v 1.4 1999/03/07 19:14:44 marekm Exp $") - +RCSID ("$Id: valid.c,v 1.5 2003/04/22 10:59:22 kloczek Exp $") #include #include #include "prototypes.h" #include "defines.h" #include - /* * valid - compare encrypted passwords * @@ -48,9 +46,7 @@ RCSID("$Id: valid.c,v 1.4 1999/03/07 19:14:44 marekm Exp $") * is used to indicate that a dummy salt must be used to encrypt the * password anyway. */ - -int -valid(const char *password, const struct passwd *ent) +int valid (const char *password, const struct passwd *ent) { const char *encrypted; const char *salt; @@ -62,8 +58,8 @@ valid(const char *password, const struct passwd *ent) * routine is meant to waste CPU time. */ - if (ent->pw_name && ! ent->pw_passwd[0]) { - if (! password[0]) + if (ent->pw_name && !ent->pw_passwd[0]) { + if (!password[0]) return (1); /* user entered nothing */ else return (0); /* user entered something! */ @@ -86,7 +82,7 @@ valid(const char *password, const struct passwd *ent) * looking at execution time. */ - encrypted = pw_encrypt(password, salt); + encrypted = pw_encrypt (password, salt); /* * One last time we must deal with there being no password file @@ -94,7 +90,7 @@ valid(const char *password, const struct passwd *ent) * cause non-existent users to not be validated. */ - if (ent->pw_name && strcmp(encrypted, ent->pw_passwd) == 0) + if (ent->pw_name && strcmp (encrypted, ent->pw_passwd) == 0) return (1); else return (0); diff --git a/libmisc/xmalloc.c b/libmisc/xmalloc.c index e85ae26c..f6f009ee 100644 --- a/libmisc/xmalloc.c +++ b/libmisc/xmalloc.c @@ -10,29 +10,24 @@ #include #include "rcsid.h" -RCSID("$Id: xmalloc.c,v 1.3 1998/12/28 20:34:56 marekm Exp $") - +RCSID ("$Id: xmalloc.c,v 1.4 2003/04/22 10:59:22 kloczek Exp $") #include - #include "defines.h" +extern char *malloc (); -extern char *malloc(); - -char * -xmalloc(size_t size) +char *xmalloc (size_t size) { char *ptr; - ptr = malloc(size); + ptr = malloc (size); if (!ptr && size) { - fprintf(stderr, _("malloc(%d) failed\n"), (int) size); - exit(13); + fprintf (stderr, _("malloc(%d) failed\n"), (int) size); + exit (13); } return ptr; } -char * -xstrdup(const char *str) +char *xstrdup (const char *str) { - return strcpy(xmalloc(strlen(str) + 1), str); + return strcpy (xmalloc (strlen (str) + 1), str); } diff --git a/ltmain.sh b/ltmain.sh index c9635a41..ddc1f97f 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # @@ -49,14 +49,14 @@ EOF fi # The name of this program. -progname=`$echo "$0" | sed 's%^.*/%%'` +progname=`$echo "$0" | ${SED} 's%^.*/%%'` modename="$progname" # Constants. PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.4.2 -TIMESTAMP=" (1.922.2.53 2001/09/11 03:18:52)" +VERSION=1.5 +TIMESTAMP=" (1.1220 2003/04/05 19:32:58)" default_mode= help="Try \`$progname --help' for more information." @@ -67,10 +67,19 @@ rm="rm -f" # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' -SP2NL='tr \040 \012' -NL2SP='tr \015\012 \040\040' +# test EBCDIC or ASCII +case `echo A|od -x` in + *[Cc]1*) # EBCDIC based system + SP2NL="tr '\100' '\n'" + NL2SP="tr '\r\n' '\100\100'" + ;; + *) # Assume ASCII based system + SP2NL="tr '\040' '\012'" + NL2SP="tr '\015\012' '\040\040'" + ;; +esac # NLS nuisances. # Only set LANG and LC_ALL to C if already set. @@ -88,8 +97,8 @@ fi : ${IFS=" "} if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - echo "$modename: not configured to build any kind of library" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + $echo "$modename: not configured to build any kind of library" 1>&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 exit 1 fi @@ -105,8 +114,51 @@ execute_dlfiles= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" +##################################### +# Shell function definitions: +# This seems to be the best place for them + +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +win32_libid () { + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ + grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | \ + sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` + if test "X$win32_nmres" = "Ximport" ; then + win32_libid_type="x86 archive import" + else + win32_libid_type="x86 archive static" + fi + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $echo $win32_libid_type +} + +# End of Shell function definitions +##################################### + # Parse our command line options once, thoroughly. -while test $# -gt 0 +while test "$#" -gt 0 do arg="$1" shift @@ -122,6 +174,33 @@ do execute_dlfiles) execute_dlfiles="$execute_dlfiles $arg" ;; + tag) + tagname="$arg" + + # Check whether tagname contains only valid characters + case $tagname in + *[!-_A-Za-z0-9,/]*) + $echo "$progname: invalid tag name: $tagname" 1>&2 + exit 1 + ;; + esac + + case $tagname in + CC) + # Don't test for the "default" C tag, as we know, it's there, but + # not specially marked. + ;; + *) + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then + taglist="$taglist $tagname" + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" + else + $echo "$progname: ignoring unknown tag $tagname" 1>&2 + fi + ;; + esac + ;; *) eval "$prev=\$arg" ;; @@ -139,17 +218,25 @@ do ;; --version) - echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" + $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" + $echo + $echo "Copyright (C) 2003 Free Software Foundation, Inc." + $echo "This is free software; see the source for copying conditions. There is NO" + $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit 0 ;; --config) - sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 + ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 + # Now print the configurations for the tags. + for tagname in $taglist; do + ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0" + done exit 0 ;; --debug) - echo "$progname: enabling shell trace mode" + $echo "$progname: enabling shell trace mode" set -x ;; @@ -158,16 +245,16 @@ do ;; --features) - echo "host: $host" + $echo "host: $host" if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" + $echo "enable shared libraries" else - echo "disable shared libraries" + $echo "disable shared libraries" fi if test "$build_old_libs" = yes; then - echo "enable static libraries" + $echo "enable static libraries" else - echo "disable static libraries" + $echo "disable static libraries" fi exit 0 ;; @@ -177,10 +264,19 @@ do --mode) prevopt="--mode" prev=mode ;; --mode=*) mode="$optarg" ;; + --preserve-dup-deps) duplicate_deps="yes" ;; + --quiet | --silent) show=: ;; + --tag) prevopt="--tag" prev=tag ;; + --tag=*) + set tag "$optarg" ${1+"$@"} + shift + prev=tag + ;; + -dlopen) prevopt="-dlopen" prev=execute_dlfiles @@ -214,8 +310,10 @@ if test -z "$show_help"; then # Infer the operation mode. if test -z "$mode"; then + $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 + $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 case $nonopt in - *cc | *++ | gcc* | *-gcc*) + *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) mode=link for arg do @@ -270,158 +368,127 @@ if test -z "$show_help"; then modename="$modename: compile" # Get the compilation command and the source file. base_compile= - prev= - lastarg= - srcfile="$nonopt" + srcfile="$nonopt" # always keep a non-empty value in "srcfile" suppress_output= + arg_mode=normal + libobj= - user_target=no for arg do - case $prev in - "") ;; - xcompiler) - # Aesthetically quote the previous argument. - prev= - lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - - case $arg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - - # Add the previous argument to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else - base_compile="$base_compile $lastarg" - fi - continue - ;; - esac - - # Accept any command-line options. - case $arg in - -o) - if test "$user_target" != "no"; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit 1 - fi - user_target=next + case "$arg_mode" in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg="$arg" + arg_mode=normal ;; - -static) - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" - done - IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - - # Add the arguments to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else - base_compile="$base_compile $lastarg" - fi - continue - ;; - esac - - case $user_target in - next) - # The next one is the -o target name - user_target=yes - continue - ;; - yes) - # We got the output file - user_target=set + target ) libobj="$arg" + arg_mode=normal continue ;; - esac - # Accept the current argument as the source file. - lastarg="$srcfile" - srcfile="$arg" + normal ) + # Accept any command-line options. + case $arg in + -o) + if test -n "$libobj" ; then + $echo "$modename: you cannot specify \`-o' more than once" 1>&2 + exit 1 + fi + arg_mode=target + continue + ;; + + -static) + build_old_libs=yes + continue + ;; + + -prefer-pic) + pic_mode=yes + continue + ;; + + -prefer-non-pic) + pic_mode=no + continue + ;; + + -Xcompiler) + arg_mode=arg # the next one goes into the "base_compile" arg list + continue # The current "srcfile" will either be retained or + ;; # replaced later. I would guess that would be a bug. + + -Wc,*) + args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` + lastarg= + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" + + # Double-quote args containing other shell metacharacters. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + lastarg="$lastarg $arg" + done + IFS="$save_ifs" + lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` + + # Add the arguments to base_compile. + base_compile="$base_compile $lastarg" + continue + ;; + + * ) + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # + lastarg="$srcfile" + srcfile="$arg" + ;; + esac # case $arg + ;; + esac # case $arg_mode # Aesthetically quote the previous argument. - - # Backslashify any backslashes, double quotes, and dollar signs. - # These are the only characters that are still specially - # interpreted inside of double-quoted scrings. lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` + case $lastarg in # Double-quote args containing other shell metacharacters. # Many Bourne shells cannot handle close brackets correctly # in scan sets, so we specify it separately. - case $lastarg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") lastarg="\"$lastarg\"" ;; esac - # Add the previous argument to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else - base_compile="$base_compile $lastarg" - fi - done + base_compile="$base_compile $lastarg" + done # for arg - case $user_target in - set) + case $arg_mode in + arg) + $echo "$modename: you must specify an argument for -Xcompile" + exit 1 ;; - no) - # Get the name of the library object. - libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - *) + target) $echo "$modename: you must specify a target with \`-o'" 1>&2 exit 1 ;; + *) + # Get the name of the library object. + [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` + ;; esac # Recognize several different file suffixes. # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSfmso]' + xform='[cCFSifmso]' case $libobj in *.ada) xform=ada ;; *.adb) xform=adb ;; @@ -429,10 +496,13 @@ if test -z "$show_help"; then *.asm) xform=asm ;; *.c++) xform=c++ ;; *.cc) xform=cc ;; + *.ii) xform=ii ;; + *.class) xform=class ;; *.cpp) xform=cpp ;; *.cxx) xform=cxx ;; *.f90) xform=f90 ;; *.for) xform=for ;; + *.java) xform=java ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -445,6 +515,56 @@ if test -z "$show_help"; then ;; esac + # Infer tagged configuration to use if any are available and + # if one wasn't chosen via the "--tag" command line option. + # Only attempt this if the compiler in the base compile + # command doesn't match the default compiler. + if test -n "$available_tags" && test -z "$tagname"; then + case $base_compile in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" + case "$base_compile " in + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + $echo "$modename: unable to infer tagged configuration" + $echo "$modename: specify a tag with \`--tag'" 1>&2 + exit 1 +# else +# $echo "$modename: using $tagname tagged configuration" + fi + ;; + esac + fi + + objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` + xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$obj"; then + xdir= + else + xdir=$xdir/ + fi + lobj=${xdir}$objdir/$objname + if test -z "$base_compile"; then $echo "$modename: you must specify a compilation command" 1>&2 $echo "$help" 1>&2 @@ -453,9 +573,9 @@ if test -z "$show_help"; then # Delete any leftover library objects. if test "$build_old_libs" = yes; then - removelist="$obj $libobj" + removelist="$obj $lobj $libobj ${libobj}T" else - removelist="$libobj" + removelist="$lobj $libobj ${libobj}T" fi $run $rm $removelist @@ -480,6 +600,7 @@ if test -z "$show_help"; then removelist="$removelist $output_obj $lockfile" trap "$run $rm $removelist; exit 1" 1 2 15 else + output_obj= need_locks=no lockfile= fi @@ -493,7 +614,7 @@ if test -z "$show_help"; then done elif test "$need_locks" = warn; then if test -f "$lockfile"; then - echo "\ + $echo "\ *** ERROR, $lockfile exists and contains: `cat $lockfile 2>/dev/null` @@ -507,56 +628,55 @@ compiler." $run $rm $removelist exit 1 fi - echo $srcfile > "$lockfile" + $echo $srcfile > "$lockfile" fi if test -n "$fix_srcfile_path"; then eval srcfile=\"$fix_srcfile_path\" fi + $run $rm "$libobj" "${libobj}T" + + # Create a libtool object file (analogous to a ".la" file), + # but don't create it if we're doing a dry run. + test -z "$run" && cat > ${libobj}T </dev/null`" != x"$srcfile"; then - echo "\ + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $echo "\ *** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` @@ -585,9 +705,9 @@ compiler." fi # Just move the object if needed, then go on to compile the next one - if test x"$output_obj" != x"$libobj"; then - $show "$mv $output_obj $libobj" - if $run $mv $output_obj $libobj; then : + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then + $show "$mv $output_obj $lobj" + if $run $mv $output_obj $lobj; then : else error=$? $run $rm $removelist @@ -595,48 +715,21 @@ compiler." fi fi - # If we have no pic_flag, then copy the object into place and finish. - if (test -z "$pic_flag" || test "$pic_mode" != default) && - test "$build_old_libs" = yes; then - # Rename the .lo from within objdir to obj - if test -f $obj; then - $show $rm $obj - $run $rm $obj - fi + # Append the name of the PIC object to the libtool object file. + test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != x"$srcfile"; then - echo "\ + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $echo "\ *** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` @@ -684,7 +775,7 @@ compiler." fi # Just move the object if needed - if test x"$output_obj" != x"$obj"; then + if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then $show "$mv $output_obj $obj" if $run $mv $output_obj $obj; then : else @@ -694,23 +785,25 @@ compiler." fi fi - # Create an invalid libtool object if no PIC, so that we do not - # accidentally link it into a program. - if test "$build_libtool_libs" != yes; then - $show "echo timestamp > $libobj" - $run eval "echo timestamp > \$libobj" || exit $? - else - # Move the .lo from within objdir - $show "$mv $libobj $lo_libobj" - if $run $mv $libobj $lo_libobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi + # Append the name of the non-PIC object the libtool object file. + # Only append if the libtool object file exists. + test -z "$run" && cat >> ${libobj}T <> ${libobj}T <\?\'\ \ ]*|*]*|"") @@ -887,11 +985,123 @@ compiler." prev= continue ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; release) release="-$arg" prev= continue ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg + moreargs= + for fil in `cat $save_arg` + do +# moreargs="$moreargs $fil" + arg=$fil + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + pic_object= + non_pic_object= + + # Read the .lo file + # If there is no directory component, then add one. + case $arg in + */* | *\\*) . $arg ;; + *) . ./$arg ;; + esac + + if test -z "$pic_object" || \ + test -z "$non_pic_object" || + test "$pic_object" = none && \ + test "$non_pic_object" = none; then + $echo "$modename: cannot find name of object for \`$arg'" 1>&2 + exit 1 + fi + + # Extract subdirectory from the argument. + xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$arg"; then + xdir= + else + xdir="$xdir/" + fi + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles $pic_object" + prev= + fi + + # A PIC object. + libobjs="$libobjs $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" + + # A standard non-PIC object + non_pic_objects="$non_pic_objects $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + fi + else + # Only an error if not doing a dry-run. + if test -z "$run"; then + $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 + exit 1 + else + # Dry-run case. + + # Extract subdirectory from the argument. + xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$arg"; then + xdir= + else + xdir="$xdir/" + fi + + pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` + non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` + libobjs="$libobjs $pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" + fi + fi + done + else + $echo "$modename: link input file \`$save_arg' does not exist" + exit 1 + fi + arg=$save_arg + prev= + continue + ;; rpath | xrpath) # We need an absolute path. case $arg in @@ -930,13 +1140,21 @@ compiler." finalize_command="$finalize_command $wl$qarg" continue ;; + xcclinker) + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $qarg" + prev= + compile_command="$compile_command $qarg" + finalize_command="$finalize_command $qarg" + continue + ;; *) eval "$prev=\"\$arg\"" prev= continue ;; esac - fi # test -n $prev + fi # test -n "$prev" prevarg="$arg" @@ -988,11 +1206,16 @@ compiler." continue ;; + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) case $with_gcc/$host in - no/*-*-irix*) + no/*-*-irix* | /*-*-irix*) compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" ;; @@ -1043,18 +1266,22 @@ compiler." # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; - *-*-openbsd*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd*) - # Do not include libc_r directly, use -pthread flag. + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework + deplibs="$deplibs -framework System" continue - ;; esac + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd* | *-*-freebsd*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; + esac fi deplibs="$deplibs $arg" continue @@ -1065,6 +1292,34 @@ compiler." continue ;; + # gcc -m* arguments should be passed to the linker via $compiler_flags + # in order to pass architecture information to the linker + # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. + -m*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" + fi + continue + ;; + + -shrext) + prev=shrext + continue + ;; + -no-fast-install) fast_install=no continue @@ -1089,6 +1344,11 @@ compiler." continue ;; + -objectlist) + prev=objectlist + continue + ;; + -o) prev=output ;; -release) @@ -1141,6 +1401,11 @@ compiler." prev=vinfo continue ;; + -version-number) + prev=vinfo + vinfo_number=yes + continue + ;; -Wc,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` @@ -1189,6 +1454,11 @@ compiler." continue ;; + -XCClinker) + prev=xcclinker + continue + ;; + # Some other compiler flag. -* | +*) # Unknown arguments in both finalize_command and compile_command need @@ -1201,29 +1471,101 @@ compiler." esac ;; - *.lo | *.$objext) - # A library or standard object. - if test "$prev" = dlfiles; then - # This file was specified with -dlopen. - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $arg" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi + *.$objext) + # A standard object. + objs="$objs $arg" + ;; - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"` - prev= - else + *.lo) + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + pic_object= + non_pic_object= + + # Read the .lo file + # If there is no directory component, then add one. case $arg in - *.lo) libobjs="$libobjs $arg" ;; - *) objs="$objs $arg" ;; + */* | *\\*) . $arg ;; + *) . ./$arg ;; esac + + if test -z "$pic_object" || \ + test -z "$non_pic_object" || + test "$pic_object" = none && \ + test "$non_pic_object" = none; then + $echo "$modename: cannot find name of object for \`$arg'" 1>&2 + exit 1 + fi + + # Extract subdirectory from the argument. + xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$arg"; then + xdir= + else + xdir="$xdir/" + fi + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles $pic_object" + prev= + fi + + # A PIC object. + libobjs="$libobjs $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" + + # A standard non-PIC object + non_pic_objects="$non_pic_objects $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + fi + else + # Only an error if not doing a dry-run. + if test -z "$run"; then + $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 + exit 1 + else + # Dry-run case. + + # Extract subdirectory from the argument. + xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$arg"; then + xdir= + else + xdir="$xdir/" + fi + + pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` + non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` + libobjs="$libobjs $pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" + fi fi ;; @@ -1277,12 +1619,54 @@ compiler." exit 1 fi + # Infer tagged configuration to use if any are available and + # if one wasn't chosen via the "--tag" command line option. + # Only attempt this if the compiler in the base link + # command doesn't match the default compiler. + if test -n "$available_tags" && test -z "$tagname"; then + case $base_compile in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" + case $base_compile in + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) + # The compiler in $compile_command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + $echo "$modename: unable to infer tagged configuration" + $echo "$modename: specify a tag with \`--tag'" 1>&2 + exit 1 +# else +# $echo "$modename: using $tagname tagged configuration" + fi + ;; + esac + fi + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" fi + oldlibs= # calculate the name of the file, without its directory outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` libobjs_save="$libobjs" @@ -1303,11 +1687,11 @@ compiler." output_objdir="$output_objdir/$objdir" fi # Create the object directory. - if test ! -d $output_objdir; then + if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir status=$? - if test $status -ne 0 && test ! -d $output_objdir; then + if test "$status" -ne 0 && test ! -d "$output_objdir"; then exit $status fi fi @@ -1325,16 +1709,47 @@ compiler." *) linkmode=prog ;; # Anything else should be a program. esac + case $host in + *cygwin* | *mingw* | *pw32*) + # don't eliminate duplcations in $postdeps and $predeps + duplicate_compiler_generated_deps=yes + ;; + *) + duplicate_compiler_generated_deps=$duplicate_deps + ;; + esac specialdeplibs= + libs= # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac + if test "X$duplicate_deps" = "Xyes" ; then + case "$libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi libs="$libs $deplib" done + + if test "$linkmode" = lib; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + esac + pre_post_deps="$pre_post_deps $pre_post_dep" + done + fi + pre_post_deps= + fi + deplibs= newdependency_libs= newlib_search_path= @@ -1366,25 +1781,30 @@ compiler." ;; esac for pass in $passes; do + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" + deplibs= + fi if test "$linkmode" = prog; then - # Determine which files to process case $pass in - dlopen) - libs="$dlfiles" - save_deplibs="$deplibs" # Collect dlpreopened libraries - deplibs= - ;; + dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi + if test "$pass" = dlopen; then + # Collect dlpreopened libraries + save_deplibs="$deplibs" + deplibs= + fi for deplib in $libs; do lib= found=no case $deplib in -l*) - if test "$linkmode" = oldlib && test "$linkmode" = obj; then - $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 + if test "$linkmode" != lib && test "$linkmode" != prog; then + $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 continue fi if test "$pass" = conv; then @@ -1410,6 +1830,42 @@ compiler." test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" fi continue + else # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $deplib "*) + if (${SED} -e '2q' $lib | + grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + library_names= + old_library= + case $lib in + */* | *\\*) . $lib ;; + *) . ./$lib ;; + esac + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` + test "X$ladir" = "X$lib" && ladir="." + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + fi fi ;; # -l -L*) @@ -1434,7 +1890,7 @@ compiler." fi ;; *) - $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2 + $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 ;; esac # linkmode continue @@ -1460,15 +1916,17 @@ compiler." case $linkmode in lib) if test "$deplibs_check_method" != pass_all; then - echo - echo "*** Warning: This library needs some functionality provided by $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." + $echo + $echo "*** Warning: Trying to link with static lib archive $deplib." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which you do not appear to have" + $echo "*** because the file extensions .$libext of this argument makes me believe" + $echo "*** that it is just a static archive that I should not used here." else - echo - echo "*** Warning: Linking the shared library $output against the" - echo "*** static library $deplib is not portable!" + $echo + $echo "*** Warning: Linking the shared library $output against the" + $echo "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" fi continue @@ -1485,14 +1943,18 @@ compiler." esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + elif test "$linkmode" = prog; then + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + newdlprefiles="$newdlprefiles $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + newdlfiles="$newdlfiles $deplib" + fi fi continue ;; @@ -1501,14 +1963,14 @@ compiler." continue ;; esac # case $deplib - if test $found = yes || test -f "$lib"; then : + if test "$found" = yes || test -f "$lib"; then : else $echo "$modename: cannot find the library \`$lib'" 1>&2 exit 1 fi # Check to see that this really is a libtool archive. - if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 @@ -1524,8 +1986,9 @@ compiler." library_names= old_library= # If the library was installed with an old release of libtool, - # it will not redefine variable installed. + # it will not redefine variables installed, or shouldnotlink installed=yes + shouldnotlink=no # Read the .la file case $lib in @@ -1535,8 +1998,7 @@ compiler." if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then - # Add dl[pre]opened files of deplib + { test "$linkmode" != prog && test "$linkmode" != lib; }; then test -n "$dlopen" && dlfiles="$dlfiles $dlopen" test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" fi @@ -1555,9 +2017,11 @@ compiler." tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac + if test "X$duplicate_deps" = "Xyes" ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi tmp_libs="$tmp_libs $deplib" done elif test "$linkmode" != prog && test "$linkmode" != lib; then @@ -1567,6 +2031,7 @@ compiler." continue fi # $pass = conv + # Get the name of the library we link against. linklib= for l in $old_library $library_names; do @@ -1585,8 +2050,10 @@ compiler." fi if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. - dlprefiles="$dlprefiles $lib" + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. + dlprefiles="$dlprefiles $lib $dependency_libs" else newdlfiles="$newdlfiles $lib" fi @@ -1652,11 +2119,12 @@ compiler." compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else - deplibs="$lib $deplibs" + deplibs="$lib $deplibs" # used for prog,scan pass fi continue fi + if test "$linkmode" = prog && test "$pass" != link; then newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" @@ -1673,28 +2141,36 @@ compiler." -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test esac # Need to link against all dependency_libs? - if test $linkalldeplibs = yes; then + if test "$linkalldeplibs" = yes; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac + if test "X$duplicate_deps" = "Xyes" ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi tmp_libs="$tmp_libs $deplib" done # for deplib continue fi # $linkmode = prog... - link_static=no # Whether the deplib will be linked statically - if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - # Link against this shared library + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var"; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath " in + *" $dir "*) ;; + *" $absdir "*) ;; + *) temp_rpath="$temp_rpath $dir" ;; + esac + fi - if test "$linkmode,$pass" = "prog,link" || - { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -1716,17 +2192,6 @@ compiler." esac ;; esac - if test "$linkmode" = prog; then - # We need to hardcode the library path - if test -n "$shlibpath_var"; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $dir" ;; - esac - fi - fi fi # $linkmode,$pass = prog,link... if test "$alldeplibs" = yes && @@ -1736,11 +2201,51 @@ compiler." # We only need to search for static libraries continue fi + fi + link_static=no # Whether the deplib will be linked statically + if test -n "$library_names" && + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes fi + # This is a shared library + + # Warn about portability, can't link against -module's on some systems (darwin) + if test "$shouldnotlink" = yes && test "$pass" = link ; then + $echo + if test "$linkmode" = prog; then + $echo "*** Warning: Linking the executable $output against the loadable module" + else + $echo "*** Warning: Linking the shared library $output against the loadable module" + fi + $echo "*** $linklib is not portable!" + fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) compile_rpath="$compile_rpath $absdir" + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" + esac + ;; + esac + fi if test -n "$old_archive_from_expsyms_cmds"; then # figure out the soname @@ -1754,7 +2259,7 @@ compiler." elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin*) + *cygwin* | mingw*) major=`expr $current - $age` versuffix="-$major" ;; @@ -1766,8 +2271,8 @@ compiler." # Make a new name for the extract_expsyms_cmds to use soroot="$soname" - soname=`echo $soroot | sed -e 's/^.*\///'` - newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" + soname=`$echo $soroot | ${SED} -e 's/^.*\///'` + newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : @@ -1798,7 +2303,7 @@ compiler." # make sure the library variables are pointing to the new library dir=$output_objdir linklib=$newlib - fi # test -n $old_archive_from_expsyms_cmds + fi # test -n "$old_archive_from_expsyms_cmds" if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= @@ -1809,6 +2314,22 @@ compiler." immediate | unsupported) if test "$hardcode_direct" = no; then add="$dir/$linklib" + case $host in + *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-darwin* ) + # if the lib is a module then we can not link against it, someone + # is ignoring the new warnings I added + if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then + $echo "** Warning, lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + $echo + $echo "** And there doesn't seem to be a static archive available" + $echo "** The link will probably fail, sorry" + else + add="$dir/$old_library" + fi + fi + esac elif test "$hardcode_minus_L" = no; then case $host in *-*-sunos*) add_shlibpath="$dir" ;; @@ -1827,6 +2348,14 @@ compiler." add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then add_dir="-L$dir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="-L$inst_prefix_dir$libdir $add_dir" + ;; + esac + fi add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then add_shlibpath="$dir" @@ -1868,6 +2397,7 @@ compiler." if test "$linkmode" = prog || test "$mode" = relink; then add_shlibpath= + add_prefix_dir= add_dir= add= # Finalize command for both is simple: just hardcode it. @@ -1882,30 +2412,47 @@ compiler." *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; esac add="-l$name" + elif test "$hardcode_automatic" = yes; then + if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" + fi else # We cannot seem to hardcode it, guess we'll fake it. add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_dir="-L$inst_prefix_dir$libdir $add_dir" + ;; + esac + fi add="-l$name" fi + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) + add_prefix_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi + + # add_prefix_dir must be appended instead, otherwise it can + # possibly be overrided by any hardcoded -L/... path in deplibs if test "$linkmode" = prog; then + test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else + test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" fi fi elif test "$linkmode" = prog; then - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - - # Try to link the static library # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. @@ -1925,20 +2472,21 @@ compiler." # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - echo - echo "*** Warning: This library needs some functionality provided by $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." + $echo + $echo "*** Warning: This system can not link to static lib archive $lib." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - echo "*** Therefore, libtool will create a static module, that should work " - echo "*** as long as the dlopening application is linked with the -dlopen flag." + $echo "*** But as you try to build a module library, libtool will still create " + $echo "*** a static module, that should work as long as the dlopening application" + $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $echo + $echo "*** However, this would only work if libtool was able to extract symbol" + $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + $echo "*** not find such a program. So, this module is probably useless." + $echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -1957,8 +2505,8 @@ compiler." if test "$linkmode" = lib; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || test $build_old_libs = yes || - test $link_static = yes; }; then + { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || + test "$link_static" = yes; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -1981,9 +2529,11 @@ compiler." tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac + if test "X$duplicate_deps" = "Xyes" ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi tmp_libs="$tmp_libs $deplib" done @@ -2007,9 +2557,9 @@ compiler." ;; esac if grep "^installed=no" $deplib > /dev/null; then - path="-L$absdir/$objdir" + path="$absdir/$objdir" else - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 @@ -2017,12 +2567,53 @@ compiler." if test "$absdir" != "$libdir"; then $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 fi - path="-L$absdir" + path="$absdir" fi + depdepl= + case $host in + *-*-darwin*) + # we do not want to link against static libs, but need to link against shared + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" + fi + newlib_search_path="$newlib_search_path $path" + path="" + fi + ;; + *) + path="-L$path" + ;; + esac + + ;; + -l*) + case $host in + *-*-darwin*) + # Again, we only want to link against shared libraries + eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` + for tmp in $newlib_search_path ; do + if test -f "$tmp/lib$tmp_libs.dylib" ; then + eval depdepl="$tmp/lib$tmp_libs.dylib" + break + fi + done + path="" + ;; + *) continue ;; + esac ;; *) continue ;; esac case " $deplibs " in + *" $depdepl "*) ;; + *) deplibs="$deplibs $depdepl" ;; + esac + case " $deplibs " in *" $path "*) ;; *) deplibs="$deplibs $path" ;; esac @@ -2030,6 +2621,7 @@ compiler." fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs + dependency_libs="$newdependency_libs" if test "$pass" = dlpreopen; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do @@ -2037,7 +2629,6 @@ compiler." done fi if test "$pass" != dlopen; then - test "$pass" != scan && dependency_libs="$newdependency_libs" if test "$pass" != conv; then # Make sure lib_search_path contains only unique directories. lib_search_path= @@ -2060,9 +2651,30 @@ compiler." eval tmp_libs=\"\$$var\" new_libs= for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: case $deplib in -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. case " $specialdeplibs " in *" $deplib "*) new_libs="$deplib $new_libs" ;; *) @@ -2090,11 +2702,19 @@ compiler." eval $var=\"$tmp_libs\" done # for var fi - if test "$pass" = "conv" && - { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then - libs="$deplibs" # reset libs - deplibs= - fi + # Last step: remove runtime libs from dependency_libs (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i="" + ;; + esac + if test -n "$i" ; then + tmp_libs="$tmp_libs $i" + fi + done + dependency_libs=$tmp_libs done # for pass if test "$linkmode" = prog; then dlfiles="$newdlfiles" @@ -2103,6 +2723,10 @@ compiler." case $linkmode in oldlib) + if test -n "$deplibs"; then + $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 + fi + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 fi @@ -2116,7 +2740,7 @@ compiler." fi if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2 + $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 fi if test -n "$release"; then @@ -2138,6 +2762,7 @@ compiler." case $outputname in lib*) name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + eval shared_ext=\"$shrext\" eval libname=\"$libname_spec\" ;; *) @@ -2149,6 +2774,7 @@ compiler." if test "$need_lib_prefix" != no; then # Add the "lib" prefix for modules if required name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` + eval shared_ext=\"$shrext\" eval libname=\"$libname_spec\" else libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` @@ -2161,9 +2787,9 @@ compiler." $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 exit 1 else - echo - echo "*** Warning: Linking the shared library $output against the non-libtool" - echo "*** objects $objs is not portable!" + $echo + $echo "*** Warning: Linking the shared library $output against the non-libtool" + $echo "*** objects $objs is not portable!" libobjs="$libobjs $objs" fi fi @@ -2173,7 +2799,7 @@ compiler." fi set dummy $rpath - if test $# -gt 2; then + if test "$#" -gt 2; then $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 fi install_libdir="$2" @@ -2182,14 +2808,16 @@ compiler." if test -z "$rpath"; then if test "$build_libtool_libs" = yes; then # Building a libtool convenience library. - libext=al + # Some compilers have problems with a `.al' extension so + # convenience libraries should have the same extension an + # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" build_libtool_libs=convenience build_old_libs=yes fi if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2 + $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 fi if test -n "$release"; then @@ -2208,9 +2836,46 @@ compiler." exit 1 fi - current="$2" - revision="$3" - age="$4" + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + number_major="$2" + number_minor="$3" + number_revision="$4" + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix + # which has an extra 1 added just for fun + # + case $version_type in + darwin|linux|osf|windows) + current=`expr $number_major + $number_minor` + age="$number_minor" + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|sunos) + current="$number_major" + revision="$number_minor" + age="0" + ;; + irix|nonstopux) + current=`expr $number_major + $number_minor - 1` + age="$number_minor" + revision="$number_minor" + ;; + esac + ;; + no) + current="$2" + revision="$3" + age="$4" + ;; + esac # Check that each of the things are valid numbers. case $current in @@ -2240,7 +2905,7 @@ compiler." ;; esac - if test $age -gt $current; then + if test "$age" -gt "$current"; then $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit 1 @@ -2273,16 +2938,21 @@ compiler." versuffix=".$current"; ;; - irix) + irix | nonstopux) major=`expr $current - $age + 1` - verstring="sgi$major.$revision" + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac + verstring="$verstring_prefix$major.$revision" # Add in all the interfaces that we are compatible with. loop=$revision - while test $loop != 0; do + while test "$loop" -ne 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` - verstring="sgi$major.$iface:$verstring" + verstring="$verstring_prefix$major.$iface:$verstring" done # Before this point, $major must not contain `.'. @@ -2296,13 +2966,13 @@ compiler." ;; osf) - major=`expr $current - $age` + major=.`expr $current - $age` versuffix=".$current.$age.$revision" verstring="$current.$age.$revision" # Add in all the interfaces that we are compatible with. loop=$age - while test $loop != 0; do + while test "$loop" -ne 0; do iface=`expr $current - $loop` loop=`expr $loop - 1` verstring="$verstring:${iface}.0" @@ -2326,7 +2996,7 @@ compiler." *) $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 exit 1 ;; esac @@ -2334,12 +3004,11 @@ compiler." # Clear the version info if we defaulted, and they specified a release. if test -z "$vinfo" && test -n "$release"; then major= - verstring="0.0" case $version_type in darwin) # we can't check for "0.0" in archive_cmds due to quoting # problems, so we reset it completely - verstring="" + verstring= ;; *) verstring="0.0" @@ -2373,9 +3042,24 @@ compiler." fi if test "$mode" != relink; then - # Remove our outputs. - $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" - $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.* + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$echo "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + removelist="$removelist $p" + ;; + *) ;; + esac + done + if test -n "$removelist"; then + $show "${rm}r $removelist" + $run ${rm}r $removelist + fi fi # Now set the variables for building old libraries. @@ -2388,9 +3072,9 @@ compiler." # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` - deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` - dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` + deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` done if test -n "$xrpath"; then @@ -2403,7 +3087,7 @@ compiler." *) finalize_rpath="$finalize_rpath $libdir" ;; esac done - if test $hardcode_into_libs != yes || test $build_old_libs = yes; then + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then dependency_libs="$temp_xrpath $dependency_libs" fi fi @@ -2441,10 +3125,11 @@ compiler." *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd*) + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue ;; - *) + *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then deplibs="$deplibs -lc" @@ -2473,7 +3158,7 @@ compiler." # This might be a little naive. We might want to check # whether the library exists or not. But this is on # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behaviour. + # implementing what was already the behavior. newdeplibs=$deplibs ;; test_compile) @@ -2486,43 +3171,22 @@ compiler." int main() { return 0; } EOF $rm conftest - $CC -o conftest conftest.c $deplibs - if test $? -eq 0 ; then + $LTCC -o conftest conftest.c $deplibs + if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - libname=`eval \\$echo \"$libname_spec\"` - deplib_matches=`eval \\$echo \"$library_names_spec\"` - set dummy $deplib_matches - deplib_match=$2 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" - else - droppeddeps=yes - echo - echo "*** Warning: This library needs some functionality provided by $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - fi - else - newdeplibs="$newdeplibs $i" - fi - done - else - # Error occured in the first compile. Let's try to salvage the situation: - # Compile a seperate program for each library. - for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - $rm conftest - $CC -o conftest conftest.c $i - # Did it work? - if test $? -eq 0 ; then - ldd_output=`ldd conftest` + if test "$name" != "" && test "$name" -ne "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) + newdeplibs="$newdeplibs $i" + i="" + ;; + esac + fi + if test -n "$i" ; then libname=`eval \\$echo \"$libname_spec\"` deplib_matches=`eval \\$echo \"$library_names_spec\"` set dummy $deplib_matches @@ -2531,19 +3195,64 @@ EOF newdeplibs="$newdeplibs $i" else droppeddeps=yes - echo - echo "*** Warning: This library needs some functionality provided by $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." + $echo + $echo "*** Warning: dynamic linker does not accept needed library $i." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which I believe you do not have" + $echo "*** because a test_compile did reveal that the linker did not use it for" + $echo "*** its dynamic dependency list that programs get resolved with at runtime." + fi + fi + else + newdeplibs="$newdeplibs $i" + fi + done + else + # Error occurred in the first compile. Let's try to salvage + # the situation: Compile a separate program for each library. + for i in $deplibs; do + name="`expr $i : '-l\(.*\)'`" + # If $name is empty we are operating on a -L argument. + if test "$name" != "" && test "$name" != "0"; then + $rm conftest + $LTCC -o conftest conftest.c $i + # Did it work? + if test "$?" -eq 0 ; then + ldd_output=`ldd conftest` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) + newdeplibs="$newdeplibs $i" + i="" + ;; + esac + fi + if test -n "$i" ; then + libname=`eval \\$echo \"$libname_spec\"` + deplib_matches=`eval \\$echo \"$library_names_spec\"` + set dummy $deplib_matches + deplib_match=$2 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + newdeplibs="$newdeplibs $i" + else + droppeddeps=yes + $echo + $echo "*** Warning: dynamic linker does not accept needed library $i." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which you do not appear to have" + $echo "*** because a test_compile did reveal that the linker did not use this one" + $echo "*** as a dynamic dependency that programs can get resolved with at runtime." + fi fi else droppeddeps=yes - echo - echo "*** Warning! Library $i is needed by this library but I was not able to" - echo "*** make it link in! You will probably need to install it or some" - echo "*** library that it depends on before this library will be fully" - echo "*** functional. Installing it before continuing would be even better." + $echo + $echo "*** Warning! Library $i is needed by this library but I was not able to" + $echo "*** make it link in! You will probably need to install it or some" + $echo "*** library that it depends on before this library will be fully" + $echo "*** functional. Installing it before continuing would be even better." fi else newdeplibs="$newdeplibs $i" @@ -2557,11 +3266,20 @@ EOF for a_deplib in $deplibs; do name="`expr $a_deplib : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do + if test "$name" != "" && test "$name" != "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then + libname=`eval \\$echo \"$libname_spec\"` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null \ | grep " -> " >/dev/null; then @@ -2574,28 +3292,36 @@ EOF # but so what? potlib="$potent_lib" while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | sed 's/.* -> //'` + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | sed 10q \ - | egrep "$file_magic_regex" > /dev/null; then + | ${SED} 10q \ + | $EGREP "$file_magic_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 fi - done - done + done + done + fi if test -n "$a_deplib" ; then droppeddeps=yes - echo - echo "*** Warning: This library needs some functionality provided by $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." + $echo + $echo "*** Warning: linker path does not have real file for library $a_deplib." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which you do not appear to have" + $echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $echo "*** with $libname but no candidates were found. (...for file magic test)" + else + $echo "*** with $libname and none of the candidates passed a file format test" + $echo "*** using a file magic. Last file checked: $potlib" + fi fi else # Add a -L argument. @@ -2610,26 +3336,44 @@ EOF name="`expr $a_deplib : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. if test -n "$name" && test "$name" != "0"; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - if eval echo \"$potent_lib\" 2>/dev/null \ - | sed 10q \ - | egrep "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then + libname=`eval \\$echo \"$libname_spec\"` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval $echo \"$potent_lib\" 2>/dev/null \ + | ${SED} 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + done done - done + fi if test -n "$a_deplib" ; then droppeddeps=yes - echo - echo "*** Warning: This library needs some functionality provided by $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." + $echo + $echo "*** Warning: linker path does not have real file for library $a_deplib." + $echo "*** I have the capability to make that library automatically link in when" + $echo "*** you link to this library. But I can only do this if you have a" + $echo "*** shared version of the library, which you do not appear to have" + $echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $echo "*** with $libname but no candidates were found. (...for regex pattern test)" + else + $echo "*** with $libname and none of the candidates passed a file format test" + $echo "*** using a regex pattern. Last file checked: $potlib" + fi fi else # Add a -L argument. @@ -2639,16 +3383,23 @@ EOF ;; none | unknown | *) newdeplibs="" - if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | - grep . >/dev/null; then - echo + tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ + -e 's/ -[LR][^ ]*//g'` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + for i in $predeps $postdeps ; do + # can't use Xsed below, because $i might contain '/' + tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` + done + fi + if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ + | grep . >/dev/null; then + $echo if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." + $echo "*** Warning: inter-library dependencies are not supported in this platform." else - echo "*** Warning: inter-library dependencies are not known to be supported." + $echo "*** Warning: inter-library dependencies are not known to be supported." fi - echo "*** All declared inter-library dependencies are being dropped." + $echo "*** All declared inter-library dependencies are being dropped." droppeddeps=yes fi ;; @@ -2668,17 +3419,17 @@ EOF if test "$droppeddeps" = yes; then if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - echo "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." + $echo + $echo "*** Warning: libtool could not satisfy all declared inter-library" + $echo "*** dependencies of module $libname. Therefore, libtool will create" + $echo "*** a static module, that should work as long as the dlopening" + $echo "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $echo + $echo "*** However, this would only work if libtool was able to extract symbol" + $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + $echo "*** not find such a program. So, this module is probably useless." + $echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -2688,16 +3439,16 @@ EOF build_libtool_libs=no fi else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." + $echo "*** The inter-library dependencies that have been dropped here will be" + $echo "*** automatically added whenever a program is linked with this library" + $echo "*** or is declared to -dlopen it." - if test $allow_undefined = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." + if test "$allow_undefined" = no; then + $echo + $echo "*** Since this library must not contain undefined symbols," + $echo "*** because either the platform does not support them or" + $echo "*** it was explicitly requested with -no-undefined," + $echo "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -2755,7 +3506,11 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - eval dep_rpath=\"$hardcode_libdir_flag_spec\" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -2775,6 +3530,7 @@ EOF fi # Get the real and link names of the library. + eval shared_ext=\"$shrext\" eval library_names=\"$library_names_spec\" set dummy $library_names realname="$2" @@ -2785,7 +3541,9 @@ EOF else soname="$realname" fi - test -z "$dlname" && dlname=$soname + if test -z "$dlname"; then + dlname=$soname + fi lib="$output_objdir/$realname" for link @@ -2793,23 +3551,6 @@ EOF linknames="$linknames $link" done - # Ensure that we have .o objects for linkers which dislike .lo - # (e.g. aix) in case we are running --disable-static - for obj in $libobjs; do - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir="." - else - xdir="$xdir" - fi - baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` - if test ! -f $xdir/$oldobj; then - $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" - $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? - fi - done - # Use standard objects if they are pic test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` @@ -2823,13 +3564,21 @@ EOF save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? + if len=`expr "X$cmd" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + $show "$cmd" + $run eval "$cmd" || exit $? + skipped_export=false + else + # The command line is too long to execute in one step. + $show "using reloadable object file for export list..." + skipped_export=: + fi done IFS="$save_ifs" if test -n "$export_symbols_regex"; then - $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" + $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' $show "$mv \"${export_symbols}T\" \"$export_symbols\"" $run eval '$mv "${export_symbols}T" "$export_symbols"' fi @@ -2840,17 +3589,29 @@ EOF $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' fi + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + tmp_deplibs="$tmp_deplibs $test_deplib" + ;; + esac + done + deplibs="$tmp_deplibs" + if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs eval libobjs=\"\$libobjs $whole_archive_flag_spec\" else gentop="$output_objdir/${outputname}x" $show "${rm}r $gentop" $run ${rm}r "$gentop" - $show "mkdir $gentop" - $run mkdir "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" status=$? - if test $status -ne 0 && test ! -d "$gentop"; then + if test "$status" -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" @@ -2866,16 +3627,42 @@ EOF $show "${rm}r $xdir" $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" status=$? - if test $status -ne 0 && test ! -d "$xdir"; then + if test "$status" -ne 0 && test ! -d "$xdir"; then exit $status fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. $show "(cd $xdir && $AR x $xabs)" $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi - libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` done fi fi @@ -2891,10 +3678,130 @@ EOF fi # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval cmds=\"$module_expsym_cmds\" + else + eval cmds=\"$module_cmds\" + fi + else if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else eval cmds=\"$archive_cmds\" + fi + fi + + if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise. + $echo "creating reloadable object files..." + + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + delfiles= + last_robj= + k=1 + output=$output_objdir/$save_output-${k}.$objext + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + eval test_cmds=\"$reload_cmds $objlist $last_robj\" + if test "X$objlist" = X || + { len=`expr "X$test_cmds" : ".*"` && + test "$len" -le "$max_cmd_len"; }; then + objlist="$objlist $obj" + else + # The command $test_cmds is almost too long, add a + # command to the queue. + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + eval concat_cmds=\"$reload_cmds $objlist $last_robj\" + else + # All subsequent reloadable object files will link in + # the last one created. + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" + fi + last_robj=$output_objdir/$save_output-${k}.$objext + k=`expr $k + 1` + output=$output_objdir/$save_output-${k}.$objext + objlist=$obj + len=1 + fi + done + # Handle the remaining objects by creating one last + # reloadable object file. All subsequent reloadable object + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + + if ${skipped_export-false}; then + $show "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $run $rm $export_symbols + libobjs=$output + # Append the command to create the export file. + eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" + fi + + # Set up a command to remove the reloadale object files + # after they are used. + i=0 + while test "$i" -lt "$k" + do + i=`expr $i + 1` + delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" + done + + $echo "creating a temporary reloadable object file: $output" + + # Loop through the commands generated above and execute them. + save_ifs="$IFS"; IFS='~' + for cmd in $concat_cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + + libobjs=$output + # Restore the value of output. + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval cmds=\"$archive_expsym_cmds\" + else + eval cmds=\"$archive_cmds\" + fi + + # Append the command to remove the reloadable object files + # to the just-reset $cmds. + eval cmds=\"\$cmds~$rm $delfiles\" fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do @@ -2986,10 +3893,10 @@ EOF gentop="$output_objdir/${obj}x" $show "${rm}r $gentop" $run ${rm}r "$gentop" - $show "mkdir $gentop" - $run mkdir "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" status=$? - if test $status -ne 0 && test ! -d "$gentop"; then + if test "$status" -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" @@ -3005,16 +3912,42 @@ EOF $show "${rm}r $xdir" $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" status=$? - if test $status -ne 0 && test ! -d "$xdir"; then + if test "$status" -ne 0 && test ! -d "$xdir"; then exit $status fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. $show "(cd $xdir && $AR x $xabs)" $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi - reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` done fi fi @@ -3050,8 +3983,8 @@ EOF # Create an invalid libtool object if no PIC, so that we don't # accidentally link it into a program. - $show "echo timestamp > $libobj" - $run eval "echo timestamp > $libobj" || exit $? + # $show "echo timestamp > $libobj" + # $run eval "echo timestamp > $libobj" || exit $? exit 0 fi @@ -3067,20 +4000,6 @@ EOF $run eval "$cmd" || exit $? done IFS="$save_ifs" - else - # Just create a symlink. - $show $rm $libobj - $run $rm $libobj - xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$libobj"; then - xdir="." - else - xdir="$xdir" - fi - baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` - oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` - $show "(cd $xdir && $LN_S $oldobj $baseobj)" - $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? fi if test -n "$gentop"; then @@ -3093,7 +4012,7 @@ EOF prog) case $host in - *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; + *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; esac if test -n "$vinfo"; then $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 @@ -3118,6 +4037,16 @@ EOF ;; esac + case $host in + *darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + if test "$tagname" = CXX ; then + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" + fi + ;; + esac + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -3268,12 +4197,12 @@ extern \"C\" { done if test -n "$exclude_expsyms"; then - $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' $run eval '$mv "$nlist"T "$nlist"' fi if test -n "$export_symbols_regex"; then - $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T' + $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' $run eval '$mv "$nlist"T "$nlist"' fi @@ -3281,9 +4210,9 @@ extern \"C\" { if test -z "$export_symbols"; then export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols - $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else - $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' + $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi @@ -3291,8 +4220,8 @@ extern \"C\" { for arg in $dlprefiles; do $show "extracting global C symbols from \`$arg'" - name=`echo "$arg" | sed -e 's%^.*/%%'` - $run eval 'echo ": $name " >> "$nlist"' + name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` + $run eval '$echo ": $name " >> "$nlist"' $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" done @@ -3301,12 +4230,18 @@ extern \"C\" { test -f "$nlist" || : > "$nlist" if test -n "$exclude_expsyms"; then - egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T $mv "$nlist"T "$nlist" fi # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then + if grep -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then : else grep -v "^: " < "$nlist" > "$nlist"S @@ -3315,7 +4250,7 @@ extern \"C\" { if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' else - echo '/* NONE */' >> "$output_objdir/$dlsyms" + $echo '/* NONE */' >> "$output_objdir/$dlsyms" fi $echo >> "$output_objdir/$dlsyms" "\ @@ -3367,18 +4302,18 @@ static const void *lt_preloaded_setup() { *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) case "$compile_command " in *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; + *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; esac;; *-*-hpux*) case "$compile_command " in *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DPIC";; + *) pic_flag_for_symtable=" $pic_flag";; esac esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" @@ -3403,7 +4338,7 @@ static const void *lt_preloaded_setup() { finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi - if test $need_relink = no || test "$build_libtool_libs" != yes; then + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" @@ -3528,7 +4463,7 @@ static const void *lt_preloaded_setup() { relink_command="$var=\"$var_value\"; export $var; $relink_command" fi done - relink_command="cd `pwd`; $relink_command" + relink_command="(cd `pwd`; $relink_command)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi @@ -3548,13 +4483,228 @@ static const void *lt_preloaded_setup() { # win32 will think the script is a binary if it has # a .exe suffix, so we strip it off here. case $output in - *.exe) output=`echo $output|sed 's,.exe$,,'` ;; + *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; esac # test for cygwin because mv fails w/o .exe extensions case $host in - *cygwin*) exeext=.exe ;; + *cygwin*) + exeext=.exe + outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; *) exeext= ;; esac + case $host in + *cygwin* | *mingw* ) + cwrappersource=`$echo ${objdir}/lt-${output}.c` + cwrapper=`$echo ${output}.exe` + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15 + + cat > $cwrappersource <> $cwrappersource<<"EOF" +#include +#include +#include +#include +#include +#include + +#if defined(PATH_MAX) +# define LT_PATHMAX PATH_MAX +#elif defined(MAXPATHLEN) +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif + +#ifndef DIR_SEPARATOR +#define DIR_SEPARATOR '/' +#endif + +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +#define HAVE_DOS_BASED_FILE_SYSTEM +#ifndef DIR_SEPARATOR_2 +#define DIR_SEPARATOR_2 '\\' +#endif +#endif + +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ + +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ +} while (0) + +const char *program_name = NULL; + +void * xmalloc (size_t num); +char * xstrdup (const char *string); +char * basename (const char *name); +char * fnqualify(const char *path); +char * strendzap(char *str, const char *pat); +void lt_fatal (const char *message, ...); + +int +main (int argc, char *argv[]) +{ + char **newargz; + int i; + + program_name = (char *) xstrdup ((char *) basename (argv[0])); + newargz = XMALLOC(char *, argc+2); +EOF + + cat >> $cwrappersource <> $cwrappersource <<"EOF" + newargz[1] = fnqualify(argv[0]); + /* we know the script has the same name, without the .exe */ + /* so make sure newargz[1] doesn't end in .exe */ + strendzap(newargz[1],".exe"); + for (i = 1; i < argc; i++) + newargz[i+1] = xstrdup(argv[i]); + newargz[argc+1] = NULL; +EOF + + cat >> $cwrappersource <> $cwrappersource <<"EOF" +} + +void * +xmalloc (size_t num) +{ + void * p = (void *) malloc (num); + if (!p) + lt_fatal ("Memory exhausted"); + + return p; +} + +char * +xstrdup (const char *string) +{ + return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL +; +} + +char * +basename (const char *name) +{ + const char *base; + +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over the disk name in MSDOS pathnames. */ + if (isalpha (name[0]) && name[1] == ':') + name += 2; +#endif + + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; + return (char *) base; +} + +char * +fnqualify(const char *path) +{ + size_t size; + char *p; + char tmp[LT_PATHMAX + 1]; + + assert(path != NULL); + + /* Is it qualified already? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha (path[0]) && path[1] == ':') + return xstrdup (path); +#endif + if (IS_DIR_SEPARATOR (path[0])) + return xstrdup (path); + + /* prepend the current directory */ + /* doesn't handle '~' */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ + p = XMALLOC(char, size); + sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); + return p; +} + +char * +strendzap(char *str, const char *pat) +{ + size_t len, patlen; + + assert(str != NULL); + assert(pat != NULL); + + len = strlen(str); + patlen = strlen(pat); + + if (patlen <= len) + { + str += len - patlen; + if (strcmp(str, pat) == 0) + *str = '\0'; + } + return str; +} + +static void +lt_error_core (int exit_status, const char * mode, + const char * message, va_list ap) +{ + fprintf (stderr, "%s: %s: ", program_name, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + + if (exit_status >= 0) + exit (exit_status); +} + +void +lt_fatal (const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + va_end (ap); +} +EOF + # we should really use a build-platform specific compiler + # here, but OTOH, the wrappers (shell script and this C one) + # are only useful if you want to execute the "real" binary. + # Since the "real" binary is built for $host, then this + # wrapper might as well be built for $host, too. + $run $LTCC -s -o $cwrapper $cwrappersource + ;; + esac $rm $output trap "$rm $output; exit 1" 1 2 15 @@ -3572,7 +4722,7 @@ static const void *lt_preloaded_setup() { # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -3610,7 +4760,7 @@ else test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` while test -n \"\$file\"; do destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` @@ -3623,7 +4773,7 @@ else fi file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` done # Try to get the absolute directory name. @@ -3632,12 +4782,12 @@ else " if test "$fast_install" = yes; then - echo >> $output "\ + $echo >> $output "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || \\ - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -3648,7 +4798,7 @@ else $rm \"\$progdir/\$file\" fi" - echo >> $output "\ + $echo >> $output "\ # relink executable if necessary if test -n \"\$relink_command\"; then @@ -3666,13 +4816,13 @@ else $rm \"\$progdir/\$file\" fi" else - echo >> $output "\ + $echo >> $output "\ program='$outputname' progdir=\"\$thisdir/$objdir\" " fi - echo >> $output "\ + $echo >> $output "\ if test -f \"\$progdir/\$program\"; then" @@ -3703,14 +4853,6 @@ else # Run the actual program with our arguments. " case $host in - # win32 systems need to use the prog path for dll - # lookup to work - *-*-cygwin* | *-*-pw32*) - $echo >> $output "\ - exec \$progdir/\$program \${1+\"\$@\"} -" - ;; - # Backslashes separate directories on plain windows *-*-mingw | *-*-os2*) $echo >> $output "\ @@ -3720,11 +4862,7 @@ else *) $echo >> $output "\ - # Export the path to the program. - PATH=\"\$progdir:\$PATH\" - export PATH - - exec \$program \${1+\"\$@\"} + exec \$progdir/\$program \${1+\"\$@\"} " ;; esac @@ -3736,7 +4874,7 @@ else # The program doesn't exist. \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 \$echo \"This script is just a wrapper for \$program.\" 1>&2 - echo \"See the $PACKAGE documentation for more information.\" 1>&2 + $echo \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ @@ -3759,7 +4897,7 @@ fi\ oldobjs="$libobjs_save" build_libtool_libs=no else - oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` + oldobjs="$old_deplibs $non_pic_objects" fi addlibs="$old_convenience" fi @@ -3768,10 +4906,10 @@ fi\ gentop="$output_objdir/${outputname}x" $show "${rm}r $gentop" $run ${rm}r "$gentop" - $show "mkdir $gentop" - $run mkdir "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" status=$? - if test $status -ne 0 && test ! -d "$gentop"; then + if test "$status" -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" @@ -3788,14 +4926,40 @@ fi\ $show "${rm}r $xdir" $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" status=$? - if test $status -ne 0 && test ! -d "$xdir"; then + if test "$status" -ne 0 && test ! -d "$xdir"; then exit $status fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. $show "(cd $xdir && $AR x $xabs)" $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` done @@ -3805,25 +4969,65 @@ fi\ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then eval cmds=\"$old_archive_from_new_cmds\" else - # Ensure that we have .o objects in place in case we decided - # not to build a shared library, and have fallen back to building - # static libs even though --disable-static was passed! - for oldobj in $oldobjs; do - if test ! -f $oldobj; then - xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$oldobj"; then - xdir="." - else - xdir="$xdir" - fi - baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` - obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` - $show "(cd $xdir && ${LN_S} $obj $baseobj)" - $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? - fi - done - eval cmds=\"$old_archive_cmds\" + + if len=`expr "X$cmds" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # the command line is too long to link in one step, link in parts + $echo "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + # GNU ar 2.10+ was changed to match POSIX; thus no paths are + # encoded into archives. This makes 'ar r' malfunction in + # this piecewise linking case whenever conflicting object + # names appear in distinct ar calls; check, warn and compensate. + if (for obj in $save_oldobjs + do + $echo "X$obj" | $Xsed -e 's%^.*/%%' + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 + $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 + AR_FLAGS=cq + fi + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + for obj in $save_oldobjs + do + oldobjs="$objlist $obj" + objlist="$objlist $obj" + eval test_cmds=\"$old_archive_cmds\" + if len=`expr "X$test_cmds" : ".*"` && + test "$len" -le "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~$old_archive_cmds\" + fi + fi fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do @@ -3858,7 +5062,7 @@ fi\ fi done # Quote the link command for shipping. - relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" + relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. @@ -3875,7 +5079,7 @@ fi\ case $deplib in *.la) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 @@ -3889,7 +5093,7 @@ fi\ newdlfiles= for lib in $dlfiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 @@ -3900,7 +5104,7 @@ fi\ newdlprefiles= for lib in $dlprefiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 @@ -3913,7 +5117,7 @@ fi\ # place dlname in correct position for cygwin tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac $echo > $output "\ # $outputname - a libtool library file @@ -3942,13 +5146,16 @@ revision=$revision # Is this an already installed library? installed=$installed +# Should we warn about portability when linking against -modules? +shouldnotlink=$module + # Files to dlopen/dlpreopen dlopen='$dlfiles' dlpreopen='$dlprefiles' # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test $need_relink = yes; then + if test "$installed" = no && test "$need_relink" = yes; then $echo >> $output "\ relink_command=\"$relink_command\"" fi @@ -4084,7 +5291,7 @@ relink_command=\"$relink_command\"" # Not a directory, so check to see that there is only one file specified. set dummy $files - if test $# -gt 2; then + if test "$#" -gt 2; then $echo "$modename: \`$dest' is not a directory" 1>&2 $echo "$help" 1>&2 exit 1 @@ -4124,7 +5331,7 @@ relink_command=\"$relink_command\"" *.la) # Check to see that this really is a libtool archive. - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 @@ -4159,12 +5366,33 @@ relink_command=\"$relink_command\"" dir="$dir$objdir" if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. + if test "$inst_prefix_dir" = "$destdir"; then + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 + exit 1 + fi + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + fi + $echo "$modename: warning: relinking \`$file'" 1>&2 $show "$relink_command" if $run eval "$relink_command"; then : else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - continue + exit 1 fi fi @@ -4186,7 +5414,7 @@ relink_command=\"$relink_command\"" $run eval "$striplib $destdir/$realname" || exit $? fi - if test $# -gt 0; then + if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. for linkname do @@ -4272,20 +5500,48 @@ relink_command=\"$relink_command\"" destfile="$destdir/$destfile" fi + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install + stripped_ext="" + case $file in + *.exe) + if test ! -f "$file"; then + file=`$echo $file|${SED} 's,.exe$,,'` + stripped_ext=".exe" + fi + ;; + esac + # Do a test to see if this is really a libtool program. - if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + case $host in + *cygwin*|*mingw*) + wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` + ;; + *) + wrapper=$file + ;; + esac + if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then notinst_deplibs= relink_command= + # To insure that "foo" is sourced, and not "foo.exe", + # finese the cygwin/MSYS system by explicitly sourcing "foo." + # which disallows the automatic-append-.exe behavior. + case $build in + *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; + *) wrapperdot=${wrapper} ;; + esac # If there is no directory component, then add one. case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; + */* | *\\*) . ${wrapperdot} ;; + *) . ./${wrapperdot} ;; esac # Check the variables that should have been set. if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 + $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 exit 1 fi @@ -4308,10 +5564,17 @@ relink_command=\"$relink_command\"" done relink_command= + # To insure that "foo" is sourced, and not "foo.exe", + # finese the cygwin/MSYS system by explicitly sourcing "foo." + # which disallows the automatic-append-.exe behavior. + case $build in + *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; + *) wrapperdot=${wrapper} ;; + esac # If there is no directory component, then add one. case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; + */* | *\\*) . ${wrapperdot} ;; + *) . ./${wrapperdot} ;; esac outputname= @@ -4325,7 +5588,7 @@ relink_command=\"$relink_command\"" $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 continue fi - file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` @@ -4343,14 +5606,14 @@ relink_command=\"$relink_command\"" fi else # Install the binary that we compiled earlier. - file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` fi fi # remove .exe since cygwin /usr/bin/install will append another # one anyways case $install_prog,$host in - /usr/bin/install*,*cygwin*) + */usr/bin/install*,*cygwin*) case $file:$destfile in *.exe:*.exe) # this is ok @@ -4359,7 +5622,7 @@ relink_command=\"$relink_command\"" destfile=$destfile.exe ;; *:*.exe) - destfile=`echo $destfile | sed -e 's,.exe$,,'` + destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` ;; esac ;; @@ -4444,42 +5707,42 @@ relink_command=\"$relink_command\"" fi # Exit here if they wanted silent mode. - test "$show" = ":" && exit 0 + test "$show" = : && exit 0 - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" + $echo "----------------------------------------------------------------------" + $echo "Libraries have been installed in:" for libdir in $libdirs; do - echo " $libdir" + $echo " $libdir" done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" + $echo + $echo "If you ever happen to want to link against installed libraries" + $echo "in a given directory, LIBDIR, you must either use libtool, and" + $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + $echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" + $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + $echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" + $echo " - add LIBDIR to the \`$runpath_var' environment variable" + $echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - echo " - use the \`$flag' linker flag" + $echo " - use the \`$flag' linker flag" fi if test -n "$admincmds"; then - echo " - have your system administrator run these commands:$admincmds" + $echo " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" fi - echo - echo "See any operating system documentation about shared libraries for" - echo "more information, such as the ld(1) and ld.so(8) manual pages." - echo "----------------------------------------------------------------------" + $echo + $echo "See any operating system documentation about shared libraries for" + $echo "more information, such as the ld(1) and ld.so(8) manual pages." + $echo "----------------------------------------------------------------------" exit 0 ;; @@ -4507,7 +5770,7 @@ relink_command=\"$relink_command\"" case $file in *.la) # Check to see that this really is a libtool archive. - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 @@ -4578,7 +5841,7 @@ relink_command=\"$relink_command\"" -*) ;; *) # Do a test to see if this is really a libtool program. - if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then # If there is no directory component, then add one. case $file in */* | *\\*) . $file ;; @@ -4601,7 +5864,7 @@ relink_command=\"$relink_command\"" eval "export $shlibpath_var" fi - # Restore saved enviroment variables + # Restore saved environment variables if test "${save_LC_ALL+set}" = set; then LC_ALL="$save_LC_ALL"; export LC_ALL fi @@ -4610,7 +5873,7 @@ relink_command=\"$relink_command\"" fi # Now prepare to actually exec the command. - exec_cmd='"$cmd"$args' + exec_cmd="\$cmd$args" else # Display what would be done. if test -n "$shlibpath_var"; then @@ -4651,19 +5914,20 @@ relink_command=\"$relink_command\"" rmdirs= + origobjdir="$objdir" for file in $files; do dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` if test "X$dir" = "X$file"; then dir=. - objdir="$objdir" + objdir="$origobjdir" else - objdir="$dir/$objdir" + objdir="$dir/$origobjdir" fi name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test $mode = uninstall && objdir="$dir" + test "$mode" = uninstall && objdir="$dir" # Remember objdir for removal later, being careful to avoid duplicates - if test $mode = clean; then + if test "$mode" = clean; then case " $rmdirs " in *" $objdir "*) ;; *) rmdirs="$rmdirs $objdir" ;; @@ -4687,7 +5951,7 @@ relink_command=\"$relink_command\"" case $name in *.la) # Possibly a libtool archive, so verify it. - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then . $dir/$name # Delete the libtool libraries and symlinks. @@ -4695,9 +5959,9 @@ relink_command=\"$relink_command\"" rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - if test $mode = uninstall; then + if test "$mode" = uninstall; then if test -n "$library_names"; then # Do each command in the postuninstall commands. eval cmds=\"$postuninstall_cmds\" @@ -4706,7 +5970,7 @@ relink_command=\"$relink_command\"" IFS="$save_ifs" $show "$cmd" $run eval "$cmd" - if test $? != 0 && test "$rmforce" != yes; then + if test "$?" -ne 0 && test "$rmforce" != yes; then exit_status=1 fi done @@ -4721,7 +5985,7 @@ relink_command=\"$relink_command\"" IFS="$save_ifs" $show "$cmd" $run eval "$cmd" - if test $? != 0 && test "$rmforce" != yes; then + if test "$?" -ne 0 && test "$rmforce" != yes; then exit_status=1 fi done @@ -4733,22 +5997,52 @@ relink_command=\"$relink_command\"" ;; *.lo) - if test "$build_old_libs" = yes; then - oldobj=`$echo "X$name" | $Xsed -e "$lo2o"` - rmfiles="$rmfiles $dir/$oldobj" + # Possibly a libtool object, so verify it. + if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + + # Read the .lo file + . $dir/$name + + # Add PIC object to the list of files to remove. + if test -n "$pic_object" \ + && test "$pic_object" != none; then + rmfiles="$rmfiles $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" \ + && test "$non_pic_object" != none; then + rmfiles="$rmfiles $dir/$non_pic_object" + fi fi ;; *) - # Do a test to see if this is a libtool program. - if test $mode = clean && - (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$file + if test "$mode" = clean ; then + noexename=$name + case $file in + *.exe) + file=`$echo $file|${SED} 's,.exe$,,'` + noexename=`$echo $name|${SED} 's,.exe$,,'` + # $file with .exe has already been added to rmfiles, + # add $file without .exe + rmfiles="$rmfiles $file" + ;; + esac + # Do a test to see if this is a libtool program. + if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + relink_command= + . $dir/$noexename - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles + rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then + rmfiles="$rmfiles $objdir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then + rmfiles="$rmfiles $objdir/lt-${noexename}.c" + fi fi fi ;; @@ -4756,6 +6050,7 @@ relink_command=\"$relink_command\"" $show "$rm $rmfiles" $run $rm $rmfiles || exit_status=1 done + objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -4803,6 +6098,7 @@ Provide generalized library-building support services. --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] --quiet same as \`--silent' --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG --version print version information MODE must be one of the following: @@ -4816,7 +6112,9 @@ MODE must be one of the following: uninstall remove libraries from an installed directory MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE." +a more detailed description of MODE. + +Report bugs to ." exit 0 ;; @@ -4928,6 +6226,7 @@ The following components of LINK-COMMAND are treated specially: -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries @@ -4973,11 +6272,31 @@ Otherwise, only FILE itself is deleted using RM." ;; esac -echo +$echo $echo "Try \`$modename --help' for more information about other modes." exit 0 +# The TAGs below are defined such that we never get into a situation +# in which we disable both kinds of libraries. Given conflicting +# choices, we go for a static library, that is the most portable, +# since we can't tell whether shared libraries were disabled because +# the user asked for that or because the platform doesn't support +# them. This is particularly important on AIX, because we don't +# support having both static and shared libraries enabled at the same +# time on that platform, so we default to a shared-only configuration. +# If a disable-shared tag is given, we'll fallback to a static-only +# configuration. But we'll never go from static-only to shared-only. + +# ### BEGIN LIBTOOL TAG CONFIG: disable-shared +build_libtool_libs=no +build_old_libs=yes +# ### END LIBTOOL TAG CONFIG: disable-shared + +# ### BEGIN LIBTOOL TAG CONFIG: disable-static +build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` +# ### END LIBTOOL TAG CONFIG: disable-static + # Local Variables: # mode:shell-script # sh-indentation:2 diff --git a/man/Makefile.am b/man/Makefile.am index f388d9ae..6a803aa0 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,6 +1,6 @@ # subdirectories for translated manual pages -SUBDIRS = cs de fr hu id it ja ko pl pt_BR +SUBDIRS = cs de es fr hu id it ja ko pl pt_BR ru zh_CN zh_TW man_MANS = \ adduser.8 \ @@ -11,11 +11,11 @@ man_MANS = \ expiry.1 \ faillog.5 \ faillog.8 \ - getspnam.3 \ gpasswd.1 \ groupadd.8 \ groupdel.8 \ groupmod.8 \ + groups.1 \ grpck.8 \ grpconv.8 \ grpunconv.8 \ @@ -45,12 +45,8 @@ man_MANS = \ vipw.8 EXTRA_DIST = $(man_MANS) \ - dpasswd.8 \ - getspnam.3 \ - groups.1 \ id.1 \ pw_auth.3 \ - pwauth.8 \ shadow.3 \ shadowconfig.8 \ sulogin.8 diff --git a/man/Makefile.in b/man/Makefile.in index ac356537..3bf9b0f8 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,103 +14,146 @@ @SET_MAKE@ -# subdirectories for translated manual pages - -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ -SUBDIRS = cs de fr hu id it ja ko pl pt_BR +# subdirectories for translated manual pages +SUBDIRS = cs de es fr hu id it ja ko pl pt_BR ru zh_CN zh_TW man_MANS = \ adduser.8 \ @@ -120,11 +164,11 @@ man_MANS = \ expiry.1 \ faillog.5 \ faillog.8 \ - getspnam.3 \ gpasswd.1 \ groupadd.8 \ groupdel.8 \ groupmod.8 \ + groups.1 \ grpck.8 \ grpconv.8 \ grpunconv.8 \ @@ -155,17 +199,14 @@ man_MANS = \ EXTRA_DIST = $(man_MANS) \ - dpasswd.8 \ - getspnam.3 \ - groups.1 \ id.1 \ pw_auth.3 \ - pwauth.8 \ shadow.3 \ shadowconfig.8 \ sulogin.8 subdir = man +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -174,15 +215,21 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in +RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + ps-recursive install-info-recursive uninstall-info-recursive \ + all-recursive install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -192,13 +239,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: man1dir = $(mandir)/man1 @@ -216,6 +256,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -233,6 +277,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -240,45 +288,6 @@ uninstall-man1: rm -f $(DESTDIR)$(man1dir)/$$inst; \ done -man3dir = $(mandir)/man3 -install-man3: $(man3_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man3dir) - @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.3*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \ - done -uninstall-man3: - @$(NORMAL_UNINSTALL) - @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.3*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \ - rm -f $(DESTDIR)$(man3dir)/$$inst; \ - done - man5dir = $(mandir)/man5 install-man5: $(man5_MANS) $(man_MANS) @$(NORMAL_INSTALL) @@ -294,6 +303,10 @@ install-man5: $(man5_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -311,6 +324,10 @@ uninstall-man5: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -333,6 +350,10 @@ install-man8: $(man8_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -350,6 +371,10 @@ uninstall-man8: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -364,7 +389,7 @@ uninstall-man8: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -384,7 +409,7 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -411,66 +436,108 @@ tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ETAGS = etags +ETAGSFLAGS = + +CTAGS = ctags +CTAGSFLAGS = tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ @@ -488,7 +555,7 @@ check: check-recursive all-am: Makefile $(MANS) installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man3dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) + $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) install: install-recursive install-exec: install-exec-recursive @@ -501,6 +568,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -508,7 +576,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -518,7 +586,7 @@ clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool \ distclean-tags @@ -536,42 +604,49 @@ install-exec-am: install-info: install-info-recursive -install-man: install-man1 install-man3 install-man5 install-man8 +install-man: install-man1 install-man5 install-man8 installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-info: uninstall-info-recursive -uninstall-man: uninstall-man1 uninstall-man3 uninstall-man5 \ - uninstall-man8 +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 -.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive distclean \ - distclean-generic distclean-libtool distclean-recursive \ - distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ - info-recursive install install-am install-data install-data-am \ - install-data-recursive install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-man install-man1 install-man3 \ - install-man5 install-man8 install-recursive install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - installdirs-recursive maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ + clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ + install-exec install-exec-am install-exec-recursive \ + install-info install-info-am install-info-recursive install-man \ + install-man1 install-man5 install-man8 install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ + pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ + tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-man uninstall-man1 \ - uninstall-man3 uninstall-man5 uninstall-man8 \ - uninstall-recursive + uninstall-man5 uninstall-man8 uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/chage.1 b/man/chage.1 index e058d103..596eb4d3 100644 --- a/man/chage.1 +++ b/man/chage.1 @@ -1,4 +1,4 @@ -.\"$Id: chage.1,v 1.9 2002/03/09 19:22:29 ankry Exp $ +.\"$Id: chage.1,v 1.12 2003/05/06 22:55:11 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" @@ -39,66 +39,58 @@ chage \- change user password expiry information \fBchage\fR \fB-l \fIuser\fR .SH DESCRIPTION -\fBchage\fR changes the number of days between password changes and the -date of the last password change. -This information is used by the system to determine when a user must -change her password. +\fBchage\fR changes the number of days between password changes and the date +of the last password change. This information is used by the system to +determine when a user must change her password. +.PP The \fBchage\fR command is restricted to the root user, except for the \fB-l\fR option, which may be used by an unprivileged user to determine when her password or account is due to expire. -.PP -With the \fB-m\fR option, the value of \fImindays\fR is the minimum number -of days between password changes. -A value of zero for this field indicates that the user may change -her password at any time. -.PP -With the \fB-M\fR option, the value of \fImaxdays\fR is the maximum number -of days during which a password is valid. -When \fImaxdays\fR plus \fIlastday\fR is less than the current day, -the user will be required to change her password before being -able to use her account. +The options which apply to the \fBchage\fR command are: +.IP "\fB-m\fR \fImindays\fR" +Set the minimum number of days between password changes. A value of zero for +this field indicates that the user may change her password at any time. +.IP "\fB-M\fR \fImaxdays\fR" +Set maximum number of days during which a password is valid. When +\fImaxdays\fR plus fIlastday\fR is less than the current day, the user will +be required to change her password before being able to use her account. This occurance can be planned for in advance by use of the \fB-W\fR option, which provides the user with advance warning. -.PP -With the \fB-d\fR option, the value of \fIlastday\fR is the number of days -since January 1st, 1970 when the password was last changed. -The date may also be expressed in the format YYYY-MM-DD (or the format more -commonly used in your area). -.PP -The \fB-E\fR option is used to set a date on which the user's account will -no longer be accessible. -The \fIexpiredate\fR option is the number of days since January 1, 1970 on -which the accounted is locked. -The date may also be expressed in the format YYYY-MM-DD (or the format more -commonly used in your area). -A user whose account is locked must contact the system administrator before -being able to use the system again. -.PP -The \fB-I\fR option is used to set the number of days of inactivity after -a password has expired before the account is locked. -The \fIinactive\fR option is the number of days of inactivity. A value of -0 disables this feature. -A user whose account is locked must contact the system administrator before -being able to use the system again. -.PP -The \fB-W\fR option is used to set the number of days of warning before a -password change is required. -The \fIwarndays\fR option is the number of days prior to the password -expiring that a user will be warned her password is about to expire. +.IP "\fB-d\fR \fIlastday\fR" +Set the number of days since January 1st, 1970 when the password was last +changed. The date may also be expressed in the format YYYY-MM-DD (or the +format more commonly used in your area). +.IP "\fB-E\fR \fIexpiredate\fR" +Set the date on which the user's account will no longer be accessible. The +\fIexpiredate\fR option is the number of days since January 1, 1970 on which +the accounted is locked. The date may also be expressed in the format +YYYY-MM-DD (or the format more commonly used in your area). A user whose +account is locked must contact the system administrator before being able to +use the system again. +.IP "\fB-I\fR \fIinactive\fR" +Set the number of days of inactivity after a password has expired before the +account is locked. The \fIinactive\fR option is the number of days of +inactivity. A value of 0 disables this feature. A user whose account is +locked must contact the system administrator before being able to use the +system again. +.IP "\fB-W\fR \fIwarndays\fR" +Set the number of days of warning before a password change is required. The +\fIwarndays\fR option is the number of days prior to the password expiring +that a user will be warned her password is about to expire. .PP If none of the options are selected, \fBchage\fR operates in an interactive fashion, prompting the user with the current values for all of the fields. -Enter the new value to change the field, or leave the line blank to use -the current value. -The current value is displayed between a pair of \fB[ ]\fR marks. +Enter the new value to change the field, or leave the line blank to use the +current value. The current value is displayed between a pair of \fB[ ]\fR +marks. .SH NOTE The \fBchage\fR program requires shadow password file to be available. Its functionality is not available when passwords are stored in the passwd file. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \ - user account information .br -/etc/shadow \- shadow user account information +\fI/etc/shadow\fR \ - shadow user account information .SH SEE ALSO .BR passwd (5), .BR shadow (5) diff --git a/man/chfn.1 b/man/chfn.1 index a9945763..6d0d6d6e 100644 --- a/man/chfn.1 +++ b/man/chfn.1 @@ -1,4 +1,4 @@ -.\"$Id: chfn.1,v 1.8 2002/03/09 19:22:29 ankry Exp $ +.\"$Id: chfn.1,v 1.10 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" @@ -37,27 +37,24 @@ chfn \- change real user name and information [\fIuser\fR] .SH DESCRIPTION \fBchfn\fR changes user fullname, office number, office extension, and home -phone number information for a user's account. -This information is typically printed by \fBfinger\fR(1) and similiar -programs. -A normal user may only change the fields for her own account, -the super user may change the fields for any account. -Also, only the super user may use the \fB-o\fR option to change the -undefined portions of the GECOS field. +phone number information for a user's account. This information is +typically printed by \fBfinger\fR(1) and similiar programs. A normal user +may only change the fields for her own account, the super user may change +the fields for any account. Also, only the super user may use the \fB-o\fR +option to change the undefined portions of the GECOS field. .PP -The only restriction placed on the contents of the fields is that no -control characters may be present, nor any of comma, colon, or equal sign. -The \fIother\fR field does not have this restriction, and is used to -store accounting information used by other applications. +The only restriction placed on the contents of the fields is that no control +characters may be present, nor any of comma, colon, or equal sign. The +\fIother\fR field does not have this restriction, and is used to store +accounting information used by other applications. .PP If none of the options are selected, \fBchfn\fR operates in an interactive fashion, prompting the user with the current values for all of the fields. -Enter the new value to change the field, or leave the line blank to use -the current value. -The current value is displayed between a pair of \fB[ ]\fR marks. -Without options, chfn prompts for the current user account. +Enter the new value to change the field, or leave the line blank to use the +current value. The current value is displayed between a pair of \fB[ ]\fR +marks. Without options, chfn prompts for the current user account. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \- user account information .SH SEE ALSO .BR passwd (5) .SH AUTHOR diff --git a/man/chpasswd.8 b/man/chpasswd.8 index ef7661b8..20f2d5ea 100644 --- a/man/chpasswd.8 +++ b/man/chpasswd.8 @@ -1,4 +1,4 @@ -.\"$Id: chpasswd.8,v 1.10 2002/03/08 04:39:11 kloczek Exp $ +.\"$Id: chpasswd.8,v 1.11 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,28 +31,23 @@ .SH SYNOPSIS \fBchpasswd\fR [\fB-e\fR] .SH DESCRIPTION -\fBchpasswd\fR reads a file of user name and password pairs -from standard input and uses this information -to update a group of existing users. Without the -e switch, the -passwords are expected to be cleartext. With the -e switch, the -passwords are expected to be in encrypted form. -Each line is of the format +\fBchpasswd\fR reads a file of user name and password pairs from standard +input and uses this information to update a group of existing users. Without +the \fB-e\fR switch, the passwords are expected to be cleartext. With the +\fB-e\fR switch, the passwords are expected to be in encrypted form. Each +line is of the format: .sp 1 \fIuser_name\fR:\fIpassword\fR .sp 1 -The named user must exist. -The supplied password will be encrypted as necessary, and the password age -updated, if present. +The named user must exist. The supplied password will be encrypted as +necessary, and the password age updated, if present. + .PP -This command is intended to be used in a large system environment where -many accounts are created at a single time. +This command is intended to be used in a large system environment where many +accounts are created at a single time. .SH CAVEATS -.\" The \fBmkpasswd\fR command must be executed afterwards to update the -.\" DBM password files. The input file must be protected if it contains unencrypted passwords. -.\" This command may be discarded in favor of the newusers(8) command. .SH SEE ALSO -.\" mkpasswd(8), passwd(1), useradd(1) .BR passwd (1), .BR newusers (8), .BR useradd (8) diff --git a/man/chsh.1 b/man/chsh.1 index 6e4fdf4a..a0a999e9 100644 --- a/man/chsh.1 +++ b/man/chsh.1 @@ -1,4 +1,4 @@ -.\"$Id: chsh.1,v 1.8 2002/03/09 19:22:29 ankry Exp $ +.\"$Id: chsh.1,v 1.10 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,33 +30,30 @@ chsh \- change login shell .SH SYNOPSIS .TP 5 -\fBchsh\fR -[\fB-s \fIlogin_shell\fR] [\fIuser\fR] +\fBchsh\fR [\fB-s \fIlogin_shell\fR] [\fIuser\fR] .SH DESCRIPTION -\fBchsh\fR changes the user login shell. -This determines the name of the user's initial login command. -A normal user may only change the login shell for her own account, -the super user may change the login shell for any account. +\fBchsh\fR changes the user login shell. This determines the name of the +user's initial login command. A normal user may only change the login shell +for her own account, the super user may change the login shell for any +account. .PP -The only restrictions placed on the login shell is that the -command name must be listed in \fI/etc/shells\fR, unless the -invoker is the super-user, and then any value may be added. -An account with a restricted login shell may not change -her login shell. -For this reason, placing \fB/bin/rsh\fR in \fI/etc/shells\fR -is discouraged since accidentally changing to a restricted -shell would prevent the user from every changing her login -shell back to its original value. +The only restrictions placed on the login shell is that the command name +must be listed in \fI/etc/shells\fR, unless the invoker is the super-user, +and then any value may be added. An account with a restricted login shell +may not change her login shell. For this reason, placing \fB/bin/rsh\fR in +\fI/etc/shells\fR is discouraged since accidentally changing to a restricted +shell would prevent the user from every changing her login shell back to its +original value. .PP -If the \fB-s\fR option is not selected, \fBchsh\fR operates in an interactive -fashion, prompting the user with the current login shell. -Enter the new value to change the shell, or leave the line blank to use -the current one. -The current shell is displayed between a pair of \fB[ ]\fR marks. +If the \fB-s\fR option is not selected, \fBchsh\fR operates in an +interactive fashion, prompting the user with the current login shell. Enter +the new value to change the shell, or leave the line blank to use the +current one. The current shell is displayed between a pair of \fB[ ]\fR +marks. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \- user account information .br -/etc/shells \- list of valid login shells +\fI/etc/shells\fR \- list of valid login shells .SH SEE ALSO .BR chfn (1), .BR passwd (5) diff --git a/man/cs/Makefile.am b/man/cs/Makefile.am index e6612681..3723d04b 100644 --- a/man/cs/Makefile.am +++ b/man/cs/Makefile.am @@ -2,6 +2,7 @@ mandir = @mandir@/cs man_MANS = \ + id.1 \ passwd.5 \ shadow.5 diff --git a/man/cs/Makefile.in b/man/cs/Makefile.in index 72fd748f..b430e6eb 100644 --- a/man/cs/Makefile.in +++ b/man/cs/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,108 +14,154 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ mandir = @mandir@/cs +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ man_MANS = \ + id.1 \ passwd.5 \ shadow.5 EXTRA_DIST = $(man_MANS) subdir = man/cs +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -122,10 +169,15 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/cs/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -135,15 +187,55 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/cs/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: +man1dir = $(mandir)/man1 +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done + man5dir = $(mandir)/man5 install-man5: $(man5_MANS) $(man_MANS) @$(NORMAL_INSTALL) @@ -159,6 +251,10 @@ install-man5: $(man5_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -176,6 +272,10 @@ uninstall-man5: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -185,6 +285,8 @@ uninstall-man5: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -192,15 +294,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -212,8 +325,7 @@ check: check-am all-am: Makefile $(MANS) installdirs: - $(mkinstalldirs) $(DESTDIR)$(man5dir) - + $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -225,6 +337,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -232,7 +345,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -242,7 +355,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -259,31 +372,40 @@ install-exec-am: install-info: install-info-am -install-man: install-man5 +install-man: install-man1 install-man5 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-man -uninstall-man: uninstall-man5 +uninstall-man: uninstall-man1 uninstall-man5 .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-man5 install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ - uninstall-man uninstall-man5 + install-info-am install-man install-man1 install-man5 \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man5 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/cs/id.1 b/man/cs/id.1 new file mode 100644 index 00000000..de77930a --- /dev/null +++ b/man/cs/id.1 @@ -0,0 +1,62 @@ +.TH ID 1 "GNU Shell Utilities" "FSF" \" -*- nroff -*- +.do hla cs +.do hpf hyphen.cs +.SH JM冇O +id \- vyp竁e re嫮n a efektivn UID a GID +.SH POU埋T +.B id +[\-gnruG] [\-\-group] [\-\-name] [\-\-real] [\-\-user] [\-\-groups] +[\-\-help] [\-\-version] [u養vatel] +.SH POPIS +Tato dokumentace nen d嫮e udr駟v嫕a a m躨e bt nep鷫sn nebo nepln. +Autoritativn璥 zdrojem je Texinfo dokumentace. +.PP +Tato manu嫮ov str嫕ka popisuje GNU verzi p齶kazu +.BR id . +P齶kaz +.B id +vyp竁e informace o zadan幦 u養vateli nebo (pokud nen jm幯o u養vatele +zad嫕o) o u養vateli, kter program +.B id +spustil. Implicitn vypisuje re嫮n user ID, re嫮n group ID, +efektivn user ID, pokud se li寤 od re嫮n嶭o user ID, efektivn +group ID, pokud se li寤 od re嫮n嶭o group ID, a group ID skupin, +v nich je u養vatel 鋩enem. P鷫d ka鞏ou z hodnot je vyps嫕 鷫t鮓ec +ur鋎j獳 o jakou hodnotu se jedn a za ka鞏ou jsou odpov獮aj獳 +jm幯a skupin a u養vatel v z嫛ork塶h. +.PP +Volby zp鑸ob, 頡 program +.B id +vypisuje pouze n骿ter z t駥hto informac. +.SS VOLBY +.TP +.I "\-g, \-\-group" +Vyp竁e pouze group ID. +.TP +.I "\-G, \-\-groups" +Vyp竁e pouze skupiny, v nich je u養vatel 鋩enem. +.TP +.I "\-\-help" +Vyp竁e n嫛od k pou養t na standardn vstup a bezchybn skon鴈. +.TP +.I "\-n, \-\-name" +Vyp竁e jm幯o u養vatele nebo skupiny m疄to 鴈sla ID. +Vy靠duje +.IR \-u , +.IR \-g , +nebo +.IR \-G . +.TP +.I "\-r, \-\-real" +Vyp竁e re嫮n m疄to efektivn獳h user a group ID. +Vy靠duje +.IR \-u , +.IR \-g , +nebo +.IR \-G . +.TP +.I "\-u, \-\-user" +Vyp竁e pouze user ID. +.TP +.I "\-\-version" +Vyp竁e 鴈slo verze na standardn vstup a bezchybn skon鴈. diff --git a/man/cs/shadow.5 b/man/cs/shadow.5 index a3f2f62c..44ed2c74 100644 --- a/man/cs/shadow.5 +++ b/man/cs/shadow.5 @@ -49,9 +49,9 @@ informacemi ulo Tento soubor nesm bt 鋱teln 鸅dnmi u養vateli, m-li bt ochrana hesel 鋱nn. .SH SOUBORY -/etc/passwd \- informace o u養vatelskch 鋈ech +\fI/etc/passwd\fR \- informace o u養vatelskch 鋈ech .br -/etc/shadow \- za隘frovan hesla u養vatel +\fI/etc/shadow\fR \- za隘frovan hesla u養vatel .SH DAL怛 INFORMACE chage(1), login(1), diff --git a/man/de/Makefile.am b/man/de/Makefile.am index 03d6e3d3..6011c26d 100644 --- a/man/de/Makefile.am +++ b/man/de/Makefile.am @@ -3,6 +3,7 @@ mandir = @mandir@/de man_MANS = \ chsh.1 \ + chfn.1 \ + groups.1 \ + login.1 \ passwd.1 - -EXTRA_DIST = $(man_MANS) diff --git a/man/de/Makefile.in b/man/de/Makefile.in index 81d014da..cdfbb947 100644 --- a/man/de/Makefile.in +++ b/man/de/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,108 +14,154 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ mandir = @mandir@/de +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ man_MANS = \ chsh.1 \ + chfn.1 \ + groups.1 \ + login.1 \ passwd.1 - -EXTRA_DIST = $(man_MANS) subdir = man/de +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -122,10 +169,15 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/de/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -135,13 +187,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/de/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: man1dir = $(mandir)/man1 @@ -159,6 +204,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -176,6 +225,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -185,6 +238,8 @@ uninstall-man1: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -192,15 +247,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -213,7 +279,6 @@ all-am: Makefile $(MANS) installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -225,6 +290,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -232,7 +298,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -242,7 +308,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -264,13 +330,21 @@ install-man: install-man1 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 @@ -282,8 +356,8 @@ uninstall-man: uninstall-man1 install-info-am install-man install-man1 install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ - uninstall-man uninstall-man1 + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-man uninstall-man1 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/de/chsh.1 b/man/de/chsh.1 deleted file mode 100644 index 8a10bb3e..00000000 --- a/man/de/chsh.1 +++ /dev/null @@ -1,36 +0,0 @@ -.\" -.\" Copyright 1993 Sebastian Hetze und der/die in der Sektion -.\" AUTOR genannten Autor/Autoren -.\" -.\" Dieser Text steht unter der GNU General Public License. -.\" Er darf kopiert und ver鄚dert, korrigiert und verbessert werden. -.\" Die Copyright und Lizenzbestimmung mssen allerdings erhalten -.\" bleiben. Die Hinweise auf das LunetIX Linuxhandbuch, aus dem -.\" dieser Text stammt, drfen nicht entfernt werden. -.\" -.TH CHSH 1 "1. Juli 1993" "LunetIX Linuxhandbuch" "Dienstprogramme fr Benutzer" -.SH BEZEICHNUNG -chsh \- 鄚dert den Loginshell Eintrag in der Pa腛ortdatei -.SH SYNTAX -.B chsh -.RI [ Benutzer ] -.RI [ Shell ] -.SH BESCHREIBUNG -.B chsh -erm鐷licht es jedem eingetragenen Benutzer, seine Loginshell selbst, das -hei腷 ohne Hilfe des Superusers (root) zu ver鄚dern. Die Loginshell wird -in der Pa腛ortdatei /etc/passwd festgelegt. Diese Datei kann nur mit -Rootprivilegien ver鄚dert werden. Um auch den anderen Anwendern das -Ver鄚dern des Eintrages zu erlauben, l酳ft das -.B chsh -Programm SUID root. Das hei腷, bei seiner Ausfhrung wird die effektive -Benutzerkennung des Superusers gesetzt. Um die Systemsicherheit trotzdem -zu gew鄣rleisten, k霵nen nur Programme, die in der Datei /etc/shells -eingetragen sind als Loginshell benutzt werden. -.PP -Normalerweise kann ein Anwender nur seine eigene Loginshell 鄚dern. Der -Superuser selbst kann das Programm aber auch fr andere Benutzer anwenden, -indem er den Benutzernamen in der Kommandozeile angibt. -.SH AUTOR -Peter Orbaek - diff --git a/man/de/passwd.1 b/man/de/passwd.1 deleted file mode 100644 index 85d3438e..00000000 --- a/man/de/passwd.1 +++ /dev/null @@ -1,39 +0,0 @@ -.\" -.\" Copyright 1993 Sebastian Hetze und der/die in der Sektion -.\" AUTOR genannten Autor/Autoren -.\" -.\" Dieser Text steht unter der GNU General Public License. -.\" Er darf kopiert und ver鄚dert, korrigiert und verbessert werden. -.\" Die Copyright und Lizenzbestimmung mssen allerdings erhalten -.\" bleiben. Die Hinweise auf das LunetIX Linuxhandbuch, aus dem -.\" dieser Text stammt, drfen nicht entfernt werden. -.\" -.TH PASSWD 1 "1. Juli 1993" "LunetIX Linuxhandbuch" "Dienstprogramme fr Benutzer" -.SH BEZEICHNUNG -passwd \- 鄚dert das Pa腛ort zum System -.SH SYNTAX -.B passwd -.RI [ Username ] -.SH BESCHREIBUNG -Die Pa腛顤ter aller Benutzer werden in der Datei /etc/passwd gespeichert. -Diese Datei ist lesbar aber schreibgeschtzt. Um dem Benutzer die -M鐷lichkeit zu geben, sein eigenes Pa腛ort zu 鄚dern, l酳ft -.B passwd -SUID -.BR root ". -Deshalb hat der Anwender zur Laufzeit des Programms Rootprivilegien und darf -in die Datei schreiben. -.PP -Bei einigen Linuxinstallationen wird das Benutzerpa腛ort in einer separaten -Datei namens -.B shadow -gespeichert, um den normalen Benutzern den Lesezugriff auf diese Daten zu -verwehren. Die Einzelheiten zu diesem Pa腛ortsystem sind in den englischen -Manualpages beschrieben. -.SH SIEHE AUCH -.BR chsh (1), -.BR newgrp (1) -und das LunetIX Linuxhandbuch -.SH AUTOR -Peter Orbaek - diff --git a/man/es/Makefile.am b/man/es/Makefile.am new file mode 100644 index 00000000..b90aa954 --- /dev/null +++ b/man/es/Makefile.am @@ -0,0 +1,7 @@ + +mandir = @mandir@/es + +man_MANS = \ + login.1 \ + passwd.1 \ + su.1 diff --git a/man/es/Makefile.in b/man/es/Makefile.in new file mode 100644 index 00000000..25803c41 --- /dev/null +++ b/man/es/Makefile.in @@ -0,0 +1,362 @@ +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LIBCRACK = @LIBCRACK@ +LIBCRYPT = @LIBCRYPT@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ +LIBPAM = @LIBPAM@ +LIBS = @LIBS@ +LIBSKEY = @LIBSKEY@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +U = @U@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ + +mandir = @mandir@/es +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ + +man_MANS = \ + login.1 \ + passwd.1 \ + su.1 + +subdir = man/es +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = + +NROFF = nroff +MANS = $(man_MANS) +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/es/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +man1dir = $(mandir)/man1 +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(MANS) + +installdirs: + $(mkinstalldirs) $(DESTDIR)$(man1dir) +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-man1 install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-man uninstall-man1 + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/man/expiry.1 b/man/expiry.1 index 5ead3c71..f30ab260 100644 --- a/man/expiry.1 +++ b/man/expiry.1 @@ -1,4 +1,4 @@ -.\"$Id: expiry.1,v 1.3 2002/03/09 19:22:29 ankry Exp $ +.\"$Id: expiry.1,v 1.5 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" Modified for expiry by Ben Collins , 1999 @@ -34,12 +34,12 @@ expiry \- check and enforce password expiration policy .TP 6 \fBexpiry\fR [\fB-c\fR] [\fB-f\fR] .SH DESCRIPTION -\fBexpiry\fR checks (\fB-c\fR) the current password expiration and forces (\fB-f\fR) -changes when required. It is callable as a normal user command. +\fBexpiry\fR checks (\fB-c\fR) the current password expiration and forces +(\fB-f\fR) changes when required. It is callable as a normal user command. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \ - user account information .br -/etc/shadow \- shadow user account information +\fI/etc/shadow\fR \ - shadow user account information .SH SEE ALSO .BR passwd (5), .BR shadow (5) diff --git a/man/faillog.5 b/man/faillog.5 index c9f17fe8..af506098 100644 --- a/man/faillog.5 +++ b/man/faillog.5 @@ -1,4 +1,4 @@ -.\"$Id: faillog.5,v 1.7 2001/01/25 10:43:50 kloczek Exp $ +.\"$Id: faillog.5,v 1.9 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,14 +29,12 @@ .SH NAME faillog \- Login failure logging file .SH DESCRIPTION -.I faillog -maintains a count of login failures and the limits for each account. -The file is fixed length record, indexed by numerical UID. -Each record contains the count of login failures since the last -successful login; -the maximum number of failures before the account is disabled; -the line the last login failure occured on; -and the date the last login failure occured. +\fI/var/log/faillog\fR maintains a count of login failures and the limits +for each account. The file is fixed length record, indexed by numerical UID. +Each record contains the count of login failures since the last successful +login; the maximum number of failures before the account is disabled; the +line the last login failure occured on; and the date the last login failure +occured. .PP The structure of the file is .DS @@ -47,10 +45,9 @@ The structure of the file is char fail_line[12]; time_t fail_time; }; - .DE .SH FILES -/var/log/faillog \- login failure log +\fI/var/log/faillog\fR \ - login failure log .SH SEE ALSO .BR faillog (8) .SH AUTHOR diff --git a/man/faillog.8 b/man/faillog.8 index 5b8079bb..0ce91064 100644 --- a/man/faillog.8 +++ b/man/faillog.8 @@ -1,4 +1,4 @@ -.\"$Id: faillog.8,v 1.10 2001/01/27 02:55:52 kloczek Exp $ +.\"$Id: faillog.8,v 1.13 2003/05/06 23:06:35 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,61 +31,49 @@ .SH NAME faillog \- examine faillog and set login failure limits .SH SYNOPSIS -.TP 8 +.TP 6 \fBfaillog\fR [\fB-u\fR \fIlogin-name\fR] [\fB-a\fR] [\fB-t\fR \fIdays\fR] [\fB-m\fR \fImax\fR] [\fB-pr\fR] .SH DESCRIPTION \fBfaillog\fR formats the contents of the failure log, \fI/var/log/faillog\fR, and maintains failure counts and -limits. -The order of the arguments to \fBfaillog\fR is significant. -Each argument is processed immediately in the order given. +limits. The order of the arguments to \fBfaillog\fR is significant. Each +argument is processed immediately in the order given. .PP -The \fB-p\fR flag causes failure entries to be printed in UID -order. -Entering \fB-u \fIlogin-name\fR flag will -cause the failure record for \fIlogin-name\fR only to be printed. -Entering \fB-t \fIdays\fR will cause only the -failures more recent than \fIdays\fR to be printed. -The \fB-t\fR flag overrides the use of \fB-u\fR. -The \fB-a\fR flag causes all users to be selected. -When used with the \fB-p\fR flag, this option selects all users -who have ever had a login failure. -It is meaningless with the \fB-r\fR flag. +The \fB-p\fR flag causes failure entries to be printed in UID order. +Entering \fB-u \fIlogin-name\fR flag will cause the failure record for +\fIlogin-name\fR only to be printed. Entering \fB-t \fIdays\fR will cause +only the failures more recent than \fIdays\fR to be printed. The \fB-t\fR +flag overrides the use of \fB-u\fR. The \fB-a\fR flag causes all users to be +selected. When used with the \fB-p\fR flag, this option selects all users +who have ever had a login failure. It is meaningless with the \fB-r\fR flag. .PP -The \fB-r\fR flag is used to reset the count of login failures. -Write access to \fI/var/log/faillog\fR is required for -this option. -Entering \fB-u \fIlogin-name\fR will cause only the failure count -for \fIlogin-name\fR to be reset. +The \fB-r\fR flag is used to reset the count of login failures. Write access +to \fI/var/log/faillog\fR is required for this option. Entering \fB-u +\fIlogin-name\fR will cause only the failure count for \fIlogin-name\fR to +be reset. .PP -The \fB-m\fR flag is used to set the maximum number of login -failures before the account is disabled. -Write access to \fI/var/log/faillog\fR is required for this -option. -Entering \fB-m \fImax\fR will cause all accounts to be disabled -after \fImax\fR failed logins occur. -This may be modified with \fB-u \fIlogin-name\fR to limit this -function to \fIlogin-name\fR only. -Selecting a \fImax\fR value of 0 has the effect of not placing -a limit on the number of failed logins. -The maximum failure count -should always be 0 for \fBroot\fR to prevent -a denial of services attack against the system. +The \fB-m\fR flag is used to set the maximum number of login failures before +the account is disabled. Write access to \fI/var/log/faillog\fR is required +for this option. Entering \fB-m \fImax\fR will cause all accounts to be +disabled after \fImax\fR failed logins occur. This may be modified with +\fB-u \fIlogin-name\fR to limit this function to \fIlogin-name\fR only. +Selecting a \fImax\fR value of 0 has the effect of not placing a limit on +the number of failed logins. The maximum failure count should always be 0 +for \fBroot\fR to prevent a denial of services attack against the system. .PP -Options may be combined in virtually any fashion. -Each \fB-p\fR, \fB-r\fR, and \fB-m\fR option will cause -immediate execution using any \fB-u\fR or \fB-t\fR modifier. +Options may be combined in virtually any fashion. Each \fB-p\fR, \fB-r\fR, +and \fB-m\fR option will cause immediate execution using any \fB-u\fR or +\fB-t\fR modifier. .SH CAVEATS -\fBfaillog\fR only prints out users with no successful login since -the last failure. -To print out a user who has had a successful login since their last -failure, you must explicitly request the user with the \fB-u\fR flag, -or print out all users with the \fB-a\fR flag. +\fBfaillog\fR only prints out users with no successful login since the last +failure. To print out a user who has had a successful login since their last +failure, you must explicitly request the user with the \fB-u\fR flag, or +print out all users with the \fB-a\fR flag. .PP Some systems may replace /var/log with /var/adm or /usr/adm. .SH FILES -/var/log/faillog \- failure logging file +\fI/var/log/faillog\fR \ - failure logging file .SH SEE ALSO .BR login (1), .BR faillog (5) diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am index a41007a7..352ef061 100644 --- a/man/fr/Makefile.am +++ b/man/fr/Makefile.am @@ -8,6 +8,7 @@ man_MANS = \ chsh.1 \ faillog.5 \ gpasswd.1 \ + groups.1 \ newgrp.1 \ passwd.1 \ passwd.5 \ @@ -15,6 +16,3 @@ man_MANS = \ useradd.8 \ userdel.8 \ usermod.8 - -EXTRA_DIST = $(man_MANS) \ - groups.1 diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in index e0bdd1fe..5bd16a70 100644 --- a/man/fr/Makefile.in +++ b/man/fr/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,100 +14,144 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ mandir = @mandir@/fr +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ man_MANS = \ adduser.8 \ @@ -115,6 +160,7 @@ man_MANS = \ chsh.1 \ faillog.5 \ gpasswd.1 \ + groups.1 \ newgrp.1 \ passwd.1 \ passwd.5 \ @@ -123,11 +169,8 @@ man_MANS = \ userdel.8 \ usermod.8 - -EXTRA_DIST = $(man_MANS) \ - groups.1 - subdir = man/fr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -135,10 +178,15 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/fr/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -148,13 +196,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/fr/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: man1dir = $(mandir)/man1 @@ -172,6 +213,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -189,6 +234,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -211,6 +260,10 @@ install-man5: $(man5_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -228,6 +281,10 @@ uninstall-man5: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -250,6 +307,10 @@ install-man8: $(man8_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -267,6 +328,10 @@ uninstall-man8: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -276,6 +341,8 @@ uninstall-man8: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -283,15 +350,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -304,7 +382,6 @@ all-am: Makefile $(MANS) installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -316,6 +393,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -323,7 +401,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -333,7 +411,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -355,13 +433,21 @@ install-man: install-man1 install-man5 install-man8 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 @@ -373,9 +459,9 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 install-info-am install-man install-man1 install-man5 \ install-man8 install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-man5 uninstall-man8 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man5 uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/fr/adduser.8 b/man/fr/adduser.8 deleted file mode 100644 index ed737f29..00000000 --- a/man/fr/adduser.8 +++ /dev/null @@ -1 +0,0 @@ -.so man8/useradd.8 diff --git a/man/fr/chage.1 b/man/fr/chage.1 deleted file mode 100644 index 95ce26c0..00000000 --- a/man/fr/chage.1 +++ /dev/null @@ -1,113 +0,0 @@ -.\" Copyright 1990 - 1994 Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: chage.1,v 1.1 2002/03/10 07:41:04 kloczek Exp $ -.\" -.TH CHAGE 1 "1 Novembre 2001" -.SH NOM -chage \- Changer les informations d'expiration du mot de passe d'un -utilisateur. -.SH SYNOPSIS -.TP 6 -\fBchage\fR -[\fB-m \fImin\fR] [\fB-M \fImax\fR] -[\fB-d \fIdernier\fR] [\fB-I \fIinactive\fR] -.br -[\fB-E \fIexpire\fR] [\fB-W \fIalerte\fR] \fIutilisateur\fR -.TP 6 -\fBchage\fR -\fB-l\fR \fIutilisateur\fR -.SH DESCRIPTION -\fBchage\fR modifie le nombre de jours entre les changements de mot de passe -ainsi que la date du dernier changement. -Cette information est utilis嶪 par le syst鋗e pour d彋erminer quand un -utilisateur doit changer son mot de passe. -La commande \fBchage\fR est r廥erv嶪 au Super-utilisateur, sauf pour l'option -\fB-l\fR, qui peut 皻re utilis嶪 par un utilisateur non privil嶲i pour savoir -quand son mot de passe ou sont compte doit expirer. -.PP -Avec l'option \fB-m\fR, la valeur de \fImin\fR repr廥ente le nombre minimum -de jours entre chaque changement de mot de passe. -Une valeur de z廨o pour ce champ indique que l'utilisateur peut changer -son mot de passe n'importe quand. -.PP -Avec l'option \fB-M\fR, la valeur de \fImax\fR repr廥ente le nombre maximum -de jours pendant lesquels un mot de passe est valide. -Quand \fImax\fR plus \fIdernier\fR est inf廨ieur la date courante, -l'utilisateur est oblig de changer son mot de passe avant de pouvoir -utiliser son compte. -Cet 憝鋝ement peut 皻re d嶰lench plus t矌 gr歊e l'option \fB-W\fR -qui pr憝ient l'utilisateur l'avance avec un message d'alerte. -.PP -Avec l'option \fB-d\fR, la valeur \fIdernier\fR est le num廨o du -jour depuis le 1er Janvier 1970, o le mot de passe a 彋 chang la -derni鋨e fois. -La date peut aussi 皻re exprim嶪 dans le format YYYY-MM-DD (ou le format -utilis plus commun幦ent dans votre r嶲ion). -.PP -L'option \fB-E\fR est utilis嶪 pour d嶨inir une date partir de laquelle -le compte de l'utilisateur ne sera plus accessible. -La valeur \fIexpire\fR est le num廨o du jour depuis le 1er Janvier 1970 -apr鋊 lequel le compte sera bloqu. -La date peut aussi 皻re exprim嶪 dans un format YYYY-MM-DD (ou le format -plus commun幦ent utilis dans votre r嶲ion). -Un utilisateur dont le compte est bloqu doit contacter l'administrateur -syst鋗e pour pouvoir utiliser le syst鋗e nouveau. -.PP -L'option \fB-I\fR est utilis嶪 pour d嶨inir le nombre de jours d'inactivit, -apr鋊 qu'un mot de passe a expir, avant que le compte ne soit bloqu. -Un utilisateur dont le compte est bloqu doit contacter l'administrateur -syst鋗e avant de pouvoir utiliser le syst鋗e nouveau. -La valeur \fIinactive\fR est le nombre de jours d'inactivit. Une valeur -de 0 d廥active cette fonction. -.PP -L'option \fB-W\fR est utilis嶪 pour d嶨inir le nombre de jours d'alerte -avant que le changement de mot de passe ne soit obligatoire. -La valeur \fIalerte\fR est le nombre de jours pr嶰嶮ent l'expiration -pendant lesquels un utilisateur sera pr憝enu que son mot de passe est -sur le point d'expirer. -.PP -Toutes les valeurs ci-dessus sont stock嶪s au jour pr鋊 quand le fichier -俞~shadow password\~ est utilis, mais sont converties en semaines -quand le fichier de mots de passe standard est utilis. - cause de cette conversion, des erreurs d'arrondis peuvent appara褾re. -.PP -Si aucune de ces options n'est donn嶪, \fBchage\fR utilise un mode -interactif, demandant confirmation l'utilisateur pour les valeurs de tous -les champs. Entrez la nouvelle valeur pour changer la valeur du champ, ou -laissez la ligne vide pour utiliser la valeur courante. -La valeur courante est affich嶪 entre crochets. -.SH FICHIERS -/etc/passwd \- informations des comptes utilisateurs. -.br -/etc/shadow \- fichier 俞~shadow password\~. -.SH VOIR AUSSI -.BR passwd (5), -.BR shadow (5) -.SH TRADUCTION -Olivier Marin, 2001. - diff --git a/man/fr/chsh.1 b/man/fr/chsh.1 deleted file mode 100644 index 8bc8c63d..00000000 --- a/man/fr/chsh.1 +++ /dev/null @@ -1,57 +0,0 @@ -.\" -.\" chsh.1 -- change your login shell -.\" (c) 1994 by salvatore valente -.\" -.\" this program is free software. you can redistribute it and -.\" modify it under the terms of the gnu general public license. -.\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.1 $ -.\" $Date: 2002/03/10 07:41:04 $ -.\" -.\" Traduction 22/04/1997 par Christophe Blaess (ccb@club-internet.fr) -.\" -.TH CHSH 1 "22 Avril 1997" Linux "Manuel de l'utilisateur Linux" -.SH NOM -chsh \- Changer le shell appel la connexion. -.SH SYNOPSIS -.B chsh -[\ \-s\ shell\ ] [\ \-l\ ] [\ \-u\ ] [\ \-v\ ] [\ utilisateur\ ] -.SH DESCRIPTION -.B chsh -est invoqu pour changer le shell qui est appel lors de la connexion de -l'utilisateur. -Si aucun shell n'est mentionn sur la ligne de commande, -.B chsh -va en r嶰lamer un. -.SH SHELLS VALIDES -.B chsh -acceptera le nom complet (avec chemin d'acc鋊) de tout fichier ex嶰utable -sur le syst鋗e. N嶧nmoins, il affichera un message d'avertissement si le -shell n'est pas mentionn dans le fichier -.IR /etc/shells . -.SH OPTIONS -.TP -.I "\-s, \-\-shell" -Indiquer le shell de connexion d廥ir. -.TP -.I "\-l, \-\-list-shells" -Afficher la liste des shells mentionn廥 dans -.I /etc/shells -puis quitter. -.TP -.I "\-u, \-\-help" -Afficher un message d'aide puis quitter. -.TP -.I "-v, \-\-version" -Afficher un num廨o de version, puis quitter. -.SH "VOIR AUSSI" -.BR login (1), -.BR passwd (5), -.BR shells (5) -.SH AUTEURS -Salvatore Valente - -.SH TRADUCTION -Christophe Blaess, 1997. diff --git a/man/fr/faillog.5 b/man/fr/faillog.5 deleted file mode 100644 index dda1cea6..00000000 --- a/man/fr/faillog.5 +++ /dev/null @@ -1,60 +0,0 @@ -.\" Copyright 1989 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.TH FAILLOG 5 -.SH NOM -faillog \- Fichier de trace d'嶰hecs de login -.SH DESCRIPTION -.I faillog -maintient le d嶰ompte des 嶰hecs de login et la limite associ廥 -chaque compte. Ce fichier est enregistrements de taille fixe, -index廥 par l'UID num廨ique. Chaque enregistrement contient le nombre -d'嶰hecs de login depuis la derni鋨e r徼ssite, le nombre maximum -d'嶰hecs avant que le compte ne soit d廥activ, la ligne sur laquelle -le dernier 嶰hec de login a eu lieu et la date du dernier 嶰hec de -login\&. - -.PP -La structure des enregistrements est la suivante\ : -.DS - - struct faillog { - short fail_cnt; - short fail_max; - char fail_line[12]; - time_t fail_time; - }; - -.DE -.SH FICHIERS -/var/log/faillog \- Fichier de trace d'嶰hecs de login -.SH VOIR AUSSI -.BR faillog (8) -.SH AUTEUR -Julianne Frances Haugh -.SH TRADUCTION -Pascal Terjan diff --git a/man/fr/gpasswd.1 b/man/fr/gpasswd.1 deleted file mode 100644 index 143b29a6..00000000 --- a/man/fr/gpasswd.1 +++ /dev/null @@ -1,69 +0,0 @@ -.\" Copyright 1996, Rafal Maszkowski, rzm@pdi.net -.\" All rights reserved. You can redistribute this man page and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of the -.\" License, or (at your option) any later version. -.\" -.\" $Id: gpasswd.1,v 1.1 2002/03/10 07:41:04 kloczek Exp $ -.\" -.TH GPASSWD 1 -.SH NOM -gpasswd \- administre le fichier /etc/group -.br -.SH SYNOPSIS -.B gpasswd \fIgroupe\fR -.br -.B gpasswd -.B -a -\fIutilisateur\fR \fIgroupe\fR -.br -.B gpasswd -.B -d -\fIutilisateur\fR \fIgroupe\fR -.br -.B gpasswd -.B -R -\fIgroupe\fR -.br -.B gpasswd -.B -r -\fIgroupe\fR -.br -.B gpasswd -.RB [ -A -\fIutilisateur\fR,...] -.RB [ -M -\fIutilisateur\fR,...] -\fIgroupe\fR -.br -.SH DESCRIPTION -.B gpasswd -est utilis pour administrer le fichier /etc/group (ainsi que le fichier /etc/gshadow -si l'option SHADOWGRP a 彋 d嶨inie lors de la compilation). -Chaque groupe peut avoir des administrateurs, des membres ainsi qu'un mot de passe. -Les administrateurs syst鋗es poss鋄ent les droits d'administrateur de groupe et de membre, il peuvent utiliser l'option \fB-A\fR pour d嶨inir le(s) administrateur(s) de groupe et l'option \fB-M\fR pour en d嶨inir les membres -.PP -Un administrateur de groupe peut ajouter ou supprimer des utilisateurs en utilisant respectivement les options \fB-a\fR et \fB-d\fR . Les administrateurs peuvent utiliser l'option \fB-r\fR pour supprimer le mot de passe d'un groupe. Lorsque aucun mot de passe n'est d嶨ini, seul les membres d'un groupe peuvent utiliser -.BR newgrp (1) -pour en faire partie. L'option \fB-R\fR d廥active l'acc鋊 au groupe via la commande -.BR newgrp (1) -.PP -.B gpasswd -ex嶰ut par un administrateur de groupe suivit d'un nom de groupe, affiche simplement l'invite de changement de mot de passe du groupe. Si un mot de passe est d嶨ini alors seul les membres du groupe peuvent utiliser la commande -.BR newgrp (1) -sans entrer de mot de passe, les non-membres doivent le fournir. - -.SH FICHIERS -/etc/group \- Identification des groupes -.br -/etc/gshadow \- Identification masqu嶪 des groupes -.SH VOIR AUSSI -.BR newgrp (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR grpck (8) -.br -.SH TRADUCTION -Maxime Mastin, 2001. - diff --git a/man/fr/groups.1 b/man/fr/groups.1 deleted file mode 100644 index 5247fa10..00000000 --- a/man/fr/groups.1 +++ /dev/null @@ -1,37 +0,0 @@ -.\" Traduction 09/01/1997 par Christophe Blaess (ccb@club-internet.fr) -.\" -.TH GROUPS 1L "9 Janvier 1997" FSF "Manuel de l'utilisateur Linux" -.SH NOM -groups \- Afficher les groupes auxquels appartient un utilisateur. -.SH SYNOPSIS -.B groups -[utilisateur...] -.br -.B groups -{\-\-help,\-\-version} -.SH DESCRIPTION -Cette page de manuel documente la version GNU de -.BR groups . - -.B groups -affiche le noms des groupes suppl幦entaires de chaque -.IR utilisateur -indiqu, ou ceux du processus en cours si rien n'est pr嶰is. - -Si plusieurs utilisateurs sont mentionn廥, le nom de chacun d'entre -eux est affich avant la liste de ses groupes. -.PP -La liste des groupes est 廦uivalente au r廥ultat de la commande `id \-Gn'. -.SS OPTIONS -Quand la version GNU de -.B groups -est invoqu嶪 avec un seul argument, les options suivantes sont reconnues : -.TP -.I "\-\-help" -Afficher un message d'aide sur la sortie standard et terminer normalement. -.TP -.I "\-\-version" -Afficher un num廨o de version sur la sortie standard et terminer normalement. - -.SH TRADUCTION -Christophe Blaess, 1997. diff --git a/man/fr/newgrp.1 b/man/fr/newgrp.1 deleted file mode 100644 index ed5f5d7d..00000000 --- a/man/fr/newgrp.1 +++ /dev/null @@ -1,32 +0,0 @@ -.\" Original author unknown. This man page is in the public domain. -.\" Modified Sat Oct 9 17:46:48 1993 by faith@cs.unc.edu -.TH NEWGRP 1 "9 October 1993" "Linux 1.2" "Manuel du Programmeur Linux" -.SH NOM -newgrp \- se connecter sous un nouveau groupe -.SH SYNOPSIS -.BI "newgrp [ " groupe " ]" -.SH DESCRIPTION -.B Newgrp -change le groupe de l'appelant, de la m瘱e mani鋨e que -.BR login (1). -Le m瘱e utilisateur reste connect, et le r廧ertoire courant -reste inchang, mais l'憝aluation des droits d'acc鋊 aux fichiers -se fait en fonction du nouvel identifiant de groupe. -.LP -Si aucun groupe n'est sp嶰ifi, le GID est 嶰hang pour celui du login initial. -.LP -.SH FICHIERS -.I /etc/group -.br -.I /etc/passwd - -.SH "VOIR AUSSI" -.BR login "(1), " group (5) - -.SH AUTEUR -Version originale par Michael Haardt. D廥ormais maintenu par -Peter Orbaek (poe@daimi.aau.dk). - -.SH TRADUCTION -S嶵astien Mah, 2001 - diff --git a/man/fr/passwd.1 b/man/fr/passwd.1 deleted file mode 100644 index a784b939..00000000 --- a/man/fr/passwd.1 +++ /dev/null @@ -1,162 +0,0 @@ -.\" Copyright Red Hat Software, Inc., 1998, 1999. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, and the entire permission notice in its entirety, -.\" including the disclaimer of warranties. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. The name of the author may not be used to endorse or promote -.\" products derived from this software without specific prior -.\" written permission. -.\" -.\" ALTERNATIVELY, this product may be distributed under the terms of -.\" the GNU Public License, in which case the provisions of the GPL are -.\" required INSTEAD OF the above restrictions. (This clause is -.\" necessary due to a potential bad interaction between the GPL and -.\" the restrictions contained in a BSD-style copyright.) -.\" -.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -.\" OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.\" Copyright (c) Cristian Gafton, 1998, -.\" -.\" Traduction 21/08/2000 par Fr嶮廨ic Delanoy (fdelanoy@info.fundp.ac.be) -.\" -.TH PASSWD 1 "21 Aot 2000" PAM "Manuel de l'utilisateur Linux" -.SH NOM - -passwd \- mettre jour les marques d'authentification d'un utilisateur. - -.SH SYNOPSIS -.B passwd [-k] [-l] [-u [-f]] [-d] [-S] [nom_utilisateur] -.sp 2 -.SH DESCRIPTION -Passwd est utilis pour mettre jour la (les) marque(s) d'authentification d'un utilisateur. Passwd est configur pour travailler gr歊e l' -.BR "API Linux-PAM" ". " -Il s'initialise principalement en tant que service "passwd" avec -.I Linux-PAM -et utilise les modules -.I "password" -configur廥 pour authentifier et ensuite mettre jour le mot de passe d'un utilisateur. - -.sp -Une entr嶪 du fichier de configuration de -.I Linux-PAM -pour ce service serait : -.br - -.br - # -.br - # entr嶪 de service de mot de passe effectuant une -.br - # v廨ification de force d'un mot de passe -.br - # propos avant de le mettre jour. -.br - # -.br - passwd password requisite \\ -.br - /usr/lib/security/pam_cracklib.so retry=3 -.br - passwd password required \\ -.br - /usr/lib/security/pam_pwdb.so use_authtok -.br - # - -.sp -Notez qu'aucun autre type de module n'est requis pour le fonctionnement correct de cette application. - -.SH OPTIONS - -.IP \fB-k\fR -L'option, -.BR -k ", " -est utilis嶪 pour indiquer que la mise jour ne devrait 皻re effectu嶪 que pour les marques d'identifications (mots de passe); l'utilisateur conserve ses marques non expir廥. - -.IP \fB-l\fR -Cette option est utilis pour verrouiller le compte sp嶰ifi, et n'est disponible que pour root. Le verrouillage est effecut en rendant le mot de passe crypt invalide (en le pr嶨ixant par un !). - -.IP \fB--stdin\fR -Cette option est utilis嶪 pour indiquer que \fBpasswd\fR doit lire le nouveau mot de passe partir de l'entr嶪 standard, qui peut 皻re un tube. - -.IP \fB-u\fR -L'inverse de l'option pr嶰嶮ente - il d憝errouillera le mot de passe du compte en supprimant le pr嶨ixe "!". Cette option n'est disponible que pour root. Par d嶨aut, \fBpasswd\fR refusera de cr嶪r un compte sans mot de passe associ (il ne d憝errouillera pas un compte contenant uniquement ! pour mot de passe). L'option \fB-f\fR outrepassera cette protection. - -.IP \fB-d\fR -C'est une fa蔞n rapide pour d廥activer un mot de passe pour un compte. Il supprimera le besoin du mot de passe pour un compte donn. Disponible uniquement pour root. - -.IP \fB-S\fR -Cela affiche une information courte sur le statut du mot de passe pour un compte donn. Disponible uniquement pour root. - -.SH "Rappelez-vous les deux principes suivants" - -.IP \fBProt嶲ez\ votre\ mot de passe.\fR -N'嶰rivez nulle part votre mot de passe - m幦orisez-le. En particulier, ne le laissez pas n'importe o et ne le placez pas non plus dans un fichier non crypt ! Utilisez des mots de passe non reli廥 sur des syst鋗es contr犨廥 par diff廨entes organisations. Ne divulguez ni ne partagez votre mot de passe, en particulier quelqu'un disant pr彋endant faire partie d'un support technique, ou un vendeur. Ne laissez personne regarder votre mot de passe pendant que vous le tapez. N'entrez pas votre mot de passe sur un ordinateur auquel vous ne faites pas confiance, ou si les "choses" ont l'air amusantes; quelqu'un pourrait 皻re en train d'essayer de d彋ourner votre mot de passe. Utilisez votre mot de passe pour une p廨iode limit嶪 et modifiez-le p廨iodiquement. - -.IP \fBChoisisser un mot de passe difficile deviner.\fR -.I passwd -essaiera de vous emp璚her de choisir un mot de passe r嶪llemnt mauvais, mais il n'est pas infaillible; cr嶪z votre mot de passe sagement. N'utilisez rien que vous pouvez trouver dans un dictionnaire (dans n'importe quel langue ou jargon). N'utilisez pas de nom (incluant celui d'un conjoint, d'un parent, d'un enfant, d'un animal domestique, d'un personnage imaginaire, d'un personnage c幨鋐re, ou d'un endroit connu), ou de variation sur votre nom personnel ou de compte. N'utilisez aucune information personnelle qui soit accessible (comme votre num廨o de t幨廧hone, votre plaque d'immatriculation ou votre num廨o de s嶰urit sociale), ou sur les personnes de votre entourage. N'utilisez pas une date d'anniversaire ou un motif simple comme "azerty", "qwerty", "abc" ou "aaa"). N'utilisez aucun 幨幦ent cit ci-dessus suivi ou pr嶰嶮 par un chiffre. Au lieu de cela, utilisez un m幨ange de lettres minuscules et majuscules, de chiffres et de signes de ponctuation. Utiliseez des mots de passe longs (disons d'au moins 8 caract鋨es). Vous pourriez utiliser une paire de mots avec un signe de ponctuation ins廨, une phrase de passe (une s廦uence de mots compr嶭ensible), ou la premi鋨e lettre de chaque mot dans une phrase de passe. - -.SH "" -Ces principes sont partiellement impos廥 par le syst鋗e, mais uniquement partiellement. Une certaine vigilance de votre c矌 rendra le syst鋗e beaucoup plus sr. - -.SH "VALEUR DE RETOUR" - -En cas de succ鋊, -.B passwd -se terminera avec une valeur de retour de 0. Une valeur de retour de 1 indique qu'une erreur s'est produite. Les erreurs textuelles sont 嶰rites dans le flux d'erreur standard. - -.SH "CONFORMIT " -.br -.BR Linux-PAM -(Pluggable Authentication Modules pour Linux). -.br -Notez que si votre distribution de Linux-PAM se conforme au Standard de Syst鋗e de fichiers de Linux, vous pouvez trouver les modules dans -.I /lib/security/ -au lieu de /usr/lib/security/, comme indiqu dans l'exemple. - -.SH "FICHIERS" -.br -.B /etc/pam.d/passwd -- le fichier de configuration de -.BR Linux-PAM - -.SH BOGUES -.sp 2 -Inconnus. - -.SH "VOIR AUSSI" - -.BR pam "(8), " -et -.BR pam_chauthok "(2). " - -.sp -Pour des informations plus compl鋈es sur la fa蔞n de configurere cette application avec -.BR Linux-PAM ", " -voyez le -.BR "Linux-PAM System Administrators' Guide" " at " -.br -.I "" - -.SH AUTEUR -Cristian Gafton - -.SH TRADUCTION -Fr嶮廨ic Delanoy, 2000. diff --git a/man/fr/passwd.5 b/man/fr/passwd.5 deleted file mode 100644 index 77523785..00000000 --- a/man/fr/passwd.5 +++ /dev/null @@ -1,149 +0,0 @@ -.\" Copyright (c) 1993 Michael Haardt (u31b3hs@pool.informatik.rwth-aachen.de), Fri Apr 2 11:32:09 MET DST 1993 -.\" -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.\" -.\" Modified Sun Jul 25 10:46:28 1993 by Rik Faith (faith@cs.unc.edu) -.\" Modified Sun Aug 21 18:12:27 1994 by Rik Faith (faith@cs.unc.edu) -.\" Modified Sun Jun 18 01:53:57 1995 by Andries Brouwer (aeb@cwi.nl) -.\" -.\" Traduction 17/10/1996 par Christophe Blaess (ccb@club-internet.fr) -.\" Mise jour 18/05/1998 (LDP-man-pages-1.19) -.\" -.TH PASSWD 5 "18 Mai 1998" Linux "Manuel de l'administrateur Linux" -.SH NOM -passwd \- Fichier des mots de passe. -.SH DESCRIPTION -.B Passwd -est un fichier de texte qui contient la liste des comptes sur le syst鋗e, -ainsi que des informations utiles sur ces comptes, comme l'identification -de l'utilisateur, du groupe, le r廧ertoire personnel, le shell, etc. -Souvent, ce fichier contient 嶲alement le mot de pass chiffr de l'utilisateur. -Le fichier des mots -de passe doit permettre la lecture par tout le monde (de nombreux -utilitaires comme -.IR ls (1) -l'utilisent pour convertir les UID en noms d'utilisateur). -Par contre seul le Super\-User doit disposer de droits d'嶰riture sur -le fichier. - -Au bon vieux temps, aucun probl鋗e de s嶰urite ne se posait avec ce -droit de lecture g幯廨al. Chacun pouvait consulter les mots de passe -crypt廥, mais le mat廨iel 彋ait trop lent pour pouvoir d嶰rypter un -mot de passe bien choisi. De plus le principe de base d'Unix reposait -sur une communaute soud嶪 d'utilisateurs sans intentions n嶨astes. -Actuellement, il est de plus en plus recommand d'utiliser des -syst鋗es de masquage des mots de passe, comme -.BR shadow -avec lequel le fichier -.I /etc/passwd -contient des * la place des mots de passe, et o ces derniers sont -stock廥 sous forme crypt嶪 dans -.I /etc/shadow -qui n'est lisible que par le Super-utilisateur. - -Que le masquage des mots de passe soit utilis ou non, de nombreux -administrateurs syst鋗es utilisent un ast廨ique dans le champ -'mot de passe' pour s'assurer que l'utilisateur en question ne -pouirra pas se connecter (Voir le paragrahe Notes plus bas). - -Si vous devez cr嶪r un nouvel utilisateur, placez un ast廨ique dans le champ -'mot de passe', puis utilisez la commande \fBpasswd\fP(1) pour le mettre jour. - -Si la racine du syst鋗e de fichiers est sur un disque RAM, vous devez penser - copier sur le disque physique les modifications du fichier des mots de passe -avant d'arr皻er le systeme. Vous devez 嶲alement v廨ifier ce moment les -droits d'acc鋊 au fichier. - -Si vous d廥irez cr嶪r des groupes d'utilisateurs, leur champ GID doivent -correspondre une entree du fichier -.IR /etc/group (5). - -Il doit y avoir, dans le fichier des mots de passe, une ligne par utilisateur, -avec le format suivant : -.sp -.RS -account:passwd:UID:GID:GECOS:directory:shell -.RE -.sp -Les divers champs sont les suivants : -.sp -.RS -.TP 1.0in -.I account -Le nom que l'utilisateur utilisera pour se connecter, il ne devrait normalement -pas contenir de majuscules -.TP -.I password -La repr廥entation encrypt嶪 (optionnelle) du mot de passe. -.TP -.I UID -L'ID num廨ique de l'utilisateur. -.TP -.I GID -L'ID num廨ique du groupe principal de l'utilisateur. -.TP -.I GECOS -Ce champ est optionnel et n'a qu'un r犨e informatif. Il contient g幯廨alement -le nom complet de l'utilisateur. GECOS signifie "General Electric Comprehensive -Operating System", qui fut renomm GCOS quand la division "gros syst鋗es" de -General Electric a 彋 vendue a Honeywell. Dennis Ritchie raconte: -"Il arrivait que l'on envoie des sortie d'impression ou des r廥ultats de -traitements diff廨廥 vers une machine GCOS. Le champ GCOS du fichier password -彋ait un endroit classique pour glisser des informations dans la carte -$IDENT. Pas tr鋊 幨嶲ant..." - -.TP -.I directory -Le r廧ertoire de connexion de l'utilisateur (variable d' -.IR environnement (5) -$HOME). -.TP -.I shell -Le programme ex嶰uter apr鋊 la phase de connexion (par d嶨aut -.IR /bin/sh ). -Si ce fichier n'existe pas, l'utilisateur ne pourra pas se connecter avec -.BR login (1). -.RE -.SH NOTES -Si vous d廥irez cr嶪r des groupes d'utilisateurs, leurs champs GIDs doivent -皻re identiques, et il doit y avoir une entr嶪 correspondante dans le fichier -.IR /etc/group . - -Si le mot de passe crypt est rempli avec un ast廨isque, l'utilisateur ne -pourra pas se connecter avec -.BR login (1), -mais pourra toujours le faire avec -.BR rlogin (1), -lancer des processus en utilisant -.BR rsh (1), -.BR cront (1), -.BR at (1), -ou des filtres de courrier, etc... -La modification du champ "Shell" a g幯廨alement les m瘱es effets, et autorise -toujours l'utilisation de -.BR su (1). -.SH FICHIERS -.I /etc/passwd -.SH "VOIR AUSSI" -.BR passwd "(1), " login "(1), " group "(5), " shadow (5). - -.SH TRADUCTION -Christophe Blaess, 1997. diff --git a/man/fr/shadow.5 b/man/fr/shadow.5 deleted file mode 100644 index 2c233e5f..00000000 --- a/man/fr/shadow.5 +++ /dev/null @@ -1,92 +0,0 @@ -.\" Copyright 1989 - 1990, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: shadow.5,v 1.1 2002/03/10 07:41:04 kloczek Exp $ -.\" -.TH SHADOW 5 -.SH NOM -shadow \- fichiers de mots de passe crypt廥 -.SH DESCRIPTION -.I /etc/shadow -contient les mots de passe crypt廥 des utilisateurs [ Ndt : plus exactement, le r廥ultat du cryptage d'une cha螽e de longueur nulle -avec le mot de passe comme cl de cryptage ] ainsi qu'憝entuellement des informations sur l'殟e des mots de passe : -.IP "" .5i -Nom de login -.IP "" .5i -mot de passe crypt -.IP "" .5i -Nombre de jours 嶰oul廥 depuis le 1er janvier 1970 jusqu'au dernier changement de mot de passe -.IP "" .5i -Nombre de jours durant lesquels le mot de passe est encore valide -.IP "" .5i -Nombre de jours apr鋊 lesquels le mot de passe doit 皻re chang -.IP "" .5i -Nombre de jours avant l'expiration du mot de passe impliquant l'avertissement de l'utilisateur -.IP "" .5i -Nombre de jours apr鋊 l'expiration provoquant la desactivation du compte -.IP "" .5i -Num廨o du jour depuis le 1er janvier 1970 partir duquel le compte a 彋 d廥activ -.IP "" .5i -Champs r廥erv -.PP -Le champs -.I mot de passe -doit 皻re rempli. -Le mot de passe crypt comprend 13 24 caract鋨es pris dans -l'alphabet r嶮uit a-z, A-Z, 0-9, \. et /. -Consultez \fBcrypt\fR(3) pour plus d'information sur le traitement de cette cha螽e. -.PP -La date de derni鋨e modification du mot de passe est donn par le nNombre de jours 嶰oul廥 depuis le 1er janvier 1970 jusqu'au dernier changement de mot de passe. -Le mot de passe ne peut 皻re chang jusqu' ce que le nombre de jours indiqu廥 soit 嶰oul, et doit 皻re chang apr鋊 que le nombre maximum de jours indiqu. -Si le nomnre minimum de jours requis est plus grand que le nombre maximum de jours de vailid, ce mot de passe -.B ne peut pas -皻re chang par l'utilisateur. -.PP -Un compte est consid廨 comme inactif et est d廥activ si le mot de passe n'est pas chang dans l'intervalle sp嶰ifi apr鋊 l'expiration du mot de passe. -Un compte est 嶲alement d廥activ le jours indiqu quelque soit les autres informations d'expiration. -.PP -Cette information est prioritaire sur toutes les autres champs pr廥ents dans \fI/etc/passwd\fR. -.PP -Ce fichier \fBne doit pas 皻re\fR accessible en lecture par les utilisateurs normaux afin de maintenir la s嶰urit des mots de passe, en particuliers contre les attaques aux dictionnaires. -.SH FICHIERS -/etc/passwd - information sur les comptes des utilisateurs -.br -/etc/shadow - mots de passe crypt廥 des utilisateurs -.SH VOIR AUSSI -.BR chage (1), -.BR login (1), -.BR passwd (1), -.BR su (1), -.BR sulogin (8), -.BR shadow (3), -.BR passwd (5), -.BR pwconv (8), -.BR pwunconv (8) -.SH AUTEUR -Julianne Frances Haugh (jfh@tab.com) -.SH TRADUCTION -.RI "Thierry Vignaud <" tvignaud@mandrakesoft.com ">, 1999" diff --git a/man/fr/useradd.8 b/man/fr/useradd.8 deleted file mode 100644 index a7cab6a3..00000000 --- a/man/fr/useradd.8 +++ /dev/null @@ -1,161 +0,0 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: useradd.8,v 1.1 2002/03/10 07:41:04 kloczek Exp $ -.\" -.\" Traduction 26/09/00 par Fr嶮廨ic Delanoy (fdelanoy@info.fundp.ac.be) -.\" -.TH USERADD 8 -.SH NOM -useradd \- Cr嶪r un nouvel utilisateur ou mettre jour l'information par d嶨aut sur un nouvel utilisateur -.SH SYNOPSIS -.TP 8 -.B useradd -.\" .RB [ -A -.\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c -.IR commentaire ] -.RB [ -d -.IR r廧_perso ] -.br -.RB [ -e -.IR date_expiration ] -.RB [ -f -.IR inactive_time ] -.br -.RB [ -g -.IR groupe_initial ] -.RB [ -G -.IR groupe [,...]] -.br -.RB [ -m " [" -k -.IR r廧_squelette ] " |" " " -M ] -.RB [ -p -.IR mot_de_passe ] -.br -.RB [ -s -.IR shell ] -.RB [ -u -.IR uid " [" -.BR -o ]] -.RB [ -n ] -.RB [ -r ] -.I login -.TP 8 -.B useradd -\fB-D\fR -[\fB-g\fI groupe_d嶨aut\fR] -[\fB-b\fI r廧_perso_d嶨aut\fR] -.br -[\fB-f\fI inactivit嬞fR] -[\fB-e\fI date_expiration_d嶨aut\fR] -.br -[\fB-s\fI shell_d嶨aut\fR] -.SH DESCRIPTION -.SS Cr嶧tion de nouveaux utilisateurs -Quand elle est invoqu嶪 sans l'option \fB-D\fR, la commande \fBuseradd\fR cr嶪 un nouveau compte utilisateur qui utilise les valeurs sp嶰ifi嶪s sur la ligne de commandes, et les valeurs par d嶨aut du syst鋗e. Le nouveau compte utilisateur sera ins廨 dans les fichiers du syst鋗e quand c'est n嶰essaire, le r廧ertoire personnel sera cr澭, et les fichiers initiaux copi廥, cela d廧endant des options pr廥entes en ligne de commandes. La version fournie avec Red Hat Linux cr嶪 un groupe pour chaque utilisateur ajout au syst鋗e, moins que l'option \fB-n\fR ne soit fournie. Les options qui s'appliquent la commande \fBuseradd\fR sont : -.\" .IP "\fB-A {\fImethod\fR|\fBDEFAULT\fR},..." -.\" The value of the user's authentication method. -.\" The authentication method is the name of a program which is responsible -.\" for validating the user's identity. -.\" The string \fBDEFAULT\fR may be used to change the user's authentication -.\" method to the standard system password method. -.\" This is a comma-separated list of program names. -.\" It may include \fBDEFAULT\fR exactly once. -.IP "\fB-c \fIcommentaire\fR" -Le champ de commentaire du fichier de mots de passe du nouvel utilisateur. -.IP "\fB-d \fIr廧_perso\fR" -Le nouvel utilisateur sera cr澭 en utilisant \fIr廧_perso\fR comme valeur du r廧ertoire de connexion de l'utilisateur. Le comportement par d嶨aut est de concat幯er le nom de \fIlogin\fR au \fIr廧_perso_d嶨aut\fR, et de l'utiliser en tant que nom de r廧ertoire de connexion. -.IP "\fB-e \fIdate_expiration\fR" -La date laquelle le compte de l'utilisateur sera d廥activ. La date est sp嶰ifi嶪 dans le format \fIAAAA-MM-JJ\fR. -.IP "\fB-f \fIjours_inactifs\fR" -Le nombre de jours suivant l'expiration d'un mot de passe apr鋊 lequel le compte est d嶨initivement d廥activ. Une valeur de 0 d廥active le compte d鋊 que le mot de passe a expir, et une valeur de -1 d廥active cette caract廨istique. La valeur par d嶨aut est de -1. -.IP "\fB-g \fIgroupe_initial\fR" -Le nom du groupe ou le num廨o du groupe de connexion initial de l'utilisateur. Le nom du groupe doit exister. Un num廨o de groupe doit se r嶨廨er un groupe pr嶪xistant. Le num廨o de groupe par d嶨aut est de 1. -.IP "\fB-G \fIgroupe,[...]\fR" -Une liste de groupes suppl幦entaires auxquels fait 嶲alement partie l'utilisateur. Chaque groupe est s廧ar du suivant par une virgule, sans espace entre les deux. Les groupes sont soumis aux m瘱es restrictions que celui donn avec l'option \fB-g\fR. Le comportement par d嶨aut pour l'utilisateur est de n'appartenir qu'au groupe initial. -.IP \fB-m\fR -Le r廧ertoire personnel de l'utilisateur sera cr澭 s'il n'existe pas d嶴. Les fichiers contenus dans \fIr廧_squelette\fR seront copi廥 dans le r廧ertoire personnel si l'option \fB-k\fR est employ嶪; sinon, les fichiers contenus dans \fIr廧_squelette\fR seront utilis廥 la place. Tous les r廧ertoires contenus dans \fIr廧_squelette\fR ou dans \fI/etc/skel\fR seront 嶲alement cr澭s dans le r廧ertoire personnel de l'utilisateur. L'option \fB-k\fR n'est valide qu'en conjonction avec l'option \fB-m\fR. Le comportement par d嶨aut est de ne pas cr嶪r le r廧ertoire, et de ne copier aucun fichier. -.IP \fB-M\fR -Le r廧ertoire personnel de l'utilisateur ne sera pas cr澭, m瘱e si les r嶲lages globaux au syst鋗e pr廥ents dans \fI/etc/login.defs\fR consistent en la cr嶧tion de r廧ertoires personnels. -.IP \fB-n\fR -Un groupe de m瘱e nom que l'utilisateur ajout au syst鋗e sera cr澭 par d嶨aut. Cette option d廥activera ce comportement sp嶰ifique de Red Hat Linux. -.IP \fB-r\fR -Cette option est utilis嶪 pour cr嶪r un compte syst鋗e, 諘d un utilisateur avec un UID plus petit que la valeur de UID_MIN d嶨inie dans -\fI/etc/login.defs\fR. Notez que \fBuseradd\fR ne cr嶪ra pas de r廧ertoire personnel pour un tel utilisateur, et ce quel que soit le r嶲lage par d嶨aut pr廥ent dans \fI/etc/login.defs\fR. Vous devez sp嶰ifier l'option \fB-m\fR si vous d廥irez la cr嶧tion d'un r廧ertoire personnel pour un tel utilisateur. C'est une option ajout嶪 par Red Hat. -.IP "\fB-p \fImot_de_passe\fR" -Le mot de passe crypt, comme renvoy par \fBcrypt\fR(3). Le comportement par d嶨aut est de d廥activer le compte. -.IP "\fB-s \fIshell\fR" -Le nom du shell de connexion de l'utilisateur. Le comportement par d嶨aut est de laisser ce compte vide, ce qui fait s幨ectionner au syst鋗e le shell de connexion par d嶨aut. -.IP "\fB-u \fIuid\fR" -La valeur num廨ique de l'ID de l'utilisateur. Cette valeur doit 皻re unique, moins que l'option \fI-o\fR ne soit utilis嶪. La valeur doit 皻re non n嶲ative. Le comportement par d嶨aut est d'utiliser la plus petite valeur d'ID plus grande que 99, et plus grande que celle de n'importe quel autre utilisateur. Les valeurs comprises entre 0 et 99 sont typiquement r廥erv嶪s pour les comptes syst鋗es. -.SS Modifier les valeurs par d嶨aut. -Quand il est invoqu avec l'option \fB-D\fR, \fBuseradd\fR soit affichera les valeurs actuelles par d嶨aut, soit mettra jour les valeurs par d嶨aut via la ligne de commandes. Les options valides sont -.IP "\fB-b \fIr廧_perso\fR" -Le pr嶨ixe de chemin initial pour un nouveau r廧ertoire personnel d'utilisateur. Le nom de l'utilisateur sera suffix la fin de \fIr廧_perso\fR pour cr嶪r le nom du nouveau r廧ertoire si l'option \fB-d\fI n'est pas utilis嶪 pendant la cr嶧tion d'un nouveau compte. -.IP "\fB-e \fIdate_expiration_d嶨aut\fR" -La date laquelle le compte utilisateur sera d廥activ. -.IP "\fB-f \fIinactivit嬞fR" -Le nombre de jours apr鋊 l'expiration d'un mot de passe avant que le compte ne soit d廥activ. -.IP "\fB-g \fIgroupe_d嶨aut\fR" -Le nom de groupe ou l'ID du groupe initial d'un nouvel utilisateur. Le groupe nomm doit exister, et un ID de groupe num廨ique doit d嶴 exister en tant qu'ID de groupe. -.IP "\fB-s \fIshell_d嶨aut\fR" -Le nom du shell de connexion d'un nouvel utilisateur. Le programme nomm sera utilis pour tous les futurs nouveaux comptes. -.PP -Si aucune option n'est sp嶰ifi嶪, \fBuseradd\fR affichera les valeurs par d嶨aut du moment. -.SH NOTES -L'administrateur syst鋗e est responsable du placement des fichiers d'utilisateur par d嶨aut dans le r廧ertoire \fI/etc/skel\fR. -.br -Cette version de \fIuseradd\fR a 彋 modifi嶪 par Red Hat pour se conformer la convention utilisateur/groupe de RedHat. -.SH INCONV冇IENTS -Vous ne pouvez pas ajouter d'utilisateur un groupe NIS. Cela doit 皻re effectu sur le serveur NIS. -.SH FICHIERS -\fB/etc/passwd\fR - information sur les comptes utilisateurs -.br -\fB/etc/shadow\fR - information s嶰uris嶪 sur les comptes utilisateurs -.br -\fB/etc/group\fR - information de groupes -.br -\fB/etc/default/useradd\fR - information par d嶨aut -.br -\fB/etc/login.defs\fR - r嶲lages globaux du syst鋗e -.br -\fB/etc/skel\fR - r廧ertoire contenant les fichiers utilis廥 par d嶨aut -.SH "VOIR AUSSI" -.BR chfn (1), -.BR chsh (1), -.BR crypt (3), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR passwd (1), -.BR userdel (8), -.BR usermod (8) -.SH AUTEUR -Julianne Frances Haugh (jfh@bga.com) -.SH TRADUCTION -Fr嶮廨ic Delanoy, 2000. diff --git a/man/fr/userdel.8 b/man/fr/userdel.8 deleted file mode 100644 index e26f97ab..00000000 --- a/man/fr/userdel.8 +++ /dev/null @@ -1,64 +0,0 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: userdel.8,v 1.1 2002/03/10 07:41:04 kloczek Exp $ -.\" -.\" Traduction 27/09/2000 par Fr嶮廨ic Delanoy (fdelanoy@info.fundp.ac.be) -.\" -.TH USERDEL 8 -.SH NOM -userdel \- Effacer un compte utilisateur et les fichiers associ廥 -.SH SYNOPSIS -.B userdel -[\fB-r\fR] -.I login -.SH DESCRIPTION -La commande \fBuserdel\fR modifie les fichiers des comptes du syst鋗e, en supprimant toutes les entr嶪s qui se r嶨鋨ent \fIlogin\fR. L'utilisateur nomm doit exister. -.SH OPTIONS -.IP \fB-r\fR -Les fichiers pr廥ents dans le r廧ertoire personnel de l'utilisateur seront supprim廥 en m瘱e temps que le r廧ertoire lui-m瘱e. Les fichiers situ廥 dans d'autres syst鋗es de fichiers devront 皻re recherch廥 et 幨imin廥 manuellement. -.SH FICHIERS -/etc/passwd - information sur les comptes utilisateurs -.br -/etc/shadow - information s嶰uris嶪 sur les comptes utilisateurs -.br -/etc/group - information de groupes -.SH INCONV冇IENTS -\fBuserdel\fR ne vous permet pas de supprimer un compte si l'utilisateur en question est actuellement connect. Vous devez tuer tous les processus en cours d'ex嶰ution appartenant l'utilisateur poss嶮ant le compte que vous 皻es en train de supprimer. Vous ne pouvez pas supprimer d'attribut NIS d'un client NIS. Cela doit 皻re effectu sur le serveur NIS. -.SH "VOIR AUSSI" -.BR chfn (1), -.BR chsh (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR passwd (1), -.BR useradd (8), -.BR usermod (8) -.SH AUTEUR -Julianne Frances Haugh (jfh@bga.com) -.SH TRADUCTION -Fr嶮廨ic Delanoy, 2000. diff --git a/man/fr/usermod.8 b/man/fr/usermod.8 deleted file mode 100644 index 76cbf703..00000000 --- a/man/fr/usermod.8 +++ /dev/null @@ -1,124 +0,0 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: usermod.8,v 1.1 2002/03/10 07:41:04 kloczek Exp $ -.\" -.\" Traduction 27/09/2000 par Fr嶮廨ic Delanoy (fdelanoy@info.fundp.ac.be) -.\" -.TH USERMOD 8 -.SH NOM -usermod \- modifier un compte utilisateur -.SH SYNOPSIS -.TP 8 -.B usermod -.\" .RB [ -A -.\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c -.IR commentaire ] -.RB [ -d -.IR r廧_perso " [" -.BR -m ]] -.br -.RB [ -e -.IR date_expiration ] -.RB [ -f -.IR inactivit ] -.br -.RB [ -g -.IR groupe_initial ] -.RB [ -G -.IR groupe [,...]] -.br -.RB [ -l -.IR nom_connexion ] -.RB [ -p -.IR mot_de_passe ] -.br -.RB [ -s -.IR shell ] -.RB [ -u -.IR uid " [" -.BR -o ]] -.RB [ -L | -U ] -.I login -.SH DESCRIPTION -La commande \fBusermod\fR modifie les fichiers des comptes du syst鋗e pour refl彋er les modifications qui ont 彋 sp嶰ifi嶪s sur la ligne de commandes. Les options qui s'appliquent la commande \fBusermod\fR sont -.\" .IP "\fB-A \fImethod\fR|\fBDEFAULT\fR" -.\" The new value of the user's authentication method. -.\" The authentication method is the name of a program which is responsible -.\" for validating the user's identity. -.\" The string \fBDEFAULT\fR may be used to change the user's authentication -.\" method to the standard system password method. -.IP "\fB-c \fIcommentaire\fR" -La nouvelle valeur du fichier du champ de commentaire du fichier de mot de passe de l'utilisateur. Il est normalement modifi en utilisant l'utilitaire \fBchfn\fR(1). -.IP "\fB-d \fIr廧_perso\fR" -Le nouveau r廧ertoire de connexion de l'utilisateur. Si l'option \fB-m\fR est fournie, le contenu du r廧ertoire personnel actuel sera d廧lac dans le nouveau r廧ertoire personnel, qui sera cr澭 si n嶰essaire. -.IP "\fB-e \fIdate_expiration\fR" -La date laquelle le compte utilisateur sera d廥activ. La date est sp嶰ifi嶪 dans le format \fIAAAA-MM-JJ\fR. -.IP "\fB-f \fIjours_inactifs\fR" -Le nombre de jours suivant l'expiration d'un mot de passe apr鋊 lequel le compte est d嶨initivement d廥activ. Une valeur de 0 d廥active le compte d鋊 que le mot de passe a expir, et une valeur de -1 d廥active cette caract廨istique. La valeur par d嶨aut est de -1. -.IP "\fB-g \fIgroupe_initial\fR" -Le nom du groupe ou le num廨o du groupe de connexion initial de l'utilisateur. Le nom du groupe doit exister. Un num廨o de groupe doit se r嶨廨er un groupe pr嶪xistant. Le num廨o de groupe par d嶨aut est de 1. -.IP "\fB-G \fIgroupe,[...]\fR" -Une liste de groupes suppl幦entaires auxquels fait 嶲alement partie l'utilisateur. Chaque groupe est s廧ar du suivant par une virgule, sans espace entre les deux. Les groupes sont soumis aux m瘱es restrictions que celles donn嶪s avec l'option \fB-g\fR. Si l'utilisateur fait actuellement partie d'un groupe qui n'est pas list, l'utilisateur sera supprim du groupe. -.IP "\fB-l \fInom_connexion\fR" -Le nom de l'utilisateur passera de \fIlogin\fR \fIlogin_name\fR. Rien d'autre n'est modifi. En particulier, le r廧ertoire personnel de l'utilisateur devra probablement 皻re chang pour refl彋er le nouveau nom de connexion. -.IP "\fB-p \fImot_de_passe\fR" -Le mot de passe crypt, comme renvoy par \fBcrypt\fR(3). -.IP "\fB-s \fIshell\fR" -Le nom du nouveau shell de connexion de l'utilisateur. Si shell n'est pas fourni, le syst鋗e s幨ectionnera le shell de connexion par d嶨aut. -.IP "\fB-u \fIuid\fR" -La valeur num廨ique de l'ID de l'utilisateur. Cette valeur doit 皻re unique, moins que l'option \fI-o\fR ne soit utilis嶪. La valeur doit 皻re non n嶲ative. Les valeurs comprises entre 0 et 99 sont typiquement r廥erv嶪s aux comptes syst鋗es. Tous les fichiers poss嶮廥 par l'utilisateur et qui sont situ廥 dans le sous-arbre de r廧ertoires "d嶵utant" au r廧ertoire personnel de l'utilisateur verront leur ID d'utilisateur automatiquement modifi. Les fichiers situ廥 l'ext廨ieur du r廧ertoire personnel de l'utilisateur doivent 皻re modifi廥 la main. -.IP "\fB-L\fR" -Verrouiller le mot de passe d'un utilisateur. Cette option ajoute un `!' devant le mot de passe crypt, ce qui d廥active le mot de passe. Vous ne pouvez pas utiliser cette option avec \fI-p\fR ou \fI-U\fR. -.IP "\fB-U\fR" -D憝errouiller le mot de passe d'un utilisateur. Cela supprime le `!' situ devant le mot de passe crypt. Vous ne pouvez pas utiliser cette option avec \fI-p\fR ou \fI-L\fR. -.SH INCONV冇IENTS -\fBusermod\fR ne vous permet pas de modifier le nom d'un utilisateur qui est actuellement connect. Vous devez 皻re sr que l'utilisateur nomm n'est pas en train d'ex嶰uter un quelconque programme quand cette commande est ex嶰ut嶪 si l'UID num廨ique de l'utilisateur est modifi. Vous devez modifier le nom du propri彋aire de tous les fichiers \fIcrontab\fR manuellement. Vous devez modifier le nom du propri彋aire de n'importe quel travail \fIat\fR manuellement. Vous devez effectuer les modifications impliquant NIS sur le serveur NIS. -.SH FICHIERS -/etc/passwd - information sur les comptes utilisateurs -.br -/etc/shadow - information s嶰uris嶪 sur les comptes utilisateurs -.br -/etc/group - information de groupes -.SH "VOIR AUSSI" -.BR chfn (1), -.BR chsh (1), -.BR crypt (3), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR passwd (1), -.BR useradd (8), -.BR userdel (8) -.SH AUTEUR -Julianne Frances Haugh (jfh@bga.com) -.SH TRADUCTION -Fr嶮廨ic Delanoy, 2000. - - - diff --git a/man/getspnam.3 b/man/getspnam.3 deleted file mode 100644 index 0cd58f93..00000000 --- a/man/getspnam.3 +++ /dev/null @@ -1 +0,0 @@ -.so shadow.3 diff --git a/man/gpasswd.1 b/man/gpasswd.1 index f865faf2..28904275 100644 --- a/man/gpasswd.1 +++ b/man/gpasswd.1 @@ -1,4 +1,4 @@ -.\"$Id: gpasswd.1,v 1.5 2002/03/09 19:22:29 ankry Exp $ +.\"$Id: gpasswd.1,v 1.9 2003/05/06 23:06:35 kloczek Exp $ .\" Copyright 1996, Rafal Maszkowski .\" All rights reserved. You can redistribute this man page and/or .\" modify it under the terms of the GNU General Public License as @@ -10,6 +10,7 @@ gpasswd \- administer the /etc/group file .br .SH SYNOPSIS +.TP 6 \fBgpasswd \fIgroup\fR .br \fBgpasswd -a \fIuser\fR \fIgroup\fR @@ -22,33 +23,26 @@ gpasswd \- administer the /etc/group file .br \fBgpasswd\fR [\fB-A \fIuser\fR,...] [\fB-M\fR \fIuser\fR,...] \fIgroup\fR .SH DESCRIPTION -.B gpasswd -is used to administer the /etc/group file (and /etc/gshadow -file if compiled with SHADOWGRP defined). Every group can -have administrators, members and a password. System -administrator can use \fB-A\fR option to define group -administrator(s) and \fB-M\fR option to define members and -has all rights of group administrators and members. +\fBgpasswd\fR is used to administer the \fI/etc/group\fR file (and +\fI/etc/gshadow\fR file if compiled with SHADOWGRP defined). Every group can +have administrators, members and a password. System administrator can use +\fB-A\fR option to define group administrator(s) and \fB-M\fR option to +define members and has all rights of group administrators and members. .PP -Group administrator can add and delete users using \fB-a\fR -and \fB-d\fR options respectively. Administrators can use -\fB-r\fR option to remove group password. When no password -is set only group members can use -.BR newgrp (1) -to join the group. Option \fB-R\fR disables -access to the group through -.BR newgrp (1) -command. +Group administrator can add and delete users using \fB-a\fR and \fB-d\fR +options respectively. Administrators can use \fB-r\fR option to remove group +password. When no password is set only group members can use \fBnewgrp\fR to +join the group. Option \fB-R\fR disables access to the group through +\fBnewgrp\fR command. .PP \fBgpasswd\fR called by a group administrator with group name only prompts for the group password. If password is set the members can still .BR newgrp (1) without a password, non-members must supply the password. - .SH FILES -/etc/group \- group information +\fI/etc/group\fR \- group information .br -/etc/gshadow \- shadow group information +\fI/etc/gshadow\fR \- shadow group information .SH SEE ALSO .BR newgrp (1), .BR groupadd (8), diff --git a/man/groupadd.8 b/man/groupadd.8 index 00f97fa5..ce905986 100644 --- a/man/groupadd.8 +++ b/man/groupadd.8 @@ -1,4 +1,4 @@ -.\"$Id: groupadd.8,v 1.10 2002/03/09 11:16:14 ankry Exp $ +.\"$Id: groupadd.8,v 1.17 2004/01/05 01:08:23 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,24 +29,41 @@ .SH NAME groupadd \- Create a new group .SH SYNOPSIS -\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] \fIgroup\fR +.TP 6 +\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] \fIgroup\fR .SH DESCRIPTION -The \fBgroupadd\fR command -creates a new group account using the values specified on the -command line and the default values from the system. -The new group will be entered into the system files as needed. -The options which apply to the \fBgroupadd\fR command are -.IP "\fB-g \fIgid\fR" -The numerical value of the group's ID. -This value must be unique, unless the \fB-o\fR option is used. -The value must be non-negative. -The default is to use the smallest ID value greater than 99 and -greater than every other group. -Values between 0 and 99 are typically reserved for system accounts. +The \fBgroupadd\fR command creates a new group account using the values +specified on the command line and the default values from the system. The +new group will be entered into the system files as needed. The options which +apply to the \fBgroupadd\fR command are: +.IP "\fB-g\fR \fIgid\fR" +The numerical value of the group's ID. This value must be unique, unless the +\fB-o\fR option is used. The value must be non-negative. The default is to +use the smallest ID value greater than 99 and greater than every other +group. Values between 0 and 99 are typically reserved for system accounts. +.IP "\fB-f\fR" +This option causes to just exit with success status if the specified +group already exists. With \fB-g\fR, if specified gid already exists, +other (unique) gid is chosen (i.e. \fB-g\fR is turned off). .SH FILES -/etc/group \- group account information +\fI/etc/group\fR \- group account information .br -/etc/gshadow \- secure group account information +\fI/etc/gshadow\fR \- secure group account information +.SH EXIT VALUES +.TP 2 +The \fBgroupadd\fR command exits with the following values: +.br +\fB0\fR \- success +.br +\fB2\fR \- invalid command syntax +.br +\fB3\fR \- invalid argument to option +.br +\fB4\fR \- gid not unique (when -o not used) +.br +\fB9\fR \- group name not unique +.br +\fB10\fR \- can't update group file .SH SEE ALSO .BR chfn (1), .BR chsh (1), diff --git a/man/groupdel.8 b/man/groupdel.8 index 6b893868..3dccc4b4 100644 --- a/man/groupdel.8 +++ b/man/groupdel.8 @@ -1,4 +1,4 @@ -.\"$Id: groupdel.8,v 1.10 2002/03/09 11:16:14 ankry Exp $ +.\"$Id: groupdel.8,v 1.13 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1991 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,19 +31,31 @@ groupdel \- Delete a group .SH SYNOPSIS \fBgroupdel\fR \fIgroup\fR .SH DESCRIPTION -The \fBgroupdel\fR command modifies the system account files, deleting -all entries that refer to \fIgroup\fR. -The named group must exist. +The \fBgroupdel\fR command modifies the system account files, deleting all +entries that refer to \fIgroup\fR. The named group must exist. .PP -You must manually check all filesystems to insure that no files remain -with the named group as the file group ID. +You must manually check all filesystems to insure that no files remain with +the named group as the file group ID. .SH CAVEATS -You may not remove the primary group of any existing user. -You must remove the user before you remove the group. +You may not remove the primary group of any existing user. You must remove +the user before you remove the group. .SH FILES -/etc/group \- group information +\fI/etc/group\fR \- group information .br -/etc/gshadow \- secure group information +\fI/etc/gshadow\fR \- secure group information +.SH EXIT VALUES +.TP 2 +The \fBgroupdel\fR command exits with the following values: +.br +\fB0\fR \- success +.br +\fB2\fR \- invalid command syntax +.br +\fB6\fR \- specified group doesn't exist +.br +\fB8\fR \- can't remove user's primary group +.br +\fB10\fR \- can't update group file .SH SEE ALSO .BR chfn (1), .BR chsh (1), diff --git a/man/groupmod.8 b/man/groupmod.8 index c3d078bb..3e7225cf 100644 --- a/man/groupmod.8 +++ b/man/groupmod.8 @@ -1,4 +1,4 @@ -.\"$Id: groupmod.8,v 1.10 2002/03/09 11:16:14 ankry Exp $ +.\"$Id: groupmod.8,v 1.13 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -32,23 +32,38 @@ groupmod \- Modify a group \fBgroupmod\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-n\fI group_name \fR] \fIgroup\fR .SH DESCRIPTION -The \fBgroupmod\fR command modifies the system account files to reflect -the changes that are specified on the command line. -The options which apply to the \fIgroupmod\fR command are -.IP "\fB-g \fIgid\fR" -The numerical value of the group's ID. -This value must be unique, unless the \fB-o\fR option is used. -The value must be non-negative. -Values between 0 and 99 are typically reserved for system groups. -Any files which the old group ID is the file group ID -must have the file group ID changed manually. -.IP "\fB-n \fIgroup_name\fR" +The \fBgroupmod\fR command modifies the system account files to reflect the +changes that are specified on the command line. The options which apply to +the \fIgroupmod\fR command are +.IP "\fB-g\fR \fIgid\fR" +The numerical value of the group's ID. This value must be unique, unless the +\fB-o\fR option is used. The value must be non-negative. Values between 0 +and 99 are typically reserved for system groups. Any files which the old +group ID is the file group ID must have the file group ID changed manually. +.IP "\fB-n\fR \fIgroup_name\fR" The name of the group will be changed from \fIgroup\fR to \fIgroup_name\fR. .SH FILES -/etc/group \- group information +\fI/etc/group\fR \- group information .br -/etc/gshadow \- secure group information +\fI/etc/gshadow\fR \- secure group information +.SH EXIT VALUES +.TP 2 +The \fBgroupmod\fR command exits with the following values: +.br +\fB0\fR \- success +.br +\fB2\fR \- bad command syntax +.br +\fB3\fR \- invalid argument to option +.br +\fB4\fR \- gid already in use (and no -o) +.br +\fB6\fR \- specified group doesn't exist +.br +\fB9\fR \- group name already in use +.br +\fB10\fR \- can't update group file .SH SEE ALSO .BR chfn (1), .BR chsh (1), diff --git a/man/groups.1 b/man/groups.1 index e7c7f07d..355e1e19 100644 --- a/man/groups.1 +++ b/man/groups.1 @@ -1,4 +1,4 @@ -.\"$Id: groups.1,v 1.10 2002/03/09 19:22:29 ankry Exp $ +.\"$Id: groups.1,v 1.12 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,7 +29,8 @@ .SH NAME groups \- display current group names .SH SYNOPSIS -\fBgroups\fR [\fIuser\fR] +\fBgroups\fR +[\fIuser\fR] .SH DESCRIPTION \fBgroups\fR displays the current group names or ID values. If the value does not have a corresponding entry in \fI/etc/group\fR, the value will be @@ -41,7 +42,7 @@ from \fI/etc/group\fR reported. The user must use \fBnewgrp\fR or \fBsg\fR to change their current real and effective group ID. .SH FILES -/etc/group \- group information +\fI/etc/group\fR \ - group information .SH SEE ALSO .BR newgrp (1), .BR getgid (2), diff --git a/man/grpck.8 b/man/grpck.8 index 69eeddb0..f3be959b 100644 --- a/man/grpck.8 +++ b/man/grpck.8 @@ -1,4 +1,4 @@ -.\"$Id: grpck.8,v 1.9 2002/03/08 04:39:11 kloczek Exp $ +.\"$Id: grpck.8,v 1.12 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -33,11 +33,11 @@ grpck \- verify integrity of group files .SH DESCRIPTION \fBgrpck\fR verifies the integrity of the system authentication information. All entries in the \fI/etc/group\fR and \fI/etc/gshadow\fR are checked to -see that the entry has the proper format and valid data in each field. -The user is prompted to delete entries that are improperly formatted or -which have other incorrectable errors. -.P -Checks are made to verify that each entry has +see that the entry has the proper format and valid data in each field. The +user is prompted to delete entries that are improperly formatted or which +have other incorrectable errors. +.PP +Checks are made to verify that each entry has: .sp .in +.5i - the correct number of fields @@ -47,56 +47,52 @@ Checks are made to verify that each entry has - a valid list of members and administrators .in -.5i .sp -.P -The checks for correct number of fields and unique group name are fatal. -If the entry has the wrong number of fields, the user will be prompted to -delete the entire line. -If the user does not answer affirmatively, all further checks are bypassed. -An entry with a duplicated group name is prompted for deletion, but the -remaining checks will still be made. -All other errors are warnings and the user is encouraged to run the +.PP +The checks for correct number of fields and unique group name are fatal. If +the entry has the wrong number of fields, the user will be prompted to +delete the entire line. If the user does not answer affirmatively, all +further checks are bypassed. An entry with a duplicated group name is +prompted for deletion, but the remaining checks will still be made. All +other errors are warnings and the user is encouraged to run the \fBgroupmod\fR command to correct the error. -.P +.PP The commands which operate on the \fI/etc/group\fR file are not able to -alter corrupted or duplicated entries. -\fBgrpck\fR should be used in those circumstances to remove the offending -entry. +alter corrupted or duplicated entries. \fBgrpck\fR should be used in those +circumstances to remove the offending entry. .SH OPTIONS By default, \fBgrpck\fR operates on the files \fI/etc/group\fR and -\fI/etc/gshadow\fR. -The user may select alternate files with the \fIgroup\fR and \fIshadow\fR -parameters. -Additionally, the user may execute the command in read-only mode by -specifying the \fB-r\fR flag. -This causes all questions regarding changes to be answered \fBno\fR -without user intervention. +\fI/etc/gshadow\fR. The user may select alternate files with the \fIgroup\fR +and \fIshadow\fR parameters. Additionally, the user may execute the command +in read-only mode by specifying the \fB-r\fR flag. This causes all questions +regarding changes to be answered \fBno\fR without user intervention. \fBgrpck\fR can also sort entries in \fI/etc/group\fR and \fI/etc/gshadow\fR by GID. To run it in sort mode pass it \fB-s\fR flag. No checks are performed then, it just sorts. .SH FILES -/etc/group \- group account information +\fI/etc/group\fR \ - group account information .br -/etc/gshadow \- encrypted passwords and group administrator information +\fI/etc/gshadow\fR \ - encrypted passwords and group administrator information .br -/etc/passwd \- user information +\fI/etc/passwd\fR \ - user information .SH SEE ALSO .BR group (5), .BR passwd (5), .BR shadow (5), .BR groupmod (8) -.SH DIAGNOSTICS +.SH EXIT VALUES +.TP 2 The \fBgrpck\fR command exits with the following values: -.IP 0 5 -Success -.IP 1 5 -Syntax Error -.IP 2 5 -One or more bad group entries -.IP 3 5 -Cannot open group files -.IP 4 5 -Cannot lock group files -.IP 5 5 -Cannot update group files +.br +\fB0\fR \- success +.br +\fB1\fR \- syntax Error +.br +\fB2\fR \- one or more bad group entries +.br +\fB3\fR \- can't open group files +.br +\fB4\fR \- can't lock group files +.br +\fB5\fR \- can't update group files .SH AUTHOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/hu/Makefile.am b/man/hu/Makefile.am index 96adaa00..9c404b23 100644 --- a/man/hu/Makefile.am +++ b/man/hu/Makefile.am @@ -4,10 +4,10 @@ mandir = @mandir@/hu man_MANS = \ chsh.1 \ gpasswd.1 \ + groups.1 \ login.1 \ newgrp.1 \ passwd.1 \ - sg.1 - -EXTRA_DIST = $(man_MANS) \ - groups.1 + sg.1 \ + su.1 + \ No newline at end of file diff --git a/man/hu/Makefile.in b/man/hu/Makefile.in index 1b26cf75..2f44009a 100644 --- a/man/hu/Makefile.in +++ b/man/hu/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,114 +14,157 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ mandir = @mandir@/hu +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ man_MANS = \ chsh.1 \ gpasswd.1 \ + groups.1 \ login.1 \ newgrp.1 \ passwd.1 \ - sg.1 - - -EXTRA_DIST = $(man_MANS) \ - groups.1 + sg.1 \ + su.1 subdir = man/hu +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -128,10 +172,15 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/hu/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -141,13 +190,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/hu/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: man1dir = $(mandir)/man1 @@ -165,6 +207,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -182,6 +228,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -191,6 +241,8 @@ uninstall-man1: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -198,15 +250,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -219,7 +282,6 @@ all-am: Makefile $(MANS) installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -231,6 +293,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -238,7 +301,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -248,7 +311,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -270,13 +333,21 @@ install-man: install-man1 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 @@ -288,8 +359,8 @@ uninstall-man: uninstall-man1 install-info-am install-man install-man1 install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ - uninstall-man uninstall-man1 + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-man uninstall-man1 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/hu/chsh.1 b/man/hu/chsh.1 deleted file mode 100644 index b35da016..00000000 --- a/man/hu/chsh.1 +++ /dev/null @@ -1,65 +0,0 @@ -.\" Copyright 1990, John F. Haugh II -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by John F. Haugh, II -.\" and other contributors. -.\" 4. Neither the name of John F. Haugh, II nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JOHN HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JOHN HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: chsh.1,v 1.1 2001/11/13 23:28:50 ankry Exp $ -.\" -.TH CHSH 1 -.SH N勼 -chsh \- bejelentkez廥i parancs廨telmez (h嶴j) 嫮l癃嫳a -.SH 糞TEKINT仉 -.TP 5 -\fBchsh\fR -[\fB-s \fIh嶴jprogram\fR] [\fIfelhaszn嫮酀fR] -.SH LE炅糜 -A \fBchsh\fR parancs a felhaszn嫮 bejelentkez廥i parancs廨telmez鰋彋 v嫮toztatja meg. -Norm嫮 felhaszn嫮 csak a saj嫢 parancs廨telmez鰋彋 嫮l癃hatja, a -rendszergazda b嫫ki彋. -.PP -A h嶴jprogrammal (shell) szemben t嫥asztott k饘etelm幯y, hogy szerepeljen -a \fI/etc/shells\fR f奫lban, kiv憝e ha a rendszergazd摋 mert -neki minden be嫮l癃嫳 elfogadott. -Korl嫢ozott parancs廨telmez鰗 nem lehet m嫳ikra 嫢嫮l癃ani. -Ez廨t nem tan塶sos a \fB/bin/rsh\fR-nak a \fI/etc/shells\fR-ben -val felsorol嫳a, mert ha a felhaszn嫮 嫢v嫮t erre a h嶴j-ra -nem v嫮that m嫳ikra. -.PP -A \fB-s\fR opci n幨kl a \fBchsh\fR interakt癉 m鏚on -mk鐰ik. Be kell 甏ni az j 廨t幧et, vagy resen hagyni a sort, hogy -az 廧pen aktu嫮is be嫮l癃嫳 maradjon, ami \fB[ ]\fR jelek k驆飆t l嫢hat. -.SH F穗LOK -/etc/passwd \- felhasz嫮鏙 nyilv嫕tart嫳 -.br -/etc/shells \- enged幨yezett parancs廨telmez鰈 list奫a -.SH L糜D M乇 -.BR chfn (1), -.BR passwd (5) -.SH MAGYAR FORD炆糜 -Szekely Krisztian diff --git a/man/hu/gpasswd.1 b/man/hu/gpasswd.1 deleted file mode 100644 index 7972d86e..00000000 --- a/man/hu/gpasswd.1 +++ /dev/null @@ -1,81 +0,0 @@ -.\" Copyright 1996, Rafal Maszkowski, rzm@pdi.net -.\" All rights reserved. You can redistribute this man page and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of the -.\" License, or (at your option) any later version. -.\" -.\" $Id: gpasswd.1,v 1.1 2001/11/13 23:28:50 ankry Exp $ -.\" -.TH GPASSWD 1 -.SH N勼 -gpasswd \- az /etc/group f奫lt adminisztr嫮ja -.br -.SH 糞TEKINT仉 -.B gpasswd \fIcsoport\fR -.br -.B gpasswd -.B -a -\fIfelhaszn嫮酀fR \fIcsoport\fR -.br -.B gpasswd -.B -d -\fIfelhaszn嫮酀fR \fIcsoport\fR -.br -.B gpasswd -.B -R -\fIcsoport\fR -.br -.B gpasswd -.B -r -\fIcsoport\fR -.br -.B gpasswd -.RB [ -A -\fIfelhaszn嫮酀fR,...] -.RB [ -M -\fIfelhaszn嫮酀fR,...] -\fIcsoport\fR -.br -.SH LE炅糜 -A -.B gpasswd -program seg癃s嶲憝el adminisztr嫮hatjuk az /etc/group f奫lt -illetve az /etc/gshadow f奫lt amennyiben a SHADOWGPR defini嫮va -volt a ford癃嫳 alatt. Minden csoportban lehetnek adminisztr嫢orok, -tagok 廥 egy jelsz. A rendszeradminisztr嫢or a \fB-A\fR opci -seg癃s嶲憝el defini嫮hat csoportadminisztr嫢or(oka)t 廥 a \fB-M\fR -opci镽al tagokat. A rendszeradminiszt嫢or minden joggal rendelkezik, -amellyel a csoportadminisztr嫢or 廥 a csoport tagjai. -.PP -A csoportadminisztr嫢or a \fB-a\fR kapcsol镽al hozhat l彋re -felhaszn嫮鏦at, 廥 a \fB-d\fR opci镽al t顤闤heti 鰈et. Az -adminisztr嫢orok a \fB-r\fR opci镽al t顤闤hetik a csoport -jelszav嫢. Ha nincs jelsz be嫮l癃va, akkor csak a csoport -tagjai haszn嫮hatj嫜 a -.BR newgrp (1) -parancsot a csatlakoz嫳hoz. A \fB-R\fR opci -megg嫢olja a csoport el廨廥彋 a -.BR newgrp (1) -parancson keresztl. -.PP -Ha -.B gpasswd -parancsot a csoportadminisztr嫢or adja ki a csoport nev憝el, -akkor csak a jelsz鏒 kell be甏nia. Ha van jelsz, akkor a tagok -be tudnak l廧ni a -.BR newgrp (1) -paranccsal jelsz n幨kl is, csak a csoporton k癉li felhaszn嫮鏦nak -kell megadniuk a jelsz鏒. - -.SH F穗LOK -/etc/group \- inform塶i a csoportr鏊 -.br -/etc/gshadow \- inform塶i a shadow csoportr鏊 -.SH L糜D M乇 -.BR newgrp (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR grpck (8) -.SH MAGYAR FORD炆糜 -T璥嫫 Andr嫳 diff --git a/man/hu/login.1 b/man/hu/login.1 deleted file mode 100644 index d6059329..00000000 --- a/man/hu/login.1 +++ /dev/null @@ -1,131 +0,0 @@ -.\" Copyright 1989 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: login.1,v 1.1 2002/03/10 07:34:02 kloczek Exp $ -.\" -.TH LOGIN 1 -.SH N勼 -login \- 犆 kapcsolat felv彋ele a rendszerrel (bejelentkez廥) -.SH 糞TEKINT仉 -.B login -.RI [ felhaszn嫮鏮憝 " [" k顤nyezeti v嫮toz鏦 ]] -.SH LE炅糜 -A -.B login -programot a rendszerbe val bel廧廥re haszn嫮juk. 翼tal墎an nem -k驆vetlenl haszn嫮juk, hanem automatikusan megh癉嫳ra kerl, amikor a -.I login: -promptra v嫮aszk幯t be甏juk a felhaszn嫮鏮evnket. -A -.B login -a shell szempontj墎鏊 kl霵leges kezel廥 lehet 廥 el灀ordulhat, hogy -nem h癉hat meg alfolyamatk幯t. Tipikus p幨da erre, amikor a -.B login -parancsot a shell \fBexec login\fR -k幯t 廨telmezi, teh嫢 az j -bejelentkez廥 el鰗t az aktu嫮isb鏊 val kil廧廥re k廥zteti a -felhaszn嫮鏒. -Ha nem login shellb鯷 pr鏏嫮juk meg a \fBlogin\fR parancsot v嶲rehajtani, -hibazenetet kapunk. -.PP -Amikor a \fIlogin:\fR promptn嫮 kerl megh癉嫳ra, lehet鰆嶲 van a -felhaszn嫮鏮憝 ut嫕 k顤nyezeti v嫮toz鏦 megad嫳嫫a, \fBN勼=仂T屮\fR. -form墎an, azonban nem minden v嫮toz鏒 tudunk ily m鏚on szab嫮yozni: -p幨d嫠l a \fBPATH\fR, \fBHOME\fR 廥 a \fBSHELL\fR nem kaphat itt 廨t幧et, -tov墎b az \fBIFS\fR letilt嫳ra kerlhet, ha a \felhaszn嫮 login shellje -a fB/bin/sh\fR. -.PP -Ezut嫕 a jelszavunkat kell megadnunk. A be甏t karakterek nem jelennek meg -a k廧erny鰒, megel鶝v幯 a 'leskel髇廥t'. Ha t鐽bsz顤 hib嫳 jelsz鏒 adunk -meg, a \fBlogin\fR kil廧, 廥 a kapcsolat megszakad. -.PP -Ha a jelszavunk 廨v幯yess嶲i ideje korl嫢ozott, a rendszer tov墎bl廧廥 -el鰗t felsz鏊癃hat a jelsz megv嫮toztat嫳嫫a. Ez azt jelenti, hogy a -jelszavunk lej嫫t, nem 廨v幯yes, vagy hamarosan le fog j嫫ni. A r嶲i -jelszavunkat is esetleg meg kell adni ellen鰎z廥k廧pen, majd az 嫮talunk -v嫮asztott j jelsz鏒. A t幦墎an l嫳d: \fBpasswd \fR(1) -.PP -Sikeres bejelentkez廥 ut嫕 n嶭嫕y rendszerzenetet kapunk, 廥 a postal墂嫕k -嫮lapot嫫鏊 n幦i visszajelsz廥t. A rendszerzenetf奫l (\fI/etc/motd\fR) -ki甏at嫳嫢 letilthatjuk egy 0 byte hosszs墔 \fI.hushlogin\fR file -l彋rehoz嫳嫛al a login k霵yvt嫫unkban. A posta 嫮lapot嫢鏊 fgg髊n a -k饘etkez zenetek valamelyik彋 kapjuk: "\fBYou have new mail.\fR" (犆 -lev幨 van), "\fBYou have mail.\fR" (Lev幨 van), vagy "\fBNo Mail.\fR" -(Nincs lev幨). -.PP -A felhaszn嫮鏙- (UID) 廥 a csoportazonos癃鏮k (GID) be嫮l癃嫳ra kerl az -\fI/etc/passwd\fR alapj嫕. A \fB$HOME\fR, \fB$SHELL\fR, -\fB$PATH\fR, \fB$LOGNAME\fR 廥 a \fB$MAIL\fR k顤nyezeti v嫮toz鏦 -be嫮l癃嫳ra kerlnek a passwd adatb嫙is megfelel mez鬑 alapj嫕. -Az ulimit, umask 廥 a nice is 廨t幧et kaphat a GECOS mez tartalma -alapj嫕. -.PP -N嶭嫕y rendszeren a \fB$TERM\fR v嫮toz is 廨t幧et kap, mik幯t az a -\fI/etc/ttytype\fR-ban meg van 甏va. -.PP -V嶲rehajt鏚hat a parancs廨telmez鰒k inicializ塶i鏀 scriptje is. Ez gyben -l嫳d a megfelel k憴ik霵yv-oldalt. -.SH FIGYELMEZTET仉EK -.PP -A \fBlogin\fR ezen verzi鎩a sok ford癃嫳i opci镽al rendelkezik, b嫫 csak -n嶭嫕y k驆lk az, ami haszn嫮atban lehet egyes speci嫮is g廧eken. - -.PP -A f奫lok elhelyezked廥e a rendszerkonfigur塶i鏦 kl霵b驆鰆嶲嶵鯷 ad鏚鏇n -v嫮tozhat. -.SH F穗LOK -/etc/utmp \- az aktu嫮is bejelentkez廥ek list奫a -.br -/etc/wtmp \- az el鶝 (eddigi) bejelentkez廥ek list奫a -.br -/etc/passwd \- felhaszn嫮鏙 account-okra vonatkoz inform塶i鏦 -.br -/etc/shadow \- titkos癃ott jelszavak 廥 廨v幯yess嶲i id-inform塶i鏦 -.br -/etc/motd \- rendszerzenet file -.br -/etc/nologin \- nem-root felhaszn嫮鏦 bel廧廥幯ek tilt嫳a -.br -/etc/ttytype \- termin嫮t甑usok list奫a -.br -$HOME/.profile \- inicializ塶i鏀 script az alap廨telmezett shellhez -.br -$HOME/.hushlogin \- korl嫢ozza a rendszerzenetek megjelen癃廥彋 -.br -.SH L糜D M乇 -.PP -.BR getty (8), -.BR mail (1), -.BR passwd (1), -.BR sh (1), -.BR su (1), -.\" .BR d_passwd (5), -.BR passwd (5), -.BR nologin (5) -.SH SZERZ -Julianne Frances Haugh (jfh@bga.com) -.SH MAGYAR FORD炆糜 -Niedermayer Mikl鏀 diff --git a/man/hu/newgrp.1 b/man/hu/newgrp.1 deleted file mode 100644 index 461e9ceb..00000000 --- a/man/hu/newgrp.1 +++ /dev/null @@ -1,89 +0,0 @@ -.\" Copyright 1991, Julianne Frances Haugh -.\" Hungarian translation by Peter Mamuzsics -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: newgrp.1,v 1.2 2002/03/09 11:16:16 ankry Exp $ -.\" -.TH NEWGRP 1 -.SH N勼 -newgrp \- Csoportazonos癃 m鏚os癃嫳a -.br -sg \- Parancs v嶲rehajt嫳a m嫳 csoportazono癃 alatt -.SH 糞TEKINT仉 -.BR newgrp " [" - ] -[\fIgroup\fR] -.br -.BR sg " [" - ] -[\fIgroup\fR [\fB-c\fR \fIcommand\fR]] -.SH LE炅糜 -A -.B newgrp -parancs a jelenlegi bejelentkez廥hez tartoz csoportazonos癃 -m鏚os癃嫳嫫a haszn嫮hat. Ha a parancsot az elhagyhat \fB\-\fR -kapcsol镽al h癉tuk meg, akkor a rendszer gy inicializ嫮ja jra -a felhaszn嫮鏙 k顤nyezetet, ahogy az a bejelelentkez廥 sor嫕 -megt顤t幯ik, ellenkez esetben a jelenlegi k顤nyezet - bele廨tve -az aktu嫮is munkak霵yvt嫫at is - v嫮tozatlan marad. -.PP -A -.B newgrp -parancs lecser幨i az aktu嫮is csoportazonos癃鏒 a megnevezett -vagy - ha nincs megadva - az \fI/etc/passwd\fR f奫lban megadott -alap廨telmezett csoportra. Ha a felhaszn嫮 nem rendelkezik jelsz镽al, -de a csoport igen, vagy a felhaszn嫮 nem tagja a csoportnak, -de a csoport rendelkezik jelsz镽al, akkor a rendszer bek廨i a csoport -jelszav嫢. -Amennyiben a csoportnak nincs jelszava, 廥 a felhaszn嫮 nem tagja a -csoportnak, akkor a hozz塻廨廥 nem lehets嶲es. -.PP -Az -.B sg -parancs mk鐰廥e hasonl a \fBnewgrp\fR parancs mk鐰廥嶭ez, -de ez nem cser幨i le a felhaszn嫮 parancs廨telmez鰋彋, 璲y -amikor kil廧nk az \fBsg\fR parancsb鏊, visszakapjuk az -eredeti csoportazonos癃鏒. -Az -.B sg -parancsnak egy m嫳ik, aposztr鏹ok k驆 z嫫t parancsot is meg lehet -adni, amely a Bourne parancs廨telmez鰉el kerl v嶲rehajt嫳ra. -.SH HIB窿 -A \fBnewgrp\fR t鐽bf幨e ford癃嫳i be嫮l癃嫳sal rendelkezik, -amelyeknek egy adott felhaszn嫮嫳i k顤nyezetben csak egy r廥z廨e -lehet szks嶲. -.SH F穗LOK -/etc/passwd \- felhaszn嫮鏙 inform塶i鏦 -.br -/etc/group \- csoportinfom塶i鏦 -.SH L糜D M乇 -.BR id (1), -.BR login (1), -.BR su (1) -.SH SZERZ -Julianne Frances Haugh (jfh@bga.com) -.br -.SH MAGYAR FORD炆糜 -Mamuzsics P彋er diff --git a/man/hu/passwd.1 b/man/hu/passwd.1 deleted file mode 100644 index 896b958d..00000000 --- a/man/hu/passwd.1 +++ /dev/null @@ -1,165 +0,0 @@ -.\" Copyright 1989 - 1994, John F. Haugh II -.\" All rights reserved. -.\" -.\" Redistribution is allowed, provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by John F. Haugh, II -.\" and other contributors. -.\" 4. Neither the name of John F. Haugh, II nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JOHN HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JOHN HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: passwd.1,v 1.2 2002/02/28 13:54:22 ankry Exp $ -.\" -.TH PASSWD 1 "" \" -*- nroff -*- -.SH N勼 -passwd \- Felhaszn嫮鏙 jelsz megv嫮toztat嫳a -.SH 糞TEKINT仉 -\fBpasswd\fR [\fB-f\fR|\fB-s\fR] [\fIn憝\fR] -.br -\fBpasswd\fR [\fB-g\fR] [\fB-r\fR|\fB-R\fR] \fIcsoport\fR -.br -\fBpasswd\fR [\fB-x\fR \fImax\fR] [\fB-n\fR \fImin\fR] -[\fB-w\fR \fIfigy\fR] [\fB-i\fR \fIinakt\fR] \fIn憝\fR -.br -\fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR} \fIn憝\fR -.SH LE炅糜 -A \fBpasswd\fR a felhaszn嫮鏦 廥 a csoportok megv嫮toztat嫳嫢 v嶲zi. -A felhaszn嫮鏦 csak a saj嫢 jelszavukat v嫮toztathatj嫜 meg, a rendszergazda -b嫫ki彋. A csoportok jelszav嫢 az adott csoport adminisztr嫢ora -v嫮toztathatja meg. -A \fBpasswd\fR ezen k癉l haszn嫮hat a felhaszn嫮鏙 adatok, mint pl. az -igazi n憝, a login shell, vagy a jelszavak "szavatoss墔i idej幯ek" -megv嫮toztat嫳嫫a is. -.SS Jelsz镽嫮toz嫳ok -A felhaszn嫮鏮ak el鰆z顤 a r嶲i jelszav嫢 kell be甏nia, ha m嫫 volt neki. -Ezut嫕 ennek a jelsz鏮ak a k鏚olt v嫮tozat嫢 飉szehasonl癃ja a t嫫olt -jelsz镽al. A megfelel jelsz be甏嫳嫫a a felhaszn嫮鏮ak csak egy lehet鰆嶲e -van. -A rendszergazda 嫢ugorhatja ezt a l廧廥t, 璲y az elfelejtett jelszavak is -megv嫮toztathat鏇k. -.PP -Miut嫕 a felhaszn嫮 be甏ta a jelszav嫢, a \fBpasswd\fR megvizsg嫮ja, hogyan -rendelkezett a rendszergazda a jelszavak "szavatoss墔i idej廨鯷". Amennyiben -az id nem alkalmas a jelsz megv嫮toztat嫳嫫a, \fBpasswd\fR kil廧 minden -v嫮toztat嫳 n幨kl. -.PP -Ezekut嫕 a program bek廨i a felhaszn嫮鏒鏊 az j jelsz鏒, majd -megvizsg嫮ja hogy el嶲 bonyolult-e. -翼tal嫕os szab嫮yk幯t elmondhat, hogy a jelszavak j鏦, ha 6-8 karakterb鯷 -嫮lnak, 廥 a k饘etkez jelk廥zletekb鯷 tartalmaz elemeket: -.IP "" .5i -Az ABC kis beti -.IP "" .5i -Az ABC nagy beti -.IP "" .5i -Sz嫥ok 0 廥 9 k驆飆t -.IP "" .5i -甾嫳jelek -.PP -Fontos odafigyelni, hogy ne tartalmazzon az adott rendszeren haszn嫮t -"erase" 廥 "kill" k鏚 karaktereket. -A \fBpasswd\fR nem fogad el nem el嶲g bonyolult jelsz鏒. -.PP -Ha a jelsz elfogadhat, -a \fBpasswd\fR a biztons墔 kedv澭rt m嶲 egyszer bek廨i az j jelsz鏒, 廥 -csak akkor hajtja v嶲re a v嫮toztat嫳t, ha a k彋 bevitt jelsz megegyezik. -.SS Csoportok jelszavai -A \fB-g\fR kapcsol haszn嫮ata eset幯 a megadott nev csoport jelszava -v嫮tozik meg. Ezt csak a rendszergazda vagy a csoport adminisztr嫢ora teheti -meg. -A jelenlegi csoportjelszavat nem k廨i v嫮toztat嫳 el鰗t. -Az \fB-r\fR kapcsol鏒 a \fB-g\fR kapcsol镽al haszn嫮va lehet a csoport jelszav嫢 kikapcsolni, ez嫮tal minden tag haszn嫮hatja a csoportot. -Az \fB-R\fR kapcsol a \fB-g\fR kapcsol镽al haszn嫮va a csoport minden felhaszn嫮 el鰗t lez嫫ul. - -.SS A jelszavak "szavatoss墔i ideje" -A jelszavak el憝l廥i idej彋 a rendszergazda a \fB-x\fR, \fB-n\fR, \fB-w\fR, 廥 \fB-i\fR kapcsol鏦kal szab嫮yozhatja. -A \fB-x\fR kapcsol a jelsz鏂ser幧 k驆ti maxim嫮is id鰗 嫮l癃ja be. -A jelsz鏒 legk廥騸b \fImax\fR naponk幯t meg kell v嫮toztatni. -Az \fB-n\fR kapcsol a k彋 jelsz鏂sere k驆飆ti minim嫮is id鰗 szab嫮yozza: a felhaszn嫮 addig nem v嫮toztathatja meg jelszav嫢, am璲 legal墎b -\fImin\fR nap el nem telt az el鶝 v嫮toztat嫳 鏒a. -A \fB-w\fR kapcsol镽al azt 嫮l癃hatod be, hogy h嫕y nappal a jelsz lej嫫ta el鰗t kezdje el a rendszer a felhaszn嫮鏒 figyelmeztetni. Az els figyelmeztet廥 \fIfigy\fR nappal a lej嫫at el鰗t jelenik meg, 廥 ut嫕a naponta t奫幧oztatja a felhaszn嫮鏒 a m嶲 h嫢ral憝 napok sz嫥嫫鏊. -Az \fB-i\fR kapcsol \fIinakt\fR nappal a jelsz lej嫫ta ut嫕 lez嫫ja a felhaszn嫮 bel廧廥i lehet鰆嶲彋. - -.SS Jogosults墔-kezel廥 -A felhaszn嫮鏦 lez嫫hat鏇k 廥 jra beengedhet髊k a \fB-l\fR 廥 a \fB-u\fR kapcsol鏦kal. -Az \fB-l\fR kapcsol a jelsz鏒 kicser幨i egy olyan 廨t幧re, ami semmilyen lehets嶲es jelsz k鏚olt 廨t幧憝el nem egyezik. -Az \fB-u\fR kapcsol vissza嫮l癃ja a jelsz鏒 a r嶲ire, 廥 璲y jra enged幨yezi a bel廧廥t. -.PP -A jogosults墔ok az \fB-S\fR kapcsol镽al 嫮l癃hat鏇k be. Ez 6 r廥zb鯷 嫮l: -Az els azt jelzi, hogy a felhasz嫮 le van z嫫va (L), nincs jelszava (NP), vagy van 廨v幯yes jelszava (P). -A m嫳odik r廥z az utols jelsz镽嫮toztat嫳 d嫢uma. -A k饘etkez n嶲y r廥z a jelszavak minim嫮is 廥 maxim嫮is ideje, az els figyelmeztet廥 a jelsz lej嫫ta el鰗t 廥 hogy mennyi ideig 幨 a jelsz lej嫫ta ut嫕. - -.SS Tippek a felhaszn嫮鏙 jelszavakhoz -Egy jelszavas rendszer biztons墔a a k鏚ol嫳i algoritmus er鰆s嶲彋鯷 廥 a lehets嶲es kulcsok sz嫥嫢鏊 fgg. -A \fB\s-2UNIX\s+2\fR rendszerek k鏚ol嫳i m鏚ja az NBS DES algoritmuson alapul, 廥 nagyon biztons墔os. A lehets嶲es kulcsok sz嫥a a v嫮asztott jelsz v幨etlenszers嶲幯 mlik. -.PP -A jelszavas rendszerek felt顤廥e legt鐽bsz顤 a gondatlanul megv嫮asztott jelsz镽嫮aszt嫳nak vagy a jelszavak cser幨get廥幯ek eredm幯ye. -Ezen okok miatt c幨szer olyan jelsz鏒 v嫮asztanod, ami nem szerepel a sz鏒嫫ban 廥 nem szks嶲es le甏nod. Tipikusan rossz v嫮aszt嫳 m嶲, ha valamilyen nevet, valamilyen azonos癃鏀z嫥odat, szlet廥napodat, vagy c璥edet haszn嫮od jelsz鏦幯t. -Ezeket legt鐽bsz顤 minden m嫳 lehet鰆嶲 vizsg嫮ata el鰗t kipr鏏嫮ja a potenci嫮is cracker. -.PP -Igyekezz olyan jelsz鏒 v嫮asztani, amit k霵nyen megjegyzel 廥 璲y nem vagy -arra szorulva, hogy le kelljen 甏nod. -Ezt p幨d嫠l gy 廨heted el, hogy k彋 r饘idebb sz鏒 elv嫮asztasz egy sz嫥mal -vagy valamilyen karakterrel, p幨d嫠l jel@szo -.PP -A m嫳ik m鏚szer, hogy egy k霵nyen megjegyezhet mondat vagy id憴et minden -szav嫕ak els vagy utols betj彋 甏od egym嫳 ut嫕. -玡y p幨d嫠l a -.IP "" .5i -Morzsa kuty嫥 hegyezd fled -.PP --b鯷 -.IP "" .5i -Maqmhdfd -.PP -lesz. -Feltehet鯷eg kev廥 cracker sz鏒嫫墎an fog szerepelni ez a sz. -Ennek ellen廨e a m嶲 nagyobb biztons墔 kedv澭rt 廨demes valamilyen saj嫢 -m鏚szert kital嫮nod jelszavak k廥z癃廥廨e. - -.SS Megjegyz廥 a csoportok jelszavair鏊 -A csoportok jelszavai 嫮land biztons墔i probl幦嫢 jelenthetnek, mivel -nemcsak egy ember ismerheti a jelszavat. A csoport-kezel廥 azonban -hasznos abban az esetben, ha t鐽b felhaszn嫮 egyttmk鐰廥彋 kell -megoldani. - -.SH FIGYELMEZTET仉 -Nem biztos, hogy minden kapcsol felhaszn嫮hat. -Az, hogy hogyan vizsg嫮ja a jelszavak bonyolults墔嫢, rendszerr鯷 rendszerre -v嫮tozhat. -Minden felhaszn嫮鏮ak c幨szer a lehet legbonyolultabb, de m嶲 haszn嫮hat -jelsz鏒 haszn嫮nia. -Ha NIS-t haszn嫮 a felhaszn嫮鏦 azonos癃嫳嫫a a rendszer 廥 a felhaszn嫮 nem -l廧ett be a NIS kiszolg嫮鏎a, nem v嫮toztathatja meg jelszav嫢. -.SH F穗LOK -/etc/passwd \- felhaszn嫮鏙 inform塶i鏦 -.br -/etc/shadow \- k鏚olt felhaszn嫮鏙 jelszavak -.SH L糜D M乇 -.BR passwd (3), -.BR shadow (3), -.BR group (5), -.BR passwd (5) -.SH MAGYAR FORD炆糜 -宁di "Cactus" Gerg diff --git a/man/hu/sg.1 b/man/hu/sg.1 deleted file mode 100644 index d07c5e48..00000000 --- a/man/hu/sg.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/newgrp.1 diff --git a/man/id.1 b/man/id.1 index a726f6e2..9a214f3f 100644 --- a/man/id.1 +++ b/man/id.1 @@ -1,4 +1,4 @@ -.\"$Id: id.1,v 1.10 2002/03/09 19:22:29 ankry Exp $ +.\"$Id: id.1,v 1.12 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -37,9 +37,9 @@ values. If the value does not have a corresponding entry in the corresponding name. The optional \fB-a\fR flag will display the group set on systems which support multiple concurrent group membership. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \ - user account information .br -/etc/group \- group information +\fI/etc/group\fR \ - group information .SH SEE ALSO .BR getgid (2), .BR getgroups (2), diff --git a/man/id/Makefile.in b/man/id/Makefile.in index e37f2ece..e26a49ba 100644 --- a/man/id/Makefile.in +++ b/man/id/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,100 +14,144 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ mandir = @mandir@/id +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ man_MANS = \ adduser.8 \ @@ -117,6 +162,7 @@ man_MANS = \ EXTRA_DIST = $(man_MANS) subdir = man/id +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -124,10 +170,15 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/id/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -137,13 +188,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/id/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: man1dir = $(mandir)/man1 @@ -161,6 +205,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -178,6 +226,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -200,6 +252,10 @@ install-man8: $(man8_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -217,6 +273,10 @@ uninstall-man8: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -226,6 +286,8 @@ uninstall-man8: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -233,15 +295,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -254,7 +327,6 @@ all-am: Makefile $(MANS) installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -266,6 +338,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -273,7 +346,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -283,7 +356,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -305,13 +378,21 @@ install-man: install-man1 install-man8 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 uninstall-man8 @@ -323,8 +404,9 @@ uninstall-man: uninstall-man1 uninstall-man8 install-info-am install-man install-man1 install-man8 \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool uninstall uninstall-am \ - uninstall-info-am uninstall-man uninstall-man1 uninstall-man8 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/it/Makefile.am b/man/it/Makefile.am index b014c797..120be88f 100644 --- a/man/it/Makefile.am +++ b/man/it/Makefile.am @@ -26,5 +26,4 @@ man_MANS = \ usermod.8 \ vigr.8 \ vipw.8 - -EXTRA_DIST = $(man_MANS) + \ No newline at end of file diff --git a/man/it/Makefile.in b/man/it/Makefile.in index 352f0345..cc1fb956 100644 --- a/man/it/Makefile.in +++ b/man/it/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,100 +14,144 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ mandir = @mandir@/it +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ man_MANS = \ adduser.8 \ @@ -134,9 +179,8 @@ man_MANS = \ vigr.8 \ vipw.8 - -EXTRA_DIST = $(man_MANS) subdir = man/it +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -144,10 +188,15 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/it/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -157,13 +206,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/it/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: man1dir = $(mandir)/man1 @@ -181,6 +223,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -198,6 +244,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -220,6 +270,10 @@ install-man5: $(man5_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -237,6 +291,10 @@ uninstall-man5: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -259,6 +317,10 @@ install-man8: $(man8_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -276,6 +338,10 @@ uninstall-man8: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -285,6 +351,8 @@ uninstall-man8: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -292,15 +360,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -313,7 +392,6 @@ all-am: Makefile $(MANS) installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -325,6 +403,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -332,7 +411,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -342,7 +421,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -364,13 +443,21 @@ install-man: install-man1 install-man5 install-man8 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 @@ -382,9 +469,9 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 install-info-am install-man install-man1 install-man5 \ install-man8 install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-man5 uninstall-man8 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man5 uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/it/adduser.8 b/man/it/adduser.8 deleted file mode 100644 index ed737f29..00000000 --- a/man/it/adduser.8 +++ /dev/null @@ -1 +0,0 @@ -.so man8/useradd.8 diff --git a/man/it/chfn.1 b/man/it/chfn.1 deleted file mode 100644 index 35bd6bc6..00000000 --- a/man/it/chfn.1 +++ /dev/null @@ -1,74 +0,0 @@ -.\" $Id: chfn.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" chfn.1 -- change your finger information -.\" (c) 1994 by salvatore valente -.\" -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" -.\" this program is free software. you can redistribute it and -.\" modify it under the terms of the gnu general public license. -.\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.1 $ -.\" $Date: 2002/03/10 07:41:06 $ -.\" -.\" " for hilit19 -.TH CHFN 1 "13 ottobre 1994" "chfn" "Linux Reference Manual" -.SH NOME -chfn \- cambia le proprie "finger information" -.SH SINTASSI -.B chfn -[\ \-f\ nome_vero\] [\ \-o\ ufficio\] [\ \-p\ telefono_ufficio\] -[\ \-h\ telefono_casa\] [\ \-u\ ] [\ \-v\ ] [\ nome_utente\] -.SH DESCRIZIONE -.B chfn - usato per cambiare le proprie finger information. Queste informazioni sono -salvate nel file -.IR /etc/passwd , -e sono mostrate dal programma -.BR finger . -Il comando -.B finger -di Linux mostra quattro porzioni di informazione che possono essere -cambiati tramite -.BR chfn : -il proprio nome vero, l'ufficio e il numero di telefono di quest'ultimo, e il -proprio numero di telefono di casa. -.SS LINEA DI COMANDO -Ognuno delle quattro porzioni pu essere specificata nella linea di comando. -Se non viene passata alcuna informazione sulla linea di comando, -.B chfn -entra in modo interattivo. -.SS MODO INTERATTIVO -Nel modo interattivo, -.B chfn -chieder ognuno dei campi. Al prompt, possono essere immesse le nuove -informazioni, o premere return per non cambiare il campo. L'immissione della -parola chiave "none" cancella il campo. -.SH OPZIONI -.TP -.I "\-f, \-\-full-name" -Specifica il proprio nome reale. -.TP -.I "\-o, \-\-office" -Specifica il numero del proprio ufficio. -.TP -.I "\-p, \-\-office-phone" -Specifica il numero di telefono del proprio ufficio. -.TP -.I "\-h, \-\-home-phone" -Specifica il numero di telefono di casa. -.TP -.I "\-u, \-\-help" -Mostra un messaggio d'aiuto ed esce. -.TP -.I "-v, \-\-version" -Mostra informazioni sulla versione ed esce. -.SH "VEDERE ANCHE" -.BR finger (1), -.BR passwd (5) -.SH AUTORE -Salvatore Valente diff --git a/man/it/chsh.1 b/man/it/chsh.1 deleted file mode 100644 index 1d1da815..00000000 --- a/man/it/chsh.1 +++ /dev/null @@ -1,58 +0,0 @@ -.\" $Id: chsh.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" chsh.1 -- change your login shell -.\" (c) 1994 by salvatore valente -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" Aggiornamento alla 2.9 di Roberto Pertile -.\" Maggio 1999 -.\" this program is free software. you can redistribute it and -.\" modify it under the terms of the gnu general public license. -.\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.1 $ -.\" $Date: 2002/03/10 07:41:06 $ -.\" -.TH CHSH 1 "7 ottobre 1998" "chsh" "Linux Reference Manual" -.SH NOME -chsh \- cambia la shell di login -.SH SINTASSI -.B chsh -[\ \-s\ shell\ ] [\ \-l\ ] [\ \-u\ ] [\ \-v\ ] [\ nome_utente\ ] -.SH DESCRIZIONE -.B chsh - usato per cambiare la propria shell di login. -Se nella linea di comando non viene fornita una shell, -.B chsh -ne chiede una. -.SS SHELL VALIDE -.B chsh -accetter l'intero percorso di qualunque file eseguibile nel sistema. -Tuttavia, emetter un messaggio di avviso se la shell non elencata nel -file -.I /etc/shells. -D'altra parte, pu anche essere configurato in modo tale da accettare solo -shell elencate in questo file, a meno che sia eseguito da root. -.SH OPZIONI -.TP -.I "\-s, \-\-shell" -Specifica la propria shell di login. -.TP -.I "\-l, \-\-list-shells" -Stampa la lista delle shell elencate in -.I /etc/shells -ed esce. -.TP -.I "\-u, \-\-help" -Stampa un messaggio sull'uso ed esce. -.TP -.I "-v, \-\-version" -Stampa informazioni sulla versione ed esce. -.SH "VEDERE ANCHE" -.BR login (1), -.BR passwd (5), -.BR shells (5) -.SH AUTORE -Salvatore Valente diff --git a/man/it/gpasswd.1 b/man/it/gpasswd.1 deleted file mode 100644 index 550e4cda..00000000 --- a/man/it/gpasswd.1 +++ /dev/null @@ -1,76 +0,0 @@ -.\" Copyright 1996, Rafal Maszkowski, rzm@pdi.net -.\" All rights reserved. You can redistribute this man page and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of the -.\" License, or (at your option) any later version. -.\" -.\" $Id: gpasswd.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH GPASSWD 1 -.SH NOME -gpasswd \- amministra il file /etc/group -.br -.SH SINTASSI -.B gpasswd \fIgruppo\fR -.br -.B gpasswd -.B -a -\fIutente\fR \fIgruppo\fR -.br -.B gpasswd -.B -d -\fIutente\fR \fIgruppo\fR -.br -.B gpasswd -.B -R -\fIgruppo\fR -.br -.B gpasswd -.B -r -\fIgruppo\fR -.br -.B gpasswd -.RB [ -A -\fIutente\fR,...] -.RB [ -M -\fIutente\fR,...] -\fIgruppo\fR -.br -.SH DESCRIZIONE -.B gpasswd -viene usato per amministrare il file /etc/group (ed il file /etc/gshadow -se compilato con SHADOWGRP definito). Ogni gruppo pu avere amministratori, -membri ed una password. L'amministratore di sistema pu usare l'opzione \fB-A\fR -per definire l'amministratore/gli amministratori di gruppo e l'opzione \fB-M\fR -per definire i membri ed ha tutti i diritti degli amministratori di gruppo e -dei membri. -.PP -L'amministratore di gruppo pu aggiungere e rimuovere utenti usando -rispettivamente le opzioni \fB-a\fR e \fB-d\fR. Gli amministratori possono usare -l'opzione \fB-r\fR per rimuovere la password di gruppo. Quando non -impostata alcuna password solo i membri del gruppo possono usare -.BR newgrp (1) -per unirsi al gruppo. L'opzione \fB-R\fR disabilita l'accesso al gruppo tramite -il comando -.BR newgrp (1). -.PP -.B gpasswd -invocata da un amministratore di gruppo con il solo nome del gruppo richiede -solamente la password di gruppo. Se la password impostata i membri possono ancora -usare -.BR newgrp (1) -senza la password, i non-membri devono fornire la password. - -.SH FILE -/etc/group \- informazioni sui gruppi -.br -/etc/gshadow \- informazioni sul gruppo shadow -.SH VEDERE ANCHE -.BR newgrp (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR grpck (8) diff --git a/man/it/groups.1 b/man/it/groups.1 deleted file mode 100644 index 72f0aab7..00000000 --- a/man/it/groups.1 +++ /dev/null @@ -1,46 +0,0 @@ -.\" $Id: groups.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Italian manpages for GNU sh-utils-1.16. -.\" Copyright (C) 1997 Free Software Foundation, Inc. -.\" Giovanni Bortolozzo , 1997. -.\" -.\" Traduzione di Giovanni Bortolozzo -.\" Maggio 1997 -.\" -.\"" for hilit19 -.TH GROUPS 1 "GNU Shell Utilities" "FSF" -.SH NOME -groups \- mostra i gruppi in cui presente l'utente -.SH SINTASSI -.B groups -[nomeutente...] -.br -.B groups -{\-\-help,\-\-version} -.SH DESCRIZIONE -Questa documentazione non mantenuta da lungo tempo e potrebbe essere -inaccurata o incompleta. La documentazione in Texinfo ora la fonte -autorevole. -.PP -Questa pagina di manuale documenta la versione GNU di -.BR groups . -.B groups -mostra i nomi dei gruppi supplementari in cui presente ogni -.I nomeutente -dato, o del processo corrente se non ne dato nessuno. Se sono dati -dei nomi di utenti, il nome di ogni utente stampato prima della -lista dei gruppi dell'utente. -.PP -La lista dei gruppi equivalente all'output del comando `id \-Gn'. -.SS OPZIONI -Quando GNU -.B groups - chiamato con un solo argomento sono riconosciute le seguenti -opzioni: -.TP -.I "\-\-help" -Mostra nello standard output un messaggio d'aiuto ed esce con successo. -.TP -.I "\-\-version" -Mostra nello standard output informazioni sulla versione ed esce con -successo. - diff --git a/man/it/grpck.8 b/man/it/grpck.8 deleted file mode 100644 index 1bc07062..00000000 --- a/man/it/grpck.8 +++ /dev/null @@ -1,108 +0,0 @@ -.\" Copyright 1992 - 1993, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: grpck.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH GRPCK 8 -.SH NOME -grpck \- verifica l'integrit dei file di gruppo -.SH SINTASSI -\fBgrpck\fR [\fB-r\fR] [\fIgruppo\fR \fIshadow\fR] -.SH DESCRIZIONE -\fBgrpck\fR verifica l'integrit delle informazioni di autenticazione del -sistema. -Vengono controllate tutte le voci in \fI/etc/group\fR e \fI/etc/gshadow\fR -per verificare che la voce abbia il formato appropriato e dati validi -in ciascun campo. -Viene richiesto all'utente di rimuovere le voci che sono formattate -impropriamente o che hanno altri errori incorreggibili. -.P -Vengono fatti controlli per verificare che ogni voce abbia -.sp -.in +.5i -- il corretto numero di campi -.br -- un nome univoco di gruppo -.br -- una lista valida di membri ed amministratori -.in -.5i -.sp -.P -Le verifiche sul corretto numero di campi e sul nome univoco del gruppo -sono fatali. -Se la voce ha un numero errato di campi, all'utente verr richiesto di -cancellare l'intera riga. -Se l'utente non risponde affermativamente, vengono omessi tutti gli -ulteriori controlli. -Verr richiesta la cancellazione di una voce avente il nome del gruppo duplicato, -ma i rimanenti controlli verranno ugualmente effettuati. -Tutti gli altri errori sono avvertimenti e l'utente incitato ad eseguire -il comando \fBgroupmod\fR per correggere l'errore. -.P -I comandi che operano sul file \fI/etc/group\fR non sono in grado di alterare -voci corrotte o duplicate. -In quelle circostanze dovrebbe essere usato \fBgrpck\fR per rimuovere la voce -scorretta. -.SH OPZIONI -Come modalit predefinita, \fBgrpck\fR opera sui file \fI/etc/group\fR ed -\fI/etc/gshadow\fR. -L'utente pu selezionare file alternativi con i parametri \fIgruppo\fR e -\fIshadow\fR. -Inoltre, l'utente pu eseguire il comando in modalit di sola lettura -specificando l'opzione \fB-r\fR. -Questa fa in modo che venga risposto \fBno\fR a tutte le domande che riguardano -i cambiamenti senza l'intervento dell'utente. -.SH FILE -/etc/group \- informazioni sugli account di gruppo -.br -/etc/gshadow \- password crittate e informazioni sugli amministratori di gruppo -.br -/etc/passwd \- informazioni sugli utenti -.SH VEDERE ANCHE -.BR groupmod (8), -.BR group (5), -.BR passwd (5), -.BR shadow (5) -.SH DIAGNOSTICA -Il comando \fBgrpck\fR esce con i seguenti valori: -.IP 0 5 -Successo -.IP 1 5 -Errore di sintassi -.IP 2 5 -Una o pi voci di gruppo scorrette -.IP 3 5 -Impossibile aprire i file di gruppo -.IP 4 5 -Impossibile eseguire il lock dei file di gruppo -.IP 5 5 -Impossibile aggiornare i file di gruppo -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/grpconv.8 b/man/it/grpconv.8 deleted file mode 100644 index 470d789c..00000000 --- a/man/it/grpconv.8 +++ /dev/null @@ -1,58 +0,0 @@ -.\" $Id: grpconv.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Traduzione in italiano di Isabella Ruocco -.\" Giugno 1999 -.TH PWCONV 8 "26 sep 1997" -.SH NOME -pwconv, pwunconv, grpconv, grpunconv \- convertono a e da password e gruppi shadow. -.SH SINTASSI -.B pwconv -.br -.B pwunconv -.br -.B grpconv -.br -.B grpunconv -.SH DESCRIZIONE -Questi quattro programmi agiscono tutti sui file normali e e oscurati (shadow) -delle password e dei gruppi: -.IR /etc/passwd ", " /etc/group ", " /etc/shadow ", e " /etc/gshadow . - -.B pwconv -.RI "crea " shadow " da " passwd " e, in modo opzionale, da un preesistente " shadow . -.B pwunconv -.RI "crea " passwd " da " passwd " e " shadow " e quindi rimuove " shadow . -.B grpconv -.RI "crea " gshadow " da " group " e, in modo opzionale, da un preesistente " gshadow . -.B grpunconv -.RI "crea " group " da " group " e " gshadow " e quindi rimuove " gshadow . - -Ciascun programma, prima della conversione, acquisisce i lock necessari. - -.BR pwconv " e " grpconv -sono simili. Per prima cosa vengono rimosse le voci nel file oscurato che non esistono -nel file principale. Quindi vengono aggiornate le voci oscurate che -non hanno `x' come password nel file principale. Vengono aggiunte le eventuali voci -oscurate mancanti. Infine, le password nel file principale vengono -sostituite con `x'. Questi programmi possono essere usati per le conversioni iniziali -cos come per aggiornare il file oscurato se il file principale viene editato -a mano. - -.B pwconv -user i valori di -.BR PASS_MIN_GIORNI ", " PASS_MAX_GIORNI ", e " PASS__GIORNI_PREAVVISO -da -.I /etc/login.defs -quando si aggiungono nuove voci a -.IR /etc/shadow . - -.RB "Analogamente, " pwunconv " e " grpunconv -sono simili. Le password nel file principale vengono aggiornate -dal file oscurato. Voci che esistono nel file principale ma non -nel file oscurato vengono lasciate stare. Infine, viene rimosso il file oscurato. - -Alcune informazioni sull'invecchiamento delle password vengono perse da -.BR pwunconv . -Questo convertir quello che potr. -.SH "VEDERE ANCHE" -.BR login.defs (5), -.BR shadowconfig (8) diff --git a/man/it/grpunconv.8 b/man/it/grpunconv.8 deleted file mode 100644 index ca092223..00000000 --- a/man/it/grpunconv.8 +++ /dev/null @@ -1 +0,0 @@ -.so man8/grpconv.8 diff --git a/man/it/lastlog.8 b/man/it/lastlog.8 deleted file mode 100644 index f77b02d4..00000000 --- a/man/it/lastlog.8 +++ /dev/null @@ -1,66 +0,0 @@ -.\" Copyright 1992, Phillip Street and Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" @(#)lastlog.8 3.3 08:24:58 29 Sep 1993 (National Guard Release) -.\" $Id: lastlog.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH LASTLOG 8 -.SH NOME -lastlog \- esamina il file lastlog -.SH SINTASSI -.B lastlog -.RB [ -u -.IR uid ] -.RB [ -t -.IR giorni ] -.SH DESCRIZIONE -\fBlastlog\fR formatta e stampa il contenuto dell'ultimo log di login, -\fI/var/log/lastlog\fR. Verranno stampati \fBnome-login\fR, \fBporta\fR, -e \fBdata_ultima_connessione\fR. -Il comportamento predefinito (senza opzioni) quello di stampare le voci di -lastlog in ordine di UID. -Digitando l'opzione \fB-u \fInome-login\fR verr stampato solo il -record di \fInome-login\fR. -Digitando \fB-t \fIgiorni\fR verranno stampate solo le ultime connessioni -pi recenti di \fIgiorni\fR. -L'opzione \fB-t\fR sovrascrive l'uso di \fB-u\fR. -.PP -Se l'utente non si mai connesso verr mostrato, al posto della porta e della -data, il messaggio \fB"**Never logged in**"\fR (**Mai connesso**). -.SH FILE -/var/log/lastlog \- file di connessione lastlog -.SH CAVEAT -Grandi lacune nei numeri di uid provocheranno una prolungata esecuzione del -programma lastlog senza alcun output sullo schermo (i.e. se mmdf=800 e l'ultimo -uid=170, sembrer che il programma rimanga appeso mentre elabora gli uid 171-799). -.SH AUTORI -Julianne Frances Haugh (jfh@tab.com) -.br -Phillip Street diff --git a/man/it/login.1 b/man/it/login.1 deleted file mode 100644 index 390bbf5c..00000000 --- a/man/it/login.1 +++ /dev/null @@ -1,334 +0,0 @@ -.\" $Id: login.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu) -.\" May be distributed under the GNU General Public License -.\" Pu essere distribuito sotto la GNU General Public License -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" Aggiornamento alla 2.9 di Roberto Pertile -.TH LOGIN 1 "4 novembre 1996" "Util-linux 1.6" "Linux Programmer's Manual" -.SH NOME -login \- accede al sistema -.SH SINTASSI -.BR "login [ " nome " ]" -.br -.B "login \-p" -.br -.BR "login \-h " nome_host -.br -.BR "login \-f " nome -.SH DESCRIZIONE -.B login -viene utilizzato quando si accede a un sistema. Pu -anche venire usato per passare da un utente a un altro in qualunque momento -(le shell pi recenti tuttavia hanno un supporto incorporato per questa -caratteristica). - -Se non sono forniti argomenti, -.B login -chiede il nome dell'utente. - -Se l'utente -.I non - root, e se esiste -.IR /etc/nologin , -vengono stampati sullo schermo i contenuti di questo file e viene -terminata l'operazione. -Ci viene usato, tipicamente, per impedire collegamenti quando il sistema -sta per essere spento. - -Se per l'utente sono specificate particolari restrizioni di accesso in -.IR /etc/usertty , -esse devono venire rispettate, altrimenti il tentativo di collegamento -ricever un diniego e verr generato un messaggio di -.BR syslog . -Si veda la sezione sulle "Restrizioni Speciali sull'Accesso". - -Se l'utente root, allora il collegamento deve avvenire da una tty -elencata in -.IR /etc/securetty . -I fallimenti saranno registrati dai servizi di -.BR syslog . - -Dopo la verifica di queste condizioni, verr richiesta e controllata -la password (se necessaria per quell'utente). Sono consentiti dieci -tentativi prima che -.B login -termini, tuttavia dopo i primi tre, la risposta comincer a diventare -molto lenta. -I collegamenti falliti vengono riferiti dai servizi di -.BR syslog . -Questi servizi sono inoltre usati per riferire qualsiasi collegamento -riuscito di root. - -Se esiste il file -.IR .hushlogin , -allora verr eseguito un collegamento "silenzioso" (disabilitando il -controllo della posta, la stampa dell'orario dell'ultimo collegamento -e del messaggio del giorno). Altrimenti, se esiste -.IR /var/log/lastlog , -viene stampata la data e ora dell'ultimo collegamento (e viene registrato -il collegamento in atto). - -Sono eseguiti compiti amministrativi vari, come impostare lo UID e il GID -della tty. Viene conservata la variabile d'ambiente TERM, se esiste (le altre -variabili d'ambiente vengono conservate se si usa l'opzione -.BR \-p ). -Quindi vengono impostate le variabili d'ambiente HOME, PATH, SHELL, TERM, -MAIL e LOGNAME. PATH viene predefinito come -.I /usr/local/bin:/bin:/usr/bin:. -per gli utenti normali e come -.I /sbin:/bin:/usr/sbin:/usr/bin -per root. Infine, se non si tratta di un collegamento "silenzioso", viene -stampato il messaggio del giorno, viene controllato il file col nome -dell'utente in -.IR /usr/spool/mail , -e stampato un messaggio se esso ha lunghezza non-zero. - -Viene poi lanciata la shell dell'utente. Se non specificata nessuna -shell per l'utente in -.BR /etc/passwd , -allora viene usata -.BR /bin/sh . -Se non sono specificate directory in -.IR /etc/passwd , -allora viene usata -.I / -(la directory home viene controllata dal file -.I .hushlogin -descritto sopra). -.SH OPZIONI -.TP -.B \-p -Usata da -.BR getty (8) -per dire a -.B login -di non distruggere l'ambiente. -.TP -.B \-f -Usata per saltare la seconda autentifica di collegamento. Ci, -specificamente, -.B non -funziona per root, e non sembra funzionare bene sotto Linux. -.TP -.B \-h -Usata da altri server (per esempio, -.BR telnetd (8)) -per passare il nome dell'host remoto a -.B login -onde poterlo collocare in utmp e wtmp. Solo il superutente pu usare -quest'opzione. - - -.SH "RESTRIZIONI SPECIALI SULL'ACCESSO" -Il file -.I /etc/securetty -elenca il nome delle tty sulle quali pu collegarsi root. Su ogni linea deve -essere specificato un nome di dispositivo tty senza il prefisso /dev/. Se -il file non esiste, a root permesso di collegarsi da qualunque tty. - -.PP -Il file -.I /etc/usertty -specifica restrizioni di accesso ulteriori per specifici utenti. Se questo -file non esiste, non viene imposta alcuna ulteriore restrizione d'accesso. -Il file consiste di una sequenza di sezioni. Ci sono tre possibili tipi di -sezione: CLASSES, GROUPS e USERS. Una sezione CLASSES definisce la classe di -tty consentiti e i modelli di hostname, una sezione GROUPS definisce tty e -host consentiti in base al gruppo, una sezione USERS definisce tty e host -consentiti in base all'utente. -.PP -Ogni riga di questo file pu avere una lunghezza massima di 255 caratteri. I -commenti iniziano con un carattere # e si estendono fino al termine della -riga. -.PP -.SS "La sezione CLASSES" -Una sezione CLASSES incomincia con la parola CLASSES, all'inizio della riga -e tutta in maiuscole. Ognuna delle righe che seguono, fino -all'inizio di una nuova sezione o alla fine del file, consistono in una -sequenza di parole separate da tabulazioni o spazi. Ogni riga definisce -una classe di tty e modelli di host. -.PP -La parola all'inizio di una riga viene definita come un nome collettivo -per le tty e i modelli di host specificati nel resto della riga. Questo -nome collettivo pu essere usato in ogni sezione successiva GROUPS o -USERS. Nessuno di tali nomi di classi deve essere parte della definizione -di una classe, per evitare problemi con classi ricorsive. -.PP -Un esempio di sezione CLASSES: -.PP -.nf -.in +.5 -CLASSES -mia_classe1 tty1 tty2 -mia_classe2 tty3 @.foo.com -.in -.5 -.fi -.PP -Ci definisce le classi -.I mia_classe1 -e -.I mia_classe2 -corrispondenti a quello che hanno a destra. -.PP - -.SS "La sezione GROUPS" -Una sezione GROUPS definisce i tipi consentiti di tty e host in base al -gruppo Unix. Se un utente membro di un gruppo Unix in accordo a -.I /etc/passwd -e -.I /etc/group -e tale gruppo menzionato in una sezione GROUPS in -.I /etc/usertty -allora l'utente ha il permesso di accesso se lo ha il gruppo. -.PP -Una sezione GROUPS incomincia con la parola GROUPS, tutta in maiuscole, -all'inizio di una riga, ogni riga seguente una sequenza di parole -separate da spazi o tabulazioni. La prima parola di una riga il nome -del gruppo e il resto delle parole sulla riga specificano le tty e gli host -dai quali consentito accesso ai membri di quel gruppo. Queste -specificazioni possono comportare l'uso di classi definite nelle precedenti -sezioni CLASSES. -.PP -Esempio di una sezione GROUPS: -.PP -.nf -.in +0.5 -GROUPS -sys tty1 @.bar.edu -stud mia_classe1 tty4 -.in -0.5 -.fi -.PP -Questo esempio specifica che i membri del gruppo -.I sys -possono collegarsi da tty1 e da host nel dominio bar.edu. Gli utenti nel -gruppo -.I stud -possono collegarsi dagli host/tty specificati nella classe mia_classe1 o -da tty4. -.PP - -.SS "La sezione USERS" -Una sezione USERS comincia con la parola USERS tutta in maiuscolo all'inizio -di una riga, e ogni riga successiva una sequenza di parole separate da -spazi o tabulazioni. La prima parola in una riga un nome di utente e a -quell'utente permesso di collegarsi dai tty e dagli host menzionati nel -resto della riga. Queste specificazioni possono comportare classi definite -in precedenti sezioni CLASSES. Se non viene specificata alcuna intestazione -all'inizio del file, la prima sezione predefinita come sezione USERS. -.PP -Esempio di una sezione USERS: -.PP -.nf -.in +0.5 -USERS -zacho tty1 @130.225.16.0/255.255.255.0 -blue tty3 mia_classe2 -.in -0.5 -.fi -.PP -Ci consente all'utente zacho di collegarsi solo sul tty1 e dagli host con -indirizzi IP nell'intervallo 130.225.16.0 \- 130.225.16.255, e all'utente -blue consente di collegarsi dal tty3 e da qualunque cosa sia stato -specificato in mia_classe2. -.PP -Ci pu essere una riga nella sezione USERS che comincia con un nome di -utente di *. Questa una regola predefinita e verr applicata a -qualsiasi utente che non corrisponda ad alcuna altra riga. -.PP -Se un utente corrisponde sia a una riga USERS sia a una riga GROUPS -allora all'utente consentito l'accesso risultante dall'unione di tutti i -tty/host menzionati in tali specificazioni. - -.SS Origini -Le specifiche di tty e i modelli di host usate nella specificazione degli -accessi di classi, gruppi e utenti si chiamano origini. Una stringa origine -pu avere uno dei seguenti formati: -.IP o -Il nome di un dispositivo tty senza il prefisso /dev/, per esempio tty1 o -ttyS0. -.PP -.IP o -La stringa @localhost, che significa che all'utente permesso di fare -telnet/rlogin dall'host locale allo stesso host. Questo consente inoltre -all'utente, per esempio, di eseguire il comando: xterm -e /bin/login. -.PP -.IP o -Il suffisso di un nome di dominio come @.some.dom, che significa che -l'utente pu fare rlogin/telnet da qualsiasi host il cui nome di dominio -abbia il suffisso -.some.dom. -.PP -.IP o -Un intervallo di indirizzi IPv4 , scritto @x.x.x.x/y.y.y.y dove x.x.x.x - l'indirizzo IP nella consueta notazione decimale puntata, e -y.y.y.y una bitmask nella stessa notazione che specifica quali bit -nell'indirizzo devono essere confrontati con l'indirizzo IP dell'host remoto. -Per esempio, @130.225.16.0/255.255.254.0 vuol dire che l'utente pu fare -rlogin/telnet da qualsiasi host il cui indirizzo IP sia nell'intervallo -130.225.16.0 \- 130.225.17.255. -.PP -Qualunque delle suddette origini pu essere prefissata da una -specificazione di tempo secondo la sintassi: -.PP -.nf -spec_ora ::= '[' [':' ]* ']' -giorno ::= 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun' -ora ::= '0' | '1' | ... | '23' -spec_ora ::= | '\-' -giorno-o-ora ::= | -.fi -.PP -Per esempio, l'origine [mon:tue:wed:thu:fri:8\-17]tty3 significa che il -collegamento consentito dal luned al venerd fra le 8:00 e le 17:59 -(5:59 p.m.) dalla tty3. Questo mostra anche che un intervallo di ore a\-b -include tutti gli istanti fra a:00 e b:59. La specificazione di una singola -ora (come 10) significa l'intervallo di tempo fra le 10:00 e le 10:59. -.PP -La mancata specificazione di qualsiasi prefisso di tempo per una tty o host -significa che il collegamento da quella origine permesso in qualunque -momento. Se dato un prefisso di tempo, ci si accerti di specificare sia un -insieme di giorni sia una una o pi ore o intervalli di ore. Una -specificazione di ore non pu comprendere nessuno spazio bianco. -.PP -Se non data alcuna regola predefinita allora gli utenti che non -corrispondano ad alcuna riga di -.I /etc/usertty -possono collegarsi da qualunque posto, come il comportamento standard. -.PP -.SH FILE -.nf -.I /var/run/utmp -.I /var/log/wtmp -.I /var/log/lastlog -.I /usr/spool/mail/* -.I /etc/motd -.I /etc/passwd -.I /etc/nologin -.I /etc/usertty -.I .hushlogin -.fi -.SH "VEDERE ANCHE" -.BR init (8), -.BR getty (8), -.BR mail (1), -.BR passwd (1), -.BR passwd (5), -.BR environ (7), -.BR shutdown (8) -.SH BACHI - -Linux, a differenza di altri sistemi operativi draconiani, non controlla le -quote di spazio. - -Non supportata l'opzione non documentata del BSD -.BR \-r . -Ci potrebbe essere richiesto da alcuni programmi di -.BR rlogind (8) . - -.SH AUTORE -Derivato dal BSD login 5.40 (5/9/89) da Michael Glad (glad@daimi.dk) per HP-UX -.br -Portato a Linux 0.12: Peter Orbaek (poe@daimi.aau.dk) diff --git a/man/it/newgrp.1 b/man/it/newgrp.1 deleted file mode 100644 index c7396e0b..00000000 --- a/man/it/newgrp.1 +++ /dev/null @@ -1,34 +0,0 @@ -.\" $Id: newgrp.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Original author unknown. This man page is in the public domain. -.\" Modified Sat Oct 9 17:46:48 1993 by faith@cs.unc.edu -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" -.\" " for hilit19 -.TH NEWGRP 1 "9 ottobre 1993" "Linux 1.2" "Linux Programmer's Manual" -.SH NOME -newgrp \- logga in un nuovo gruppo -.SH SINTASSI -.BI "newgrp [ " gruppo " ]" -.SH DESCRIZIONE -.B Newgrp -cambia l'identificatico del gruppo (GID) del suo chiamante, in modo analogo a -.BR login (1). -La stessa persona rimane loggata, e non cambiata la directory corrente, -ma i calcoli sui permessi d'accesso ai file sono fatti rispetto a nuovo -group ID. -.LP -Se non specificato alcun gruppo, il GID posto pari al GID di login. -.LP -.SH FILE -.I /etc/group -.br -.I /etc/passwd - -.SH "VEDERE ANCHE" -.BR login "(1), " group (5) - -.SH AUTORE -All'inizio era Michael Haardt. Attualmente mantenuto da -Peter Orbaek (poe@daimi.aau.dk). diff --git a/man/it/passwd.1 b/man/it/passwd.1 deleted file mode 100644 index cf02ca50..00000000 --- a/man/it/passwd.1 +++ /dev/null @@ -1,57 +0,0 @@ -.\" $Id: passwd.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Copyright 1992 Rickard E. Faith (faith@cs.unc.edu) -.\" May be distributed under the GNU General Public License -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" -.\" " for hilit19 -.TH PASSWD 1 "22 giugno 1994" "Linux 1.2" "Linux Programmer's Manual" -.SH NOME -passwd \- cambia la password -.SH SINTASSI -.BR "passwd [ " utente " [ " password " ] ]" -.SH DESCRIZIONE -Senza alcun argomento -.B passwd -cambier la password per l'attuale utente. Per prima cosa all'utente chiesta -la vecchia password, dopo di che, per evitare errori di battitura, va immessa -per due volte la nuova password. La nuova password deve essere lunga almeno -sei caratteri ed essere composta sia da maiuscole che da minuscole o da -caratteri non alfabetici. La nuova password non deve essere uguale alla -vecchia password, e non deve coincidere con il nome dell'utente. - -Le forme a uno e due argomenti possono essere usate solo dal superuser. Usando -la forma ad un argomento, il superuser pu cambiare la password per -quell'utente. Al superuser non chiesta la vecchia password, e non sono -applicate le regole per le password valide, poich il superuser potrebbe -avere valide ragioni per scegliere una password che non ne sia conforme. - -La forma a due argomenti assegna ad -.I utente -la password passata come secondo argomento. Ci pu essere utile quando -si deve assegnare a molti utenti una password iniziale. - -Passando una stringa vuota come secondo argomento si cancella la password -dell'utente. - -.SH FILE -.I /etc/passwd -.br -.I /etc/shells -.SH "VEDERE ANCHE" -.BR chsh (1), -.BR chfn (1) -.SH BACHI -Sono permesse password composte solo da numeri. -.br -Non viene prodotto nessun messaggio d'avviso se il superuser sceglie una -password ``scadente''. -.br -Le opzioni -.B \-f -e -.B \-s -non sono supportare. -.SH AUTORE -Peter Orbaek (poe@daimi.aau.dk) diff --git a/man/it/passwd.5 b/man/it/passwd.5 deleted file mode 100644 index b97aa538..00000000 --- a/man/it/passwd.5 +++ /dev/null @@ -1,136 +0,0 @@ -.\" $Id: passwd.5,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Copyright (c) 1993 Michael Haardt (u31b3hs@pool.informatik.rwth-aachen.de) -.\" Fri Apr 2 11:32:09 MET DST 1993 -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.\" -.\" Modified Sun Jul 25 10:46:28 1993 by Rik Faith (faith@cs.unc.edu) -.\" Modified Sun Aug 21 18:12:27 1994 by Rik Faith (faith@cs.unc.edu) -.\" Modified Sun Jun 18 01:53:57 1995 by Andries Brouwer (aeb@cwi.nl) -.\" Modified Mon Jan 5 20:24:40 MET 1998 by Michael Haardt -.\" (michael@cantor.informatik.rwth-aachen.de) -.TH PASSWD 5 "5 gennaio 1988" "Linux" "Linux Programmer's Manual" -.SH NOME -passwd \- file delle password -.SH DESCRIZIONE -.B Passwd - un file di testo che contiene un elenco degli account sul sistema, e -per ciascuno di questi riporta alcune informazioni utili come user ID, -group ID, home directory, ecc. Spesso contiene anche le password -criptate di ciascun account. Il file delle password dovrebbe avere -permessi di lettura per tutti (molte utility, come -.BR ls (1), -ne fanno uso per associare lo user ID allo user name), ma permesso di -scrittura solo per il superuser. -.PP -Nei buoni tempi andati, il permesso di lettura per tutti non era un -grosso problema: chiunque poteva leggere le password criptate, ma i -calcolatori erano troppo lenti per decifrare una password scelta -bene. Soprattutto, si supponeva di lavorare fra amici. Oggigiorno, -molti usano una qualche versione di shadow password (chiavi ombra), in -cui -.I /etc/passwd -contiene degli * al posto delle password criptate, che a loro volta -sono nel file \fI/etc/shadow\fP, che solo il superuser pu leggere. -.PP -Sia che si utilizzino o meno le shadow password, molti amministratori di -sistema usano un asterisco nel campo della password per far s che un -utente non possa autenticarsi con una password (vedi le note pi -sotto). -.PP -Se si crea una nuova login, si metta un asterisco nel campo della -password, e poi si usi il programma -.BR passwd (1) -per riempirlo. -.PP -C' una voce per riga, ed ogni riga ha il formato: -.sp -.RS -account:passwd:UID:GID:GECOS:directory:shell -.RE -.sp -Il significato dei campi il seguente: -.sp -.RS -.TP 1.0in -.I account -il nome dell'utente nel sistema. Non dovrebbe contenere maiuscole. -.TP -.I password -la password criptata o un asterisco. -.TP -.I UID -l'identificativo numerico dell'utente (UID = User IDentifier). -.TP -.I GID -l'identificativo numerico del gruppo principale per l'utente (GID = -Group IDentifier). -.TP -.I GECOS -Questo campo opzionale e viene usato solo per fornire -informazioni. Di solito contiene il nome per esteso dell'utente. GECOS -sta per General Electric Comprehensive Operating System, (sistema -operativo comprensivo della General Electric), ribattezzato GCOS -quando la divisione grandi sistemi della GE fu venduta alla -Honeywell. Dennis Ritchie rifer: 隹 volte dovevamo spedire una stampa -o un gruppo di lavori alla macchina GCOS. Il campo del gcos nel file -delle password era un posto in cui sbattere le informazioni per la -$IDENTcard. Per niente elegante. -.TP -.I directory -la $HOME directory dell'utente. -.TP -.I shell -il programma lanciato al login (se vuoto, viene usato -.BR /bin/sh ). -Se punta ad un programma che non esiste, l'utente non potr avere -accesso tramite -.BR login (1). -.RE -.SH NOTE -Se si vuole creare un gruppo di utenti, il loro GID deve -essere uguale e ci deve essere una voce nel file \fI/etc/group\fP, o il -gruppo non esister. -.PP -Se la password criptata un asterisco, l'utente non potr fare login -tramite -.BR login (1). -ma potr ugualmente accedere al suo account usando -.BR rlogin (1), -far girare processi esistenti o iniziarne nuovi con -.BR rsh (1), -.BR cron (1), -.BR at (1) -o filtri per la posta, ecc. Bloccare un account semplicemente -modificando il campo della shell ha lo stesso effetto e in pi -permette l'uso di -.BR su (1). -.SH FILE -.I /etc/passwd -.SH "VEDERE ANCHE" -.BR passwd (1), -.BR login (1), -.BR su (1), -.BR group (5), -.BR shadow (5) diff --git a/man/it/pwconv.8 b/man/it/pwconv.8 deleted file mode 100644 index a8edb920..00000000 --- a/man/it/pwconv.8 +++ /dev/null @@ -1,58 +0,0 @@ -.\" $Id: pwconv.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Traduzione in italiano di Isabella Ruocco -.\" Giugno 1999 -.TH PWCONV 8 "26 sep 1997" -.SH NOME -pwconv, pwunconv, grpconv, grpunconv \- convertono a e da password e gruppi shadow. -.SH SINTASSI -.B pwconv -.br -.B pwunconv -.br -.B grpconv -.br -.B grpunconv -.SH DESCRIPTION -Questi quattro programmi agiscono tutti sui file normali e e oscurati (shadow) -delle password e dei gruppi: -.IR /etc/passwd ", " /etc/group ", " /etc/shadow ", e " /etc/gshadow . - -.B pwconv -.RI "crea " shadow " da " passwd " e, in modo opzionale, da un preesistente " shadow . -.B pwunconv -.RI "crea " passwd " da " passwd " e " shadow " e quindi rimuove " shadow . -.B grpconv -.RI "crea " gshadow " da " group " e, in modo opzionale, da un preesistente " gshadow . -.B grpunconv -.RI "crea " group " da " group " e " gshadow " e quindi rimuove " gshadow . - -Ciascun programma, prima della conversione, acquisisce i lock necessari. - -.BR pwconv " e " grpconv -sono simili. Per prima cosa vengono rimosse le voci nel file oscurato che non esistono -nel file principale. Quindi vengono aggiornate le voci oscurate che -non hanno `x' come password nel file principale. Vengono aggiunte le eventuali voci -oscurate mancanti. Infine, le password nel file principale vengono -sostituite con `x'. Questi programmi possono essere usati per le conversioni iniziali -cos come per aggiornare il file oscurato se il file principale viene editato -a mano. - -.B pwconv -user i valori di -.BR PASS_MIN_GIORNI ", " PASS_MAX_GIORNI ", e " PASS_GIORNI_PREAVVISO -da -.I /etc/login.defs -quando si aggiungono nuove voci a -.IR /etc/shadow . - -.RB "Analogamente, " pwunconv " e " grpunconv -sono simili. Le password nel file principale vengono aggiornate -dal file oscurato. Voci che esistono nel file principale ma non -nel file oscurato vengono lasciate stare. Infine, viene rimosso il file oscurato. - -Alcune informazioni sull'invecchiamento delle password vengono perse da -.BR pwunconv . -Questo convertir quello che potr. -.SH "VEDERE ANCHE" -.BR login.defs (5), -.BR shadowconfig (8) diff --git a/man/it/pwunconv.8 b/man/it/pwunconv.8 deleted file mode 100644 index 6eed9e8b..00000000 --- a/man/it/pwunconv.8 +++ /dev/null @@ -1 +0,0 @@ -.so man8/pwconv.8 diff --git a/man/it/shadow.5 b/man/it/shadow.5 deleted file mode 100644 index 45d229fe..00000000 --- a/man/it/shadow.5 +++ /dev/null @@ -1,102 +0,0 @@ -.\" Copyright 1989 - 1990, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: shadow.5,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" Traduzione in italiano di Isabella Ruocco -.\" Giugno 1999 -.\" -.TH SHADOW 5 -.SH NOME -shadow \- file crittato delle password -.SH DESCRIZIONE -.I shadow -contiene le informazioni sulle password crittate per gli account degli utenti -e, opzionalmente, informazioni sull'invecchiamento delle password. -E' incluso -.IP "" .5i -Nome di login -.IP "" .5i -Password crittata -.IP "" .5i -Giorni a partire dal 1 gennaio 1970 in cui la password stata cambiata l'ultima volta -.IP "" .5i -Giorni prima che la password possa essere modificata -.IP "" .5i -Giorni dopo i quali la password deve essere modificata -.IP "" .5i -Giorni prima della scadenza della password in cui l'utente viene avvertito -.IP "" .5i -Giorni dopo la scadenza della password in cui l'account viene disabilitato -.IP "" .5i -Giorni a partire dal 1 gennaio 1970 dopo i quali l'account viene disabilitato -.IP "" .5i -Campo riservato -.PP -Il campo password deve essere riempito. -La password crittata composta da un numero compreso tra 13 e 24 di caratteri dei -64 caratteri alfabetici -da a fino a z, da A a Z, da 0 a 9, \. e /. -Fate riferimento a \fBcrypt\fR(3) per dettagli riguardanti il modo in cui questa stringa -viene interpretata. -.PP -La data dell'ultima modifica della password specificata come il numero -di giorni dal 1 gennaio 1970. -La passowrd non pu essere modifcata nuovamente prima che sia passato -il numero di giorni previsto, e deve essere cambiata dopo il massimo numero -di giorni. -Se il minimo numero di giorni richiesto superiore del -massimo numero di giorni permesso, questa password non potr -essere modificata dall'utente. -.PP -Un account viene considerato inattivo e viene disabilitato se -la password non viene modificata entro il numero di giorni specificato -dopo la scadenza della password. -Un account sar anche disabilitato il giorno specificato -senza tener conto di altre informazioni sulla scadenza della password. -.PP -Questa informazione ha la precedenza nei confronti di qualunque informazione sulla password o sulla scadenza della password -presente in \fI/etc/passwd\fR. -.PP -Questo file non deve essere leggibile dagli utenti normali se si vuole mantenere -la sicurezza sulle password. -.SH FILE -/etc/passwd \- informazioni sull'account dell'utente -.br -/etc/shadow \- password crittate degli utenti -.SH VEDERE ANCHE -.BR chage (1), -.BR login (1), -.BR passwd (1), -.BR su (1), -.BR sulogin (8), -.BR shadow (3), -.BR passwd (5), -.BR pwconv (8), -.BR pwunconv (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/useradd.8 b/man/it/useradd.8 deleted file mode 100644 index f854cfe4..00000000 --- a/man/it/useradd.8 +++ /dev/null @@ -1,197 +0,0 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: useradd.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH USERADD 8 -.SH NOME -useradd \- Crea un nuovo utente o aggiorna le informazioni predefinite per -i nuovi utenti -.SH SINTASSI -.TP 8 -.B useradd -.\" .RB [ -A -.\" .RI { metodo | \fBPREDEFINITO\fR "},... ]" -.RB [ -c -.IR commento ] -.RB [ -d -.IR home_dir ] -.br -.RB [ -e -.IR data_scadenza ] -.RB [ -f -.IR tempo_inattivit ] -.br -.RB [ -g -.IR gruppo_iniziale ] -.RB [ -G -.IR gruppo [,...]] -.br -.RB [ -m " [" -k -.IR dir_scheletro ]] -.RB [ -s -.IR shell ] -.br -.RB [ -u -.IR uid " [" -.BR -o ]] -.I login -.TP 8 -.B useradd -\fB-D\fR -[\fB-g\fI gruppo_predefinito\fR] -[\fB-b\fI home_predefinita\fR] -.br -[\fB-f\fI inattivit趌predefinita\fR] -[\fB-e\fI data_scadenza_predefinita\fR] -.br -[\fB-s\fI shell_predefinita\fR] -.SH DESCRIZIONE -.SS Creare Nuovi Utenti -Quando viene invocato senza l'opzione \fB-D\fR, il comando \fBuseradd\fR -crea un nuovo account di utente usando i valori specificati sulla linea di -comando ed i valori predefiniti dal sistema. -Il nuovo account di utente verr aggiunto ai file di sistema che lo necessitano, -verr creata la home directory, e l verranno copiati i file iniziali, a seconda -delle opzioni sulla linea di comando. -Le opzioni che si applicano al comando \fBuseradd\fR sono -.\" .IP "\fB-A {\fImetodo\fR|\fBPREDEFINITO\fR},..." -.\" Il valore del metodo di autenticazione dell'utente. -.\" Il metodo di autenticazione il nome di un programma che responsabile -.\" della validazione dell'identit dell'utente. -.\" La stringa \fBPREDEFINITO\fR pu essere usata per cambiare il metodo di -.\" autenticazione dell'utente con il metodo standard di sistema delle -.\" password. -.\" Questa una lista di nomi di programmi separati da virgole. -.\" Pu includere \fBPREDEFINITO\fR esattamente una volta. -.IP "\fB-c \fIcommento\fR" -Il campo commento del nuovo utente nel file password. -.IP "\fB-d \fIhome_dir\fR" -Il nuovo utente verr creato usando \fIhome_dir\fR come valore per la -directory di login dell'utente. -Il comportamento predefinito di appendere il nome \fIlogin\fR a -\fIhome_predefinita\fR ed usare quella come nome di directory di login. -.IP "\fB-e \fIdata_scadenza\fR" -La data in cui verr disabilitato l'account dell'utente. -La data specificata nel formato \fIMM/GG/AA\fR. -.IP "\fB-f \fIgiorni_inattivit赨fR" -Il numero di giorni dopo la scadenza della password fino a quando l'account -verr permanentemente disabilitato. -Un valore pari a 0 disabilita l'account non appena scaduta la password, -ed un valore pari a -1 disabilita questa caratteristica. -Il valore predefinito -1. -.IP "\fB-g \fIgruppo_iniziale\fR" -IL nome o numero del gruppo iniziale di login dell'utente. -Il nome del gruppo deve esistere. Un numero di gruppo deve fare riferimento -ad un gruppo gi esistente. -Il numero di gruppo predefinito 1. -.IP "\fB-G \fIgruppo,[...]\fR" -Una lista di gruppi supplementari di cui l'utente altres membro. -Ciascun gruppo separato dal successivo da una virgola, senza spazi -bianchi intermedi. -I gruppi sono soggetti alle stesse restrizioni del gruppo dato con -l'opzione \fB-g\fR. -Il comportamento predefinito che l'utente appartenga solo al gruppo -iniziale. -.IP \fB-m\fR -La home directory dell'utente verr creata se non esiste. -I file contenuti in \fIdir_scheletro\fR saranno copiati nella home directory -se viene usata l'opzione \fB-k\fR, altrimenti verranno usati i file -contenuti in \fI/etc/skel\fR. -Anche tutte le directory contenute in \fIdir_scheletro\fR o \fI/etc/skel\fR -verranno create nella home directory dell'utente. -L'opzione \fB-k\fR valida solo in congiunzione con l'opzione \fB-m\fR. -Il comportamento predefinito di non creare la directory e di non copiarvi -alcun file. -.IP "\fB-s \fIshell\fR" -Il nome della shell di login dell'utente. -Il comportamento predefinito di lasciare vuoto questo campo, che fa s che -il sistema selezioni la shell di connessione predefinita. -.IP "\fB-u \fIuid\fR" -Il valore numerico dell'ID dell'utente. -Questo valore deve essere univoco, a meno che non venga usata l'opzione -\fI-o\fR. -Il valore deve essere non-negativo. -Il comportamento predefinito di usare il minimo valore di ID superiore a 99 -e superiore a quello di ogni altro utente. -Valori tra 0 e 99 sono tipicamente riservati per account di sistema. -.SS Cambiare i valori predefiniti -Quando invocato con l'opzione \fB-D\fR, \fBuseradd\fR o mostrer i valori -predefiniti correnti, oppure aggiorner i valori predefiniti dalla linea -di comando. -Le opzioni valide sono -.IP "\fB-b \fIhome_predefinita\fR" -Il prefisso del percorso per la home directory del nuovo utente. -Il nome dell'utente verr aggiunto alla fine di \fIhome_predefinita\fR -per creare il nome della nuova directory se non viene usata l'opzione \fB-d\fI -quando si crea un nuovo account. -.IP "\fB-e \fIdata_scadenza_predefinita\fR" -La data in cui l'account dell'utente verr disabilitato. -.IP "\fB-f \fIinattivit趌predefinita\fR" -Il numero di giorni dopo la scadenza di una password prima che l'account -venga disabilitato. -.IP "\fB-g \fIgruppo_predefinito\fR" -Il nome o ID del gruppo iniziale per un nuovo utente. -Il gruppo nominato deve esistere, ed un ID numerico di gruppo deve avere una -voce esistente. -.IP "\fB-s \fIshell_predifinita\fR" -Il nome della shell di login per un nuovo utente. -Il programma nominato verr usato per tutti gli account dei futuri nuovi -utenti. -.PP -Se non specificata alcuna opzione, \fBuseradd\fR mostra i valori predefiniti -correnti. -.SH NOTE -L'amministratore di sistema responsabile del posizionamento dei file -predefiniti degli utenti nella directory \fI/etc/skel\fR. -.SH CAVEAT -Non possibile aggiungere un utente ad un gruppo NIS. -Questo deve essere fatto sul server NIS. -.SH FILE -/etc/passwd \- informazioni sugli account di utenti -.br -/etc/shadow \- informazioni sicure sugli account di utenti -.br -/etc/group \- informazioni sui gruppi -.br -/etc/default/useradd \- informazioni predefinite -.br -/etc/skel \- directory contenente i file predefiniti -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR passwd (1), -.BR userdel (8), -.BR usermod (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/usermod.8 b/man/it/usermod.8 deleted file mode 100644 index 8315da07..00000000 --- a/man/it/usermod.8 +++ /dev/null @@ -1,151 +0,0 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: usermod.8,v 1.1 2002/03/10 07:41:07 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH USERMOD 8 -.SH NOME -usermod \- Modifica l'account di un utente -.SH SINTASSI -.TP 8 -.B usermod -.\" .RB [ -A -.\" .RI { metodo | \fBPREDEFINITO\fR "},... ]" -.RB [ -c -.IR commento ] -.RB [ -d -.IR home_dir " [" -.BR -m ]] -.br -.RB [ -e -.IR data_scadenza ] -.RB [ -f -.IR tempo_inattivit ] -.br -.RB [ -g -.IR gruppo_iniziale ] -.RB [ -G -.IR gruppo [,...]] -.br -.RB [ -l -.IR nome_login ] -.RB [ -s -.IR shell ] -.br -.RB [ -u -.IR uid " [" -.BR -o ]] -.I login -.SH DESCRIZIONE -Il comando \fBusermod\fR modifica i file di account di sistema in modo da -riflettere le modifiche specificate sulla linea di comando. -Le opzioni che si applicano al comando \fBusermod\fR sono -.\" .IP "\fB-A \fImetodo\fR|\fBPREDEFINITO\fR" -.\" Il nuovo valore del metodo di autenticazione dell'utente. -.\" Il metodo di autenticazione il nome di un programma che responsabile -.\" della validazione dell'identit dell'utente. -.\" La stringa \fBPREDEFINITO\fR pu essere usata per cambiare il metodo di -.\" autenticazione dell'utente con il metodo standard di sistema delle -.\" password. -.IP "\fB-c \fIcommento\fR" -Il campo commento del nuovo utente nel file password. -Normalmente viene modificato usando l'utilit \fBchfn\fR(1). -.IP "\fB-d \fIhome_dir\fR" -La nuova directory di login dell'utente. -Se data l'opzione \fB-m\fR il contenuto della home directory corrente -sar spostato nella nuova home directory, che viene creata se non esiste gi. -.IP "\fB-e \fIdata_scadenza\fR" -La data in cui l'account dell'utente verr disabilitato. -La data specificata nel formato \fIMM/GG/AA\fR. -.IP "\fB-f \fIgiorni_inattivit赨fR" -Il numero di giorni dopo la scadenza di una password prima che l'account -venga permanentemente disabilitato. -Un valore pari a 0 disabilita l'account non appena la password scaduta, -ed un valore pari a -1 disabilita la caratteristica. -Il valore predefinito -1. -.IP "\fB-g \fIgruppo_iniziale\fR" -Il nuome o numero del nuovo gruppo di connessione dell'utente. -Il nome del gruppo deve esistere. Un numero di gruppo deve riferirsi ad un -gruppo gi esistente. -Il numero di gruppo predefinito 1. -.IP "\fB-G \fIgruppo,[...]\fR" -Una lista di gruppi supplementari di cui l'utente altres membro. -Ciascun gruppo separato dal successivo da una virgola, senza spazi bianchi -intermedi. -I gruppi sono soggetti alle stesse restrizioni del gruppo dato con l'opzione -\fB-g\fR. -Se l'utente attualmente membro di un gruppo che non elencato, l'utente -verr rimosso dal gruppo. -.IP "\fB-l \fInome_login\fR" -Il nome dell'utente verr cambiato da \fIlogin\fR a \fInome_login\fR. -Niente altro viene cambiato. -In particolare, la home directory dell'utente dovrebbe probabilmente -essere modificata in modo da riflettere il nuovo nome di login. -.IP "\fB-s \fIshell\fR" -Il nome della nuova shell di login dell'utente. -Lasciando questo campo vuoto si fa in modo che il sistema selezioni la shell -di connessione predefinita. -.IP "\fB-u \fIuid\fR" -Il valore numerico dell'ID dell'utente. -Questo valore deve essere univoco, a meno che non venga usata l'opzione -\fI-o\fR. -Questo valore deve essere non-negativo. -Valori tra 0 e 99 sono tipicamente riservati ad account di sistema. -Tutti i file che l'utente possiede e che sono posiszionati nell'albero di -directory avente come radice la home directory dell'utente avranno l'ID utente del -file cambiato automaticamente. -I file fuori della home directory dell'utente devono essere modificati -manualmente. -.SH CAVEAT -\fBusermod\fR non permetter di modificare il nome di un utente che -attualmente connesso. -Occorre essere certi che l'utente nominato non sta eseguendo alcun processo -quando questo comando viene eseguito se l'ID numerico dell'utente sta per -essere cambiato. -Occorre cambiare il proprietario di ogni file crontab manualmente. -Occorre cambiare il proprietario di ogni job manualmente. -Occorre fare qualunque cambiamento che riguarda NIS sul server NIS. -.SH FILE -/etc/passwd \- informazioni sugli account di utenti -.br -/etc/shadow \- informazioni sicure sugli account di utenti -.br -/etc/group \- informazioni sui gruppi -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR passwd (1), -.BR useradd (8), -.BR userdel (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/vigr.8 b/man/it/vigr.8 deleted file mode 100644 index db77dbbf..00000000 --- a/man/it/vigr.8 +++ /dev/null @@ -1 +0,0 @@ -.so man8/wipw.8 diff --git a/man/it/vipw.8 b/man/it/vipw.8 deleted file mode 100644 index 8978019e..00000000 --- a/man/it/vipw.8 +++ /dev/null @@ -1,31 +0,0 @@ -.\" $Id: vipw.8,v 1.1 2002/03/10 07:41:07 kloczek Exp $ -.\" Traduzione in italiano di Isabella Ruocco -.\" Giugno 1999 -.TH VIPW 8 "26 sep 1997" -.SH NOME -vipw, vigr \- editano i file delle password, dei gruppi, delle password oscurate, o dei gruppi oscurati. -.SH SINTASSI -.BR vipw " [-s]" -.br -.BR vigr " [-s]" -.SH DESCRIZIONE -.BR vipw " e " vigr -editeranno i file -.IR /etc/passwd " ed " /etc/group ", rispettivamente." -Con l'opzione -.B -s -, editeranno la versione oscurata di quei file, -.IR /etc/shadow " ed " /etc/gshadow ", rispettivamente. -I programmi imposteranno i lock appropriati per evitare la corruzione dei file. - -Quando cercano un editor, i programmi prima proveranno -con la variabile d'ambiente -.BR VISUAL , -poi con la variabile d'ambiente -.BR EDITOR , -e infine con l'editor predefinito, -.BR vi . -.SH "VEDERE ANCHE" -.BR passwd (5), -.BR group (5), -.BR shadow (5) diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am index 4195e30b..7a61fe43 100644 --- a/man/ja/Makefile.am +++ b/man/ja/Makefile.am @@ -7,12 +7,14 @@ man_MANS = \ chfn.1 \ chpasswd.8 \ chsh.1 \ + expiry.1 \ faillog.5 \ faillog.8 \ gpasswd.1 \ groupadd.8 \ groupdel.8 \ groupmod.8 \ + groups.1 \ grpck.8 \ grpconv.8 \ grpunconv.8 \ @@ -42,11 +44,8 @@ man_MANS = \ vipw.8 EXTRA_DIST = $(man_MANS) \ - dpasswd.8 \ - groups.1 \ id.1 \ pw_auth.3 \ - pwauth.8 \ shadow.3 \ shadowconfig.8 \ sulogin.8 diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in index 86d66065..ca6941f5 100644 --- a/man/ja/Makefile.in +++ b/man/ja/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,100 +14,144 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ mandir = @mandir@/ja +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ man_MANS = \ adduser.8 \ @@ -114,12 +159,14 @@ man_MANS = \ chfn.1 \ chpasswd.8 \ chsh.1 \ + expiry.1 \ faillog.5 \ faillog.8 \ gpasswd.1 \ groupadd.8 \ groupdel.8 \ groupmod.8 \ + groups.1 \ grpck.8 \ grpconv.8 \ grpunconv.8 \ @@ -150,16 +197,14 @@ man_MANS = \ EXTRA_DIST = $(man_MANS) \ - dpasswd.8 \ - groups.1 \ id.1 \ pw_auth.3 \ - pwauth.8 \ shadow.3 \ shadowconfig.8 \ sulogin.8 subdir = man/ja +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -167,10 +212,15 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/ja/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -180,13 +230,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/ja/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: man1dir = $(mandir)/man1 @@ -204,6 +247,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -221,6 +268,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -243,6 +294,10 @@ install-man5: $(man5_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -260,6 +315,10 @@ uninstall-man5: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -282,6 +341,10 @@ install-man8: $(man8_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -299,6 +362,10 @@ uninstall-man8: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -308,6 +375,8 @@ uninstall-man8: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -315,15 +384,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -336,7 +416,6 @@ all-am: Makefile $(MANS) installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -348,6 +427,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -355,7 +435,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -365,7 +445,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -387,13 +467,21 @@ install-man: install-man1 install-man5 install-man8 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 @@ -405,9 +493,9 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 install-info-am install-man install-man1 install-man5 \ install-man8 install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-man5 uninstall-man8 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man5 uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/ja/chage.1 b/man/ja/chage.1 index a56f33a5..25038561 100644 --- a/man/ja/chage.1 +++ b/man/ja/chage.1 @@ -1,3 +1,4 @@ +.\"$Id: chage.1,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,16 +26,15 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: chage.1,v 1.2 2001/11/16 17:01:32 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" .TH CHAGE 1 .SH 抩蟆 -chage \- 交□扒由旦伐□玉及肣躲渝蜃及樹扷毛庍凳允月﹝ +chage \- 交□扒由旦伐□玉及肣躲渝蜃樹扷毛庍凳允月﹝ .SH 踏摯 .TP 6 \fBchage\fR @@ -44,71 +44,77 @@ chage \- [\fB-E \fIexpiredate\fR] [\fB-W \fIwarndays\fR] \fIuser\fR .TP 6 \fBchage\fR -\fB-l\fR \fIuser\fR +\fB-l \fIuser\fR .SH 濩抸 -\fBchage\fR反﹜ -由旦伐□玉及瘉蔽凳蕙ゥ井日慼卞庍凳允屯五渝ゥ引匹及ゥ醒毛庍凳允月﹝ -扑旦氾丞反﹜仇及樹扷毛迕中化﹜交□扒互中勾由旦伐□玉毛庍凳允屯五井毛瑁爛允月﹝ -\fBchage\fR戊穴件玉及銀迕反﹜\fB-l\fR左皿扑亦件毛迕中月樺寧動陸反 -root交□扒及心卞孺蜃今木化中月﹝ -\fB-l\fR左皿扑亦件反﹜域怚獢憧隊狩封洶峊悒馴鵅憧夼穭洏╞咱戎韞 -及渝蜃互濠木月ゥ互中勾井毛襞月凶戶卞銀丹仇午互請侳月﹝ +\fBchage\fR 反﹜ +由旦伐□玉毛瘉詨卞凳蕙仄化井日﹜ +慼卞庍凳仄卅仃木壬卅日卅中渝ゥ引匹及ゥ醒毛庍凳允月﹝ +扑旦氾丞反仇及樹扷毛迕中化﹜ +交□扒互中勾由旦伐□玉毛庍凳仄卅仃木壬卅日卅中井毛瑁爛允月﹝ +\fBchage\fR 戊穴件玉毛銀尹月及反 root 交□扒及心卞蜃日木化中月﹝ +凶分仄域怚獢憧隊 \fB-l\fR 左皿扑亦件毛隙爛允木壬仇及戊穴件玉毛厙迕匹五﹜ +憤坌及由旦伐□玉引凶反失市它件玄互中勾濠木月井毛襞月仇午互匹五月﹝ .PP -\fB-m\fR左皿扑亦件毛隙爛仄凶樺寧﹜ -\fImindays\fR及襖反由旦伐□玉庍凳及棉及瘉斕ゥ醒卞卅月﹝ -仇及勂毛未伕午仄凶凜反﹜交□扒反中勾匹手由旦伐□玉毛庍凳匹五月﹝ +\fB-m\fR 左皿扑亦件毛隙爛仄凶樺寧﹜ +\fImindays\fR 及襖反由旦伐□玉庍凳及棉厥及瘉羶ゥ醒卞卅月﹝ +仇及白奴□伙玉毛未伕午仄凶凜反﹜交□扒反中勾匹手由旦伐□玉毛庍凳匹五月﹝ .PP -\fB-M\fR左皿扑亦件毛隙爛仄凶樺寧﹜ -\fImaxdays\fR及襖反由旦伐□玉互肣躲卅瘉贏ゥ醒午卅月﹝ -\fImaxdays\fR午\fIlastday\fR毛凶仄凶襖互蜇箕及ゥ尥方曰凝今中樺寧﹜ -交□扒互失市它件玄毛銀迕允月凶戶卞反由旦伐□玉毛庍凳仄卅仁化反 -卅日卅中﹝ -\fB-W\fR左皿扑亦件毛銀尹壬仇及渝ゥ互中勾侳月井互坌井月方丹卞允月仇午互匹五﹜ -公及樺寧反交□扒卞儀蟆卞煞屢互芨尹日木月﹝ +\fB-M\fR 左皿扑亦件毛隙爛允月午﹜ +\fImaxdays\fR 及襖反由旦伐□玉互肣躲卅瘉贏ゥ醒午卅月﹝ +\fImaxdays\fR 午 \fIlastday\fR 毛簫仄凶襖互蜇箕及ゥ尥方曰凝今中樺寧﹜ +交□扒反失市它件玄毛銀迕允月蟆卞由旦伐□玉毛庍凳仄卅仃木壬卅日卅中﹝ +\fB-W\fR 左皿扑亦件毛銀尹壬仇及渝ゥ互中勾侳月井互坌井月方丹卞匹五月﹝ +仇及樺寧反交□扒卞儀蟆卞煞屢互芨尹日木月﹝ .PP -\fB-d\fR左皿扑亦件毛迕中月樺寧﹜ -\fIlastday\fR及襖反1970ヵ1畸1ゥ井日由旦伐□玉瘉蔽凳蕙ゥ坶及ゥ醒卞卅月﹝ -ゥ醒反ヵヵヵヵ/畸畸/ゥゥ午中丹踏摯 (潦仄仁反丐卅凶及譁啗匹手勻午方仁迕中日木化 -中月踏摯)匹隙爛允月儀手匹五月﹝ +\fB-d\fR 左皿扑亦件毛迕中月午﹜ +由旦伐□玉及瘉蔽凳蕙ゥ毛澀爛匹五月﹝ +\fIlastday\fR 及襖反 +1970 ヵ 1 畸 1 ゥ井日由旦伐□玉瘉蔽凳蕙ゥ引匹及ゥ醒匹丐月﹝ +ゥ尥反 YYYY-MM-DD 午中丹踏摯 +(手仄仁反丐卅凶及譁啗匹手勻午方仁迕中日木化中月踏摯) +匹隙爛允月儀手匹五月﹝ .PP -\fB-E\fR左皿扑亦件反交□扒互失市它件玄卞瘉鍍失弁本旦匹五卅仁卅月 -ゥ尥毛澀爛允月及卞迕中日木月﹝ -\fIexpiredate\fR左皿扑亦件反1970ヵ1畸1ゥ井日失市它件玄互伕永弁 -今木月ゥ坶及ゥ醒匹丐月﹝ -ゥ醒反ヵヵヵヵ/畸畸/ゥゥ午中丹踏摯(潦仄仁反丐卅凶及譁啗匹手勻午方仁 -迕中日木化中月手及)匹隙爛允月仇午手請侳月﹝ -失市它件玄互伕永弁今木凶交□扒互瘋太公及扑旦氾丞毛銀丹凶戶卞反﹜ -扑旦氾丞棟咥樊卞戊件正弁玄毛潸日友壬卅日卅中﹝ +\fB-E\fR 左皿扑亦件反﹜ +公木動嫦交□扒互失市它件玄卞失弁本旦匹五卅仁卅月ゥ尥毛澀爛允月及卞迕中日木月﹝ +\fIexpiredate\fR 反 1970 ヵ 1 畸 1 ゥ井日 +失市它件玄互伕永弁今木月ゥ引匹及ゥ醒匹丐月﹝ +ゥ尥反 YYYY-MM-DD 午中丹踏摯 +(手仄仁反丐卅凶及譁啗匹手勻午方仁迕中日木化中月手及) +匹隙爛允月仇午手匹五月﹝ +失市它件玄毛伕永弁今木凶交□扒互瘋太公及扑旦氾丞毛銀丹卞反﹜ +扑旦氾丞棟咥樊午洘俀毛潸月优邰互丐月﹝ .PP -\fB-I\fR左皿扑亦件反由旦伐□玉及渝蜃互濠木化井日失市它件玄互伕永弁 -今木月坶及銀迕尕Хゥ醒毛澀爛允月凶戶卞迕中月﹝ -失市它件玄互伕永弁今木凶交□扒互瘋太公及扑旦氾丞毛銀丹凶戶卞反﹜ -扑旦氾丞棟咥樊卞戊件正弁玄毛潸日友壬卅日卅中﹝ -\fIinactive\fR左皿扑亦件反銀迕尕Х午卅月渝棉及ゥ醒匹丐月﹝ -0午允月午仇及窗Х毛躲井卅仁允月仇午互請侳月﹝ +\fB-I\fR 左皿扑亦件反﹜ +由旦伐□玉及渝蜃互濠木化井日失市它件玄互伕永弁今木月引匹及 +旵譆ゥ醒毛澀爛允月凶戶卞迕中月﹝ +失市它件玄毛伕永弁今木凶交□扒互瘋太公及扑旦氾丞毛銀丹凶戶卞反﹜ +扑旦氾丞棟咥樊卞洘俀仄卅仃木壬卅日卅中﹝ +\fIinactive\fR 反銀迕尕Х渝棉及ゥ醒匹丐月﹝ +0 卞允木壬仇及窗Х毛拑躲卞匹五月﹝ .PP -\fB-W\fR左皿扑亦件反﹜由旦伐□玉及庍凳互优邰午卅月蟆卞煞屢毛墊丹 -ゥ醒毛澀爛允月凶戶卞迕中月﹝ -\fIwarndays\fR左皿扑亦件反﹜由旦伐□玉及渝蜃濠木卞燮分勻化 +\fB-W\fR 左皿扑亦件反﹜ +由旦伐□玉及庍凳互优邰午卅月蟆卞煞屢毛墊丹渝棉及ゥ醒毛澀爛允月凶戶卞迕中月﹝ +\fIwarndays\fR 反﹜ +由旦伐□玉及渝蜃濠木卞燮分勻化﹜ 交□扒卞渝蜃互濠木井井勻化中月仇午毛煞屢允月ゥ醒匹丐月﹝ .PP -扑乓玉□由旦伐□玉白央奶伙互迕中日木月凜反﹜曉卞街仆凶襖反ゥ醒午仄化 -忡繡今木月互﹜伓賞及由旦伐□玉白央奶伙互迕中日木月凜卞反 -蔥及醒卞庍晶今木月﹝ -仇及庍晶互墊歹木月凶戶﹜殘戶及貲犒互戲元月仇午手丐月﹝ -.PP -曉卞街仆凶中內木及左皿扑亦件手隙爛仄卅井勻凶樺寧反﹜ -\fBchage\fR反覆狪讀卞が綜仄﹜蟈化及勂卞覆仄化﹜備★蜇箕及澀爛襖毛刓憎仄﹜ +中內木及左皿扑亦件手隙爛今木卅中午 +\fBchage\fR 反覆狪讀卞が綜允月﹝ +蟈化及白奴□伙玉卞覆仄化備★蜇箕及澀爛襖毛刓憎仄﹜ 蕙仄中襖及ェ恘毛瞼允﹝ -蕙仄中襖毛澀爛允月樺寧反公木毛ェ恘仄﹜蜇箕及襖毛銀丹卅日塢墊及引引 -伉正□件平□毛瓷六壬方中﹝ -蜇箕及襖反域覆及\fB[ ]\fR筏寞及棉卞刓憎今木月﹝ +蕙仄中襖毛澀爛允月樺寧反公木毛ェ恘仄﹜ +蜇箕及襖毛銀丹卅日塢墊及引引伉正□件平□毛瓷六壬方中﹝ +蜇箕及襖反 \fB[ ]\fR 及棉卞刓憎今木月﹝ +.SH 鏜啦 +\fBchage\fR 皿伕弘仿丞毛迕中月卞反 shadow 由旦伐□玉白央奶伙互优邰匹丐月﹝ +仇及窗Х反﹜passwd 白央奶伙卞由旦伐□玉互忡繡今木化中月午五卞反 +厙迕匹五卅中﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒及失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/shadow \- 交□扒及 shadow 失市它件玄樹扷 +\fI/etc/shadow\fR \- shadow 祭今木凶交□扒失市它件玄樹扷 .SH 楮洘嫩杴 .BR passwd (5), .BR shadow (5) .SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +Julianne Frances Haugh diff --git a/man/ja/chfn.1 b/man/ja/chfn.1 index 049ec320..6a285829 100644 --- a/man/ja/chfn.1 +++ b/man/ja/chfn.1 @@ -1,3 +1,4 @@ +.\"$Id: chfn.1,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,16 +26,15 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: chfn.1,v 1.2 2001/11/16 17:01:32 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" .TH CHFN 1 .SH 抩蟆 -chfn \- 交□扒及抩蟆羈及樹扷毛庍凳允月﹝ +chfn \- 交□扒及頗抩支樹扷毛庍凳允月﹝ .SH 踏摯 .TP 5 \fBchfn\fR @@ -43,29 +43,31 @@ chfn \- [\fB-w \fIwork_ph\fR] [\fB-h \fIhome_ph\fR] [\fB-o \fIother\fR] [\fIuser\fR] .SH 濩抸 -\fBchfn\fR 反﹜交□扒及白伙生□丞﹜左白奴旦及朿盒砦瘚琱蚙熏砦獢 +\fBchfn\fR 反﹜交□扒及白伙生□丞’左白奴旦及朿盒砦獢汎熏砦獢 憤鎘及齬狪砦璊中勻凶失市它件玄樹扷毛庍凳允月﹝ -仇及樹扷反 \fBfinger\fR(1) 支公木午挀僻及皿伕弘仿丞卞方勻化刓憎今木月﹝ -域怚獢憧隊牳封狩姪及失市它件玄及樹扷及庍凳及心墊丹仇午互請侳月﹝ -旦□由□交□扒反蟈化及失市它件玄卞覆仄化樹扷及庍凳互請侳月﹝ -引凶﹜\fB-o\fR 左皿扑亦件毛迕中化 GCOS 勂及怳爛聒朿坌及庍凳毛墊尹月及手 -旦□由□交□扒分仃匹丐月﹝ +仇及樹扷反 \fBfinger\fR(1) 及方丹卅皿伕弘仿丞卞方勻化刓憎今木月﹝ +域怚獢憧隊牳封狩姪及失市它件玄樹扷及心毛庍凳匹五月﹝ +旦□由□交□扒反蟈化及失市它件玄卞覆仄化樹扷毛庍凳匹五月﹝ +引凶 \fB-o\fR 左皿扑亦件毛迕中化 +GECOS 勂及怳爛聒朿坌毛庍凳匹五月及手旦□由□交□扒分仃匹丐月﹝ .PP -備勂卞反﹜戊件玄伕□伙妐儂菴太﹜戊件穴﹜戊伕件﹜羈寞動陸及蟈化及妐儂毛 -踏仁仇午互請侳月﹝ -\fIother\fR 勂卞覆仄化反仇及孺蜃反卅中及匹﹜職及失皿伉弗□扑亦件互迕中月 -失市它件氾奴件弘樹扷毛筏狤仄化云仁儀互請侳月﹝ +備白奴□伙玉卞踏仁ま芢卞楮允月孺蜃反﹜ +戊件玄伕□伙妐儂’戊件穴’戊伕件’羈寞毛殖氏匹中化反卅日卅中﹜ +午中丹仇午及心匹丐月﹝ +\fIother\fR 勂卞覆仄化反仇及孺蜃反卅中及匹﹜ +職及失皿伉弗□扑亦件互迕中月失市它件氾奴件弘樹扷及筏狤卞厙迕今木月﹝ .PP -中內木及左皿扑亦件手薊鎗今木卅井勻凶樺寧反﹜\fBchfn\fR 反覆狪讀卞が綜仄﹜ -蟈化及勂卞覆仄化﹜備★蜇箕及澀爛襖毛刓憎仄﹜蕙仄中襖及ェ恘毛瞼允﹝ -蕙仄中襖毛澀爛允月樺寧反公木毛ェ恘仄﹜引凶反蜇箕及襖毛銀丹卅日塢墊及引引 -伉正□件平□毛瓷六壬方中﹝ -蜇箕及襖反域覆及 \fB[ ]\fR 筏寞及棉卞刓憎今木月﹝ -左皿扑亦件毛隙爛仄卅井勻凶樺寧﹜chfn 反公木毛粟が仄凶交□扒及失市它件玄卞 -覆仄化か仁﹝ +中內木及左皿扑亦件手隙爛今木卅中午 +\fBchfn\fR 反覆狪讀卞が綜允月﹝ +蟈化及勂卞覆仄化備★蜇箕及澀爛襖毛刓憎仄﹜蕙仄中襖及ェ恘毛瞼允﹝ +蕙仄中襖毛澀爛允月樺寧反公木毛ェ恘仄﹜ +蜇箕及襖毛銀丹卅日塢墊及引引伉正□件平□毛瓷六壬方中﹝ +蜇箕及襖反 \fB[ ]\fR 筏寞及棉卞刓憎今木月﹝ +左皿扑亦件毛隙爛仄卅井勻凶樺寧﹜ +chfn 反蜇箕及交□扒失市它件玄卞覆仄化が綜允月﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒及失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .SH 楮洘嫩杴 .BR passwd (5) .SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +Julianne Frances Haugh diff --git a/man/ja/chpasswd.8 b/man/ja/chpasswd.8 index d147cc9f..d5061a42 100644 --- a/man/ja/chpasswd.8 +++ b/man/ja/chpasswd.8 @@ -1,3 +1,4 @@ +.\"$Id: chpasswd.8,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,43 +26,45 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: chpasswd.8,v 1.2 2001/11/16 17:01:32 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka .\" Updated Wed Apr 26 18:06:10 JST 2000 .\" by Kentaro Shirakata +.\" Updated & Modified Sat 21 Sep 2002 by NAKANO Takeo .\" .TH CHPASSWD 8 .SH 抩蟆 \fBchpasswd\fR \- 由旦伐□玉白央奶伙毛田永民質咥匹凳蕙允月 .SH 踏摯 -\fBchpasswd [-e]\fR +\fBchpasswd\fR [\fB-e\fR] .SH 濩抸 -\fBchpasswd\fR戊穴件玉反伓賞ェ恘井日交□扒抩午由旦伐□玉 -及賺互筏今木化中月白央奶伙毛づ心慇心﹜公及樹扷毛迕中化湃繡及交□扒歇及 -由旦伐□玉樹扷毛凳蕙允月﹝ --e 左皿扑亦件互卅中樺寧反﹜由旦伐□玉反尪妐午葦卅今木月﹝ --e 左皿扑亦件互丐月樺寧反﹜由旦伐□玉反剪寞祭今木化中月午葦卅今木月﹝ -備墊反 +\fBchpasswd\fR 戊穴件玉反 +伓賞ェ恘井日交□扒抩午由旦伐□玉及賺互筏今木化中月白央奶伙毛づ心慇心﹜ +公及樹扷毛迕中化湃繡及交□扒歇及由旦伐□玉樹扷毛凳蕙允月﹝ +-e 左皿扑亦件互卅中樺寧反﹜由旦伐□玉反尪妐午心卅今木月﹝ +-e 左皿扑亦件互丐月樺寧反﹜由旦伐□玉反剪寞祭今木化中月午心卅今木月﹝ +備墊及踏摯反慼及騷曰﹝ .sp 1 \fIuser_name\fR:\fIpassword\fR .sp 1 -午中丹踏摯匹丐月﹝ -隙爛仄凶交□扒反湃卞繡箕仄化中卅仁化反卅日卅中﹝ -芨尹日木凶由旦伐□玉反优邰卞殺元化剪寞祭今木﹜由旦伐□玉及肣躲渝蜃互繡箕允月卅日 -公木手凳蕙今木月﹝ +隙爛仄凶交□扒反湃卞繡箕仄化中卅仃木壬卅日卅中﹝ +芨尹日木凶由旦伐□玉反优邰卞殺元化剪寞祭今木﹜ +由旦伐□玉及肣躲渝蜃互丐月樺寧反公木手凳蕙今木月﹝ .PP -仇及戊穴件玉反﹜き凜卞釐恟及失市它件玄毛綜嶽允月迋卅釐筋昑卅扑旦氾丞棕雁 -匹銀迕允月仇午毛啦豭仄化中月﹝ +仇及戊穴件玉反﹜き凜卞釐恟及失市它件玄毛綜嶽允月方丹卅﹜ +釐筋昑卅扑旦氾丞棕雁匹迕中月凶戶卞綜日木凶﹝ .SH 煞屢 +.\" The \fBmkpasswd\fR command must be executed afterwards to update the +.\" DBM password files. ェ恘白央奶伙卞剪寞祭今木化中卅中由旦伐□玉互筏今木化中月樺寧反﹜ -皿伕氾弁玄毛井仃化云井卅仁化反卅日卅中﹝ +贗濠卞忡賃仄化云井卅仃木壬卅日卅中﹝ +.\" This command may be discarded in favor of the newusers(8) command. .SH 楮洘嫩杴 +.\" mkpasswd(8), passwd(1), useradd(1) .BR passwd (1), -.BR useradd (8), -.BR newusers (8) +.BR newusers (8), +.BR useradd (8) .SH 難樊 Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/ja/chsh.1 b/man/ja/chsh.1 index 79b066d2..e10f3159 100644 --- a/man/ja/chsh.1 +++ b/man/ja/chsh.1 @@ -1,3 +1,4 @@ +.\"$Id: chsh.1,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,46 +26,47 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: chsh.1,v 1.2 2001/11/16 17:01:32 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" .TH CHSH 1 .SH 抩蟆 -chsh \- 伕弘奶件扑尼伙毛庍凳允月﹝ +chsh \- 伕弘奶件扑尼伙毛庍凳允月 .SH 踏摯 .TP 5 \fBchsh\fR [\fB-s \fIlogin_shell\fR] [\fIuser\fR] .SH 濩抸 -\fBchsh\fR反交□扒及伕弘奶件扑尼伙毛庍凳允月﹝ +\fBchsh\fR 反交□扒及伕弘奶件扑尼伙毛庍凳允月﹝ 仇木卞方勻化﹜交□扒互伕弘奶件仄化瘉賡卞撢墊今木月戊穴件玉互瑁引月﹝ 域怚獢憧隊牳封洶峊╞咱戎韞及伕弘奶件扑尼伙及心毛庍凳匹五月﹝ -旦□由□交□扒反蟈化及失市它件玄及伕弘奶件扑尼伙毛庍凳允月仇午互請侳月﹝ +旦□由□交□扒反蟈化及失市它件玄及伕弘奶件扑尼伙毛庍凳匹五月﹝ .PP -伕弘奶件扑尼伙反﹜戊穴件玉抩互\fI/etc/shells\fR卞筏竭今木化中木壬卅氏匹手恌中﹝ +伕弘奶件扑尼伙反﹜ +戊穴件玉抩互 \fI/etc/shells\fR 卞筏竭今木化中木壬卅氏匹手恌中﹝ 旦□由□交□扒及樺寧反仇及孺蜃反卅仁﹜中井卅月襖匹手隙爛匹五月﹝ 窗Х毛孺蜃今木凶伕弘奶件扑尼伙毛迕中化中月失市它件玄井日反﹜ -伕弘奶件扑尼伙毛庍凳請侳卅中﹝ -仇及咥苀井日﹜\fB/bin/rsh\fR毛\fI/etc/shells\fR卞踏仁仇午反換戶日木卅中﹝ -窗Х互孺蜃今木凶扑尼伙卞貲勻化庍凳仄化仄引勻凶樺寧﹜升丹支勻化手 -伕弘奶件扑尼伙毛葭及手及卞枑允仇午互請侳卅仁卅勻化仄引丹井日匹丐月﹝ +伕弘奶件扑尼伙毛庍凳匹五卅中井手仄木卅中﹝ +仇及咥苀井日﹜ +\fB/bin/rsh\fR 反 \fI/etc/shells\fR 卞反踏井卅中幻丹互恌中﹝ +貲勻化窗Х互孺蜃今木凶扑尼伙卞庍凳仄化仄引丹午﹜ +伕弘奶件扑尼伙毛葭及手及卞枑六卅仁卅勻化仄引丹井日匹丐月﹝ .PP -\fB-s\fR左皿扑亦件毛隙爛仄卅井勻凶樺寧反﹜ -\fBchsh\fR反覆狪讀卞が綜仄﹜備勂卞覆仄化蜇箕及澀爛襖毛刓憎仄﹜ -蕙仄中襖及ェ恘毛瞼允﹝ +\fB-s\fR 左皿扑亦件毛隙爛仄卅井勻凶樺寧反﹜ +\fBchsh\fR 反覆狪讀卞が綜允月﹝ +交□扒及蜇箕及伕弘奶件扑尼伙毛刓憎仄﹜蕙仄中襖及ェ恘毛瞼允﹝ 澀爛襖毛庍凳允月卅日蕙仄中襖毛ェ恘仄﹜ -坭反蜇箕及襖毛銀丹卅日塢墊及引引伉正□件平□毛瓷六壬方中﹝ -蜇箕及襖反域覆及 \fB[ ]\fR 筏寞及棉卞刓憎今木月﹝ +蜇箕及襖毛銀丹卅日塢墊及引引伉正□件平□毛瓷六壬方中﹝ +蜇箕及扑尼伙反 \fB[ ]\fR 筏寞及棉卞刓憎今木月﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒及失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/shells \- 隙爛匹五月伕弘奶件扑尼伙及伉旦玄 +\fI/etc/shells\fR \- 隙爛匹五月伕弘奶件扑尼伙及伉旦玄 .SH 楮洘嫩杴 .BR chfn (1), .BR passwd (5) .SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +Julianne Frances Haugh diff --git a/man/ja/dpasswd.8 b/man/ja/expiry.1 similarity index 63% rename from man/ja/dpasswd.8 rename to man/ja/expiry.1 index 260cc30f..f450d377 100644 --- a/man/ja/dpasswd.8 +++ b/man/ja/expiry.1 @@ -1,5 +1,7 @@ -.\" Copyright 1991, Julianne Frances Haugh +.\"$Id: expiry.1,v 1.1 2003/04/28 02:14:00 kloczek Exp $ +.\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. +.\" Modified for expiry by Ben Collins , 1999 .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -25,35 +27,27 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dpasswd.8,v 1.2 2001/11/16 17:01:32 ankry Exp $ +.\" Japanese Version Copyright (c) 2002 NAKANO Takeo all rights reserved. +.\" Translated Sun 3 Mar 2002 by NAKANO Takeo +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" -.\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka -.\" all rights reserved. -.\" Translated Fri Feb 14 23:06:00 JST 1997 -.\" by Kazuyoshi Furutaka -.\" -.TH DPASSWD 8 +.TH EXPIRY 1 .SH 抩蟆 -\fBdpasswd\fR \- 母奶失伙失永皿迕由旦伐□玉毛庍凳允月 +expiry \- 由旦伐□玉及渝蜃濠木禾伉扑□及民尼永弁午撕墊 .SH 踏摯 -\fBdpasswd\fR -.RB [ - ( a | d )] -\fIshell\fR +.TP 6 +\fBexpiry\fR [\fB-c\fR] [\fB-f\fR] .SH 濩抸 -\fBdpasswd\fR反交□扒及伕弘奶件扑尼伙及母奶失伙失永皿迕由旦伐□玉及 -馨笛﹜綽輪菴太凳蕙毛墊卅丹﹝ -交□扒互母奶失伙失永皿卞方曰伕弘奶件允月端反橘卞﹜騷橘及由旦伐□玉 -卞方月交□扒ロ據毛墊卅勻凶詨卞母奶失伙失永皿迕及由旦伐□玉及ェ恘毛瞼今木月﹝ -ェ恘互懇仄仁墊卅歹木凶儀毛割ロ允月啃﹜ -\fBdpasswd\fR反蕙仄中由旦伐□玉毛わ蘸ェ恘今六月﹝ -.PP -\fIshell\fR婁醒反伕弘奶件皿伕弘仿丞尺及敦蟈卅由旦抩匹卅仁化反卅日卅中﹝ +.B expiry +反蜇箕及由旦伐□玉渝蜃濠木樹扷毛民尼永弁 (\fB-c\fR) 仄﹜ +优邰卅樺寧反庍凳毛雄孺允月 (\fB-f\fR)﹝ +仇及戊穴件玉反騷橘及交□扒戊穴件玉午仄化裟太請仄第Х匹丐月﹝ .SH 白央奶伙 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/d_passwd -.br -/etc/dialups +\fI/etc/shadow\fR \- shadow 祭今木凶交□扒失市它件玄樹扷 .SH 楮洘嫩杴 -.BR login (1) +.BR passwd (5), +.BR shadow (5) .SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +Ben Collins diff --git a/man/ja/faillog.5 b/man/ja/faillog.5 index 13763175..73e52057 100644 --- a/man/ja/faillog.5 +++ b/man/ja/faillog.5 @@ -1,3 +1,4 @@ +.\"$Id: faillog.5,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,27 +26,26 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: faillog.5,v 1.2 2001/11/16 17:01:32 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Modified Tue 18 Sep 2002 by NAKANO Takeo .\" .TH FAILLOG 5 .SH 抩蟆 faillog \- 伕弘奶件撩л毛筏狤允月白央奶伙 .SH 濩抸 .I faillog -反蜊★及失市它件玄卞覆允月伕弘奶件撩л莢醒午公及蜃蘸毛棟咥允月﹝ -白央奶伙反裔爛贏伊戊□玉匹丐曰﹜備伊戊□玉反UID砦璊У媊磥竣鴗諢 -備伊戊□玉卞反﹜瘉詨卞伕弘奶件卞嶽跦仄化動侳窒莢伕弘奶件卞撩л仄凶井; -失市它件玄互銀迕尕Х午卅月引匹及伕弘奶件撩л第Х莢醒; -域硅И嵽磳陞丰韝佷瘉啎楔縣五及濤糧犯田奶旦; -域硅И嵽磳陞丰韝佷瘉啎楔褪尥﹜ +反蜊★及失市它件玄卞覆允月伕弘奶件撩л莢醒午公及蜃蘸毛筏狤允月﹝ +白央奶伙反裔爛贏伊戊□玉匹丐曰﹜UID 砦璊ル丰韞ル疇砲嘖掑惜竣鴗々中諢 +備伊戊□玉卞反﹜瘉詨卞伕弘奶件卞嶽跦仄化動嫦及伕弘奶件撩л莢醒﹜ +失市它件玄互銀迕尕Х午卅月引匹卞袱今木月伕弘奶件撩л莢醒﹜ +瘉詨卞伕弘奶件卞撩л仄凶午五及濤糧犯田奶旦﹜ +瘉詨卞伕弘奶件卞撩л仄凶ゥ尥﹜ 互筏狤今木化中月﹝ .PP -仇及白央奶伙及厭瞻反動票及騷曰匹丐月 +仇及白央奶伙及厭瞻反動票及騷曰﹝ .DS struct faillog { @@ -57,7 +57,7 @@ faillog \- .DE .SH 白央奶伙 -/var/log/faillog \- 伕弘奶件撩л及筏狤 +\fI/var/log/faillog\fR \- 伕弘奶件撩л及筏狤 .SH 楮洘嫩杴 .BR faillog (8) .SH 難樊 diff --git a/man/ja/faillog.8 b/man/ja/faillog.8 index 03ef95cc..76d8c9b9 100644 --- a/man/ja/faillog.8 +++ b/man/ja/faillog.8 @@ -1,3 +1,4 @@ +.\"$Id: faillog.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,77 +26,77 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: faillog.8,v 1.2 2001/11/16 17:01:32 ankry Exp $ .\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Modified Sat 21 Sep 2002 by NAKANO Takeo .\" .TH FAILLOG 8 .SH 抩蟆 -faillog \- faillog毛譬屯﹜login撩л及孺蜃毛澀爛允月 +faillog \- faillog 毛譬屯﹜login 撩л及孺蜃毛澀爛允月 .SH 踏摯 -.TP 8 -.B faillog -.RB [ -u -.IR login-name ] -.RB [ -a ] -.RB [ -t -.IR days ] -.RB [ -m -.IR max ] -.RB [ -pr ] +\fBfaillog\fR [\fB-u\fR \fIlogin-name\fR] [\fB-a\fR] [\fB-t\fR \fIdays\fR] +[\fB-m\fR \fImax\fR] [\fB-pr\fR] .SH 濩抸 -\fBfaillog\fR反伕弘奶件及撩л毛筏狤允月伕弘白央奶伙\fI/var/log/faillog\fR -及ま芢毛幫溥仄﹜撩л及莢醒菴太公及孺蜃及忡潮毛墊卅丹﹝ -\fBfaillog\fR卞芨尹月婁醒及賜輛卞反啦怗互丐月﹝ +\fBfaillog\fR 反伕弘奶件及撩л毛筏狤允月伕弘白央奶伙 +\fI/var/log/faillog\fR 及ま芢毛幫溥仄﹜ +撩л及莢醒午孺蜃襖毛筏狤’棟咥允月﹝ +\fBfaillog\fR 卞芨尹月婁醒及賜輛反褐邰匹丐曰﹜ 備婁醒反芨尹日木凶賜卞躂切卞質咥今木月﹝ .PP -\fB-p\fR白仿永弘反伕弘奶件撩л及巨件玄伉毛UID賜卞刓憎今六月﹝ -\fB-u \fIlogin-name\fR午ェ恘仄凶端反﹜\fIlogin-name\fR及 -伕弘奶件撩л筏狤及心毛刓憎允月﹝ -\fB-t \fIdays\fR午ェ恘允月午﹜瘉嗤\fIdays\fRゥ動ま及伕弘奶件撩л -及筏狤毛刓憎允月﹝ -\fB-t\fR白仿永弘毛迕中凶端反\fB-u\fR白仿永弘及か五互俅孺今木月﹝ -\fB-a\fR白仿永弘毛迕中月午蟈交□扒卞覆允月筏狤互刓憎今木月﹝ -仇及白仿永弘毛\fB-p\fR白仿永弘午午手卞迕中凶樺寧反﹜仇木引匹卞伕弘奶件卞 -撩л仄凶儀及丐月蟈化及交□扒互薊太請今木月﹝ -\fB-r\fR白仿永弘午迕中化手啦怗互拑中﹝ +\fB-p\fR 白仿弘毛隙爛允月午伕弘奶件撩л及巨件玄伉毛 UID 賜卞刓憎允月﹝ +\fB-u \fIlogin-name\fR 午ェ恘允月午﹜ +\fIlogin-name\fR 及伕弘奶件撩л筏狤及心毛刓憎允月﹝ +\fB-t \fIdays\fR 午ェ恘允月午﹜ +瘉嗤 \fIdays\fR ゥ動ま及伕弘奶件撩л及筏狤毛刓憎允月﹝ +\fB-u\fR 白仿弘毛隙爛允月午 \fB-t\fR 白仿弘反拑骰今木月﹝ +.\"nakano 午中丹及互撢端及が綜及方丹卅竣互允月及分仃升... +\fB-a\fR 白仿弘毛迕中月午蟈交□扒卞覆允月筏狤互刓憎今木月﹝ +仇及白仿弘毛 \fB-p\fR 白仿弘午午手卞迕中月午﹜ +仇木引匹卞伕弘奶件卞撩л仄凶蟈化及交□扒互刓憎今木月﹝ +\fB-a\fR 反 \fB-r\fR 白仿弘午迕中化手啦怗互拑中﹝ .PP -\fB-r\fR白仿永弘反伕弘奶件撩л及莢醒毛伉本永玄允月啃及手及匹丐月﹝ -仇及左皿扑亦件毛迕中月卞反\fI/var/log/faillog\fR尺及踏五慇心腺互 -优邰匹丐月﹝ -\fB-u \fIlogin-name\fR午ェ恘仄凶端反﹜\fIlogin-name\fR及 -伕弘奶件撩л莢醒及心毛伉本永玄允月﹝ +\fB-r\fR 白仿弘反伕弘奶件撩л莢醒及筏狤毛伉本永玄允月﹝ +仇及左皿扑亦件毛迕中月卞反 +\fI/var/log/faillog\fR 尺及踏五慇心腺蜃互优邰匹丐月﹝ +\fB-u \fIlogin-name\fR 午ェ恘允月午﹜ +\fIlogin-name\fR 及伕弘奶件撩л莢醒及心毛伉本永玄允月﹝ .PP -\fB-m\fR白仿永弘反﹜失市它件玄互銀迕尕Х卞卅月瘉釐及伕弘奶件 -撩л莢醒毛澀爛允月啃卞迕中月﹝ -仇及左皿扑亦件毛迕中月卞反\fI/var/log/faillog\fR尺及踏五慇心腺互 -优邰匹丐月﹝ -\fB-m \fImax\fR午ェ恘仄凶樺寧﹜伕弘奶件撩л互\fImax\fR莢卞瓊仄凶詨反 -蟈化及失市它件玄互銀迕尕Х卞卅月﹝ -\fB-u \fIlogin-name\fR午午手卞迕中木壬仇及窗Х毛\fIlogin-name\fR卞 -及心綜迕今六月儀互請侳月﹝ -\fImax\fR及襖毛0卞允月午伕弘奶件及撩л莢醒卞反孺蜃互拑仁卅月﹝ -失正永弁卞方曰\fBroot\fR互伕弘奶件尕Х午卅曰扑旦氾丞棟咥互 -請侳卅仁卅勻化仄引丹儀毛侂什啃卞﹜\fBroot\fR卞覆仄化反 -瘉釐伕弘奶件撩л莢醒反中勾匹手优內0午仄卅仁化反卅日卅中﹝ +\fB-m\fR 白仿弘反﹜ +失市它件玄互銀迕尕Х卞卅月引匹及瘉釐及伕弘奶件撩л莢醒毛澀爛允月﹝ +仇及左皿扑亦件毛迕中月卞反 +\fI/var/log/faillog\fR 尺及踏五慇心腺蜃互优邰匹丐月﹝ +\fB-m \fImax\fR 午ェ恘允月午﹜ +蟈化及失市它件玄反伕弘奶件撩л莢醒互 \fImax\fR 卞卅月午銀迕尕Х卞卅月﹝ +.\"nakano double meaning... +\fB-u \fIlogin-name\fR 毛き凜卞迕中月午﹜ +仇及窗Х毛 \fIlogin-name\fR 分仃卞綜迕今六月仇午互匹五月﹝ +\fImax\fR 及襖毛 0 卞允月午伕弘奶件及撩л莢醒卞反孺蜃互拑仁卅月﹝ +扑旦氾丞卞覆允月扔□申旦尕Х僎猾毛侂什凶戶﹜ +\fBroot\fR 及瘉釐伕弘奶件撩л莢醒反橘卞 0 卞仄化云仁屯五匹丐月﹝ .PP -左皿扑亦件反升及方丹卞賺心寧歹六化手恌中﹝ -\fB-p\fR﹜\fB-r\fR菴太\fB-m\fR及備左皿扑亦件反\fB-u\fR坭反\fB-t\fR -及中內木午賺心寧歹六化手躂切卞質咥今木月﹝ +左皿扑亦件反幻廿升及方丹卞賺心寧歹六化手恌中﹝ +\fB-p\fR, \fB-r\fR, \fB-m\fR +及備左皿扑亦件反﹜ +\fB-u\fR, \fB-t\fR 及隙爛卞方月膜懇毛熬仃﹜ +隙爛仄凶賜卞撢墊今木月﹝ .SH 煞屢 -\fBfaillog\fR反瘉詨卞撩л仄化動侳伕弘奶件卞嶽跦仄化中卅中交□扒及心毛 -刓憎允月﹝ -伕弘奶件卞撩л仄凶詨卞懇仄仁伕弘奶件請侳凶交□扒毛刓憎今六月啃卞反﹜ -\fB-u\fR白仿永弘毛迕中化公及交□扒毛抸憎讀卞隙爛允月井﹜ -\fB-a\fR白仿永弘毛迕中化蟈交□扒毛刓憎今六卅仁化反卅日卅中﹝ +\fBfaillog\fR 反﹜ +瘉詨卞撩л仄化動嫦伕弘奶件卞嶽跦仄化中卅中交□扒及心毛刓憎允月﹝ +伕弘奶件卞撩л仄凶詨卞懇仄仁伕弘奶件匹五凶交□扒手刓憎今六月卞反﹜ +\fB-u\fR 白仿弘毛迕中化公及交□扒毛抸憎讀卞隙爛允月井﹜ +\fB-a\fR 白仿弘毛迕中化蟈交□扒毛刓憎今六卅仃木壬卅日卅中﹝ .PP -扑旦氾丞卞方勻化反﹜/var/log及醫歹曰卞/var/adm坭反/usr/adm毛迕中化中月 -仇午手丐月﹝ +扑旦氾丞卞方勻化反 +/var/log 匹反卅仁 +/var/adm +支 +/usr/adm +卞伕弘白央奶伙互譆井木化中月井手仄木卅中﹝ .SH 白央奶伙 -/var/log/faillog \- 伕弘奶件撩л毛筏狤允月白央奶伙 +\fI/var/log/faillog\fR \- 撩л毛筏狤仄凶白央奶伙 .SH 楮洘嫩杴 .BR login (1), .BR faillog (5) diff --git a/man/ja/gpasswd.1 b/man/ja/gpasswd.1 index cc5f56b7..32ba5554 100644 --- a/man/ja/gpasswd.1 +++ b/man/ja/gpasswd.1 @@ -1,85 +1,70 @@ -.\" Copyright 1996, Rafal Maszkowski, rzm@pdi.net +.\"$Id: gpasswd.1,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\" Copyright 1996, Rafal Maszkowski .\" All rights reserved. You can redistribute this man page and/or .\" modify it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2 of the .\" License, or (at your option) any later version. .\" -.\" $Id: gpasswd.1,v 1.2 2001/11/16 17:01:32 ankry Exp $ -.\" -.\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka -.\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Updated & Modified 3 Mar 2002 by NAKANO Takeo +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" .TH GPASSWD 1 -.SH NAME +.SH 抩蟆 gpasswd \- /etc/group白央奶伙毛棟咥允月 -.br .SH 踏摯 -.B gpasswd \fIgroup\fR +\fBgpasswd \fIgroup\fR .br -.B gpasswd -.B -a -\fIuser\fR \fIgroup\fR +\fBgpasswd -a \fIuser\fR \fIgroup\fR .br -.B gpasswd -.B -d -\fIuser\fR \fIgroup\fR +\fBgpasswd -d \fIuser\fR \fIgroup\fR .br -.B gpasswd -.B -R -\fIgroup\fR +\fBgpasswd -R \fIgroup\fR .br -.B gpasswd -.B -r -\fIgroup\fR -.br -.B gpasswd -.RB [ -A -\fIuser\fR,...] -.RB [ -M -\fIuser\fR,...] -\fIgruop\fR +\fBgpasswd -r \fIgroup\fR .br +\fBgpasswd\fR [\fB-A \fIuser\fR,...] [\fB-M\fR \fIuser\fR,...] \fIgroup\fR .SH 濩抸 .B gpasswd -反/etc/group白央奶伙 -(菴太﹜SHADOWGRP毛爛聒仄化戊件由奶伙仄凶凜反/etc/gshadow白央奶伙) -毛棟咥允月及卞迕中日木月﹝ -備弘伙□皿卞棟咥樊毛譆五﹜丟件田□菴太由旦伐□玉毛澀爛允月仇午互請侳月﹝ +反 /etc/group 白央奶伙 +(云方太 SHADOWGRP 毛爛聒仄化戊件由奶伙仄凶凜反 /etc/gshadow 白央奶伙) +及棟咥卞迕中日木月﹝ +備弘伙□皿卞反﹜棟咥樊’丟件田□’由旦伐□玉毛澀爛匹五月﹝ 扑旦氾丞棟咥樊反﹜ -\fB-A\fR左皿扑亦件毛銀勻化弘伙□皿棟咥樊(呁醒匹手第)毛爛聒允月仇午支 -\fB-M\fR左皿扑亦件毛銀勻化丟件田□毛爛聒允月仇午互匹五﹜ -備弘伙□皿及棟咥樊菴太丟件田□午き羈及た腺毛儅勻化中月﹝ +\fB-A\fR 左皿扑亦件毛銀勻化弘伙□皿棟咥樊 (呁醒匹手第) 毛爛聒仄凶曰﹜ +\fB-M\fR 左皿扑亦件毛銀勻化丟件田□毛爛聒仄凶曰匹五﹜ +備弘伙□皿及棟咥樊’丟件田□午き羈及た腺毛儅勾﹝ .PP -弘伙□皿棟咥樊反﹜公木冗木\fB-a\fR菴太\fB-d\fR左皿扑亦件毛迕中化 -交□扒毛馨笛仄凶曰綽輪允月仇午互請侳月﹝ -棟咥樊反\fB-r\fR左皿扑亦件毛迕中化弘伙□皿由旦伐□玉毛綽輪允月儀互請侳月﹝ +弘伙□皿棟咥樊反﹜\fB-a\fR 左皿扑亦件毛迕中化交□扒毛馨笛仄凶曰﹜ +\fB-d\fR 左皿扑亦件毛迕中化交□扒毛綽輪仄凶曰匹五月﹝ +棟咥樊反 \fB-r\fR 左皿扑亦件毛迕中化弘伙□皿由旦伐□玉毛綽輪匹五月﹝ 由旦伐□玉互澀爛今木化中卅中凜反﹜ 弘伙□皿及丟件田□及心互 -.B newgrp(1) -毛迕中化弘伙□皿及域夠午卅月仇午互請侳月﹝ -左皿扑亦件\fB-R\fR毛隙爛仄凶樺寧反﹜ -.I newgrp(1) -戊穴件玉毛迕中凶弘伙□皿尺及失弁本旦毛請侳卅仁允月﹝ +.BR newgrp (1) +毛迕中化弘伙□皿及域夠卞卅木月﹝ +左皿扑亦件 \fB-R\fR 毛隙爛允月午﹜ +.BR newgrp (1) +戊穴件玉毛迕中凶弘伙□皿尺及失弁本旦反匹五卅仁卅月﹝ .PP 弘伙□皿及棟咥樊互弘伙□皿抩及心毛隙爛仄化 .B gpasswd -戊穴件玉毛撢墊仄凶樺寧反 +戊穴件玉毛撢墊仄凶樺寧反﹜ 由旦伐□玉及ェ恘毛菲戶日木月﹝ 由旦伐□玉互澀爛今木化中月樺寧匹手﹜ 丟件田□反由旦伐□玉卅仄匹 -.B newgrp(1) -戊穴件玉毛迕中月仇午互請侳月互﹜ +.BR newgrp (1) +戊穴件玉毛銀尹月互﹜ 丟件田□匹卅中諦反由旦伐□玉毛ェ恘仄卅仁化反卅日卅中﹝ - .SH 白央奶伙 -/etc/group \- 弘伙□皿樹扷 +\fI/etc/group\fR \- 弘伙□皿樹扷 .br -/etc/gshadow \- shadow仄凶弘伙□皿樹扷 +\fI/etc/gshadow\fR \- shadow 今木凶弘伙□皿樹扷 .SH 楮洘嫩杴 .BR newgrp (1), .BR groupadd (8), .BR groupdel (8), .BR groupmod (8), .BR grpck (8) +.SH 難樊 +Rafal Maszkowski diff --git a/man/ja/groupadd.8 b/man/ja/groupadd.8 index ec32bb99..366dd4ba 100644 --- a/man/ja/groupadd.8 +++ b/man/ja/groupadd.8 @@ -1,3 +1,4 @@ +.\"$Id: groupadd.8,v 1.7 2004/01/05 01:08:29 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,36 +26,35 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: groupadd.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Updated & Modified Sat 21 Sep 2002 by NAKANO Takeo .\" .TH GROUPADD 8 .SH 抩蟆 groupadd \- 蕙仄中弘伙□皿毛綜嶽允月 .SH 踏摯 -.B groupadd -[\fB-g\fI gid \fR[\fB-o\fR]] -.I group +\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] \fIgroup\fR .SH 濩抸 -\fBgroupadd\fR戊穴件玉反戊穴件玉仿奶件曉匹隙爛今木凶襖菴太 -扑旦氾丞及犯奴白巧伙玄襖毛迕中化蕙仄中弘伙□皿毛綜嶽允月﹝ -蕙仄中弘伙□皿反优邰午卅勻凶端卞扑旦氾丞白央奶伙卞筏ェ今木月﹝ -\fBgroupadd\fR戊穴件玉卞隙爛匹五月左皿扑亦件反慼及手及匹丐月 +\fBgroupadd\fR 戊穴件玉反﹜ +戊穴件玉仿奶件曉匹隙爛今木凶襖午 +扑旦氾丞及犯白巧伙玄襖午毛迕中化蕙仄中弘伙□皿毛綜嶽允月﹝ +蕙仄中弘伙□皿互优邰卞殺元化扑旦氾丞白央奶伙卞筏ェ今木月﹝ +\fBgroupadd\fR 戊穴件玉卞隙爛匹五月左皿扑亦件反慼及騷曰﹝ .IP "\fB-g \fIgid\fR" -蕙筋弘伙□皿及ID砦獢 -仇及襖反﹜\fB-o\fR左皿扑亦件毛迕中卅中蜃曰反﹜職午褐呁仄化反卅日卅中﹝ -引凶﹜鯠橨秅リ吨砟々洃吨擗吨丑 -犯奴白巧伙玄反﹜99方曰釐五仁啾勾職及蟈化及湃繡弘伙□皿及ID方曰手 -釐五卅手及及醱匹瘉凝及手及匹丐月﹝ -0井日99坶及襖反釐纏扑旦氾丞迕及失市它件玄卞芺沶今木化中月﹝ +蕙筋弘伙□皿及 ID 砦獢 +仇及襖反﹜\fB-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ +引凶鯠橨秅リ吨惜鴗苳吨擗吨丑 +犯白巧伙玄匹反﹜99 云方太職及丐日斗月湃繡弘伙□皿及 ID 方曰手釐五中﹜ +瘉凝及醒襖午卅月﹝ +0 井日 99 引匹及襖反﹜ +騷橘扑旦氾丞迕及失市它件玄卞芺沶今木化中月﹝ .SH 白央奶伙 -/etc/group \- 弘伙□皿及失市它件玄樹扷 +\fI/etc/group\fR \- 弘伙□皿失市它件玄樹扷 .br -/etc/gshadow \- 弘伙□皿及兜蟈卅失市它件玄樹扷 +\fI/etc/gshadow\fR \- 兜蟈卅弘伙□皿失市它件玄樹扷 .SH 楮洘嫩杴 .BR chfn (1), .BR chsh (1), diff --git a/man/ja/groupdel.8 b/man/ja/groupdel.8 index c5c43443..6674dedf 100644 --- a/man/ja/groupdel.8 +++ b/man/ja/groupdel.8 @@ -1,3 +1,4 @@ +.\"$Id: groupdel.8,v 1.6 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,33 +26,32 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: groupdel.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Updated & Modified Sat 21 Sep 2002 by NAKANO Takeo .\" .TH GROUPDEL 8 .SH 抩蟆 -groupdel \- 弘伙□皿毛壅蛔允月 +groupdel \- 弘伙□皿毛綽輪允月 .SH 踏摯 -.B groupdel -.I group +\fBgroupdel\fR \fIgroup\fR .SH 濩抸 -\fBgroupdel\fR戊穴件玉反﹜扑旦氾丞及失市它件玄白央奶伙毛庍凳仄﹜ -\fIgroup\fR卞簞允月蟈化及巨件玄伉□毛綽輪允月﹝ -隙爛今木凶弘伙□皿反繡箕仄化中卅仁化反卅日卅中﹝ +\fBgroupdel\fR 戊穴件玉反﹜扑旦氾丞失市它件玄白央奶伙毛膜懇仄﹜ +弘伙□皿 \fIgroup\fR 卞覆殺允月允屯化及巨件玄伉毛綽輪允月﹝ +隙爛今木凶弘伙□皿反繡箕仄化中卅仃木壬卅日卅中﹝ .PP -蟈化及白央奶伙扑旦氾丞醱卞隙爛仄凶弘伙□皿及ID毛儅勾白央奶伙互酸勻化中卅中 -仇午毛﹜澎綜僅匹割ロ仄卅仁化反卅日卅中﹝ +蟈化及白央奶伙扑旦氾丞卞﹜ +隙爛仄凶弘伙□皿及 ID 毛儅勾白央奶伙互酸勻化中卅中仇午毛﹜ +澎綜僅匹割ロ仄卅仁化反卅日卅中﹝ .SH 煞屢 繡箕允月交□扒及潛弘伙□皿毛綽輪仄化反卅日卅中﹝ -弘伙□皿毛綽輪允月蟆卞公及交□扒毛綽輪仄卅仁化反卅日卅中﹝ +弘伙□皿毛綽輪允月蟆卞公及交□扒毛綽輪仄卅仃木壬卅日卅中﹝ .SH 白央奶伙 -/etc/group \- 弘伙□皿及樹扷 +\fI/etc/group\fR \- 弘伙□皿樹扷 .br -/etc/gshadow \- 弘伙□皿及兜蟈卅樹扷 +\fI/etc/gshadow\fR \- 兜蟈卅弘伙□皿樹扷 .SH 楮洘嫩杴 .BR chfn (1), .BR chsh (1), diff --git a/man/ja/groupmod.8 b/man/ja/groupmod.8 index d0622143..df7f9150 100644 --- a/man/ja/groupmod.8 +++ b/man/ja/groupmod.8 @@ -1,3 +1,4 @@ +.\"$Id: groupmod.8,v 1.6 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,47 +26,45 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: groupmod.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Updated & Modified Sat 21 Sep 2002 by NAKANO Takeo .\" .TH GROUPMOD 8 .SH 抩蟆 -groupmod \- 弘伙□皿卞庍凳毛笛尹月 +groupmod \- 弘伙□皿毛膜懇允月 .SH 踏摯 -.B groupmod -[\fB-g\fI gid \fR[\fB-o\fR]] -[\fB-n\fI group_name \fR] -.I group +\fBgroupmod\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-n\fI group_name \fR] +\fIgroup\fR .SH 濩抸 -\fBgroupmod\fR戊穴件玉反﹜戊穴件玉仿奶件曉匹隙爛仄凶庍凳儀嫩卞穡仄化 -扑旦氾丞及失市它件玄白央奶伙毛荼庍允月﹝ -\fIgroupmod\fR戊穴件玉卞隙爛匹五月左皿扑亦件反慼及騷曰 +\fBgroupmod\fR 戊穴件玉反﹜ +戊穴件玉仿奶件井日及隙爛卞方勻化﹜ +扑旦氾丞失市它件玄白央奶伙毛膜懇允月﹝ +\fIgroupmod\fR 戊穴件玉卞隙爛匹五月左皿扑亦件反慼及騷曰﹝ .IP "\fB-g \fIgid\fR" -庍凳毛熬仃月弘伙□皿及ID砦獢 -仇及襖反﹜\fB-o\fR左皿扑亦件毛迕中月樺寧動陸反﹜職午褐呁仄化反卅日卅中﹝ -引凶﹜鯠橨秅リ吨砟々洃吨擗吨丑 -犯奴白巧伙玄匹反﹜99方曰釐五仁啾勾職及蟈化及湃繡弘伙□皿及ID方曰手 -釐五卅手及及醱匹瘉凝及手及匹丐月﹝ -庍凳蟆及弘伙□皿ID毛儅勾蟈化及白央奶伙反﹜澎綜僅匹蕙仄中弘伙□皿ID尺午 -庍凳仄卅仁化反卅日卅中﹝ +庍凳毛熬仃月弘伙□皿及 ID 砦獢 +仇及襖反﹜\fB-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ +引凶鯠橨秅リ吨砟々洃吨擗吨丑 +犯白巧伙玄反﹜99 云方太職及丐日斗月湃繡弘伙□皿及 ID 方曰手釐五中﹜ +瘉凝及醒襖午卅月﹝ +庍凳蟆及弘伙□皿 ID 毛儅勾蟈化及白央奶伙反﹜ +澎綜僅匹蕙仄中弘伙□皿 ID 尺午庍凳仄卅仃木壬卅日卅中﹝ .IP "\fB-n \fIgroup_name\fR" -弘伙□皿及抩蟆互\fIgroup\fR井日\fIgroup_name\fR卞庍凳今木月﹝ +弘伙□皿及抩蟆互 \fIgroup\fR 井日 \fIgroup_name\fR 卞庍凳今木月﹝ .SH 白央奶伙 -/etc/group \- 弘伙□皿及樹扷 +\fI/etc/group\fR \- 弘伙□皿樹扷 .br -/etc/gshadow \- 弘伙□皿及兜蟈卅樹扷 +\fR/etc/gshadow\I \- 兜蟈卅弘伙□皿樹扷 .SH 楮洘嫩杴 .BR chfn (1), .BR chsh (1), .BR passwd (1), .BR groupadd (8), -.BR groupdel (8) +.BR groupdel (8), .BR useradd (8), .BR userdel (8), -.BR usermod (8), +.BR usermod (8) .SH 難樊 Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/ja/groups.1 b/man/ja/groups.1 index 08736266..8efe7e67 100644 --- a/man/ja/groups.1 +++ b/man/ja/groups.1 @@ -1,3 +1,4 @@ +.\"$Id: groups.1,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,36 +26,40 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: groups.1,v 1.2 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 2001 Maki KURODA .\" all right reserved, .\" Translated Tue Oct 30 11:58:18 JST 2001 .\" by Maki KURODA +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo +.\" +.\"WORD: concurrent group set き凜赭簞弘伙□皿螂寧 +.\"WORD: real group ID 撢弘伙□皿 ID +.\"WORD: effective group ID 撢躲弘伙□皿 ID .\" .TH GROUPS 1 .SH 抩蟆 -groups \- 蜇箕及弘伙□皿 ID 抩及刓憎 +groups \- 蜇箕及弘伙□皿抩及刓憎 .SH 踏摯 -.B groups -.RI [ user ] +\fBgroups\fR [\fIuser\fR] .SH 濩抸 .B groups -反蜇箕及弘伙□皿 ID 抩引凶反襖毛刓憎允月﹝ -公及襖互 \fI/etc/group\fR 卞瓚狤今木化中卅仃木壬﹜ -公及襖反醒襖弘伙□皿 ID 午仄化刓憎今木月﹝ -\fIuser\fR 左皿扑亦件由仿丟正反 \fIuser\fR 互赭簞允月弘伙□皿抩毛刓憎允月﹝ +反蜇箕及弘伙□皿及抩蟆引凶反 ID 襖毛刓憎允月﹝ +ID 襖卞覆殺允月抩蟆互 \fI/etc/group\fR 卞瓚狤今木化中卅仃木壬﹜ +醒襖及弘伙□皿 ID 匹刓憎今木月﹝ +由仿丟□正午仄化 \fIuser\fR 毛芨尹月午﹜ +隙爛仄凶 \fIuser\fR 互赭簞允月弘伙□皿抩毛刓憎允月﹝ .SH 鏜啦 -隋き弘伙□皿互扔禾□玄今木化中卅中扑旦氾丞反 \fI/etc/group\fR 卞 -扷屢今木化中月樹扷毛澀爛允月﹝ -交□扒反蜇箕及 real 支 effective 弘伙□皿 ID 毛庍凳允月凶戶卞 \fBnewgrp\fR 引凶反 \fBsg\fR 毛 -銀迕仄卅仃木壬卅日卅中﹝ +き凜赭簞弘伙□皿螂寧 (concurrent group set) +毛扔禾□玄仄化中卅中扑旦氾丞匹反﹜ +\fI/etc/group\fR 及樹扷互扷屢今木月﹝ +交□扒互蜇箕及撢弘伙□皿 ID 支撢躲弘伙□皿 ID 毛庍凳允月卞反﹜ +\fBnewgrp\fR 支 \fBsg\fR 毛銀迕仄卅仃木壬卅日卅中﹝ .SH 白央奶伙 /etc/group \- 弘伙□皿樹扷 .SH 楮洘嫩杴 .BR newgrp (1), +.BR getuid (2), .BR getgid (2), -.BR getgroups (2), -.BR getuid (2) +.BR getgroups (2) .SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +Julianne Frances Haugh diff --git a/man/ja/grpck.8 b/man/ja/grpck.8 index 34c900ae..45dd41f1 100644 --- a/man/ja/grpck.8 +++ b/man/ja/grpck.8 @@ -1,3 +1,4 @@ +.\"$Id: grpck.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,77 +26,86 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: grpck.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Updated & Modified Sat 21 Sep 2002 by NAKANO Takeo .\" -.TH GRPCK 1 +.TH GRPCK 8 .SH 抩蟆 -grpck \- 弘伙□皿白央奶伙及敦蟈嶺毛腹據允月 +grpck \- 弘伙□皿白央奶伙互懇仄中井升丹井腹犖允月 .SH 踏摯 \fBgrpck\fR [\fB-r\fR] [\fIgroup\fR \fIshadow\fR] .SH 濩抸 -\fBgrpck\fR戊穴件玉反扑旦氾丞及ロ據樹扷互敦蟈卅手及井升丹井及腹據毛墊丹﹝ -\fI/etc/group\fR菴太\fI/etc/gshadow\fR白央奶伙醱及蟈化及巨件玄伉□卞覆仄化﹜ -踏摯互懇仄中井﹜菴太備勂卞筏今木化中月犯□正反肣躲卅手及井升丹井及腹據互 -墊卅歹木月﹝ -踏摯互懇仄仁卅井勻凶曰襪懇尕Х卅貲曰毛殖戈巨件玄伉□反綽輪毛瞼今木月﹝ +\fBgrpck\fR 戊穴件玉反扑旦氾丞及ロ據樹扷互懇仄中井升丹井腹犖允月﹝ +\fI/etc/group\fR 午 \fI/etc/gshadow\fR +備白央奶伙及蟈化及巨件玄伉卞覆仄﹜ +備白奴□伙玉及踏摯互懇仄中井﹜ +公及犯□正互肣躲卅手及井升丹井毛腹據允月﹝ +踏摯互懇仄仁卅中巨件玄伉支﹜ +膜懇尕Х卅貲曰毛殖戈巨件玄伉反綽輪允月方丹皿伕件皿玄毛請允﹝ .P -備★及巨件玄伉□卞覆仄化 +備★及巨件玄伉卞覆仄化 .sp .in +.5i -- 勂及醒互懇仄中井 +- 白奴□伙玉及醒互懇仄中井 .br - 弘伙□皿抩卞褐呁互卅中井 .br -- 丟件田□菴太棟咥樊及伉旦玄互懇仄中井 +- 丟件田□及伉旦玄午棟咥樊及伉旦玄互懇仄中井 .in -.5i -羈及民尼永弁互墊歹木月﹝ .sp +互民尼永弁今木月﹝ .P -勂及醒互懇仄中仇午菴太弘伙□皿抩及褐呁互卅中仇午互瘉手褐邰匹丐月﹝ -勂及醒互懇仄仁卅中樺寧﹜公及墊及巨件玄伉□毛綽輪允月方丹瞼今木月﹝ -綽輪卞き啦仄卅井勻凶樺寧反﹜公木動嫦及民尼永弁反拑骰今木月﹝ -褐呁仄凶弘伙□皿抩互丐勻凶樺寧手綽輪毛瞼今木月互﹜仇及樺寧反 -綽輪仄卅仁化手公木動嫦及民尼永弁反糧墊今木月﹝ -職及蟈化及巨仿□卞覆仄化反煞屢互卅今木月及心匹丐曰﹜公及樺寧反 -貲曰毛襪懇允月凶戶卞\fBgroupmod\fR戊穴件玉毛撢墊允月方丹換戶日木月﹝ +白奴□伙玉及醒互棉啜勻化中凶曰﹜ +弘伙□皿抩互褐呁仄化中月及反譙抰讀卅巨仿□匹丐月﹝ +白奴□伙玉及醒互懇仄仁卅中樺寧﹜ +交□扒□反公及巨件玄伉墊毛綽輪允月方丹瞼今木月﹝ +綽輪卞き啦仄卅井勻凶樺寧反﹜公木動嫦及民尼永弁反墊歹木卅中﹝ +褐呁仄凶弘伙□皿抩互丐勻凶樺寧手綽輪毛瞼今木月互﹜ +仇及樺寧反綽輪仄卅仁化手公木動嫦及民尼永弁反糧墊今木月﹝ +職及蟈化及巨仿□卞覆仄化反煞屢互卅今木月﹝ +\fBgroupmod\fR 戊穴件玉毛撢墊仄化公及巨仿□毛膜懇允月午恌中分欠丹﹝ .P -\fI/etc/group\fR白央奶伙卞綜迕允月戊穴件玉反﹜莽木凶手仄仁反 -褐呁仄凶巨件玄伉□毛庍凳允月仇午反請侳卅中﹝ -公及方丹卅端卞貲曰及丐月巨件玄伉□毛綽輪允月凶戶卞反 -\fBgrpck\fR毛迕中卅仁化反卅日卅中﹝ +\fI/etc/group\fR 白央奶伙毛醜綜允月戊穴件玉反﹜ +莽木凶巨件玄伉支褐呁仄凶巨件玄伉毛庍凳匹五卅中﹝ +公及方丹卅端卞貲曰及丐月巨件玄伉毛綽輪允月卞反 +\fBgrpck\fR 毛迕中月午方中﹝ .SH 左皿扑亦件 -犯奴白巧伙玄匹反﹜\fBgrpck\fR反\fI/etc/group\fR白央奶伙菴太 -\fI/etc/gshadow\fR卞綜迕允月﹝ -\fIgroup\fR菴太\fIshadow\fR由仿丟□正毛迕中化帎及白央奶伙毛薊鎗允月 -儀手匹五月﹝ -笛尹化﹜\fB-r\fR白仿永弘毛隙爛允月仇午卞方曰﹜ +犯白巧伙玄匹反 \fBgrpck\fR 反 \fI/etc/group\fR 白央奶伙午 +\fI/etc/gshadow\fR 卞覆仄化が綜允月﹝ +\fIgroup\fR 由仿丟□正午 \fIshadow\fR 由仿丟□正毛迕中化﹜ +帎及白央奶伙毛薊鎗允月仇午手匹五月﹝ +今日卞 \fB-r\fR 白仿弘毛隙爛允木壬﹜ 伉□玉左件伉□乒□玉匹戊穴件玉毛撢墊允月仇午手匹五月﹝ -仇及樺寧反﹜庍凳毛墊丹井升丹井及撙杽卞覆仄化中切中切蠶尹卅仁午手﹜ -憤が讀卞\fBno\fR午莢蠶今木月﹝ +仇及樺寧﹜庍凳毛墊丹井升丹井反交□扒尺杽中寧歹今木內﹜ +憤が讀卞 \fBno\fR 午莢蠶今木月﹝ +.B grpck +反 +\fI/etc/group\fR 午 \fI/etc/gshadow\fR +及巨件玄伉毛 GID 匹末□玄允月仇午手匹五月﹝ +末□玄乒□玉匹が綜今六月卞反 \fB-s\fR 白仿弘毛芨尹月﹝ +仇及樺寧民尼永弁反墊歹木內﹜簽卞末□玄允月分仃匹丐月﹝ .SH 白央奶伙 -/etc/group \- 弘伙□皿失市它件玄卞楮允月樹扷 +\fI/etc/group\fR \ - 弘伙□皿失市它件玄樹扷 .br -/etc/gshadow \- 剪寞祭今木凶由旦伐□玉﹜菴太弘伙□皿棟咥樊及樹扷 +\fI/etc/gshadow\fR \- 剪寞祭今木凶由旦伐□玉午弘伙□皿棟咥樊樹扷 .br -/etc/passwd \- 交□扒卞楮允月樹扷 +\fI/etc/passwd\fR \ - 交□扒□樹扷 .SH 楮洘嫩杴 .BR group (5), .BR passwd (5), .BR shadow (5), .BR groupmod (8) .SH 忒曰襖 -\fBgrpck\fR戊穴件玉反動票及枑曰襖毛忒仄化蔽弇允月: +\fBgrpck\fR 戊穴件玉反蔽弇凜卞動票及襖毛忒允: .IP 0 5 嶽跦 .IP 1 5 厭妐巨仿□ .IP 2 5 -貲曰及丐月弘伙□皿巨件玄伉□互繡箕允月 +貲勻凶弘伙□皿巨件玄伉互繡箕允月 .IP 3 5 弘伙□皿白央奶伙毛左□皿件匹五卅中 .IP 4 5 diff --git a/man/ja/id.1 b/man/ja/id.1 index 8ae3f615..37956fa3 100644 --- a/man/ja/id.1 +++ b/man/ja/id.1 @@ -1,3 +1,4 @@ +.\"$Id: id.1,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,31 +26,32 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: id.1,v 1.2 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 2000 ISHIKAWA Keisuke .\" all rights reserved. .\" Translated Thu Nov 9 23:17:10 JST 2000 .\" by ISHIKAWA Keisuke +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" .TH ID 1 .SH 抩蟆 id \- 蜇箕及交□扒 ID 抩午弘伙□皿 ID 抩毛刓憎允月 .SH 踏摯 -.B id -.RB [ -a ] +\fBid\fR [\fB-a\fR] .SH 濩抸 -.B id -反﹜蜇箕及撢交□扒 ID﹜撢躲交□扒 ID﹜撢弘伙□皿 ID﹜撢躲弘伙□皿 ID 及抩蟆引凶反襖毛刓憎允月﹝ -\fI/etc/passwd\fR 卞﹜公及襖卞覆殺允月巨件玄伉互繡箕仄卅中樺寧反﹜覆殺允月抩蟆反刓憎今木內卞襖分仃互刓憎今木月﹝ -\fB-a\fR 白仿弘 (左皿扑亦件) 毛隙爛允月午﹜交□扒毛呁醒及弘伙□皿及丟件田□卞匹五月扑旦氾丞匹及弘伙□皿’本永玄互刓憎今木月﹝ +\fBid\fR反﹜蜇箕及撢交□扒 ID﹜撢躲交□扒 ID﹜撢弘伙□皿 ID﹜ +撢躲弘伙□皿 ID 及抩蟆引凶反襖毛刓憎允月﹝ +襖卞覆殺允月巨件玄伉互 \fI/etc/passwd\fR 支 +\fI/etc/group\fR 卞繡箕仄卅中樺寧反﹜ +覆殺允月抩蟆反刓憎今木內卞襖分仃互刓憎今木月﹝ +交□扒互き凜卞呁醒及弘伙□皿及丟件田□卞卅木月扑旦氾丞匹反﹜ +\fB-a\fR 左皿扑亦件毛隙爛允月午弘伙□皿及螂寧互刓憎今木月﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒□失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒□失市它件玄樹扷 .br -/etc/group \- 弘伙□皿樹扷 +\fI/etc/group\fR \ - 弘伙□皿樹扷 .SH 楮洘嫩杴 .BR getgid (2), .BR getgroups (2), .BR getuid (2) .SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +Julianne Frances Haugh diff --git a/man/ja/lastlog.8 b/man/ja/lastlog.8 index 7493d7dd..18159625 100644 --- a/man/ja/lastlog.8 +++ b/man/ja/lastlog.8 @@ -1,3 +1,4 @@ +.\"$Id: lastlog.8,v 1.8 2003/04/28 06:38:54 kloczek Exp $ .\" Copyright 1992, Phillip Street and Julianne Frances Haugh .\" All rights reserved. .\" @@ -24,9 +25,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" .\" @(#)lastlog.8 3.3 08:24:58 29 Sep 1993 (National Guard Release) -.\" $Id: lastlog.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ .\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. @@ -34,41 +33,48 @@ .\" by Kazuyoshi Furutaka .\" Updated & Modified Thu Oct 14 1997 by NAKANO Takeo .\" Updated Fri Jan 12 2001 by Kentaro Shirakata +.\" Updated Mon Mar 4 2002 by kentaro Shirakata +.\" Modified Sat 21 Sep 2002 by NAKANO Takeo .\" .TH LASTLOG 8 .SH 抩蟆 lastlog \- lastlog 白央奶伙毛譬屯月 .SH 踏摯 -.B lastlog -.RB [ \-u -.IR login-name ] -.RB [ \-t -.IR days ] +.TP 8 +\fBlastlog\fR [(\fB-u\fR|\fB--user\fR) \fIlogin\fR] +[(\fB-t\fR|\fB--time\fR) \fIdays\fR] [(\fB-h\fR|\fB--help\fR)] .SH 濩抸 \fBlastlog\fR 反瘉蔽伕弘奶件及筏狤白央奶伙 \fI/var/log/lastlog\fR 及ま芢毛幫溥仄化刓憎允月﹝ -\fBlogin-name\fR, \fBport\fR, \fBlast login time\fR 互刓憎今木月﹝ -犯白巧伙玄匹反 (白仿弘毛隙爛仄卅井勻凶樺寧反) lastlog 巨件玄伉毛 -UID 及醒襖匹末□玄仄化刓憎允月﹝ -\fB\-u \fIlogin-name\fR 白仿弘毛隙爛允月午 -\fIlogin-name\fR 及筏狤分仃互刓憎今木月﹝ -\fB\-t \fIdays\fR 午ェ恘允月午瘉嗤 -\fIdays\fR ゥ動ま及瘉蔽伕弘奶件毛刓憎允月﹝ -\fB\-t\fR 白仿弘毛迕中月午 \fB\-u\fR 白仿弘及隙爛反拑骰今木月﹝ +\fB伕弘奶件抩\fR’\fB禾□玄\fR’\fB瘉蔽伕弘奶件凜對\fR﹜互刓憎今木月﹝ +左皿扑亦件毛隙爛仄卅井勻凶樺寧﹜犯白巧伙玄匹反 +lastlog 巨件玄伉毛 UID 及醒襖匹末□玄仄化刓憎允月﹝ +.TP +\fB-u\fR, \fB--user\fR \fIlogin-name\fR +\fIlogin-name\fR 及筏狤分仃毛刓憎允月﹝ +.TP +\fB-t\fR, \fB--time\fR \fIdays\fR +瘉嗤 \fIdays\fR ゥ動ま及瘉蔽伕弘奶件毛刓憎允月﹝ +.TP +\fB-h\fR, \fB--help\fR +左件仿奶件目伙皿毛刓憎仄化蔽弇允月﹝ +.PP +\fB-u\fR 白仿弘毛迕中月午 \fB-t\fR 反拑骰今木月﹝ +.\"nakano 午中丹及互撢端及が綜及方丹卞葦尹月及分互﹝ .PP 域蘸手伕弘奶件仄化中卅中交□扒卞覆仄化反﹜ 禾□玄午凜對及醫歹曰卞 \fB"**Never logged in**"\fR 午中丹丟永本□斥互刓憎今木月﹝ .SH 白央奶伙 -/var/log/lastlog \- lastlog 筏狤白央奶伙 +\fI/var/log/lastlog\fR \- lastlog 筏狤白央奶伙 .SH 煞屢 -uid 砦璊侁蝷迨岓穭茪洶═諵﹜ -lastlog 皿伕弘仿丞反贏凜棉旦弁伉□件卞窒手請恘仄卅中引引 -撢墊毛糧仃月 (勾引曰 mmdf=800 匹瘉詨及 uid=170及樺寧﹜ -uid 171-799 及棉皿伕弘仿丞反窒手請恘仄卅中及匹﹜ +UID 砦璊侁蝷迨岓穭茪洶═諵﹜ +lastlog 皿伕弘仿丞反贏凜棉脰昍卞窒手請恘仄卅中引引 +撢墊毛糧仃月 (拺尹壬 mmdf 互 800 匹瘉詨及 UID 互 170 及樺寧﹜ +UID 互 171-799 及棉皿伕弘仿丞反窒手請恘仄卅中及匹﹜ 甩件弘仄凶方丹卞葦尹月)﹝ .SH 難樊 Julianne Frances Haugh (jockgrrl@ix.netcom.com) -.br +.BR Phillip Street diff --git a/man/ja/limits.5 b/man/ja/limits.5 index 06342315..c0e8e179 100644 --- a/man/ja/limits.5 +++ b/man/ja/limits.5 @@ -1,77 +1,86 @@ +.\"$Id: limits.5,v 1.3 2003/04/28 02:14:00 kloczek Exp $ .\" .\" Japanese Version Copyright (c) 2001 Maki KURODA .\" all right reserved, .\" Translated Mon Nov 5 18:12:16 JST 2001 .\" by Maki KURODA +.\" Modified Tue 18 Sep 2002 by NAKANO Takeo .\" .TH LIMITS 5 .SH 抩蟆 -limits \- 鳳蜓孺蜃及爛聒 +limits \- 伉末□旦孺蜃及爛聒 .SH 濩抸 .I limits -白央奶伙 (犯白巧伙玄匹反 /etc/limits ﹜config.h 卞爛聒今木化中月 LIMITS_FILE) 反 -雄孺仄凶中鳳蜓及孺蜃毛筏課允月﹝ -仇及白央奶伙反 root 互赭肣仄﹜ root 失市它件玄及心づ心慇心第Х匹丐月屯五匹丐月‘ +白央奶伙 (犯白巧伙玄匹反 /etc/limits﹝ +丐月中反 config.h 匹爛聒仄凶 LIMITS_FILE) +卞反﹜澀爛仄凶中伉末□旦孺蜃毛筏課允月﹝ +仇及白央奶伙反 root 互赭肣仄﹜ +root 失市它件玄及心互づ心慇心第Х午允月屯五匹丐月‘ .PP -犯白巧伙玄匹反 root 卞覆允月喃曰癲化反墊歹木卅中﹝撢端﹜root 午き羈及失市它件玄 ( UID 0 毛髐角縞╞咱戎韞) -尺及仇及澎糧五卞方勻化孺蜃允月杅芊反卅中﹝ +犯白巧伙玄匹反 root 卞覆允月孺蜃反澀爛匹五卅中﹝ +撢反﹜root 午き羈及失市它件玄 (UID 0 及失市它件玄) +毛仇及澎蟾卞方勻化孺蜃允月仇午反匹五卅中﹝ .PP -備墊卞反動票及溥摯匹交□扒卞覆允月孺蜃毛筏課允月“ +備墊卞反動票及溥摯匹交□扒卞覆允月孺蜃毛筏課允月﹝ .sp .I user LIMITS_STRING .PP -\fBLIMITS_STRING\fP 反鳳蜓孺蜃及爛聒毛勾卅仆凶妐儂昫匹丐月﹝ -備孺蜃及爛聒反﹜1 妐儂及摹帎閡午﹜公木卞糧仁醒儂匹刓仄凶孺蜃襖匹厭嶽今木月﹝ +\fBLIMITS_STRING\fP 反伉末□旦孺蜃及爛聒毛洘瑛今六凶妐儂昫匹丐月﹝ +備孺蜃及爛聒反﹜1 妐儂及摹帎閡午﹜公木卞糧仁孺蜃醒襖井日卅月﹝ .PP -肣躲卅摹帎閡反動票匹丐月“ -A: 瘉釐失玉伊旦旦矢□旦 (KB) +肣躲卅摹帎閡反動票及騷曰﹝ +.sp +A: 失玉伊旦塢棉及瘉釐襖 (KB) .br -C: 瘉釐戊失白央奶伙扔奶朮 (KB) +C: 戊失白央奶伙扔奶朮及瘉釐襖 (KB) .br -D: 瘉釐犯□正扔奶朮 (KB) +D: 犯□正扔奶朮及瘉釐襖 (KB) .br -F: 瘉釐白央奶伙扔奶朮 (KB) +F: 白央奶伙扔奶朮及瘉釐襖 (KB) .br -M: 丟乒伉曉卞割忡今木月瘉釐失玉伊旦旦矢□旦 (KB) +M: 丟乒伉曉卞伕永弁匹五月失玉伊旦塢棉及瘉釐襖 (KB) .br -N: 瘉釐左□皿件白央奶伙醒 +N: 白央奶伙左□皿件醒及瘉釐襖 .br -R: 瘉釐伊斥犯件玄澀爛扔奶朮 (KB) +R: 伊斥犯件玄本永玄扔奶朮及瘉釐襖 (KB) .br -S: 瘉釐旦正永弁扔奶朮 (KB) +S: 旦正永弁扔奶朮及瘉釐襖 (KB) .br -T: 瘉釐 CPU 凜棉 (MIN) +T: CPU 凜棉及瘉釐襖 (坌) .br -U: 瘉釐皿伕本旦醒 +U: 皿伕本旦醒及瘉釐襖 .br -K: \fBumask\fR(2) 卞方月澀爛今木月﹜白央奶伙綜嶽凜及 mask +K: \fBumask\fR(2) 卞方曰澀爛今木月﹜白央奶伙綜嶽凜及 mask .br -L: 交□扒及瘉釐伕弘奶件醒 +L: 仇及交□扒及き凜伕弘奶件醒及瘉釐襖 .br P: \fBsetpriority\fR(2) 卞方勻化澀爛今木月皿伕本旦穸燮蘸 .PP -拺尹壬﹜\fIL2D2048N5\fP 反肣躲卅 \fBLIMITS_STRING\fP 匹丐月﹝づ心支允今毛嗶尹化﹜ -2 筇雂恄膉峇銴忖宒韙倚毛允月仇午手匹五月“ +拺尹壬﹜\fIL2D2048N5\fP 反懇仄中 \fBLIMITS_STRING\fP 匹丐月﹝ +動票及 2 勾及拺反羈笠匹丐月﹝2 筇雂峇銴忖侔氻葥蚺紗韙砟酗手匹五月﹝ .sp username L2D2048N5 .br username L2 D2048 N5 .PP -\fIusername\fP 及詨及墊及酸曰互孺蜃今木凶妐儂昫午仄化健歹木月及匹﹜ -戊丟件玄互袱第今木卅中仇午卞鏜啦允月仇午﹝ -拑躲卅孺蜃妐儂昫反﹜login 皿伕弘仿丞卞方勻化蛐濮今木月(拑骰今木月)分欠丹﹝ +\fIusername\fP 動嫦及墊及酸曰互孺蜃迕及妐儂昫午仄化健歹木月及匹﹜ +戊丟件玄反踏仁仇午互匹五卅中﹝ +login 皿伕弘仿丞反﹜懇仄仁卅中孺蜃妐儂昫反蛐濮允月 (拑骰允月)﹝ .PP -犯白巧伙玄及隙爛反交□扒抩 "\fB*\fP" 卞方勻化刓憎今木月﹝ -\fBLIMITS_FILE\fP 卞聶醒及 \fIdefault\fP 毛瓚狤仄化中月樺寧﹜ +犯白巧伙玄及巨件玄伉反﹜交□扒抩互 "\fB*\fP" 午卅勻化中月手及匹丐月﹝ +\fBLIMITS_FILE\fP 卞呁醒及\fI犯白巧伙玄\fP毛瓚狤允月午﹜ 瘉詨及手及互犯白巧伙玄隙爛午仄化銀迕今木月﹝ .PP -丐月交□扒尺及孺蜃毛敦蟈卞拑躲卞允月卞反﹜扑件弘伙母永扑亙 "\fB-\fP" 毛銀迕允月﹝ +丐月交□扒尺及孺蜃毛敦蟈卞拑躲卞允月卞反﹜ +扑件弘伙母永扑亙 "\fB-\fP" 毛銀迕允月﹝ .PP -今日卞﹜蟈化及孺蜃及澀爛反＞伕弘奶件咍＝匹澀爛今木化中月仇午卞鏜啦允月仇午﹝ -公木日反弘伕□田伙匹反卅仁引凶﹜捩菁匹反卅中﹝弘伕□田伙卅孺蜃互第Х卞卅月午五互 -侳月分欠丹互﹜漆及午仇欠反＞仄卅仃木壬卅日卅中仇午＝匹丐月﹝;) +今日卞﹜蟈化及孺蜃及澀爛反＞伕弘奶件簽匏＝匹澀爛今木化中月仇午卞鏜啦允月仇午﹝ +孺蜃反弘伕□田伙匹反卅仁﹜捩糧讀匹手卅中﹝ +弘伕□田伙卅孺蜃反中內木第Х卞卅月分欠丹互﹜ +漆及午仇欠反＞TO DO＝匹丐月﹝;) +.\"nakano わ筇雂恀舅酗鴗リ中中峇咫吨╮ .SH 白央奶伙 -/etc/limits +\fI/etc/limits\fR .SH 楮洘嫩杴 .BR login (1), .BR setpriority (2), diff --git a/man/ja/login.1 b/man/ja/login.1 index c51bc782..63738929 100644 --- a/man/ja/login.1 +++ b/man/ja/login.1 @@ -1,3 +1,4 @@ +.\"$Id: login.1,v 1.6 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,24 +26,23 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: login.1,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka .\" Updated Fri Jan 12 04:05:44 JST 2001 .\" by Kentaro Shirakata +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" .TH LOGIN 1 .SH 抩蟆 -login \- 扑旦氾丞曉卞本永扑亦件毛釩仁 +login \- 扑旦氾丞曉匹本永扑亦件毛釩仁 .SH 踏摯 -\fBlogin\fR [\fB-p\fR] [\fIusername\fR] [\fIENV=VAR ...\fR] +\fBlogin\fR [\fB-p\fR] [\fIusername\fR] [\fIENV=VAR\fR ...] .br -\fBlogin\fR [\fB-p\fR] [\fB-h\fR \fIhost\fR] [\fB-f\fR \fIusername\fR] +\fBlogin\fR [\fB-p\fR] [\fB-h \fIhost\fR] [\fB-f \fIusername\fR] .br -\fBlogin\fR [\fB-p\fR] \fB-r\fR \fIhost\fR +\fBlogin\fR [\fB-p\fR] \fB-r \fIhost\fR .SH 濩抸 .B login 反扑旦氾丞卞蕙凶卞本永扑亦件毛釩仁凶戶卞迕中日木月﹝ @@ -50,148 +50,103 @@ login \- .I login: 午中丹皿伕件皿玄卞殺元月儀卞方勻化憤が讀卞粟が今木月﹝ .B login -反扑尼伙卞及心蜃爛今木化云曰﹜扔皮皿伕本旦午仄化粟が允月仇午反請侳卅中﹝ -霾滇讀卞反﹜扑尼伙反 +反扑尼伙燬迕及手及匹丐曰﹜ +扔皮皿伕本旦午仄化粟が允月仇午反匹五卅中﹝ +騷橘扑尼伙反 .B login 毛 -\fBexec login\fR午葦哤允及匹﹜交□扒反蜇箕及扑尼伙井日握惜諵酗卞卅月﹝ -伕弘奶件扑尼伙動陸井日\fBlogin\fR毛粟が仄方丹午允月午﹜巨仿□丟永本□斥互 -刓憎今木月﹝ +\fBexec login\fR 午心卅允及匹﹜交□扒反蜇箕及扑尼伙井日握惜諵酗卞卅月﹝ +伕弘奶件扑尼伙動陸井日 \fBlogin\fR 毛粟が仄方丹午允月午﹜ +巨仿□丟永本□斥互刓憎今木月﹝ .PP -\fIlogin:\fR皿伕件皿玄井日粟が仄凶端反﹜交□扒抩卞糧中化棕雁庍醒毛ェ恘 -允月儀手匹五月﹝ -公木日毛ェ恘允月樺寧反\fBNAME=VALUE\fR午中丹踏摯匹墊丹﹝ +\fIlogin:\fR皿伕件皿玄井日粟が仄凶端反﹜ +交□扒抩卞糧中化棕雁庍醒毛ェ恘允月儀手匹五月﹝ +公木日毛ェ恘允月樺寧反 \fBNAME=VALUE\fR 午中丹踏摯匹墊丹﹝ 仇及杅芊匹蟈化及庍醒毛澀爛匹五月歹仃匹反卅中﹝ -澀爛匹五卅中手及及醫刓拺午仄化﹜\fBPATH\fR, \fBHOME\fR, \fBSHELL\fR互 -丐月﹝ -笛尹化﹜伕弘奶件扑尼伙互\fB/bin/sh\fR及樺寧反\fBIFS\fR及澀爛手 -墊丹儀互請侳卅中﹝ +拺尹壬 +\fBPATH\fR, \fBHOME\fR, \fBSHELL\fR +卅升反澀爛匹五卅中﹝ +今日卞伕弘奶件扑尼伙互 \fB/bin/sh\fR 及樺寧反 +\fBIFS\fR 手澀爛手匹五卅中﹝ .PP -慼中匹﹜优邰卅日壬﹜由旦伐□玉及ェ恘毛瞼今木月﹝ -由旦伐□玉毛抸井仄化仄引歹卅中凶戶卞﹜巨戊□反墊歹木卅中﹝ -醒莢動曉由旦伐□玉ェ恘卞撩л允月午\fBlogin\fR反蔽弇仄騷耨及濤糧反 -濠蠅今木化仄引丹﹝ +慼中匹﹜优邰卅樺寧卞反﹜交□扒反由旦伐□玉毛ェ恘允月方丹瞼今木月﹝ +由旦伐□玉毛刓憎仄化仄引歹卅中方丹﹜巨戊□反墊歹木卅中﹝ +醒莢動曉由旦伐□玉ェ恘卞撩л允月午 +\fBlogin\fR 反蔽弇仄﹜騷耨及濤糧反濠蠅今木化仄引丹﹝ .PP 失市它件玄卞覆仄化由旦伐□玉及肣躲渝蜃互澀爛今木化中月樺寧反﹜ 燮卞褡戈蟆卞蕙仄中由旦伐□玉及澀爛毛瞼今木月仇午手丐月﹝ -本永扑亦件毛糧仃月凶戶卞反衙中由旦伐□玉菴太蕙仄中由旦伐□玉毛ェ恘 -仄卅仁化反卅日卅中﹝ -擇仄中樹扷反\fBpasswd\fR (1)毛輔寰六方﹝ +本永扑亦件毛糧仃月凶戶卞反衙中由旦伐□玉午 +蕙仄中由旦伐□玉毛ェ恘仄卅仁化反卅日卅中﹝ +擇仄中樹扷反 \fBpasswd\fR(1) 毛輔寰允月仇午﹝ .PP -伕弘奶件卞嶽跦允月午﹜扑旦氾丞卞楮允月樹扷支丟奶伙及肣拑互刓憎今木月﹝ -伕弘奶件犯奴伊弁玄伉卞贏今 0 及白央奶伙\fI.hushlogin\fR毛綜勻化云仁仇午匹﹜ -扑旦氾丞及丟永本□斥白央奶伙﹜穡切\fI/etc/motd\fR互刓憎今木卅仁允月仇午 -手請侳月﹝ -丟奶伙卞楮允月丟永本□斥午仄化反﹜丟奶伙示永弁旦及橇謫卞方勻化 +伕弘奶件卞嶽跦允月午﹜扑旦氾丞丟永本□斥支丟□伙及肣拑互刓憎今木月﹝ +伕弘奶件犯奴伊弁玄伉卞贏今 0 及白央奶伙 \fI.hushlogin\fR 毛綜勻化云仃壬﹜ +扑旦氾丞丟永本□斥白央奶伙匹丐月 +\fI/etc/motd\fR 及刓憎毛拑躲卞匹五月﹝ +丟□伙卞楮允月丟永本□斥反﹜丟□伙示永弁旦及橇謫卞方勻化 "\fBYou have new mail.\fR", -"\fBYou have mail.\fR", "\fBNo Mail.\fR"及中內木互刓憎今木月﹝ +"\fBYou have mail.\fR", +"\fBNo Mail.\fR" +及中內木井卞卅月﹝ .PP -交□扒菴太弘伙□皿及ID反\fI/etc/passwd\fR白央奶伙醱卞筏竭今木化中月襖 -卞方勻化澀爛今木月﹝ -\fB$HOME\fR, \fB$SHELL\fR, \fB$PATH\fR, \fB$LOGNAME\fR, \fB$MAIL\fR及襖 -反由旦伐□玉巨件玄伉□醱及覆殺允月勂卞筏今木凶襖卞方勻化澀爛今木月﹝ -ulimit, umask, nice襖毛 GECOS 勂及巨件玄伉□卞方勻化澀爛允月仇午手匹五月﹝ +交□扒 ID 午弘伙□皿及 ID 反 +\fI/etc/passwd\fR 白央奶伙醱卞筏竭今木化中月襖卞蝨勻化澀爛今木月﹝ +\fB$HOME\fR, \fB$SHELL\fR, \fB$PATH\fR, \fB$LOGNAME\fR, \fB$MAIL\fR +及襖反﹜由旦伐□玉巨件玄伉及公木冗木及白奴□伙玉卞蝨勻化澀爛今木月﹝ +ulimit, umask, nice 襖互﹜ +GECOS 白奴□伙玉及巨件玄伉□卞方勻化澀爛今木月仇午手丐月﹝ .PP -奶件旦玄伊□扑亦件卞方勻化反﹜ -tty犯田奶旦及羹坱及潘挀卞丐歹六化﹜ -棕雁庍醒\fB$TERM\fR互 -\fI/etc/ttytype\fR卞隙爛今木凶騷曰卞賡渝祭今木月﹝ +奶件旦玄□伙凜及澀爛卞方勻化反﹜ +\fI/etc/ttytype\fR 及隙爛卞蝨勻化﹜ +棕雁庍醒\fB$TERM\fR互 tty 濤糧及羹坱及滇 (terminal type) +卞賡渝祭今木月仇午手丐月﹝ .PP 戊穴件玉奶件正皿伉正及賡渝祭旦弁伉皿玄互撢墊今木月仇午手丐月﹝ 仇及窗Х卞勾中化及擇仄中樹扷反贗癲卅穴瓦亙失伙本弁扑亦件毛輔寰及仇午﹝ .PP -扔皮扑旦氾丞伕弘奶件反伕弘奶件扑尼伙及瘉賡及妐儂午仄化 -"*" 毛譆仁仇午匹隙爛允月﹝ -芨尹日木凶石□丞犯奴伊弁玄伉反交□扒互撢端卞伕弘奶件允月 -蕙仄中白央奶伙扑旦氾丞及伙□玄午仄化健歹木月﹝ +扔皮扑旦氾丞伕弘奶件匹反﹜ +伕弘奶件扑尼伙及瘉賡及妐儂卞 "*" 毛譆仁﹝ +欐今木凶石□丞犯奴伊弁玄伉反﹜ +交□扒互撢端卞伕弘奶件允月蕙仄中白央奶伙扑旦氾丞及伙□玄午仄化健歹木月﹝ .SH 左皿扑亦件 .TP .B -p 棕雁毛忡繡允月﹝ .TP .B -f -交□扒反儀蟆ロ據今木化中月手及午仄化﹜ロ據が綜毛墊卅歹卅中﹝ +交□扒反允匹卞ロ據今木化中月手及午仄化﹜ロ據が綜毛墊卅歹卅中﹝ .TP .B -h -仇及伕弘奶件及凶戶及伉乒□玄石旦玄及抩蟆﹝ +仇及伕弘奶件及伉乒□玄石旦玄及抩蟆﹝ .TP .B -r -rlogin 及凶戶及憤が伕弘奶件皿伕玄戊伙毛撢墊允月﹝ +rlogin 及憤が伕弘奶件皿伕玄戊伙毛撢墊允月﹝ .PP -\fB-r\fP, \fB-h\fP, \fB-f\fP 左皿扑亦件反 \fBlogin\fP 互 root 午仄化粟が今木凶 -樺寧卞及心迕中日木月﹝ +\fB-r\fP, \fB-h\fP, \fB-f\fP 左皿扑亦件反﹜ +root 互 \fBlogin\fP 毛粟が仄凶樺寧卞及心迕中月﹝ .SH 煞屢 +仇及リ \fBlogin\fR 卞反聶仁及戊件由奶伙凜左皿扑亦件互丐月互﹜ +扔奶玄卞方勻化反仇及丹切及域朿仄井銀歹木化中卅中井手仄木卅中﹝ .PP -仇及リ垥fBlogin\fR卞反聶仁及戊件由奶伙凜左皿扑亦件互丐月互﹜ -扔奶玄卞方勻化反﹜公及丹切及中仁勾井仄井銀歹木化中卅中仇午手丐月﹝ -.PP -扑旦氾丞及澀爛及啜中卞方勻化曉筏白央奶伙及箕質反井歹月﹝ -.SH shadow 伕弘奶件皿伕弘仿丞匹及交□扒孺蜃及澀爛杅芊 -.PP -引內﹜伉末□旦卞覆仄化翌仄凶中孺蜃毛筏仄凶﹜root 及心互づ戈仇午及請侳月 -白央奶伙(犯白巧伙玄匹反\fB/etc/limits\fR﹜ -引凶反 config.h 醱匹爛聒今木化中月 LIMITS_FILE 匹隙爛仄凶手及)毛綜月﹝ -犯白巧伙玄匹反﹜'root'卞反 quota 及孺蜃反翌今木卅中﹝ -撢端及午仇欠﹜仇及澎芊卞方勻化 root 午き腺及失市它件玄(UID 互 0 及失市它件玄) -卞孺蜃毛翌允澎峏化反繡箕仄卅中﹝ -.PP -備墊卞反動票及踏摯匹交□扒尺及孺蜃毛踏中化云仁﹝ -.br -\fBuser LIMITS_STRING\fR -.PP -\fBLIMITS_STRING\fR反伉末□旦卞覆允月孺蜃及伉旦玄毛洘瑛仄凶 -妐儂昫匹丐月﹝ -備孺蜃反摹帎閡域妐儂午公木卞糧仁孺蜃醒襖卞方勻化隙爛允月﹝ -摹帎閡午仄化肣躲卅手及反: -.br -\fBC\fR: core 白央奶伙扔奶朮及瘉釐襖 (KB) -.br -\fBD\fR: 瘉釐及犯□正扔奶朮 (KB) -.br -\fBF\fR: 瘉釐及白央奶伙扔奶朮 (KB) -.br -\fBM\fR: 丟乒伉醱匹燥肣允月仇午及請侳月失玉伊旦塢棉及瘉釐襖 (KB) -.br -\fBN\fR: 釩仁仇午及請侳月白央奶伙醒及瘉釐襖 -.br -\fBR\fR: 橘鏤今六日木月瘉釐扔奶朮 (KB) -.br -\fBS\fR: 瘉釐及旦正永弁扔奶朮 (KB) -.br -\fBT\fR: 瘉釐 CPU 正奶丞 (坌) -.br -\fBU\fR: 瘉釐皿伕本旦醒 -.br -\fBL\fR: 伕弘奶件請侳月醒及瘉釐襖 -.PP -拺尹壬﹜\fBL2D2048N5\fR反懇仄中\fBLIMITS_STRING\fR匹丐月﹝ -.PP -犯白巧伙玄及巨件玄伉□反'\fB*\fR'午中丹交□扒抩匹刓今木月﹝ -LIMITS_FILE 醱卞呁醒及'犯白巧伙玄'巨件玄伉□互澀爛今木化中月樺寧反﹜ -瘉詨及手及互犯白巧伙玄巨件玄伉□午仄化迕中日木月﹝ +扑旦氾丞澀爛及啜中卞方勻化曉筏白央奶伙及譆五樺赭反庍歹月﹝ .SH 白央奶伙 -/etc/utmp \- 蜇箕及伕弘奶件本永扑亦件及伉旦玄 +\fI/var/log/utmp\fR \ - 蜇箕及伕弘奶件本永扑亦件及伉旦玄 .br -/etc/wtmp \- 躂蟆及伕弘奶件本永扑亦件及伉旦玄 +\fI/var/run/wtmp\fR \ - 聊蛔及伕弘奶件本永扑亦件及伉旦玄 .br -/etc/passwd \- 交□扒失市它件玄及樹扷 +\fI/etc/passwd\fR \ - 交□扒失市它件玄樹扷 .br -/etc/shadow \- shadow 今木凶由旦伐□玉菴太﹜渝蜃及樹扷 +\fI/etc/shadow\fR \ - 剪寞祭由旦伐□玉午肣躲渝蜃樹扷 .br -/etc/motd \- 扑旦氾丞丟永本□斥白央奶伙 +\fI/etc/motd\fR \ - 扑旦氾丞丟永本□斥白央奶伙 .br -/etc/nologin \- root 動陸及交□扒及伕弘奶件毛俅孺允月 +\fI/etc/nologin\fR \ - root 動陸及交□扒及伕弘奶件毛嗟鞅允月 .br -/etc/ttytype \- 羹坱及潘挀及伉旦玄 -.br -/etc/limits \- 交□扒卞翌允扑旦氾丞伉末□旦尺及孺蜃 -.br -$HOME/.profile \- 犯白巧伙玄扑尼伙及賡渝祭旦弁伉皿玄 -.br -$HOME/.hushlogin \- 扑旦氾丞丟永本□斥及刓憎毛午戶月 +\fI/etc/ttytype\fR \ - 羹坱及滇及伉旦玄 .br +\fI$HOME/.hushlogin\fR \- 扑旦氾丞丟永本□斥及刓憎毛俅孺允月 .SH 楮洘嫩杴 -.PP .BR mail (1), .BR passwd (1), .BR sh (1), @@ -202,4 +157,4 @@ $HOME/.hushlogin \- .BR passwd (5), .BR getty (8) .SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +Julianne Frances Haugh diff --git a/man/ja/login.access.5 b/man/ja/login.access.5 index 6c4ef81c..2d97167c 100644 --- a/man/ja/login.access.5 +++ b/man/ja/login.access.5 @@ -1,54 +1,68 @@ -.\" This page is originally in the shadow package. -.\" -.\" Translated Fri 14 Feb 1997 by Kazuyoshi Furutaka -.\" +.\"$Id: login.access.5,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" this is comment +.\" +.\" This page is originally in the shadow package. +.\" Translated Fri 14 Feb 1997 +.\" by Kazuyoshi Furutaka +.\" Modified Tue 18 Sep 2002 by NAKNAO Takeo +.\" .TH LOGIN.ACCESS 5 .\" .Dt SKEY.ACCESS 5 .\" .Os FreeBSD 1.2 .SH 抩蟆 -login.access \- 伕弘奶件失弁本旦毛戊件玄伕□伙允月氾□皮伙 +login.access \- 伕弘奶件失弁本旦及孺豢刓 .SH 濩抸 .I login.access -白央奶伙卞反﹜伕弘奶件毛袱第坭反蛐濮允月(交□扒, 石旦玄)及賺菴太/坭反 -(交□扒, tty)及賺心丐歹六毛隙爛允月﹝ +白央奶伙卞反﹜伕弘奶件毛袱第引凶反蛐濮允月﹜ +(交□扒, 石旦玄) 支 (交□扒, tty) 及賺心寧歹六毛隙爛允月﹝ .PP -簿井互伕弘奶件仄凶端反﹜ +簿井互伕弘奶件允月午﹜ .I login.access -白央奶伙互旦平乓件今木﹜瘉賡卞扞寧允月(交□扒,石旦玄)及賺寧六﹜手仄仁反 -生永玄伐□弁煩苀及伕弘奶件匹卅中樺寧反瘉賡卞扞寧允月(交□扒, tty)及賺心 -寧歹六毛繭允﹝ -仇及氾□皮伙及袱第勂卞方勻化伕弘奶件互袱第今木月井蛐濮今木月井互瑁引月﹝ +白央奶伙互旦平乓件今木﹜瘉賡卞穴永民允月 +(交□扒,石旦玄) 及賺﹜ +丐月中反生永玄伐□弁煩苀及伕弘奶件匹卅中樺寧反瘉賡卞穴永民允月 +(交□扒, tty) 及賺毛繭允﹝ +仇及氾□皮伙及袱第白奴□伙玉卞方勻化﹜ +伕弘奶件互袱第今木月井蛐濮今木月井互瑁引月﹝ .PP -伕弘奶件失弁本旦孺豢刓及備墊卞反3勾及勂互丐曰﹜妐儂":"匹坌喃今木化中月: +伕弘奶件失弁本旦孺豢刓及備墊反 3 勾及白奴□伙玉井日卅曰﹜ +妐儂 ":" 匹坌喃今木月﹝ .sp 1 -.IR 袱第 : 交□扒 : 濤糧葭 +.IR permission : users : origins .sp 1 -瘉賡及勂反"\fB+\fR"(失弁本旦毛袱第允月)手仄仁反"\fB-\fR"(失弁本旦毛蛐搕馱)匹卅仁化反 -卅日卅中﹝ -わ筇雂怤韝炾鴗襤尨憭峊磳陞丰鯦黎牏縣洏陞諢憧訞鴃═滮楔砟 +瘉賡及白奴□伙玉反 "\fB+\fR" (失弁本旦毛袱第允月) 井 +"\fB-\fR" (失弁本旦毛蛐搕馱) 匹卅仃木壬卅日卅中﹝ +わ筇雂峊掍ㄐ憧諝氻洁１鴗襤尨憭峊磳陞丰鯦黎銗陞諢憧訞鴃 +手仄仁反 .B ALL -(优內扞寧允月) -匹卅仁化反卅日卅中﹝ -趕筇雂怤韝洁１鴗襤尨憭姾ty抩(生永玄伐□弁煩苀匹卅中伕弘奶件及樺寧)﹜ -石旦玄抩﹜("\fB.\fR"匹銨引月)玉丟奶件抩﹜石旦玄失玉伊旦﹜引凶反("\fB.\fR"匹蔽歹月) -奶件正□生永玄及生永玄伐□弁砦璊咫擗吨諝磪馴﹜ +(优內穴永民允月) +匹卅仃木壬卅日卅中﹝ +趕筇雂峊掍ㄐ憧諝氻洁 +tty 抩 (生永玄伐□弁煩苀匹卅中伕弘奶件及樺寧)﹜ +石旦玄抩﹜ +玉丟奶件抩 ("\fB.\fR"匹銨引月)﹜ +石旦玄失玉伊旦﹜ +奶件正□生永玄及生永玄伐□弁砦 ("\fB.\fR"匹蔽歹月)﹜ +及夫午勾動曉及厭嶽邰豳井日卅月伉旦玄匹丐月井﹜ .B ALL -(优內扞寧允月)坭反 +(优內穴永民允月) 引凶反 .B LOCAL -("\fB.\fR"毛蟈仁殖引卅中妐儂昫蟈化卞扞寧允月)匹卅仁化反卅日卅中﹝ -NIS毛捫迕仄化中月樺寧反﹜石旦玄坭反交□扒及由正□件醱卞@netgroupname -毛隙爛允月仇午互請侳月﹝ +("\fB.\fR"毛蟈仁殖引卅中妐儂昫蟈化卞穴永民允月) +及中內木井匹卅仁化反卅日卅中﹝ +NIS 毛捫迕仄化中月樺寧反﹜石旦玄支交□扒及由正□件匹 +@netgroupname 互銀尹月﹝ .PP .B EXCEPT -左矢伊□正毛迕中月仇午卞方曰﹜午化手棵峎卞伙□伙毛隙爛允月仇午互請侳月﹝ +左矢伊□正毛迕中月午﹜ +騞鴾侅庉洶迉諢憧諵羃媊磥リ迨諢 .PP -伕弘奶件允月交□扒抩互中內木及抩蟆午手扞寧仄卅中樺寧及心﹜group白央奶伙 -毛腹綢允月﹝ -交□扒抩互阺卞筏今木化中月弘伙□皿卞及心扞寧允月: 皿伕弘仿丞反交□扒及 -潛弘伙□皿及id砦禚齯牉咫吨丑 +group 白央奶伙互腹綢今木月及反﹜ +伕弘奶件允月交□扒抩互抩蟆卞穴永民仄卅井勻凶樺寧卞蜃日木月﹝ +穴永民允月弘伙□皿反﹜ +group 白央奶伙醱匹交□扒抩互抸憎讀卞伉旦玄今木化中月手及卞蜃日木月﹝ +仇及皿伕弘仿丞反交□扒及潛弘伙□皿及 ID 砦璊牏リ牉咫吨丑 .SH 白央奶伙 -/etc/login.access +\fI/etc/login.access\fR .SH 楮洘嫩杴 .BR login (1) .SH 難樊 diff --git a/man/ja/login.defs.5 b/man/ja/login.defs.5 index 52da5559..01f5e123 100644 --- a/man/ja/login.defs.5 +++ b/man/ja/login.defs.5 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: login.defs.5,v 1.3 2002/03/09 11:16:16 ankry Exp $ +.\" $Id: login.defs.5,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. @@ -35,33 +35,37 @@ .\" by Kentaro Shirakata .\" Updated Sat Jan 13 09:24:04 JST 2001 .\" by Kentaro Shirakata +.\" Updated Tue 18 Sep 2002 by NAKNAO Takeo .\" .\" WORD: shadow login suite shadow 伕弘奶件窗Х -.TH LOGIN 5 +.TH LOGIN.DEFS 5 .SH 抩蟆 -/etc/login.defs \- login及澀爛 +/etc/login.defs \- shadow 由旦伐□玉窗Х及澀爛 .SH 濩抸 .I /etc/login.defs -白央奶伙反 shadow 伕弘奶件窗Х卞覆允月扔奶玄裔肣及澀爛毛墊丹凶戶及手及匹丐月﹝ +白央奶伙反 shadow 伕弘奶件窗Х卞覆允月扔奶玄裔肣及澀爛毛爛聒允月﹝ 仇及白央奶伙反优內繡箕仄卅仃木壬卅日卅中﹝ -仇及白央奶伙互拑仁午手扑旦氾丞捫迕反第Х匹丐月互﹜云公日仁侗引卅中 -瑛絆午卅月分欠丹﹝ +仇及白央奶伙互拑仁化手扑旦氾丞捫迕反第Х匹丐月互﹜ +云公日仁侗引卅中瑛絆午卅月分欠丹﹝ .PP -仇及白央奶伙反づ心潸曰第Х卅氾平旦玄白央奶伙匹﹜白央奶伙醱及域墊卞勾五 -域勾及由仿丟□正毛澀爛仄化中月﹝ -備墊反澀爛由仿丟□正及抩蟆菴太公及襖互塢⑩匹嗉濠日木凶手及井日卅月﹝ -塢墊菴太戊丟件玄墊反拑骰今木月﹝ -戊丟件玄墊反`#'筏寞匹銨引月﹝筏寞`#'反公及墊匹及塢⑩動陸及瘉賡及妐儂 -匹卅仁化反卅日卅中﹝ +仇及白央奶伙反づ心潸曰第Х卅氾平旦玄白央奶伙匹﹜ +白央奶伙醱及域墊卞勾五域勾及澀爛由仿丟□正毛澀爛仄化中月﹝ +備墊匹反﹜澀爛由仿丟□正及抩蟆午公及襖互塢⑩匹嗉濠日木化憎今木月﹝ +塢墊午戊丟件玄墊反拑骰今木月﹝ +戊丟件玄墊反 `#' 筏寞匹銨引月﹝ +筏寞`#'反公及墊匹及塢⑩動陸及瘉賡及妐儂匹卅仃木壬卅日卅中﹝ .PP -由仿丟□正襖反銓勾及滇毛潸月仇午互請侳月: 妐儂昫﹜皮□伙滇﹜醒﹜у擎蘸醒 -匹丐月﹝ -妐儂昫卞反蟈化及執綬第Х妐儂毛銀丹仇午互請侳月﹝ -皮□伙滇由仿丟□正及襖反``yes''坭反``no''及中內木井匹卅仁化反卅日卅中﹝ -怳爛聒及﹜手仄仁反曉筏動陸及襖及皮□伙滇由仿丟□正及襖反``no''午今木月﹝ -(簽擎蘸菴太у擎蘸)醒反﹜蝸褡醒﹜(醒襖及蟆卞``0''毛尥仃凶)玷尪穭牏縣 -(醒襖及蟆卞``0x''毛尥仃凶)蝸牰褡醒及中內木井匹隙爛允月﹝ -簽菴太у擎蘸醒由仿丟□正及瘉釐襖反煌遙窗卞匙繡允月﹝ +由仿丟□正襖反銓勾及滇毛潸月仇午互匹五月﹝ +妐儂昫’皮□伙滇’醒襖’у擎蘸醒襖﹜匹丐月﹝ +妐儂昫卞反蟈化及執儂第Х妐儂毛銀尹月﹝ +皮□伙滇由仿丟□正及襖反 ``yes'' 井 ``no'' 及中內木井匹卅仃木壬卅日卅中﹝ +襖及隙爛今木化中卅中皮□伙滇由仿丟□正支﹜ +``yes'', ``no'' 動陸互隙爛今木凶皮□伙滇由仿丟□正及襖反 ``no''午今木月﹝ +(簽擎蘸云方太у擎蘸) 醒襖反﹜ +10 褡醒﹜ +(醒襖及蟆卞 ``0'' 毛尥仃凶) 8 褡醒﹜ +(醒襖及蟆卞 ``0x'' 毛尥仃凶) 16 褡醒及中內木井匹隙爛允月﹝ +簽擎蘸’у擎蘸醒襖由仿丟□正及瘉釐襖反煌遙窗卞匙繡允月﹝ .PP 動票卞憎允方丹卅澀爛嫩杴互丐月: .\" @@ -69,11 +73,9 @@ 手仄 .I yes 卅日﹜ -.B chfn -午 -.B chsh -皿伕弘仿丞反旦□由□交□扒互粟が仄凶及匹卅中蜃曰 -窒日井及庍凳毛墊卅丹蟆卞由旦伐□玉毛謁友月﹝ +.BR chfn ", " chsh +徆皿伕弘仿丞反﹜旦□由□交□扒互粟が仄凶及匹卅中蜃曰 +窒日井及庍凳毛墊卅丹蟆卞由旦伐□玉毛諜友月﹝ .\" .IP "CHFN_RESTRICT (妐儂昫)" 仇及由仿丟□正反 @@ -83,503 +85,114 @@ 白奴□伙玉及丹切﹜ 域怚獢憧隊 .B chfn -毛銀勻化庍凳請侳月白奴□伙玉毛隙爛允月﹝ +毛銀勻化庍凳匹五月白奴□伙玉毛隙爛允月﹝ 隙爛允月妐儂昫反 .IR f , .IR r , .IR w , .I h -及妐儂及リ啦及賺心寧歹六匹﹜公木冗木白伙生□丞﹜朿盒砦獢 +備妐儂及リ啦及賺心寧歹六匹﹜公木冗木白伙生□丞﹜朿盒砦獢 縝樺齬狪砦獢Ⅳ威蟔欐蠍砦璊繵梋ㄓ馱諢 -隙爛今木卅井勻凶樺寧反﹜旦□由□交□扒分仃互蟈化及嫩杴毛庍凳請侳月﹝ +隙爛今木卅井勻凶樺寧反﹜旦□由□交□扒分仃互蟈化及嫩杴毛庍凳匹五月﹝ +瘉手孺蜃毛五勾仁仄凶中樺寧反﹜ +chfn 毛 SUID 匹反奶件旦玄□伙仄卅仃木壬方中﹝ .\" -.IP "CLOSE_SESSIONS (皮□伙襖)" -pam_close_session() 裟太請仄毛肣躲卞允月﹝ -騷橘及(pam_unix.so)本永扑亦件棟咥乒斥亙□伙毛銀丹樺寧反﹜仇木反尕邰匹丐月﹝ -仄井仄 kerberos 支公及職及捩糧讀本永扑亦件乒犯伙毛迕中月乒斥亙□伙匹反﹜ -.B login -反 fork 仄化扑尼伙互蔽弇允月及毛謹勾优邰互丐曰﹜ -公木匹本永扑亦件毛弁伉□件失永皿請侳月﹝ +.IP "CREATE_HOME (皮□伙襖)" +useradd 互﹜犯白巧伙玄匹交□扒及石□丞犯奴伊弁玄伉毛 +綜嶽允月井升丹井毛爛聒允月﹝ +仇及左皿扑亦件反 useradd 及戊穴件玉仿奶件及 -m 白仿弘午 OR 今木月﹝ .\" -.IP "CONSOLE (妐儂昫)" -仇及嫩杴毛隙爛允月午﹜root互伕弘奶件匹五月戊件末□伙犯田奶旦毛孺蜃允月 -仇午互請侳月﹝ -仇仇匹隙爛仄凶澀爛毛坢凶今卅中戊件末□伙犯田奶旦井日root午仄化伕弘奶件 -仄方丹午仄化手蛐搕竣鴗諢ㄓ酗庣鈲雂怹葸磥玅韝臚庢謎陘藗悀中諵酗互請侳﹜ -夫午勾反 -.sp -.ft I - CONSOLE /etc/consoles -.ft R -.sp -及迋卅濮覆由旦毛迕中凶隙爛芊﹜ -漆域勾反 -.sp -.ft I - CONSOLE console:tty01:tty02:tty03:tty04 -.ft R -.sp -及迋卞戊伕件匹嗉濠日木凶伉旦玄匹羹坱瞬毛隙爛允月杅芊匹丐月﹝ -由旦抩毛隙爛允月樺寧反﹜域墊匹域勾及羹坱濤糧瞬毛隙爛仄卅仁化反卅日卅中﹝ -仇及由仿丟□正互怳爛聒匹丐月樺寧支隙爛仄凶白央奶伙互繡箕仄卅中樺寧反﹜ -root反蟈化及羹坱犯田奶旦井日伕弘奶件請侳化仄引丹﹝ -仇及白央奶伙互繡箕仄卅中樺寧支莽木化中月樺寧卞反root午仄化及尕懇卅伕弘奶件互 -請侳化仄引丹仇午卞卅月及匹﹜仇及白央奶伙反皿伕氾弁玄毛井仃化云井卅仁化反 -卅日卅中﹝ -本平亙伉氾奴互騞鴾佌攪蚺リ═踾儦蝷洁═酗峇銴忖吤╞縞疇砟帣饒蝗迨藚竣砟 -凶戶卞﹜戊伕件匹嗉濠勻凶溥摯毛迕中卅仁化反卅日卅中﹝ -.\" -.IP "CONSOLE_GROUPS (妐儂昫)" -XXX 妐踏祭及优邰丐曰﹝ -.\" -.IP "CRACKLIB_DICTPATH (妐儂昫)" -XXX 妐踏祭及优邰丐曰﹝ -.\" -.IP "DEFAULT_HOME (皮□伙襖)" -XXX 妐踏祭及优邰丐曰﹝ -.\" -.IP "DIALUPS_CHECK_ENAB (皮□伙襖)" -襖互 -.I yes -匹﹜井勾 -.I /etc/dialups -白央奶伙互繡箕允月樺寧反﹜仇及白央奶伙匹隙爛仄凶母奶失伙失永皿犯田奶旦 -匹反鎔わ及由旦伐□玉手銀迕今木月﹝ -仇及白央奶伙卞反母奶失伙失永皿濤糧瞬及伉旦玄毛動票及迋卞域墊卞域勾內勾 -隙爛仄卅仁化反卅日卅中: -.nf -.sp -.ft I - ttyfm01 - ttyfm02 - \0\0. - \0\0. - \0\0. -.ft R -.sp -.fi -.\" -.IP "ENVIRON_FILE (妐儂昫)" -伕弘奶件仄凶曰 su 仄凶曰仄凶凜卞本永玄允月棕雁庍醒及伉旦玄 (域墊卞夫午勾內勾) -互踏井木凶白央奶伙﹝ -.\" -.IP "ENV_HZ (妐儂昫)" -仇及由仿丟□正卞反HZ棕雁庍醒及ま芢毛隙爛允月﹝ -銀迕拺反: -.sp - \fIENV_HZ HZ=50\fR -.sp -仇及由仿丟□正互爛聒今木化中卅中樺寧反﹜HZ及襖反賡渝祭今木卅中﹝ -.\" -.IP "ENV_PATH (妐儂昫)" -仇及由仿丟□正反域怚獢憧隊庛◇鬙悒馱侚葸磥楔吨砟々洃吨擗吨丑 -UID互未伕動陸及交□扒互伕弘奶件仄凶樺寧﹜棕雁庍醒PATH及ま芢反仇及 -襖卞賡渝祭今木月﹝ -仇及由仿丟□正反优內优邰匹丐月; 爛聒今木化中卅中樺寧反貲勻凶 -犯白巧伙玄襖卞澀爛今木化仄引丹分欠丹﹝ -.\" -.IP "ENV_SUPATH (妐儂昫)" -仇及由仿丟□正反旦□由□交□扒及腹綢由旦卞澀爛仄卅仁化反卅日卅中﹝ -UID互未伕及交□扒互伕弘奶件仄凶樺寧﹜棕雁庍醒PATH及ま芢反仇及 -襖卞賡渝祭今木月﹝ -仇及由仿丟□正反优內优邰匹丐月; 爛聒今木化中卅中樺寧反貲曰及丐曰ぜ月 -犯白巧伙玄襖卞澀爛今木化仄引丹分欠丹﹝ -.\" -.IP "ENV_TZ (妐儂昫)" -仇及由仿丟□正卞反棕雁庍醒TZ毛綜曰請允凶戶及樹扷毛隙爛允月﹝ -由仿丟□正及襖反﹜TZ卞隙爛仄凶中襖井﹜仇及樹扷互筏課今木化中月白央奶伙及 -濮覆由旦抩匹卅仁化反卅日卅中﹝ -銀迕拺反: -.sp - \fIENV_TZ\0\0\0\0TZ=CST6CDT\fP -.sp -坭反 -.sp - \fIENV_TZ\0\0\0\0/etc/tzname\fP -.sp -繡箕仄卅中白央奶伙毛隙爛仄凶樺寧﹜TZ反丐月犯白巧伙玄襖卞賡渝祭今木月﹝ -仇及由仿丟□正互怳爛聒及樺寧反TZ及襖反賡渝祭今木卅中﹝ -.\" -.IP "ERASECHAR (醒)" -羹坱及 -.I erase -妐儂互仇及襖卞賡渝祭今木月﹝ -.I termio -奶件正□白尼□旦毛髐角縞極馴ぁ(拺尹壬 System V)匹及心扔禾□玄今木化中月﹝ -隙爛今木化中卅中樺寧反﹜erase妐儂反田永弁旦矢□旦卞賡渝祭今木月﹝ -楮洘樹扷卞勾中化反KILLCHAR毛輔寰六方﹝ -.\" -.IP "FAILLOG_ENAB (皮□伙襖)" -.I yes -卞澀爛仄凶樺寧反﹜伕弘奶件及撩л互 -.I /var/log/faillog -醱卞 -.BR faillog (8) -及踏摯匹筏狤今木月﹝ -.\" -.IP "FAIL_DELAY (醒)" -伕弘奶件互撩л允月咍卞贊曹今六月卍醒﹝ -.\" -.IP "FAKE_SHELL (妐儂昫)" -呿癲及交□扒□扑尼伙及醫歹曰卞﹜仇及由仿丟□正匹隙爛今木凶皿伕弘仿丞互粟が今木月﹝ -仄井仄﹜公及杴卞葦尹月抩蟆 (argv[0]) 反葭及扑尼伙午卅月﹝ -粟が今木凶皿伕弘仿丞反撢端及扑尼伙及粟が蟆卞优邰卅綜僅 -(伕幼件弘﹜馨笛ロ據﹜田瓜□﹜...)互墊卅尹月﹝ -.\" -.IP "FTMP_FILE (妐儂昫)" -仇及由仿丟□正卞反伕弘奶件撩л毛筏狤允月白央奶伙及濮覆由旦抩毛隙爛允月﹝ -伕弘奶件撩л互素舅楔蕪儦蝖═膜庰倔縣洶酗峊掍‘丰諵 -.I utmp -溥摯及伊戊□玉匹馨笛今木月﹝ -.I /var/log/faillog -.\" this parameter is not specified then logging will be inhibited. See -.\" FAILLOG_ENAB and LOG_UNKFAIL_ENAB for related information. -尺及伕弘奶件撩л及筏狤午反﹜動票及鰾匹唱卅勻化中月仇午卞鏜啦﹝ -仇及窗Х匹反伕弘奶件撩л毛蟈化筏狤允月互﹜``faillog''窗Х匹反伕弘奶件撩л -樹扷毛交□扒咍卞筏狤仄化墊仁﹝ -仇及由仿丟□正互隙爛今木化中卅中樺寧反伕幼件弘互俅孺今木月﹝ -楮洘樹扷反FAILLOG_ENAB午LOG_UNKFAIL_ENAB毛輔寰六方﹝ -.\" -.IP "GID_MAX (醒)" -.IP "GID_MIN (醒)" +.IP "GID_MAX (醒襖)" +.IP "GID_MIN (醒襖)" +.B useradd +皿伕弘仿丞云方太 .B groupadd -皿伕弘仿丞互弘伙□皿ID毛薊鎗允月凜及炾洁 -.\" -.IP "HUSHLOGIN_FILE (妐儂昫)" -仇及由仿丟□正反``hushlogin''及橢瘀毛澀爛允月凶戶卞迕中月﹝ -仇及澀爛毛墊丹杅芊卞反わ騷曰丐月﹝ -鎔域及杅芊反﹜仇及由仿丟□正及襖互白央奶伙抩匹丐曰啾勾公及白央奶伙互 -交□扒及石□丞犯奴伊弁玄伉卞繡箕允月樺寧反``hushlogin''及橢瘀互嶽峏允月﹜ -午中丹手及匹丐月﹝ -白央奶伙及醱褥反拑骰今木月; 公木互繡箕允月儀及心互``hushlogin''橢瘀毛 -嶽峏今六月及匹丐月﹝ -鎔わ及杅芊反﹜仇及由仿丟□正及襖互濮覆由旦抩匹﹜交□扒及伕弘奶件抩坭反 -扑尼伙互仇及白央奶伙醱卞筏課今木化中月樺寧卞``hushlogin''橢瘀互嶽曰峏勾﹜ -午中丹手及匹丐月﹝ -仇及樺寧﹜白央奶伙反動票及迋卅踏摯匹卅仁化反卅日卅中: -.nf -.sp -.ft I - demo - /usr/lib/uucp/uucico - \0\0. - \0\0. - \0\0. -.ft R -.sp -.fi -仇及由仿丟□正互怳爛聒及樺寧反﹜``hushlogin''橢瘀互嶽峏允月仇午反拑中﹝ -``hushlogin''橢瘀互嶽峏仄凶樺寧﹜公及ゥ及丟永本□斥及刓憎﹜手勻午手瘉嗤及 -伕弘奶件嶽跦菴太撩л及刓憎﹜丟奶伙及肣拑及刓憎﹜由旦伐□玉渝蜃及民尼永弁反 -墊歹木卅中﹝ -交□扒及石□丞犯奴伊弁玄伉卞hushlogin白央奶伙毛譆井六月杅芊毛迕中月午 -交□扒互由旦伐□玉渝蜃及民尼永弁毛莢礞リ迨々楔牏忖酗卞鏜啦﹝ -楮洘允月樹扷反MOTD_FILE, FAILLOG_ENAB, LASTLOG_ENAB, 菴太MAIL_CHECK_ENAB -毛輔寰六方﹝ -.\" -.IP "ISSUE_FILE (妐儂昫)" -伕弘奶件皿伕件皿玄毛請允蟆卞刓憎允月白央奶伙及白伙由旦抩﹝ -.\" -.IP "KILLCHAR (醒)" -羹坱及 -.I kill -妐儂互仇及襖卞賡渝祭今木月﹝ -.I termio -奶件正□白尼□旦毛髐角縞極馴ぁ(拺尹壬 System V)匹及心扔禾□玄今木化中月﹝ -隙爛今木化中卅中樺寧反﹜kill妐儂反\s-2CTRL/U\s0卞賡渝祭今木月﹝ -楮洘樹扷卞勾中化反ERASECHAR毛輔寰六方﹝ -.\" -.IP "LASTLOG_ENAB (皮□伙襖)" -仇及由仿丟□正毛 -.I yes -卞澀爛仄﹜啾勾白央奶伙 -.I /var/log/lastlog -互繡箕允月樺寧﹜交□扒互伕弘奶件卞嶽跦仄凶筏狤互仇及白央奶伙卞酸今木月﹝ -今日卞﹜仇及左皿扑亦件互左件卞澀爛今木化中月樺寧反瘉手瘉嗤及伕弘奶件嶽跦 -菴太撩лゥ凜互交□扒卞刓憎今木月﹝FAILLOG_ENAB互左件卞卅勻化中卅中樺寧反 -伕弘奶件撩л及刓憎反墊歹木卅中﹝ -``hushlogin''橢瘀互嶽曰峏勻化中月樺寧反伕弘奶件嶽跦手撩л手刓憎今木卅中﹝ -.\" -.IP "LOGIN_RETRIES (醒)" -.B login -皿伕弘仿丞互蔽弇允月引匹卞第Х卅伕弘奶件及瘋魂墊及醒﹝ -.\" -.IP "LOGIN_STRING (妐儂昫)" -XXX 妐踏祭及优邰丐曰﹝ -.IP "LOGIN_TIMEOUT (醒)" -XXX 妐踏祭及优邰丐曰﹝ -.IP "LOG_OK_LOGINS (皮□伙襖)" -XXX 妐踏祭及优邰丐曰﹝ -.IP "LOG_UNKFAIL_ENAB (皮□伙襖)" -仇及由仿丟□正互 -.I yes -卞澀爛今木化中月樺寧反伕弘奶件撩л互筏狤今木月端卞怳瓚狤及交□扒抩手 -殖戶日木月﹝本平亙伉氾奴毛渣萵卞趙允第Х嶺手丐月仇午卞鏜啦; 方仁葦日木月 -伕弘奶件及撩л卞﹜交□扒抩午由旦伐□玉毛ェ木晶尹化ェ恘仄化仄引丹仇午互 -街仆日木月互﹜仇及樺寧由旦伐□玉互撩л伕弘卞筏狤今木化仄引丹﹝ -仇及左皿扑亦件毛左白卞仄化云仁午﹜怳瓚狤交□扒抩反伕弘奶件撩л丟永本□斥卞 -筏狤今木卅中﹝ -.\" -.IP "MAIL_CHECK_ENAB (皮□伙襖)" -仇及由仿丟□正毛 -.I yes -卞澀爛允月午﹜伕弘奶件凜卞交□扒卞丟奶伙示永弁旦及橇謫毛騷襞允月﹝ -楮洘樹扷反MAIL_DIR毛輔寰六方﹝ +皿伕弘仿丞互弘伙□皿 ID 毛薊鎗允月凜及炾洁 .\" .IP "MAIL_DIR (妐儂昫)" -仇及由仿丟□正卞反交□扒及丟奶伙示永弁旦白央奶伙互譆井木化中月犯奴伊弁玄伉及 -濮覆由旦毛隙爛允月﹝ -仇及由旦卞交□扒及伕弘奶件抩毛尥仃簫仄化MAIL棕雁庍醒 \- 交□扒及 -丟奶伙示永弁旦尺及由旦 \- 毛綜曰請允﹝ -仇及由仿丟□正午 MAIL_FILE 及升切日井反优內爛聒仄卅仁化反卅日卅中; -怳爛聒及樺寧反懇仄仁卅中第Х嶺及丐月犯白巧伙玄襖互銀歹木月﹝ -楮洘樹扷反MAIL_CHECK_ENAB毛輔寰六方﹝ +丟□伙旦皿□伙犯奴伊弁玄伉﹝ +丐月交□扒失市它件玄互膜懇’綽輪今木凶端卞﹜ +公及交□扒及丟□伙示永弁旦卞覆允月綜僅及凶戶卞优邰午卅月﹝ +隙爛今木卅中午﹜戊件由奶伙凜及犯白巧伙玄襖互迕中日木月﹝ .\" -.IP "MAIL_FILE (妐儂昫)" -仇及由仿丟□正卞反丟奶伙示永弁旦白央奶伙及抩蟆毛隙爛允月﹝ -交□扒及石□丞犯奴伊弁玄伉卞仇及抩蟆互馨笛今木化﹜ -MAIL棕雁庍醒 \- 交□扒及丟奶伙示永弁旦尺及由旦 \- 毛綜曰請允﹝ -仇及由仿丟□正午 MAIL_DIR 及升切日井反优內爛聒仄卅仁化反卅日卅中; -怳爛聒及樺寧反懇仄仁卅中第Х嶺及丐月犯白巧伙玄襖互銀歹木月﹝ -楮洘樹扷反MAIL_CHECK_ENAB毛輔寰六方﹝ -.\" -.IP "MD5_CRYPT_ENAB (皮□伙襖)" -.I yes -卅日﹜ -.B passwd -皿伕弘仿丞反蕙仄仁庍凳今木凶由旦伐□玉毛蕙仄中 MD5 矛□旦及 -.BR crypt (3) -由旦伐□玉甩永扑亙失伙打伉朮丞毛迕中化剪寞祭允月﹝ -仇木反 FreeBSD 匹瘉賡卞睡迕今木﹜Linux 匹反 -libc-5.4.38 午 glibc-2.0 (引凶反公木動曉) 匹覆殺仄化中月﹝ -仇及失伙打伉朮丞反 8 妐儂動曉及由旦伐□玉卞覆殺仄化中月 ( -.BR getpass (3) -卞方曰 127 妐儂卞孺蜃今木月)互﹜蝨侳及 -.BR crypt (3) -撢隸午詢晶嶺互卅中﹝ -.\" -.IP "MOTD_FILE (妐儂昫)" -仇及由仿丟□正卞反``公及ゥ及丟永本□斥''白央奶伙尺及由旦抩毛戊伕件匹嗉濠勻化 -隙爛允月﹝ -隙爛仄凶白央奶伙互繡箕允月樺寧反﹜交□扒及伕弘奶件凜卞白央奶伙及醱褥互 -刓憎今木月﹝ -仇及由仿丟□正互爛聒今木化中卅中樺寧﹜手仄仁反``hushlogin''伕弘奶件橢瘀 -互嶽曰峏勾樺寧卞反﹜刓憎反墊歹木卅中﹝ -.\" -.IP "NOLOGINS_FILE (妐儂昫)" -仇及由仿丟□正卞反root動陸及伕弘奶件毛嗟鞅允月白央奶伙及濮覆由旦抩毛隙爛 -允月﹝ -仇及白央奶伙互繡箕允月樺寧卞反﹜root動陸及交□扒互伕弘奶件仄方丹午仄凶端 -白央奶伙及醱褥互刓憎今木﹜伕弘奶件反蛐搕竣鴗諢ㄓ酗峊悒擖寣憧縣牴媊磥竣鴗 -中卅中樺寧反仇及窗Х反銀迕匹五卅中﹝ -.\" -.IP "NOLOGIN_STR (妐儂昫)" -XXX 妐踏祭及优邰丐曰﹝ -.\" -.IP "OBSCURE_CHECKS_ENAB (皮□伙襖)" -仇及由仿丟□正互 -.I yes -卞澀爛今木化中月樺寧反﹜由旦伐□玉庍凳毛熬仃尥仃月蟆卞皿伕弘仿丞 -.B passwd -互芴坌卞民尼永弁毛墊丹﹝ -墊歹木月民尼永弁反騞鴾佸掃膉リ═瞗Ⅷ庇韝手迕中月屯五匹丐月﹝ -.B passwd -皿伕弘仿丞互 -.I root -卞方勻化撢墊今木凶樺寧反﹜由旦伐□玉及ろ荸蘸民尼永弁反田奶由旦今木月﹝ -楮洘樹扷反PASS_MIN_LEN毛輔寰六方﹝ -.\" -.IP "PASS_ALWAYS_WARN (皮□伙襖)" -XXX 妐踏祭及优邰丐曰﹝ -.\" -.IP "PASS_CHANGE_TRIES (醒)" -XXX 妐踏祭及优邰丐曰﹝ -.\" -.IP "PASS_MIN_DAYS (醒)" -由旦伐□玉互庍凳匹五月方丹卞卅月引匹及瘉羶ゥ醒﹝ +.IP "PASS_MAX_DAYS (醒襖)" +域勾及由旦伐□玉毛銀尹月瘉贏ゥ醒﹝ +由旦伐□玉互仇及ゥ醒方曰手衙中樺寧反﹜庍凳允月方丹雄孺今木月﹝ +隙爛今木化中卅中樺寧反 -1 午卅月 (仇及孺蜃窗Х毛拑躲卞允月)﹝ +.IP "PASS_MIN_DAYS (醒襖)" +由旦伐□玉毛庍凳仄化井日慼卞庍凳匹五月方丹卞卅月引匹及瘉羶ゥ醒﹝ 仇及ゥ醒互煩凶卅中丹切卞由旦伐□玉毛庍凳仄方丹午仄化手蛐搕竣鴗諢 -隙爛今木化中卅中樺寧反未伕午葦哤今木月﹝ +隙爛今木化中卅中樺寧反 -1 午卅月 (仇及孺蜃窗Х毛拑躲卞允月)﹝ +.IP "PASS_WARN_AGE (醒襖)" +由旦伐□玉及肣躲渝蜃互侳月蟆卞煞屢毛砟馱賵棉及ゥ醒﹝ +未伕卞仄化云仁午﹜渝蜃濠木及癲ゥ卞及心煞屢毛墊中﹜ +扙及醒毛隙爛仄凶樺寧反域濠煞屢毛墊歹卅中﹝ +隙爛今木化中卅中樺寧反煞屢毛墊歹卅中﹝ +.PP +PASS_MAX_DAYS, PASS_MIN_DAYS, PASS_WARN_AGE +反失市它件玄毛綜月午五卞分仃厙迕今木月﹝ +仇木日及澀爛毛庍凳仄化手﹜湃繡及失市它件玄卞反排黍仄卅中﹝ .\" -.IP "PASS_MIN_LEN (醒)" -由旦伐□玉午仄化袱今木月瘉凝及妐儂醒﹝ -仇木方曰手羶中由旦伐□玉毛澀爛仄方丹午仄化手蛐搕竣鴗諢 -未伕卞澀爛仄化云仁午仇及腹犖反墊歹木卅中﹝ -隙爛今木化中卅中樺寧反未伕午葦哤今木月﹝ +.IP "UID_MAX (醒襖)" +.IP "UID_MIN (醒襖)" +.B useradd +皿伕弘仿丞互交□扒 ID 毛薊鎗允月凜及炾洁 .\" -.IP "PASS_MAX_DAYS (醒)" -域勾及由旦伐□玉毛銀尹月瘉贏ゥ醒﹝由旦伐□玉互仇及ゥ醒方曰手衙中樺寧反 -失市它件玄互伕永弁今木月﹝隙爛今木化中卅中樺寧反丐月釐五卅醒互迕中日木月﹝ -.\" -.IP "PASS_MAX_LEN (醒)" -XXX 妐踏祭及优邰丐曰﹝ -.\" -.IP "PASS_WARN_AGE (醒)" -由旦伐□玉及肣躲渝蜃互侳月蟆卞煞屢毛砟馱踰醒﹝未伕卞仄化云仁午﹜癲ゥ卞及心 -煞屢毛墊中﹜扙醒毛隙爛仄凶樺寧反煞屢反墊歹木卅中﹝ -隙爛今木化中卅中樺寧反煞屢反墊歹木卅中﹝ -.\" -.IP "PORTTIME_CHECKS_ENAB (皮□伙襖)" -仇及由仿丟□正毛 -.I yes -卞澀爛仄﹜啾勾 -.I /etc/porttime -白央奶伙互繡箕允月樺寧反﹜交□扒互公及凜棉隙爛仄凶羹坱井日伕弘奶件仄化恌中井 -毛割ロ允月及卞公及白央奶伙毛輔寰允月﹝ -c.f. -.BR porttime (5) -.\" -.IP "QMAIL_DIR (妐儂昫)" -仇及由仿丟□正卞反 Qmail 交□扒及凶戶及 Maildir 互丐月犯奴伊弁玄伉毛隙 -爛允月﹝楮洘樹扷反 MAIL_CHECK_ENAB 毛輔寰六方﹝ -.\" -.IP "QUOTAS_ENAB (皮□伙襖)" -仇及由仿丟□正互 -.I yes -卞澀爛今木化中月樺寧反﹜交□扒及``ulimit'', ``umask'', ``niceness'' -互 -.I passwd -白央奶伙及 -.I gecos -勂卞隙爛今木化中月襖卞賡渝祭今木月﹝ -c.f. -.BR passwd (5) -.\" -.IP "SU_NAME (妐儂昫)" -仇及由仿丟□正反``su -''互撢墊今木凶樺寧及戊穴件玉抩毛澀爛允月﹝ -拺尹壬﹜仇及由仿丟□正互``su''午爛聒今木化中凶樺寧﹜ -.BR ps (1) -匹反撢墊醱及戊穴件玉互``-su''午刓憎今木月﹝ -仇及由仿丟□正互爛聒今木化中卅中樺寧反﹜ -.BR ps (1) -卞反撢墊醱及撢端及扑尼伙及抩蟆﹜拺尹壬``-sh``午中勻凶刓憎互卅今木月﹝ -.\" -.IP "SULOG_FILE (妐儂昫)" -仇及由仿丟□正卞反 -.B su -戊穴件玉及撢墊筏狤毛踏五慇戈白央奶伙及濮覆由旦抩毛隙爛允月﹝ -仇及由仿丟□正互澀爛今木化中卅中樺寧反﹜筏狤反墊歹木卅中﹝ -.B su -戊穴件玉反由旦伐□玉毛ロ據允月端卞銀歹木月儀手丐月及匹﹜仇及左皿扑亦件坭反 -.I syslog -及中內木井毛迕中化 -.B su -撢墊毛筏狤仄卅仁化反卅日卅中﹝ -楮洘樹扷反SYSLOG_SU_ENAB左皿扑亦件毛輔寰六方﹝ -.\" -.IP "SU_WHEEL_ONLY (皮□伙襖)" -XXX 妐踏祭及优邰丐曰﹝ -.\" -.IP "SYSLOG_SG_ENAB (皮□伙襖)" -XXX 妐踏祭及优邰丐曰﹝ -.\" -.IP "SYSLOG_SU_ENAB (皮□伙襖)" -仇及由仿丟□正互 -.I yes -卞澀爛今木﹜啾勾 -.B login -互 -.I syslog -窗Х毛か井六月方丹卞戊件由奶伙今木化中月樺寧反﹜蟈化及 -.B su -撢墊互 -.I syslog -窗Х毛迕中化騷襞今木月﹝ -楮洘樹扷反SULOG_FILE毛輔寰六方﹝ -.\" -.IP "TTYGROUP (妐儂昫坭反醒)" -羹坱及弘伙□皿赭肣簞嶺互仇及弘伙□皿抩手仄仁反ID卞賡渝祭今木月﹝ -恌仁襞日木凶本平亙伉氾奴僎猾及域勾卞﹜職及交□扒及羹坱瞬卞羹坱 -戊件玄伕□伙扑□弗件旦毛霜月﹜午中丹手及互丐月﹝ -仇及杽鎖反﹜職及交□扒互羹坱瞬卞失弁本旦匹五卅中方丹卞袱第簞嶺毛澀爛允木壬 -莢礞リ迨諵活═酗忖馱諵酸ヶ卅互日 -.B write -午中勻凶皿伕弘仿丞互窗Х仄卅仁卅勻化仄引丹﹝職及荸瑁杅芊午仄化反﹜ -療箕讀卞渣萵毛梊氏分妐儂扑□弗件旦毛白奴伙正□仄化潸曰輪中化仄引丹迋卅 -.B write -皿伕弘仿丞毛銀中﹜仇木毛た潰卅弘伙□皿卞``setgid''今六﹜仇及弘伙□皿卞 -羹坱犯田奶旦及弘伙□皿赭肣簞嶺毛喃曰癲化﹜羹坱瞬及袱第簞嶺毛\fI0620\fR卞 -澀爛允月﹜午中丹手及手丐月﹝ -TTYGROUP反引今卞仇及迋卅橇須及凶戶卞澀爛匹五月方丹卞仄化丐月﹝ -仇及嫩杴互爛聒今木化中卅中午五反﹜羹坱及弘伙□皿赭肣簞嶺反交□扒及弘伙□皿 -砦璊佌暾祭今木月﹝ -楮洘樹扷反 TTYPERM 毛輔寰六方﹝ -.\" -.IP "TTYPERM (醒)" -伕弘奶件羹坱及袱第簞嶺互仇及襖卞賡渝祭今木月﹝ -霾滇讀卅澀爛襖午仄化反﹜\fI0622\fR卞澀爛仄化職及交□扒互公及羹坱卞write -失弁本旦請侳月迋卞允月手及支﹜\fI0600\fR卞澀爛仄化職及交□扒井日羹坱毛 -潮月手及卅升互丐月﹝ -隙爛今木化中卅中樺寧反﹜羹坱及袱第簞嶺反\fI0622\fR卞賡渝祭今木月﹝ -楮洘樹扷反TTYGROUP毛輔寰六方﹝ -.\" -.IP "TTYTYPE_FILE (妐儂昫)" -仇及由仿丟□正卞反羹坱犯田奶旦毛羹坱及潘挀卞穴永皿允月白央奶伙及濮覆由旦抩毛 -隙爛允月﹝備墊卞反羹坱及潘挀毛域勾午羹坱瞬毛域勾﹜塢⑩匹嗉濠勻化筏課允月﹝ -拺尹壬: -.nf -.sp -.ft I - vt100\0 tty01 - wyse60 tty02 - \0\0.\0\0\0 \0\0. - \0\0.\0\0\0 \0\0. - \0\0.\0\0\0 \0\0. -.ft R -.sp -.fi -仇及樹扷反棕雁庍醒 TERM 互引分澀爛今木化中卅中凜卞 -仇木毛賡渝祭允月凶戶分仃卞迕中日木月﹝ -筏寞``#''匹銨引月墊反戊丟件玄午仄化健歹木月﹝ -仇及由仿丟□正互澀爛今木化中卅中樺寧﹜白央奶伙互繡箕仄卅中樺寧﹜手仄仁反仇及 -白央奶伙醱匹羹坱瞬互葦勾井日卅中樺寧反﹜棕雁庍醒TERM反澀爛今木卅中﹝ -.\" -.IP "UID_MAX (醒)" -XXX 妐踏祭及优邰丐曰﹝ -.IP "UID_MIN (醒)" -XXX 妐踏祭及优邰丐曰﹝ -.\" -.IP "ULIMIT (у擎蘸醒)" -白央奶伙扔奶朮及蜃蘸毛仇及襖卞賡渝祭允月﹝ -.I ulimit -互髐鴾瓣々中諝極馴ぁ遄卅膉角耏ystem V匹及心扔禾□玄今木化中月﹝ -隙爛今木化中卅中樺寧反﹜白央奶伙扔奶朮蜃蘸反丐月釐五卅襖卞賡渝祭今木月﹝ -.\" -.IP "UMASK (醒)" +.IP "UMASK (醒襖)" 袱第簞嶺穴旦弁毛仇及襖卞賡渝祭允月﹝ -隙爛今木化中卅中樺寧反﹜袱第簞嶺穴旦弁反未伕卞賡渝祭今木月﹝ +隙爛今木化中卅中樺寧反﹜袱第簞嶺穴旦弁反 077 卞賡渝祭今木月﹝ .\" .IP "USERDEL_CMD (妐儂昫)" -XXX 妐踏祭及优邰丐曰﹝ +爛聒今木化中月午﹜交□扒毛綽輪允月午五卞仇及戊穴件玉互撢墊今木月﹝ +綽輪今木月交□扒 (瘉賡及婁五醒卞欐今木月) 及 at/cron/print +斥亦皮卅升毛綽輪允月戊穴件玉卞仄化云仁午方中﹝ .\" -.SH 鍬詢輔寰 -動票及鍬詢輔寰反 shadow 伕弘奶件窗Х醱及升及皿伕弘仿丞互 +.SH 輔寰刓 +動票及輔寰刓反﹜ +shadow 由旦伐□玉窗Х及升及皿伕弘仿丞互 升及由仿丟□正毛銀迕允月井毛憎仄凶手及匹丐月﹝ .na -.IP login 12 -CONSOLE DIALUPS_CHECK_ENAB ENV_HZ ENV_SUPATH ENV_TZ ERASECHAR FAILLOG_ENAB -FTMP_FILE HUSHLOGIN_FILE KILLCHAR LASTLOG_ENAB LOG_UNKFAIL_ENAB -MAIL_CHECK_ENAB MAIL_DIR MOTD_FILE NOLOGINS_FILE PORTTIME_CHECKS_ENAB -QUOTAS_ENAB TTYPERM TTYTYPE_FILE ULIMIT UMASK +.IP chfn 12 +CHFN_AUTH CHFN_RESTRICT +.IP chsh 12 +CHFN_AUTH +.IP groupadd 12 +GID_MAX GID_MIN .IP newusers 12 -PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK -.IP passwd 12 -OBSCURE_CHECKS_ENAB PASS_MIN_LEN +PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE +UMASK .IP pwconv 12 PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE -.IP su 12 -ENV_HZ ENV_SUPATH ENV_TZ HUSHLOGIN_FILE MAIL_CHECK_ENAB MAIL_DIR -MOTD_FILE NOLOGIN_STR QUOTAS_ENAB SULOG_FILE SYSLOG_SU_ENAB -.IP sulogin 12 -ENV_HZ ENV_SUPATH ENV_TZ MAIL_DIR QUOTAS_ENAB TTYPERM +.IP useradd 12 +CREATE_HOME +GID_MAX GID_MIN +PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE +UID_MAX UID_MIN +UMASK +.IP userdel 12 +MAIL_DIR +USERDEL_CMD +.IP usermod 12 +MAIL_DIR .ad .SH 田弘 -仇及 man 矢□斥卞踏井木化中卅中澀爛由仿丟□正手丐月﹝ +shadow 由旦伐□玉窗Х卞方勻化羼間今木化五凶窗Х及釐朿坌反﹜ +蜇箕反 PAM 卞方勻化質咥今木化中月﹝ +仄凶互勻化﹜ +.BR login (1), +.BR passwd (1), +.BR su (1) +卅升及皿伕弘仿丞反﹜手反支 +\fI/etc/login.defs\fR +毛迕中卅中﹝ +覆殺允月 PAM 及澀爛白央奶伙毛譬屯月方丹卞仄化幻仄中﹝ .SH 楮洘嫩杴 .BR login (1), -.BR faillog (5), +.BR passwd (1), +.BR su (1), .BR passwd (5), -.BR porttime (5), -.BR faillog (8) +.BR shadow (5), +.BR pam (8) .SH 難樊 Julianne Frances Haugh (jockgrrl@ix.netcom.com) .br diff --git a/man/ja/logoutd.8 b/man/ja/logoutd.8 index 04c8e4b8..fd260c6b 100644 --- a/man/ja/logoutd.8 +++ b/man/ja/logoutd.8 @@ -1,3 +1,4 @@ +.\"$Id: logoutd.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,33 +26,29 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: logoutd.8,v 1.2 2001/11/16 17:01:32 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Modified Sat 21 Sep 2002 by NAKANO Takeo .\" .TH LOGOUTD 8 .SH 抩蟆 -logoutd \- 伕弘奶件凜棉及孺蜃毛粗允 +logoutd \- 伕弘奶件凜棉及孺蜃毛撢雒允月 .SH 踏摯 -.B logoutd +\fBlogoutd\fR .SH 濩抸 +\fBlogoutd\fR 反 \fI/etc/porttime\fR +卞筏今木化中月伕弘奶件凜棉’禾□玄卞覆允月孺蜃毛撢雒允月﹝ .B logoutd -反 -.I /etc/porttime -卞筏今木化中月伕弘奶件凜棉菴太禾□玄卞覆允月 -孺蜃儀嫩毛撢雒允月﹝ -.B logoutd -反\fI/etc/rc\fR卞方勻化粟が今木卅仁化反卅日卅中﹝ -.\" at the current time. -\fI/etc/utmp\fR白央奶伙毛爛渝讀卞雖犖仄﹜伕弘奶件仄化中月備交□扒互 -\fI/etc/porttime\fR醱匹隙爛今木凶伕弘奶件第Х交□扒抩﹜禾□玄菴太凜對卞 -縣楔々中吨中咫繨◇漱馱諢 -\fI/etc/porttime\fR及孺蜃卞縣馱諝磳陞丰韞誑疇極蟡韝牮肥誘竣誘擗鴗諢 +反 \fI/etc/rc\fR 卞方勻化粟が今木月方丹卞允月﹝ +\fI/etc/utmp\fR 白央奶伙互爛渝讀卞旦平乓件今木﹜ +伕弘奶件仄化中月備交□扒互 +\fI/etc/porttime\fR 醱匹及公及交□扒及袱第 +(禾□玄午凜對) 卞縣楔々中吨中孩握暀諢 +\fI/etc/porttime\fR 及孺蜃卞縣馱諝磳陞丰韞誑疇極蟡韝牮肥誘竣誘擗鴗諢 .SH 白央奶伙 -/etc/porttime \- 伕弘奶件菴太禾□玄卞覆允月袱第 +/etc/porttime \- 伕弘奶件午禾□玄及袱第 .br /etc/utmp \- 蜇箕及伕弘奶件本永扑亦件 .SH 難樊 diff --git a/man/ja/mkpasswd.8 b/man/ja/mkpasswd.8 index c973d9be..3eeda4c5 100644 --- a/man/ja/mkpasswd.8 +++ b/man/ja/mkpasswd.8 @@ -1,3 +1,4 @@ +.\"$Id: mkpasswd.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,60 +26,62 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: mkpasswd.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Updated & Modified Sat 21 Sep 2002 by NAKANO Takeo .\" -.\" .TH MKPASSWD 1 .TH MKPASSWD 8 .SH 抩蟆 -mkpasswd \- passwd菴太group犯□正矛□旦白央奶伙毛凳蕙允月 +mkpasswd \- passwd 午 group 及犯□正矛□旦白央奶伙毛凳蕙允月 .SH 踏摯 \fBmkpasswd\fR [\fB-fvgps\fR] \fIfile\fR .SH 濩抸 .B mkpasswd -反白仿永弘匹芨尹日木凶踏摯卞仄凶互勻化白央奶伙毛づ心慇心﹜ -覆殺允月犯□正矛□旦白央奶伙及踏摯卞庍晶允月﹝ -綜嶽今木凶犯□正矛□旦白央奶伙反﹜聶仁及交□扒互中月扑旦氾丞匹及失弁本旦 -由白巧□穴件旦毛荼螫允月啃卞迕中日木月﹝ -請恘白央奶伙反\fIfile\fR.dir菴太\fIfile\fR.pag午及抩蟆互尥仃日木月﹝ +反白仿弘匹芨尹日木凶踏摯卞仄凶互勻化白央奶伙毛づ心慇心﹜ +公木毛犯□正矛□旦白央奶伙溥摯卞庍晶允月﹝ +綜嶽今木凶犯□正矛□旦白央奶伙反﹜ +聶仁及交□扒互中月扑旦氾丞匹及失弁本旦嶺Х毛荼螫允月凶戶卞迕中日木月﹝ +請恘白央奶伙及抩蟆反 +\fIfile\fR.dir 云方太 \fIfile\fR.pag午卅月﹝ .PP -\fB-f\fR左皿扑亦件毛隙爛允月午﹜\fBmkpasswd\fR反湃卞請恘白央奶伙互繡箕 -仄化中化手拑骰仄化曉踏五毛墊卅丹﹝ -騷橘反﹜請恘白央奶伙互湃卞繡箕允月午及煞屢毛砟楔た磎蚑肥誘馱諢 +\fB-f\fR 左皿扑亦件毛隙爛允月午﹜ +\fBmkpasswd\fR 反請恘白央奶伙互繡箕仄化中化手拑骰仄化曉踏五允月﹝ +騷橘反﹜請恘白央奶伙互湃卞繡箕允月需及煞屢毛砟楔す肥誘馱諢 .PP -\fB-v\fR左皿扑亦件毛尥仃凶樺寧﹜\fBmkpasswd\fR反庍晶毛墊卅丹咍卞 -備伊戊□玉及樹扷毛請恘允月午午手卞﹜瘉詨卞蔽弇丟永本□斥毛刓憎允月﹝ +\fB-v\fR 左皿扑亦件毛隙爛允月午﹜ +\fBmkpasswd\fR 反庍晶毛墊卅丹咍卞備伊戊□玉及樹扷毛請恘仄﹜ +瘉詨卞蔽弇丟永本□斥毛刓憎允月﹝ .PP -\fB-g\fR左皿扑亦件毛隙爛仄凶樺寧反﹜ェ恘白央奶伙互\fI/etc/group\fR -白央奶伙午き元踏摯匹丐月午仄化質咥毛墊卅丹﹝ -\fB-s\fR左皿扑亦件午賺心寧歹六化迕中凶樺寧反﹜\fI/etc/gshadow\fR白央奶伙 -及踏摯午仄化健丹﹝ +\fB-g\fR 左皿扑亦件毛隙爛允月午﹜ +ェ恘白央奶伙互 \fI/etc/group\fR +白央奶伙及踏摯匹丐月午心卅仄化質咥毛墊卅丹﹝ +\fB-s\fR 左皿扑亦件午き凜卞迕中凶樺寧反﹜ +\fI/etc/gshadow\fR 白央奶伙及踏摯互迕中日木月﹝ .PP -\fB-p\fR左皿扑亦件毛尥仃凶樺寧反﹜ェ恘白央奶伙及踏摯互\fB/etc/passwd\fR -及溥摯匹丐月午仄化質咥允月﹝ -犯奴白巧伙玄﹝ -\fB-s\fR左皿扑亦件午賺心寧歹六凶樺寧反﹜\fI/etc/shadow\fR白央奶伙及 -踏摯午仄化質咥毛墊丹﹝ +\fB-p\fR 左皿扑亦件毛隙爛允月午﹜ +ェ恘白央奶伙互 \fB/etc/passwd\fR +白央奶伙及踏摯匹丐月午心卅仄化質咥毛墊丹﹝ +仇木互犯白巧伙玄及が綜匹丐月﹝ +\fB-s\fR 左皿扑亦件午き凜卞迕中凶樺寧反﹜ +\fI/etc/shadow\fR 白央奶伙及踏摯互迕中日木月﹝ .SH 煞屢 -呁醒及犯□正矛□旦白央奶伙毛銀迕允月仇午反﹜NDBM犯□正矛□旦仿奶皮仿伉 -互髐鴾瓣縞極馴ぁ鄐リ峇葀饒膜リ═瞗Ⅸ握々峊極馴ぁ鄐е悀中趥鬗狠倰銴 -沭匹反卅中﹝ +呁醒及犯□正矛□旦白央奶伙毛銀尹月及反﹜ +NDBM 犯□正矛□旦仿奶皮仿伉毛髐角縞極馴ぁ鄐峇艉リ═瞗 +升氏卅扑旦氾丞匹手第Х卅歹仃匹反卅中﹝ .SH 鏜啦 -釐纏及戊穴件玉反庍凳毛雒仄凶端卞犯□正矛□旦白央奶伙毛凳蕙允月仇午互請侳月 -及匹﹜仇及戊穴件玉反﹜貲勻化壅蛔仄化仄引勻凶﹜引凶反莽木凶犯□正矛□旦 -白央奶伙毛瘋戲允月凜卞及心优邰卞卅月﹝ +釐纏及戊穴件玉反庍凳及端卞犯□正矛□旦白央奶伙毛凳蕙允月窗Х毛髐角々中諵峇ョ +仇及戊穴件玉互优邰卞卅月及反﹜犯□正矛□旦毛綽輪仄化仄引勻凶樺寧支﹜ +犯□正矛□旦互莽木凶樺寧卅升卞﹜瘋戲嶽允月午五分仃匹丐月﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒失市它件玄及樹扷 +\fI/etc/passwd\fR \ - 交□扒失市它件玄樹扷 .br -/etc/shadow \- shadow仄凶交□扒失市它件玄及樹扷 +\fI/etc/shadow\fR \ - shadow 祭今木凶交□扒樹扷 .br -/etc/group \- 弘伙□皿樹扷 +\fI/etc/group\fR \ - 弘伙□皿樹扷 .br -/etc/gshadow \- shadow仄凶弘伙□皿樹扷 +\fI/etc/gshadow\fR \- shadow 祭今木凶弘伙□皿樹扷 .SH 楮洘嫩杴 .BR group (5), .BR passwd (5), diff --git a/man/ja/newgrp.1 b/man/ja/newgrp.1 index 13d6d45f..96310eb7 100644 --- a/man/ja/newgrp.1 +++ b/man/ja/newgrp.1 @@ -1,3 +1,4 @@ +.\"$Id: newgrp.1,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,59 +26,67 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: newgrp.1,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Updated & Modified Sun 3 Mar 2002 by NAKANO Takeo +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" .TH NEWGRP 1 .SH 抩蟆 -newgrp \- 弘伙□皿ID毛庍凳允月 +newgrp \- 蕙仄中弘伙□皿卞伕弘奶件允月 .br -sg \- 唱卅月弘伙□皿ID匹戊穴件玉毛撢墊允月 +sg \- 帎及弘伙□皿 ID 匹戊穴件玉毛撢墊允月 .SH 踏摯 -.BR newgrp " [" - ] -[\fIgroup\fR] +\fBnewgrp\fR [\fB-\fR] [\fIgroup\fR] .br -.BR sg " [" - ] -[\fIgroup\fR [[\fB-c\fR] \fIcommand\fR]] +\fBsg\fR [\fB-\fR] [\fIgroup\fR [[\fB-c\fR] \fIcommand\fR]] .SH 濩抸 .B newgrp -反伕弘奶件本永扑亦件醱卞蜇箕及弘伙□皿ID毛庍凳允月凶戶卞迕中日木月﹝ -左皿扑亦件午仄化\fB\-\fR白仿弘毛芨尹凶樺寧反﹜ +反伕弘奶件本永扑亦件醱卞蜇箕及弘伙□皿 ID 毛庍凳允月凶戶卞迕中日木月﹝ +左皿扑亦件午仄化 \fB\-\fR 白仿弘毛芨尹凶樺寧反﹜ 蕙凶卞伕弘奶件仄凶及午き元迋卞棕雁互瘋賡渝祭今木月﹝ -公丹匹卅中樺寧反﹜綜僅犯奴伊弁玄伉毛殖戶化﹜蜇箕及棕雁反庍祭仄卅中﹝ +公丹匹卅中樺寧反﹜蜇箕及綜僅犯奴伊弁玄伉毛殖戶化﹜ +蜇箕及棕雁反庍祭仄卅中﹝ .PP .B newgrp -反﹜蜇箕及撢端及弘伙□皿ID毛﹜隙爛仄凶弘伙□皿卞﹜ -引凶弘伙□皿抩毛隙爛仄卅井勻凶樺寧反\fI/etc/passwd\fR卞筏竭今木凶 -犯奴白巧伙玄及弘伙□皿卞﹜庍凳允月﹝ +反蜇箕及撢弘伙□皿 ID 毛﹜隙爛仄凶弘伙□皿卞 +(弘伙□皿抩毛隙爛仄卅井勻凶樺寧反 \fI/etc/passwd\fR +卞筏竭今木凶犯白巧伙玄及弘伙□皿卞) 庍凳允月﹝ 交□扒卞反由旦伐□玉互卅仁弘伙□皿卞反丐月樺寧﹜ -手仄仁反﹜丟件田□匹丐月午澀爛今木化云日內﹜ -仄井手弘伙□皿卞反由旦伐□玉互丐月樺寧卞反﹜ -由旦伐□玉及ェ恘毛菲戶日木月﹝ -弘伙□皿及由旦伐□玉互澀爛今木化云日內﹜井勾交□扒互丟件田□午仄化 -澀爛今木化中卅中樺寧反﹜失弁本旦毛蛐搕竣鴗諢 +丐月中反交□扒互弘伙□皿及丟件田□匹反卅仁 +弘伙□皿卞由旦伐□玉互丐月樺寧卞反﹜ +公及交□扒反由旦伐□玉及ェ恘毛菲戶日木月﹝ +弘伙□皿及由旦伐□玉互澀爛今木化云日內﹜ +井勾交□扒互弘伙□皿及丟件田□匹卅中樺寧反﹜ +失弁本旦反蛐搕竣鴗諢 .PP .B sg -戊穴件玉反\fBnewgrp\fR午き迋卅か五毛允月互﹜ -交□扒及扑尼伙反譆五晶歹日卅中﹝ -蝨勻化﹜\fBsg\fR戊穴件玉井日握惜蕪儦蝷炾岏陘峊陞諢憧脭D卞枑月﹝ +戊穴件玉反 +.B newgrp +午き迋卞が綜允月互﹜戊穴件玉毛熬仃尥仃月﹝ +仇及戊穴件玉反 Bourne 扑尼伙匹撢墊今木月﹝ +戊穴件玉互呁醒及簽賄井日卅月樺寧反﹜ +sg 及撢墊葭午卅月匹丐欠丹扑尼伙及幻午氏升卞云中化﹜ +仇木日毛弁巧□玄允月优邰互丐月分欠丹﹝ +.BR newgrp " 午 " sg +及手丹域勾及啜中反﹜ +た爛及扑尼伙互 \fBnewgrp\fR 毛た帎卞健丹鰾卞丐月﹝ +仇及方丹卅扑尼伙反﹜憤坌憤褥毛 +.B newgrp +互戲嶽仄凶蕙仄中撢蟲午譆五晶尹月﹝仇及方丹卅仇午反 .B sg -反戊穴件玉手熬仃尥仃月﹝ -戊穴件玉反Bourne扑尼伙匹撢墊今木﹜婁迕扞匹區引卅仁化反卅日卅中﹝ -.SH 煞屢 -仇及リ垥fBnewgrp\fR卞反聶仁及戊件由奶伙凜左皿扑亦件互丐月互﹜ -扔奶玄卞方勻化反﹜公及丹切及中仁勾井仄井澀爛今木化中卅中仇午手丐月﹝ +匹反粟五卅中及匹﹜ +.B sg +戊穴件玉井日枑勻凶端卞反動蟆及弘伙□皿 ID 卞枑月﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒及失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/group \- 弘伙□皿樹扷 +\fI/etc/group\fR \ - 弘伙□皿樹扷 .SH 楮洘嫩杴 .BR id (1), .BR login (1), .BR su (1) .SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +Julianne Frances Haugh diff --git a/man/ja/newusers.8 b/man/ja/newusers.8 index 154cc712..bfc765b3 100644 --- a/man/ja/newusers.8 +++ b/man/ja/newusers.8 @@ -1,3 +1,4 @@ +.\"$Id: newusers.8,v 1.3 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,49 +26,46 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: newusers.8,v 1.1 2001/11/16 17:00:48 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1996 HANATAKA Shinya .\" all rights reserved. .\" Translated Wed Nov 20 17:42:39 JST 1996 .\" by HANATAKA Shinya +.\" Modified Sun 22 Sep 2002 by NAKANO Takeo .\" .TH NEWUSERS 8 .SH 抩蟆 -\fBnewusers\fR - 交□扒樹扷及庍凳支蕙筋交□扒綜嶽毛引午戶化墊丹 +newusers \- 交□扒及蕙筋綜嶽支樹扷凳蕙毛田永民質咥匹墊丹 .SH 踏摯 -\fBnewusers\fR [\fI new_users \fR] +\fBnewusers\fR [\fInew_users\fR] .SH 濩抸 -\fBnewusers\fR 反﹜交□扒抩午尪妐由旦伐□玉及覆毛筏仄凶白央奶伙毛づ心﹜ -公及樹扷毛手午卞﹜湃繡及交□扒樹扷及庍凳支﹜蕙筋交□扒及綜嶽毛墊丹﹝ -仇及白央奶伙及踏摯反﹜票筏及鰾毛輪五﹜ -伓賞讀卅由旦伐□玉白央奶伙 (\fBpasswd\fR(5) 輔寰) 午き元匹丐月﹝ +\fBnewusers\fR 反交□扒抩午尪妐由旦伐□玉午及賺毛筏仄凶白央奶伙毛づ心﹜ +公及樹扷毛手午卞湃繡及交□扒樹扷及庍凳支蕙筋交□扒及綜嶽毛墊丹﹝ +仇及白央奶伙及踏摯反﹜ +票筏及鰾毛輪五伓賞讀卅由旦伐□玉白央奶伙 +(\fBpasswd\fR(5) 輔寰) 午き元匹丐月﹝ .IP "\fIpw_passwd\fR" 10 -仇及白奴□伙玉互剪寞祭今木﹜剪寞祭由旦伐□玉午卅月﹝ +仇及白奴□伙玉互剪寞祭今木﹜蕙仄中剪寞祭由旦伐□玉午卅月﹝ .IP "\fIpw_age\fR" -交□扒互允匹卞繡箕允月樺寧﹜由旦伐□玉毛悵允凶戶﹜仇及白奴□伙玉反拑骰今木月﹝ +仇及白奴□伙玉反 shadow 白央奶伙輊仃及樹扷匹丐月互﹜ +交□扒互允匹卞繡箕允月樺寧反拑骰今木月﹝ .IP "\fIpw_gid\fR" 仇及白奴□伙玉卞湃繡及弘伙□皿毛隙爛仄凶樺寧反﹜ 交□扒反公及弘伙□皿卞笛尹日木月﹝ 繡箕仄卅中弘伙□皿 ID 毛隙爛仄凶樺寧反﹜ -公及弘伙□皿 ID 毛手勾蕙凶卅弘伙□皿互綜日木月﹝ +公及弘伙□皿 ID 匹蕙凶卅弘伙□皿互綜嶽今木月﹝ .IP "\fIpw_dir\fR" 仇及白奴□伙玉匹隙爛仄凶犯奴伊弁玄伉互允匹卞繡箕允月井民尼永弁仄﹜ -手仄繡箕仄卅仃木壬﹜蕙凶卞犯奴伊弁玄伉互綜日木月﹝ -引凶﹜仇及犯奴伊弁玄伉反﹜ -蕙筋交□扒﹜丐月中反樹扷互庍凳今木凶交□扒互赭肣樊午卅月﹝ +手仄繡箕仄卅仃木壬蕙凶卞犯奴伊弁玄伉互綜日木月﹝ +仇及犯奴伊弁玄伉及赭肣樊反﹜ +蕙筋綜嶽今木凶交□扒﹜丐月中反樹扷互庍凳今木凶交□扒午卅月﹝ .PP -仇及戊穴件玉反﹜聶仁及失市它件玄互域蘸卞庍凳今木月方丹卅 -釐五卅扑旦氾丞棕雁匹銀丹凶戶及手及匹丐月﹝ +仇及戊穴件玉反﹜き凜卞釐恟及失市它件玄毛綜嶽允月方丹卅﹜ +釐筋昑卅扑旦氾丞棕雁匹迕中月凶戶卞綜日木凶﹝ .SH 煞屢 -.\" The \fImkpasswd\fR command must be executed afterwards to update the -.\" DBM password files. -ェ恘白央奶伙卞反﹜戲及由旦伐□玉互殖引木月凶戶﹜健中卞鏜啦允月仇午﹝ +ェ恘白央奶伙卞反剪寞祭今木化中卅中由旦伐□玉互殖引木月凶戶﹜ +贗濠卞忡賃仄化云井卅仃木壬卅日卅中﹝ .SH 楮洘嫩杴 -.\" mkpasswd(8), passwd(1), useradd(1) .BR passwd (1), .BR useradd (8) .SH 難樊 Julianne Frances Haugh (jockgrrl@ix.netcom.com) - - diff --git a/man/ja/passwd.1 b/man/ja/passwd.1 index af49c90c..97b1b6b7 100644 --- a/man/ja/passwd.1 +++ b/man/ja/passwd.1 @@ -1,3 +1,4 @@ +.\"$Id: passwd.1,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,12 +26,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: passwd.1,v 1.3 2001/12/22 05:40:04 kloczek Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Updated 2 Mar 2002 by NAKANO Takeo +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" .TH PASSWD 1 .SH 抩蟆 @@ -40,147 +41,176 @@ passwd \- .br \fBpasswd\fR [\fB-g\fR] [\fB-r\fR|\fB-R\fR] \fIgroup\fR .br -\fBpasswd\fR [\fB-x\fR \fImax\fR] [\fB-n\fR \fImin\fR] -[\fB-w\fR \fIwarn\fR] [\fB-i\fR \fIinact\fR] \fIname\fR +\fBpasswd\fR [\fB-x \fImax\fR] [\fB-n \fImin\fR] +[\fB-w \fIwarn\fR] [\fB-i \fIinact\fR] \fIlogin\fR .br -\fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR} \fIname\fR +\fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR|\fB-e\fR} \fIlogin\fR .SH 濩抸 -\fBpasswd\fR反交□扒菴太弘伙□皿失市它件玄及由旦伐□玉毛庍凳允月﹝ +\fBpasswd\fR 反交□扒失市它件玄’弘伙□皿失市它件玄及由旦伐□玉毛庍凳允月﹝ 域怚獢憧隊牳封洶峊╞咱戎韞及由旦伐□玉仄井庍凳匹五卅中﹝ -旦□由□交□扒反中井卅月失市它件玄及由旦伐□玉手庍凳允月仇午互請侳月﹝ -弘伙□皿及棟咥樊反弘伙□皿及由旦伐□玉毛庍凳允月仇午互請侳月﹝ -\fBpasswd\fR卞方勻化﹜交□扒及白伙生□丞﹜伕弘奶件扑尼伙﹜由旦伐□玉及 -渝蜃濠木及ゥ尥菴太肣躲渝棉羈及失市它件玄樹扷毛庍凳允月仇午手匹五月﹝ +旦□由□交□扒反中井卅月失市它件玄及由旦伐□玉手庍凳匹五月﹝ +弘伙□皿及棟咥樊反弘伙□皿及由旦伐□玉毛庍凳匹五月﹝ +\fBpasswd\fR 卞方勻化﹜交□扒及白伙生□丞’伕弘奶件扑尼伙’ +由旦伐□玉及渝蜃濠木及ゥ尥’ +肣躲渝棉午中勻凶失市它件玄樹扷毛庍凳允月仇午手匹五月﹝ +.PP +.B -s +左皿扑亦件毛隙爛允月午 +.BR passwd " 反 " chsh +毛裟太請仄化交□扒及扑尼伙毛庍凳允月﹝ +.B -f +左皿扑亦件毛隙爛允月午 +.BR passwd " 反 " chfn +毛裟太請仄化交□扒及 GECOS 樹扷毛庍凳允月﹝ +仇木日及 2 勾及左皿扑亦件反詢晶嶺及凶戶分仃卞丐月﹝ +chsh 支 chfn 毛躂濤裟太請仄化手厭歹卅中﹝ .SS 由旦伐□玉及庍凳 -由旦伐□玉互湃卞丐月樺寧反﹜燮內衙中由旦伐□玉毛ェ恘允月方丹瞼今木月﹝ -ェ恘今木凶由旦伐□玉反﹜剪寞祭今木﹜筏狤今木化中月手及午寰寧今木月﹝ -懇仄中由旦伐□玉毛1莢匹ェ恘仄卅仁化反卅日卅中﹝ +由旦伐□玉互湃卞丐月樺寧反﹜引內衙中由旦伐□玉毛ェ恘允月方丹瞼今木月﹝ +ェ恘今木凶由旦伐□玉反剪寞祭今木﹜筏狤今木化中月手及午寰寧今木月﹝ +懇仄中由旦伐□玉毛 1 莢匹ェ恘仄卅仁化反卅日卅中﹝ 旦□由□交□扒反﹜由旦伐□玉毛侉木化仄引勻凶端及庍凳手墊卅尹月迋卞﹜ -仇及旦氾永皿毛拑骰允月仇午互請侳月﹝ +仇及旦氾永皿毛彊峎匹五月﹝ .PP 由旦伐□玉互ェ恘今木凶詨﹜由旦伐□玉肣躲渝蜃及樹扷毛譬屯﹜ 蜇箕由旦伐□玉及庍凳互袱今木化中月井腹犖允月﹝ -手仄袱第今木化中卅中樺寧反﹜\fBpasswd\fR反庍凳毛蛐搕楔す肥誘馱諢 +手仄袱第今木化中卅中樺寧反﹜ +\fBpasswd\fR 反庍凳毛蛐搕楔す肥誘馱諢 .PP -慼中匹﹜醫歹曰及由旦伐□玉毛ェ恘允月方丹瞼今木月﹝ -ェ恘今木凶由旦伐□玉反呁豪今毛腹犖今木月﹝ -域旼炊妡媬豸仄化反﹜由旦伐□玉反動票及螂寧公木冗木井日域勾動曉及 -妐儂毛銀勻凶6井日8妐儂及手及卞允屯五匹丐月 +慼卞交□扒反﹜譆五晶尹月由旦伐□玉毛ェ恘允月方丹瞼今木月﹝ +ェ恘今木凶由旦伐□玉反﹜蝦坌呁豪井升丹井腹犖今木月﹝ +域旼炊妡媬豸仄化反﹜ +由旦伐□玉反動票及螂寧公木冗木井日域勾動曉及妐儂毛銀勻凶 +6 井日 8 妐儂及手及卞允屯五匹丐月﹝ .IP "" .5i 凝妐儂及失伙白央矛永玄 .IP "" .5i 釐妐儂及失伙白央矛永玄 .IP "" .5i -0井日9坶及醒儂 +0 井日 9 引匹及醒儂 .IP "" .5i 嗥づ鰾 .PP -扑旦氾丞及犯奴白巧伙玄及壅蛔妐儂支kill妐儂毛殖戶卅中迋卞 -鏜啦仄卅仁化反卅日卅中﹝ -\fBpasswd\fR反丐引曰卞簽賬卅由旦伐□玉尺及庍凳反蛐搕馱諢 +扑旦氾丞及犯白巧伙玄及壅蛔妐儂支 +kill 妐儂毛殖戶卅中方丹卞鏜啦允月仇午﹝ +\fBpasswd\fR 反丐引曰卞簽賬卅由旦伐□玉尺及庍凳反蛐搕馱諢 .PP ェ恘仄凶由旦伐□玉互熬仃ェ木日木凶樺寧﹜ -\fBpasswd\fR反手丹域蘸ェ恘毛瞼仄﹜わ筇雂侔恘仄凶手及毛瘉賡及 -手及午瘜茪馱諢 -由旦伐□玉庍凳互熬仃ェ木日木月凶戶卞反﹜徆杅及ェ恘互扞寧卅仁化反卅日卅中﹝ +\fBpasswd\fR 反手丹域蘸ェ恘毛瞼仄﹜ +わ筇雂侔恘仄凶手及毛瘉賡及手及午瘜茪馱諢 +由旦伐□玉庍凳互熬仃ェ木日木月凶戶卞反﹜ +仇及徆樊互寧譙仄卅仁化反卅日卅中﹝ .SS 弘伙□皿由旦伐□玉 -\fB-g\fR左皿扑亦件毛迕中凶樺寧﹜隙爛仄凶弘伙□皿及由旦伐□玉互庍凳今木月﹝ -旦□由□交□扒井隙爛仄凶弘伙□皿及棟咥樊匹卅中午 -仇及左皿扑亦件反銀尹卅中﹝ +\fB-g\fR 左皿扑亦件毛迕中凶樺寧﹜ +隙爛仄凶弘伙□皿及由旦伐□玉互庍凳今木月﹝ +仇及左皿扑亦件反旦□由□交□扒井隙爛仄凶弘伙□皿及棟咥樊仄井銀尹卅中﹝ 蜇箕及弘伙□皿由旦伐□玉反諜友化仇卅中﹝ -\fB-g\fR左皿扑亦件毛\fB-r\fR左皿扑亦件午午手卞迕中月午﹜ +\fB-g\fR 左皿扑亦件毛 \fB-r\fR 左皿扑亦件午午手卞迕中月午﹜ 隙爛仄凶弘伙□皿及由旦伐□玉互綽輪今木月﹝ -仇丹允月午﹜蟈化及丟件田□互仇及弘伙□皿卞失弁本旦匹五月﹝ -\fB-R\fR左皿扑亦件毛\fB-g\fR左皿扑亦件午午手卞迕中月午﹜ -蟈化及交□扒卞覆仄化隙爛仄凶弘伙□皿尺及失弁本旦毛嗟鞅允月儀互請侳月﹝ +仇丹允月午蟈化及丟件田□互仇及弘伙□皿卞失弁本旦匹五月方丹卞卅月﹝ +\fB-R\fR 左皿扑亦件毛 \fB-g\fR 左皿扑亦件午午手卞迕中月午﹜ +蟈化及交□扒卞覆仄化隙爛仄凶弘伙□皿尺及失弁本旦毛嗟鞅匹五月﹝ .SS 由旦伐□玉及肣躲渝蜃樹扷 -由旦伐□玉及肣躲渝蜃及樹扷反旦□由□交□扒互\fB-x\fR﹜\fB-n\fR﹜ -\fB-w\fR菴太\fB-i\fR左皿扑亦件毛迕中化庍凳匹五月﹝ -\fB-x\fR左皿扑亦件反由旦伐□玉互肣躲卅瘉釐ゥ醒毛澀爛允月及卞迕中日木月﹝ -\fImax\fRゥ互聊亢月午由旦伐□玉毛庍凳允月方丹卞菲戶日木月﹝ -\fB-n\fR左皿扑亦件反由旦伐□玉互庍凳第Х午卅月引匹及瘉凝ゥ醒毛 -澀爛允月及卞迕中日木月﹝ -交□扒反\fImin\fRゥ互煩聊仄凶詨匹卅中午由旦伐□玉毛庍凳允月仇午互 -匹五卅中﹝ -\fB-w\fR左皿扑亦件反由旦伐□玉及銀迕渝蜃互侳月蟆卞窒ゥ棉 -煞屢毛芨尹月井毛澀爛允月凶戶卞迕中日木月﹝ -渝蜃濠木及\fIwarn\fRゥ蟆井日鏜啦互釩銨今木﹜ -丐午窒ゥ匹由旦伐□玉互渝蜃濠木卞卅月井互憎今木月﹝ -\fB-i\fR左皿扑亦件反﹜由旦伐□玉及渝蜃互濠木凶丐午窒ゥ棉公及失市它件玄 -互銀迕尕Х及橇謫卞允月井毛澀爛允月及卞迕中月﹝ -\fIinact\fRゥ棉失市它件玄毛由旦伐□玉渝蜃濠木橇謫及引引卞允月午﹜ -交□扒反公及失市它件玄卞ェ月仇午互請侳卅仁卅月﹝ +旦□由□交□扒反﹜由旦伐□玉及肣躲渝蜃卞楮允月樹扷毛庍凳匹五月﹝ +仇木卞反 \fB-x\fR, \fB-n\fR, \fB-w\fR, \fB-i\fR 卅升及左皿扑亦件毛迕中月﹝ +\fB-x\fR 左皿扑亦件反由旦伐□玉互肣躲卅瘉贏ゥ醒毛澀爛允月及卞迕中日木月﹝ +\fImax\fR ゥ互聊亢月午由旦伐□玉毛庍凳允月方丹卞菲戶日木月﹝ +\fB-n\fR 左皿扑亦件反由旦伐□玉互庍凳第Х午卅月引匹及 +瘉羶ゥ醒毛澀爛允月及卞迕中日木月﹝ +交□扒反 \fImin\fR ゥ互煩聊仄凶詨匹卅中午由旦伐□玉毛庍凳匹五卅中﹝ +\fB-w\fR 左皿扑亦件反由旦伐□玉及銀迕渝蜃互侳月蟆卞 +窒ゥ棉煞屢毛芨尹月井毛澀爛允月凶戶卞迕中日木月﹝ +渝蜃濠木及 \fIwarn\fR ゥ蟆井日鏜啦互釩銨今木﹜ +由旦伐□玉互渝蜃濠木卞卅月引匹丐午窒ゥ酸勻化中月井互憎今木月﹝ +\fB-i\fR 左皿扑亦件反﹜ +由旦伐□玉及渝蜃互濠木化井日窒ゥ棉煩聊仄凶日﹜ +公及失市它件玄毛銀迕尕Х及橇謫卞允月井毛澀爛允月及卞迕中月﹝ +\fIinact\fR ゥ棉失市它件玄毛由旦伐□玉渝蜃濠木橇謫及引引卞允月午﹜ +交□扒反公及失市它件玄卞ェ木卅仁卅月﹝ +.PP +丐月失市它件玄及由旦伐□玉毛躂切卞渝蜃濠木卞仄凶中樺寧反﹜ +\fB-e\fR 左皿扑亦件毛迕中木壬方中﹝ +允月午公及交□扒反慼卞伕弘奶件允月端卞由旦伐□玉毛庍凳允月方丹雄孺今木月﹝ +\fB-d\fR 左皿扑亦件毛銀勻化﹜交□扒及由旦伐□玉毛綽輪允月仇午手匹五月 +(由旦伐□玉互塢卞卅月)﹝仇及左皿扑亦件反鏜啦仄化銀丹仇午﹝ +仇木毛銀丹午﹜公及失市它件玄反伕弘奶件卞由旦伐□玉毛蟈仁优邰午仄卅仁卅曰﹜ +扑旦氾丞互膳ェ樊卞覆仄化左□皿件卞卅勻化仄引丹﹝ .SS 失市它件玄及忡潮 -\fB-l\fR菴太\fB-u\fR白仿永弘毛迕中化失市它件玄毛伕永弁仄凶曰 -伕永弁毛陸仄凶曰允月儀互請侳月﹝ -\fB-l\fR左皿扑亦件毛迕中月午﹜由旦伐□玉反剪寞祭今木凶ョ窒卅月襖午手 -扞寧仄卅仁卅曰﹜失市它件玄反銀迕尕Х卞卅月﹝ -\fB-u\fR左皿扑亦件毛迕中月午﹜由旦伐□玉互動蟆及襖卞枑曰﹜ +\fB-l\fR 白仿弘午 \fB-u\fR 白仿弘毛迕中月午﹜ +交□扒失市它件玄毛伕永弁仄凶曰﹜公及伕永弁毛陸仄凶曰匹五月﹝ +\fB-l\fR 左皿扑亦件毛迕中月午﹜ +由旦伐□玉白奴□伙玉及襖反剪寞祭今木凶ョ窒卅月襖午手穴永民仄卅仁卅曰﹜ +失市它件玄反銀迕尕Х卞卅月﹝ +\fB-u\fR 左皿扑亦件毛迕中月午﹜由旦伐□玉反動蟆及襖卞枑曰﹜ 失市它件玄互瘋太銀迕第Х午卅月﹝ .PP -\fB-S\fR左皿扑亦件毛迕中月午失市它件玄及橇謫互刓憎今木月﹝ -失市它件玄及橇謫及樹扷反6勾及朿坌井日卅月﹝ -瘉賡及朿坌反﹜失市它件玄卞伕永弁互井仃日木化中月及井(L)﹜ -由旦伐□玉互繡箕仄卅中及井(NP)﹜ -手仄仁反銀迕第Х卅由旦伐□玉互丐月(P)及井毛憎允﹝ -2筇雂牬К憭迉悒馴鵅憧氻畎揤馱竣鴗褪尥毛憎允﹝ +\fB-S\fR 左皿扑亦件毛迕中月午失市它件玄及橇謫互刓憎今木月﹝ +失市它件玄及橇謫及樹扷反 6 勾及朿坌井日卅月﹝ +瘉賡及朿坌反﹜失市它件玄卞伕永弁互井仃日木化中月 (L)﹜ +由旦伐□玉互繡箕仄卅中 (NP)﹜ +手仄仁反銀迕第Х卅由旦伐□玉互丐月 (P) 午中勻凶樹扷毛憎允﹝ +2 筇雂牬К憭迉悒馴鵅憧氻畎揤馱竣鴗褪尥毛憎允﹝ 酸曰及4勾及朿坌反公木冗木由旦伐□玉及瘉羶渝蜃﹜瘉贏渝蜃﹜煞屢渝棉﹜ 銀迕尕Х渝棉匹丐月﹝ .SS 交□扒由旦伐□玉卞覆允月甲件玄 -由旦伐□玉及兜蟈嶺反剪寞祭失伙打伉朮丞及雄恘今午平□塢棉及釐五今卞 -匙繡允月﹝ -\fB\s-2UNIX\s+2\fR及扑旦氾丞剪寞祭及杅芊反NBS DES失伙打伉朮丞卞 -湘勿中化云曰﹜騞鴾阭臏替迨牲滮丑 +由旦伐□玉及兜蟈嶺反剪寞祭失伙打伉朮丞及雄恘今午平□塢棉及釐五今卞匙繡允月﹝ +\fB\s-2UNIX\s+2\fR 及扑旦氾丞剪寞祭及杅芊反 +NBS DES 失伙打伉朮丞卞湘勿中化云曰﹜騞鴾阭臏替迨牲滮丑 平□塢棉及釐五今反薊壬木凶由旦伐□玉及仿件母丞今卞匙繡允月﹝ .PP -由旦伐□玉及兜蟈嶺互飲井今木月及反﹜釐纏及樺寧由旦伐□玉毛鏜啦蕉仁 -薊太健歹卅中儀卞方月﹝ -仄凶互勻化﹜由旦伐□玉反憮踏卞竭勻化中卅中手及潦仄仁反 -踏五帢戶月优邰及卅中手及毛薊鎗允屯五匹丐月﹝ -引凶﹜裔肣抩髦支昈袱據砦獢〡臍裟支憤鎘及蝠赭午中勻凶手及毛 +由旦伐□玉及兜蟈嶺互飲井今木月及反﹜ +釐纏及樺寧由旦伐□玉及薊鎗支健中互尕鏜啦卅凶戶匹丐月﹝ +蝨勻化由旦伐□玉午仄化反﹜ +憮踏卞竭勻化中月手及支踏五帢戶卅仃木壬卅日卅中手及反 +礞惜諵暀迨リ═諢 +引凶﹜裔肣抩髦’昈袱據砦獢污臍裟’憤鎘及蝠赭卅升毛 由旦伐□玉卞允月及手礞惜諵暀迨リ═諢 -午中丹及反﹜曉及中內木手扑旦氾丞及本平亙伉氾奴毛允端及蹂恟午仄化 -迕中日木月第Х嶺互丐月井日匹丐月﹝ +仇木日反中內木手扑旦氾丞本平亙伉氾奴毛г月端卞﹜ +蹂恟樹扷卞迕中日木月第Х嶺互丐月井日匹丐月﹝ .PP -由旦伐□玉反餅弅卞踏五帢戶化云仁优邰互拑中方丹卅棵簽卞閤中請六月 -手及卞仄卅仁化反卅日卅中﹝ -仇木反﹜拺尹壬羶中わ勾及簽賄毛仁勻尥仃化公及棉卞た潰筏寞坭反醒儂毛 -韌心慇戈仇午卞方勻化綜月仇午互請侳月﹝ -拺尹壬﹜Pass%word羈匹丐月﹝ +由旦伐□玉反餅弅卞踏五帢戶化云仁优邰互拑中方丹﹜ +棵簽卞閤中請六月手及卞仄卅仁化反卅日卅中﹝ +仇木反拺尹壬﹜ +羶中わ勾及簽賄毛仁勻勾仃化﹜ +公及棉卞た潰筏寞支醒儂毛韌心慇戈仇午卞方勻化綜木月﹝ +拺尹壬 Pass%word 卅升﹝ .PP 職及綜曰杅午仄化反﹜妐喀綜圴卅升井日閤中請仄支允中嗥毛薊太請仄﹜ -公木冗木及簽賄井日瘉賡潦仄仁反瘉詨及妐儂毛握亳苳嘟芊互丐月﹝ -仇及杅芊及拺午仄化反 +公木冗木及簽賄井日瘉賡手仄仁反瘉詨及妐儂毛握亳苳嘟芊互丐月﹝ +仇及杅芊及拺午仄化反﹜ .IP "" .5i Ask not for whom the bell tolls. .PP -午中丹嗥井日慼及迋卅由旦伐□玉互綜曰請六月﹝ +午中丹嗥井日 .IP "" .5i An4wtbt. +午中丹由旦伐□玉互綜曰請六月﹝ .PP -雯日仁弁仿永市□及儅勻化中月憮踏卞仇氏卅賄嗥反竭勻化中卅今公丹分﹜ -午閤丹匹丐欠丹﹝ -仄井仄﹜仇仇卞憎仄凶杅芊分仃卞俇月及匹反卅仁﹜憤坌つ憤及由旦伐□玉 -及綜曰杅毛嗶尹請允屯五匹丐月﹝ +弁仿永市□及憮踏卞反﹜ +仇氏卅賄嗥反竭勻化中卅今公丹分﹜午心卅仄化手恌中分欠丹﹝ +仄井仄﹜仇仇卞憎仄凶杅芊分仃卞俇月及匹反卅仁﹜ +憤坌つ憤及由旦伐□玉及綜曰杅毛嗶尹請允屯五匹丐月﹝ .SS 弘伙□皿及由旦伐□玉卞楮允月鏜啦 弘伙□皿由旦伐□玉反﹜域諦動曉及諦棉互襞月仇午互袱今木月手及匹丐月井日﹜ -戲侳讀卞本平亙伉氾奴曉及杽鎖毛旳尹化中月﹝ -仄井仄﹜弘伙□皿午中丹し填峏化反帎★及諦棉互隋き匹綜僅允月儀互請侳月及匹﹜ -忐厙匹反丐月﹝ +呿撙讀卞本平亙伉氾奴曉及杽鎖毛旳尹化中月﹝ +仄井仄弘伙□皿毛銀尹壬帎★及諦棉互隋き匹綜僅允月儀互匹五月及匹﹜ +仇木反忐厙卅汁□伙匹反丐月﹝ .SH 煞屢 -蟈化及左皿扑亦件互銀尹月方丹卞反澀爛今木化中卅中第Х嶺互丐月﹝ -由旦伐□玉及呁豪今及腹據反扔奶玄咍卞唱卅勻化中月分欠丹﹝ -交□扒反扑旦氾丞互坢簫允月蝦坌呁豪卅由旦伐□玉毛薊少方丹雄中日木月﹝ -NIS互が綜仄化云曰仄井手NIS扔□田動陸卞伕弘奶件仄化中月樺寧反 -由旦伐□玉毛庍凳允月仇午互請侳卅中﹝ +蟈化及左皿扑亦件互銀尹月方丹卞反澀爛今木化中卅中井手仄木卅中﹝ +由旦伐□玉及呁豪今及腹據反扔奶玄卞方勻化唱卅月分欠丹﹝ +交□扒反扑旦氾丞互坢簫允月方丹卅﹜ +蝦坌呁豪卅由旦伐□玉毛薊少方丹雄孺今木月﹝ +NIS 互が綜仄化中化﹜ +井勾 NIS 扔□田動陸卞伕弘奶件仄化中月交□扒反﹜ +由旦伐□玉毛庍凳匹五卅中﹝ +(沭鏜: 仇及樺寧 +.BR yppasswd (8) +毛迕中月﹝) .SH 白央奶伙 -/etc/passwd \- 交□扒失市它件玄卞楮允月樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/shadow \- 交□扒及剪寞祭今木凶由旦伐□玉 +\fI/etc/shadow\fR \- 剪寞祭今木凶交□扒由旦伐□玉 .SH 楮洘嫩杴 -.BR passwd (3), -.\" .BR shadow (3), .BR group (5), .BR passwd (5) .SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +Julianne Frances Haugh diff --git a/man/ja/passwd.5 b/man/ja/passwd.5 index 8a5c4704..f06cd6e0 100644 --- a/man/ja/passwd.5 +++ b/man/ja/passwd.5 @@ -1,3 +1,4 @@ +.\"$Id: passwd.5,v 1.6 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,12 +26,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: passwd.5,v 1.4 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Modified Tue 18 Sep 2002 by NAKNAO Takeo .\" .TH PASSWD 5 .SH 抩蟆 @@ -38,43 +38,47 @@ passwd \- .SH 濩抸 .I passwd 白央奶伙卞反備交□扒失市它件玄及迋★卅樹扷互筏狤今木化中月﹝ -踏井木化中月及反﹜ +踏井木化中月及反慼及騷曰﹝ .IP "" .5i 伕弘奶件抩 .IP "" .5i -左皿扑亦件及剪寞祭今木凶由旦伐□玉 +剪寞祭今木凶由旦伐□玉 (拑中仇午手丐月) .IP "" .5i 交□扒 ID 砦 .IP "" .5i 弘伙□皿 ID 砦 .IP "" .5i -交□扒抩手仄仁反戊丟件玄勂 +交□扒抩引凶反戊丟件玄及白奴□伙玉 .IP "" .5i 交□扒及石□丞犯奴伊弁玄伉 .IP "" .5i 交□扒及戊穴件玉奶件正皿伉正 .PP -由旦伐□玉互 shadow 今木化中月樺寧﹜由旦伐□玉勂毛呥戶化反卅日卅中﹝ +由旦伐□玉互 shadow 祭今木化中月樺寧反﹜ +由旦伐□玉白奴□伙玉毛呥戶化反卅日卅中﹝ shadow 由旦伐□玉毛迕中化中月樺寧﹜剪寞祭今木凶由旦伐□玉反 \fI/etc/shadow\fR 卞踏井木化中月﹝ -剪寞祭今木凶由旦伐□玉反﹜失伙白央矛永玄 a 井日 z﹜A 井日 Z﹜0 井日 9 -菴太 \. 午 / 及 64 妐儂井日綜日木凶 13 妐儂井日卅月﹝ -仇及妐儂昫互升及方丹卞荸澄今木月井及擇稱反﹜\fBcrypt\fR(3) 毛 -輔寰及仇午﹝ +剪寞祭今木凶由旦伐□玉反﹜ +失伙白央矛永玄 a 井日 z﹜A 井日 Z﹜0 井日 9﹜\. 午 / 及 +64 妐儂井日綜日木凶 13 妐儂井日卅月﹝ +仇及妐儂昫互升及方丹卞荸澄今木月井及擇稱反 +\fBcrypt\fR(3) 毛輔寰及仇午﹝ .PP -左皿扑亦件匹﹜由旦伐□玉卞糧中化由旦伐□玉肣躲渝蜃互﹜ -戊件穴匹嗉濠勻化き元妐儂螂寧及妐儂毛銀勻化筏今木化中月仇午手丐月﹝ -由旦伐□玉肣躲渝蜃反﹜由旦伐□玉憤褥午き元妐儂螂寧井日綜日木化中月﹝ -瘉賡及妐儂卞反﹜由旦伐□玉互窒蔥棉肣躲井互筏今木化中月﹝ -わ筇雂恀蜓反﹜窒蔥棉煩化壬交□扒互由旦伐□玉毛庍凳匹五月井毛芨尹月﹝ -瘉詨及わ妐儂卞反﹜瘉詨卞由旦伐□玉毛庍凳仄凶及反 1970 ヵ 1 畸井日窒蔥棉 -煩聊仄凶凜匹丐月井毛刓允﹝ -由旦伐□玉及肣躲渝蜃互聊亢凶凜反﹜交□扒反蕙仄中由旦伐□玉毛澀爛 -仄卅仁化反卅日卅中﹝ +左皿扑亦件午仄化﹜由旦伐□玉及詨卞﹜ +戊件穴卞糧中化由旦伐□玉及肣躲渝蜃妐儂昫互筏今木化中月仇午手丐月﹝ +仇及妐儂昫反由旦伐□玉午き元妐儂本永玄井日卅月﹝ +瘉賡及妐儂反﹜由旦伐□玉互窒蔥棉肣躲井毛憎允﹝ +わ筇雂恀蜓反﹜窒蔥棉煩化壬交□扒互由旦伐□玉毛庍凳匹五月井毛憎允﹝ +瘉詨及わ妐儂反﹜ +瘉詨卞由旦伐□玉毛庍凳仄凶及互 +1970 ヵ 1 畸井日窒蔥棉煩聊仄凶凜鰾匹丐月井毛刓允﹝ +由旦伐□玉及肣躲渝蜃互聊亢凶凜反﹜ +交□扒反蕙仄中由旦伐□玉毛澀爛仄卅仃木壬卅日卅中﹝ .PP -戊丟件玄勂反﹜\fBfinger\fR(1) 羈及迋★卅扑旦氾丞交□氾奴伉氾奴卞厙迕今木月﹝ -戊丟件玄勂卞反凳卞 3 勾及醒襖互筏ェ今木化中化手恌中﹝ -公木日反﹜ +戊丟件玄白奴□伙玉反 +\fBfinger\fR(1) 及方丹卅迋★卅扑旦氾丞交□氾奴伉氾奴井日厙迕今木月﹝ +戊丟件玄白奴□伙玉卞反﹜馨笛樹扷午仄化﹜ +慼及方丹卅 3 勾及醒襖互筏ェ今木化中月仇午手丐月﹝ .IP "" .5i pri= \- nice 及賡渝澀爛襖 .IP "" .5i @@ -82,19 +86,21 @@ umask= \- umask .IP "" .5i ulimit= \- ulimit 及賡渝澀爛襖 .PP -仇木日及勂反詢中卞﹜引凶戊丟件玄勂及帎及白奴□伙玉午﹜戊件穴毛迕中化 -嗉帎今木化中月﹝ +仇木日及白奴□伙玉反詢中卞﹜引凶職及戊丟件玄白奴□伙玉午﹜ +戊件穴毛迕中化坌峊今木月﹝ .PP -石□丞犯奴伊弁玄伉勂卞反伕弘奶件凜及綜僅犯奴伊弁玄伉抩互筏今木化中月﹝ +石□丞犯奴伊弁玄伉白奴□伙玉反﹜ +賡渝綜僅犯奴伊弁玄伉及抩蟆毛芨尹月﹝ \fBlogin\fR 反仇及樹扷毛迕中化棕雁庍醒 \fBHOME\fR 及ま芢毛澀爛允月﹝ .PP -戊穴件玉奶件正皿伉正勂卞反交□扒及戊穴件玉蛻賄奶件正皿伉正手仄仁反 +戊穴件玉奶件正皿伉正及白奴□伙玉卞反﹜ +交□扒及戊穴件玉蛻賄奶件正皿伉正井﹜ 瘉賡卞撢墊允月皿伕弘仿丞及抩蟆毛筏允﹝ \fBlogin\fR 反仇及樹扷毛迕中化棕雁庍醒 \fBSHELL\fR 及ま芢毛澀爛允月﹝ -仇及勂卞窒手筏今木化中卅中樺寧反﹜犯奴白巧伙玄襖午仄化 \fB/bin/sh\fR 毛 -銀迕允月﹝ +仇及白奴□伙玉卞窒手筏今木化中卅中樺寧反﹜ +犯白巧伙玄襖午仄化 \fB/bin/sh\fR 毛銀迕允月﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒及失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .SH 楮洘嫩杴 .BR login (1), .BR passwd (1), diff --git a/man/ja/porttime.5 b/man/ja/porttime.5 index 930b70d0..50204e09 100644 --- a/man/ja/porttime.5 +++ b/man/ja/porttime.5 @@ -1,3 +1,4 @@ +.\"$Id: porttime.5,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,48 +26,50 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: porttime.5,v 1.2 2001/11/16 17:01:33 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Modified Tue 18 Sep 2002 by NAKNAO Takeo .\" .TH PORTTIME 5 .SH 抩蟆 porttime \- 禾□玄失弁本旦凜棉澀爛白央奶伙 .SH 濩抸 .I porttime -卞反tty犯田奶旦﹜交□扒抩菴太伕弘奶件第Х凜棉及伉旦玄互筏今木化中月﹝ +反 tty 犯田奶旦’交□扒抩’伕弘奶件第Х凜棉﹜及伉旦玄井日卅月﹝ .PP -蜊★及巨件玄伉□反戊伕件匹嗉濠日木凶趕勾及勂井日卅月﹝ -瘉賡及勂反戊件穴匹嗉濠日木凶tty犯田奶旦及伉旦玄﹜坭反蟈化及tty犯田奶旦互 -扞寧允月方丹卞失旦正伉旦弁毛筏允﹝ -わ筇雂怤韝豸洏野韞牏И飺琱擗鴗縞獢憧傻黎峊磪馴﹜坭反蟈化及交□扒互扞寧 -允月方丹卞失旦正伉旦弁毛筏允﹝ -趕筇雂怤韝豸洏野韞牏И飺琱擗鴗縞磳陞丰韝繺鶷臚馱趥棉及伉旦玄毛筏允﹝ +公木冗木及巨件玄伉反﹜戊伕件匹嗉濠日木凶趕勾及白奴□伙玉井日卅月﹝ +瘉賡及白奴□伙玉反戊件穴匹嗉濠日木凶 tty 犯田奶旦及伉旦玄匹﹜ +失旦正伉旦弁毛隙爛仄凶樺寧反丐日斗月 tty 犯田奶旦卞穴永民允月﹝ +わ筇雂峊掍ㄐ憧諝氻洏野韞牏И飺琱擗鴗縞獢憧傻黎峊磪馴匹﹜ +失旦正伉旦弁毛隙爛仄凶樺寧反丐日斗月交□扒卞穴永民允月﹝ +趕筇雂峊掍ㄐ憧諝氻洁 +戊件穴匹嗉濠日木凶伕弘奶件毛袱第凜棉及伉旦玄匹丐月﹝ .PP -失弁本旦正奶丞及備巨件玄伉反﹜ -\fBSu\fR, \fBMo\fR, \fBTu\fR, \fBWe\fR, \fBTh\fR, \fBFr\fR, 菴太 \fBSa\fR -午峎筏今木凶未伕蜊動曉及豖ゥ午﹜公木卞糧仁甩奶白件匹厥化日木凶凜棉及賺 -井日卅月﹝ -畸豖ゥ井日嗯豖ゥ引匹毛隙爛允月凶戶卞\fBWk\fR毛﹜ -蟈化及ゥ毛隙爛允月凶戶卞\fBAl\fR午中丹峎筏芊毛迕中月仇午手請侳月﹝ -豖ゥ及隙爛互拑中樺寧反﹜\fBAl\fR分午心卅允﹝ +失弁本旦凜棉及備巨件玄伉反﹜ +\fBSu\fR, \fBMo\fR, \fBTu\fR, \fBWe\fR, \fBTh\fR, \fBFr\fR, \fBSa\fR +匹峎筏今木凶未伕蜊動曉及豖ゥ午﹜ +甩奶白件匹嗉濠日木凶 2 勾及凜對午井日卅月﹝ +畸豖ゥ井日嗯豖ゥ引匹毛隙爛允月 \fBWk\fR 支﹜ +蟈化及ゥ毛隙爛允月 \fBAl\fR 午中丹峎筏芊毛迕中月仇午手匹五月﹝ +豖ゥ及隙爛互拑中樺寧反 \fBAl\fR 分午心卅今木月﹝ .SH 拺 -動票及拺匹反﹜交□扒\fBjfh\fR互尪ゥ及詬蟆9凜井日詬詨5凜引匹 -蟈化及禾□玄井日失弁本旦允月儀毛袱第仄化中月﹝ +慼及巨件玄伉反﹜交□扒 \fBjfh\fR 互尪ゥ及詬蟆9凜井日詬詨5凜引匹﹜ +蟈化及禾□玄井日失弁本旦第Х匹丐月仇午毛憎允﹝ .br .sp 1 *:jfh:Wk0900-1700 .br .sp 1 -動票及巨件玄伉匹反﹜\fBroot\fR菴太\fBoper\fR動陸及交□扒卞反ョ窒卅月凜棉匹手 -/dev/console井日及失弁本旦毛袱第仄化中卅中﹝ -仇及拺井日\fI/etc/porttime\fR白央奶伙互失弁本旦正奶丞及伉旦玄午仄化 -升及迋卅賜輛匹質咥今木月井互坌井月﹝ -職及蟈化及交□扒反わ筇雂峊言韞伉卞扞寧仄﹜蝨勻化console井日及失弁本旦反 -袱第今木卅中﹝ +慼及巨件玄伉反﹜ +\fBroot\fR 午 \fBoper\fR 動陸及交□扒卞反﹜升及凜棉謨卞手 +/dev/console 井日及失弁本旦毛袱第仄卅中﹝ +仇及拺反﹜\fI/etc/porttime\fR +白央奶伙互失弁本旦第Х凜棉及伉旦玄毛 +升丹中丹賜輛匹健丹井手憎仄化中月﹝ +職及蟈化及交□扒反わ筇雂峊言韞伉卞穴永民仄﹜ +仄凶互勻化 console 井日及失弁本旦反袱第今木卅中﹝ .br .sp 1 console:root,oper:Al0000-2400 @@ -74,15 +77,16 @@ porttime \- console:*: .br .sp 1 -動票及巨件玄伉匹反﹜交□扒\fBgames\fR反耦僅凜棉陸卅日ョ窒卅月禾□玄井日手 -失弁本旦請侳月迋卞隙爛仄化中月﹝ +慼及巨件玄伉反﹜ +交□扒 \fBgames\fR 互﹜耦僅凜棉陸卅日 +丐日斗月禾□玄井日失弁本旦匹五月方丹卞隙爛仄化中月﹝ .br .sp 1 *:games:Wk1700-0900,SaSu0000-2400 .br .sp 1 .SH 白央奶伙 -/etc/porttime \- 禾□玄尺及失弁本旦第Х凜棉毛筏仄凶白央奶伙 +\fI/etc/porttime\fR \- 禾□玄尺及失弁本旦第Х凜棉毛筏仄凶白央奶伙 .SH 楮洘嫩杴 .BR login (1) .SH 難樊 diff --git a/man/ja/pw_auth.3 b/man/ja/pw_auth.3 index 8da1dfd0..e7de1aa0 100644 --- a/man/ja/pw_auth.3 +++ b/man/ja/pw_auth.3 @@ -1,3 +1,4 @@ +.\"$Id: pw_auth.3,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,12 +26,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: pw_auth.3,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" updated Tue 17 Sep 2002 by NAKANO Takeo .\" .TH PWAUTH 3 .SH 抩蟆 @@ -48,88 +48,91 @@ pwauth \- .IB *input) ; .SH 濩抸 .B pw_auth -反﹜隙爛今木凶交□扒卞覆仄化棟咥樊互澀爛仄凶楮醒毛裟太請允﹝ +反﹜芨尹日木凶交□扒卞覆仄化棟咥樊互澀爛仄凶楮醒毛裟太請允﹝ .PP -\fIcommand\fR反ロ據皿伕弘仿丞及抩蟆匹丐月﹝ -升及ロ據皿伕弘仿丞毛銀迕允月井反由旦伐□玉白央奶伙卞筏今木凶交□扒樹扷 -卞方曰瑁爛今木月﹝ -仇及妐儂昫卞反﹜本立戊伕件匹嗉濠日木凶域勾動曉及撢墊白央奶伙抩毛隙爛允月﹝ +\fIcommand\fR 反ロ據皿伕弘仿丞及抩蟆匹丐月﹝ +仇木反由旦伐□玉白央奶伙卞筏今木凶公及交□扒及樹扷井日瑁爛今木月﹝ +仇及妐儂昫反本立戊伕件匹嗉濠日木凶域勾動曉及撢墊白央奶伙抩井日卅月﹝ 備★及皿伕弘仿丞反筏今木化中月賜卞撢墊今木月﹝ -戊穴件玉仿奶件婁醒反動票卞街仆月杅芊匹隙爛今木月﹝ +動票卞筏課允月公木冗木及 +.I reason +卞殺元化﹜戊穴件玉仿奶件婁醒互芨尹日木月﹝ .PP -\fIuser\fR反﹜\fI/etc/passwd\fR白央奶伙醱卞筏今木凶﹜ -ロ據今木月交□扒抩匹丐月﹝ +\fIuser\fR 反ロ據今木月交□扒抩匹﹜ +\fI/etc/passwd\fR 白央奶伙醱及手及卞覆殺允月﹝ 交□扒巨件玄伉反交□扒抩匹隙爛今木月﹝ -仄凶互勻化﹜域啦讀匹卅中交□扒ID互丐勻化手恌仁﹜ -公及交□扒ID卞瑛太勾仃日木凶唱卅月交□扒抩備★卞覆仄化唱卅月ロ據皿伕弘仿丞 -菴太ロ據樹扷毛隙爛匹五月﹝ +仄凶互勻化交□扒 ID 卞反褐卅勻化中月手及互丐勻化手恌仁﹜ +公及交□扒 ID 卞瑛太勾仃日木凶唱卅月交□扒抩及備★卞覆仄化﹜ +唱卅月ロ據皿伕弘仿丞午ロ據樹扷午毛隙爛匹五月﹝ .PP -銀迕匹五月備★及ロ據杅芊反﹜蟈仁唱卅月酷杅匹撢墊今木ぜ月﹝ -た卞筏今木化中卅中樺寧反﹜交□扒午支曰午曰允月凶戶卞伓賞讀卅 -白央奶伙犯奴旦弁伉皿正0,1菴太2毛銀丹仇午互請侳月﹝ -ロ據毛邰擱仄凶交□扒及き域嶺毛譬屯月凶戶卞撢端及交□扒ID毛迕中月仇午手請侳月﹝ -\fIreason\fR反動票及中內木井匹丐月 +銀迕匹五月備★及ロ據杅芊反﹜唱卅月杅芊匹潸曰健歹木月仇午互丐月﹝ +た卞筏今木化中卅中樺寧反﹜伓賞讀卅 +白央奶伙犯奴旦弁伉皿正 0, 1, 2 毛銀勻化交□扒午騷耨匹五月﹝ +撢交□扒ID毛迕中化﹜ +ロ據毛邰擱仄凶交□扒及褥葭 (identity) 毛瑁戶月仇午手匹五月﹝ +\fIreason\fR 反動票及中內木井匹丐月﹝ .IP \fBPW_SU\fR 1i -隙爛仄凶交□扒及撢交□扒ID卞庍凳允月凶戶卞﹜戊穴件玉毛粟が仄凶交□扒及 -撢交□扒ID及ロ據毛墊丹﹝ -\fB-s\fR左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +隙爛今木凶交□扒及撢交□扒 ID 卞濠曰贅尹方丹午仄化中月﹜ +蜇箕及撢交□扒 ID 卞覆仄化ロ據毛墊丹﹝ +\fB-s\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_LOGIN\fR 1i -蕙凶卞伕弘奶件本永扑亦件毛綜曰請公丹午仄化中月隙爛今木凶交□扒及ロ據毛 -墊丹﹝ -\fB-l\fR左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +蕙凶卞伕弘奶件本永扑亦件毛綜曰請公丹午仄化中月 +隙爛今木凶交□扒毛ロ據允月﹝ +\fB-l\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_ADD\fR 1i 隙爛今木凶交□扒卞覆仄化蕙凶卅巨件玄伉毛綜月﹝ -仇木卞方曰﹜ロ據皿伕弘仿丞互蕙筋交□扒迕及筏盛恄啗毛賞髐馱諵酗互請侳月﹝ -\fB-a\fR左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +仇木卞方曰﹜ロ據皿伕弘仿丞反蕙筋交□扒迕及筏盛恄啗毛賞髐リ迨諢 +\fB-a\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_CHANGE\fR 1i 隙爛今木凶交□扒及湃繡及巨件玄伉毛庍凳允月﹝ -仇木卞方曰﹜ロ據皿伕弘仿丞互湃繡及交□扒及ロ據樹扷毛庍凳允月仇午互請侳月﹝ -\fB-c\fR左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +仇木卞方曰﹜ロ據皿伕弘仿丞反湃繡及交□扒及ロ據樹扷毛庍凳匹五月﹝ +\fB-c\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_DELETE\fR 1i 隙爛今木凶交□扒及ロ據樹扷毛壅蛔允月﹝ -仇木卞方曰﹜動詨仇及ロ據皿伕弘仿丞毛迕中化ロ據今木月儀及拑仁卅勻凶交□扒 -樹扷及筏盛恄啗毛莢汊允月仇午互請侳月﹝ -\fB-d\fR左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +仇木卞方曰﹜ロ據皿伕弘仿丞反漆詨ロ據允月仇午互拑仁卅勻凶 +交□扒迕及筏盛恄啗毛瘋厙迕匹五月﹝ +\fB-d\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_TELNET\fR 1i -\fBtelnet\fR戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ -\fB-t\fR左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fBtelnet\fR 戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ +\fB-t\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_RLOGIN\fR 1i -\fBrlogin\fR戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ -\fB-r\fR左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fBrlogin\fR 戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ +\fB-r\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_FTP\fR 1i -\fBftp\fR戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ -\fB-f\fR左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ -交□扒午支曰午曰允月凶戶卞伓賞白央奶伙犯奴旦弁伉皿正毛迕中月仇午反請侳卅中﹝ -伓賞ェ恘白央奶伙犯奴旦弁伉皿正反褪皿伕本旦卞瑛太勾仃日木化云曰﹜ -域杅職及わ勾及請恘白央奶伙犯奴旦弁伉皿正反\fI/dev/null\fR卞瑛太勾仃日木化中月﹝ -\fBpw_auth\fR楮醒反白央奶伙犯奴旦弁伉皿正0毛迕中化域墊及犯□正毛 -ロ據皿伕弘仿丞卞由奶皿允月﹝ +\fBftp\fR 戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ +\fB-f\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +伓賞及白央奶伙犯奴旦弁伉皿正毛迕中化交□扒午騷耨允月仇午反匹五卅中﹝ +伓賞及ェ恘白央奶伙犯奴旦弁伉皿正反褪皿伕本旦卞濤糧今木化云曰﹜ +職及わ勾及請恘白央奶伙犯奴旦弁伉皿正反 \fI/dev/null\fR 卞濤糧今木化中月﹝ +\fBpw_auth\fR 楮醒反白央奶伙犯奴旦弁伉皿正 0 +毛迕中化域墊及犯□正毛ロ據皿伕弘仿丞卞由奶皿允月﹝ .IP \fBPW_REXEC\fR 1i -\fIrexec\fR戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ -\fB-x\fR左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ -伉乒□玄交□扒午支曰午曰允月凶戶卞伓賞白央奶伙犯奴旦弁伉皿正毛迕中月仇午反 -請侳卅中﹝ -伓賞ェ恘白央奶伙犯奴旦弁伉皿正反褪皿伕本旦卞瑛太勾仃日木化云曰﹜ -域杅職及わ勾及請恘白央奶伙犯奴旦弁伉皿正反\fI/dev/null\fR卞瑛太勾仃日木化中月﹝ -\fBpw_auth\fR楮醒反白央奶伙犯奴旦弁伉皿正0毛迕中化域墊及犯□正毛 -ロ據皿伕弘仿丞卞由奶皿允月﹝ +\fIrexec\fR 戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ +\fB-x\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +伓賞及白央奶伙犯奴旦弁伉皿正毛迕中化交□扒午騷耨允月仇午反匹五卅中﹝ +伓賞及ェ恘白央奶伙犯奴旦弁伉皿正反褪皿伕本旦卞濤糧今木化云曰﹜ +職及わ勾及請恘白央奶伙犯奴旦弁伉皿正反 \fI/dev/null\fR 卞濤糧今木化中月﹝ +\fBpw_auth\fR 楮醒反白央奶伙犯奴旦弁伉皿正 0 +毛迕中化域墊及犯□正毛ロ據皿伕弘仿丞卞由奶皿允月﹝ .PP 瘉詨及婁醒反 .B PW_FTP 菴太 .B PW_REXEC 及杅芊匹迕中日木月ロ據犯□正匹丐曰﹜ -域墊及妐午仄化健歹木化﹜ロ據皿伕弘仿丞卞由奶皿今木月﹝ +域墊及氾平旦玄午仄化健歹木﹜ロ據皿伕弘仿丞卞由奶皿今木月﹝ +.I reason +互 .B PW_CHANGE -及杅芊匹交□扒抩互庍凳今木月樺寧反﹜\fIinput\fR及ま芢反 -動蟆迕中化中凶交□扒抩午卅勻化中月﹝ +及午五反﹜交□扒抩互庍凳今木月樺寧卞反 +\fIinput\fR 及ま芢反動蟆迕中化中凶交□扒抩匹丐月﹝ .SH 煞屢 仇及楮醒反撢端及本永扑亦件毛綜曰請允仇午反仄卅中﹝ 隙爛今木凶交□扒及本永扑亦件毛綜曰請允儀毛袱第允月井搕咫艣尹月分仃匹丐月﹝ .PP 引分生永玄伐□弁左皿扑亦件反氾旦玄仄化中卅中﹝ .SH 忒曰襖 -\fBpw_auth\fR楮醒反﹜ロ據皿伕弘仿丞互蔽弇戊□玉0匹蔽弇仄凶樺寧反0毛﹜ +\fBpw_auth\fR 楮醒反﹜ロ據皿伕弘仿丞互蔽弇戊□玉 0 匹蔽弇仄凶樺寧反 0 毛﹜ 公木動陸及樺寧反未伕動陸及襖毛忒允﹝ .SH 楮洘嫩杴 .BR login (1), @@ -138,5 +141,5 @@ pwauth \- .BR useradd (8), .BR userdel (8), .BR usermod (8) -.SH AUTHOR +.SH 難樊 Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/ja/pwauth.8 b/man/ja/pwauth.8 deleted file mode 100644 index 82a804ef..00000000 --- a/man/ja/pwauth.8 +++ /dev/null @@ -1,69 +0,0 @@ -.\" Copyright 1992, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: pwauth.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" -.\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka -.\" all rights reserved. -.\" Translated Fri Feb 14 23:06:00 JST 1997 -.\" by Kazuyoshi Furutaka -.\" -.TH PWAUTH 8 -.SH 抩蟆 -pwauth \- 棟咥樊及澀爛仄凶由旦伐□玉ロ據芊 -.SH 濩抸 -扑旦氾丞及棟咥樊反﹜交□扒互呿諦匹丐月儀毛ロ據允月澎蟾午仄化﹜ -皿伕弘仿丞毛中仁勾井澀爛仄化云仁儀互請侳月﹝ -公木日及皿伕弘仿丞反\fI/etc/passwd\fR手仄仁反\fI/etc/shadow\fR白央奶伙醱匹﹜ -剪寞祭今木凶由旦伐□玉及醫歹曰午仄化隙爛今木月﹝ -交□扒失市它件玄毛棟咥允月交□氾奴伉氾奴反﹜剪寞祭今木凶由旦伐□玉勂 -毛譬屯﹜公及交□扒卞覆仄化扑旦氾丞棟咥樊互ロ據皿伕弘仿丞毛澀爛仄化 -中月井升丹井毛衛リ馱諢 -棟咥皿伕弘仿丞及中內木井互﹜ -仇木井日庍凳今木月交□扒卞ロ據皿伕弘仿丞互澀爛今木化中月午 -衛リ楔蕪儦蝷狊鴾芊兝fBpw_auth\fR楮醒互裟太請今木月﹝ -.PP -交□扒ロ據卞迕中月瘉賡及巨件玄伉反\fBuseradd\fR戊穴件玉卞方曰戲嶽今木月﹝ -ロ據樹扷及庍凳支交□扒失市它件玄毛綽輪允月羈及庍凳卞端仄化反 -\fBpw_auth\fR楮醒互裟太請今木﹜ -備交□扒失市它件玄及ロ據樹扷互瘉蕙及橇謫卞問儅今木月﹝ -.PP -ロ據皿伕弘仿丞憤蟲反撢端及伕弘奶件坭反生永玄伐□弁本永扑亦件毛 -戲嶽仄卅中﹝ -ロ據皿伕弘仿丞及蔽弇戊□玉反伕弘奶件互袱第今木凶井搕咫恛衛リ冞悀中擗鴗諢 -裟太請仄凶皿伕本旦卞反﹜伕弘奶件手仄仁反生永玄伐□弁本永扑亦件毛戲嶽 -仄ぜ月贗濠卅た腺互卅仁化反卅日卅中﹝ -.SH 楮洘嫩杴 -.BR login (1), -.BR passwd (1), -.BR su (1), -.BR pw_auth (3), -.BR useradd (8), -.BR userdel (8), -.BR usermod (8) -.SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/ja/pwck.8 b/man/ja/pwck.8 index c320ecbe..ebc4f5d1 100644 --- a/man/ja/pwck.8 +++ b/man/ja/pwck.8 @@ -1,3 +1,4 @@ +.\"$Id: pwck.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,76 +26,85 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: pwck.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Updated Sun 3 Mar 2002 by NAKANO Takeo +.\" Modified Sun 22 Sep 2002 by NAKANO Takeo .\" .TH PWCK 8 .SH 抩蟆 -pwck \- 由旦伐□玉白央奶伙及敦蟈嶺毛腹據允月 +pwck \- 由旦伐□玉白央奶伙互懇仄中井升丹井腹犖允月 .SH 踏摯 -\fBpwck\fR [\fB-r\fR] [\fIpasswd\fR \fIshadow\fR] +\fBpwck\fR [\fB-sr\fR] [\fIpasswd\fR \fIshadow\fR] .SH 濩抸 -\fBpwck\fR反扑旦氾丞及ロ據樹扷及敦蟈嶺及腹據毛墊丹﹝ -\fI/etc/passwd\fR菴太\fI/etc/shadow\fR白央奶伙醱及蟈化及巨件玄伉□卞覆仄化﹜ -踏摯互懇仄中井菴太備勂卞筏今木化中月犯□正反肣躲卅手及井升丹井及腹據互 -墊卅歹木月﹝ -踏摯互懇仄仁卅井勻凶曰公及職及襪懇尕Х卅貲曰毛殖戈巨件玄伉□反綽輪毛瞼今木月﹝ +\fBpwck\fR 戊穴件玉反扑旦氾丞及ロ據樹扷互懇仄中井升丹井腹犖允月﹝ +\fI/etc/passwd\fR 午 \fI/etc/shadow\fR +備白央奶伙及允屯化及巨件玄伉卞覆仄﹜ +備白奴□伙玉及踏摯互懇仄中井﹜ +公及犯□正互肣躲卅手及井升丹井毛腹據允月﹝ +踏摯互懇仄仁卅中巨件玄伉支﹜ +膜懇尕Х卅貲曰毛殖戈巨件玄伉反綽輪允月方丹皿伕件皿玄毛請允﹝ .P -備★及巨件玄伉□卞覆仄化 +備★及巨件玄伉卞覆仄化 .sp .in +.5i -- 勂及醒互懇仄中井 +- 白奴□伙玉及醒互懇仄中井 .br - 交□扒抩卞褐呁互卅中井 .br -- 交□扒菴太弘伙□皿失奶犯件氾奴白央奶失互肣躲卅手及匹丐月井 +- 交□扒支弘伙□皿及 ID 互懇仄中井 .br -- 潛弘伙□皿互肣躲卅手及匹丐月井 +- 皿仿奶穴伉弘伙□皿互懇仄中井 .br - 石□丞犯奴伊弁玄伉互懇仄中井 .br - 伕弘奶件扑尼伙互懇仄中井 .in -.5i -羈及民尼永弁互墊歹木月﹝ .sp +互民尼永弁今木月﹝ .P -勂及醒互懇仄中仇午菴太交□扒抩及褐呁互卅中仇午互瘉褐邰儀嫩匹丐月﹝ -勂及醒互懇仄仁卅中樺寧﹜公及墊及巨件玄伉□毛綽輪允月方丹瞼今木月﹝ -綽輪卞き啦仄卅井勻凶樺寧反﹜公木動嫦及民尼永弁反拑骰今木月﹝ -褐呁仄凶交□扒抩互丐勻凶樺寧手綽輪毛瞼今木月互﹜仇及樺寧反 -公木動嫦及民尼永弁反糧墊今木月﹝ -職及蟈化及巨仿□卞覆仄化反煞屢互卅今木月及心匹丐曰﹜公及樺寧反 -貲曰毛襪懇允月凶戶卞\fBusermod\fR戊穴件玉毛撢墊允月方丹換戶日木月﹝ +白奴□伙玉及醒互棉啜勻化中凶曰﹜ +弘伙□皿抩互褐呁仄化中月及反譙抰讀卅巨仿□匹丐月﹝ +白奴□伙玉及醒互懇仄仁卅中樺寧﹜ +交□扒□反公及巨件玄伉墊毛綽輪允月方丹瞼今木月﹝ +綽輪卞き啦仄卅井勻凶樺寧反﹜公木動嫦及民尼永弁反墊歹木卅中﹝ +褐呁仄凶弘伙□皿抩互丐勻凶樺寧手綽輪毛瞼今木月互﹜ +仇及樺寧反綽輪仄卅仁化手公木動嫦及民尼永弁反糧墊今木月﹝ +職及允屯化及巨仿□卞覆仄化反煞屢互卅今木月﹝ +\fBusermod\fR 戊穴件玉毛撢墊仄化公及巨仿□毛膜懇允月午恌中分欠丹﹝ .P -\fI/etc/passwd\fR白央奶伙卞綜迕允月戊穴件玉反﹜貲勻凶手仄仁反 -褐呁仄凶巨件玄伉□毛庍凳允月仇午反請侳卅中﹝ -公及端反﹜\fBpwck\fR毛迕中化貲曰及丐月巨件玄伉□毛綽輪允屯五匹丐月﹝ +\fI/etc/passwd\fR 白央奶伙毛醜綜允月戊穴件玉反﹜ +莽木凶巨件玄伉支褐呁仄凶巨件玄伉毛庍凳匹五卅中﹝ +公及方丹卅端卞貲曰及丐月巨件玄伉毛綽輪允月卞反 +\fBpwck\fR 毛迕中月午方中﹝ .SH 左皿扑亦件 -犯奴白巧伙玄匹反﹜\fBpwck\fR反\fI/etc/passwd\fR白央奶伙菴太 -\fI/etc/shadow\fR卞覆仄化綜迕允月﹝ -\fIpasswd\fR菴太\fIshadow\fR由仿丟□正毛迕中化帎及白央奶伙毛薊鎗允月 -儀手匹五月﹝ -笛尹化﹜\fB-r\fR白仿永弘匹隙憎允月仇午卞方曰﹜ +犯白巧伙玄匹反 \fBpwck\fR 反 \fI/etc/passwd\fR 白央奶伙午 +\fI/etc/shadow\fR 卞覆仄化が綜允月﹝ +\fIpasswd\fR 由仿丟□正午 \fIshadow\fR 由仿丟□正毛迕中化﹜ +帎及白央奶伙毛薊鎗允月仇午手匹五月﹝ +今日卞 \fB-r\fR 白仿弘毛隙爛允木壬﹜ 伉□玉左件伉□乒□玉匹戊穴件玉毛撢墊允月仇午手匹五月﹝ -仇及樺寧反﹜庍凳毛墊丹井升丹井及撙杽卞覆仄化中切中切蠶尹卅仁午手﹜ -憤が讀卞\fBno\fR午莢蠶今木月﹝ +仇及樺寧﹜庍凳毛墊丹井升丹井反交□扒尺杽中寧歹今木內﹜ +憤が讀卞 \fBno\fR 午莢蠶今木月﹝ +\fBpwck\fR 反 \fI/etc/passwd\fR 午 \fI/etc/shadow\fR +及巨件玄伉毛 UID 匹末□玄允月仇午手匹五月﹝ +末□玄乒□玉匹が綜今六月卞反 \fB-s\fR 白仿弘毛芨尹月﹝ +仇及樺寧民尼永弁反墊歹木內﹜簽卞末□玄允月分仃匹丐月﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒失市它件玄卞楮允月樹扷 +\fI/etc/passwd\fR \- 交□扒□失市它件玄樹扷 .br -/etc/shadow \- 剪寞祭今木凶由旦伐□玉樹扷 +\fI/etc/shadow\fR \- 剪寞祭今木凶由旦伐□玉樹扷 .br -/etc/group \- 弘伙□皿卞楮允月樹扷 +\fI/etc/group\fR \ - 弘伙□皿樹扷 .SH 楮洘嫩杴 .BR group (5), .BR passwd (5), .BR shadow (5), .BR usermod (8) .SH 忒曰襖 -\fBpwck\fR戊穴件玉反動票及枑曰襖毛忒仄化蔽弇允月: +\fBpwck\fR 戊穴件玉反動票及襖毛忒仄化蔽弇允月: .IP 0 5 嶽跦 .IP 1 5 diff --git a/man/ja/pwconv.8 b/man/ja/pwconv.8 index 9c8276e1..604afced 100644 --- a/man/ja/pwconv.8 +++ b/man/ja/pwconv.8 @@ -1,13 +1,14 @@ +.\"$Id: pwconv.8,v 1.3 2003/04/28 02:14:00 kloczek Exp $ .\" .\" Japanese Version Copyright (c) 2001 Yuichi SATO .\" all rights reserved. .\" Translated Sat Dec 1 20:09:17 JST 2001 .\" by Yuichi SATO +.\" Modified Sun 22 Sep 2002 by NAKANO Takeo .\" -.\" $Id: pwconv.8,v 1.2 2001/12/20 14:02:38 ankry Exp $ .TH PWCONV 8 "26 Sep 1997" .SH 抩蟆 -pwconv, pwunconv, grpconv, grpunconv \- shadow 由旦伐□玉午 shadow 弘伙□皿尺及庍晶﹜云方太騷橘及白央奶伙尺及菅庍晶 +pwconv, pwunconv, grpconv, grpunconv \- 由旦伐□玉’弘伙□皿及 shadow 祭午﹜騷橘白央奶伙尺及菅庍晶 .SH 踏摯 .B pwconv .br @@ -17,69 +18,63 @@ pwconv, pwunconv, grpconv, grpunconv \- shadow .br .B grpunconv .SH 濩抸 -仇木日 4 勾及皿伕弘仿丞反﹜騷橘及由旦伐□玉’弘伙□皿白央奶伙 -云方太 shadow 由旦伐□玉’弘伙□皿白央奶伙 -.IR /etc/passwd ", " /etc/group ", " /etc/shadow ", " /etc/gshadow +仇木日 4 勾及皿伕弘仿丞反﹜ +騷橘及由旦伐□玉白央奶伙’弘伙□皿白央奶伙午﹜ +shadow 祭今木凶由旦伐□玉白央奶伙’弘伙□皿白央奶伙匹丐月 +\fI/etc/passwd\fR ", " \fI/etc/group\fR ", " \fI/etc/shadow\fR ", " \fI/etc/gshadow\fR 毛醜綜允月﹝ -\fBpwconv\fR 反 \fIpasswd\fR 午 \fIshadow\fR (湃卞繡箕允月樺寧) 井日 -\fIshadow\fR 毛綜嶽允月﹝ -\fBpwunconv\fR 反 \fIpasswd\fR 午 \fIshadow\fR 井日 \fIpasswd\fR 毛綜嶽仄﹜ -\fIshadow\fR 毛綽輪允月﹝ -\fBgrpconv\fR 反 \fIgroup\fR 午 \fIgshadow\fR (湃卞繡箕允月樺寧) 井日 -\fIgshadow\fR 毛綜嶽允月﹝ -\fBgrpunconv\fR 反 \fIgroup\fR 午 \fIgshadow\fR 井日 \fIgroup\fR 毛綜嶽仄﹜ -\fIgshadow\fR 毛綽輪允月﹝ +\fBpwconv\fR 反 \fIpasswd\fR 井日 \fIshadow\fR 毛綜嶽允月 +(允匹卞繡箕允月樺寧反 \fIshadow\fR 及樹扷手迕中月)﹝ +\fBpwunconv\fR 反 \fIpasswd\fR 午 \fIshadow\fR 井日 +\fIpasswd\fR 毛綜嶽仄﹜\fIshadow\fR 毛綽輪允月﹝ +\fBgrpconv\fR 反 \fIgroup\fR 井日 \fIgshadow\fR 毛綜嶽允月 +(允匹卞繡箕允月樺寧反 \fIgshadow\fR 及樹扷手迕中月)﹝ +\fBgrpunconv\fR 反 \fIgroup\fR 午 \fIgshadow\fR 井日 +\fIgroup\fR 毛綜嶽仄﹜\fIgshadow\fR 毛綽輪允月﹝ -備皿伕弘仿丞反优邰午今木月伕永弁毛庍晶及蟆卞潸ぜ允月﹝ +備皿伕弘仿丞反庍晶蟆卞﹜优邰卅伕永弁毛邰菲允月﹝ .B pwconv 午 .B grpconv -反挀僻仄化中月﹝ -1 勾杴反﹜騷橘及白央奶伙卞巨件玄伉互卅中樺寧﹜ -公及巨件玄伉反 shadow 祭今木凶白央奶伙匹反綽輪今木月午中丹鰾匹丐月﹝ -2 勾杴反﹜騷橘及白央奶伙匹由旦伐□玉互 `x' 卞卅勻化中卅中樺寧﹜ -shadow 祭今木凶白央奶伙卞云中化﹜ -公木卞覆殺允月巨件玄伉互凳蕙今木月午中丹鰾匹丐月﹝ -3 勾杴反﹜騷橘及白央奶伙卞踏井木凶由旦伐□玉互 `x' 卞譆五晶尹日木月鰾匹丐月﹝ -仇木日及皿伕弘仿丞反﹜賡戶化庍晶毛墊丹午五卞銀尹月﹝ -引凶﹜騷橘及白央奶伙毛澎が匹彸螂仄凶樺寧卞 -shadow 祭今木凶白央奶伙毛凳蕙允月及卞銀丹仇午手匹五月﹝ +午反動票及鰾匹挀僻仄化中月﹝ +引內﹜shadow 祭白央奶伙卞丐月巨件玄伉及丹切﹜ +騷橘白央奶伙卞卅中手及反﹜綽輪今木月﹝ +引凶﹜shadow 祭白央奶伙卞丐月巨件玄伉及丹切﹜ +騷橘白央奶伙匹由旦伐□玉互 `x' 卞卅勻化中卅中手及反﹜凳蕙今木月﹝ +瘉詨卞﹜騷橘白央奶伙卞踏井木凶由旦伐□玉反 `x' 卞譆五晶尹日木月﹝ +仇木日及皿伕弘仿丞反﹜賡戶化庍晶毛墊丹午五卞手﹜ +引凶騷橘及白央奶伙毛澎が匹彸螂仄凶端卞﹜ +shadow 祭白央奶伙毛凳蕙允月午五卞手厙迕匹五月﹝ -.I /etc/shadow -卞蕙仄中巨件玄伉毛馨笛允月樺寧﹜ -.B pwconv -反 -.I /etc/login.defs -卞丐月 +\fI/etc/shadow\fR 卞蕙仄中巨件玄伉毛馨笛允月午五﹜ +\fBpwconv\fR 反 \fI/etc/login.defs\fR +及 .BR PASS_MIN_DAYS ", " PASS_MAX_DAYS ", " PASS_WARN_AGE 及襖毛銀丹﹝ -き迋卞﹜ -.B pwunconv -午 -.B grpunconv -反挀僻仄化中月﹝ -騷橘及白央奶伙及由旦伐□玉反﹜ -shadow 祭今木凶白央奶伙毛銀勻化凳蕙今木月﹝ -巨件玄伉互騷橘及白央奶伙卞反繡箕允月互 -shadow 祭今木凶白央奶伙卞反繡箕仄卅中午中丹樺寧﹜ -公及巨件玄伉反公及引引卞今木月﹝ -瘉蔽讀卞 shadow 祭今木凶白央奶伙反綽輪今木月﹝ +き元方丹卞﹜ +\fBpwunconv\fR 午 \fBgrpunconv\fR +午反動票及鰾匹挀僻仄化中月﹝ +騷橘白央奶伙及由旦伐□玉反﹜ +shadow 祭白央奶伙及手及匹凳蕙今木月﹝ +騷橘白央奶伙卞丐月巨件玄伉反﹜ +shadow 祭白央奶伙卞反公及巨件玄伉互卅仁化手﹜ +公及引引譆井木糧仃月﹝ +瘉詨卞﹜ shadow 祭白央奶伙反綽輪今木月﹝ +由旦伐□玉及肣躲渝蜃樹扷及域朿反﹜ .B pwunconv -反渝蜃及濠木凶由旦伐□玉毛г滋仄﹜庍晶匹五月手及及心毛庍晶允月﹝ - +卞方勻化撩歹木月﹝庍晶匹五月手及反庍晶今木月﹝ .SH 田弘 -(尕懇卅巨件玄伉支褐呁仄凶巨件玄伉午中勻凶) 巨仿□互 -由旦伐□玉白央奶伙支弘伙□皿白央奶伙卞丐月午﹜ -皿伕弘仿丞反捩棄卞伙□皿仄化﹜云井仄卅溥匹撩л允月﹝ +(尕懇卅巨件玄伉支褐呁仄凶巨件玄伉午中勻凶) +巨仿□互由旦伐□玉白央奶伙支弘伙□皿白央奶伙卞丐月午﹜ +皿伕弘仿丞反捩棄卞伙□皿仄凶曰﹜云井仄卅溥匹撩л允月井手仄木卅中﹝ shadow 由旦伐□玉’弘伙□皿尺及庍晶支 shadow 祭白央奶伙井日及菅庍晶毛墊丹蟆卞﹜ \fBpwck\fR 午 \fBgrpck\fR 毛撢墊仄化巨仿□毛膜懇允月仇午﹝ .SH 楮洘嫩杴 .BR login.defs (5), -.BR pwck (8), .BR grpck (8), -.BR shadowconfig (8) +.BR pwck (8) diff --git a/man/ja/shadow.3 b/man/ja/shadow.3 index 0c99a701..e66f271d 100644 --- a/man/ja/shadow.3 +++ b/man/ja/shadow.3 @@ -1,3 +1,4 @@ +.\"$Id: shadow.3,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1989 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,12 +26,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: shadow.3,v 1.2 2001/11/16 17:01:33 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" updated Tue 17 Sep 2002 by NAKANO Takeo .\" .TH SHADOW 3 .SH 抩蟆 @@ -63,82 +63,89 @@ shadow \- .B int ulckpwdf(); .SH 濩抸 .I shadow -反shadow由旦伐□玉白央奶伙\fI/etc/shadow\fR及ま芢毛醜綜允月伙□民件匹丐月﹝ +反 shadow 由旦伐□玉白央奶伙 +\fI/etc/shadow\fR 及ま芢毛醜綜允月伙□民件匹丐月﹝ +\fI#include\fR 白央奶伙卞芨尹日木化中月厭瞻蟲反動票及騷曰﹝ .sp struct spwd { .in +.5i .br - char *sp_namp; /* 交□扒及伕弘奶件抩 */ + char *sp_namp; /* user login name */ .br - char *sp_pwdp; /* 剪寞祭今木凶由旦伐□玉 */ + char *sp_pwdp; /* encrypted password */ .br - long sp_lstchg; /* 瘉蔽由旦伐□玉庍凳ゥ凜 */ + long sp_lstchg; /* last password change */ .br - int sp_min; /* 由旦伐□玉庍凳尕Хゥ醒 */ + int sp_min; /* days until change allowed. */ .br - int sp_max; /* 由旦伐□玉庍凳邰菲坶及ゥ醒 */ + int sp_max; /* days before change required */ .br - int sp_warn; /* 由旦伐□玉渝蜃坢弇煞屢ゥ醒 */ + int sp_warn; /* days warning for expiration */ .br - int sp_inact; /* 失市它件玄拑躲引匹及ゥ醒 */ + int sp_inact; /* days before account inactive */ .br - int sp_expire; /* 失市它件玄渝蜃坢弇及ゥ尥 */ + int sp_expire; /* date when account expires */ .br - int sp_flag; /* 冪侳及銀迕卞芺沶 */ + int sp_flag; /* reserved for future use */ .br .in -.5i } .PP -備勂及啦怗反 +備白奴□伙玉及啦怗反: .sp -sp_namp \- 甘伙蔽羹及交□扒抩尺及禾奶件正 +sp_namp \- 甘伙蔽羹今木凶交□扒抩妐儂昫尺及禾奶件正 .br -sp_pwdp \- 甘伙蔽羹及由旦伐□玉尺及禾奶件正 +sp_pwdp \- 甘伙蔽羹今木凶由旦伐□玉妐儂昫尺及禾奶件正 .br sp_lstchg \- 1970ヵ1畸1ゥ井日由旦伐□玉瘉蔽庍凳ゥ凜坶及ゥ醒 .br -sp_min \- 由旦伐□玉庍凳互請侳月迋卞卅月引匹及ゥ醒 +sp_min \- 由旦伐□玉庍凳互請侳月方丹卞卅月引匹及ゥ醒 .br sp_max \- 由旦伐□玉毛庍凳仄卅仁化手恌中ゥ醒 .br -sp_warn \- 由旦伐□玉互拑躲午卅月引匹卞交□扒卞由旦伐□玉互 -拑躲午卅曰井井勻化中月午及煞屢毛請允ゥ醒 +sp_warn \- 由旦伐□玉互渝蜃濠木卞卅月蟆卞﹜ +渝蜃濠木互嗤勿中化中月需及煞屢毛交□扒卞請允渝棉及ゥ醒 .br -sp_inact \- 由旦伐□玉互拑躲午卅勻化井日失市它件玄互尕Х午卅曰 -銀迕匹五卅仁卅月引匹及ゥ醒 +sp_inact \- 由旦伐□玉互渝蜃濠木卞卅勻化井日﹜ +失市它件玄互尕Х午卅曰銀迕匹五卅仁卅月引匹及ゥ醒 .br -sp_expire \- 1970ヵ1畸1井日失市它件玄銀迕尕Х午卅月坶及ゥ醒 +sp_expire \- 1970ヵ1畸1井日失市它件玄互銀迕尕Х午卅月ゥ坶及ゥ醒 .br -sp_flag \- 冪侳及銀迕卞芺沶 +sp_flag \- 冪侳銀丹午五卞輊仃化芺沶 .SH 濩抸 -\fBgetspent\fR, \fBgetspname\fR, \fBfgetspent\fR, 菴太 \fBsgetspent\fR -反備★\fBstruct spwd\fR尺及禾奶件正毛忒允﹝ -\fBgetspent\fR反白央奶伙井日慼及巨件玄伉毛﹜\fBfgetspent\fR反 -隙爛今木凶旦玄伉□丞井日慼及巨件玄伉毛忒允﹝ -仇及端﹜白央奶伙反懇仄中踏摯匹丐月移爛仄化中月﹝ -\fBsgetspent\fR反ェ恘午仄化芨尹日木凶妐儂昫毛迕中化\fBstruct spwd\fR -尺及禾奶件正毛忒允﹝ -\fBgetspnam\fR反白央奶伙醱及蜇箕及匏譆井日\fBname\fR卞扞寧允月巨件玄伉 -毛繭允﹝ +\fBgetspent\fR, \fBgetspname\fR, \fBfgetspent\fR, \fBsgetspent\fR +反﹜公木冗木 \fBstruct spwd\fR 尺及禾奶件正毛忒允﹝ +\fBgetspent\fR 反白央奶伙井日慼及巨件玄伉毛﹜ +\fBfgetspent\fR 反隙爛今木凶旦玄伉□丞 +(懇仄中踏摯及白央奶伙午心卅今木月) +井日慼及巨件玄伉毛忒允﹝ +\fBsgetspent\fR 反ェ恘午仄化芨尹日木凶妐儂昫毛迕中化 +\fBstruct spwd\fR 尺及禾奶件正毛忒允﹝ +\fBgetspnam\fR 反白央奶伙醱及蜇箕及匏譆井日 +\fBname\fR 卞穴永民允月巨件玄伉毛繭允﹝ .PP -\fBsetspent\fR菴太\fBendspent\fR反shadow仄凶由旦伐□玉白央奶伙尺及 -失弁本旦毛屺★釩銨菴太蔽弇允月凶戶卞迕中月仇午互請侳月﹝ +\fBsetspent\fR 反 +shadow 由旦伐□玉白央奶伙尺及失弁本旦毛釩銨允月凶戶卞﹜ +\fBendspent\fR 反蔽弇允月凶戶卞迕中日木月﹝ .PP -\fB/etc/shadow\fR白央奶伙卞覆允月к職讀卅失弁本旦毛忡據允月凶戶卞﹜ -\fBlckpwdf\fR菴太\fBulckpwdf\fR伙□民件毛迕中卅仁化反卅日卅中﹝ -\fBlckpwdf\fR反\fBpw_lock\fR毛迕中化瘉釐15卍棉伕永弁毛仄方丹午允月﹝ -公仄化﹜瘉賡及15卍及酸曰毛迕中化わ蘸杴及伕永弁毛仄方丹午仄糧仃月﹝ -蟈朿匹15卍棉及棉卞中內木井及魂心互撩л仄凶樺寧反﹜\fBlckpwdf\fR反-1毛忒允﹝ -中內木及伕永弁手嶽跦仄凶樺寧反0互忒今木月﹝ +\fI/etc/shadow\fR 白央奶伙卞覆允月к職讀卅失弁本旦毛忡據仄凶中樺寧卞反﹜ +\fBlckpwdf\fR 伙□民件午 \fBulckpwdf\fR 伙□民件毛迕中月﹝ +\fBlckpwdf\fR 反 \fBpw_lock\fR 毛迕中化瘉釐 15 卍棉伕永弁毛潸ぜ仄方丹午允月﹝ +公仄化瘉賡及 15 卍及酸曰及棉﹜ +\fBspw_lock\fR 卞方勻化わ蘸杴及伕永弁毛仄方丹午魂心糧仃月﹝ +煌 15 卍棉及棉卞中內木井及魂心互撩л仄凶樺寧反﹜ +\fBlckpwdf\fR 反 -1 毛忒允﹝ +中內木及伕永弁手嶽跦仄凶樺寧反 0 互忒今木月﹝ .SH 忒曰襖 -仇木日及伙□民件反﹜巨件玄伉互酸勻化中卅中樺寧坭反質咥及聊蠢匹 -巨仿□互素舅楔蕪儦蝷沄ULL毛忒允﹝ -忒曰襖互\fBint\fR匹丐月伙□民件反﹜嶽跦凜卞反0毛﹜撩л凜卞反-1毛忒允﹝ +仇木日及伙□民件反﹜巨件玄伉互酸勻化中卅中樺寧支﹜ +質咥及聊蠢匹巨仿□互素舅楔蕪儦蝷豸 NULL 毛忒允﹝ +忒曰襖互 \fBint\fR 匹丐月伙□民件反﹜ +嶽跦仄凶日 0 毛﹜撩л仄凶日 -1 毛忒允﹝ .SH 煞屢 shadow今木凶由旦伐□玉白央奶伙尺及失弁本旦反孺蜃今木化中月及匹﹜ -仇木日及伙□民件反旦□由□交□扒及心迕中月仇午互請侳月﹝ +仇木日及伙□民件反旦□由□交□扒分仃互厙迕匹五月﹝ .SH 白央奶伙 -/etc/shadow \- 剪寞祭今木凶交□扒由旦伐□玉 +\fI/etc/shadow\fR \- 剪寞祭今木凶交□扒由旦伐□玉 .SH 楮洘嫩杴 .BR getpwent (3), .BR shadow (5) diff --git a/man/ja/shadow.5 b/man/ja/shadow.5 index 3678eda4..7cfec8bc 100644 --- a/man/ja/shadow.5 +++ b/man/ja/shadow.5 @@ -1,3 +1,4 @@ +.\"$Id: shadow.5,v 1.6 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,72 +26,74 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: shadow.5,v 1.4 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Modified Tue 18 Sep 2002 by NAKNAO Takeo .\" .TH SHADOW 5 .SH 抩蟆 shadow \- 剪寞祭今木凶由旦伐□玉白央奶伙 .SH 濩抸 .I shadow -卞反交□扒及失市它件玄卞覆允月剪寞祭今木凶由旦伐□玉及樹扷﹜菴太 -左皿扑亦件午仄化由旦伐□玉及肣躲渝蜃及樹扷互筏今木化中月﹝ +卞反交□扒及失市它件玄卞覆允月剪寞祭今木凶由旦伐□玉樹扷﹜ +云方太左皿扑亦件午仄化由旦伐□玉及肣躲渝蜃及樹扷互筏今木化中月﹝ 殖引木化中月ま芢反 .IP "" .5i 伕弘奶件抩 .IP "" .5i 剪寞祭今木凶由旦伐□玉 .IP "" .5i -1970 ヵ 1 畸 1 ゥ井日瘉詨卞由旦伐□玉互庍凳今木凶ゥ坶及ゥ醒 +1970 ヵ 1 畸 1 ゥ井日﹜瘉詨卞由旦伐□玉互庍凳今木凶ゥ引匹及ゥ醒 .IP "" .5i -由旦伐□玉互庍凳第午卅月引匹及ゥ醒 +由旦伐□玉互庍凳第Х午卅月引匹及ゥ醒 .IP "" .5i 由旦伐□玉毛庍凳仄卅仁化反卅日卅仁卅月ゥ引匹及ゥ醒 .IP "" .5i -由旦伐□玉肣躲渝蜃互侳月仇午毛交□扒卞煞屢允月ゥ醒 +由旦伐□玉肣躲渝蜃互侳月蟆卞﹜交□扒互煞屢毛熬仃月ゥ醒 .IP "" .5i -由旦伐□玉肣躲渝蜃互聊亢化井日失市它件玄互銀迕尕Х卞卅月坶及ゥ醒 +由旦伐□玉肣躲渝蜃互聊亢化井日失市它件玄互銀迕尕Х卞卅月引匹及ゥ醒 .IP "" .5i 1970 ヵ 1 畸 1 ゥ井日失市它件玄互銀迕尕Х卞卅月ゥ引匹及ゥ醒 .IP "" .5i -芺沶今木凶勂 +芺沶白奴□伙玉 .PP -由旦伐□玉勂反优內筏ェ今木化中卅仁化反卅日卅中﹝ -剪寞祭今木凶由旦伐□玉反﹜a 井日 z﹜A 井日 Z 及失伙白央矛永玄﹜ -0 井日 9 坶及醒儂菴太 \. 午 / 及 64 妐儂及丹切及 13 井日 24 妐儂井日卅月﹝ +由旦伐□玉白奴□伙玉反优內筏ェ今木化中卅仁化反卅日卅中﹝ +剪寞祭今木凶由旦伐□玉反﹜ +a 井日 z﹜A 井日 Z 及失伙白央矛永玄﹜ +0 井日 9 引匹及醒儂﹜ \. 午 / 及 64 妐儂及丹切及﹜ +13 妐儂動曉 24 妐儂動票匹丐月﹝ 仇及妐儂昫互升及方丹卞荸澄今木月井及擇稱反 \fBcrypt\fR(3) 毛輔寰六方﹝ .PP -瘉詨卞由旦伐□玉毛庍凳仄凶ゥ凜反 1970 ヵ 1 畸 1 ゥ井日及ゥ醒午仄化 -筏課今木月﹝ +瘉詨卞由旦伐□玉毛庍凳仄凶ゥ凜反 +1970 ヵ 1 畸 1 ゥ井日及ゥ醒午仄化筏課今木月﹝ 由旦伐□玉反蝸坌卅ゥ醒互煩聊仄化井日匹卅中午庍凳匹五內﹜ -引凶瘉釐ゥ醒互煩聊仄凶詨反优內庍凳六友壬卅日卅中﹝ -庍凳第午卅月引匹卞邰允月ゥ醒互肣躲渝蜃方曰手釐五中樺寧反﹜ +引凶瘉釐ゥ醒互煩聊仄凶詨反优內庍凳仄卅仃木壬卅日卅中﹝ +庍凳第Х午卅月引匹卞邰允月ゥ醒互肣躲渝蜃方曰手釐五中樺寧反﹜ 交□扒互由旦伐□玉毛庍凳允月仇午反請侳卅中﹝ .PP -由旦伐□玉及肣躲渝蜃互聊亢化井日隙爛仄凶ゥ醒及丹切卞由旦伐□玉毛庍凳 -仄卅井勻凶樺寧反﹜公及失市它件玄反拑躲午卅曰﹜銀迕尕Х卞卅月﹝ -引凶﹜失市它件玄反隙爛仄凶渝ゥ卞﹜由旦伐□玉職及肣躲渝蜃樹扷卞反方日內﹜ -銀迕尕Х午卅月﹝ +由旦伐□玉及肣躲渝蜃互聊亢化井日﹜ +隙爛ゥ醒及丹切卞由旦伐□玉毛庍凳仄卅井勻凶樺寧反﹜ +公及失市它件玄反拑躲卞卅曰﹜銀尹卅仁卅月﹝ +引凶﹜失市它件玄毛隙爛仄凶渝ゥ卞﹜ +(公及職及由旦伐□玉肣躲渝蜃樹扷卞反方日內) +銀迕尕Х午允月仇午手匹五月﹝ .PP -仇及樹扷反 \fI/etc/passwd\fR 醱卞筏今木化中月ョ窒卅月由旦伐□玉菴太 -公及肣躲渝蜃樹扷方曰手穸燮今木月﹝ +仇及樹扷反﹜\fI/etc/passwd\fR 醱及 +丐日斗月由旦伐□玉樹扷’肣躲渝蜃樹扷方曰手穸燮今木月﹝ .PP -由旦伐□玉及兜蟈嶺毛問儅允月凶戶卞反﹜仇及白央奶伙毛域怚獢憧 -互づ戶月方丹卞仄化反卅日卅中﹝ +由旦伐□玉及兜蟈嶺毛忡勾凶戶卞反﹜ +仇及白央奶伙毛域怚獢憧隊甚氻嶀諵銴忖豸楔々洃吨擗吨丑 .SH 白央奶伙 -/etc/passwd \- 交□扒及失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/shadow \- 剪寞祭今木凶交□扒由旦伐□玉 +\fI/etc/shadow\fR \- 剪寞祭今木凶交□扒由旦伐□玉 .SH 楮洘嫩杴 .BR chage (1), .BR login (1), .BR passwd (1), .BR su (1), -.BR shadow (3), .BR passwd (5), .BR pwconv (8), .BR pwunconv (8), diff --git a/man/ja/shadowconfig.8 b/man/ja/shadowconfig.8 index be232b80..91f48ea1 100644 --- a/man/ja/shadowconfig.8 +++ b/man/ja/shadowconfig.8 @@ -1,25 +1,31 @@ +.\"$Id: shadowconfig.8,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\" +.\" Japanese Version Copyright (c) 2001 Maki KURODA .\" all right reserved, .\" Translated Tue Oct 30 11:59:11 JST 2001 -.\" by Maki KURODA +.\" by Maki KURODA +.\" Modified Sun 22 Sep 2002 by NAKANO Takeo .\" .TH SHADOWCONFIG 8 "19 Apr 1997" "Debian GNU/Linux" .SH 抩蟆 -shadowconfig \- shadow 由旦伐□玉及澀爛毛左件菴太左白卞濠贅尹月 +shadowconfig \- shadow 由旦伐□玉毛肣躲’拑躲卞允月 .SH 踏摯 .B "shadowconfig" .IR on " | " off .SH 濩抸 -.PP .B shadowconfig on 反 shadow 由旦伐□玉毛肣躲卞允月﹝ .B shadowconfig off 反 shadow 由旦伐□玉毛拑躲卞允月﹝ +窒井棉啜中互丐月午﹜ .B shadowconfig -反窒日井及棉啜中互丐月午﹜巨仿□丟永本□斥毛刓憎仄﹜ -未伕匹反卅中忒曰襖毛忒允﹝ -手仄公及方丹卅仇午互粟仇勻凶樺寧﹜巨仿□毛膜懇仄﹜瘋蘸撢墊仄卅仃木壬卅日卅中﹝ -shadow 由旦伐□玉及澀爛互允匹卞左件及樺寧卞左件卞澀爛仄凶曰﹜ -允匹卞左白及樺寧卞左白卞澀爛仄化手﹜窒及排黍手卅中﹝ +反巨仿□丟永本□斥毛刓憎仄﹜未伕動陸及忒曰襖毛忒允﹝ +公及方丹卅仇午互粟仇勻凶樺寧反﹜ +巨仿□毛膜懇仄化瘋蘸撢墊仄卅仃木壬卅日卅中﹝ -.I /usr/doc/passwd/README.debian.gz -卞反 shadow 由旦伐□玉午公木卞楮允月た藹及棵簽卅懊莞互踏井木化中月﹝ +shadow 由旦伐□玉互允匹卞肣躲卞卅勻化中月午五卞瘋蘸肣躲卞仄凶曰﹜ +拑躲卞卅勻化中月午五卞瘋蘸拑躲卞仄化手﹜窒及排黍手卅中﹝ + +\fI/usr/share/doc/passwd/README.debian.gz\fR +卞反 shadow 由旦伐□玉支楮洘窗Х卞楮允月 +棵簽卅濩抸互踏井木化中月﹝ diff --git a/man/ja/su.1 b/man/ja/su.1 index 0ecd1b3d..33e14eb0 100644 --- a/man/ja/su.1 +++ b/man/ja/su.1 @@ -1,3 +1,4 @@ +.\"$Id: su.1,v 1.6 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,66 +26,63 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: su.1,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka -.\" Updated Wed Apr 26 16:46:14 JST 2000 -.\" by Kentaro Shirakata -.\" Updated Fri Jan 12 03:35:18 JST 2001 -.\" by Kentaro Shirakata +.\" Updated Wed Apr 26 JST 2000 by Kentaro Shirakata +.\" Updated Fri Jan 12 JST 2001 by Kentaro Shirakata +.\" Updated Mon Mar 4 JST 2002 by Kentaro Shirakata +.\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" .TH SU 1 .SH 抩蟆 -su \- 交□扒ID毛庍凳允月﹜坭反旦□由□交□扒卞卅月 +su \- 交□扒ID毛庍凳允月﹝引凶反旦□由□交□扒卞卅月 .SH 踏摯 -.BR su " [" - ] -.RI [ username " [" args ]] +\fBsu\fR [\fB-\fR] [\fIusername\fR [\fIargs\fR]] .SH 濩抸 -.B su -反伕弘奶件本永扑亦件醱卞帎及交□扒卞嶽曰允引允及卞迕中月﹝ +\fBsu\fR 反伕弘奶件本永扑亦件醱卞帎及交□扒卞卅月凶戶卞迕中月﹝ 交□扒抩毛隙爛六內卞粟が仄凶樺寧﹜ -犯白巧伙玄匹反旦□由□交□扒及ID卞庍凳允月﹝ -左皿扑亦件婁醒\fB\-\fR毛迕中月午﹜ +犯白巧伙玄匹反旦□由□交□扒及 ID 卞庍凳允月﹝ +左皿扑亦件婁醒 \fB\-\fR 毛迕中月午﹜ 躂濤伕弘奶件仄凶樺寧午き元棕雁卞賡渝祭今木月﹝ .PP 交□扒抩及詨欠卞馨笛及婁醒毛芨尹月仇午手匹五﹜ -公及樺寧及婁醒反交□扒及伕弘奶件扑尼伙卞欐今木月﹝ -た卞﹜公及婁醒及域勾午仄化\fB-c\fR毛欐仄凶樺寧﹜ +公及樺寧婁醒反交□扒及伕弘奶件扑尼伙卞欐今木月﹝ +た卞﹜公及婁醒及域勾午仄化 \fB-c\fR 毛欐仄凶樺寧﹜ 公木卞糧仁婁醒反釐朿坌及戊穴件玉奶件正皿伉正卞戊穴件玉午仄化荸澄今木月﹝ -公及戊穴件玉反\fI/etc/passwd\fR匹覆擂及交□扒卞隙爛今木化中月 -扑尼伙匹撢墊今木月﹝ +戊穴件玉反公及交□扒卞 (\fI/etc/passwd\fR 匹) +隙爛今木化中月扑尼伙匹撢墊今木月﹝ .PP 优邰卅樺寧卞反﹜交□扒卞反由旦伐□玉及ェ恘互瞼今木月﹝ 棉啜勻凶由旦伐□玉互ェ恘今木凶樺寧卞反巨仿□丟永本□斥互請恘今木月﹝ -\fIsu\fR仄方丹午仄凶樺寧反﹜扑旦氾丞г莽毛腹襞允月凶戶卞﹜ +\fIsu\fR仄方丹午仄凶樺寧反﹜扑旦氾丞及匽迕毛腹襞允月凶戶卞﹜ 公木互懇仄中樺寧手尕懇卅樺寧手橘卞筏狤互酸今木月﹝ .PP 蜇箕及棕雁反蕙仄中扑尼伙卞婁五煤互木月﹝ -\fB$PATH\fR及襖反﹜騷橘及交□扒及樺寧反\fB/bin:/usr/bin\fR卞﹜ -旦□由□交□扒及樺寧反\fB/sbin:/bin:/usr/sbin:/usr/bin\fR卞瘋澀爛今木月﹝ -仇木反\fI/etc/login.defs\fR及\fBENV_PATH\fR午\fBENV_SUPATH\fR匹庍凳匹五月﹝ +凶分仄 +\fB$PATH\fR 及襖反﹜ +騷橘及交□扒匹反 \fB/bin:/usr/bin\fR 卞﹜ +旦□由□交□扒匹反 \fB/sbin:/bin:/usr/sbin:/usr/bin\fR +卞瘋澀爛今木月﹝ +仇木反 \fI/etc/login.defs\fR 及 +\fBENV_PATH\fR 午 \fBENV_SUPATH\fR 匹庍凳匹五月﹝ .PP -扔皮扑旦氾丞伕弘奶件反伕弘奶件扑尼伙及瘉賡及妐儂午仄化 -"*" 毛譆仁仇午匹隙爛允月﹝ -芨尹日木凶石□丞犯奴伊弁玄伉反交□扒互撢端卞伕弘奶件允月 -蕙仄中白央奶伙扑旦氾丞及伙□玄午仄化健歹木月﹝ +扔皮扑旦氾丞伕弘奶件匹反﹜ +伕弘奶件扑尼伙及瘉賡及妐儂卞 "*" 毛譆仁﹝ +欐今木凶石□丞犯奴伊弁玄伉反﹜ +交□扒互撢端卞伕弘奶件允月蕙仄中白央奶伙扑旦氾丞及伙□玄午仄化健歹木月﹝ .SH 煞屢 -.PP -仇及リ垥fBsu\fR卞反聶仁及戊件由奶伙凜左皿扑亦件互丐月互﹜ -扔奶玄卞方勻化反﹜公及域朿仄井澀爛今木化中卅中仇午手丐月﹝ +仇及リ \fBsu\fR 卞反聶仁及戊件由奶伙凜左皿扑亦件互丐月互﹜ +扔奶玄卞方勻化反仇及域朿仄井澀爛今木化中卅中仇午手丐月﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒失市它件玄及樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/shadow \- 剪寞祭今木凶由旦伐□玉菴太渝蜃樹扷 -.br -$HOME/.profile \- 犯白巧伙玄扑尼伙迕及賡渝祭旦弁伉皿玄 +\fI/etc/shadow\fR \- 剪寞祭由旦伐□玉午肣躲渝蜃樹扷 .SH 楮洘嫩杴 .BR login (1), .BR sh (1), .BR login.defs (5), .BR suauth (5) .SH 難樊 -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +Julianne Frances Haugh diff --git a/man/ja/suauth.5 b/man/ja/suauth.5 index 09f06580..444805eb 100644 --- a/man/ja/suauth.5 +++ b/man/ja/suauth.5 @@ -1,108 +1,111 @@ -.\" This page is originally in the shadow package. +.\"$Id: suauth.5,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" -.\" Translated Fri 14 Feb 1997 by Kazuyoshi Furutaka +.\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka +.\" all rights reserved. +.\" Translated Fri 14 Feb 1997 +.\" by Kazuyoshi Furutaka +.\" Modified Tue 18 Sep 2002 by NAKNAO Takeo .\" .TH SUAUTH 5 "Feb 14, 1996" .UC 5 .SH 抩蟆 -suauth \- su毛擇稱卞戊件玄伕□伙允月凶戶及白央奶伙 +suauth \- su 毛擇稱卞孺豢允月凶戶及白央奶伙 .SH 踏摯 .B /etc/suauth .SH 濩抸 .I /etc/suauth 白央奶伙反﹜ -su戊穴件玉毛撢墊仄凶凜卞优內輔寰今木月﹝ -仇及白央奶伙卞方勻化﹜ +su 戊穴件玉互撢墊今木月凶太卞輔寰今木月﹝ +仇及白央奶伙毛迕中月午﹜ +動票及樹扷卞湘勿中化 su 戊穴件玉及が綜毛庍凳匹五月﹝ .PP .RS .nf -1) su互覆擂午允月交□扒 +1) su 匹嶽曰醫歹欠丹午仄化中月交□扒 .fi -2)su戊穴件玉毛撢墊仄化中月交□扒(手仄仁反公及交□扒互簞允月弘伙□皿) +2) su 戊穴件玉毛撢墊仄化中月交□扒 +(手仄仁反公及交□扒互簞允月弘伙□皿及中內木井) .RE -卞湘勿中化su戊穴件玉及蕊朸互庍凳今木月﹝ .PP -仇及白央奶伙反動票及迋卅踏摯毛仄化云曰﹜ -#匹銨引月墊反戊丟件玄午仄化健歹木﹜拑骰今木月; +仇及白央奶伙反慼及迋卅踏摯毛仄化中月﹝ +# 匹銨引月墊反戊丟件玄午仄化健歹木﹜拑骰今木月﹝ .PP .RS to-id:from-id:ACTION .RE .PP -仇仇匹﹜to-id反 +仇仇匹 to-id 反﹜ .B ALL -午中丹賄﹜戊件穴匹嗉濠日木凶交□扒抩及伉旦玄 -手仄仁反 +午中丹簽賄﹜ +戊件穴匹嗉濠日木凶交□扒抩及伉旦玄﹜ .B ALL EXCEPT -午中丹賄午公木卞糧仁","匹嗉濠日木凶交□扒抩及伉旦玄 +午中丹簽賄動嫦卞譆井木凶 "," 嗉濠曰及交□扒抩伉旦玄﹜ 及中內木井匹丐月﹝ .PP -from-id反to-id午き元踏摯匹丐曰﹜凳卞 +from-id 反 to-id 午き元踏摯匹丐曰﹜凳卞 .B GROUP -午中丹賄手銀迕匹五月﹝ +午中丹簽賄手銀迕匹五月﹝ .B ALL EXCEPT GROUP -午中丹銀中杅手蟈仁懇仄中﹝ +午中丹銀中杅手き迋卞厙迕匹五月﹝ .B GROUP -及詨卞反域勾動曉及弘伙□皿抩毛","匹嗉濠勻化筏允﹝ -楮洘允月弘伙□皿及潛弘伙□皿id毛筏允分仃匹反蝸坌匹反卅仁﹜ -.B /etc/group (5) -醱及巨件玄伉毛筏允优邰互丐月﹝ +及詨卞反域勾動曉及弘伙□皿抩毛 "," 匹嗉濠勻化筏允﹝ +公及弘伙□皿毛潛弘伙□皿 id 午仄化儅勾分仃匹反分戶匹﹜ +\fI/etc/group\fR 及巨件玄伉卞交□扒抩互筏今木化中卅仃木壬卅日卅中﹝ .PP -ACTION卞反﹜蜇箕扔禾□玄今木化中月動票及左皿扑亦件及中內木井域勾 -毛隙爛匹五月﹝ -.TP 20 +ACTION 卞反﹜動票及左皿扑亦件及中內木井域勾毛隙爛匹五月﹝ +.TP 10 .B DENY -由旦伐□玉毛妏仁蟆卞su毛曩鞅允月﹝ -.TP 20 +由旦伐□玉毛妏仁蟆卞 su が綜毛醱鞅允月﹝ +.TP .B NOPASS -憤が讀卞su允月仇午互請侳﹜由旦伐□玉反諜友化侳卅中﹝ -.TP 20 +憤が讀卞 su 反嶽跦仄﹜由旦伐□玉反諜友卅中﹝ +.TP .B OWNPASS -su請侳月凶戶卞反﹜交□扒互憤坌及由旦伐□玉毛ェ恘仄卅仁化反 -卅日卅中﹝由旦伐□玉毛ェ恘允月方丹卞邰菲今木月﹝ +su 互嶽跦允月凶戶卞反﹜ +交□扒互憤坌及由旦伐□玉毛ェ恘仄卅仁化反卅日卅中﹝ +由旦伐□玉毛ェ恘允月方丹卞邰菲今木月﹝ .PP -戊伕件卞方勻化嗉濠日木凶帎★及勂互趕勾丐月仇午卞鏜啦﹝ -戊伕件及挃卞塢⑩互丐勻化反卅日卅中﹝ -白央奶伙反域墊咍卞賜痐侀蓏ㄓ竣鴗諵酗菴太﹜瘉賡卞贗寧仄凶筋禮毛迕中﹜ -白央奶伙及酸曰反嗚怗今木卅中仇午卞手鏜啦六方﹝ -仄凶互勻化﹜扑旦氾丞棟咥樊反优邰午允月分仃鬮替陘罋啎忖酗互請侳月﹝ +戊伕件卞方勻化嗉濠日木凶帎★及白奴□伙玉互趕勾丐月鰾卞鏜啦允月仇午﹝ +戊伕件及蟆詨卞塢⑩互丐勻化反卅日卅中﹝ +白央奶伙反域墊咍卞賜痐侀蓏ㄓ竣魽 +瘉賡卞穴永民仄凶筋禮互迕中日木﹜ +白央奶伙及酸曰反公木動曉邀犖今木卅中﹝ +仇木卞方勻化﹜ +扑旦氾丞棟咥樊反侗戈蜃曰及鬮替陘罋啎忖酗互第Х午卅月﹝ .SH 拺 .PP .nf # /etc/suauth白央奶伙及拺 # -# 醒抩及た腺交□扒反憤坌及由旦伐□玉毛 -# 迕中化root卞su請侳月﹝ +# わ諦及た腺交□扒互﹜憤坌及由旦伐□玉毛 +# 迕中化 root 卞 su 匹五月﹝ # root:chris,birddog:OWNPASS # -# 職及交□扒反wheel弘伙□皿卞簞仄化中卅中蜃曰 -# root卞su允月仇午反請侳卅中﹝ -# BSD午き元蕊朸﹝ +# 職及交□扒反 wheel 弘伙□皿卞簞仄化中卅中蜃曰 +# root 卞 su 匹五卅中﹝仇木反 BSD 午き元が綜匹丐月﹝ # root:ALL EXCEPT GROUP wheel:DENY # -# 云公日仁terry午birddog反き元諦棉互 +# 云公日仁 terry 午 birddog 反き元諦棉互 # 赭肣允月失市它件玄匹丐月﹝ -# 由旦伐□玉拑仄匹詢中卞 -# 職杅卞su請侳月﹝ +# 由旦伐□玉拑仄匹詢中卞職杅卞 su 匹五月﹝ # terry:birddog:NOPASS birddog:terry:NOPASS # .fi .SH 白央奶伙 -/etc/suauth +\fI/etc/suauth\fR .SH 田弘 聶仁及田弘互療氏匹中月第Х嶺互丐月﹝ -午曰歹仃﹜白央奶伙由□扔反踏摯巨仿□卞散釐匹反卅仁﹜ -(墊及銨戶菴太蔽歹曰動陸卞)葦井仃及塢⑩反丐勻化反卅日卅中仄﹜ -た爛及玄□弁件卞方曰蟈仁帎及嗉濠曰杅卞卅勻化仄引丹儀手丐月﹝ +午曰歹仃﹜白央奶伙由□扒反踏摯巨仿□卞散釐匹反卅仁﹜ +(墊及銨戶菴太蔽歹曰動陸卞) 拑蟯卅塢⑩互丐勻化反卅日卅中仄﹜ +た爛及玄□弁件互帎★及手及毛嗉濠月方丹卞卅勻化中月﹝ .SH 忒曰襖 白央奶伙毛由□旦允月端及巨仿□反 -.B syslogd (8) -毛迕中化AUTH窗Х及伊矛伙ERR -午仄化騷襞今木月﹝ +.BR syslogd (8) +毛騷仄化﹜AUTH 白央扑伉氾奴及 ERR 伊矛伙匹騷襞今木月﹝ .SH 楮洘嫩杴 .BR su (1) .SH 難樊 diff --git a/man/ja/sulogin.8 b/man/ja/sulogin.8 index 8865cda8..a845402a 100644 --- a/man/ja/sulogin.8 +++ b/man/ja/sulogin.8 @@ -1,3 +1,4 @@ +.\"$Id: sulogin.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1989 - 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,70 +26,67 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: sulogin.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka +.\" Modified Sun 22 Sep 2002 by NAKANO Takeo .\" .TH SULOGIN 8 .SH 抩蟆 -sulogin \- 扑件弘伙交□扒login +sulogin \- 扑件弘伙交□扒 login .SH 踏摯 \fBsulogin\fR [\fItty-device\fR] .SH 濩抸 .B sulogin -反扑件弘伙交□扒乒□玉凜﹜交□扒互扑旦氾丞卞失弁本旦請侳月方丹卞 -卅月蟆卞\fI/etc/init\fR卞方勻化粟が今木月﹝ -仇及窗Х反﹜\fBinit\fR互贗濠卞庍凳今木化中月井﹜ -\fB/etc/inittab\fR卞扑件弘伙交□扒迕login及巨件玄伉互丐月 -扑旦氾丞匹及心か井六月儀互請侳月﹝ +反﹜扑件弘伙交□扒乒□玉及凜﹜ +交□扒互扑旦氾丞卞失弁本旦第Х午卅月蟆卞﹜ +\fI/etc/init\fR 卞方勻化粟が今木月﹝ +仇及窗Х反﹜\fBinit\fR 互贗濠卞庍凳今木化中月扑旦氾丞井﹜ +丐月中反 \fI/etc/inittab\fR 卞扑件弘伙交□扒 login +及巨件玄伉互丐月扑旦氾丞匹及心厙迕匹五月﹝ .PP -慼及迋卞ェ恘毛瞼今木月 +慼及方丹卅皿伕件皿玄互請月﹝ .IP "" .5i Type control-d to proceed with normal startup, .br (or give root password for system maintenance): .PP -左皿扑亦件及犯田奶旦抩婁醒毛隙爛仄卅井勻凶樺寧反﹜ -伓賞白央奶伙犯奴旦弁伉皿正毛迕中化ェ請恘毛墊卅丹﹝ +左皿扑亦件及犯田奶旦抩婁醒互隙爛今木凶樺寧毛輪五﹜ +伓賞及白央奶伙犯奴旦弁伉皿正毛迕中化ェ請恘毛墊卅丹﹝ .PP -交□扒互懇仄中root及由旦伐□玉毛ェ恘仄凶樺寧反﹜ +交□扒互懇仄中 root 及由旦伐□玉毛ェ恘仄凶樺寧反﹜ 伕弘奶件本永扑亦件互釩銨今木月﹝ -醫歹曰卞\fBEOF\fR互瓷今木凶樺寧反﹜ +\fBEOF\fR 互瓷今木凶樺寧反﹜ 扑旦氾丞反穴伙民交□扒乒□玉卞ェ月﹝ .PP -交□扒互扑件弘伙交□扒扑尼伙毛握惜蕪儦蝖═滮楔砟柦fBEOF\fR毛瓷仄凶樺寧反 +交□扒互扑件弘伙交□扒扑尼伙毛握惜縑 +丐月中反 (扑尼伙卞ェ月蟆卞) \fBEOF\fR 毛瓷仄凶詨卞反﹜ 扑旦氾丞反穴伙民交□扒乒□玉卞ェ月凶戶卞优邰卅賡渝祭質咥毛釩銨允月﹝ .SH 煞屢 -.PP -仇及戊穴件玉反﹜ -\fBinit\fR互\fB/bin/sh\fR匹反卅仁\fBsulogin\fR毛裟少迋庍凳今木化中月井﹜ -引凶反\fIinittab\fR醱匹扑件弘伙交□扒伕弘奶件卞覆允月澀爛互卅今木化中月 -樺寧卞及心銀迕匹五月﹝ +仇及戊穴件玉互厙迕匹五月方丹卞允月卞反﹜ +\fBinit\fR 互 \fB/bin/sh\fR 匹反卅仁 +\fBsulogin\fR 毛裟少方丹卞卅勻化中月井﹜ +引凶反 +\fIinittab\fR +醱卞扑件弘伙交□扒伕弘奶件卞覆允月澀爛互今木化中月优邰互丐月﹝ 拺尹壬﹜ .br .sp 1 co:s:respawn:/etc/sulogin /dev/console .br .sp 1 -.\" should execute the sulogin command in single user mode. -午中丹墊毛筏ェ仄化云仁儀卞方曰﹜扑件弘伙交□扒乒□玉匹反sulogin -戊穴件玉互撢墊今木月﹝ +午中丹墊毛踏中化云仃壬﹜ +扑件弘伙交□扒乒□玉匹反 sulogin 戊穴件玉互撢墊今木月﹝ .PP 第Х卅蜃曰敦蟈卅棕雁互羼間今木月﹝ -.\" However, various devices may be unmounted or uninitialized and many -.\" of the user commands may be unavailable or nonfunctional as a result. -仄井仄卅互日﹜迋★卅犯田奶旦互穴它件玄今木化中卅井勻凶曰賡渝祭今木化中卅 -井勻凶曰允月凶戶﹜聶仁及交□扒戊穴件玉互銀尹卅井勻凶曰窗Х仄卅中 -井手仄木卅中﹝ +仄井仄﹜ +迋★卅犯田奶旦互穴它件玄今木化中卅井勻凶曰賡渝祭今木化中卅井勻凶曰允月凶戶﹜ +聶仁及交□扒戊穴件玉互銀尹卅井勻凶曰窗Х仄卅中井手仄木卅中﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/shadow \- 剪寞祭今木凶由旦伐□玉菴太公及肣躲渝蜃樹扷 -.br -/.profile \- 扑件弘伙交□扒扑尼伙迕及賡渝祭旦弁伉皿玄 +\fI/etc/shadow\fR \- 剪寞祭今木凶由旦伐□玉午肣躲渝蜃及樹扷 .SH 楮洘嫩杴 .BR login (1), .BR sh (1), diff --git a/man/ja/useradd.8 b/man/ja/useradd.8 index 56392422..e3ca90b4 100644 --- a/man/ja/useradd.8 +++ b/man/ja/useradd.8 @@ -1,3 +1,4 @@ +.\"$Id: useradd.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,166 +26,142 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" -.\" $Id: useradd.8,v 1.2 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1996 HANATAKA Shinya .\" all rights reserved. .\" Translated Wed Nov 20 17:42:39 JST 1996 .\" by HANATAKA Shinya +.\" Updated Mon Mar 5 JST 2002 by Kentaro Shirakata +.\" Modified Sun 22 Sep 2002 by NAKANO Takeo .\" .\"WORD: initial group 潛弘伙□皿 .\"WORD: supplementary group 怀踞弘伙□皿 .\" .TH USERADD 8 .SH 抩蟆 -useradd \- 蕙筋交□扒及綜嶽﹜云方太蕙筋交□扒及犯白巧伙玄樹扷及庍凳 +useradd \- 蕙筋交□扒及綜嶽’蕙筋交□扒及犯白巧伙玄樹扷及凳蕙 .SH 踏摯 .TP 8 -.B useradd -.\" .RB [ -A -.\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c -.IR comment ] -.RB [ -d -.IR home_dir ] +\fBuseradd\fR [\fB-c\fR \fIcomment\fR] [\fB-d\fR \fIhome_dir\fR] .br -.RB [ -e -.IR expire_date ] -.RB [ -f -.IR inactive_time ] +[\fB-e\fR \fIexpire_date\fR] [\fB-f\fR \fIinactive_time\fR] .br -.RB [ -g -.IR initial_group ] -.RB [ -G -.IR group [,...]] +[\fB-g\fR \fIinitial_group\fR] [\fB-G\fR \fIgroup\fR[,...]] .br -.RB [ -m " [" -k -.IR skeleton_dir ]] -.RB [ -p -.IR passwd ] +[\fB-m\fR [\fB-k\fR \fIskeleton_dir\fR]] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] .br -.RB [ -s -.IR shell ] -.RB [ -u -.IR uid " [" -.BR -o ]] -.I login +[\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR .TP 8 -.B useradd -\fB-D\fR -[\fB-g\fI default_group\fR] -[\fB-b\fI default_home\fR] +\fBuseradd\fR \fB-D\fR [\fB-g\fI default_group\fR] [\fB-b\fI default_home\fR] .br -[\fB-f\fI default_inactive\fR] -[\fB-e\fI default_expire_date\fR] +[\fB-e\fI default_expire_date\fR] [\fB-f\fI default_inactive\fR] .br [\fB-s\fI default_shell\fR] .SH 濩抸 .SS 蕙筋交□扒及綜嶽 -\fB-D\fR 左皿扑亦件卅仄匹撢墊今木凶樺寧﹜ \fBuseradd\fR 戊穴件玉反﹜ -戊穴件玉仿奶件匹芨尹日木凶襖午犯白巧伙玄及澀爛襖毛手午卞﹜ +\fB-D\fR 左皿扑亦件卅仄匹撢墊今木凶樺寧﹜ +\fBuseradd\fR 戊穴件玉反 +戊穴件玉仿奶件及襖午犯白巧伙玄及澀爛襖毛手午卞 蕙筋交□扒及失市它件玄毛綜嶽允月﹝ -戊穴件玉仿奶件及左皿扑亦件卞殺元化﹜蕙筋交□扒及失市它件玄互 -优邰卅扑旦氾丞白央奶伙卞馨笛今木﹜石□丞犯奴伊弁玄伉互綜日木﹜ +戊穴件玉仿奶件左皿扑亦件卞殺元化﹜ +蕙筋交□扒及失市它件玄互优邰卅扑旦氾丞白央奶伙卞馨笛今木﹜ +石□丞犯奴伊弁玄伉互綜嶽今木﹜ 澀爛白央奶伙互戊疋□今木月﹝ -\fBuseradd\fR 戊穴件玉及左皿扑亦件反慼及午云曰匹丐月﹝ -.\" .IP "\fB-A {\fImethod\fR|\fBDEFAULT\fR},..." -.\" The value of the user's authentication method. -.\" The authentication method is the name of a program which is responsible -.\" for validating the user's identity. -.\" The string \fBDEFAULT\fR may be used to change the user's authentication -.\" method to the standard system password method. -.\" This is a comma-separated list of program names. -.\" It may include \fBDEFAULT\fR exactly once. +\fBuseradd\fR 戊穴件玉及左皿扑亦件反慼及騷曰﹝ .IP "\fB-c \fIcomment\fR" 由旦伐□玉白央奶伙卞馨笛允月蕙筋交□扒及戊丟件玄白奴□伙玉﹝ .IP "\fB-d \fIhome_dir\fR" -蕙筋交□扒及伕弘奶件凜及犯奴伊弁玄伉反﹜ \fIhome_dir\fR 午允月﹝ -犯白巧伙玄匹反﹜ \fIlogin\fR 毛 \fIdefault_home\fR 卞尥仃笛尹凶手及互 -伕弘奶件凜及犯奴伊弁玄伉午卅月﹝ +蕙筋交□扒及伕弘奶件犯奴伊弁玄伉毛 \fIhome_dir\fR 卞允月﹝ +犯白巧伙玄匹反 \fIlogin\fR 毛 +\fIdefault_home\fR 卞尥仃笛尹凶手及互伕弘奶件犯奴伊弁玄伉午卅月﹝ .IP "\fB-e \fIexpire_date\fR" -交□扒失市它件玄互拑躲午卅月ゥ尥﹝ -ゥ尥反 \fIYYYY-MM-DD\fR 及溥摯匹丐月﹝ +交□扒失市它件玄互銀迕尕Х卞卅月ゥ尥﹝ +ゥ尥反 \fIYYYY-MM-DD\fR 午中丹踏摯匹隙爛允月﹝ .IP "\fB-f \fIinactive_days\fR" -由旦伐□玉互及銀迕渝蜃互濠木化井日﹜仇及左皿扑亦件匹芨尹凶ゥ醒煩聊允月午 -失市它件玄反捩菁卞銀迕尕Х午卅月﹝ -襖午仄化 0 毛隙爛允月午﹜由旦伐□玉互撩躲仄凶躂詨卞失市它件玄反銀迕尕Х午卅曰﹜ --1 毛隙爛允月午﹜仇及窗Х反拑躲午卅月﹝ -犯白巧伙玄襖反 -1 匹丐月﹝ +由旦伐□玉及銀迕渝蜃互濠木化井日失市它件玄互捩菁卞銀迕尕Х卞卅月引匹及ゥ醒﹝ +0 卞允月午﹜ +由旦伐□玉及渝蜃互濠木月午き凜卞仇及失市它件玄反銀迕尕Х卞卅月﹝ +-1 卞允月午仇及窗Х互拑躲卞卅月﹝犯白巧伙玄襖反 -1﹝ .IP "\fB-g \fIinitial_group\fR" -交□扒及簞允月潛弘伙□皿及弘伙□皿抩引凶反弘伙□皿 ID﹝ -弘伙□皿抩反允匹卞繡箕允月手及匹卅仃木壬卅日卅中﹝ -弘伙□皿 ID 反﹜允匹卞繡箕允月弘伙□皿卞覆殺允月手及匹卅仃木壬卅日卅中﹝ -犯白巧伙玄及弘伙□皿 ID 反 1 匹丐月﹝ +交□扒及簞允月潛弘伙□皿及弘伙□皿抩引凶反 ID﹝ +弘伙□皿抩反允匹卞繡箕仄化中卅仃木壬卅日卅中﹝ +弘伙□皿 ID 反湃繡及弘伙□皿卞覆殺允月手及匹卅仃木壬卅日卅中﹝ +犯白巧伙玄及弘伙□皿 ID 反 1 井﹜ +引凶反 \fI/etc/default/useradd\fR +匹隙爛今木化中月手及互丐木壬公木卞蝨丹﹝ .IP "\fB-G \fIgroup,[...]\fR" -交□扒及簞允月怀踞弘伙□皿及伉旦玄﹝ -弘伙□皿反戊件穴匹嗉濠曰﹜塢⑩毛殖戶化反中仃卅中﹝ -仇木日及弘伙□皿反﹜ \fB-g\fR 左皿扑亦件午き迋卞﹜ -允匹卞繡箕允月手及匹卅仃木壬卅日卅中﹝ +交□扒及簞允月怀踞弘伙□皿 (supplementary groups) 及伉旦玄﹝ +弘伙□皿反戊件穴匹嗉濠曰﹜棉卞塢⑩毛ェ木化反卅日卅中﹝ +隙爛匹五月弘伙□皿卞反 \fB-g\fR 左皿扑亦件午き迋及孺蜃互丐月﹝ 犯白巧伙玄匹反﹜交□扒反潛弘伙□皿及心卞簞允月﹝ .IP \fB-m\fR 石□丞犯奴伊弁玄伉互繡箕仄卅中樺寧卞反﹜石□丞犯奴伊弁玄伉毛綜嶽允月﹝ \fB-k\fR 左皿扑亦件毛き凜卞隙爛允月午 \fIskeleton_dir\fR 動票及白央奶伙互﹜ 隙爛仄卅中午 \fI/etc/skel\fR 動票及白央奶伙互﹜ 石□丞犯奴伊弁玄伉卞戊疋□今木月﹝ -\fIskeleton_dir\fR 引凶反 \fI/etc/skel\fR 卞殖引木月允屯化及犯奴伊弁玄伉手﹜ -石□丞犯奴伊弁玄伉卞綜日木月﹝ -\fB-k\fR 左皿扑亦件反﹜ \fB-m\fR 左皿扑亦件午午手卞銀歹木月樺寧及心肣躲匹丐月﹝ +石□丞犯奴伊弁玄伉卞反﹜ +\fIskeleton_dir\fR 引凶反 \fI/etc/skel\fR +卞殖引木月允屯化及犯奴伊弁玄伉手綜嶽今木月﹝ +\fB-k\fR 左皿扑亦件反﹜ +\fB-m\fR 左皿扑亦件午午手卞銀歹木月樺寧及心肣躲匹丐月﹝ 犯白巧伙玄匹反﹜石□丞犯奴伊弁玄伉毛綜日內﹜白央奶伙及戊疋□手仄卅中﹝ +.IP "\fB-o\fR" +褐呁仄凶 (裔肣匹卅中) UID 匹交□扒毛綜嶽匹五月方丹卞允月﹝ .IP "\fB-p \fIpasswd\fR" -\fBcrypt\fR(3) 卞方勻化剪寞祭今木凶由旦伐□玉﹝ +\fBcrypt\fR(3) 及忒曰襖匹丐月剪寞祭由旦伐□玉﹝ 犯白巧伙玄匹反﹜失市它件玄反銀尹卅中橇謫午卅月﹝ .IP "\fB-s \fIshell\fR" -交□扒及伕弘奶件扑尼伙抩﹝ +交□扒及伕弘奶件扑尼伙及抩蟆﹝ 犯白巧伙玄匹反仇及白奴□伙玉反塢⑩午卅曰﹜ 扑旦氾丞互犯白巧伙玄及伕弘奶件扑尼伙毛薊少﹝ .IP "\fB-u \fIuid\fR" -交□扒 ID﹝ -\fI-o\fR 左皿扑亦件互き凜卞隙爛今木卅中樺寧反﹜職午褐卅勻化反卅日卅中﹝ -醒襖反鯠擗恞秅リ吨惜鴗苳吨擗吨丑 -犯白巧伙玄匹反﹜ 99 方曰釐五仁﹜ -允匹卞繡箕允月升及交□扒方曰手釐五中醒及丹切﹜瘉凝及襖互銀歹木月﹝ -0 井日 99 引匹及襖反釐纏﹜扑旦氾丞失市它件玄迕午仄化芺沶今木化中月﹝ +交□扒及 ID 砦獢 +仇及襖反﹜\fB-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ +引凶鯠橨秅リ吨砟々洃吨擗吨丑 +犯白巧伙玄匹反﹜99 云方太職及丐日斗月湃繡交□扒及 ID 方曰手釐五中﹜ +瘉凝及醒襖午卅月﹝ +0 井日 99 引匹及襖反﹜ +騷橘扑旦氾丞迕及失市它件玄卞芺沶今木化中月﹝ .SS 犯白巧伙玄襖及庍凳 \fB-D\fR 左皿扑亦件毛隙爛允月午﹜ \fBuseradd\fR 反蜇箕及犯白巧伙玄襖毛刓憎允月井﹜ 引凶反左皿扑亦件匹芨尹日木凶襖卞殺元化犯白巧伙玄襖毛庍凳允月﹝ -銀迕第Х卅左皿扑亦件反慼及午云曰匹丐月﹝ +銀迕第Х卅左皿扑亦件反慼及騷曰﹝ .IP "\fB-b \fIdefault_home\fR" -蕙筋交□扒及石□丞犯奴伊弁玄伉尺及由旦﹝ -蕙筋交□扒失市它件玄毛綜嶽允月端卞 \fB-d\fI 左皿扑亦件毛隙爛仄卅中樺寧﹜ +蕙筋交□扒及石□丞犯奴伊弁玄伉及由旦及皿伊白奴永弁旦﹝ +蕙筋交□扒失市它件玄及綜嶽凜卞 \fB-d\fI 左皿扑亦件互隙爛今木卅中午﹜ \fIdefault_home\fR 及詨卞交□扒抩毛尥仃笛尹凶手及互 蕙筋犯奴伊弁玄伉抩午仄化銀歹木月﹝ .IP "\fB-e \fIdefault_expire_date\fR" -交□扒失市它件玄互拑躲午卅月ゥ尥﹝ +交□扒失市它件玄互銀迕尕Х午卅月ゥ尥﹝ .IP "\fB-f \fIdefault_inactive\fR" 由旦伐□玉及銀迕渝蜃互濠木化井日失市它件玄互銀迕尕Х午卅月引匹及ゥ醒﹝ .IP "\fB-g \fIdefault_group\fR" 蕙筋交□扒及簞允月潛弘伙□皿及弘伙□皿抩引凶反弘伙□皿 ID﹝ 弘伙□皿抩反允匹卞繡箕允月手及匹卅仃木壬卅日卅中﹝ -弘伙□皿 ID 反﹜允匹卞繡箕允月弘伙□皿卞覆殺允月手及匹卅仃木壬卅日卅中﹝ +弘伙□皿 ID 反湃繡及弘伙□皿卞覆殺允月手及匹卅仃木壬卅日卅中﹝ .IP "\fB-s \fIdefault_shell\fR" 蕙筋交□扒及伕弘奶件扑尼伙﹝ -隙爛今木凶皿伕弘仿丞互﹜漆詨綜日木月允屯化及交□扒失市它件玄卞贗迕今木月﹝ +隙爛今木凶皿伕弘仿丞反﹜ +漆詨綜日木月允屯化及蕙筋交□扒失市它件玄卞贗迕今木月﹝ .PP -左皿扑亦件毛隙爛仄卅中樺寧﹜ \fBuseradd\fR 反蜇箕及犯白巧伙玄襖毛刓憎允月﹝ +左皿扑亦件毛隙爛仄卅中午﹜ +\fBuseradd\fR 反蜇箕及犯白巧伙玄襖毛刓憎允月﹝ .SH 鏜啦 -\fI/etc/skel\fR 犯奴伊弁玄伉卞犯白巧伙玄及交□扒白央奶伙毛譆仁綜僅反 -扑旦氾丞棟咥樊及毚リ匹丐月﹝ +\fI/etc/skel\fR 犯奴伊弁玄伉卞犯白巧伙玄及交□扒白央奶伙毛譆仁及反 +扑旦氾丞棟咥樊及墊丹屯五綜僅匹丐月﹝ .SH 煞屢 NIS 及弘伙□皿卞交□扒毛笛尹化反卅日卅中﹝ 仇木反优內 NIS 扔□田曉匹墊丹仇午﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/shadow \- shadow 今木凶交□扒失市它件玄樹扷 +\fI/etc/shadow\fR \- 兜蟈卅交□扒失市它件玄樹扷 .br -/etc/group \- 弘伙□皿樹扷 +\fI/etc/group\fR \ - 弘伙□皿樹扷 .br -/etc/default/useradd \- 犯白巧伙玄襖及樹扷 +\fI/etc/default/useradd\fR \- 犯白巧伙玄樹扷 .br -/etc/skel \- 白央奶伙及鋸溥互譆井木月犯奴伊弁玄伉 +\fI/etc/skel/\fR \ - 白央奶伙及鋸溥互譆井木月犯奴伊弁玄伉 .SH 楮洘嫩杴 .BR chfn (1), .BR chsh (1), @@ -197,5 +174,3 @@ NIS .BR usermod (8) .SH 難樊 Julianne Frances Haugh (jockgrrl@ix.netcom.com) - - diff --git a/man/ja/userdel.8 b/man/ja/userdel.8 index 30587cf6..9716e6a9 100644 --- a/man/ja/userdel.8 +++ b/man/ja/userdel.8 @@ -1,3 +1,4 @@ +.\"$Id: userdel.8,v 1.6 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,44 +26,44 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: userdel.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka -.\" Updated Fri Jan 12 03:27:30 JST 2000 -.\" by Kentaro Shirakata +.\" Updated Fri Jan 12 JST 2000 by Kentaro Shirakata +.\" Updated Fri Mar 1 JST 2002 by Kentaro Shirakata +.\" Modified Sun 22 Sep 2002 by NAKANO Takeo .\" .TH USERDEL 8 .SH 抩蟆 -userdel \- 交□扒及失市它件玄菴太楮洘允月白央奶伙毛綽輪允月 +userdel \- 交□扒及失市它件玄午楮洘白央奶伙毛綽輪允月 .SH 踏摯 .B userdel [\fB-r\fR] .I login .SH 濩抸 -\fBuserdel\fR戊穴件玉反扑旦氾丞及失市它件玄白央奶伙卞庍凳毛雒仄﹜ -交□扒\fIlogin\fR卞簞允月蟈化及巨件玄伉□毛綽輪允月﹝ +\fBuserdel\fR 戊穴件玉反﹜扑旦氾丞失市它件玄白央奶伙毛膜懇仄﹜ +交□扒 \fIlogin\fR 卞覆殺允月允屯化及巨件玄伉毛綽輪允月﹝ 綽輪今木月交□扒反繡箕仄化中卅仃木壬卅日卅中﹝ +\fBuserdel\fR 戊穴件玉卞贗迕匹五月左皿扑亦件反動票及騷曰﹝ .IP \fB-r\fR -交□扒及石□丞犯奴伊弁玄伉醱及白央奶伙毛石□丞犯奴伊弁玄伉憤蟲午午手卞 -壅蛔允月﹝引凶交□扒及丟□伙旦皿□伙手壅蛔允月﹝ -職及白央奶伙扑旦氾丞曉卞丐月白央奶伙反澎綜僅匹繭仄請仄化輪蛔仄卅仁化反 -卅日卅中﹝ +交□扒及石□丞犯奴伊弁玄伉醱及白央奶伙毛綽輪允月﹝ +石□丞犯奴伊弁玄伉憤蟲午交□扒及丟□伙旦皿□伙手壅蛔允月﹝ +白央奶伙扑旦氾丞醱及幻井及樺赭卞丐月公及交□扒及白央奶伙反﹜ +澎綜僅匹繭仄請仄化綽輪仄卅仃木壬卅日卅中﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒及失市它件玄卞楮允月樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/shadow \- 兜蟈卅﹜交□扒及失市它件玄卞楮允月樹扷 +\fI/etc/shadow\fR \- 兜蟈卅交□扒失市它件玄樹扷 .br -/etc/group \- 弘伙□皿卞楮允月樹扷 +\fI/etc/group\fR \ - 弘伙□皿樹扷 .SH 煞屢 -\fBuserdel\fR反壅蛔今木月交□扒互蜇箕伕弘奶件仄化中月樺寧反 -公及失市它件玄毛壅蛔允月儀毛袱第仄卅中﹝ -公及凜反壅蛔仄方丹午仄化中月失市它件玄卞簞允月撢墊醱及皿伕本旦蟈化毛 -kill仄卅仁化反卅日卅中﹝ -NIS及弁仿奶失件玄井日反中井卅月NIS赭肣及失市它件玄手壅蛔允月儀反請侳卅中﹝ -壅蛔允月樺寧卞反NIS及扔□田井日墊歹卅仁化反卅日卅中﹝ +\fBuserdel\fR 反﹜綽輪今木月交□扒互蜇箕伕弘奶件仄化中月樺寧反﹜ +公及失市它件玄及綽輪毛袱第仄卅中﹝ +綽輪仄方丹午仄化中月失市它件玄卞簞允月撢墊醱及皿伕本旦反﹜ +允屯化 kill 仄卅仃木壬卅日卅中﹝ +NIS 及弁仿奶失件玄井日反﹜NIS 及簞嶺襖反綽輪匹五卅中﹝ +綽輪反 NIS 及扔□田匹墊歹卅仃木壬卅日卅中﹝ .SH 楮洘嫩杴 .BR chfn (1), .BR chsh (1), diff --git a/man/ja/usermod.8 b/man/ja/usermod.8 index 032f1120..baef3e6a 100644 --- a/man/ja/usermod.8 +++ b/man/ja/usermod.8 @@ -1,3 +1,4 @@ +.\"$Id: usermod.8,v 1.6 2003/04/28 02:14:00 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,134 +26,111 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: usermod.8,v 1.3 2002/03/09 11:16:16 ankry Exp $ -.\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. .\" Translated Fri Feb 14 23:06:00 JST 1997 .\" by Kazuyoshi Furutaka .\" Updated Tue Jan 23 17:21:08 JST 2001 .\" by Kentaro Shirakata +.\" Modified Sun 22 Sep 2002 by NAKANO Takeo +.\" +.\"WORD: initial group 潛弘伙□皿 +.\"WORD: supplementary group 怀踞弘伙□皿 .\" .TH USERMOD 8 .SH 抩蟆 -usermod \- 交□扒失市它件玄毛庍凳允月 +usermod \- 交□扒失市它件玄毛膜懇允月 .SH 踏摯 -.TP 8 -.B usermod -.\" .RB [ -A -.\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c -.IR comment ] -.RB [ -d -.IR home_dir " [" -.BR -m ]] +\fBusermod\fR [\fB-c\fR \fIcomment\fR] [\fB-d\fR \fIhome_dir\fR [\fB-m\fR]] .br -.RB [ -e -.IR expire_date ] -.RB [ -f -.IR inactive_time ] +[\fB-e\fR \fIexpire_date\fR] [\fB-f\fR \fIinactive_time\fR] .br -.RB [ -g -.IR initial_group ] -.RB [ -G -.IR group [,...]] +[\fB-g\fR \fIinitial_group\fR] [\fB-G\fR \fIgroup\fR [,...]] .br -.RB [ -l -.IR login_name ] -.RB [ -p -.IR passwd ] +[\fB-l\fR \fIlogin_name\fR] [\fB-p\fR \fIpasswd\fR] .br -.RB [ -s -.IR shell ] -.RB [ -u -.IR uid " [" -.BR -o ]] -.RB [ -L | -U ] -.I login +[\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR [\fB-o\fR]] [\fB-L\fR|\fB-U\fR] +\fIlogin\fR .SH 濩抸 -\fBusermod\fR戊穴件玉反戊穴件玉仿奶件曉匹及隙憎卞仄凶互勻化 -扑旦氾丞及失市它件玄白央奶伙毛庍凳允月﹝ -\fBusermod\fR戊穴件玉匹銀尹月左皿扑亦件反 -.\" .IP "\fB-A \fImethod\fR|\fBDEFAULT\fR" -.\" 交□扒及蕙仄中ロ據杅芊﹝ -.\" 交□扒及ロ據杅芊午反﹜交□扒互呿諦匹丐月儀毛割ロ允月啃及皿伕弘仿丞抩匹丐月﹝ -.\" 妐儂昫\fBDEFAULT\fR毛迕中化交□扒及ロ據杅芊毛扑旦氾丞伓賞及由旦伐□玉杅摯卞 -.\" 庍凳允月儀手請侳月﹝ +\fBusermod\fR 戊穴件玉反﹜ +戊穴件玉仿奶件曉匹及隙爛卞方勻化﹜ +扑旦氾丞失市它件玄白央奶伙毛膜懇允月﹝ +\fBusermod\fR 戊穴件玉卞隙爛匹五月左皿扑亦件反慼及騷曰﹝ .IP "\fB-c \fIcomment\fR" -由旦伐□玉白央奶伙及蕙仄中戊丟件玄勂及ま芢 -騷橘反\fBchfn\fR(1)交□氾奴伉氾奴毛迕中化庍凳今木月﹝ +由旦伐□玉白央奶伙及戊丟件玄白奴□伙玉卞芨尹月蕙仄中襖﹝ +騷橘反 +.BR chfn (1) +交□氾奴伉氾奴卞方勻化庍凳今木月﹝ .IP "\fB-d \fIhome_dir\fR" 蕙仄中伕弘奶件犯奴伊弁玄伉﹝ -\fB-m\fR左皿扑亦件毛迕中凶樺寧反蜇箕及石□丞犯奴伊弁玄伉及醱褥互 -蕙仄中石□丞犯奴伊弁玄伉卞啖が今木月﹝手仄繡箕仄卅中樺寧反蕙凶卞 -綜日木月﹝ +\fB-m\fR 左皿扑亦件毛迕中月午﹜ +蜇箕及石□丞犯奴伊弁玄伉及醱褥互蕙仄中石□丞犯奴伊弁玄伉卞啖が今木月 +(詨樊互繡箕仄卅中樺寧反蕙凶卞綜嶽今木月)﹝ .IP "\fB-e \fIexpire_date\fR" -失市它件玄互銀迕尕Х卞卅月ゥ尥﹝ -ゥ尥反\fIYYYY-MM-DD\fR午中丹踏摯匹隙爛允月 -(YYYY, MM, DD 反公木冗木ヵ﹜畸﹜ゥ毛刓允醒儂)﹝ +公及交□扒失市它件玄互銀迕尕Х卞卅月ゥ尥﹝ +ゥ尥反 \fIYYYY-MM-DD\fR 午中丹踏摯匹隙爛允月﹝ .IP "\fB-f \fIinactive_days\fR" -由旦伐□玉及銀迕渝蜃互濠木化井日失市它件玄互捩菁卞銀迕尕Х卞卅月 -引匹及ゥ醒﹝ -0午允月午﹜由旦伐□玉及渝蜃互濠木月午き凜卞仇及失市它件玄反銀迕尕第Х -卞卅月﹝-1午允月午仇及窗Х互か井卅仁卅月﹝ -犯白巧伙玄襖反-1﹝ +由旦伐□玉及銀迕渝蜃互濠木化井日失市它件玄互捩菁卞銀迕尕Х卞卅月引匹及ゥ醒﹝ +0 卞允月午﹜ +由旦伐□玉及渝蜃互濠木月午き凜卞仇及失市它件玄反銀迕尕Х卞卅月﹝ +-1 卞允月午仇及窗Х互拑躲卞卅月﹝犯白巧伙玄襖反 -1﹝ .IP "\fB-g \fIinitial_group\fR" -伕弘奶件凜及蕙仄中弘伙□皿抩引凶反ID﹝ -仇及弘伙□皿抩反湃卞繡箕仄化中卅仁化反卅日卅中﹝ -引凶﹜弘伙□皿砦璊炴繡及弘伙□皿毛輔寰仄化中卅仁化反卅日卅中﹝ -犯白巧伙玄及弘伙□皿砦璊1匹丐月﹝ + +蕙凶卞公及交□扒及伕弘奶件凜賡渝弘伙□皿午允月弘伙□皿抩引凶反 ID﹝ +弘伙□皿抩反湃卞繡箕仄化中卅仃木壬卅日卅中﹝ +弘伙□皿砦璊炴繡及弘伙□皿毛輔寰仄化中卅仃木壬卅日卅中﹝ +犯白巧伙玄及弘伙□皿砦璊 1﹝ .IP "\fB-G \fIgroup,[...]\fR" -交□扒互簞允﹜汏弘伙□皿及伉旦玄﹝ -弘伙□皿反戊件穴毛迕中化嗉濠曰﹜棉卞塢⑩妐儂毛ェ木化反 -卅日卅中﹝ -隙爛匹五月弘伙□皿卞反\fB-g\fR左皿扑亦件毛迕中月樺寧午 -き迋及孺蜃互丐月﹝ +交□扒互簞允月怀踞弘伙□皿 (supplementary groups) 及伉旦玄﹝ +弘伙□皿反戊件穴匹嗉濠曰﹜棉卞塢⑩妐儂毛ェ木化反卅日卅中﹝ +隙爛匹五月弘伙□皿卞反 \fB-g\fR 左皿扑亦件午き迋及孺蜃互丐月﹝ +蜇箕公及交□扒互﹜ 蕙仄中伉旦玄卞卅中弘伙□皿及丟件田□卞卅勻化中月樺寧反﹜ 公及弘伙□皿井日綽輪今木月﹝ .IP "\fB-l \fIlogin_name\fR" -交□扒及伕弘奶件抩毛\fIlogin\fR井日\fIlogin_name\fR卞庍凳允月﹝ -職反窒手庍凳仄卅中﹝ -た卞﹜蕙仄中伕弘奶件抩卞寧歹六化石□丞犯奴伊弁玄伉抩毛庍凳仄卅仁化反 -卅日卅中分欠丹﹝ +交□扒及伕弘奶件抩毛 \fIlogin\fR 井日 \fIlogin_name\fR 卞庍凳允月﹝ +職反窒手庍凳仄卅中及匹﹜ +云公日仁蕙仄中伕弘奶件抩卞寧歹六化 +石□丞犯奴伊弁玄伉及抩蟆毛庍凳允月优邰互丐月分欠丹﹝ .IP "\fB-p \fIpasswd\fR" -\fBcrypt\fR(3)及忒曰襖匹丐月剪寞祭今木凶由旦伐□玉﹝ +\fBcrypt\fR(3) 及忒曰襖匹丐月剪寞祭由旦伐□玉﹝ .IP "\fB-s \fIshell\fR" -蕙仄中伕弘奶件扑尼伙及抩蟆﹝ -仇及勂毛塢⑩卞仄凶樺寧反扑旦氾丞互犯白巧伙玄及伕弘奶件扑尼伙毛 -薊鎗允月﹝ +交□扒及蕙仄中伕弘奶件扑尼伙及抩蟆﹝ +仇及白奴□伙玉毛塢⑩卞仄凶樺寧反﹜ +扑旦氾丞互犯白巧伙玄及伕弘奶件扑尼伙毛薊鎗允月﹝ .IP "\fB-u \fIuid\fR" -交□扒及ID砦獢 -仇及砦璊狟黎褐呁仄化中化反卅日卅中﹝\fI-o\fR左皿扑亦件毛迕中凶 -端反仇及蜃曰匹反卅中﹝ -引凶﹜鯠橨秅リ吨砟々洃吨擗吨丑 -0井日99坶及襖反釐纏扑旦氾丞迕及失市它件玄及凶戶卞芺沶今木化中月﹝ -石□丞犯奴伊弁玄伉動票及﹜公及交□扒赭肣及蟈化及白央奶伙及交□扒ID反﹜ +交□扒及 ID 砦獢 +仇及襖反﹜\fB-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ +引凶鯠橨秅リ吨砟々洃吨擗吨丑 +0 井日 99 引匹及襖反﹜騷橘扑旦氾丞失市它件玄迕卞芺沶今木化中月﹝ +石□丞犯奴伊弁玄伉動票及﹜ +公及交□扒赭肣及允屯化及白央奶伙及交□扒 ID 反﹜ 憤が讀卞蕙仄中襖卞庍凳今木月﹝ -石□丞犯奴伊弁玄伉動票卞卅中白央奶伙反澎綜僅匹庍凳仄卅仁化反卅日卅中﹝ +石□丞犯奴伊弁玄伉動票卞卅中白央奶伙反澎綜僅匹庍凳仄卅仃木壬卅日卅中﹝ .IP "\fB-L\fR" 交□扒及由旦伐□玉毛伕永弁允月﹝ -仇木反剪寞祭今木凶由旦伐□玉及燮え卞 '!' 毛馨笛仄﹜ -儀撢曉由旦伐□玉毛拑躲卞允月﹝ -仇及左皿扑亦件反 \fI-p\fR 引凶反 \fI-U\fR 午き凜卞迕中月仇午反匹五卅中﹝ +仇木反剪寞祭今木凶由旦伐□玉及蟆卞 '!' 毛馨笛仄﹜ +撢撙讀卞由旦伐□玉毛拑躲卞允月﹝ +仇及左皿扑亦件毛 \fI-p\fR 支 \fI-U\fR 午き凜卞迕中月仇午反匹五卅中﹝ .IP "\fB-U\fR" 交□扒及由旦伐□玉毛失件伕永弁允月﹝ 仇木反剪寞祭今木凶由旦伐□玉及燮え及 '!' 毛潸曰輪仁﹝ -仇及左皿扑亦件反 \fI-p\fR 引凶反 \fI-L\fR 午き凜卞迕中月仇午反匹五卅中﹝ +仇及左皿扑亦件毛 \fI-p\fR 支 \fI-L\fR 午き凜卞迕中月仇午反匹五卅中﹝ .SH 煞屢 -\fBusermod\fR反蜇箕伕弘奶件仄化中月交□扒及抩蟆毛庍凳允月儀反請侳卅中﹝ -仇及戊穴件玉毛銀迕仄化交□扒及ID砦璊藡揤馱馱赮搕洁 -隙爛仄凶交□扒及皿伕本旦互域勾手撢墊今木化中卅中儀毛割ロ仄化井日 -匹卅仁化反卅日卅中﹝ -crontab白央奶伙及赭肣樊反澎綜僅匹庍凳仄卅仁化反卅日卅中﹝ -引凶﹜at斥亦皮及赭肣樊手澎綜僅匹庍凳允月优邰互丐月﹝ -NIS卞楮允月綜僅反NIS扔□田曉匹墊卅歹卅仁化反卅日卅中﹝ +\fBusermod\fR +反蜇箕伕弘奶件仄化中月交□扒及抩蟆毛庍凳匹五卅中﹝ +仇及戊穴件玉毛銀迕仄化交□扒及 ID 砦璊藡揤馱馱赮搕豸洁 +隙爛仄凶交□扒及皿伕本旦互域勾手撢墊今木化中卅中仇午毛 +儀蟆卞割ロ仄卅仃木壬卅日卅中﹝ +crontab 白央奶伙及赭肣樊反澎綜僅匹庍凳仄卅仃木壬卅日卅中﹝ +at 斥亦皮及赭肣樊反澎綜僅匹庍凳仄卅仃木壬卅日卅中﹝ +NIS 卞楮允月綜僅反 NIS 扔□田曉匹墊卅歹卅仃木壬卅日卅中﹝ .SH 白央奶伙 -/etc/passwd \- 交□扒失市它件玄及樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -/etc/shadow \- 兜蟈卅交□扒失市它件玄樹扷 +\fI/etc/shadow\fR \- 兜蟈卅交□扒失市它件玄樹扷 .br -/etc/group \- 弘伙□皿樹扷 +\fI/etc/group\fR \ - 弘伙□皿樹扷 .SH 楮洘嫩杴 .BR chfn (1), .BR chsh (1), diff --git a/man/ja/vipw.8 b/man/ja/vipw.8 index e4503374..e4e48b22 100644 --- a/man/ja/vipw.8 +++ b/man/ja/vipw.8 @@ -1,36 +1,37 @@ -.\" $Id: vipw.8,v 1.2 2002/03/09 11:16:16 ankry Exp $ -.\" +.\"$Id: vipw.8,v 1.4 2003/04/28 02:14:00 kloczek Exp $ .\" .\" Japanese Version Copyright (c) 2001 Maki KURODA .\" all right reserved, .\" Translated Tue Oct 30 11:55:56 JST 2001 -.\" by Maki KURODA -.\" +.\" by Maki KURODA +.\" Modified Sun 22 Sep 2002 by NAKANO Takeo .\" .TH VIPW 8 "26 Sep 1997" .SH 抩蟆 -vipw, vigr \- password﹜ group﹜ shadow-password﹜shadow-group 白央奶伙毛彸螂允月﹝ +vipw, vigr \- password, group 午公木冗木及 shadow 白央奶伙毛彸螂允月 .SH 踏摯 -.BR vipw " [-s]" +\fBvipw\fR [\fB-s\fR] .br -.BR vigr " [-s]" +\fBvigr\fR [\fB-s\fR] .SH 濩抸 .BR vipw " 午 " vigr -反 -.IR /etc/passwd 午 /etc/group -毛公木冗木彸螂允月﹝ +反﹜公木冗木 +\fI/etc/passwd\fR " 午 " \fI/etc/group\fR +毛彸螂允月﹝ .B -s -白仿弘互隙爛今木化中月樺寧﹜公木日及白央奶伙及 shadow 田□斥亦件匹丐月 -.IR /etc/shadow 午 /etc/gshadow +白仿弘互隙爛今木月午﹜仇木日及白央奶伙及 shadow 祭リリ═ +\fI/etc/shadow\fR 午 \fI/etc/gshadow\fR 毛公木冗木彸螂允月﹝ -皿伕弘仿丞反白央奶伙及荼庍毛侂什凶戶及贗濠卅伕永弁毛澀爛允月﹝ -銀歹木月巨犯奴正反﹜棕雁庍醒 -.BR VISUAL ﹜ +仇木日及皿伕弘仿丞反白央奶伙互莽木卅中方丹贗濠卅伕永弁毛澀爛允月﹝ + +仇木日及皿伕弘仿丞反﹜厙迕允月巨犯奴正午仄化引內 棕雁庍醒 -.BR EDITOR ﹜ -犯白巧伙玄及巨犯奴正 +.BR VISUAL , +棕雁庍醒 +.BR EDITOR , +毛賜卞魂仄﹜瘉詨卞犯白巧伙玄及巨犯奴正匹丐月 .BR vi -及賜匹丐月﹝ +毛迕中方丹午允月﹝ .SH 楮洘嫩杴 .BR group (5), .BR passwd (5), diff --git a/man/ko/Makefile.am b/man/ko/Makefile.am index acc037c2..d405cb71 100644 --- a/man/ko/Makefile.am +++ b/man/ko/Makefile.am @@ -4,9 +4,7 @@ mandir = @mandir@/ko man_MANS = \ chfn.1 \ chsh.1 \ + groups.1 \ login.1 \ newgrp.1 \ passwd.5 - -EXTRA_DIST = $(man_MANS) \ - groups.1 diff --git a/man/ko/Makefile.in b/man/ko/Makefile.in index f9b2692b..8b3b5a5f 100644 --- a/man/ko/Makefile.in +++ b/man/ko/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,113 +14,155 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ mandir = @mandir@/ko +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ man_MANS = \ chfn.1 \ chsh.1 \ + groups.1 \ login.1 \ newgrp.1 \ passwd.5 - -EXTRA_DIST = $(man_MANS) \ - groups.1 - subdir = man/ko +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -127,10 +170,15 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/ko/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -140,13 +188,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/ko/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: man1dir = $(mandir)/man1 @@ -164,6 +205,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -181,6 +226,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -203,6 +252,10 @@ install-man5: $(man5_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -220,6 +273,10 @@ uninstall-man5: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -229,6 +286,8 @@ uninstall-man5: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -236,15 +295,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -257,7 +327,6 @@ all-am: Makefile $(MANS) installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -269,6 +338,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -276,7 +346,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -286,7 +356,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -308,13 +378,21 @@ install-man: install-man1 install-man5 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 uninstall-man5 @@ -326,8 +404,9 @@ uninstall-man: uninstall-man1 uninstall-man5 install-info-am install-man install-man1 install-man5 \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool uninstall uninstall-am \ - uninstall-info-am uninstall-man uninstall-man1 uninstall-man5 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man5 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/ko/groups.1 b/man/ko/groups.1 deleted file mode 100644 index 10901a39..00000000 --- a/man/ko/groups.1 +++ /dev/null @@ -1,31 +0,0 @@ -.TH GROUPS 1L "GNU 蔗 嶸せ葬じ" "FSF" \" -*- nroff -*- -.SH 檜葷 -groups \- 餌辨濠陛 樓и 斜瑜菟擊 轎溘и棻 -.SH 偃蹂 -.B groups -[餌辨濠貲...] -.br -.B groups -{\-\-help,\-\-version} -.SH 撲貲 -檜 裔む檜雖朝 GNU 幗瞪曖 -.BR groups -蒂 棻琿棻. -.B groups -朝 輿橫霞 陝 -.IR username -傳朝 Щ煎撮蝶 -陛 樓и 蹺陛 斜瑜曖 檜葷擊 轎溘п遽棻. -虜擒 餌辨濠貲檜 輿橫螺棻賊 陝 餌辨濠貲檜 模樓脹 斜瑜 跡煙 擅縑 ル衛脹棻. -.PP -斜瑜 跡煙擎 `id \-Gn'曖 唸婁諦 偽棻. -.SS 褫暮 -GNU -.B groups -陛 欽 и 偃曖 檣熱蒂 陛雖堅 褒ч腎賊 棻擠 褫暮菟擊 檣衝и棻: -.TP -.I "\-\-help" -ル遽轎溘戲煎 餌辨徹擊 轎溘ж堅 薑鼻瞳戲煎 謙猿и棻. -.TP -.I "\-\-version" -ル遽轎溘戲煎 幗瞪薑爾蒂 轎溘ж堅 薑鼻瞳戲煎 謙猿и棻. diff --git a/man/ko/login.1 b/man/ko/login.1 deleted file mode 100644 index e228581b..00000000 --- a/man/ko/login.1 +++ /dev/null @@ -1,301 +0,0 @@ -.\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu) -.\" May be distributed under the GNU General Public License -.TH LOGIN 1 "1 February 1993" "Linux 0.99" "Linux Programmer's Manual" -.SH 檜葷 -login \- 衛蝶蠱 蕾樓 -.SH 餌辨徹 -.BR "login [ " 檜葷 " ]" -.br -.B "login \-p" -.br -.BR "login \-h " ˊ瘋挫抶 -.br -.BR "login \-f " 檜葷 -.SH 撲貲 -.B login -ヴ斜葡擎 и 衛蝶蠱縑 蕾樓籀葬蒂 ж朝 ヴ斜葡檜棻. -傳и ⑷營 蕾樓 醞縑憮紫 и 餌辨濠縑憮 棻艇 餌辨濠煎 夥紱堅濠 й 陽紫 -餌辨腆 熱 氈棻. (иら, 渠睡碟曖 蹂闈 虜菟橫霞 蔗擎 斜 蔗 頂睡瞳戲煎 -檜楝и 晦棟擊 薯奢ж堅 氈晦紫 ж棻.) - -嬴鼠 褫暮 橈檜 餌辨ж賊, -餌辨濠 啗薑擊 僭橫爾朝 Щ煉Щお陛 釭顫陪棻. - -檜陽 殮溘腎朝 啗薑檜 root陛 嬴棲堅, -.I /etc/nologin -だ橾檜 氈戲賊 斜 だ橾寰縑 頂辨檜 爾罹雖堅 -檜 ヴ斜葡擎 謙猿脹棻. 檜匙擎 衛蝶蠱 匐餌釭 晦顫 餌薑鼻 橾奩 餌辨濠 -蕾樓擊 ж雖 跤ж紫煙 й陽 餌辨脹棻. - -.IR /etc/usertty -だ橾縑憮 か薑 餌辨濠曖 煎斜檣 ъ辨婁 剪睡陛 雖薑腎橫 氈擊 陽, -虜橾 斜 餌辨濠陛 蕾樓ж堅濠 й 陽朝 斜縑 評艇 蕾樓籀葬蒂 и棻. -檜陽, 蕾樓剪睡腎賊 煎斜檣擎 部釭堅 -.B syslog -貲滄檜 濛翕腎橫 斜 鼻窕 晦煙и棻. -濠撮и 檜撿晦朝 嬴楚 "か滌 蕾斬 剪睡" 睡碟縑憮 棻琿棻. - - -.IR /etc/securetty -だ橾縑憮朝 root煎 蕾樓й 熱 氈朝 攪嘐陳菟檜 釭翮腎橫 氈棻. -檜陽 蕾樓 褒ぬ陛 橾橫釭賊 -.B syslog -貲滄檜 濛翕腎橫 斜 鼻窕 晦煙и棻. - -餌辨濠 啗薑曖 挫 瞰離陛 部釭賊, 綠塵廓ㄧ 僭橫爾朝 Щ煉Щお陛 -釭顫陪棻. (斜 餌辨濠曖 啗薑縑憮 綠塵廓ㄟ в蹂ж賊 釭顫陪棻.) -檜陽, 10廓翕寰 綠塵廓ㄧ ぎ葬啪 殮溘ж賊 login擎 謙猿脹棻. -斜楛等, 籀擠 撮廓擎 夥煎 棻衛 僭橫爾雖虜, 棻擠睡攪朝 衙辦 替葬啪 -奩犒脹棻. (煎斜檣 婁薑檜) -僭煩 檜 婁薑菟紫 -.B syslog -貲滄縑 曖п 斜 鼻窕 晦煙脹棻. - -.I .hushlogin -だ橾 $HOME 唳煎寰縑 氈戲賊, 億煎 紫雜и ら雖陛 氈擊 陽 爾罹輿朝 -詭衛雖諦 葆雖虞 煎斜檣и 衛除擊 憲葬朝 詭衛雖蒂 爾罹輿雖 彊朝棻. -檜 だ橾檜 橈堅, -.I /var/log/lastlog -だ橾檜 氈戲賊, 斜 だ橾縑憮 葆雖虞 煎斜檣 衛除擊 檗橫 爾罹輿堅, -斜 だ橾縑, ⑷營 煎斜檣擊 晦煙и棻. - -煎斜檣 啗薑, 綠塵廓 挫恞黃痚 部釭賊, -棻擠擎 攪嘐陳曖 UID, GID 撲薑偽擎 婦葬濛機菟擊 鼠濛嬪煎 -熱чи棻. TERM 秣皞紡鰤 餌辨腎堅 氈戲賊, 檜 秣皞紡鷏 雖薑ж堅, -( -.B \-p -褫暮檜 餌辨腎賊 棻艇 秣皞紡鰤 雖薑脹棻) -HOME, PATH, SHELL, TERM, MAIL, LOGNAME 秣皞紡鷁橉 雖薑и棻. -橾奩 餌辨濠塭賊 唳煎蒂 蟾晦高戲煎 嬴楚諦 偽檜 雖薑ж堅, -.br -.I /usr/local/bin:/bin:/usr/bin:. -root塭賊 蟾晦高戲煎 嬴楚諦 偽檜 雖薑и棻. -.br -.I /sbin:/bin:/usr/sbin:/usr/bin -.br -葆雖虞戲煎 "褻辨и" 煎斜檣檜 嬴棲塭賊, 斜陳曖 詭衛雖蒂 轎溘ж堅, -.I /usr/spool/mail -唳煎寰縑 斜 餌辨濠 檜葷戲煎 脹 だ橾曖 觼晦陛 0檜 嬴棋雖 挫恉媦 -0檜 嬴棲賊, ら雖陛 氈棻堅 憲溥遽棻. - -棻擠 餌辨濠 蔗擊 雖薑ж朝等, -.BR /etc/passwd -だ橾縑憮 斜 餌辨濠曖 蔗檜 雖薑腎橫 氈雖 彊戲賊, -.B /bin/sh -蔗擊 餌辨и棻. -傳и, -.IR /etc/passwd -だ橾縑憮 唳煎陛 雖薑腎橫 氈雖 彊戲貊, -.I / -唳煎煎 煎斜檣脹棻.( 唳煎朝 嬪縑憮 撲貲и -.I .hushlogin -だ橾檜 氈朝雖 挫恉 陽 匐餌脹棻.) -.SH 褫暮 -.TP -.B \-p -.B login -褒чй 陽 檜瞪 秣瘚橉 斜渠煎 餌辨ж紫煙 -.BR getty (8) -貲滄縑 曖п 餌辨脹棻. -.TP -.B \-f -舒廓簞 煎斜檣橾 唳辦縑朝 斜 檣隸(啗薑挫怹離)擊 鱔婁и棻. -root 啗薑橾 唳辦縑朝 濛翕腎雖 彊戲貊, 葬揪蝶縑憮朝 夥腦啪 -濛翕腎雖 彊擊 熱紫 氈棻. -.TP -.B \-h -葬賅お ˊ瘋 煎斜檣衛(陛滄, telnetd(8) 餌辨) 啗薑 殮溘擊 鱔婁и棻. -僭煩 utmp, wtmp 晦煙擎 氈棻. 檜 褫暮擎 欽雖 root虜檜 餌辨й 熱 氈棻. - -.SH "か滌 蕾斬 剪睡" -.I /etc/securetty -だ橾縑朝 root陛 蕾樓 й 熱 攪嘐陳檜 釭翮腎橫 氈棻. -檜 攪嘐陳 檜葷擎 /dev/ 旋濠蒂 儅楞и 攪嘐陳 檜葷虜檜棻. -檜 だ橾檜 橈棻賊 root朝 賅萇 攪嘐陳縑憮 蕾樓檜 陛棟ж棻. -.PP -.I /etc/usertty -だ橾縑朝 か薑 餌辨濠曖 蕾樓縑 渠и か滌и 撲薑 頂辨檜 氈棻. -檜 だ橾檜 橈棻賊, 橫集и か薑 餌辨濠曖 蕾樓 剪睡偽擎 橈棻. -檜 だ橾曖 撮睡碟戲煎 掘撩腎橫 氈朝等, 陝陝 斜 睡碟菟曖 檜葷擎 -CLASSES, GROUPS, USERS 檜棻. CLASSES 睡碟縑憮朝 攪嘐陳曖 贗楚蝶諦 -ˊ瘋挫抶 ぬ欐檜 薑曖腎堅, GROUPS 睡碟縑憮朝 斜瑜 欽嬪曖 ъ塊腎朝 -攪嘐陳婁 ˊ瘋扇 薑曖腎堅, USERS 睡碟縑憮朝 餌辨濠 欽嬪曖 ъ塊腎朝 -攪嘐陳婁 ˊ瘋扇 薑曖脹棻. -.PP -檜 だ橾曖 陝 還擎 255 僥濠蒂 剩擊 熱 橈戲貊, -# 僥濠煎 衛濛ж朝 斜 還 瞪羹朝 輿戮戲煎 籀葬脹棻. -.PP -.SS "CLASSES 播暮" -CLASSES 播暮擎 渠僥濠煎 羅蘊睡攪 CLASSES塭堅 噪戲煎 薑曖脹棻. -檜 睡碟擎 棻擠 播暮檜 薑曖腎晦 瞪梱雖 賅萇 睡碟檜 んл脹棻. -陝 欽橫曖 掘碟擎 奢寥僥濠釭 龔僥濠煎 и棻. -陝 還縑朝 攪嘐陳婁 ˊ瘋 ぬ欐曖 贗楚蝶陛 薑曖脹棻. -.PP -陝 還曖 籀擠擎 婦葬濠陛 薑曖ж朝 贗楚蝶 檜葷檜 螃堅, -斜 棻擠縑朝 斜 贗楚蝶縑憮 餌辨ж朝 攪嘐陳婁 ˊ瘋 ぬ欐檜 螞棻. -檜 贗楚蝶 檜葷擎 棻擠縑 螃朝 GROUPS, USERS 播暮縑憮 餌辨腆 熱 氈棻. -.PP -CLASSES 播暮 蕨薯: -.PP -.nf -.in +.5 -CLASSES -myclass1 tty1 tty2 -myclass2 tty3 @.foo.com -.in -.5 -.fi -.PP -嶺 蕨薯朝 -.I myclass1 -婁 -.I myclass2 -贗楚蝶蒂 螃艇薹 睡碟婁 偽檜 薑曖и 匙檜棻. -.PP -.SS "GROUPS 播暮" -GROUPS 播暮縑憮朝 嶸棣蝶 斜瑜 欽嬪曖 ъ塊腎朝 攪嘐陳婁 ˊ瘋扇 薑曖脹棻. -蕾樓ж朝 餌辨濠曖 斜瑜檜(檜匙擎 -.I /etc/passwd -だ橾婁 -.I /etc/group -だ橾縑憮 挫庰)檜 -.I /etc/usertty -だ橾曖 GROUPS 播暮 睡碟縑憮 薑曖脹 斜瑜檜塭賊, 斜縑 п渡腎朝 -攪嘐陳婁 ˊ瘋挪☆ 蕾樓檜 陛棟п 霞棻. -.PP -GROUPS 播暮擎 羅蘊縑 渠僥濠煎 GROUPS 檜塭堅 噪戲煎 薑曖陛 衛濛腎堅, -棻擠播暮曖 薑曖陛 釭顫釭晦 瞪梱雖 檜 播暮戲煎 陛薑и棻. -陝 欽橫曖 掘碟擎 奢寥僥濠釭 龔僥濠煎 ж貊, -陝 還曖 籀擠縑朝 斜瑜檜 螃堅 棻擠縑朝 斜 斜瑜縑憮 蕾斬й 熱 氈朝 -攪嘐陳婁 ˊ瘋扇 螞棻. 傳и ъ塊腎朝 攪嘐陳婁 ˊ瘋 睡碟縑憮 -擅 CLASSES 播暮縑憮 薑曖и 贗楚蝶 檜葷檜 餌辨腆 熱紫 氈棻. -.PP -GROUPS 播暮曖 蕨薯: -.PP -.nf -.in +0.5 -GROUPS -sys tty1 @.bar.edu -stud myclass1 tty4 -.in -0.5 -.fi -.PP -嶺 蕨薯朝 -.I sys -斜瑜曖 餌辨濠朝 bar.edu 紫詭檣擊 陛霞 ˊ瘋挪□, tty1煎虜 -蕾樓檜 陛棟ж棻. -.I stud -斜瑜曖 餌辨濠朝 myclass1 贗楚蝶 傳朝 tty4煎虜 蕾樓檜 陛棟ж棻. -.PP - -.SS "USERS 播暮" -USERS 播暮擎 羅蘊縑 USERS 塭堅 渠僥濠煎 噪戲煎 薑曖脹棻. -陝 欽橫曖 掘碟擎 奢寥僥濠諦 龔僥濠煎 ж貊, -羅蘊縑朝 餌辨濠 啗薑, 棻擠縑朝 斜 啗薑 餌辨濠陛 蕾樓 й 熱 氈朝 -攪嘐陳婁 斜 餌辨濠陛 蕾樓 衛紫ж朝 ˊ瘋扇 薑曖脹棻. -僭煩 攪嘐陳婁 ˊ瘋 薑曖睡碟縑憮 擅 CLASSES 播暮縑憮 薑曖и 贗楚蝶陛 -餌辨腆 熱紫 氈棻. -.PP -USERS 播暮 蕨薯: -.PP -.nf -.in +0.5 -USERS -zacho tty1 @130.225.16.0/255.255.255.0 -blue tty3 myclass2 -.in -0.5 -.fi -.PP -嶺 蕨薯朝 zacho 啗薑 餌辨濠朝 IP 輿模陛 130.225.16.0 睡攪 130.225.16.255 -彰嬪 寰曖 ˊ瘋挪□ 檜 闡曖 tty1煎 蕾樓 ж堅濠 й 陽虜 蕾樓擊 й 熱 氈棻. -blue 啗薑 餌辨濠朝 myclass2縑憮 薑曖脹 秣瘞 tty3戲煎虜 蕾樓й 熱 氈棻. -.PP -USERS 播暮寰縑憮 餌辨濠 啗薑 睡碟縑 * 僥濠陛 螢 熱紫 氈棻. -檜匙擎 蟾晦高 雖薑檜貊, 賅萇 餌辨濠縑啪 瞳辨脹棻. -.PP -蕾樓ж堅濠 ж朝 餌辨濠曖 啗薑婁 斜瑜檜 USERS, GROUPS 播暮 舒 睡碟縑憮 賅舒 -瞳辨腎賊 陝 播暮縑憮 薑曖脹 賅萇 攪嘐陳/ˊ瘋扇 瞳辨脹棻. - -.SS Origins -攪嘐陳婁 ˊ瘋 薑曖 睡碟縑朝 贗楚蝶, origin檜塭堅 睡腦朝 -橾捱曖 僥濠翮檜 餌辨脹棻. 檜 origin 僥濠翮擎 棻擠婁 偽擎 ⑽衝擊 鏃и棻. -.IP o -攪嘐陳曖 檜葷縑朝 /dev/ 睡碟檜 緒霞棻. 闊, tty1, ttyS0 ⑽衝戲煎 餌辨脹棻. -.PP -.IP o -@localhost 僥濠翮擎 煎蠔 ˊ瘋挪□ telnet/rlogin戲煎 蕾樓ж朝 餌辨濠蒂 -曖嘐и棻. 闊 `xterm -e /bin/login' 貲滄偽擎 匙檜 褒ч脹棻朝 匙擊 曖嘐и棻. -.PP -.IP o -@.some.dom 僥濠翮擎 葬賅お ˊ瘋 蕾樓衛 斜 餌辨濠陛 rlogin/telnet戲煎 -紫詭檣檜 .some.dom煎 部釭朝 ˊ瘋挪□飛 蕾樓й 熱 氈棻朝 匙擊 曖嘐и棻. -.PP -.IP o -IP 輿模曖 艙羲擎 @x.x.x.x/y.y.y.y 檜楛 衝戲煎 薑曖ж朝等, -檜匙擎 x.x.x.x 縑憮 y.y.y.y 彰嬪曖 IP 輿模蒂 陛霞 ˊ瘋挪□飛 -蕾樓檜 陛棟ж棻. 蕨蒂 菟橫, @130.225.16.0/255.255.254.0 -戲煎 薑曖ж賊, IP曖 彰嬪陛 130.225.16.0 \- 130.225.17.255檣 -ˊ瘋挪□飛 蕾樓檜 陛棟ж棻. -.PP -晦顫 origin 縑憮 餌辨腎朝 僥濠翮煎 衛除擊 薑й熱 氈朝等, -斜 ⑽衝擎 棻擠婁 偽棻. -.PP -.nf -timespec ::= '[' [':' ]* ']' -day ::= 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun' -hour ::= '0' | '1' | ... | '23' -hourspec ::= | '\-' -day-or-hour ::= | -.fi -.PP -蕨蒂 菟橫, [mon:tue:wed:thu:fri:8\-17]tty3 僥濠翮擎 -錯蹂橾睡攪 旎蹂橾梱雖, 螃瞪 8衛 00碟睡攪 螃 5衛 59碟梱雖虜 -tty3戲煎 蕾樓й 熱 氈擠擊 曖嘐и棻. 衛除 雖薑縑憮朝 欽雖, -a\-b 衝戲煎 薑曖腎賊 a衛 00碟 睡攪 b衛 59碟梱雖蒂 曖嘐ж貊, -欽雖 欽橾 璋濠虜 氈戲賊(陛滄 10) 斜 衛除虜(10衛 00碟睡攪 10衛 59碟梱雖)擊 -曖嘐и棻. -.PP -衛除睡碟曖 撲薑檜 雖薑腎雖 彊戲賊 橫集и 衛除縑紫 蕾樓檜 陛棟ж棻. -陝 蹂橾滌煎 斜 衛除擊 評煎 薑ж堅 談戲賊 陝 蹂橾 薑曖棻擠縑 衛除擊 -陝陝 評煎 薑曖 й 熱紫 氈棻. -衛除雖薑縑憮朝 奢寥僥濠蒂 餌辨й 熱 橈棻. -.PP -虜擒 -.I /etc/usertty -だ橾縑憮 陝 薑曖菟檜 夥腦雖 跤ж啪 薑曖脹棻賊, -賅萇 餌辨濠曖 か滌 蕾樓 剪睡 偽擎 匙擎 橈棻. -.PP -.SH "婦溼 だ橾" -.nf -.I /var/run/utmp -.I /var/log/wtmp -.I /var/log/lastlog -.I /usr/spool/mail/* -.I /etc/motd -.I /etc/passwd -.I /etc/nologin -.I /etc/usertty -.I .hushlogin -.fi -.SH "婦溼 о跡" -.BR init (8), -.BR getty (8), -.BR mail (1), -.BR passwd (1), -.BR passwd (5), -.BR environ (7), -.BR shutdown (8) -.SH 弊溯 -葬揪蝶縑憮朝 棻艇 蕪陳 遴艙羹薯諦 殖葬 и 餌辨濠曖 醞犒 煎斜檣擊 -薯иж雖 彊朝棻. - -撲貲腎雖 彊擎 BSD曖 -.B \-r -褫暮擎 雖錳腎雖 彊朝棻. -檜 褫暮擎 -橫集и -.BR rlogind (8) -ヴ斜葡縑憮 в蹂й 雖紫 賅艇棻. -.SH 虜萇檜 -Derived from BSD login 5.40 (5/9/89) by Michael Glad (glad@daimi.dk) for HP-UX -.br -Ported to Linux 0.12: Peter Orbaek (poe@daimi.aau.dk) diff --git a/man/ko/newgrp.1 b/man/ko/newgrp.1 deleted file mode 100644 index e2bbe987..00000000 --- a/man/ko/newgrp.1 +++ /dev/null @@ -1,29 +0,0 @@ -.\" Original author unknown. This man page is in the public domain. -.\" Modified Sat Oct 9 17:46:48 1993 by faith@cs.unc.edu -.TH NEWGRP 1 "9 October 1993" "Linux 1.2" "Linux Programmer's Manual" -.SH NAME -newgrp \- 濠褐檜 模樓脹 斜瑜擊 億 斜瑜戲煎 夥羞棻. -.SH SYNOPSIS -.BI "newgrp [ " group " ]" -.SH DESCRIPTION -.B Newgrp -貲滄擎 -changes the group identification of its caller, analogously to -.BR login (1). -貲滄戲煎 煎斜檣 й 陽 衝滌腎朝 斜瑜擊 夥羞棻. -\fIgroup\fR戲煎 餌辨腆 熱 氈朝 高擎 /etc/group だ橾寰縑 -氈朝 斜瑜曖 檜葷檜釭, GID 高檜罹撿 ж貊, -貲滄ч 檣濠縑憮 檜 高擊 か滌 雖薑ж雖 彊戲賊, ⑷營 濠褐曖 -斜瑜戲煎 夥羞棻. -.LP -.SH FILES -.I /etc/group -.br -.I /etc/passwd - -.SH "SEE ALSO" -.BR login "(1), " group (5) - -.SH AUTHOR -Originally by Michael Haardt. Currently maintained by -Peter Orbaek (poe@daimi.aau.dk). diff --git a/man/ko/passwd.5 b/man/ko/passwd.5 deleted file mode 100644 index ec8e2995..00000000 --- a/man/ko/passwd.5 +++ /dev/null @@ -1,120 +0,0 @@ -.\" Copyright (c) 1993 Michael Haardt (michael@moria.de), Fri Apr 2 11:32:09 MET DST 1993 -.\" -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, -.\" USA. -.\" -.\" Modified Sun Jul 25 10:46:28 1993 by Rik Faith (faith@cs.unc.edu) -.\" Modified Sun Aug 21 18:12:27 1994 by Rik Faith (faith@cs.unc.edu) -.\" Modified Sun Jun 18 01:53:57 1995 by Andries Brouwer (aeb@cwi.nl) -.\" Modified Mon Jan 5 20:24:40 MET 1998 by Michael Haardt -.\" (michael@cantor.informatik.rwth-aachen.de) -.\" -.\" и措橫 廓羲 : ASPLINUX 2000喇 7錯 29橾 -.\" -.TH PASSWD 5 "January 5, 1998" "" "File formats" -.SH 檜葷 -passwd \- ぬ蝶錶萄 だ橾 -.SH 撲貲 -.B Passwd -朝 臢蝶お だ橾煎憮, 衛蝶蠱 啗薑曖 跡煙擊 んлж堅 氈堅, 餌辨濠 ID, 斜瑜 -ID, 蛤滓饜葬, 蔗 蛔曖 陝 啗薑縑 渠и 衙辦 嶸辨и 薑爾蒂 薯奢и棻. -謙謙, 陝 啗薑縑 渠и 懍音 ぬ蝶錶萄蒂 んли棻. -Passwd朝 橾奩瞳檣 檗晦 掏и擊 陛螳撿 ж雖虜, 熱ぷ 嶸盪縑啪虜 噙晦 蕾斬檜 -陛棟ж棻. -.PP -蕨瞪縑朝 橾奩瞳檣 檗晦 掏и戲煎檣и 僥薯菟檜 橈歷棻. 賅萇 餌塋菟檜 -懍音 ぬ蝶錶萄蒂 檗擊 熱 氈歷雖虜, ぬ蝶錶萄蒂 觼楷ж晦縑朝 ж萄錚橫陛 -傘鼠釭 替溜堅, 渦辦晦, 晦獄瞳檣 陛薑擎 斜菟擎 嬴輿 耀熨и 餌辨濠 -奢翕羹曖 ぬ蝶錶萄菟檜歷棻. - -螃棺陳 號擎 餌塋菟檜 膠紫辦 ぬ蝶錶萄曖 橾睡 幗瞪擊 褒чи棻. - .I /etc/passwd朝 懍音 ぬ蝶錶萄 渠褐 *煎 脹 -ぬ蝶錶萄蒂 雖棲堅, 懍音 ぬ蝶錶萄菟擎 熱ぷ嶸盪虜檜 檗擊 熱 氈朝 -.I /etc/shadow縑 盪濰脹棻. -.PP -膠紫辦 ぬ蝶辦萄陛 餌辨腎朝雖縑 鼻婦橈檜, 號擎 衛蝶蠱 婦葬濠菟擎 餌辨濠陛 -濠晦 濠褐擊 ぬ蝶錶萄蒂 餌辨ж罹 檣隸й 熱 橈紫煙 ぬ蝶錶萄 в萄頂縑 -滌ル蒂 餌辨и棻. - -.PP -虜橾 億煎遴 煎斜檣擊 虜菟賊, 辦摹 ぬ蝶錶萄 в萄縑 滌ル蒂 場堅, 檜蒂 -撲薑ж晦 嬪п .BR passwd (1)擊 餌辨и棻. -PP -陝 ч葆棻 ж釭曖 о跡檜 氈堅, 陝 ч擎 棻擠曖 ⑽衝擊 雖棋棻. -.sp -.RS -啗薑:ぬ蝶錶萄:UID:GID:GECOS:蛤滓饜葬:蔗 -.RE -.sp -陝 в萄縑 渠и 撲貲擎 棻擠婁 偽棻. -.sp -.RS -.TP 1.0in -.I 啗薑 -衛蝶蠱縑憮曖 餌辨濠 檜葷. 渠僥濠蒂 餌辨п憮朝 寰脹棻. -.TP -.I ぬ蝶錶萄 -懍音 餌辨濠曖 ぬ蝶錶萄 分 滌ル -.TP -.I UID -璋濠煎 ル⑷腎朝 餌辨濠 id -.TP -.I GID -檜 餌辨濠縑 渠и 輿 斜瑜 ID, 璋濠煎 ル⑷脾 -.TP -.I GECOS -檜 в萄朝 摹鷗瞳檜堅, 螃霜 薑爾瞳檣 跡瞳戲煎虜 餌辨脹棻. 爾鱔, 檜朝 -餌辨濠曖 瞪羹 檜葷擊 んли棻. GECOS朝 橾奩 瞪濠 鱔м 遴艙羹薯煎憮, -GE曖 剪渠 衛蝶蠱檜 Honeywell縑 っ衙脹 GCOS,煎 棻衛 貲貲腎歷棻. Dennis -Ritchie朝 蜓ж晦蒂, 陽陽煎 辦葬朝 Щ萼攪 轎溘 分 橾婪 籀葬 濛機菟擊 -GCOS 該褐戲煎 瞪歎ж艘棻. ぬ蝶錶萄 だ橾縑憮 GCOS в萄朝 $IDENTcard縑 渠и -薑爾蒂 獗啖舒朝 濰模檜棻. -.TP -.I directory -餌辨濠曖 $HOME 蛤滓饜葬 -.TP -.I shell(蔗) -煎斜檣衛 褒чж朝 Щ煎斜極(虜橾 綠歷棻賊, .BR /bin/sh擊 餌辨и棻.) -虜橾 襄營ж雖 彊朝 褒чだ橾煎 撲薑腎歷棻賊, 餌辨濠朝 .BR login (1)擊 鱔п -煎斜檣 й 熱 橈擊 匙檜棻. - -.RE -.SH 輿曖 -罹楝碟檜 餌辨濠 斜瑜擊 虜菟堅 談棻賊, GID朝 檜諦 翕橾ж罹撿 ж貊, -\fI/etc/group\fP頂縑 о跡菟檜 氈剪釭, 斜瑜檜 襄營ж雖 彊嬴撿 и棻. -.PP -懍音 ぬ蝶錶萄陛 滌ル煎 撲薑脹 唳辦, 餌辨濠朝 .BR login (1)煎 煎斜橾 й 熱 橈雖虜, -.BR rlogin (1)擊 餌辨ж罹 煎斜檣й 熱 氈擊 熱紫 氈棻. 襄營ж朝 Щ煎撮蝶菟擊 褒чж堅, -.BR rsh (1) -分 -.BR cron (1) -分 -.BR at (1) -擊 蟾晦亳藷偽鑒, 詭橾 в攪蒂 衛濛и棻. -欽牖 蔗 в萄蒂 滲唳衛麵憮 啗薑擊 濡斜朝 匙擎 僅偽擎 唸婁蒂 陛螳螃堅, -.BR su (1)曖 餌辨擊 ъ辨и棻.. -.SH だ橾 -.I /etc/passwd -.SH 婦溼 о跡 -.BR passwd (1), -.BR login (1), -.BR su (1), -.BR group (5), -.BR shadow (5) diff --git a/man/lastlog.8 b/man/lastlog.8 index 727e6049..ee612a4e 100644 --- a/man/lastlog.8 +++ b/man/lastlog.8 @@ -1,4 +1,4 @@ -.\"$Id: lastlog.8,v 1.10 2001/01/27 02:55:52 kloczek Exp $ +.\"$Id: lastlog.8,v 1.14 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1992, Phillip Street and Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,14 +31,14 @@ lastlog \- examine lastlog file .SH SYNOPSIS .TP 8 -\fBlastlog\fR [<\fB-u\fR|\fB--user\fR> \fIlogin-name\fR] -[<\fB-t\fR|\fB--time\fR> \fIdays\fR] [<\fB-h\fR|\fB--help\fR>] +\fBlastlog\fR [(\fB-u\fR|\fB--user\fR) \fIlogin\fR] +[(\fB-t\fR|\fB--time\fR) \fIdays\fR] [(\fB-h\fR|\fB--help\fR) ] .SH DESCRIPTION .PP \fBlastlog\fR formats and prints the contents of the last login log \fI/var/log/lastlog\fR file . The \fBlogin-name\fR, \fBport\fR, and \fBlast login time\fR will be printed. The default (no flags) causes lastlog entries -to be printed, sorted by the numerical UID. +to be printed, sorted by their order in \fB/etc/passwd\fR. .TP \fB-u\fR, \fB--user\fR \fIlogin-name\fR will cause the lastlog record for \fIlogin-name\fR only to be printed @@ -54,7 +54,7 @@ The \fB-t\fR flag overrides the use of \fB-u\fR. If the user has never logged in the message \fB"**Never logged in**"\fR will be displayed instead of the port and time. .SH FILES -/var/log/lastlog \- lastlog logging file +\fI/var/log/lastlog\fR \ - lastlog logging file .SH CAVEATS Large gaps in uid numbers will cause the lastlog program to run longer with no output to the screen (i.e. if mmdf=800 and last uid=170, program will diff --git a/man/limits.5 b/man/limits.5 index fe6afb86..596d8fa4 100644 --- a/man/limits.5 +++ b/man/limits.5 @@ -1,13 +1,11 @@ -.\"$Id: limits.5,v 1.5 2001/01/25 10:43:50 kloczek Exp $ +.\"$Id: limits.5,v 1.7 2003/05/01 18:17:39 kloczek Exp $ .TH LIMITS 5 .SH NAME limits \- Resource limits definition .SH DESCRIPTION -The -.I limits -file (/etc/limits by default or LIMITS_FILE defined config.h) -describes the resource limits you wish to impose. -It should be owned by root and readable by root account only. +The \fIlimits\fR file (/etc/limits by default or LIMITS_FILE defined +config.h) describes the resource limits you wish to impose. It should be +owned by root and readable by root account only. .PP By default no quotas are imposed on 'root'. In fact, there is no way to impose limits via this procedure to root-equiv accounts (accounts with UID 0). @@ -54,21 +52,22 @@ username L2D2048N5 .br username L2 D2048 N5 .PP -Be aware that after \fIusername\fP the rest of the line is considered a limit -string, thus comments are not allowed. A invalid limits string will be +Be aware that after \fIusername\fP the rest of the line is considered a +limit string, thus comments are not allowed. A invalid limits string will be rejected (not considered) by the login program. .PP -The default entry is denoted by username "\fB*\fP". If you have multiple \fIdefault\fP -entries in your \fBLIMITS_FILE\fP, then the last one will be used as the default -entry. +The default entry is denoted by username "\fB*\fP". If you have multiple +\fIdefault\fP entries in your \fBLIMITS_FILE\fP, then the last one will be +used as the default entry. .PP To completely disable limits for a user, a single dash "\fB-\fP" will do. .PP -Also, please note that all limit settings are set PER LOGIN. They are -not global, nor are they permanent. Perhaps global limits will come, but -for now this will have to do ;) +Also, please note that all limit settings are set PER LOGIN. They are not +global, nor are they permanent. Perhaps global limits will come, but for +now this will have to do ;) + .SH FILES -/etc/limits +\fI/etc/limits\fR .SH SEE ALSO .BR login (1), .BR setpriority (2), diff --git a/man/login.1 b/man/login.1 index b63a7e67..b8958681 100644 --- a/man/login.1 +++ b/man/login.1 @@ -1,4 +1,4 @@ -.\"$Id: login.1,v 1.11 2002/03/09 19:22:30 ankry Exp $ +.\"$Id: login.1,v 1.16 2003/06/19 18:17:05 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -35,48 +35,39 @@ login \- begin session on the system .br \fBlogin\fR [\fB-p\fR] \fB-r \fIhost\fR .SH DESCRIPTION -.B login -is used to establish a new session with the system. -It is normally invoked automatically by responding to the -.I login: -prompt on the user\'s terminal. -.B login -may be special to the shell and may not be invoked as a sub-process. -Typically, -.B login -is treated by the shell as \fBexec login\fR which causes the user -to exit from the current shell. -Attempting to execute \fBlogin\fR from any shell but the login shell -will produce an error message. +\fBlogin\fR is used to establish a new session with the system. It is +normally invoked automatically by responding to the \fIlogin:\fR prompt on +the user\'s terminal. fBlogin\fR may be special to the shell and may not be +invoked as a sub-process. Typically, \fBlogin\fR is treated by the shell as +\fBexec login\fR which causes the user to exit from the current shell. +Attempting to execute \fBlogin\fR from any shell but the login shell will +produce an error message. .PP -When invoked from the \fIlogin:\fR prompt, the user may enter -environmental variables after the username. -These variables are entered in the form \fBNAME=VALUE\fR. -Not all variables may be set in the fashion, notably \fBPATH\fR, -\fBHOME\fR and \fBSHELL\fR. -Additionally, \fBIFS\fR may be inhibited if the user\'s login -shell is \fB/bin/sh\fR. + +When invoked from the \fIlogin:\fR prompt, the user may enter environmental +variables after the username. These variables are entered in the form +\fBNAME=VALUE\fR. Not all variables may be set in the fashion, notably +\fBPATH\fR, \fBHOME\fR and \fBSHELL\fR. Additionally, \fBIFS\fR may be +inhibited if the user\'s login shell is \fB/bin/sh\fR. .PP -The user is then prompted for a password, where appropriate. -Echoing is disabled to prevent revealing the password. -Only a small number of password failures are permitted before -\fBlogin\fR exits and the communications link is severed. +The user is then prompted for a password, where appropriate. Echoing is +disabled to prevent revealing the password. Only a small number of password +failures are permitted before \fBlogin\fR exits and the communications link +is severed. .PP -If password aging has been enabled for your account, you may be -prompted for a new password before proceeding. -You will be forced to provide your old password and the new -password before continuing. -Please refer to \fBpasswd\fR(1) for more information. +If password aging has been enabled for your account, you may be prompted for +a new password before proceeding. You will be forced to provide your old +password and the new password before continuing. Please refer to +\fBpasswd\fR(1) for more information. .PP -After a successful login, -you will be informed of any system messages and the presence -of mail. -You may turn off the printing of the system message file, -\fI/etc/motd\fR, by creating a zero-length file \fI.hushlogin\fR -in your login directory. -The mail message will be one of "\fBYou have new mail.\fR", -"\fBYou have mail.\fR", or "\fBNo Mail.\fR" according to -the condition of your mailbox. + +After a successful login, you will be informed of any system messages and +the presence of mail. You may turn off the printing of the system message +file, \fI/etc/motd\fR, by creating a zero-length file \fI.hushlogin\fR in +your login directory. The mail message will be one of "\fBYou have new +mail.\fR", "\fBYou have mail.\fR", or "\fBNo Mail.\fR" according to the +condition of your mailbox. + .PP Your user and group ID will be set according to their values in the \fI/etc/passwd\fR file. @@ -99,17 +90,13 @@ A subsystem login is indicated by the presense of a "*" as the first character of the login shell. The given home directory will be used as the root of a new filesystem which the user is actually logged into. .SH OPTIONS -.TP -.B -p +.IP "\fB-p\fR" Preserve environment. -.TP -.B -f +.IP "\fB-f\fR" Do not perform authentication, user is preauthenticated. -.TP -.B -h +.IP "\fB-h\fR" Name of the remote host for this login. -.TP -.B -r +.IP "\fB-r\fR" Perform autologin protocol for rlogin. .PP The \fB-r\fP, \fB-h\fP and \fB-f\fP options are only used when \fBlogin\fP is @@ -120,30 +107,26 @@ may be in use at any particular site. .PP The location of files is subject to differences in system configuration. .SH FILES +\fI/var/run/utmp\fR \- list of current login sessions .br -/etc/utmp \- list of current login sessions +\fI/var/log/wtmp\fR \- list of previous login sessions .br -/etc/wtmp \- list of previous login sessions +\fI/etc/passwd\fR \- user account information .br -/etc/passwd \- user account information +\fI/etc/shadow\fR \- encrypted passwords and age information .br -/etc/shadow \- encrypted passwords and age information +\fI/etc/motd\fR \- system message file .br -/etc/motd \- system message file +\fI/etc/nologin\fR \- prevent non-root users from logging in .br -/etc/nologin \- prevent non-root users from logging in +\fI/etc/ttytype\fR \- list of terminal types .br -/etc/ttytype \- list of terminal types -.br -$HOME/.profile \- initialization script for default shell -.br -$HOME/.hushlogin \- suppress printing of system messages +\fI$HOME/.hushlogin\fR \- suppress printing of system messages .SH SEE ALSO .BR mail (1), .BR passwd (1), .BR sh (1), .BR su (1), -.\" .BR d_passwd (5), .BR login.defs (5), .BR nologin (5), .BR passwd (5), diff --git a/man/login.access.5 b/man/login.access.5 index 684a54df..9e4312ef 100644 --- a/man/login.access.5 +++ b/man/login.access.5 @@ -1,4 +1,4 @@ -.\"$Id: login.access.5,v 1.3 2001/01/25 10:43:50 kloczek Exp $ +.\"$Id: login.access.5,v 1.5 2003/05/01 18:17:39 kloczek Exp $ .\" this is comment .TH LOGIN.ACCESS 5 .\" .Dt SKEY.ACCESS 5 @@ -6,47 +6,37 @@ .SH NAME login.access \- Login access control table .SH DESCRIPTION -The -.I login.access -file specifies (user, host) combinations and/or (user, tty) -combinations for which a login will be either accepted or refused. +The \fIlogin.access\fR file specifies (user, host) combinations and/or +(user, tty) combinations for which a login will be either accepted or +refused. .PP -When someone logs in, the -.I login.access -is scanned for the first entry that -matches the (user, host) combination, or, in case of non-networked -logins, the first entry that matches the (user, tty) combination. The -permissions field of that table entry determines whether the login will -be accepted or refused. +When someone logs in, the \fIlogin.access\fR is scanned for the first entry +that matches the (user, host) combination, or, in case of non-networked +logins, the first entry that matches the (user, tty) combination. The +permissions field of that table entry determines whether the login will be +accepted or refused. .PP Each line of the login access control table has three fields separated by a ":" character: .sp 1 .IR permission : users : origins .sp 1 -The first field should be a "\fB+\fR" (access granted) or "\fB-\fR" -(access denied) character. The second field should be a list of one or -more login names, group names, or -.B ALL -(always matches). The third field should be a list -of one or more tty names (for non-networked logins), host names, domain -names (begin with "\fB.\fR"), host addresses, internet network numbers -(end with "\fB.\fR"), -.B ALL -(always matches) or -.B LOCAL -(matches any string that does not contain a "\fB.\fR" character). -If you run NIS you can use @netgroupname in host or user patterns. +The first field should be a "\fB+\fR" (access granted) or "\fB-\fR" (access +denied) character. The second field should be a list of one or more login +names, group names, or \fBALL\fR (always matches). The third field should be +a list of one or more tty names (for non-networked logins), host names, +domain names (begin with "\fB.\fR"), host addresses, internet network +numbers (end with "\fB.\fR"), \fBALL\fR (always matches) or \fBLOCAL\fR +(matches any string that does not contain a "\fB.\fR" character). If you run +NIS you can use @netgroupname in host or user patterns. .PP -The -.B EXCEPT -operator makes it possible to write very compact rules. +The \fBEXCEPT\fR operator makes it possible to write very compact rules. .PP The group file is searched only when a name does not match that of the logged-in user. Only groups are matched in which users are explicitly listed: the program does not look at a user's primary group id value. .SH FILES -/etc/login.access +\fI/etc/loginn.defs\fR .SH SEE ALSO .BR login (1) .SH AUTHOR diff --git a/man/login.defs.5 b/man/login.defs.5 index 354334ba..48627585 100644 --- a/man/login.defs.5 +++ b/man/login.defs.5 @@ -25,105 +25,86 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: login.defs.5,v 1.11 2002/03/08 04:39:11 kloczek Exp $ +.\" $Id: login.defs.5,v 1.12 2003/05/01 18:17:39 kloczek Exp $ .\" .TH LOGIN.DEFS 5 .SH NAME /etc/login.defs \- shadow password suite configuration .SH DESCRIPTION The -.I /etc/login.defs -file defines the site-specific configuration for the shadow password -suite. This file is required. Absence of this file will not prevent -system operation, but will probably result in undesirable operation. +\fI/etc/login.defs\fR file defines the site-specific configuration for the +shadow password suite. This file is required. Absence of this file will +not prevent system operation, but will probably result in undesirable +operation. .PP -This file is a readable text file, each line of the file describing -one configuration parameter. The lines consist of a configuration -name and value, separated by whitespace. Blank lines and comment -lines are ignored. Comments are introduced with a `#' pound sign and -the pound sign must be the first non-white character of the line. +This file is a readable text file, each line of the file describing one +configuration parameter. The lines consist of a configuration name and +value, separated by whitespace. Blank lines and comment lines are ignored. +Comments are introduced with a `#' pound sign and the pound sign must be the +first non-white character of the line. .PP -Parameter values may be of four types: strings, booleans, numbers, -and long numbers. A string is comprised of any printable characters. -A boolean should be either the value ``yes'' or ``no''. An undefined -boolean parameter or one with a value other than these will be given -a ``no'' value. Numbers (both regular and long) may be either decimal -values, octal values (precede the value with ``0'') or hexadecimal -values (precede the value with ``0x''). The maximum value of the -regular and long numeric parameters is machine-dependent. +Parameter values may be of four types: strings, booleans, numbers, and long +numbers. A string is comprised of any printable characters. A boolean should +be either the value ``yes'' or ``no''. An undefined boolean parameter or one +with a value other than these will be given a ``no'' value. Numbers (both +regular and long) may be either decimal values, octal values (precede the +value with ``0'') or hexadecimal values (precede the value with ``0x''). +The maximum value of the regular and long numeric parameters is +machine-dependent. .PP The following configuration items are provided: .\" .IP "CHFN_AUTH (boolean)" -If -.IR yes , -the -.B chfn -and -.B chsh -programs will require authentication before making any changes, unless -run by the superuser. +If \fIyes\fR, the \fBchfn\fR and \fBchsh\fR programs will require +authentication before making any changes, unless run by the superuser. .\" .IP "CHFN_RESTRICT (string)" -This parameter specifies which values in the -.I gecos -field of the -.I passwd -file may be changed by regular users using the -.B chfn -program. It can be any combination of letters -.IR f , -.IR r , -.IR w , -.IR h , -for Full name, Room number, Work phone, and Home phone, respectively. -For backward compatibility, "yes" is equivalent to "rwh" -and "no" is equivalent to "frwh". -If not specified, only the superuser can make any changes. -The most restrictive setting is better achieved by not installing chfn SUID. +This parameter specifies which values in the fIgecos\fR field of the +\fI/etc/passwd\fR file may be changed by regular users using the fBchfn\fR +program. It can be any combination of letters \fIf\fR, \fIr\fR, \fIw\fR, +\fIh\fR, for Full name, Room number, Work phone, and Home phone, +respectively. For backward compatibility, "yes" is equivalent to "rwh" and +"no" is equivalent to "frwh". If not specified, only the superuser can make +any changes. The most restrictive setting is better achieved by not +installing chfn SUID. .\" .IP "CREATE_HOME (boolean)" This defines whether useradd should create home directories for users by -default. This option is OR'ed with the -m flag on useradd command line. +default. This option is OR'ed with the \fI-m\fR flag on useradd command line. .\" .IP "GID_MAX (number)" .IP "GID_MIN (number)" -Range of group IDs to choose from for the -.B useradd -and -.B groupadd +Range of group IDs to choose from for the fBuseradd\fR and \fBgroupadd\fR programs. .\" .IP "MAIL_DIR (string)" -The mail spool directory. This is needed to manipulate the mailbox when -its corresponding user account is modified or deleted. If not specified, -a compile-time default is used. +The mail spool directory. This is needed to manipulate the mailbox when its +corresponding user account is modified or deleted. If not specified, a +compile-time default is used. .\" .IP "PASS_MAX_DAYS (number)" -The maximum number of days a password may be used. If the password is -older than this, a password change will be forced. If not specified, -1 -will be assumed (which disables the restriction). +The maximum number of days a password may be used. If the password is older +than this, a password change will be forced. If not specified, -1 will be +assumed (which disables the restriction). .IP "PASS_MIN_DAYS (number)" -The minimum number of days allowed between password changes. Any password -changes attempted sooner than this will be rejected. If not specified, -1 +The minimum number of days allowed between password changes. Any password +changes attempted sooner than this will be rejected. If not specified, -1 will be assumed (which disables the restriction). .IP "PASS_WARN_AGE (number)" -The number of days warning given before a password expires. A zero means -warning is given only upon the day of expiration, a negative value means -no warning is given. If not specified, no warning will be provided. +The number of days warning given before a password expires. A zero means +warning is given only upon the day of expiration, a negative value means no +warning is given. If not specified, no warning will be provided. .PP PASS_MAX_DAYS, PASS_MIN_DAYS and PASS_WARN_AGE -are only used at the time of account creation. Any changes to these +are only used at the time of account creation. Any changes to these settings won't affect existing accounts. .\" .IP "UID_MAX (number)" .IP "UID_MIN (number)" -Range of user IDs to choose from for the -.B useradd -program. +Range of user IDs to choose from for the \fBuseradd\fR program. .\" .IP "UMASK (number)" -The permission mask is initialized to this value. If not specified, +The permission mask is initialized to this value. If not specified, the permission mask will be initialized to 077. .\" .IP "USERDEL_CMD (string)" @@ -160,10 +141,8 @@ MAIL_DIR .ad .SH BUGS Much of the functionality that used to be provided by the shadow password -suite is now handled by PAM. -Thus, -.I /etc/login.defs -is no longer used by programs such as +suite is now handled by PAM. Thus, \fI/etc/login.defs\fR is no longer used +by programs such as .BR login (1), .BR passwd (1) and diff --git a/man/logoutd.8 b/man/logoutd.8 index a6f9e777..3a548ba7 100644 --- a/man/logoutd.8 +++ b/man/logoutd.8 @@ -1,4 +1,4 @@ -.\"$Id: logoutd.8,v 1.7 2001/01/25 10:43:50 kloczek Exp $ +.\"$Id: logoutd.8,v 1.10 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,19 +31,16 @@ logoutd \- Enforce login time restrictions .SH SYNOPSIS .B logoutd .SH DESCRIPTION -.B logoutd -enforces the login time and port restrictions specified in -.IR /etc/porttime . -.B logoutd -should be started from \fI/etc/rc\fR. -The \fI/etc/utmp\fR file is scanned periodically and each user name +\fBlogoutd\fR enforces the login time and port restrictions specified in +\fI/etc/porttime\fR. \fBlogoutd\fR should be started from \fI/etc/rc\fR. +The \fI/var/run/utmp\fR file is scanned periodically and each user name is checked to see if the named user is permitted on the named port at the current time. Any login session which is violating the restrictions in \fI/etc/porttime\fR is terminated. .SH FILES -/etc/porttime \- login and port permissions +\fI/etc/porttime\fR \ - login and port permissions .br -/etc/utmp \- current login sessions +\fI/var/run/utmp\fR \ - current login sessions .SH AUTHOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/mkpasswd.8 b/man/mkpasswd.8 index 2ec8fc3e..436e61fb 100644 --- a/man/mkpasswd.8 +++ b/man/mkpasswd.8 @@ -1,4 +1,4 @@ -.\"$Id: mkpasswd.8,v 1.8 2002/03/08 04:39:11 kloczek Exp $ +.\"$Id: mkpasswd.8,v 1.10 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,46 +31,41 @@ mkpasswd \- Update passwd and group database files .SH SYNOPSIS \fBmkpasswd\fR [\fB-fvgps\fR] \fIfile\fR .SH DESCRIPTION -.B mkpasswd -reads the file in the format given by the flags and converts it to the -corresponding database file format. -These database files are used to improve access performance on systems -with large numbers of users. -The output files will be named \fIfile\fR.dir and \fIfile\fR.pag. +\fBmkpasswd\fR reads the file in the format given by the flags and converts +it to the corresponding database file format. These database files are used +to improve access performance on systems with large numbers of users. The +output files will be named \fIfile\fR.dir and \fIfile\fR.pag. .PP The \fB-f\fR option causes \fBmkpasswd\fR to ignore any existing output -files and overwrite them. -Normally \fBmkpasswd\fR complains about existing output files and quits. +files and overwrite them. Normally \fBmkpasswd\fR complains about existing +output files and quits. .PP -The \fB-v\fR option causes \fBmkpasswd\fR to output information about -each record as it is converted, with a final message at the very end. +The \fB-v\fR option causes \fBmkpasswd\fR to output information about each +record as it is converted, with a final message at the very end. .PP The \fB-g\fR option treats the input file as though it were in -\fI/etc/group\fR file format. -When combined with the \fB-s\fR option, the \fI/etc/gshadow\fR file -format is used instead. +\fI/etc/group\fR file format. When combined with the \fB-s\fR option, the +\fI/etc/gshadow\fR file format is used instead. .PP The \fB-p\fR option treats the input file as though it were in -\fI/etc/passwd\fR file format. -This is the default. -When combined with the \fB-s\fR option, the \fI/etc/shadow\fR file -format is used instead. +\fI/etc/passwd\fR file format. This is the default. When combined with the +\fB-s\fR option, the \fI/etc/shadow\fR file format is used instead. .SH CAVEATS -The use of more than one database file is limited to systems which -include the NDBM database library and therefore may not be available -on every system. +The use of more than one database file is limited to systems which include +the NDBM database library and therefore may not be available on every +system. .SH NOTE -Since most commands are capable of updating the database files as -changes are made, this command need only be used when re-creating a -deleted or corrupted database file. +Since most commands are capable of updating the database files as changes +are made, this command need only be used when re-creating a deleted or +corrupted database file. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \ - user account information .br -/etc/shadow \- shadow user information +\fI/etc/shadow\fR \ - shadow user information .br -/etc/group \- group information +\fI/etc/group\fR \ - group information .br -/etc/gshadow \- shadow group information +\fI/etc/gshadow\fR \ - shadow group information .SH SEE ALSO .BR group (5), .BR passwd (5), diff --git a/man/newgrp.1 b/man/newgrp.1 index 12bdcc23..da737077 100644 --- a/man/newgrp.1 +++ b/man/newgrp.1 @@ -1,4 +1,4 @@ -.\"$Id: newgrp.1,v 1.12 2002/03/09 19:22:30 ankry Exp $ +.\"$Id: newgrp.1,v 1.14 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -36,10 +36,9 @@ sg \- execute command as different group ID \fBsg\fR [\fB-\fR] [\fIgroup\fR [[\fB-c\fR] \fIcommand\fR]] .SH DESCRIPTION \fBnewgrp\fR is used to change the current group ID during a login session. -If the optional \fB\-\fR flag is given, the user's environment -will be reinitialized as though the user had logged in, otherwise -the current environment, including current working directory, -remains unchanged. +If the optional \fB\-\fR flag is given, the user's environment will be +reinitialized as though the user had logged in, otherwise the current +environment, including current working directory, remains unchanged. .PP \fBnewgrp\fR changes the current real group ID to the named group, or to the default group listed in \fI/etc/passwd\fR if no group name is given. The @@ -49,16 +48,16 @@ password. The user will be denied access if the group password is empty and the user is not listed as a member. .PP The \fBsg\fR command works similiar to \fBnewgrp\fR but accepts a command. -The command will be executed with the Bourne shell. With most shells you +The command will be executed with the Bourne shell. With most shells you may run \fBsg\fR from, you need to enclose multi-word commands in quotes. Another difference between \fBnewgrp\fR and \fBsg\fR is that some shells -treat \fBnewgrp\fR specially, replacing themselves with a new instance of -a shell that \fBnewgrp\fR creates. This doesn't happen with \fBsg\fR, so -upon exit from a \fBsg\fR command you are returned to your previous group ID. +treat \fBnewgrp\fR specially, replacing themselves with a new instance of a +shell that \fBnewgrp\fR creates. This doesn't happen with \fBsg\fR, so upon +exit from a \fBsg\fR command you are returned to your previous group ID. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \- user account information .br -/etc/group \- group information +\fI/etc/group\fR \- group information .SH SEE ALSO .BR id (1), .BR login (1), diff --git a/man/newusers.8 b/man/newusers.8 index f0f875d5..c2d6f51c 100644 --- a/man/newusers.8 +++ b/man/newusers.8 @@ -1,4 +1,4 @@ -.\"$Id: newusers.8,v 1.10 2002/03/08 04:39:11 kloczek Exp $ +.\"$Id: newusers.8,v 1.11 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,29 +31,27 @@ .SH SYNOPSIS \fBnewusers\fR [\fInew_users\fR] .SH DESCRIPTION -\fBnewusers\fR reads a file of user name and cleartext password pairs -and uses this information to update a group of existing users or to -create new users. -Each line is in the same format as the standard password file (see +\fBnewusers\fR reads a file of user name and cleartext password pairs and +uses this information to update a group of existing users or to create new +users. Each line is in the same format as the standard password file (see \fBpasswd\fR(5)) with the following exceptions. .IP "\fIpw_passwd\fR" 10 -This field will be encrypted and used as the new value -of the encrypted password. +This field will be encrypted and used as the new value of the encrypted +password. .IP "\fIpw_age\fR" -This field will be ignored for shadow passwords if the user already -exists. +This field will be ignored for shadow passwords if the user already exists. .IP "\fIpw_gid\fR" -This field may be the name of an existing group, in which case the -named user will be added as a member. If a non-existent numerical -group is given, a new group will be created having this number. +This field may be the name of an existing group, in which case the named +user will be added as a member. If a non-existent numerical group is given, +a new group will be created having this number. .IP "\fIpw_dir\fR" -This field will be checked for existence as a directory and a new -directory with the same name will be created if it does not already exist. -The ownership of the directory will be set to be that of the user -being created or updated. +This field will be checked for existence as a directory and a new directory +with the same name will be created if it does not already exist. The +ownership of the directory will be set to be that of the user being created +or updated. .PP -This command is intended to be used in a large system environment where -many accounts are updated at a single time. +This command is intended to be used in a large system environment where many +accounts are updated at a single time. .SH CAVEATS The input file must be protected since it contains unencrypted passwords. .SH SEE ALSO diff --git a/man/passwd.1 b/man/passwd.1 index 870cdf8e..14baec92 100644 --- a/man/passwd.1 +++ b/man/passwd.1 @@ -1,4 +1,4 @@ -.\"$Id: passwd.1,v 1.13 2002/03/09 19:22:30 ankry Exp $ +.\"$Id: passwd.1,v 1.16 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -38,35 +38,30 @@ passwd \- change user password .br \fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR|\fB-e\fR} \fIlogin\fR .SH DESCRIPTION -\fBpasswd\fR changes passwords for user and group accounts. -A normal user may only change the password for his/her own account, -the super user may change the password for any account. -The administrator of a group may change the password for the group. -\fBpasswd\fR also changes account information, such as the full name -of the user, user's login shell, or password expiry date and interval. +\fBpasswd\fR changes passwords for user and group accounts. A normal user +may only change the password for his/her own account, the super user may +change the password for any account. The administrator of a group may change +the password for the group. \fBpasswd\fR also changes account information, +such as the full name of the user, user's login shell, or password expiry +date and interval. .PP The \fB-s\fR option makes passwd call chsh to change the user's shell. The \fB-f\fR option makes passwd call chfn to change the user's gecos information. These two options are only meant for compatiblity, since the other programs can be called directly. .SS Password Changes -The user is first prompted for his/her old password, if one is present. -This password is then encrypted and compared against the -stored password. -The user has only one chance to enter the correct password. -The super user is permitted to bypass this step so that forgotten -passwords may be changed. +The user is first prompted for his/her old password, if one is present. This +password is then encrypted and compared against the stored password. The +user has only one chance to enter the correct password. The super user is +permitted to bypass this step so that forgotten passwords may be changed. .PP -After the password has been entered, password aging information -is checked to see if the user is permitted to change the password -at this time. -If not, \fBpasswd\fR refuses to change the password and exits. +After the password has been entered, password aging information is checked +to see if the user is permitted to change the password at this time. If not, +\fBpasswd\fR refuses to change the password and exits. .PP -The user is then prompted for a replacement password. -This password is tested for complexity. -As a general guideline, -passwords should consist of 6 to 8 characters including -one or more from each of following sets: +The user is then prompted for a replacement password. This password is +tested for complexity. As a general guideline, passwords should consist of 6 +to 8 characters including one or more from each of following sets: .IP "" .5i Lower case alphabetics .IP "" .5i @@ -76,44 +71,35 @@ Digits 0 thru 9 .IP "" .5i Punctuation marks .PP -Care must be taken not to include the system default erase -or kill characters. -\fBpasswd\fR will reject any password which is not suitably +Care must be taken not to include the system default erase or kill +characters. \fBpasswd\fR will reject any password which is not suitably complex. .PP -If the password is accepted, -\fBpasswd\fR will prompt again and compare the second entry -against the first. -Both entries are required to match in order for the password -to be changed. +If the password is accepted, \fBpasswd\fR will prompt again and compare the +second entry against the first. Both entries are required to match in order +for the password to be changed. .SS Group passwords -When the \fB-g\fR option is used, the password for the named -group is changed. -The user must either be the super user, or a group administrator -for the named group. -The current group password is not prompted for. -The \fB-r\fR option is used with the \fB-g\fR option to remove -the current password from the named group. -This allows group access to all members. -The \fB-R\fR option is used with the \fB-g\fR option to restrict -the named group for all users. +When the \fB-g\fR option is used, the password for the named group is +changed. The user must either be the super user, or a group administrator +for the named group. The current group password is not prompted for. The +\fB-r\fR option is used with the \fB-g\fR option to remove the current +password from the named group. This allows group access to all members. The +\fB-R\fR option is used with the \fB-g\fR option to restrict the named group +for all users. + .SS Password expiry information -The password aging information may be changed by the super -user with the \fB-x\fR, \fB-n\fR, \fB-w\fR, and \fB-i\fR options. -The \fB-x\fR option is used to set the maximum number of days -a password remains valid. -After \fImax\fR days, the password is required to be changed. -The \fB-n\fR option is used to set the minimum number of days -before a password may be changed. -The user will not be permitted to change the password until -\fImin\fR days have elapsed. -The \fB-w\fR option is used to set the number of days of warning -the user will receive before his/her password will expire. -The warning occurs \fIwarn\fR days before the expiration, telling -the user how many days remain until the password is set to expire. -The \fB-i\fR option is used to disable an account after the -password has been expired for a number of days. -After a user account has had an expired password for \fIinact\fR +The password aging information may be changed by the super user with the +\fB-x\fR, \fB-n\fR, \fB-w\fR, and \fB-i\fR options. The \fB-x\fR option is +used to set the maximum number of days a password remains valid. After +\fImax\fR days, the password is required to be changed. The \fB-n\fR option +is used to set the minimum number of days before a password may be changed. +The user will not be permitted to change the password until \fImin\fR days +have elapsed. The \fB-w\fR option is used to set the number of days of +warning the user will receive before his/her password will expire. The +warning occurs \fIwarn\fR days before the expiration, telling the user how +many days remain until the password is set to expire. The \fB-i\fR option is +used to disable an account after the password has been expired for a number +of days. After a user account has had an expired password for \fIinact\fR days, the user may no longer sign on to the account. .PP If you wish to immediately expire an account's password, you can use the @@ -123,20 +109,17 @@ password (make it empty). Use caution with this option since it can make an account not require a password at all to login, leaving your system open to intruders. .SS Account maintenance -User accounts may be locked and unlocked with the \fB-l\fR and -\fB-u\fR flags. -The \fB-l\fR option disables an account by changing the password to a -value which matches no possible encrypted value. -The \fB-u\fR option re-enables an account by changing the password -back to its previous value. +User accounts may be locked and unlocked with the \fB-l\fR and fB-u\fR +\flags. The \fB-l\fR option disables an account by changing the password to +a value which matches no possible encrypted value. The \fB-u\fR option +re-enables an account by changing the password back to its previous value. .PP -The account status may be given with the \fB-S\fR option. -The status information consists of 6 parts. -The first part indicates if the user account is locked (L), has no -password (NP), or has a usable password (P). -The second part gives the date of the last password change. -The next four parts are the minimum age, maximum age, warning period, -and inactivity period for the password. +The account status may be given with the \fB-S\fR option. The status +information consists of 6 parts. The first part indicates if the user +account is locked (L), has no password (NP), or has a usable password (P). +The second part gives the date of the last password change. The next four +parts are the minimum age, maximum age, warning period, and inactivity +period for the password. .SS Hints for user passwords The security of a password depends upon the strength of the encryption algorithm and the size of the key space. @@ -170,15 +153,13 @@ which produces .IP "" .5i An4wtbt. .PP -You may be reasonably sure few crackers will have -included this in their dictionaries. -You should, however, select your own methods for constructing +You may be reasonably sure few crackers will have included this in their +dictionaries. You should, however, select your own methods for constructing passwords and not rely exclusively on the methods given here. .SS Notes about group passwords -Group passwords are an inherent security problem since more -than one person is permitted to know the password. -However, groups are a useful tool for permitting co-operation -between different users. +Group passwords are an inherent security problem since more than one person +is permitted to know the password. However, groups are a useful tool for +permitting co-operation between different users. .SH CAVEATS Not all options may be supported. Password complexity checking may vary from site to site. @@ -187,9 +168,25 @@ feels comfortable with. Users may not be able to change their password on a system if NIS is enabled and they are not logged into the NIS server. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \- user account information .br -/etc/shadow \- encrypted user passwords +\fI/etc/shadow\fR \- encrypted user passwords +.SH EXIT VALUES +.TP 2 +The \fBpasswd\fR command exits with the following values: +\fB0\fR \- success +.br +\fB1\fR \- permission denied +.br +\fB2\fR \- invalid combination of options +.br +\fB3\fR \- unexpected failure, nothing done +.br +\fB4\fR \- unexpected failure, passwd file missing +.br +\fB5\fR \- passwd file busy, try again later +.br +\fB6\fR \- invalid argument to option .SH "SEE ALSO" .BR group (5), .BR passwd (5) diff --git a/man/passwd.5 b/man/passwd.5 index c76c609d..3d0f01b4 100644 --- a/man/passwd.5 +++ b/man/passwd.5 @@ -1,4 +1,4 @@ -.\"$Id: passwd.5,v 1.8 2002/03/08 04:39:11 kloczek Exp $ +.\"$Id: passwd.5,v 1.11 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,9 +29,8 @@ .SH NAME passwd \- The password file .SH DESCRIPTION -.I passwd -contains various pieces of information for each user account. -Included is +\fI\etc\passwd\fR contains various pieces of information for each user +account. Included is: .IP "" .5i Login name .IP "" .5i @@ -47,33 +46,16 @@ User home directory .IP "" .5i User command interpreter .PP -The password field may not be filled if shadow passwords -have been enabled. -If shadow passwords are being used, the encrypted password will -be found in \fI/etc/shadow\fR. -The encryped password consists of 13 characters from the -64 character alphabet -a thru z, A thru Z, 0 thru 9, \. and /. -Refer to \fBcrypt\fR(3) for details on how this string is -interpreted. -.PP -An optional password age string may follow the encrypted -password, separated by a comma, from the same alphabet -as the password itself. -The first character gives the number of weeks during which the -password is valid. -The second character gives the number of weeks which must pass -before the user is permitted to change the password. -The last two characters give the week since Jan 1970 when the -password was last changed. -When the number of weeks during which the password is valid -have passed, the user will be required to provide a new -password. +The password field may not be filled if shadow passwords have been enabled. +If shadow passwords are being used, the encrypted password will be found in +\fI/etc/shadow\fR. The encryped password consists of 13 characters from the +64 character alphabet a thru z, A thru Z, 0 thru 9, \. and /. Refer to +\fBcrypt\fR(3) for details on how this string is interpreted. .PP The comment field is used by various system utilities, such as -\fBfinger\fR(1). -Three additional values may be present in the comment field. -They are +\fBfinger\fR(1). Three additional values may be present in the comment +field. +They are: .IP "" .5i pri= \- set initial value of nice .IP "" .5i @@ -81,22 +63,20 @@ umask= \- set initial value of umask .IP "" .5i ulimit= \- set initial value of ulimit .PP -These fields are separated from each other and from any other -comment field by a comma. +These fields are separated from each other and from any other comment field +by a comma. .PP -The home directory field provides the name of the initial -working directory. +The home directory field provides the name of the initial working directory. \fBLogin\fR uses this information to set the value of the \fBHOME\fR environmental variable. .PP -The command interpreter field provides the name of the user's -command language interpreter, or the name of the initial program -to execute. +The command interpreter field provides the name of the user's command +language interpreter, or the name of the initial program to execute. \fBLogin\fR uses this information to set the value of the \fBSHELL\fR environmental variable. If this field is empty, it defaults to the value \fB/bin/sh\fR. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \ - user account information .SH SEE ALSO .BR login (1), .BR passwd (1), diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am index 0690595b..3c668a14 100644 --- a/man/pl/Makefile.am +++ b/man/pl/Makefile.am @@ -7,7 +7,6 @@ man_MANS = \ chfn.1 \ chpasswd.8 \ chsh.1 \ - d_passwd.5 \ expiry.1 \ faillog.5 \ faillog.8 \ @@ -15,6 +14,7 @@ man_MANS = \ groupadd.8 \ groupdel.8 \ groupmod.8 \ + groups.1 \ grpck.8 \ grpconv.8 \ grpunconv.8 \ @@ -44,12 +44,8 @@ man_MANS = \ vipw.8 EXTRA_DIST = $(man_MANS) \ - dialups.5 \ - dpasswd.8 \ - groups.1 \ id.1 \ pw_auth.3 \ - pwauth.8 \ shadow.3 \ shadowconfig.8 \ sulogin.8 diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in index fdbf4e38..3e7cdd8f 100644 --- a/man/pl/Makefile.in +++ b/man/pl/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,100 +14,144 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ mandir = @mandir@/pl +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ man_MANS = \ adduser.8 \ @@ -114,7 +159,6 @@ man_MANS = \ chfn.1 \ chpasswd.8 \ chsh.1 \ - d_passwd.5 \ expiry.1 \ faillog.5 \ faillog.8 \ @@ -122,6 +166,7 @@ man_MANS = \ groupadd.8 \ groupdel.8 \ groupmod.8 \ + groups.1 \ grpck.8 \ grpconv.8 \ grpunconv.8 \ @@ -152,17 +197,14 @@ man_MANS = \ EXTRA_DIST = $(man_MANS) \ - dialups.5 \ - dpasswd.8 \ - groups.1 \ id.1 \ pw_auth.3 \ - pwauth.8 \ shadow.3 \ shadowconfig.8 \ sulogin.8 subdir = man/pl +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -170,10 +212,15 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/pl/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -183,13 +230,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/pl/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: man1dir = $(mandir)/man1 @@ -207,6 +247,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -224,6 +268,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -246,6 +294,10 @@ install-man5: $(man5_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -263,6 +315,10 @@ uninstall-man5: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -285,6 +341,10 @@ install-man8: $(man8_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -302,6 +362,10 @@ uninstall-man8: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -311,6 +375,8 @@ uninstall-man8: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -318,15 +384,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -339,7 +416,6 @@ all-am: Makefile $(MANS) installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -351,6 +427,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -358,7 +435,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -368,7 +445,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -390,13 +467,21 @@ install-man: install-man1 install-man5 install-man8 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 @@ -408,9 +493,9 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 install-info-am install-man install-man1 install-man5 \ install-man8 install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-man5 uninstall-man8 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man5 uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/pl/chage.1 b/man/pl/chage.1 index 309b3e39..c3ac73c0 100644 --- a/man/pl/chage.1 +++ b/man/pl/chage.1 @@ -1,4 +1,4 @@ -.\" $Id: chage.1,v 1.5 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: chage.1,v 1.7 2003/05/06 22:55:11 kloczek Exp $ .\" {PTM/WK/1999-09-16} .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. @@ -46,40 +46,38 @@ u Polecenia \fBchage\fR mo瞠 u篡 tylko u篡tkownik root, za wyj徠kiem opcji \fB-l\fR. Mo瞠 si ni pos逝篡 si u篡tkownik nieuprzywilejowany do stwierdzenia, kiedy wygasa jego w豉sne has這 lub konto. -.PP -Opcja \fB-m\fR ustawia minimaln liczb dni pomi璠zy zmianami has豉 na warto嗆 -\fImindni\fR. Warto嗆 zerowa oznacza, 瞠 u篡tkownik mo瞠 je zmienia -w dowolnym czasie. -.PP -Opcja \fB-M\fR ustawia maksymaln liczb dni, przez jakie has這 jest wa積e -na warto嗆 \fImaxdni\fR. -Gdy \fImaxdni\fR plus \fIostatni\fR jest mniejsze ni bie膨cy dzie, -u篡tkownik musi zmieni swoje has豉, zanim b璠zie m鏬 skorzysta z konta. -Zdarzenie to mo瞠 by zaplanowane z wyprzedzeniem przez wykorzystanie -opcji \fB-W\fR, ostrzegaj帷ej zawczasu u篡tkownika o zbli瘸j帷ym si terminie -zmiany. -.PP -Opcja \fB-d\fR ustawia liczb dni od 1 stycznia 1970 do dnia kiedy ostatnio -zmieniono has這 na \fIostatni\fR. Data mo瞠 r闚nie zosta podana w postaci -RRRR-MM-DD (lub postaci powszechniej u篡wanej w danym regionie). -.PP -Opcja \fB-E\fR s逝篡 do ustawiania daty, pocz患szy od kt鏎ej konto u篡tkownika -nie b璠zie ju dost瘼ne. +Polecenie \fBchage\fR posiada nast瘼uj帷e opcje: +.IP "\fB-m\fR \fImindni\fR" +Utawia minimaln liczb dni pomi璠zy zmianami has豉 na warto嗆 fImindni\fR. +Warto嗆 zerowa oznacza, 瞠 u篡tkownik mo瞠 je zmienia w dowolnym czasie. +.IP "\fB-M\fR \fImaxdni\fR" +Ustawia maksymaln liczb dni, przez jakie has這 jest wa積e na warto嗆 +\fImaxdni\fR. Gdy \fImaxdni\fR plus \fIostatni\fR jest mniejsze ni bie膨cy +dzie, u篡tkownik musi zmieni swoje has豉, zanim b璠zie m鏬 skorzysta z +konta. Zdarzenie to mo瞠 by zaplanowane z wyprzedzeniem przez wykorzystanie +opcji \fB-W\fR, ostrzegaj帷ej zawczasu u篡tkownika o zbli瘸j帷ym si +terminie zmiany. +.IP "\fB-M\fR \fIostatni\fR" +Ustawia liczb dni od 1 stycznia 1970 do dnia kiedy ostatnio zmieniono has這 +na \fIostatni\fR. Data mo瞠 r闚nie zosta podana w postaci RRRR-MM-DD (lub +postaci powszechniej u篡wanej w danym regionie). +.IP "\fB-E\fR \fIdata_wa積o軼i\fR" +Ustawia dat, pocz患szy od kt鏎ej konto u篡tkownika nie b璠zie ju dost瘼ne. \fIdata_wa積o軼i\fR jest liczb dni od 1 stycznia 1970, od kt鏎ej konto jest blokowane. Data mo瞠 by te wyra穎na w postaci RRRR-MM-DD (lub innej, powszechniej u篡wanej w danym regionie). U篡tkownik, kt鏎ego konto jest zablokowane musi skontaktowa si z administratorem systemu zanim b璠zie m鏬 z niego ponownie skorzysta. -.PP +.IP "\fB-I\fR \fInieaktywne\fR" Opcja \fB-I\fR s逝篡 do ustawiania czasu nieaktywno軼i po wyga郾i璚iu has豉, po kt鏎ym konto jest blokowane. Parametr \fInieaktywne\fR podaje liczb dni nieaktywno軼i. Warto嗆 0 wy陰cza t funkcj. U篡tkownik, kt鏎ego konto jest zablokowane musi skontaktowa si z administratorem systemu zanim b璠zie m鏬 z niego ponownie skorzysta. -.PP -Opcja \fB-W\fR s逝篡 do ustawiania ostrzegania przed wymagan zmian has豉. -Parametr \fIdni_ostrzegania\fR jest liczb dni przed up造wem wa積o軼i has豉; -od tego dnia u篡tkownik b璠zie ostrzegany o nadchodz帷ym terminie. +.IP "\fB-W\fR \fIdni_ostrzegania\fR" +Ustawia na \fIdni_ostrzegania\fR liczb dni przed up造wem wa積o軼i has豉. +Od tego dnia u篡tkownik b璠zie ostrzegany o nadchodz帷ym terminie zmiany +has豉. .PP Je郵i nie podano 瘸dnej opcji, to \fBchage\fR dzia豉 w trybie interaktywnym, proponuj帷 u篡tkownikowi warto軼i bie膨ce dla ka盥ego z p鏊. Wprowadzenie @@ -91,9 +89,9 @@ Program \fBchage\fR wymaga do dzia (shadow). Je郵i has豉 u篡tkownik闚 s przechowywane w pliku passwd, funkcjonalno嗆 programu \fBchage\fR jest niedost瘼na. .SH PLIKI -/etc/passwd \- informacje o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacje o kontach u篡tkownik闚 .br -/etc/shadow \- chronione informacje o kontach u篡tkownik闚 +\fI/etc/shadow\fR \- chronione informacje o kontach u篡tkownik闚 .SH ZOBACZ TAK浩 .BR passwd (5), .BR shadow (5) diff --git a/man/pl/chfn.1 b/man/pl/chfn.1 index b49423f1..57bae15e 100644 --- a/man/pl/chfn.1 +++ b/man/pl/chfn.1 @@ -1,4 +1,4 @@ -.\" $Id: chfn.1,v 1.6 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: chfn.1,v 1.7 2003/04/26 13:24:15 kloczek Exp $ .\" {PTM/WK/1999-09-25} .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. @@ -58,7 +58,7 @@ Bie Je郵i nie podano 瘸dnej opcji, \fBchfn\fR pyta o konto u篡tkownika, kt鏎e ma podlega zmianie. .SH PLIKI -/etc/passwd \- informacja o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .SH ZOBACZ TAK浩 .BR passwd (5) .SH AUTOR diff --git a/man/pl/chsh.1 b/man/pl/chsh.1 index 8d2d60a1..e1db81ba 100644 --- a/man/pl/chsh.1 +++ b/man/pl/chsh.1 @@ -1,4 +1,4 @@ -.\" $Id: chsh.1,v 1.6 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: chsh.1,v 1.7 2003/04/26 13:24:15 kloczek Exp $ .\" {PTM/WK/1999-09-25} .\" Copyright 1990, Julianne Frances Haugh .\" All rights reserved. @@ -53,9 +53,9 @@ proponuj warto軼i powoduje zmian pow這ki, a podanie warto軼i pustej pozostawia bie膨c pow這k. Bie膨ca pow這ka wy鈍ietlana jest w nawiasach \fB[ ]\fR. .SH PLIKI -/etc/passwd \- informacja o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -/etc/shells \- lista dozwolonych pow這k zg這szeniowych +\fI/etc/shells\fR \- lista dozwolonych pow這k zg這szeniowych .SH ZOBACZ TAK浩 .BR chfn (1), .BR passwd (5) diff --git a/man/pl/d_passwd.5 b/man/pl/d_passwd.5 deleted file mode 100644 index 842b88f6..00000000 --- a/man/pl/d_passwd.5 +++ /dev/null @@ -1,29 +0,0 @@ -.\" $Id: d_passwd.5,v 1.2 2001/01/25 10:43:54 kloczek Exp $ -.\" {PTM/WK/1999-09-22} -.TH D_PASSWD 5 -.SH NAZWA -d_passwd - plik hase telefonicznych -.SH OPIS -Z dost瘼em do systemu przez lini telefoniczn zwi您ane s dwa pliki -konfiguracyjne: \fI/etc/d_passwd\fR, zawieraj帷y has豉 i \fI/etc/dialups\fR, -zawieraj帷y linie. -Ka盥orazowo, zanim u篡tkownik 陰cz帷y si za po鈔ednictwem modemu otrzyma -dost瘼 do systemu, musi poda has這 telefoniczne. Has豉 te s niezale積e -od hase u篡tkownik闚 i przypisane nie do u篡tkownika, ani linii terminalowej, -lecz do pow這ki zg這szeniowej u篡tkownika. -Do rozpocz璚ia sesji wymagane jest zar闚no has這 u篡tkownika jak -i telefoniczne. Zauwa jednak, 瞠 has豉 telefoniczne nie posiadaj kontroli -terminu wa積o軼i. Nale篡, po uzgodnieniu, okresowo zmienia je r璚znie. -W pliku \fId_passwd\fR kolejne wiersze definiuj has豉 dla rozmaitych pow這k: -.br -.sp 1 - pow這ka:zakodowane_has這: -.br -.sp 1 -Zauwa, 瞠 po polu has豉 wyst瘼uje dwukropek. Pow這ka powinna by -okre郵ona przez bezwzgl璠n nazw 軼ie磬ow pliku interpretatora polece. -Do zarz康zania has豉mi telefonicznymi s逝篡 polecenie \fBdpasswd\fR (1). -.SH ZOBACZ TAK浩 -.BR dpasswd (1), -.BR login (1), -.BR dialups (5). diff --git a/man/pl/dialups.5 b/man/pl/dialups.5 deleted file mode 100644 index 7b36df4b..00000000 --- a/man/pl/dialups.5 +++ /dev/null @@ -1,23 +0,0 @@ -.\" $Id: dialups.5,v 1.2 2001/01/25 10:43:54 kloczek Exp $ -.\" {PTM/WK/1999-09-22} -.TH DIALUPS -.SH NAZWA -dialups - plik terminalowych linii telefonicznych -.SH OPIS -Z dost瘼em do systemu przez lini telefoniczn zwi您ane s dwa pliki -konfiguracyjne: \fI/etc/d_passwd\fR, zawieraj帷y has豉 i \fI/etc/dialups\fR, -zawieraj帷y linie. W ka盥ym wierszu pliku \fIdialups\fR zawarta jest nazwa -pliku specjalnego linii terminalowej, do kt鏎ej pod陰czony jest modem: -.br -.sp 1 - /dev/tty12 - /dev/tty13 -.br -.sp 1 -Warto jest uj望 w nim \fBwszystkie\fR linie z dost瘼em modemowym. -Po陰czenie z linii pomini皻ej nie b璠zie dodatkowo weryfikowane - u篡tkownicy -陰cz帷y si ni nie b璠 musieli podawa has豉 telefonicznego. -.SH ZOBACZ TAK浩 -.BR dpasswd (1), -.BR login (1), -.BR d_passwd (5). diff --git a/man/pl/expiry.1 b/man/pl/expiry.1 index 7b42aa08..236b4c75 100644 --- a/man/pl/expiry.1 +++ b/man/pl/expiry.1 @@ -1,4 +1,4 @@ -.\" $Id: expiry.1,v 1.2 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: expiry.1,v 1.3 2003/04/26 13:24:15 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" Modified for expiry by Ben Collins , 1999 @@ -38,9 +38,9 @@ expiry \- sprawdzenie wa (\fB-f\fR) jego zmian, je郵i potrzeba. Mo瞠 ono by wywo造wane jako zwyk貫 polecenie przez u篡tkownika. .SH PLIKI -/etc/passwd \- informacje o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacje o kontach u篡tkownik闚 .br -/etc/shadow \- chronione informacje o kontach u篡tkownik闚 +\fI/etc/shadow\fR \- chronione informacje o kontach u篡tkownik闚 .SH "ZOBACZ TAK浩" .BR passwd (5), .BR shadow (5) diff --git a/man/pl/faillog.5 b/man/pl/faillog.5 index 483b72b5..e310a385 100644 --- a/man/pl/faillog.5 +++ b/man/pl/faillog.5 @@ -1,4 +1,4 @@ -.\"$Id: faillog.5,v 1.4 2001/01/27 02:55:54 kloczek Exp $ +.\"$Id: faillog.5,v 1.5 2003/01/07 14:25:35 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" Translation (c) 1998 "Gwidon S. Naskrent" .\" All rights reserved. @@ -34,8 +34,8 @@ faillog \- plik rejestruj konta. Plik ten sk豉da si z rekord闚 o sta貫j d逝go軼i, indeksowanych liczbowym UID. Ka盥y rekord zawiera licznik nieudanych zalogowa od ostatniego pomy郵nego logowania, maksymaln liczb pomy貫k przed -zablokowaniem konta, konsol na kt鏎ej nast徙i這 ostatnie nieudane -logowanie, oraz dat tego. +zablokowaniem konta, terminal na kt鏎ym nast徙i這 ostatnie nieudane +logowanie, oraz dat tego logowania. .PP Struktura tego pliku to .DS diff --git a/man/pl/gpasswd.1 b/man/pl/gpasswd.1 index a772be95..87dce071 100644 --- a/man/pl/gpasswd.1 +++ b/man/pl/gpasswd.1 @@ -1,4 +1,4 @@ -.\" $Id: gpasswd.1,v 1.4 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: gpasswd.1,v 1.5 2003/04/26 13:24:15 kloczek Exp $ .\" {PTM/WK/1999-09-16} .\" Copyright 1996, Rafal Maszkowski .\" All rights reserved. You can redistribute this man page and/or @@ -24,7 +24,7 @@ gpasswd \- administracja plikiem /etc/group \fBgpasswd\fR [\fB-A \fIu篡tkownik\fR,...] [\fB-M \fIu篡tkownik\fR,...] \fIgrupa\fR .SH OPIS \fBgpasswd\fR s逝篡 do administrowania plikiem /etc/group (oraz -/etc/gshadow je郵i zosta豉 wykonana kompilacja ze zdefiniowanym +\fI/etc/gshadow\fR je郵i zosta豉 wykonana kompilacja ze zdefiniowanym SHADOWGRP). Ka盥a z grup mo瞠 posiada administrator闚, cz這nk闚 i has這. Administrator systemu mo瞠 pos逝篡 si opcj \fB-A\fR do zdefiniowania administratora(-闚) grupy oraz opcj \fB-M\fR do zdefiniowania jej cz這nk闚. @@ -46,9 +46,9 @@ Je bez has豉, inni musz natomiast poda has這. .SH PLIKI -/etc/group \- informacja o grupach +\fI/etc/group\fR \- informacja o grupach .br -/etc/gshadow \- chroniona informacja o grupach +\fI/etc/gshadow\fR \- chroniona informacja o grupach .SH ZOBACZ TAK浩 .BR newgrp (1), .BR groupadd (8), diff --git a/man/pl/groupadd.8 b/man/pl/groupadd.8 index ec8afaa3..ecf43b5a 100644 --- a/man/pl/groupadd.8 +++ b/man/pl/groupadd.8 @@ -1,4 +1,4 @@ -.\" $Id: groupadd.8,v 1.6 2002/03/09 11:16:18 ankry Exp $ +.\" $Id: groupadd.8,v 1.9 2004/01/05 01:08:32 kloczek Exp $ .\" {PTM/WK/0.1/VIII-1999} .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. @@ -30,12 +30,12 @@ .SH NAZWA groupadd - tw鏎z now grup .SH SKｘDNIA -\fBgroupadd\fR [\fB-g\fR \fIgid\fR [\fB-o\fR]] \fIgrupa\fR +\fBgroupadd\fR [\fB-g\fR \fIgid\fR [\fB-o\fR]] [\fB-f\fR] \fIgrupa\fR .SH OPIS Polecenie \fBgroupadd\fR tworzy nowe konto grupy pos逝guj帷 si warto軼iami podanymi w wierszu polece i domy郵nymi warto軼iami z systemu. W razie potrzeby zostanie wprowadzona do systemu nowa grupa. -Polecenie \fBgroupadd\fR posiada opcje: +Polecenie \fBgroupadd\fR posiada nast瘼uj帷e opcje: .TP .BI -g " gid" Numeryczna warto嗆 identyfikatora grupy. Warto嗆 ta musi by niepowtarzalna, @@ -43,10 +43,30 @@ chyba u篡wana jest najmniejsza warto嗆 identyfikatora wi瘯sza ni 99 a wi瘯sza ni jakiejkolwiek innej grupy. Warto軼i mi璠zy 0 a 99 s zwykle zarezerwowane dla kont systemowych. +.TP +.BI -f +Ta opcja powoduje zako鎍zenie programu ze statusem oznaczaj帷ym sukces je郵i +podana groupa ju istnieje. Z opcj \fB-g\fR, je郵i podany gid ju istnieje, +wybierany jest inny (unikalny) gid (czyli \fB-g\fR jest wy陰czane). .SH PLIKI -.IR /etc/group " - informacja o kontach grup" +\fI/etc/group\fR \- informacja o kontach grup .br -.IR /etc/gshadow " - bezpieczna informacja o kontach grup" +\fI/etc/gshadow\fR \- bezpieczna informacja o kontach grup +.SH KOD ZAKO哸ZENIA +.TP 2 +Polecenie \fBgroupadd\fR ko鎍zy dzia豉nie z nast瘼uj帷ymi warto軼iami kod闚 zako鎍zenia: +.br +\fB0\fR \- powodzenie +.br +\fB2\fR \- niew豉軼iwa sk豉dnia parametr闚 polecenia +.br +\fB3\fR \- niew豉軼iwe parametry opcji +.br +\fB4\fR \- uid jest ju u篡wany (i nie u篡to opcji -o) +.br +\fB9\fR \- nazwa groupy nie jest unikalna +.br +\fB10\fR \- niemo磧iwa aktualizacja plik闚 grup .SH ZOBACZ TAK浩 .BR chfn (1), .BR chsh (1), @@ -58,8 +78,3 @@ Warto .BR usermod (8), .SH AUTOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) -.SH OD TΣMACZA -Niniejsza dokumentacja opisuje polecenie wchodz帷e w sk豉d pakietu shadow. -Istnieje wiele program闚 i skrypt闚 do zarz康zania kontami u篡tkownik闚 czy -grup. Z uwagi na powtarzaj帷e si nazwy polece, upewnij si, 瞠 korzystasz -z w豉軼iwej dokumentacji. diff --git a/man/pl/groupdel.8 b/man/pl/groupdel.8 index b9a34266..27f11725 100644 --- a/man/pl/groupdel.8 +++ b/man/pl/groupdel.8 @@ -1,4 +1,4 @@ -.\" $Id: groupdel.8,v 1.6 2002/03/09 11:16:18 ankry Exp $ +.\" $Id: groupdel.8,v 1.7 2003/04/28 17:52:15 kloczek Exp $ .\" {PTM/WK/0.1/VIII-1999} .\" Copyright 1991 - 1993, Julianne Frances Haugh .\" All rights reserved. @@ -42,10 +42,22 @@ nie pozosta Nie mo瞠sz usun望 podstawowej grupy 瘸dnego z istniej帷ych u篡tkownik闚. Musisz usun望 u篡tkownika przed usuni璚iem takiej grupy. .SH PLIKI -.IR /etc/group " - informacja o grupach" +\fI/etc/group\fR \- informacja o grupach .br -.IR /etc/gshadow " - bezpieczna informacja o grupach" -.\" secure group information +\fI/etc/gshadow\fR \- bezpieczna informacja o grupach +.SH KOD ZAKO哸ZENIA +.TP 2 +Polecenie \fBgroupdel\fR ko鎍zy dzia豉nie z nast瘼uj帷ymi warto軼iami kod闚 zako鎍zenia: +.br +\fB0\fR \- powodzenie +.br +\fB2\fR \- niew豉軼iwa sk豉dnia parametr闚 polecenia +.br +\fB6\fR \- podana grupa nie istnieje +.br +\fB8\fR \- nie mo積a usun望 grupy podstawowej u篡tykownika +.br +\fB10\fR \- nie mo積a zaktualizowa pliku z grupami .SH ZOBACZ TAK浩 .BR chfn (1), .BR chsh (1), @@ -57,8 +69,3 @@ Musisz usun .BR usermod (8) .SH AUTOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) -.SH OD TΣMACZA -Niniejsza dokumentacja opisuje polecenie wchodz帷e w sk豉d pakietu shadow. -Istnieje wiele program闚 i skrypt闚 do zarz康zania kontami u篡tkownik闚 czy -grup. Z uwagi na powtarzaj帷e si nazwy polece, upewnij si, 瞠 korzystasz -z w豉軼iwej dokumentacji. diff --git a/man/pl/groupmod.8 b/man/pl/groupmod.8 index 761af13d..ff382698 100644 --- a/man/pl/groupmod.8 +++ b/man/pl/groupmod.8 @@ -1,4 +1,4 @@ -.\" $Id: groupmod.8,v 1.6 2002/03/09 11:16:18 ankry Exp $ +.\" $Id: groupmod.8,v 1.7 2003/04/28 17:52:15 kloczek Exp $ .\" {PTM/WK/0.1/VIII-1999} .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. @@ -48,9 +48,26 @@ grupy pliku, wymagaj .BI -n " nazwa_grupy" Nazwa grupy zostanie zmieniona z \fIgrupa\fR na \fInazwa_grupy\fR. .SH PLIKI -.IR /etc/group " - informacja o grupach" +\fI/etc/group\fR \- informacja o grupach .br -.IR /etc/gshadow " - bezpieczna informacja o grupach" +\fI/etc/gshadow\fI \- bezpieczna informacja o grupach +.SH KOD ZAKO哸ZENIA +.TP 2 +Polecenie \fBgroupmod\fR ko鎍zy dzia豉nie z nast瘼uj帷ymi warto軼iami kod闚 zako鎍zenia: +.br +\fB0\fR \- powodzenie +.br +\fB2\fR \- niew豉軼iwa sk豉dnia parametr闚 polecenia +.br +\fB3\fR \- niew豉軼iwe parametry opcji +.br +\fB4\fR \- gid jest ju u篡wany (i nie u篡to opcji -o) +.br +\fB6\fR \- podana grupa nie istnieje +.br +\fB9\fR \- grupa jest ju u篡wana +.br +\fB10\fR \- niemo磧iwa aktualizacja plik闚 grup .SH ZOBACZ TAK浩 .BR chfn (1), .BR chsh (1), @@ -62,8 +79,3 @@ Nazwa grupy zostanie zmieniona z \fIgrupa\fR na \fInazwa_grupy\fR. .BR usermod (8) .SH AUTOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) -.SH OD TΣMACZA -Niniejsza dokumentacja opisuje polecenie wchodz帷e w sk豉d pakietu shadow. -Istnieje wiele program闚 i skrypt闚 do zarz康zania kontami u篡tkownik闚 czy -grup. Z uwagi na powtarzaj帷e si nazwy polece, upewnij si, 瞠 korzystasz -z w豉軼iwej dokumentacji. diff --git a/man/pl/groups.1 b/man/pl/groups.1 index 5b59938c..b46d1db9 100644 --- a/man/pl/groups.1 +++ b/man/pl/groups.1 @@ -1,4 +1,4 @@ -.\" $Id: groups.1,v 1.7 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: groups.1,v 1.8 2003/04/26 13:24:15 kloczek Exp $ .\" {PRM/WK/1999-09-25} .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. @@ -44,7 +44,7 @@ informacj Do zmiany bie膨cego rzeczywistego i efektywnego identyfikatora grupy u篡tkownik musi u篡 polecenia \fBnewgrp\fR lub \fBsg\fR. .SH PLIKI -/etc/group \- informacja o grupach +\fI/etc/group\fR \- informacja o grupach .SH ZOBACZ TAK浩 .BR newgrp (1), .BR getgid (2), diff --git a/man/pl/grpck.8 b/man/pl/grpck.8 index afd08aed..112547ff 100644 --- a/man/pl/grpck.8 +++ b/man/pl/grpck.8 @@ -1,4 +1,4 @@ -.\" $Id: grpck.8,v 1.6 2002/03/09 11:16:18 ankry Exp $ +.\" $Id: grpck.8,v 1.7 2003/04/28 17:52:15 kloczek Exp $ .\" {PTM/WK/1999-09-17} .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. @@ -39,7 +39,7 @@ i poprawne dane w ka pozycji, kt鏎e s sformatowane niepoprawnie lub posiadaj inne nie daj帷e si skorygowa b喚dy. .P -Kontrolowane jest czy ka盥a pozycja posiada +Kontrolowane jest czy ka盥a pozycja posiada: .sp .in +.5i - w豉軼iw liczb p鏊 @@ -75,29 +75,31 @@ u oraz \fI/etc/gshadow\fR wed逝g GID. By w陰czy tryb sortowania nale篡 przekaza opcj \fB-s\fR. Nie s wtedy przeprowadzane 瘸dne kontrole, tylko sortowanie. .SH PLIKI -.IR /etc/group " - informacja o kontach grup" +\fI/etc/group\fR \- informacja o kontach grup .br -.IR /etc/gshadow " - zakodowana informacja o has豉ch i administratorach grup" +\fI/etc/gshadow\fR \- zakodowana informacja o has豉ch i administratorach grup +.br +\fI/etc/passwd\fR \-informacja o u篡tkownikach +.SH KOD ZAKO哸ZENIA +.TP 2 +Polecenie \fBgrpck\fR ko鎍zy dzia豉nie z nast瘼uj帷ymi warto軼iami kod闚 zako鎍zenia: +.br +\fB0\fR \- powodzenie +.br +\fB1\fR \- niew豉軼iwa sk豉dnia parametr闚 polecenia +.br +\fB2\fR \- jedna lub wi璚ej z造ch pozycji pliku grup +.br +\fB3\fR \- niemo磧iwe otwarcie plik闚 grup +.br +\fB4\fR \- niemo磧iwa blokada plik闚 grup +.br +\fB5\fR \- niemo磧iwa aktualizacja plik闚 grup .br -.IR /etc/passwd " -informacja o u篡tkownikach" .SH ZOBACZ TAK浩 .BR group (5), .BR passwd (5), .BR shadow (5), .BR groupmod (8) -.SH DIAGNOSTYKA -Polecenie \fBgrpck\fR ko鎍zy prac z nast瘼uj帷ymi warto軼iami kod闚: -.IP 0 5 -Powodzenie -.IP 1 5 -B陰d sk豉dni -.IP 2 5 -Jedna lub wi璚ej z造ch pozycji pliku grup -.IP 3 5 -Niemo磧iwe otwarcie plik闚 grup -.IP 4 5 -Niemo磧iwa blokada plik闚 grup -.IP 5 5 -Niemo磧iwa aktualizacja plik闚 grup .SH AUTOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/pl/id.1 b/man/pl/id.1 index 97b4281a..93eaed0e 100644 --- a/man/pl/id.1 +++ b/man/pl/id.1 @@ -1,4 +1,4 @@ -.\" $Id: id.1,v 1.7 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: id.1,v 1.8 2003/04/26 13:24:15 kloczek Exp $ .\" {PTM/WK/1999-09-25} .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. @@ -40,9 +40,9 @@ lub \fI/etc/group\fR, to zostanie wy U篡vie opcji \fB-a\fR powoduje wy鈍ietlenie zestaw grup w systemach, kt鏎e obs逝guj r闚noczesne cz這nkostwo w wielu grupach. .SH PLIKI -/etc/passwd \- informacja o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -/etc/group \- informacja o grupach +\fI/etc/group\fR \- informacja o grupach .SH ZOBACZ TAK浩 .BR getgid (2), .BR getgroups (2), diff --git a/man/pl/lastlog.8 b/man/pl/lastlog.8 index e42b35b2..f04fe210 100644 --- a/man/pl/lastlog.8 +++ b/man/pl/lastlog.8 @@ -1,4 +1,4 @@ -.\" $Id: lastlog.8,v 1.5 2001/01/27 02:55:54 kloczek Exp $ +.\" $Id: lastlog.8,v 1.8 2003/04/28 06:38:54 kloczek Exp $ .\" {PTM/WK/1999-09-18} .\" Copyright 1992, Phillip Street and Julianne Frances Haugh .\" All rights reserved. @@ -33,14 +33,14 @@ lastlog \- sprawd plik ostatnich logowa (lastlog) .SH SKｘDNIA .TP 8 -\fBlastlog\fR [<\fB-u\fR|\fB--user\fR> \fIlogin-u篡tkownika\fR] -[<\fB-t\fR|\fB--time\fR> \fIdni\fR] [<\fB-h\fR|\fB--help\fR>] +\fBlastlog\fR [(\fB-u\fR|\fB--user\fR) \fIlogin\fR] +[(\fB-t\fR|\fB--time\fR) \fIdni\fR] [(\fB-h\fR|\fB--help\fR)] .SH OPIS \fBlastlog\fR formatuje i wy鈍ietla zawarto嗆 dziennika ostatnich logowa zapisanych w pliku \fI/var/log/lastlog\fR. Wy鈍ietlone zostan \fBnazwa u篡tkownika\fR, \fBport\fR i \fBczas ostatniego logowania\fR. Domy郵nie (bez -flag) pozycje pliku wy鈍ietlane s w kolejno軼i identyfikator闚 u篡tkownik闚 -(UID). +flag) pozycje pliku wy鈍ietlane s w kolejno軼i w jakiej s w pliku +\fB/etc/passwd\fR. .TP \fB-u\fR, \fB--user\fR \fIlogin-u篡tkownika\fR spowoduje wy鈍ietlenie tylko pozycji opisuj帷ej ostatnie rozpocz璚ie sesji tylko dla u篡tkownika @@ -58,7 +58,7 @@ Je zostanie wy鈍ietlony komunikat \fB"**Never logged in**"\fR (nigdy si nie logowa). .SH PLIKI -\fI/var/log/lastlog\fR " - dziennik ostatnich logowa" +\fI/var/log/lastlog\fR \- dziennik ostatnich logowa .SH PRZESTROGI Du瞠 luki w numeracji UID powoduj, 瞠 program b璠zie pracowa d逝瞠j, nie wy鈍ietlaj帷 wynik闚 (np. je郵i mmdf=800, za ostatni uid=170, to program diff --git a/man/pl/login.1 b/man/pl/login.1 index 16d19582..9233f4ef 100644 --- a/man/pl/login.1 +++ b/man/pl/login.1 @@ -1,4 +1,4 @@ -.\" $Id: login.1,v 1.7 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: login.1,v 1.9 2003/04/26 13:24:15 kloczek Exp $ .\" {PTM/WK/1999-09-25} .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. @@ -119,29 +119,27 @@ cz Po這瞠nie plik闚 mo瞠 by r騜ne w zale積o軼i od konfiguracji systemu. .SH PLIKI .br -/etc/utmp \- lista bie膨cych sesji pracy +\fI/var/run/utmp\fR \- lista bie膨cych sesji pracy .br -/etc/wtmp \- lista poprzednich sesji pracy +\fI/var/log/wtmp\fR \- lista poprzednich sesji pracy .br -/etc/passwd \- informacje o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacje o kontach u篡tkownik闚 .br -/etc/shadow \- zakodowane has豉 i informacje o ich wa積o軼i +\fI/etc/shadow\fR \- zakodowane has豉 i informacje o ich wa積o軼i .br -/etc/motd \- plik 'wiadomo軼i dnia' +\fI/etc/motd\fR \- plik 'wiadomo軼i dnia' .br -/etc/nologin \- zapobiega logowaniu innych ni root +\fI/etc/nologin\fR \- zapobiega logowaniu innych ni root .br -/etc/ttytype \- lista typ闚 terminali +\fI/etc/ttytype\fR \- lista typ闚 terminali .br -$HOME/.profile \- skrypt startowy domy郵nej pow這ki .br -$HOME/.hushlogin \- zapobiega wy鈍ietlaniu wiadomo軼i dnia +\fI$HOME/.hushlogin\fR \- zapobiega wy鈍ietlaniu wiadomo軼i dnia .SH ZOBACZ TAK浩 .BR mail (1), .BR passwd (1), .BR sh (1), .BR su (1), -.\" .BR d_passwd (5), .BR login.defs (5), .BR nologin (5), .BR passwd (5), diff --git a/man/pl/logoutd.8 b/man/pl/logoutd.8 index 50f8d3ae..3af4aa9b 100644 --- a/man/pl/logoutd.8 +++ b/man/pl/logoutd.8 @@ -1,4 +1,4 @@ -.\" $Id: logoutd.8,v 1.3 2001/01/25 10:43:54 kloczek Exp $ +.\" $Id: logoutd.8,v 1.4 2002/10/07 17:32:42 kloczek Exp $ .\" {PTM/WK/1999-09-17} .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. @@ -37,7 +37,7 @@ wymusza ograniczenia port .IR /etc/porttime . .B logoutd powinno by uruchamiane z \fI/etc/rc\fR. -Okresowo przegl康any jest plik \fI/etc/utmp\fR. Sprawdzana jest ka盥a nazwa +Okresowo przegl康any jest plik \fI/var/run/utmp\fR. Sprawdzana jest ka盥a nazwa u篡tkownika, by m鏂 stwierdzi czy posiada on zezwolenie na prac w bie膨cym czasie na danym porcie. Ka盥a sesja pracy (logowania) naruszaj帷a ograniczenia zawarte @@ -45,6 +45,6 @@ w \fI/etc/porttime\fR jest ko .SH PLIKI .IR /etc/porttime " - zezwolenia dla logowania na portach" .br -.IR /etc/utmp " - bie膨ce sesje pracy" +.IR /var/run/utmp " - bie膨ce sesje pracy" .SH AUTOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/pl/newgrp.1 b/man/pl/newgrp.1 index ba1b0077..5230e86b 100644 --- a/man/pl/newgrp.1 +++ b/man/pl/newgrp.1 @@ -1,4 +1,4 @@ -.\" $Id: newgrp.1,v 1.7 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: newgrp.1,v 1.8 2003/04/26 13:24:15 kloczek Exp $ .\" {PTM/WK/1999-09-15} .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. @@ -60,9 +60,9 @@ now \fBsg\fR, wi璚 po zako鎍zeniu \fBsg\fR u篡tkownik powraca do swego poprzedniego identyfikatora grupy. .SH PLIKI -/etc/passwd \- informacja o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -/etc/group \- informacja o grupach +\fI/etc/group\fR \- informacja o grupach .SH ZOBACZ TAK浩 .BR id (1), .BR login (1), diff --git a/man/pl/passwd.1 b/man/pl/passwd.1 index 31dfea11..2d0eafdf 100644 --- a/man/pl/passwd.1 +++ b/man/pl/passwd.1 @@ -1,4 +1,4 @@ -.\" $Id: passwd.1,v 1.9 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: passwd.1,v 1.11 2003/04/28 17:52:15 kloczek Exp $ .\" Translation (c) 1999 Wojtek Kotwica .\" (c) 2002 Andrzej Krzysztofowicz .\" @@ -183,9 +183,26 @@ wygodnie. U篡tkownicy mog nie m鏂 zmieni has豉 w systemie przy w陰czonym NIS, je郵i nie s zalogowani do serwera NIS. .SH PLIKI -/etc/passwd \- informacja o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -/etc/shadow \- zakodowane has豉 u篡tkownik闚 +\fI/etc/shadow\fR \- zakodowane has豉 u篡tkownik闚 +.SH KOD ZAKO哸ZENIA +.TP 2 +Polecenie \fBpasswd\fR ko鎍zy dzia豉nie z nast瘼uj帷ymi warto軼iami kod闚 zako鎍zenia: +.br +\fB0\fR \- powodzenie +.br +\fB1\fR \- permission denied +.br +\fB2\fR \- niew豉軼iwa sk豉dnia parametr闚 polecenia +.br +\fB3\fR \- nieoczekiwanie niepowodzenie, nic nie zosta這 wykonane +.br +\fB4\fR \- nieoczekiwanie niepowodzenie, brakuje pliku passwd +.br +\fB5\fR \- passwd file busy, try again later +.br +\fB6\fR \- niew豉軼iwe parametry opcji .SH "ZOBACZ TAK浩" .BR group (5), .BR passwd (5) diff --git a/man/pl/pwauth.8 b/man/pl/pwauth.8 deleted file mode 100644 index f4078c09..00000000 --- a/man/pl/pwauth.8 +++ /dev/null @@ -1,63 +0,0 @@ -.\" $Id: pwauth.8,v 1.4 2002/03/09 11:16:20 ankry Exp $ -.\" {PTM/WK/1999-09-15} -.\" Copyright 1992, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.TH PWAUTH 8 -.SH NAZWA -pwauth \- definiowane przez administratora uwierzytelnianie hase -.SH OPIS -Administrator systemu mo瞠 zdefiniowa list program闚, jakie s u篡wane -do potwierdzenia to窺amo軼i u篡tkownika. -Programy te podawane s zamiast informacji o zakodowanym ha郵e obecnej -w pliku \fI/etc/passwd\fR albo \fI/etc/shadow\fR. -Narz璠zia administruj帷e kontami u篡tkownik闚 sprawdzaj pole zakodowanego -has豉 i stwierdzaj czy u篡tkownik posiada zdefiniowany przez administratora -program uwierzytelniaj帷y (autentykuj帷y). -Funkcja \fBpw_auth\fR zostanie wywo豉na ka盥orazowo, gdy jeden z tych -program闚 administracyjnych stwierdzi, 瞠 zmieniany u篡tkownik posiada -zdefiniowane programy uwierzytelniania. -.PP -Pocz徠kowy wpis tworzony jest przez polecenie \fBuseradd\fR. -Zmiany, takie jak zmiana informacji autentykuj帷ej lub usuni璚ie konta -u篡tkownika, spowoduj wywo豉nie funkcji \fBpw_auth\fR. Pozwala to -na utrzymanie aktualno軼i informacji dla ka盥ego konta. -.PP -Programy uwierzytelniaj帷e nie tworz sesji pracy (loginowych) ani -sesji sieciowych. Kod zako鎍zenia programu uwierzytelniaj帷ego jest -wskazaniem czy akcja b璠zie dozwolona. -Proces wo豉j帷y musi posiada odpowiednie uprawnienia do samodzielnego -utworzenia sesji pracy lub sesji sieciowej. -.SH ZOBACZ TAK浩 -.BR login (1), -.BR passwd (1), -.BR su (1), -.BR pw_auth (3), -.BR useradd (8), -.BR userdel (8), -.BR usermod (8) -.SH AUTOR -Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/pl/pwck.8 b/man/pl/pwck.8 index bda75aba..bd0f80bd 100644 --- a/man/pl/pwck.8 +++ b/man/pl/pwck.8 @@ -1,4 +1,4 @@ -.\" $Id: pwck.8,v 1.4 2001/08/14 21:11:19 malekith Exp $ +.\" $Id: pwck.8,v 1.5 2003/04/28 17:52:15 kloczek Exp $ .\" {PTM/WK/1999-09-14} .\" Copyright 1992, Julianne Frances Haugh .\" All rights reserved. @@ -39,7 +39,7 @@ i poprawne dane w ka pozycji, kt鏎e s sformatowane niepoprawnie lub posiadaj inne nie daj帷e si skorygowa b喚dy. .P -Kontrolowane jest czy ka盥a pozycja posiada +Kontrolowane jest czy ka盥a pozycja posiada: .sp .in +.5i - w豉軼iw liczb p鏊 @@ -81,30 +81,30 @@ u oraz \fI/etc/shadow\fR wed逝g UID. By w陰czy tryb sortowania nale篡 przekaza opcj \fB-s\fR. Nie s wtedy przeprowadzane 瘸dne kontrole, tylko sortowanie. .SH PLIKI -.IR /etc/passwd " - informacja o kontach u篡tkownik闚" +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -.IR /etc/shadow " - zakodowana informacja o has豉ch" +\fI/etc/shadow\fR \- zakodowana informacja o has豉ch .br -.IR /etc/group " - informacja o grupach" +\fI/etc/group\fR \- informacja o grupach +.SH KOD ZAKO哸ZENIA +.TP 2 +Polecenie \fBpwck\fR ko鎍zy dzia豉nie z nast瘼uj帷ymi warto軼iami kod闚 zako鎍zenia: +.br +\fB0\fR \- powodzenie +.br +\fB1\fR \- niew豉軼iwa sk豉dnia parametr闚 polecenia +.br +\fB2\fR \- jedna lub wi璚ej z造ch pozycji pliku hase +.br +\fB3\fR \- niemo磧iwe otwarcie plik闚 hase +.br +\fB4\fR \- niemo磧iwa blokada plik闚 hase +.br +\fB5\fR \- niemo磧iwa aktualizacja plik闚 hase .SH ZOBACZ TAK浩 .BR usermod (8), .BR group (5), .BR passwd (5), .BR shadow (5) -.SH DIAGNOSTYKA -Polecenie \fBpwck\fR ko鎍zy prac z nast瘼uj帷ymi warto軼iami kod闚 -zako鎍zenia: -.IP 0 5 -Powodzenie -.IP 1 5 -B陰d sk豉dni -.IP 2 5 -Jedna lub wi璚ej z造ch pozycji pliku hase -.IP 3 5 -Niemo磧iwe otwarcie plik闚 hase -.IP 4 5 -Niemo磧iwa blokada plik闚 hase -.IP 5 5 -Niemo磧iwa aktualizacja plik闚 hase .SH AUTOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/pl/shadow.3 b/man/pl/shadow.3 index 3d447a95..fc144642 100644 --- a/man/pl/shadow.3 +++ b/man/pl/shadow.3 @@ -1,4 +1,4 @@ -.\" $Id: shadow.3,v 1.3 2001/01/25 10:43:54 kloczek Exp $ +.\" $Id: shadow.3,v 1.4 2003/01/07 14:32:57 kloczek Exp $ .\" {PTM/WK/1999-09-16} .\" Copyright 1989 - 1993, Julianne Frances Haugh .\" All rights reserved. @@ -63,23 +63,23 @@ Plik \fI#include\fR opisuje struktur struct spwd { .in +.4i .br -char *sp_namp; /* nazwa u篡tkownika (login) */ + char *sp_namp; /* nazwa u篡tkownika (login) */ .br -char *sp_pwdp; /* zakodowane has這 */ + char *sp_pwdp; /* zakodowane has這 */ .br -long sp_lstchg; /* ostatnia zmiana has豉 */ + long int sp_lstchg; /* ostatnia zmiana has豉 */ .br -int sp_min; /* dni do dozwolonej zmiany */ + long int sp_min; /* dni do dozwolonej zmiany */ .br -int sp_max; /* dni przed wymagan zmian */ + long int sp_max; /* dni przed wymagan zmian */ .br -int sp_warn; /* dni ostrze瞠nia o wyga郾i璚iu */ + long int sp_warn; /* dni ostrze瞠nia o wyga郾i璚iu */ .br -int sp_inact; /* dni przed wy陰czeniem konta */ + long int sp_inact; /* dni przed wy陰czeniem konta */ .br -int sp_expire; /* data wa積o軼i konta */ + long int sp_expire; /* data wa積o軼i konta */ .br -int sp_flag; /* zarezerwowane do przysz貫go u篡tku */ + unsigned long int sp_flag; /* zarezerwowane do przysz貫go u篡tku */ .br .in -.5i } diff --git a/man/pl/su.1 b/man/pl/su.1 index a180569a..9f5e1c66 100644 --- a/man/pl/su.1 +++ b/man/pl/su.1 @@ -1,4 +1,4 @@ -.\" $Id: su.1,v 1.7 2002/03/09 19:24:25 ankry Exp $ +.\" $Id: su.1,v 1.8 2003/04/26 13:24:15 kloczek Exp $ .\" {PTM/WK/1999-09-25} .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. @@ -64,11 +64,9 @@ katalog g Niniejsza wersja \fBsu\fR posiada wiele opcji kompilacji, z kt鏎ych tylko cz窷 b璠zie mie zastosowanie w danej instalacji. .SH PLIKI -/etc/passwd \- informacje o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacje o kontach u篡tkownik闚 .br -/etc/shadow \- zakodowane has豉 i informacje o ich wa積o軼i -.br -$HOME/.profile \- plik startowy dla domy郵nej pow這ki +\fI/etc/shadow\fR \- zakodowane has豉 i informacje o ich wa積o軼i .SH ZOBACZ TAK浩 .BR login (1), .BR sh (1), diff --git a/man/pl/sulogin.8 b/man/pl/sulogin.8 index c2fe5396..71af1fc0 100644 --- a/man/pl/sulogin.8 +++ b/man/pl/sulogin.8 @@ -1,4 +1,4 @@ -.\" $Id: sulogin.8,v 1.4 2002/03/09 11:16:23 ankry Exp $ +.\" $Id: sulogin.8,v 1.5 2003/04/26 13:24:15 kloczek Exp $ .\" {PTM/WK/1999-09-14} .\" Copyright 1989 - 1992, Julianne Frances Haugh .\" All rights reserved. @@ -82,8 +82,6 @@ nie funkcjonowa .IR /etc/passwd " - informacja o kontach u篡tkownik闚" .br .IR /etc/shadow " - zakodowane has豉 i informacja o ich wa積o軼i" -.br -.IR /.profile " - skrypt startowy dla pow這ki trybu jednou篡tkownikowego" .SH ZOBACZ TAK浩 .BR login (1), .BR sh (1), diff --git a/man/pl/useradd.8 b/man/pl/useradd.8 index 0f6cd392..7eeca34b 100644 --- a/man/pl/useradd.8 +++ b/man/pl/useradd.8 @@ -1,4 +1,4 @@ -.\" $Id: useradd.8,v 1.10 2002/03/09 11:16:23 ankry Exp $ +.\" $Id: useradd.8,v 1.15 2004/01/13 00:34:16 kloczek Exp $ .\" {PTM/WK/0.1/VIII-1999} .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. @@ -35,9 +35,9 @@ useradd - tw .br [\fB-e\fR \fIdata_wa積o軼i\fR] [\fB-f\fR \fIdni_nieaktywno軼i\fR] .br -[\fB-g\fR \fIgrupa_pocz徠kowa\fR] [\fB-G\fR \fIgrupa [,...]\fR] +[\fB-g\fR \fIgrupa_pocz徠kowa\fR] [\fB-G\fR \fIgrupa\fR[,...]] .br -[\fB-m\fR [\fB-k\fR \fIkatalog_wzorc闚\fR]] [\fB-o\fR] [\fB-p\fR \fIhas這\fR] +[[\fB-M\fR] \fB-m\fR [\fB-k\fR \fIkatalog_wzorc闚\fR]] [\fB-o\fR] [\fB-p\fR \fIhas這\fR] .br [\fB-s\fR \fIpow這ka\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR .TP 8 @@ -90,6 +90,11 @@ Ka Do grup odnosz si te same ograniczenia, kt鏎e obowi您uj przy grupie podanej w opcji \fB-g\fR. Domy郵nie u篡tkownik nale篡 tylko do grupy pocz徠kowej. +.IP \fB-M\fR +RedHat doda opcj CREATE_HOME w pliku login.defs w swojej wersji shadow-utils, +kt鏎a powodowa豉 domy郵ne u篡cie \fB-m\fR - ta opcja wy陰cza to. U篡wanie jej +znajduje zastosowanie np. w skryptach, lecz mo瞠 by powodem niezgodno軼i +z innymi wersjami shadow-utils. .IP \fB-m\fR Je郵i nie istnieje katalog domowy u篡tkownika, to zostanie on utworzony. Je郵i pos逝穎no si opcj \fB-k\fR, to b璠 do niego przekopiowane wzorcowe @@ -149,15 +154,38 @@ plik Nie mo瞠sz doda u篡tkownika do grupy NIS. Musi to zosta wykonane na serwerze NIS. .SH PLIKI -.IR /etc/passwd " - informacja o kontach u篡tkownik闚" +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -.IR /etc/shadow " - bezpieczna informacja o kontach u篡tkownik闚" +\fI/etc/shadow\fR \- bezpieczna informacja o kontach u篡tkownik闚 .br -.IR /etc/group " - informacja o grupach" +\fI/etc/group\fR \- informacja o grupach .br -.IR /etc/default/useradd " - informacja o ustawieniach domy郵nych" +\fI/etc/default/useradd\fR \- informacja o ustawieniach domy郵nych .br -.IR /etc/skel " - katalog zawieraj帷y pliki domy郵ne" +\fI/etc/skel/\fR \- katalog zawieraj帷y pliki domy郵ne +.SH KOD ZAKO哸ZENIA +.TP 2 +Polecenie \fBuseadd\fR ko鎍zy dzia豉nie z nast瘼uj帷ymi warto軼iami kod闚 zako鎍zenia: +.br +\fB0\fR \- powodzenie +.br +\fB1\fR \- nie mo積a zaktualizowa pliku z has豉mi +.br +\fB2\fR \- niew豉軼iwa sk豉dnia parametr闚 polecenia +.br +\fB3\fR \- niew豉軼iwe parametry opcji +.br +\fB4\fR \- uid jest ju u篡wany (i nie u篡to opcji -o) +.br +\fB6\fR \- podana grupa nie istnieje +.br +\fB9\fR \- podany login jest ju u篡wany +.br +\fB10\fR \- nie mo積a zaktualizowa pliku z grupami +.br +\fB12\fR \- nie mo積a utworzy katalogu domowego +.br +\fB13\fR \- nie mo積a utworzy spoola pocztowego .SH ZOBACZ TAK浩 .BR chfn (1), .BR chsh (1), @@ -170,9 +198,3 @@ na serwerze NIS. .BR usermod (8) .SH AUTOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) -.SH OD TΣMACZA -Niniejsza dokumentacja opisuje polecenie wchodz帷e w sk豉d pakietu -shadow. -Istnieje wiele program闚 i skrypt闚 do zarz康zania kontami -u篡tkownik闚 czy grup. Z uwagi na powtarzaj帷e si nazwy polece, upewnij -si, 瞠 korzystasz z w豉軼iwej dokumentacji. diff --git a/man/pl/userdel.8 b/man/pl/userdel.8 index e421d35b..c5c0ebe9 100644 --- a/man/pl/userdel.8 +++ b/man/pl/userdel.8 @@ -1,4 +1,4 @@ -.\" $Id: userdel.8,v 1.8 2002/03/09 11:16:24 ankry Exp $ +.\" $Id: userdel.8,v 1.9 2003/04/28 17:52:15 kloczek Exp $ .\" {PTM/WK/0.1/VIII-1999} .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. @@ -42,11 +42,28 @@ Zostan i sam ten katalog. Pliki po這穎ne w innym systemie plik闚 musz by odszukane i usuni皻e r璚znie. .SH PLIKI -.IR /etc/passwd " - informacja o kontach u篡tkownik闚" +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -.IR /etc/shadow " - bezpieczna informacja o kontach u篡tkownik闚" +\fI/etc/shadow\fR \- bezpieczna informacja o kontach u篡tkownik闚 .br -.IR /etc/group " - informacja o grupach" +\fI/etc/group\fR \- informacja o grupach +.SH KOD ZAKO哸ZENIA +.TP 2 +Polecenie \fBuserdel\fR ko鎍zy dzia豉nie z nast瘼uj帷ymi warto軼iami kod闚 zako鎍zenia: +.br +\fB0\fR \- powodzenie +.br +\fB1\fR \- nie mo積a zaktualizowa pliku z has豉mi +.br +\fB2\fR \- niew豉軼iwa sk豉dnia parametr闚 polecenia +.br +\fB6\fR \- podany u篡tkownik nie istnieje +.br +\fB8\fR \- u篡tkownik jest aktualnie zalogowany +.br +\fB10\fR \- nie mo積a zaktualizowa pliku z grupami +.br +\fB12\fR \- nie mo積a usun望 katalogu domowego .SH PRZESTROGI \fBuserdel\fR nie pozwoli na usuni璚ie konta aktualnie zalogowanego u篡tkownika. Musisz usun望 wszystkie uruchomione procesy nale膨ce @@ -64,8 +81,3 @@ Musi to zosta .BR usermod (8) .SH AUTOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) -.SH OD TΣMACZA -Niniejsza dokumentacja opisuje polecenie wchodz帷e w sk豉d pakietu shadow. -Istnieje wiele program闚 i skrypt闚 do zarz康zania kontami u篡tkownik闚 czy -grup. Z uwagi na powtarzaj帷e si nazwy polece, upewnij si, 瞠 korzystasz -z w豉軼iwej dokumentacji. diff --git a/man/pl/usermod.8 b/man/pl/usermod.8 index 778a64f6..c1a0ffbc 100644 --- a/man/pl/usermod.8 +++ b/man/pl/usermod.8 @@ -1,4 +1,4 @@ -.\" $Id: usermod.8,v 1.7 2002/03/09 11:16:24 ankry Exp $ +.\" $Id: usermod.8,v 1.9 2003/04/28 17:55:22 kloczek Exp $ .\" {PTM/WK/0.1/VIII-1999} .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. @@ -119,11 +119,11 @@ W W豉郾iciela zada at musisz zmieni r璚znie. Jakiekolwiek zmiany dotycz帷e NIS musisz wykona na serwerze NIS. .SH PLIKI -.IR /etc/passwd " - informacja o kontach u篡tkownik闚" +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -.IR /etc/shadow " - bezpieczna informacja o kontach u篡tkownik闚" +\fI/etc/shadow\fR \- bezpieczna informacja o kontach u篡tkownik闚 .br -.IR /etc/group " - informacja o grupach" +\fI/etc/group\fR \- informacja o grupach .SH ZOBACZ TAK浩 .BR chfn (1), .BR chsh (1), @@ -135,8 +135,3 @@ Jakiekolwiek zmiany dotycz .BR userdel (8) .SH AUTOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) -.SH OD TΣMACZA -Niniejsza dokumentacja opisuje polecenie wchodz帷e w sk豉d pakietu shadow. -Istnieje wiele program闚 i skrypt闚 do zarz康zania kontami u篡tkownik闚 czy -grup. Z uwagi na powtarzaj帷e si nazwy polece, upewnij si, 瞠 korzystasz -z w豉軼iwej dokumentacji. diff --git a/man/porttime.5 b/man/porttime.5 index 12f43974..3c64cf15 100644 --- a/man/porttime.5 +++ b/man/porttime.5 @@ -1,4 +1,4 @@ -.\"$Id: porttime.5,v 1.7 2001/01/25 10:43:51 kloczek Exp $ +.\"$Id: porttime.5,v 1.9 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,23 +29,22 @@ .SH NAME porttime \- port access time file .SH DESCRIPTION -.I porttime -contains a list of tty devices, user names, and permitted login times. +\fIporttime\fR contains a list of tty devices, user names, and permitted +login times. .PP -Each entry consists of three colon separated fields. -The first field is a comma separated list of tty devices, -or an asterisk to indicate that all tty devices are matched by this entry. -The second field is a comma separated list of user names, or an -asterisk to indicated that all user names are matched by this entry. -The third field is a comma separated list of permitted access times. +Each entry consists of three colon separated fields. The first field is a +comma separated list of tty devices, or an asterisk to indicate that all tty +devices are matched by this entry. The second field is a comma separated +list of user names, or an asterisk to indicated that all user names are +matched by this entry. The third field is a comma separated list of +permitted access times. .PP Each access time entry consists of zero or more days of the week, abbreviated \fBSu\fR, \fBMo\fR, \fBTu\fR, \fBWe\fR, \fBTh\fR, \fBFr\fR, and \fBSa\fR, followed by a pair of times separated by -a hyphen. -The abbreviation \fBWk\fR may be used to represent Monday thru Friday, -and \fBAl\fR may be used to indicate every day. -If no days are given, \fBAl\fR is assumed. +a hyphen. The abbreviation \fBWk\fR may be used to represent Monday thru +Friday, and \fBAl\fR may be used to indicate every day. If no days are +given, \fBAl\fR is assumed. .SH EXAMPLES The following entry allows access to user \fBjfh\fR on every port during weekdays from 9am to 5pm. @@ -55,11 +54,9 @@ during weekdays from 9am to 5pm. .br .sp 1 The following entries allow access only to the users \fBroot\fR and -\fBoper\fR on /dev/console at any time. -This illustrates how the -\fI/etc/porttime\fR file is an ordered list of access times. -Any other user would match the second entry which does not permit -access at any time. +\fBoper\fR on /dev/console at any time. This illustrates how the +\fI/etc/porttime\fR file is an ordered list of access times. Any other user +would match the second entry which does not permit access at any time. .br .sp 1 console:root,oper:Al0000-2400 @@ -67,15 +64,15 @@ access at any time. console:*: .br .sp 1 -The following entry allows access for the user \fBgames\fR on any -port during non-working hours. +The following entry allows access for the user \fBgames\fR on any port +during non-working hours. .br .sp 1 *:games:Wk1700-0900,SaSu0000-2400 .br .sp 1 .SH FILES -/etc/porttime \- file containing port access times +\fI/etc/porttime\fR \ - file containing port access times .SH SEE ALSO .BR login (1) .SH AUTHOR diff --git a/man/pt_BR/Makefile.in b/man/pt_BR/Makefile.in index d0ad33d7..6144a49c 100644 --- a/man/pt_BR/Makefile.in +++ b/man/pt_BR/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,100 +14,144 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ mandir = @mandir@/pt_BR +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ man_MANS = \ gpasswd.1 \ @@ -118,6 +163,7 @@ man_MANS = \ EXTRA_DIST = $(man_MANS) subdir = man/pt_BR +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -125,10 +171,15 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/pt_BR/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: -rm -f *.lo @@ -138,13 +189,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/pt_BR/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status uninstall-info-am: man1dir = $(mandir)/man1 @@ -162,6 +206,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -179,6 +227,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -201,6 +253,10 @@ install-man5: $(man5_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -218,6 +274,10 @@ uninstall-man5: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -240,6 +300,10 @@ install-man8: $(man8_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -257,6 +321,10 @@ uninstall-man8: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -266,6 +334,8 @@ uninstall-man8: tags: TAGS TAGS: +ctags: CTAGS +CTAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -273,15 +343,26 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -294,7 +375,6 @@ all-am: Makefile $(MANS) installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -306,6 +386,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -313,7 +394,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -323,7 +404,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -345,13 +426,21 @@ install-man: install-man1 install-man5 install-man8 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 @@ -363,9 +452,9 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 install-info-am install-man install-man1 install-man5 \ install-man8 install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-man5 uninstall-man8 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man5 uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/pt_BR/gpasswd.1 b/man/pt_BR/gpasswd.1 index 05bdf1b0..aaf631be 100644 --- a/man/pt_BR/gpasswd.1 +++ b/man/pt_BR/gpasswd.1 @@ -22,11 +22,11 @@ .\" Foundation, Inc., 675 mass Ave, Cambridge, MA 02139 USA ou .\" em portugu瘰 na Conectiva Inform嫢ica - http://www.conectiva.com.br .\" -.\" $Id: gpasswd.1,v 1.1 2001/01/31 07:06:23 kloczek Exp $ +.\" $Id: gpasswd.1,v 1.2 2003/04/26 13:24:16 kloczek Exp $ .\" .TH GPASSWD 1 .SH NOME -gpasswd \- administra o arquivo /etc/group +gpasswd \- administra o arquivo \fI/etc/group\fR .br .SH SINOSPE .B gpasswd \fIgrupo\fR @@ -57,11 +57,12 @@ gpasswd \- administra o arquivo /etc/group .SH DESCRIЫO O .B gpasswd - utilizado para administrar o arquivo /etc/group (e o arquivo /etc/gshadow, -caso compilado com SHADOWGRP). -Todos os grupos podem ter administradores, membros e uma senha. O administrador -do sistema pode usar a op誽o \fB-A\fR para definir o administrador do grupo e \fB-M\fR para definir os membros e todos os seus direitos assim como os do -administrador. + utilizado para administrar o arquivo \fI/etc/group\fR (e o arquivo +\fI/etc/gshadow\fR, caso compilado com SHADOWGRP). +Todos os grupos podem ter administradores, membros e uma senha. O +administrador do sistema pode usar a op誽o \fB-A\fR para definir o +administrador do grupo e \fB-M\fR para definir os membros e todos os seus +direitos assim como os do administrador. .PP Administradores de grupos podem adicionar e excluir usu嫫ios utilizando as op踥es \fB-a\fR e \fB-d\fR respectivamente. Administradores podem usar a op誽o @@ -81,9 +82,9 @@ solicitar esteja habilitado para outros usu嫫ios do grupo sem o uso de senha, n緌 membros podem tamb幦 executar o comando, informando por幦 a senha do grupo. .SH ARQUIVOS -/etc/group \- informa踥es do grupo +\fI/etc/group\fR \- informa踥es do grupo .br -/etc/gshadow \- informa踥es do grupo em arquivo shadow +\fI/etc/gshadow\fR \- informa踥es do grupo em arquivo shadow .SH VEJA TAMB丏 .BR newgrp (1), .BR groupadd (8), diff --git a/man/pt_BR/groupadd.8 b/man/pt_BR/groupadd.8 index dfd85045..bee0e3a5 100644 --- a/man/pt_BR/groupadd.8 +++ b/man/pt_BR/groupadd.8 @@ -25,15 +25,13 @@ .\" .\" .\" -.\" $Id: groupadd.8,v 1.2 2002/03/09 11:16:27 ankry Exp $ +.\" $Id: groupadd.8,v 1.4 2004/01/05 01:08:34 kloczek Exp $ .\" .TH GROUPADD 8 .SH NOME groupadd \- Criar um novo grupo .SH SINOPSE -.B groupadd -[\fB-g\fI gid \fR[\fB-o\fR]] [\fB-r\fR] [\fB-f\fR] -.I grupo +\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] \fIgrupo\fR .SH DESCRIЫO O comando \fBgroupadd\fR cria um novo grupo usando valores especificados na linha de comando e os valores padr髊s do sistema. O novo grupo ser criado nos arquivos do sistema, conforme o requerido. As op踥es que aplicam-se ao comando \fBgroupadd\fR s緌 .IP "\fB-g \fIgid\fR" @@ -50,9 +48,9 @@ Este Esta op誽o tamb幦 modifica o modo como a op誽o \fB-g\fR funciona. Ao solicitar um \fIgid\fR que n緌 seja nico e ao n緌 informar a op誽o \fB-o\fR, a cria誽o do grupo , a cria誽o ter o comportamento padr緌 (adicionando um grupo como se as op踥es \fB-g\fR ou \fB-o\fR \fBn緌\fR fossem especificadas). .br .SH ARQUIVOS -/etc/group \- informa踥es sobre o grupo +\fI/etc/group\fR \- informa踥es sobre o grupo .br -/etc/gshadow \- informa踥es seguras sobre o grupo +\fI/etc/gshadow\fR \- informa踥es seguras sobre o grupo .br .SH VEJA TAMB丏 .BR chfn (1), diff --git a/man/pt_BR/groupdel.8 b/man/pt_BR/groupdel.8 index 03294bbc..0eb75622 100644 --- a/man/pt_BR/groupdel.8 +++ b/man/pt_BR/groupdel.8 @@ -25,7 +25,7 @@ .\" Foundation, Inc., 675 mass Ave, Cambridge, MA 02139 USA ou .\" em portugu瘰 na Conectiva Inform嫢ica Ltda. - http://www.conectiva.com.br.\" .\" -.\" $Id: groupdel.8,v 1.2 2002/03/09 11:16:27 ankry Exp $ +.\" $Id: groupdel.8,v 1.3 2003/04/26 13:24:16 kloczek Exp $ .\" .TH GROUPDEL 8 .SH NOME @@ -40,9 +40,9 @@ Deve-se manualmente checar os sistemas de arquivos para garantir que nenhum dos .SH DICAS N緌 se deve remover o grupo prim嫫io de um grupo existente. Deve-se remover os usu嫫ios, antes de se remover o grupo. .SH ARQUIVOS -/etc/group \- informa踥es do grupo +\fI/etc/group\fR \- informa踥es do grupo .br -/etc/gshadow \- informa踥es seguras do grupo +\fI/etc/gshadow\fR \- informa踥es seguras do grupo .SH VEJA TAMB丏 .BR chfn (1), .BR chsh (1), diff --git a/man/pt_BR/groupmod.8 b/man/pt_BR/groupmod.8 index 94df2599..da2afadd 100644 --- a/man/pt_BR/groupmod.8 +++ b/man/pt_BR/groupmod.8 @@ -26,7 +26,7 @@ .\" .\" .\" -.\" $Id: groupmod.8,v 1.2 2002/03/09 11:16:27 ankry Exp $ +.\" $Id: groupmod.8,v 1.3 2003/04/26 13:24:16 kloczek Exp $ .\" .TH GROUPMOD 8 .SH NOME @@ -44,9 +44,9 @@ O valor num O nome do grupo ir ser alterado de \fIgroup\fR para \fInome_grupo\fR. .SH ARQUIVOS -/etc/group \- Informa踥es do grupo +\fI/etc/group\fR \- Informa踥es do grupo .br -/etc/gshadow \- informa踥es seguras do grupo +\fI/etc/gshadow\fR \- informa踥es seguras do grupo .SH VEJA TAMB丏 .BR chfn (1), .BR chsh (1), diff --git a/man/pt_BR/shadow.5 b/man/pt_BR/shadow.5 index 04a9a263..5e735083 100644 --- a/man/pt_BR/shadow.5 +++ b/man/pt_BR/shadow.5 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: shadow.5,v 1.2 2002/03/09 11:16:27 ankry Exp $ +.\" $Id: shadow.5,v 1.3 2003/04/26 13:24:16 kloczek Exp $ .\" .TH SHADOW 5 .SH NOME @@ -63,9 +63,9 @@ Esta informa .PP Este arquivo n緌 poder ser acessado por usu嫫ios comuns, caso deseje manter a seguran蓷 das senhas. .SH ARQUIVOS -/etc/passwd \- informa踥es das contas de usu嫫ios +\fI/etc/passwd\fR \- informa踥es das contas de usu嫫ios .br -/etc/shadow \- senhas de usu嫫ios criptografadas +\fI/etc/shadow\fR \- senhas de usu嫫ios criptografadas .SH VEJA TAMB丏 .BR chage (1), .BR login (1), diff --git a/man/pwauth.8 b/man/pwauth.8 deleted file mode 100644 index c46c0a10..00000000 --- a/man/pwauth.8 +++ /dev/null @@ -1,65 +0,0 @@ -.\"$Id: pwauth.8,v 1.8 2002/03/08 04:39:11 kloczek Exp $ -.\" Copyright 1992, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.TH PWAUTH 8 -.SH NAME -pwauth \- administrator defined password authentication -.SH DESCRIPTION -The system administrator is able to define a list of programs which -are used to validate a user's identity. -These programs are given in place of the encrypted password -information which is present in either the \fI/etc/passwd\fR or -\fI/etc/shadow\fR files. -The utilities which administer user accounts examine the encrypted -password field and determine if the user has an administrator defined -authentication program. -The \fBpw_auth\fR function will be invoked whenever one of these -administration programs determines that a user which is being altered -has authentication programs defined. -.PP -The initial entry is created with the \fBuseradd\fR command. -Alterations, such as changing authentication information or deleting -the user account, will cause the \fBpw_auth\fR function to be invoked. -This keeps the authentication information up to date for each user -account. -.PP -The authentication programs do not create the actual login or network -sessions. -The exit code from the authentication program is taken as an -indication that the action is to be permitted. -The calling process must have the appropriate priviledges to create -the login or network session itself. -.SH SEE ALSO -.BR login (1), -.BR passwd (1), -.BR su (1), -.BR pw_auth (3), -.BR useradd (8), -.BR userdel (8), -.BR usermod (8) -.SH AUTHOR -Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/pwck.8 b/man/pwck.8 index 05902977..61542767 100644 --- a/man/pwck.8 +++ b/man/pwck.8 @@ -1,4 +1,4 @@ -.\"$Id: pwck.8,v 1.9 2002/03/08 04:39:12 kloczek Exp $ +.\"$Id: pwck.8,v 1.12 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -53,56 +53,52 @@ Checks are made to verify that each entry has - a valid login shell .in -.5i .sp -.P -The checks for correct number of fields and unique user name are fatal. -If the entry has the wrong number of fields, the user will be prompted to -delete the entire line. -If the user does not answer affirmatively, all further checks are bypassed. -An entry with a duplicated user name is prompted for deletion, but the -remaining checks will still be made. -All other errors are warning and the user is encouraged to run the +.PP +The checks for correct number of fields and unique user name are fatal. If +the entry has the wrong number of fields, the user will be prompted to +delete the entire line. If the user does not answer affirmatively, all +further checks are bypassed. An entry with a duplicated user name is +prompted for deletion, but the remaining checks will still be made. All +other errors are warning and the user is encouraged to run the \fBusermod\fR command to correct the error. -.P +.PP The commands which operate on the \fI/etc/passwd\fR file are not able to alter corrupted or duplicated entries. \fBpwck\fR should be used in those circumstances to remove the offending entry. .SH OPTIONS By default, \fBpwck\fR operates on the files \fI/etc/passwd\fR and -\fI/etc/shadow\fR. -The user may select alternate files with the \fIpasswd\fR and \fIshadow\fR -parameters. -Additionally, the user may execute the command in read-only mode by -specifying the \fB-r\fR flag. -This causes all questions regarding changes to be answered \fBno\fR -without user intervention. +\fI/etc/shadow\fR. The user may select alternate files with the \fIpasswd\fR +and \fIshadow\fR parameters. Additionally, the user may execute the command +in read-only mode by specifying the \fB-r\fR flag. This causes all questions +regarding changes to be answered \fBno\fR without user intervention. \fBpwck\fR can also sort entries in \fI/etc/passwd\fR and \fI/etc/shadow\fR by UID. To run it in sort mode pass it \fB-s\fR flag. No checks are performed then, it just sorts. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \- user account information .br -/etc/shadow \- encrypted password information +\fI/etc/shadow\fR \- encrypted password information .br -/etc/group \- group information +\fI/etc/group\fR \- group information .SH SEE ALSO .BR group (5), .BR passwd (5), .BR shadow (5), .BR usermod (8) -.SH DIAGNOSTICS +.SH EXIT VALUES +.TP 2 The \fBpwck\fR command exits with the following values: -.IP 0 5 -Success -.IP 1 5 -Syntax Error -.IP 2 5 -One or more bad password entries -.IP 3 5 -Cannot open password files -.IP 4 5 -Cannot lock password files -.IP 5 5 -Cannot update password files +\fB0\fR \- success +.br +\fB1\fR \- invalid command syntax +.br +\fB2\fR \- one or more bad password entries +.br +\fB3\fR \- can't open password files +.br +\fB4\fR \- can't lock password files +.br +\fB5\fR \- can't update password files .SH AUTHOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/pwconv.8 b/man/pwconv.8 index 0f13f969..2f02996e 100644 --- a/man/pwconv.8 +++ b/man/pwconv.8 @@ -1,61 +1,55 @@ -.\"$Id: pwconv.8,v 1.10 2002/03/08 04:39:12 kloczek Exp $ +.\"$Id: pwconv.8,v 1.11 2003/05/01 18:17:39 kloczek Exp $ .TH PWCONV 8 "26 Sep 1997" .SH NAME pwconv, pwunconv, grpconv, grpunconv \- convert to and from shadow passwords and groups. .SH SYNOPSIS -.B pwconv +\fBpwconv\fR .br -.B pwunconv +\fBpwunconv\fR .br -.B grpconv +\fBgrpconv\fR .br -.B grpunconv +\fBgrpunconv\fR .SH DESCRIPTION -These four programs all operate on the normal and shadow password and -group files: -.IR /etc/passwd ", " /etc/group ", " /etc/shadow ", and " /etc/gshadow . - -.B pwconv -.RI "creates " shadow " from " passwd " and an optionally existing " shadow . -.B pwunconv -.RI "creates " passwd " from " passwd " and " shadow " and then removes " shadow . -.B grpconv -.RI "creates " gshadow " from " group " and an optionally existing " gshadow . -.B grpunconv -.RI "creates " group " from " group " and " gshadow " and then removes " gshadow . - -Each program acquires the necessary locks before conversion. - -.BR pwconv " and " grpconv -are similiar. First, entries in the shadowed file which don't exist -in the main file are removed. Then, shadowed entries which don't have -`x' as the password in the main file are updated. Any missing -shadowed entries are added. Finally, passwords in the main file are -replaced with `x'. These programs can be used for initial conversion -as well to update the shadowed file if the main file is edited by -hand. - -.B pwconv -will use the values of -.BR PASS_MIN_DAYS ", " PASS_MAX_DAYS ", and " PASS_WARN_AGE -from -.I /etc/login.defs -when adding new entries to -.IR /etc/shadow . - -.RB "Likewise, " pwunconv " and " grpunconv -are similiar. Passwords in the main file are updated from the -shadowed file. Entries which exist in the main file but not in the -shadowed file are left alone. Finally, the shadowed file is removed. - -Some password aging information is lost by -.BR pwunconv . +\fBpwconv\fR creates \fIshadow\fR from \fIpasswd\fR and an optionally existing +\fIshadow\fR. +.PP +\fBpwunconv\fR creates \fIpasswd\fR from \fIpasswd\fR and \fIshadow\fR and then +removes \fIshadow\fR. +.PP +\fBgrpconv\fR creates \fIgshadow/fR from \fIgroup/fR and an optionally existing +\fIgshadow\fR. +.PP +\fBgrpunconv\fR creates \fIgroup\fR from \fIgroup\fR and \fIgshadow\fR and then +removes \fIgshadow\fR. +.PP +These four programs all operate on the normal and shadow password and group +files: \fI/etc/passwd\fR, \fI/etc/group\fR, \fI/etc/shadow\fR, and +\fI/etc/gshadow\fR. +.PP +.PP +Each program acquires the necessary locks before conversion. fBpwconv\fR and +\fBgrpconv\fR are similiar. First, entries in the shadowed file which don't +exist in the main file are removed. Then, shadowed entries which don't have +`x' as the password in the main file are updated. Any missing shadowed +entries are added. Finally, passwords in the main file are replaced with +`x'. These programs can be used for initial conversion as well to update the +shadowed file if the main file is edited by hand. +.PP +\fBpwconv\fR will use the values of fBPASS_MIN_DAYS\fR, \fBPASS_MAX_DAYS\fR, +and \fBPASS_WARN_AGE\fR from fI/etc/login.defs\fR when adding new entries +to \fI/etc/shadow\fR. +.PP +Likewise \fBpwunconv\fR and \fBgrpunconv\fR are similiar. Passwords in the +main file are updated from the shadowed file. Entries which exist in the +main file but not in the shadowed file are left alone. Finally, the shadowed +file is removed. Some password aging information is lost by fBpwunconv\fR. It will convert what it can. .SH "BUGS" -Errors in the password or group files (such as invalid or duplicate -entries) may cause these programs to loop forever or fail in other -strange ways. Please run \fBpwck\fR and \fBgrpck\fR to correct any -such errors before converting to or from shadow passwords or groups. +Errors in the password or group files (such as invalid or duplicate entries) +may cause these programs to loop forever or fail in other strange ways. +Please run \fBpwck\fR and \fBgrpck\fR to correct any such errors before +converting to or from shadow passwords or groups. .SH "SEE ALSO" .BR login.defs (5), .BR grpck (8), diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am new file mode 100644 index 00000000..7047d26d --- /dev/null +++ b/man/ru/Makefile.am @@ -0,0 +1,6 @@ +mandir = @mandir@/ru + +man_MANS = \ + passwd.5 + +EXTRA_DIST = $(man_MANS) diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in new file mode 100644 index 00000000..5b4a147d --- /dev/null +++ b/man/ru/Makefile.in @@ -0,0 +1,361 @@ +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LIBCRACK = @LIBCRACK@ +LIBCRYPT = @LIBCRYPT@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ +LIBPAM = @LIBPAM@ +LIBS = @LIBS@ +LIBSKEY = @LIBSKEY@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +U = @U@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@/ru +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ + +man_MANS = \ + passwd.5 + + +EXTRA_DIST = $(man_MANS) +subdir = man/ru +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = + +NROFF = nroff +MANS = $(man_MANS) +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/ru/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +man5dir = $(mandir)/man5 +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man5dir) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \ + rm -f $(DESTDIR)$(man5dir)/$$inst; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(MANS) + +installdirs: + $(mkinstalldirs) $(DESTDIR)$(man5dir) +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man5 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man5 + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-man5 install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-man uninstall-man5 + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/man/ru/passwd.5 b/man/ru/passwd.5 new file mode 100644 index 00000000..73230258 --- /dev/null +++ b/man/ru/passwd.5 @@ -0,0 +1,136 @@ +.\" Copyright (c) 1993 Michael Haardt (u31b3hs@pool.informatik.rwth-aachen.de), Fri Apr 2 11:32:09 MET DST 1993 +.\" +.\" This is free documentation; you can redistribute it and/or +.\" modify it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2 of +.\" the License, or (at your option) any later version. +.\" +.\" The GNU General Public License's references to "object code" +.\" and "executables" are to be interpreted as the output of any +.\" document formatting or typesetting system, including +.\" intermediate and printed output. +.\" +.\" This manual is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public +.\" License along with this manual; if not, write to the Free +.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, +.\" USA. +.\" +.\" Modified Sun Jul 25 10:46:28 1993 by Rik Faith (faith@cs.unc.edu) +.\" Modified Sun Aug 21 18:12:27 1994 by Rik Faith (faith@cs.unc.edu) +.\" Modified Sun Jun 18 01:53:57 1995 by Andries Brouwer (aeb@cwi.nl) +.\" Modified Mon Jan 5 20:24:40 MET 1998 by Michael Haardt +.\" (michael@cantor.informatik.rwth-aachen.de) +.TH PASSWD 5 "$Date: 2003/04/28 02:17:55 $" "" "禢眝轂 そ帎瓬" +.SH 鍕欒鍣 +passwd \- そ帎 釓眐旼 +.SH 瀔澞搿毇 +.B Passwd +-- 嗩 埧剆婘趿 そ帎, 衃霰眚鄹圴 衄孖玹 殌籥挃 睋倅蚥 俵杻硨袬埧旼 +蚕衲攪, 佹秺蹊 巟 冾婘砣 衃霰眚尕 埡劼 妅に眝謄劦, 佹 +厊曬埩づ佹婘 俵杻硨袬埧曶, 厊曬埩づ佹婘 й桸倧, 鰍芩褁圴 佹埡昑, +冾芩恅挍 狟玶癹劼 . . 輾婘 嗩玵 そ帎 埡匊 衃霰眚轂衭 +睋袶の瓬蹉挃 釓眐旻 佹秺珌 俵杻硨袬埧曶. 婘 そ帎 鰍枒曬 蹙婥 +鰍衲桸曬 赽攪 騷 痽曬奷 (迓珌吇 梊妀尕, 恔倷奼籤, +.BR ls (1) +孖俵杻祰殮 嗩珆 そ帎 騷 衃俵衲避旼恌 厊曬埩づ佹婘眐 奼曬 +俵杻硨袬埧旼), 恘 睋倅衯 恓ж 畛祴蠱曬 婘杻冾 袀陓眓玶嵃瓬轂攫. +.PP + 衲轄棸 鰍觴棸 貥攪曬 恓 蹙昑 恌佹侂 倷狟旼 鰍衲桸恘衲媕 嗩珌 +そ帎 騷 痽曬奷 赽攪 虭眙. 蹅秺椋 迍 倷癹尕轂 睋袶の瓬蹉挃 +釓眐杻, 恘 嗌攣婞玴夼 蹙攽 蚝幵冾 芶騷曬恘, 痽狟 跁昑芩婥 +倷避妀媓 趿觴蹉挃 釓眐杻 , 蟠旼 婘ж, 珃恘谻棎 倷妅蟹俵 蹙昑 +黨欶攫擢吇 衵鼴 俵杻硨袬埧旼. 鬌忤輾 迓珌吇 孖俵杻祰殮 婭 妀 妅梏 +覂眑劦 冾迖旼刱 埧恓趿 釓眐旼, Ь +.I /etc/passwd +衃霰眚尕 稊蘿鰍痾 谹籣婘 睋袶の瓬蹉恘ж 釓眐曶, 蚆虭 嗩 釓眐旻 +畛恮娸 +.I /etc/shadow\fR, +冾婘砣 鰍衲桸曬 騷 痽曬奷 婘杻冾 袀陓眓玶嵃瓬轂攫. +.PP +醚睋訰蚕迍 珆 婘ж, 孖俵杻祰殮衭 旻 埧恓趿 釓眐旻, 迓珌吇 蚕衲攪挃 +謐虭恌衲畛婘砣 孖俵杻祰殮 稊蘿鰍痾 佹畷衲覂 睋袶の瓬蹉恘ж 釓眐曶, +痽狟 梒鼴尕寔, 痽 嗩珆 俵杻硨袬埧杻 恓 蚐珋籥 豜彸 蚕衲攪 俵 +衿珈 釓眐旼. (巀恔冾, 蚐珆疶埧 恌秸 摿澒搿濄). +.PP +槿旻 趿 衃矬豁埧 恘赹 殌籥挍 睋倅衯, 蚔醣賻 俵芶衲尕 俵旼 釓眐曶 +稊蘿鰍痾, 睋埧 孖俵杻祰彸 +.BR passwd (1), +痽狟 睋鐘婥 恔衲珇楦 釓眐杻. +.PP +蹅秺蹊 殌籥恔 睋倅衯 恔狦尕衭 狦恘 衲眐侜, 佹秺蹊 衲眐佹 奼齬 +に眝轂 +.sp +.RS +account:password:UID:GID:GECOS:directory:shell +.RE +.sp +龢 玿孖蹉吇 俵旼: +.sp +.RS +.TP 1.0in +.I account +奼 俵杻硨袬埧曶 蚕衲攪. 懫 恓 鰍枒恘 衃霰眚轂 睋д避挃 謬匋. +.TP +.I password +睋袶の瓬蹉挃 釓眐杻 俵杻硨袬埧曶 妀 稊蘿鰍痾. +.TP +.I UID +蟹の瓬珅 厊曬埩づ佹婘 俵杻硨袬埧曶. +.TP +.I GID +蟹の瓬珅 厊曬埩づ佹婘 珃恘谻珅 й桸倧 嗩珌 俵杻硨袬埧曶. +.TP +.I GECOS +婘 俵旼 恓狟栚轂攫媓 孖俵杻祰籥衭 婘杻冾 騷 妅に眝謄奻恄棼 藷旼. +屩殔恘 矬籣 衃霰眚尕衭 俵旽狣 奼 俵杻硨袬埧曶. GECOS 畇恔瓾籥 +General Electric Comprehensive Operating System, 冾婘畛 蹙攽 +陓疻奼曬瓬蹉 GCOS, 冾Ь 俵黨邁霰旼恌 蟠杻袶 蚕衲攪 冾迖蹉圪 +General Electric 蹙昑 倷狦蹉 冾迖蹉圪 Honeywell. 靻恌 藙瘃 ж豜疶: +"橁珌鐘 阽 俵袃攽旻 そ帎 騷 畛衄邏轂侂 妀 恔蟠 睋鐘 騷 釓侜婠珅 +狟畛蟠堍 恔 芩袶挍 GCOS. 俵旼 GCOS そ帎 釓眐旼 倷晟賻輾 +妅に眝謄奷 騷 $IDENTcard. 醚 嗌龔蹉婠." +.TP +.I directory +鰍芩褁圴 佹埡昑 俵杻硨袬埧曶 ($HOME). +.TP +.I shell +倷珌畛迋, 冾婘畛 趿俵旽捇娸 倷 觕狦 蚕衲攪 (籣旻 矬籣 恌畷ж +恓 梖邁蹉, 孖俵杻祰籥衭 +.BR /bin/sh ). +槿旻 矬籣 梖邁蹉 恓袀暙衲赹濫圴 孖俵旽捇阽 そ帎, 俵杻硨袬埧杻 恓 +蚐珋籥 豜彸 蚕衲攪 俵迍楉 +.BR login (1). +.RE +.SH 摿澒搿毇 +槿旻 趿 珆尕 衃矬避轂 й桸倧 俵杻硨袬埧旼, 婘 圮 GID 鰍枒挃 蹙婥 +狦妅賸瓬, そ帎 \fI/etc/group\fP, 鰍枒恔 蹙婥 睋倅衯 狟 嗩珅 +й桸陓, 妀 秸 嗩 й桸釓 恓 謬霰 袀暙衲豜袬婥. +.PP +槿旻 俵旼 睋袶の瓬蹉挃 釓眐旼 恔狦尕衭 稊蘿鰍痾, 俵杻硨袬埧杻 +恓 蚐珋籥 豜彸 蚕衲攪 俵迍楉 +.BR login (1), +恘 蚐珋籥 蚅攫轂 嗩 俵迍楉 +.BR rlogin (1), +趿俵旽晟 袀暙衲赹濫吇 倷狪籣袃 衃矬避轂 恘趿 俵迍楉 +.BR rsh (1), +.BR cron (1), +.BR at (1) +妀 俵痽瓬棼 づ杻婞瓬, . . 蟴倧堍 睋蟯玹奿瓬轂 殌籥挍 睋倅衯, +巟芶恮 俵旼 shell, 倷屺鼴籥 埧 秸 疻祰杻埡埡, 鰍俵旽尕攫媓 +俵稊玶尕 孖俵杻硨袬婥 +.BR su (1). +.SH 糌膵 +.I /etc/passwd +.SH "鵯濻襢 酃錂" +.BR passwd (1), +.BR login (1), +.BR su (1), +.BR group (5), +.BR shadow (5) +.SH 謥蠈艬 +蟔疻豜 Copyright (C) Alexey Mahotkin 1999 diff --git a/man/shadow.3 b/man/shadow.3 index 454a8dde..b47331d3 100644 --- a/man/shadow.3 +++ b/man/shadow.3 @@ -1,4 +1,4 @@ -.\"$Id: shadow.3,v 1.7 2001/01/25 10:43:51 kloczek Exp $ +.\"$Id: shadow.3,v 1.10 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1989 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -63,23 +63,23 @@ The structure in the \fI#include\fR file is struct spwd { .in +.5i .br - char *sp_namp; /* user login name */ + char *sp_namp; /* user login name */ .br - char *sp_pwdp; /* encrypted password */ + char *sp_pwdp; /* encrypted password */ .br - long sp_lstchg; /* last password change */ + long int sp_lstchg; /* last password change */ .br - int sp_min; /* days until change allowed. */ + long int sp_min; /* days until change allowed. */ .br - int sp_max; /* days before change required */ + long int sp_max; /* days before change required */ .br - int sp_warn; /* days warning for expiration */ + long int sp_warn; /* days warning for expiration */ .br - int sp_inact; /* days before account inactive */ + long int sp_inact; /* days before account inactive */ .br - int sp_expire; /* date when account expires */ + long int sp_expire; /* date when account expires */ .br - int sp_flag; /* reserved for future use */ + unsigned long int sp_flag; /* reserved for future use */ .br .in -.5i } @@ -106,39 +106,33 @@ sp_expire \- days since Jan 1, 1970 when account will be disabled. .br sp_flag \- reserved for future use. .SH DESCRIPTION -\fBgetspent\fR, \fBgetspname\fR, \fBfgetspent\fR, and \fBsgetspent\fR -each return a pointer to a \fBstruct spwd\fR. -\fBgetspent\fR returns the -next entry from the file, and \fBfgetspent\fR returns the next -entry from the given stream, which is assumed to be a file of -the proper format. +\fBgetspent\fR, \fBgetspname\fR, \fBfgetspent\fR, and \fBsgetspent\fR each +return a pointer to a \fBstruct spwd\fR. \fBgetspent\fR returns the next +entry from the file, and \fBfgetspent\fR returns the next entry from the +given stream, which is assumed to be a file of the proper format. \fBsgetspent\fR returns a pointer to a \fBstruct spwd\fR using the -provided string as input. -\fBgetspnam\fR searches from the current position in the file for -an entry matching \fBname\fR. +provided string as input. \fBgetspnam\fR searches from the current position +in the file for an entry matching \fBname\fR. .PP \fBsetspent\fR and \fBendspent\fR may be used to begin and end, respectively, access to the shadow password file. .PP -The \fBlckpwdf\fR and \fBulckpwdf\fR routines should be used to -insure exclusive access to the \fI/etc/shadow\fR file. -\fBlckpwdf\fR attempts to acquire a lock using \fBpw_lock\fR for -up to 15 seconds. -It continues by attempting to acquire a second lock using \fBspw_lock\fR -for the remainder of the initial 15 seconds. -Should either attempt fail after a total of 15 seconds, \fBlckpwdf\fR -returns -1. -When both locks are acquired 0 is returned. +The \fBlckpwdf\fR and \fBulckpwdf\fR routines should be used to insure +exclusive access to the \fI/etc/shadow\fR file. \fBlckpwdf\fR attempts to +acquire a lock using \fBpw_lock\fR for up to 15 seconds. It continues by +attempting to acquire a second lock using \fBspw_lock\fR for the remainder +of the initial 15 seconds. Should either attempt fail after a total of 15 +seconds, \fBlckpwdf\fR returns -1. When both locks are acquired 0 is +returned. .SH DIAGNOSTICS -Routines return NULL if no more entries are available or if an -error occurs during processing. -Routines which have \fBint\fR as the return value return 0 for -success and -1 for failure. +Routines return NULL if no more entries are available or if an error occurs +during processing. Routines which have \fBint\fR as the return value return +0 for success and -1 for failure. .SH CAVEATS -These routines may only be used by the super user as access to -the shadow password file is restricted. +These routines may only be used by the super user as access to the shadow +password file is restricted. .SH FILES -/etc/shadow \- encrypted user passwords +\fI/etc/shadow\fR \ - encrypted user passwords .SH SEE ALSO .BR getpwent (3), .BR shadow (5) diff --git a/man/shadow.5 b/man/shadow.5 index 6dd901a4..f86d6b61 100644 --- a/man/shadow.5 +++ b/man/shadow.5 @@ -1,4 +1,4 @@ -.\"$Id: shadow.5,v 1.9 2002/03/08 04:39:12 kloczek Exp $ +.\"$Id: shadow.5,v 1.11 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,10 +29,8 @@ .SH NAME shadow \- encrypted password file .SH DESCRIPTION -.I shadow -contains the encrypted password information for user's accounts -and optional the password aging information. -Included is +\fIshadow\fR contains the encrypted password information for user's accounts +and optional the password aging information. Included is .IP "" .5i Login name .IP "" .5i @@ -52,37 +50,31 @@ Days since Jan 1, 1970 that account is disabled .IP "" .5i A reserved field .PP -The password field must be filled. -The encryped password consists of 13 to 24 characters from the -64 character alphabet -a thru z, A thru Z, 0 thru 9, \. and /. -Refer to \fBcrypt\fR(3) for details on how this string is +The password field must be filled. The encryped password consists of 13 to +24 characters from the 64 character alphabet a thru z, A thru Z, 0 thru 9, +\. and /. Refer to \fBcrypt\fR(3) for details on how this string is interpreted. .PP -The date of the last password change is given as the number -of days since Jan 1, 1970. -The password may not be changed again until the proper number -of days have passed, and must be changed after the maximum -number of days. -If the minimum number of days required is greater than the -maximum number of day allowed, this password may not be -changed by the user. +The date of the last password change is given as the number of days since +Jan 1, 1970. The password may not be changed again until the proper number +of days have passed, and must be changed after the maximum number of days. +If the minimum number of days required is greater than the maximum number of +day allowed, this password may not be changed by the user. .PP -An account is considered to be inactive and is disabled if -the password is not changed within the specified number of -days after the password expires. -An account will also be disabled on the specified day -regardless of other password expiration information. +An account is considered to be inactive and is disabled if the password is +not changed within the specified number of days after the password expires. +An account will also be disabled on the specified day regardless of other +password expiration information. .PP -This information supercedes any password or password age -information present in \fI/etc/passwd\fR. +This information supercedes any password or password age information present +in \fI/etc/passwd\fR. .PP -This file must not be readable by regular users if password -security is to be maintained. +This file must not be readable by regular users if password security is to +be maintained. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \ - user account information .br -/etc/shadow \- encrypted user passwords +\fI/etc/shadow\fR \ - encrypted user passwords .SH SEE ALSO .BR chage (1), .BR login (1), diff --git a/man/shadowconfig.8 b/man/shadowconfig.8 index 75ba7b08..b246999a 100644 --- a/man/shadowconfig.8 +++ b/man/shadowconfig.8 @@ -1,4 +1,4 @@ -.\"$Id: shadowconfig.8,v 1.4 2001/08/23 23:10:48 kloczek Exp $ +.\"$Id: shadowconfig.8,v 1.6 2003/05/01 18:17:39 kloczek Exp $ .TH SHADOWCONFIG 8 "19 Apr 1997" "Debian GNU/Linux" .SH NAME shadowconfig \- toggle shadow passwords on and off @@ -7,18 +7,16 @@ shadowconfig \- toggle shadow passwords on and off .IR on " | " off .SH DESCRIPTION .PP -.B shadowconfig on -will turn shadow passwords on; -.B shadowconfig off -will turn shadow passwords off. -.B shadowconfig -will print an error message and exit with a nonzero code if it finds -anything awry. If that happens, you should correct the error and run -it again. -Turning shadow passwords on when they are already on, or off when they -are already off, is harmless. - -Read -.I /usr/share/doc/passwd/README.debian.gz -for a brief introduction to shadow passwords and related features. +\fBshadowconfig on\fR will turn shadow passwords on; \fBshadowconfig off\fR +will turn shadow passwords off. \fBshadowconfig\fR will print an error +message and exit with a nonzero code if it finds anything awry. If that +happens, you should correct the error and run it again. Turning shadow +passwords on when they are already on, or off when they are already off, is +harmless. +.P +Read \fI/usr/share/doc/passwd/README.debian.gz\fR for a brief introduction +to shadow passwords and related features. +.P +Note that turning shadow passwords off and on again will lose all password +aging information. diff --git a/man/su.1 b/man/su.1 index f66dd193..75400c91 100644 --- a/man/su.1 +++ b/man/su.1 @@ -1,4 +1,4 @@ -.\"$Id: su.1,v 1.11 2002/03/09 19:22:30 ankry Exp $ +.\"$Id: su.1,v 1.13 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -46,9 +46,9 @@ The user will be prompted for a password, if appropriate. Invalid passwords will produce an error message. All attempts, both valid and invalid, are logged to detect abuses of the system. .PP -The current environment is passed to the new shell. The value of \fB$PATH\fR -is reset to \fB/bin:/usr/bin\fR for normal users, or -\fB/sbin:/bin:/usr/sbin:/usr/bin\fR for the super user. This may be changed +The current environment is passed to the new shell. The value of fB$PATH\fR +\is reset to \fB/bin:/usr/bin\fR for normal users, or +\fB/sbin:/bin:/usr/sbin:/usr/bin\fR for the super user. This may be changed with the \fBENV_PATH\fR and \fBENV_SUPATH\fR definitions in \fI/etc/login.defs\fR. .PP @@ -59,11 +59,9 @@ the root of a new filesystem which the user is actually logged into. This version of \fBsu\fR has many compilation options, only some of which may be in use at any particular site. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \ - user account information .br -/etc/shadow \- encrypted passwords and age information -.br -$HOME/.profile \- initialization script for default shell +\fI/etc/shadow\fR \ - encrypted passwords and age information .SH SEE ALSO .BR login (1), .BR sh (1), diff --git a/man/suauth.5 b/man/suauth.5 index 5f69d505..32112be5 100644 --- a/man/suauth.5 +++ b/man/suauth.5 @@ -1,4 +1,4 @@ -.\"$Id: suauth.5,v 1.3 2001/01/25 10:43:51 kloczek Exp $ +.\"$Id: suauth.5,v 1.4 2003/04/26 13:24:11 kloczek Exp $ .TH SUAUTH 5 "Feb 14, 1996" .UC 5 .SH NAME @@ -92,7 +92,7 @@ birddog:terry:NOPASS # .fi .SH FILES -/etc/suauth +\fI/etc/suauth\fR .SH BUGS There could be plenty lurking. The file parser is particularly unforgiving about syntax errors, expecting no spurious whitespace diff --git a/man/sulogin.8 b/man/sulogin.8 index 3a25b577..2e405430 100644 --- a/man/sulogin.8 +++ b/man/sulogin.8 @@ -1,4 +1,4 @@ -.\"$Id: sulogin.8,v 1.8 2002/03/08 04:39:12 kloczek Exp $ +.\"$Id: sulogin.8,v 1.10 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1989 - 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,11 +31,9 @@ sulogin \- Single-user login .SH SYNTAX \fBsulogin\fR [\fItty-device\fR] .SH DESCRIPTION -.B sulogin -is invoked by \fBinit\fR prior to allowing the user -access to the system when in single user mode. -This feature may only be available on certain systems where -\fBinit\fR has been modified accordingly, or where the +\fBsulogin\fR is invoked by \fBinit\fR prior to allowing the user access to +the system when in single user mode. This feature may only be available on +certain systems where \fBinit\fR has been modified accordingly, or where the \fB/etc/inittab\fR has an entry for a single user login. .PP The user is prompted @@ -44,13 +42,11 @@ Type control-d to proceed with normal startup, .br (or give root password for system maintenance): .PP -Input and output will be performed with the standard file -descriptors unless the optional device name argument is provided. +Input and output will be performed with the standard file descriptors unless +the optional device name argument is provided. .PP -If the user enters the correct root password, a login session -is initiated. -When \fBEOF\fR is pressed instead, the system enters multi-user -mode. +If the user enters the correct root password, a login session is initiated. +When \fBEOF\fR is pressed instead, the system enters multi-user mode. .PP After the user exits the single-user shell, or presses \fBEOF\fR, the system begins the initialization process required to enter @@ -58,10 +54,8 @@ multi-user mode. .SH CAVEATS .PP This command can only be used if \fBinit\fR has been modified to call -\fBsulogin\fR instead of \fB/bin/sh\fR, -or if the user has set the \fIinittab\fR to support a single user -login. -For example, the line +\fBsulogin\fR instead of \fB/bin/sh\fR, or if the user has set the +\fIinittab\fR to support a single user login. For example, the line .br .sp 1 co:s:respawn:/etc/sulogin /dev/console @@ -69,15 +63,13 @@ co:s:respawn:/etc/sulogin /dev/console .sp 1 should execute the sulogin command in single user mode. .PP -As complete an environment as possible is created. -However, various devices may be unmounted or uninitialized and many -of the user commands may be unavailable or nonfunctional as a result. +As complete an environment as possible is created. However, various devices +may be unmounted or uninitialized and many of the user commands may be +unavailable or nonfunctional as a result. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \ - user account information .br -/etc/shadow \- encrypted passwords and age information -.br -/.profile \- initialization script for single user shell +\fI/etc/shadow\fR \ - encrypted passwords and age information .SH SEE ALSO .BR login (1), .BR sh (1), diff --git a/man/useradd.8 b/man/useradd.8 index 44f9fa41..0323c01d 100644 --- a/man/useradd.8 +++ b/man/useradd.8 @@ -1,4 +1,4 @@ -.\"$Id: useradd.8,v 1.13 2002/03/08 04:39:12 kloczek Exp $ +.\"$Id: useradd.8,v 1.18 2003/05/07 14:04:53 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -36,7 +36,7 @@ useradd \- Create a new user or update default new user information .br [\fB-g\fR \fIinitial_group\fR] [\fB-G\fR \fIgroup\fR[,...]] .br -[\fB-m\fR [\fB-k\fR \fIskeleton_dir\fR]] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] +[[\fB-M\fR] \fB-m\fR [\fB-k\fR \fIskeleton_dir\fR]] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] .br [\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR .TP 8 @@ -47,111 +47,124 @@ useradd \- Create a new user or update default new user information [\fB-s\fI default_shell\fR] .SH DESCRIPTION .SS Creating New Users -When invoked without the \fB-D\fR option, the \fBuseradd\fR command -creates a new user account using the values specified on the -command line and the default values from the system. -The new user account will be entered into the system files as needed, -the home directory will be created, and initial files copied, depending -on the command line options. -The options which apply to the \fBuseradd\fR command are: -.IP "\fB-c \fIcomment\fR" +When invoked without the \fB-D\fR option, the \fBuseradd\fR command creates +a new user account using the values specified on the command line and the +default values from the system. The new user account will be entered into +the system files as needed, the home directory will be created, and initial +files copied, depending on the command line options. The options which apply +to the \fBuseradd\fR command are: +.IP "\fB-c\fR \fIcomment\fR" The new user's password file comment field. -.IP "\fB-d \fIhome_dir\fR" -The new user will be created using \fIhome_dir\fR as the value for -the user's login directory. -The default is to append the \fIlogin\fR name to \fIdefault_home\fR -and use that as the login directory name. -.IP "\fB-e \fIexpire_date\fR" -The date on which the user account will be disabled. -The date is specified in the format \fIYYYY-MM-DD\fR. -.IP "\fB-f \fIinactive_days\fR" -The number of days after a password expires until the account -is permanently disabled. -A value of 0 disables the account as soon as the password has -expired, and a value of -1 disables the feature. -The default value is -1. -.IP "\fB-g \fIinitial_group\fR" -The group name or number of the user's initial login group. -The group name must exist. A group number must refer to an -already existing group. -The default group number is 1 or whatever is specified in +.IP "\fB-d\fR \fIhome_dir\fR" +The new user will be created using \fIhome_dir\fR as the value for the +user's login directory. The default is to append the \fIlogin\fR name to +\fIdefault_home\fR and use that as the login directory name. +.IP "\fB-e\fR \fIexpire_date\fR" +The date on which the user account will be disabled. The date is specified +in the format \fIYYYY-MM-DD\fR. +.IP "\fB-f\fR \fIinactive_days\fR" +The number of days after a password expires until the account is permanently +disabled. A value of 0 disables the account as soon as the password has +expired, and a value of -1 disables the feature. The default value is -1. +.IP "\fB-g\fR \fIinitial_group\fR" +The group name or number of the user's initial login group. The group name +must exist. A group number must refer to an already existing group. The +default group number is 1 or whatever is specified in \fI/etc/default/useradd\fR. -.IP "\fB-G \fIgroup,[...]\fR" -A list of supplementary groups which the user is also a member -of. -Each group is separated from the next by a comma, with no -intervening whitespace. -The groups are subject to the same restrictions as the group -given with the \fB-g\fR option. -The default is for the user to belong only to the initial group. +.IP "\fB-G\fR \fIgroup,[...]\fR" +A list of supplementary groups which the user is also a member of. Each +group is separated from the next by a comma, with no intervening whitespace. +The groups are subject to the same restrictions as the group given with the +\fB-g\fR option. The default is for the user to belong only to the initial +group. +.IP \fB-M\fR +RedHat added the CREATE_HOME option in login.defs in their version of +shadow-utils (which makes -m the default, with new -M option to turn it +off). Unfortunately, this changes the way useradd works (it can be run by +scripts expecting some standard behaviour), compared to other Unices and +other Linux distributions, and also adds a lot of confusion. .IP \fB-m\fR -The user's home directory will be created if it does not exist. -The files contained in \fIskeleton_dir\fR will be copied to the -home directory if the \fB-k\fR option is used, otherwise the -files contained in \fI/etc/skel\fR will be used instead. -Any directories contained in \fIskeleton_dir\fR or \fI/etc/skel\fR -will be created in the user's home directory as well. -The \fB-k\fR option is only valid in conjunction with the \fB-m\fR -option. -The default is to not create the directory and to not copy any -files. +The user's home directory will be created if it does not exist. The files +contained in \fIskeleton_dir\fR will be copied to the home directory if the +\fB-k\fR option is used, otherwise the files contained in \fI/etc/skel\fR +will be used instead. Any directories contained in \fIskeleton_dir\fR or +\fI/etc/skel\fR will be created in the user's home directory as well. The +\fB-k\fR option is only valid in conjunction with the \fB-m\fR option. The +default is to not create the directory and to not copy any files. .IP "\fB-o\fR" Allow create user with duplicate (non-unique) UID. .IP "\fB-p \fIpasswd\fR" -The encrypted password, as returned by \fBcrypt\fR(3). -The default is to disable the account. -.IP "\fB-s \fIshell\fR" -The name of the user's login shell. -The default is to leave this field blank, which causes the system -to select the default login shell. +The encrypted password, as returned by \fBcrypt\fR(3). The default is to +disable the account. +.IP "\fB-s\fR \fIshell\fR" +The name of the user's login shell. The default is to leave this field +blank, which causes the system to select the default login shell. .IP "\fB-u \fIuid\fR" -The numerical value of the user's ID. -This value must be unique, unless the \fI-o\fR option is used. -The value must be non-negative. -The default is to use the smallest ID value greater than 99 and -greater than every other user. +The numerical value of the user's ID. This value must be unique, unless the +\fI-o\fR option is used. The value must be non-negative. The default is to +use the smallest ID value greater than 99 and greater than every other user. Values between 0 and 99 are typically reserved for system accounts. .SS Changing the default values -When invoked with the \fB-D\fR option, \fBuseradd\fR will either -display the current default values, or update the default values -from the command line. +When invoked with the \fB-D\fR option, \fBuseradd\fR will either display the +current default values, or update the default values from the command line. The valid options are -.IP "\fB-b \fIdefault_home\fR" -The initial path prefix for a new user's home directory. -The user's name will be affixed to the end of \fIdefault_home\fR -to create the new directory name if the \fB-d\fI option is not -used when creating a new account. -.IP "\fB-e \fIdefault_expire_date\fR" +.IP "\fB-b\fR \fIdefault_home\fR" +The initial path prefix for a new user's home directory. The user's name +will be affixed to the end of \fIdefault_home\fR to create the new directory +name if the \fB-d\fI option is not used when creating a new account. +.IP "\fB-e\fR \fIdefault_expire_date\fR" The date on which the user account is disabled. -.IP "\fB-f \fIdefault_inactive\fR" -The number of days after a password has expired before the -account will be disabled. -.IP "\fB-g \fIdefault_group\fR" -The group name or ID for a new user's initial group. -The named group must exist, and a numerical group ID must have -an existing entry . -.IP "\fB-s \fIdefault_shell\fR" -The name of the new user's login shell. -The named program will be used for all future new user accounts. +.IP "\fB-f\fR \fIdefault_inactive\fR" +The number of days after a password has expired before the account will be +disabled. +.IP "\fB-g\fR \fIdefault_group\fR" +The group name or ID for a new user's initial group. The named group must +exist, and a numerical group ID must have an existing entry . +.IP "\fB-s\fR \fIdefault_shell\fR" +The name of the new user's login shell. The named program will be used for +all future new user accounts. .PP -If no options are specified, \fBuseradd\fR displays the current -default values. +If no options are specified, \fBuseradd\fR displays the current default +values. .SH NOTES -The system administrator is responsible for placing the default -user files in the \fI/etc/skel\fR directory. +The system administrator is responsible for placing the default user files +in the \fI/etc/skel/\fR directory. .SH CAVEATS -You may not add a user to an NIS group. -This must be performed on the NIS server. +You may not add a user to an NIS group. This must be performed on the NIS +server. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \- user account information .br -/etc/shadow \- secure user account information +\fI/etc/shadow\fR \- secure user account information .br -/etc/group \- group information +\fI/etc/group\fR \- group information .br -/etc/default/useradd \- default information +\fI/etc/default/useradd\fR \- default information .br -/etc/skel \- directory containing default files +\fI/etc/skel/\fR \- directory containing default files +.SH EXIT VALUES +.TP 2 +The \fBuseadd\fR command exits with the following values: +.br +\fB0\fR \- success +.br +\fB1\fR \- can't update password file +.br +\fB2\fR \- invalid command syntax +.br +\fB3\fR \- invalid argument to option +.br +\fB4\fR \- uid already in use (and no -o) +.br +\fB6\fR \- specified group doesn't exist +.br +\fB9\fR \- username already in use +.br +\fB10\fR \- can't update group file +.br +\fB12\fR \- can't create home directory +.br +\fB13\fR \- can't create mail spool .SH SEE ALSO .BR chfn (1), .BR chsh (1), diff --git a/man/userdel.8 b/man/userdel.8 index 5b182c1c..fafc6a7a 100644 --- a/man/userdel.8 +++ b/man/userdel.8 @@ -1,4 +1,4 @@ -.\"$Id: userdel.8,v 1.8 2002/03/08 04:39:12 kloczek Exp $ +.\"$Id: userdel.8,v 1.11 2003/05/01 18:17:39 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -33,28 +33,41 @@ userdel \- Delete a user account and related files [\fB-r\fR] .I login .SH DESCRIPTION -The \fBuserdel\fR command modifies the system account files, deleting -all entries that refer to \fIlogin\fR. -The named user must exist. -The options which apply to the \fBuserdel\fR command are: +The \fBuserdel\fR command modifies the system account files, deleting all +entries that refer to \fIlogin\fR. The named user must exist. The options +which apply to the \fBuserdel\fR command are: .IP \fB-r\fR -Files in the user's home directory will be removed along with the -home directory itself and the user's mail spool. -Files located in other file systems will have to be searched for -and deleted manually. +Files in the user's home directory will be removed along with the home +directory itself and the user's mail spool. Files located in other file +systems will have to be searched for and deleted manually. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \- user account information .br -/etc/shadow \- secure user account information +\fI/etc/shadow\fR \- secure user account information .br -/etc/group \- group information +\fI/etc/group\fR \- group information +.SH EXIT VALUES +.TP 2 +The \fBuserdel\fR command exits with the following values: +.br +\fB0\fR \- success +.br +\fB1\fR \- can't update password file +.br +\fB2\fR \- invalid command syntax +.br +\fB6\fR \- specified user doesn't exist +.br +\fB8\fR \- user currently logged in +.br +\fB10\fR \- can't update group file +.br +\fB12\fR \- can't remove home directory .SH CAVEATS -\fBuserdel\fR will not allow you to remove an account if the user -is currently logged in. -You must kill any running processes which belong to an account that -you are deleting. -You may not remove any NIS attributes on an NIS client. -This must be performed on the NIS server. +\fBuserdel\fR will not allow you to remove an account if the user is +currently logged in. You must kill any running processes which belong to an +account that you are deleting. You may not remove any NIS attributes on an +NIS client. This must be performed on the NIS server. .SH SEE ALSO .BR chfn (1), .BR chsh (1), diff --git a/man/usermod.8 b/man/usermod.8 index 7cf9aaae..dc2b5831 100644 --- a/man/usermod.8 +++ b/man/usermod.8 @@ -1,4 +1,4 @@ -.\"$Id: usermod.8,v 1.12 2002/03/08 04:39:12 kloczek Exp $ +.\"$Id: usermod.8,v 1.15 2003/10/21 20:13:11 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -41,84 +41,69 @@ usermod \- Modify a user account [\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR [\fB-o\fR]] [\fB-L\fR|\fB-U\fR] \fIlogin\fR .SH DESCRIPTION -The \fBusermod\fR command modifies the system account files to reflect -the changes that are specified on the command line. -The options which apply to the \fBusermod\fR command are: -.IP "\fB-c \fIcomment\fR" -The new value of the user's password file comment field. -It is normally modified using the \fBchfn\fR(1) utility. -.IP "\fB-d \fIhome_dir\fR" -The user's new login directory. -If the \fB-m\fR option is given the contents of the current home directory -will be moved to the new home directory, which is created if it does not -already exist. -.IP "\fB-e \fIexpire_date\fR" -The date on which the user account will be disabled. -The date is specified in the format \fIYYYY-MM-DD\fR. -.IP "\fB-f \fIinactive_days\fR" -The number of days after a password expires until the account -is permanently disabled. -A value of 0 disables the account as soon as the password has -expired, and a value of -1 disables the feature. -The default value is -1. -.IP "\fB-g \fIinitial_group\fR" -The group name or number of the user's new initial login group. -The group name must exist. A group number must refer to an -already existing group. +The \fBusermod\fR command modifies the system account files to reflect the +changes that are specified on the command line. The options which apply to +the \fBusermod\fR command are: +.IP "\fB-c\fR \fIcomment\fR" +The new value of the user's password file comment field. It is normally +modified using the \fBchfn\fR(1) utility. +.IP "\fB-d\fR \fIhome_dir\fR" +The user's new login directory. If the \fB-m\fR option is given the contents +of the current home directory will be moved to the new home directory, which +is created if it does not already exist. +.IP "\fB-e\fR \fIexpire_date\fR" +The date on which the user account will be disabled. The date is specified +in the format \fIYYYY-MM-DD\fR. +.IP "\fB-f\fR \fIinactive_days\fR" +The number of days after a password expires until the account is permanently +disabled. A value of 0 disables the account as soon as the password has +expired, and a value of -1 disables the feature. The default value is -1. +.IP "\fB-g\fR \fIinitial_group\fR" +The group name or number of the user's new initial login group. The group +name must exist. A group number must refer to an already existing group. The default group number is 1. -.IP "\fB-G \fIgroup,[...]\fR" -A list of supplementary groups which the user is also a member -of. -Each group is separated from the next by a comma, with no -intervening whitespace. -The groups are subject to the same restrictions as the group -given with the \fB-g\fR option. -If the user is currently a member of a group which is not listed, -the user will be removed from the group -.IP "\fB-l \fIlogin_name\fR" -The name of the user will be changed from \fIlogin\fR to -\fIlogin_name\fR. -Nothing else is changed. -In particular, the user's home directory name should probably -be changed to reflect the new login name. -.IP "\fB-p \fIpasswd\fR" -The encrypted password, as returned by \fBcrypt\fR(3). -.IP "\fB-s \fIshell\fR" -The name of the user's new login shell. -Setting this field to blank causes the system -to select the default login shell. -.IP "\fB-u \fIuid\fR" -The numerical value of the user's ID. -This value must be unique, unless the \fI-o\fR option is used. -The value must be non-negative. -Values between 0 and 99 are typically reserved for system accounts. -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-G\fR \fIgroup,[...]\fR" +A list of supplementary groups which the user is also a member of. Each +group is separated from the next by a comma, with no intervening whitespace. +The groups are subject to the same restrictions as the group given with the +\fB-g\fR option. If the user is currently a member of a group which is not +listed, the user will be removed from the group. +.IP "\fB-l\fR \fIlogin_name\fR" +The name of the user will be changed from \fIlogin\fR to \fIlogin_name\fR. +Nothing else is changed. In particular, the user's home directory name +should probably be changed to reflect the new login name. +.IP "\fB-p\fR \fIpasswd\fR" +The encrypted password, as returned by \fBcrypt\fR(3). +.IP "\fB-s\fR \fIshell\fR" +The name of the user's new login shell. Setting this field to blank causes +the system to select the default login shell. +.IP "\fB-u\fR \fIuid\fR" +The numerical value of the user's ID. This value must be unique, unless the +\fI-o\fR option is used. The value must be non-negative. Values between 0 +and 99 are typically reserved for system accounts. 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. +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. +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. -You must make certain that the named user is not executing any processes -when this command is being executed if the user's numerical user ID is -being changed. -You must change the owner of any crontab files manually. -You must change the owner of any at jobs manually. -You must make any changes involving NIS on the NIS server. +logged in. You must make certain that the named user is not executing any +processes when this command is being executed if the user's numerical user +ID is being changed. You must change the owner of any crontab files +manually. You must change the owner of any at jobs manually. You must make +any changes involving NIS on the NIS server. .SH FILES -/etc/passwd \- user account information +\fI/etc/passwd\fR \ - user account information .br -/etc/shadow \- secure user account information +\fI/etc/shadow\fR \ - secure user account information .br -/etc/group \- group information +\fI/etc/group\fR \ - group information .SH SEE ALSO .BR chfn (1), .BR chsh (1), diff --git a/man/vipw.8 b/man/vipw.8 index b7094f6c..099d897b 100644 --- a/man/vipw.8 +++ b/man/vipw.8 @@ -1,4 +1,4 @@ -.\"$Id: vipw.8,v 1.5 2002/03/08 04:39:12 kloczek Exp $ +.\"$Id: vipw.8,v 1.6 2003/05/01 18:17:39 kloczek Exp $ .TH VIPW 8 "26 Sep 1997" .SH NAME vipw, vigr \- edit the password, group, shadow-password, or shadow-group file. @@ -7,21 +7,13 @@ vipw, vigr \- edit the password, group, shadow-password, or shadow-group file. .br \fBvigr\fR [\fB-s\fR] .SH DESCRIPTION -.BR vipw " and " vigr -will edit the files -.IR /etc/passwd " and " /etc/group ", respectively." -With the -.B -s -flag, they will edit the shadow versions of those files, -.IR /etc/shadow " and " /etc/gshadow ", respectively. -The programs will set the appropriate locks to prevent file corruption. - -When looking for an editor, the programs will first try the -environment variable -.BR VISUAL , -then the environment variable -.BR EDITOR , -and finally the default editor, +\fBvipw\fR and \fBvigr\fR will edit the files \fI/etc/passwd\fR and +\fI/etc/group\fR, respectively. With the \fB-s\fR flag, they will edit the +shadow versions of those files, fI/etc/shadow\fR and \fI/etc/gshadow\fR, +respectively. The programs will set the appropriate locks to prevent file +corruption. When looking for an editor, the programs will first try the +environment variable \fBVISUAL\fR, then the environment variable +\fBEDITOR\fR, and finally the default editor, .BR vi . .SH "SEE ALSO" .BR group (5), diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am new file mode 100644 index 00000000..3472b3ae --- /dev/null +++ b/man/zh_CN/Makefile.am @@ -0,0 +1,15 @@ +# man pages encoded in GB2312 +mandir = @mandir@/zh_CN + +man_MANS = \ + chfn.1 \ + chpasswd.8 \ + chsh.1 \ + groupadd.8 \ + groupdel.8 \ + groupmod.8 \ + useradd.8 \ + userdel.8 \ + usermod.8 + +EXTRA_DIST = $(man_MANS) diff --git a/man/zh_CN/Makefile.in b/man/zh_CN/Makefile.in new file mode 100644 index 00000000..489c053c --- /dev/null +++ b/man/zh_CN/Makefile.in @@ -0,0 +1,419 @@ +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LIBCRACK = @LIBCRACK@ +LIBCRYPT = @LIBCRYPT@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ +LIBPAM = @LIBPAM@ +LIBS = @LIBS@ +LIBSKEY = @LIBSKEY@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +U = @U@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ + +# man pages encoded in GB2312 +mandir = @mandir@/zh_CN +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ + +man_MANS = \ + chfn.1 \ + chpasswd.8 \ + chsh.1 \ + groupadd.8 \ + groupdel.8 \ + groupmod.8 \ + useradd.8 \ + userdel.8 \ + usermod.8 + + +EXTRA_DIST = $(man_MANS) +subdir = man/zh_CN +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = + +NROFF = nroff +MANS = $(man_MANS) +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/zh_CN/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +man1dir = $(mandir)/man1 +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done + +man8dir = $(mandir)/man8 +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man8dir) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ + rm -f $(DESTDIR)$(man8dir)/$$inst; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(MANS) + +installdirs: + $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 uninstall-man8 + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-man1 install-man8 \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man8 + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/man/ko/chfn.1 b/man/zh_CN/chfn.1 similarity index 50% rename from man/ko/chfn.1 rename to man/zh_CN/chfn.1 index 32309435..06948e9c 100644 --- a/man/ko/chfn.1 +++ b/man/zh_CN/chfn.1 @@ -8,54 +8,57 @@ .\" .\" $Author: kloczek $ .\" $Revision: 1.1 $ -.\" $Date: 2002/03/13 19:03:01 $ +.\" $Date: 2003/04/28 02:14:04 $ .\" .TH CHFN 1 "October 13 1994" "chfn" "Linux Reference Manual" -.SH NAME -chfn \- 餌辨濠 finger 薑爾蒂 夥羞棻. -.SH SYNOPSIS +.SH 靡備 +chfn \- 蜊 曹 斕 腔 finger 捅 洘 +.SH 逄楊 .B chfn [\ \-f\ full-name\ ] [\ \-o\ office\ ] [\ \-p\ office-phone\ ] [\ \-h\ home-phone\ ] [\ \-u\ ] [\ \-v\ ] [\ username\ ] -.SH DESCRIPTION +.SH 鏡扴 .B chfn -貲滄擎 餌辨濠曖 finger 薑爾蒂 夥羞棻. 檜匙擎 -.I /etc/passwd -だ橾曖 薑爾蒂 夥羞棻. +岆 蚚 懂 蜊 曹 斕 腔 finger 捅 洘 ﹝ 捅 洘 岆 湔 溫 婓 +.I /etc/passwd 紫 囀 ﹝ 褫 賢 蚕 .B finger -貲滄檜 餌辨腆 陽 夥煎 檜 だ橾擊 霤褻ж晦 陽僥檜棻. +懂 珆 尨 斕 腔 捅 洘 ﹝ Linux .B finger -貲滄擎 +韜 鍔 頗 珆 尨 侐 僇 捅 洘 ㄛ 涴 虳 捅 洘 歙 褫 賢 蚕 .B chfn -貲滄縑憮 夥莎 褒營檜葷, 霜濰, 霜濰瞪, 餵瞪食醽ㄧ 爾罹遽棻. -.SS COMMAND LINE -嬴鼠 褫暮 橈檜 檜 貲滄擊 餌辨ж賊, 霜蕾 餌辨濠縑啪 陝陝曖 夥羚 薑爾蒂 -僭橫爾雖虜, 檜 薑爾菟擊 貲滄ч縑憮 霜蕾 殮溘й 熱紫 氈棻. +蜊 曹 +: 淩 妗 俷 靡 ㄛ 馱 釬 華 萸 萇 趕 ㄛ 摯 斕 模 腔 萇 趕 ﹝ +.SS 韜鍔蹈 +藩 珨 僇 捅 洘 歙 褫 婓 韜 鍔 蹈 奻 硌 隅 ﹝ 羶 衄 跤 隅 捅 洘 ㄛ +.B chfn +輛 蝠 抶 耀 宒 .SS INTERACTIVE MODE -嬴鼠 褫暮 橈檜 檜 貲滄擊 餌辨ж賊, 霜蕾 餌辨濠縑啪 陝陝曖 夥羚 薑爾蒂 -僭橫獄棻. 檜陽 薑渡и 高擊 雖薑п 輿堅, 錳楚曖 高擊 夥紱雖 彊戲溥賊, -斜傖 Enter 旋潸蒂 援腦賊 脹棻. -.SH OPTIONS +蝠抶耀宒 +.B chfn +頗 婓 藩 珨 戲 ヶ 枑 尨 ﹝ 婓 枑 尨 袨 怓 狟 ㄛ 斕 憩 褫 怀 陔 腔 捅 洘 麼 +岆 偌 return 奧 祥 蜊 曹 ﹝ +怀 "none" 寀 桶 尨 蜆 戲 諾 啞 ﹝ +.SH 恁砐 .TP .I "\-f, \-\-full-name" -餌辨濠 褒營 檜葷 +淩 妗 俷 靡 .TP .I "\-o, \-\-office" -餌辨濠 霜濰 +域 馱 弅 瘍 鎢 .TP .I "\-p, \-\-office-phone" -餌辨濠 霜濰 瞪食醽 +域 鼠 弅 萇 趕 .TP .I "\-h, \-\-home-phone" -餌辨濠 餵 瞪 廓 +模 爵 腔 萇 趕 .TP .I "\-u, \-\-help" -紫遺蜓擊 爾罹輿堅 葆耀棻. +凅 堤 妏 蚚 佽 隴 傻 捅 ﹝ .TP .I "-v, \-\-version" -幗瞪 薑爾蒂 爾罹輿堅 葆耀棻. -.SH "SEE ALSO" +凅 堤 唳 掛 捅 洘 ﹝ +.SH "眈壽恅璃" .BR finger (1), .BR passwd (5) -.SH AUTHOR +.SH 釬氪 Salvatore Valente diff --git a/man/fr/chpasswd.8 b/man/zh_CN/chpasswd.8 similarity index 60% rename from man/fr/chpasswd.8 rename to man/zh_CN/chpasswd.8 index ad4501c1..944e0af8 100644 --- a/man/fr/chpasswd.8 +++ b/man/zh_CN/chpasswd.8 @@ -1,5 +1,6 @@ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. +.\"; 笢恅唳唳佯齾 soloman, Laser www.linuxforum.net 2000 .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -25,41 +26,47 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: chpasswd.8,v 1.1 2002/03/10 07:41:04 kloczek Exp $ +.\" $Id: chpasswd.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ .\" .TH CHPASSWD 8 -.SH NOM -\fBchpasswd\fR - met jour le fichier de mots de passe par lot -.SH SYNOPSIS -\fBchpasswd [-e]\fR -.SH DESCRIPTION -\fBchpasswd\fR lit un fichier contenant des paires de nom d'utilisateur -et mot de passe depuis l'entr嶪 standard et utilise cette information -pour mettre jour un groupe d'utilisateurs existants. Sans l'option -e, -les mots de passe fournis doivent 皻re en clair. Si l'option -e est -utilis嶪, les mots de passe doivent 皻re fournis crypt廥. Chaque ligne -est au format +.SH NAME 靡趼 +chpasswd \- 傖蠶載陔蚚誧腔諳鍔 +.SH 軞擬 +chpasswd [\-e] +.SH 鏡扴 +.B chpasswd +植炵苀腔梓袧怀賱賺邆羶孝鏽備睿諳鍔ㄛ +甜瞳蚚涴虳陓洘懂載陔炵苀奻眒湔婓腔蚚誧腔諳鍔﹝ +婓羶衄蚚 \-e 涴跺羲壽恁砐腔①錶狟ㄛ諳鍔蔚偌隴恅腔倛宒諉彶﹝ +蝜妏蚚賸 \-e 恁砐ㄛ諳鍔蔚硐夔眕樓躇腔源宒換菰﹝ +藩俴腔撿极跡宒覤薦鱹麾 .sp 1 - \fInom_d_utilisateur\fR:\fImot_de_passe\fR + \fI蚚誧靡\fRㄩ\fI陔諳鍔\fR .sp 1 -L'utilisateur doit exister. -Le mot de passe fourni sera crypt si n嶰essaire, et l'殟e du mot de passe -sera mis jour, s'il est pr廥ent. +蚚誧靡斛剕岆炵苀奻眒湔婓腔蚚誧﹝ +怀賮鏽僉郺痡寋羌掃靇邾蚚傽池瞨 +蝜諳鍔恅璃撿衄奀潔杻俶ㄛ寀肮奀載陔﹝ .PP -Cette commande est destin嶪 皻re utilis嶪 dans un environnement o de nombreux -comptes sont cr澭s en m瘱e temps. -.SH AVERTISSEMENTS +森韜鍔巠蚚衾湮倰腔炵苀ㄛ婓森濬炵苀笢ㄛ +蚚誧珨啜飲岆珨棒肮奀汜傖腔ㄛ奧蚚 adduser 睿 +passwd 諳鍔懂勤む珨珨輛俴扢离珨啜佽厘厘掀誕鞣﹝ +.SH 蛁砩岈砐 .\" The \fBmkpasswd\fR command must be executed afterwards to update the .\" DBM password files. -Le fichier d'entr嶪 doit 皻re correctement prot嶲 s'il contient des mots de -passe en clair. .\" This command may be discarded in favor of the newusers(8) command. -.SH VOIR AUSSI -.\" mkpasswd(8), passwd(1), useradd(1) -.BR passwd (1), -.BR useradd (8), -.BR newusers (8) -.SH AUTEUR -Julianne Frances Haugh -.SH TRADUCTION -Amand Tihon +秪峈褫眕妏蚚恅璃笭隅砃輛俴怀諴 +撈ㄩchpasswd < user&passwd-filenameㄛ +蝜怀輷躁岆偌準樓躇源宒換菰腔趕ㄛ③勤蜆恅璃輛俴巠絞腔樓躇﹝ +.SH 衱獗 +passwd(1),useradd(8),newuser(8) +.SH 釬氪 +Julianne Frances Haugh (jfh@bga.com) +.SH "[笢恅唳峎誘沎" +.B 垀蹕藷 +.SH "[笢恅唳郔陔載陔]" +2000/11/26 + +.SH "[笢弊 Linux 蹦抭 man 忒聊珜楹祒數赫]" +.TP +.BI http://www.cmpp.net/ + diff --git a/man/ko/chsh.1 b/man/zh_CN/chsh.1 similarity index 51% rename from man/ko/chsh.1 rename to man/zh_CN/chsh.1 index 7a545bdb..8ed09e4e 100644 --- a/man/ko/chsh.1 +++ b/man/zh_CN/chsh.1 @@ -8,42 +8,44 @@ .\" .\" $Author: kloczek $ .\" $Revision: 1.1 $ -.\" $Date: 2002/03/13 19:03:01 $ +.\" $Date: 2003/04/28 02:14:04 $ .\" .TH CHSH 1 "October 13 1994" "chsh" "Linux Reference Manual" -.SH NAME -chsh \- 餌辨濠 煎斜檣 蔗擊 夥羞棻. -.SH SYNOPSIS +.SH 靡備 +chsh \- 載遙斕腎輮捨齾繭礬hell +.SH 逄楊 .B chsh [\ \-s\ shell\ ] [\ \-l\ ] [\ \-u\ ] [\ \-v\ ] [\ username\ ] -.SH DESCRIPTION +.SH 鏡扴 .B chsh -貲滄擎 餌辨濠陛 餌辨ж堅 氈朝 煎斜檣 蔗擊 夥紱朝等, 餌辨脹棻. -(檜蜓擎 exit 貲滄擊 餌辨ц擊 陽 煎斜嬴醒腎朝 蔗擊 蜓и棻.) -貲滄ч縑憮 蔗擊 雖薑ж雖 彊戲賊, 餌辨濠縑啪 僭橫獄棻. -.SS VALID SHELLS +蚚懂載遙斕腎輮捨齾繭礬hell +﹝婓韜鍔蹈羶硌隅shell﹝ .B chsh -貲滄縑憮朝 瞰渠 唳煎蒂 雖薑ж朝 橫集и 褒чだ橾紫 雖薑檜 陛棟ж棻. -ж雖虜, +頗枑尨珨跺跤斕﹝ +.SS 衄虴腔shell +.B chsh +褫蚚硌隅繚噤姻腔源宒懂硌隅庥扂遘鶹屼棣迮警粥腹 +辣齮畏蝜森 shell甜羶槨翹婓 .I /etc/shells -だ橾縑憮 雖薑腎橫 氈雖 彊朝 ヴ斜葡擊 餌辨й 唳辦縑朝 唳堅 詭衛雖蒂 爾罹遽棻. -.SH OPTIONS +紫奻ㄛ寀chsh頗枑堤劑豢捅洘﹝ +.SH 恁砐 .TP .I "\-s, \-\-shell" -雖薑ж朝 蔗擊 擅戲煎 餌辨й 煎斜檣 蔗煎 夥羞棻. +曹載斕腔腎褭hell. .TP .I "\-l, \-\-list-shells" +蹈堤槨翹婓 .I /etc/shells -だ橾 寰縑 雖薑脹 蔗擊 釭翮ж堅 葆耀棻. +腔shell﹝ .TP .I "\-u, \-\-help" -紫遺蜓擊 爾罹輿堅 葆耀棻. +妏蚚傻捅﹝ .TP .I "-v, \-\-version" -幗瞪 薑爾蒂 爾罹輿堅 葆耀棻. -.SH "SEE ALSO" +唳掛訧捅 +.SH "眈壽恅璃" .BR login (1), .BR passwd (5), .BR shells (5) -.SH AUTHOR +.SH 釬氪 Salvatore Valente diff --git a/man/it/groupadd.8 b/man/zh_CN/groupadd.8 similarity index 51% rename from man/it/groupadd.8 rename to man/zh_CN/groupadd.8 index 7a2c1873..b7d90edf 100644 --- a/man/it/groupadd.8 +++ b/man/zh_CN/groupadd.8 @@ -1,66 +1,93 @@ -.\" Copyright 1991, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: groupadd.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH GROUPADD 8 -.SH NOME -groupadd \- Crea un nuovo gruppo -.SH SINTASSI -.B groupadd -[\fB-g\fI gid \fR[\fB-o\fR]] -.I gruppo -.SH DESCRIZIONE -Il comando \fBgroupadd\fR crea un nuovo account di gruppo usando i valori -specificati sulla linea di comando ed i valori predefiniti dal sistema. -Il nuovo gruppo verr aggiunto ai file di sistema che lo necessitano. -Le opzioni che si applicano al comando \fBgroupadd\fR sono -.IP "\fB-g \fIgid\fR" -Il valore numerico dell'identificatore (ID) del gruppo. -Questo valore deve essere univoco, a meno che non venga usata l'opzione \fB-o\fR. -Il valore deve essere non-negativo. -La scelta predefinita quella di usare il minimo valore di ID superiore a 99 -e superiore a qualunque altro gruppo. -Valori tra 0 e 99 sono tipicamente riservati per account di sistema. -.SH FILE -/etc/group \- informazioni sugli account di gruppo -.br -/etc/gshadow \- informazioni sicure sugli account di gruppo -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR useradd (8), -.BR userdel (8), -.BR usermod (8), -.BR passwd (1), -.BR groupdel (8), -.BR groupmod (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) +.\" Copyright 1991, Julianne Frances Haugh +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $Id: groupadd.8,v 1.3 2004/01/05 01:08:36 kloczek Exp $ +.\" +.TH GROUPADD 8 +.SH 靡備 +groupadd \- 膘 蕾 陔 郪 +.SH 逄楊 +.B groupadd +[\fB-g\fI gid \fR[\fB-o\fR]] [\fB-r\fR] [\fB-f\fR] \fIgroup\fR +.SH 鏡扴 +\fBgroupadd\fR +褫 硌 隅 郪 靡 備 懂 膘 蕾 陔 腔 郪 梛 瘍 ﹝ +剒 猁 奀 褫 植 炵 苀 笢 腕 陔 郪 硉 ﹝ +\fBgroupadd\fR 衄 狟 蹈 恁 砐 褫 蚚 ﹝ +.IP "\fB-g \fIgid\fR" +group's ID 硉 ﹝ +壺 準 妏 蚚 \fB-o\fR 統 杅 祥 蜆 硉 斛 剕 岆 峔 珨 ㄛ 祥 褫 眈 肮 ﹝ +杅 硉 祥 褫 峈 蛹 ﹝ +啎 扢 峈 郔 苤 祥 腕 苤 衾 500 奧 紨 棒 崝 樓 ﹝ 0~499 換 苀 奻 +岆 悵 隱 跤 \fI炵苀梛瘍\fR 妏 蚚 ﹝ +.IP \fB-r\fR + + +森 統 杅 岆 蚚 懂 膘 蕾 \fI炵苀梛瘍\fR ﹝ +腔 UID 頗 掀 隅 砱 婓 炵 苀 紫 奻 /etc/login.defs. +腔 UID_MIN 懂 腔 苤 ﹝ 蛁 砩 useradd 森 蚚 楊 垀 膘 +蕾 腔 梛 瘍 祥 頗 膘 蕾 妏 蚚 氪 醴 翹 ㄛ 珩 祥 頗 +婓 綱 槨 翹 婓 /etc/login.defs. 腔 隅 砱 硉 ﹝ +彆 斕 砑 猁 衄 妏 蚚 氪 醴 翹 剕 塗 俋 硌 隅 -m 統 +杅 懂 膘 蕾 炵 苀 梛 瘍 ﹝ 涴 岆 RED HAT 塗 俋 崝 +扢 腔 恁 砐 ﹝ +坳 頗 赻 雄 堆 斕 恁 隅 珨 跺 苤 衾 499 腔 \fIgif\fR +祥 剒 猁 婬 樓 奻 \fB-g\fR 統 杅 ﹝ +.br +涴 岆 RED HAT 塗 俋 崝 扢 腔 恁 砐 ﹝ + +.IP \fB-f\fR +This is \fIforce\fR flag. +陔 崝 珨 跺 眒 冪 湔 婓 腔 郪 梛 瘍 ㄛ 炵 苀 頗 堤 +珋 渣 昫 捅 洘 綴 賦 旰 \fBgroupadd\fR ﹝ + 彆 岆 涴 欴 腔 ① 錶 ㄛ 祥 頗 陔 崝 涴 跺 郪 +( 彆 岆 涴 跺 ① 錶 狟 ㄛ 炵 苀 祥 頗 婬 陔 崝 珨 棒 ) +.br +珩 褫 肮 奀 樓 奻 \fB-g\fR 恁 砐 +絞 斕 樓 奻 珨 跺 \fIgid\fR ㄛ 森 奀 \fIgid\fR +憩 祥 蚚 岆 峔 珨 硉 ㄛ 褫 祥 樓 \fB-o\fR 統 杅 ㄛ +膘 疑 郪 綴 頗 珆 賦 彆 +(adding a group as neither \fB-g\fR or \fB-o\fR options were +specified). + +.br +涴 岆 RED HAT 塗 俋 崝 扢 腔 恁 砐 ﹝ +.SH 紫偶 +\fI/etc/group\fR \- 郪 訧 捅 +.br +\fI/etc/gshadow\fR \- 郪 訧 捅 樓 躇 +.SH 眈壽恅璃 +.BR chfn (1), +.BR chsh (1), +.BR useradd (8), +.BR userdel (8), +.BR usermod (8), +.BR passwd (1), +.BR groupdel (8), +.BR groupmod (8) +.SH 釬氪 +Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/groupdel.8 b/man/zh_CN/groupdel.8 similarity index 67% rename from man/it/groupdel.8 rename to man/zh_CN/groupdel.8 index e930eb4f..ed65fbd1 100644 --- a/man/it/groupdel.8 +++ b/man/zh_CN/groupdel.8 @@ -1,63 +1,57 @@ -.\" Copyright 1991 - 1993, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: groupdel.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH GROUPDEL 8 -.SH NOME -groupdel \- Rimuove un gruppo -.SH SINTASSI -.B groupdel -.I gruppo -.SH DESCRIZIONE -Il comando \fBgroupdel\fR modifica i file di account di sistema, rimuovendo -tutte le voci che si riferiscono a \fIgruppo\fR. -Il gruppo nominato deve esistere. -.PP -Occorre controllare manualmente tutti i filesystem per assicurarsi che non -rimanga alcun file avente come ID di gruppo del file il gruppo specificato. -.SH CAVEAT -Non si pu rimuovere il gruppo primario di qualche utente esistente. -Occorre rimuovere l'utente prima di rimuovere il gruppo. -.SH FILE -/etc/group \- informazioni sui gruppi -.br -/etc/gshadow \- informazioni sicure sui gruppi -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR useradd (8), -.BR userdel (8), -.BR usermod (8), -.BR passwd (1), -.BR groupadd (8), -.BR groupmod (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) +.\" Copyright 1991 - 1993, Julianne Frances Haugh +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $Id: groupdel.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" +.TH GROUPDEL 8 +.SH 靡備 +groupdel \- 刉壺禍 +.SH 逄楊 +.B groupdel +.I group +.SH 鏡扴 +\fBgroupdel\fR 韜鍔頗党蜊炵苀梛瘍紫ㄛ頗刉壺垀衄眒冪湔婓腔\fIgroup\fR. +禍橨剕湔婓﹝ +.PP +斕剕忒雄溜玾銨薦齾迮警粥裒腴傀楛衄羶衄紫偶遜岆羶党淏禍橨曹傖禍壈D﹝ +.SH 劑豢 +蝜衄庥扂遘鶲禍曀騫墓譏蓅硨葋炵躉偏芠酸嗔く蜆禍憿 +郔疑珂痄壺妏蚚氪綴婬痄壺禍憿 +.SH 紫偶 +\fI/etc/group\fR \- 禍樼庍 +\fI/etc/gshadow\fR \- 禍樼庍飲蚚 +.SH 眈壽恅璃 +.BR chfn (1), +.BR chsh (1), +.BR useradd (8), +.BR userdel (8), +.BR usermod (8), +.BR passwd (1), +.BR groupadd (8), +.BR groupmod (8) +.SH 釬氪 +Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/groupmod.8 b/man/zh_CN/groupmod.8 similarity index 62% rename from man/it/groupmod.8 rename to man/zh_CN/groupmod.8 index 78369228..20abf1b9 100644 --- a/man/it/groupmod.8 +++ b/man/zh_CN/groupmod.8 @@ -1,69 +1,68 @@ -.\" Copyright 1991, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: groupmod.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH GROUPMOD 8 -.SH NOME -groupmod \- Modifica un gruppo -.SH SINTASSI -.B groupmod -[\fB-g\fI gid \fR[\fB-o\fR]] -[\fB-n\fI nome_gruppo \fR] -.I gruppo -.SH DESCRIZIONE -Il comando \fBgroupmod\fR modifica i file di account del sistema in modo -da riflettere i cambiamenti che sono specificati sulla linea di comando. -Le opzioni che si applicano al comando \fIgroupmod\fR sono -.IP "\fB-g \fIgid\fR" -Il valore numerico dell'identificatore (ID) del gruppo. -Questo valore deve essere univoco, a meno che non venga usata l'opzione -\fB-o\fR. -Il valore deve essere non-negativo. -Valori tra 0 e 99 sono tipicamente riservati per gruppi di sistema. -Occorre modificare manualmente l'ID di gruppo di tutti i file -il cui ID di gruppo quello vecchio. -.IP "\fB-n \fInome_gruppo\fR" -Il nome del gruppo verr modificato da \fIgruppo\fR a \fInome_gruppo\fR. -.SH FILE -/etc/group \- informazioni sui gruppi -.br -/etc/gshadow \- informazioni sicure sui gruppi -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR useradd (8), -.BR userdel (8), -.BR usermod (8), -.BR passwd (1), -.BR groupadd (8), -.BR groupdel (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) +.\" Copyright 1991, Julianne Frances Haugh +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $Id: groupmod.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" +.TH GROUPMOD 8 +.SH 靡備 +groupmod \- 党 蜊 郪 +.SH 逄楊 +.B groupmod +[\fB-g\fI gid \fR[\fB-o\fR]] +[\fB-n\fI group_name \fR] +.I group +.SH 鏡扴 + +\fBgroupmod\fR 韜 鍔 頗 統 桽 斕 韜 鍔 蹈 奻 硌 隅 腔 窒 爺 +党 蜊 炵 苀 梛 瘍 紫 ﹝ 狟 蹈 峈 \fIgroupmod\fR 褫 恁 蚚 腔 統 杅 ﹝ + +.IP "\fB-g \fIgid\fR" + 郪 I D 硉 ﹝ +斛 剕 峈 峔 珨 腔 ID 硉 ㄛ 壺 準 蚚 -o 恁 砐 ﹝ +杅 趼 祥 褫 峈 蛹 硉﹝啎 扢 峈 郔 +苤 祥 腕 苤 衾 99 奧 紨 棒 崝 樓 ﹝ 0~99 換 苀 奻 +岆 悵 隱 跤 炵 苀 梛 瘍 妏 蚚 ﹝ + 彆 衄 紫 偶 妏 蚚 導 腔 郪 ID ㄛ 奧 涴 奀 緊 斕 陔 崝 腔 郪 ID +ョ 疑 迵 導 腔 眈 肮 ㄛ 涴 欴 腔 趕 +斕 猁 忒 雄 蜊 珨 狟 涴 虳 紫 偶 腔 郪 ID ﹝ +.IP "\fB-n \fIgroup_name\fR" +載 蜊 郪 靡 ﹝ +.SH 紫偶 +\fI/etc/group\fR \- 郪 訧 捅 +.br +\fI/etc/gshadow\fR \- 郪 訧 捅 樓 躇 +.SH 眈壽恅璃 +.BR chfn (1), +.BR chsh (1), +.BR useradd (8), +.BR userdel (8), +.BR usermod (8), +.BR passwd (1), +.BR groupadd (8), +.BR groupdel (8) +.SH 釬氪 +Julianne Frances Haugh (jfh@tab.com) diff --git a/man/zh_CN/useradd.8 b/man/zh_CN/useradd.8 new file mode 100644 index 00000000..5845c05c --- /dev/null +++ b/man/zh_CN/useradd.8 @@ -0,0 +1,198 @@ +.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $Id: useradd.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" +.TH USERADD 8 +.SH 靡 備 +useradd \- 梛 瘍 膘 蕾 麼 載 陔 陔 妏 蚚 氪 腔 訧 捅 +.SH 逄 楊 +.TP 8 +.B useradd +.\" .RB [ -A +.\" .RI { method | \fBDEFAULT\fR "},... ]" +.RB [ -c +.IR comment ] +.RB [ -d +.IR home_dir ] +.br +.RB [ -e +.IR expire_date ] +.RB [ -f +.IR inactive_time ] +.br +.RB [ -g +.IR initial_group ] +.RB [ -G +.IR group [,...]] +.br +.RB [ -m " [" -k +.IR skeleton_dir ] " |" " " -M ] +.RB [ -s +.IR shell ] +.br +.RB [ -u +.IR uid " [" +.BR -o ]] +.RB [ -n ] +.RB [ -r ] +.I login +.TP 8 +.B useradd +\fB-D\fR +[\fB-g\fI default_group\fR] +[\fB-b\fI default_home\fR] +.br +[\fB-f\fI default_inactive\fR] +[\fB-e\fI default_expire_date\fR] +.br +[\fB-s\fI default_shell\fR] +.SH 鏡 扴 +.SS 陔 梛 瘍 膘 蕾 +絞 祥 樓 \fB-D\fR 統 杅 , \fBuseradd\fR 硌 鍔 妏 蚚 韜 鍔 蹈 懂 硌 隅 +陔 梛 瘍 腔 扢 隅 硉 and 妏 蚚 炵 苀 奻 腔 啎 扢 硉 . +陔 妏 蚚 氪 梛 瘍 蔚 莉 汜 珨 虳 炵 苀 紫 偶 ㄛ 妏 蚚 氪 醴 翹 膘 蕾 ㄛ +蕭 掘 れ 宎 紫 偶 脹 +ㄛ 涴 虳 歙 褫 眕 瞳 蚚 韜 鍔蹈 恁 砐 硌 隅 ﹝ 森 唳 掛 峈 Red Hat Linux 枑 鼎 +ㄛ 褫 堆 藩 跺 陔 樓 腔 妏 蚚 氪 膘 蕾 跺 梗 腔 group , 拺 剕 氝 樓 \fB-n\fR +恁 砐 ﹝ +\fBuseradd\fR 褫 妏 蚚 腔 恁 砐 峈 +.\" .IP "\fB-A {\fImethod\fR|\fBDEFAULT\fR},..." +.\" The value of the user's authentication method. +.\" The authentication method is the name of a program which is responsible +.\" for validating the user's identity. +.\" The string \fBDEFAULT\fR may be used to change the user's authentication +.\" method to the standard system password method. +.\" This is a comma-separated list of program names. +.\" It may include \fBDEFAULT\fR exactly once. +.IP "\fB-c \fIcomment\fR" +陔 梛 瘍 password 紫 腔 佽 隴 戲 ﹝ +.IP "\fB-d \fIhome_dir\fR" +陔 梛 瘍 藩 棒 腎 奀 垀 妏 蚚 腔 \fIhome_dir\fR ﹝ +啎 扢 硉 峈 \fIdefault_home\fR 囀 \fIlogin\fR 靡 備 ㄛ 甜 絞 傖 腎 奀 醴 翹 +靡 備 ﹝ +.IP "\fB-e \fIexpire_date\fR" +梛 瘍 笝 砦 ぶ ﹝ ぶ 腔 硌 隅 跡 宒 峈 \fIMM/DD/YY\fR ﹝ +.IP "\fB-f \fIinactive_days\fR" +梛 瘍 徹 ぶ 撓 綴 蚗 壅 礿 ﹝ +絞 硉 峈 0 奀 梛 瘍 寀 蕾 覦 掩 礿 ﹝ +奧 絞 硉 峈 -1 奀 寀 壽 敕 森 髡 夔 ㄛ 啎 扢 硉 峈 -1 +.IP "\fB-g \fIinitial_group\fR" +group 靡 備 麼 眕 杅 趼 懂 酕 峈 妏 蚚 氪 腎 れ 宎 郪 (group) ﹝ + 郪 靡 剕 峈 珋 衄 湔 婓 腔 靡 備 ﹝ + 郪 杅 趼 珩 剕 峈 珋 衄 湔 婓 腔 郪 ﹝ +啎 扢 腔 郪 杅 趼 峈 1 ﹝ +.IP "\fB-G \fIgroup,[...]\fR" +隅 砱 森 妏 蚚 氪 峈 森 珨 剽 groups 腔 傖 埜 ﹝ +藩 跺 郪 妏 蚚 "," ⑹ 跡 羲 懂 ㄛ 祥 褫 眕 標 娸 諾 啞 趼 啋 ﹝ + 郪 靡 肮 \fB-g\fR 恁 砐 腔 癹 秶 ﹝ +隅 砱 硉 峈 妏蚚 氪 腔 れ 宎 郪 ﹝ +.IP \fB-m\fR +妏 蚚 氪 醴 翹 祥 湔 婓 寀 赻 雄 膘 蕾 ﹝ + 妏 蚚 \fB-k\fR 恁 砐 \fIskeleton_dir\fR 囀 腔 紫 偶 蔚 葩 秶 祫 妏 蚚 氪 醴 +翹 狟 ﹝ + 奧 婓 \fI/etc/skel\fR 醴 翹 狟 腔 紫 偶 珩 頗 葩 秶 徹 測 ﹝ + 睡 婓 \fIskeleton_dir\fR or \fI/etc/skel\fR 腔 醴 翹 珩 眈 肮 頗 婓 妏 蚚 氪 +醴 翹 狟 珨 珨 膘 蕾 ﹝ +The \fB-k\fR 肮 \fB-m\fR +祥 膘 蕾 醴 翹 眕 摯 祥 葩 秶 睡 紫 偶 峈 啎 扢 硉 ﹝ +.IP \fB-M\fR +祥 膘 蕾 妏 蚚 氪 醴 翹 ㄛ 撈 妏 \fI/etc/login.defs\fR 炵 苀 紫 扢 隅 猁 膘 +蕾 妏 蚚 氪 醴 翹 ﹝ +.IP \fB-n\fR +啎 扢 硉 妏 蚚 氪 郪 迵 妏 蚚 氪 靡 備 頗 眈 肮 ﹝ 森 恁 砐 蔚 秏 森 啎 +扢 硉 ﹝ +.IP \fB-r\fR +森 統 杅 岆 蚚 懂 膘 蕾 炵 苀 梛 瘍 ﹝ 炵 苀 梛 瘍 腔 UID 頗 掀 隅 砱 婓 炵 +苀 紫 奻 \fI/etc/login.defs\fR. +腔 UID_MIN 懂 腔 苤 ﹝ 蛁 砩 \fBuseradd\fR 森 蚚 楊 垀 膘 蕾 腔 梛 瘍 祥 頗 +膘 蕾 妏 蚚 氪 醴 翹 +ㄛ 珩 祥 頗 婓 綱 槨 翹 婓 \fI/etc/login.defs\fR. 腔 隅 砱 硉 ﹝ + 彆 斕 砑 猁 衄 妏 蚚 氪 醴 翹 剕 塗 俋 硌 隅 \fB-m\fR 統 杅 懂 膘 蕾 炵 +苀 梛 瘍 ﹝ +涴 岆 RED HAT 塗 俋 崝 扢 腔 恁 砐 ﹝ +.IP "\fB-s \fIshell\fR" +妏 蚚 氪 腎 綴 妏 蚚 腔 shell 靡 備 ﹝ +啎 扢 峈 祥 沓 迡 ㄛ 涴 欴 炵 苀 頗 堆 斕 硌 隅 啎 扢 腔 腎 shell ﹝ +.IP "\fB-u \fIuid\fR" +妏 蚚 氪 腔 ID 硉 ﹝ 斛 剕 峈 峔 珨 腔 ID 硉 ㄛ 壺 準 蚚 \fI-o\fR 恁 砐 ﹝ +杅 趼 祥 褫 峈 蛹 硉﹝啎 扢 峈 郔 苤 祥 腕 苤 衾 99 奧 紨 棒 崝 樓 ﹝ +0~99 換 苀 奻 岆 悵 隱 跤 炵 苀 梛 瘍 妏 蚚 ﹝ + +.SS 蜊 曹 啎 扢 硉 +絞 \fB-D\fR 恁 砐 堤 珋 奀 ㄛ \fBuseradd\fR 凅 堤 珋 婓 腔 啎 扢 硉 ㄛ 麼 岆 賢 +蚕 +韜 鍔 蹈 腔 源 宒 載 陔 啎 扢 硉 ﹝ +褫 蚚 恁 砐 峈 ￣ +.IP "\fB-b \fIdefault_home\fR" +隅 砱 妏 蚚 氪 垀 扽 醴 翹 腔 ヶ 珨 跺 醴 翹 ﹝ +妏 蚚 氪 靡 備 頗 蜇 樓 婓 \fIdefault_home\fR 綴 醱 +蚚 懂 膘 蕾 陔 妏 蚚 氪 腔 醴 翹 ﹝ +絞 妏 蚚 \fB-d\fI 綴 寀 森 恁 砐 拸 虴 ﹝ +.IP "\fB-e \fIdefault_expire_date\fR" +妏 蚚 氪 梛 瘍 礿 砦 ぶ ﹝ +.IP "\fB-f \fIdefault_inactive\fR" +梛 瘍 徹 ぶ 撓 綴 礿 ﹝ +.IP "\fB-g \fIdefault_group\fR" +陔 梛 瘍 れ 宎 郪 靡 麼 ID ﹝ + 郪 靡 剕 峈 珋 衄 湔 婓 腔 靡 備 ﹝ + 郪 I D 珩 剕 峈 珋 衄 湔 婓 腔 郪 ﹝ +.IP "\fB-s \fIdefault_shell\fR" +妏 蚚 氪 腎 綴 妏 蚚 腔 shell 靡 備 ﹝ +厘 綴 陔 樓 腔 梛 瘍 飲 蔚 妏 蚚 森 shell. +.PP + 祥 硌 隅 睡 統 杅 ㄛ \fBuseradd\fR 珆 尨 醴 ヶ 啎 扢 腔 硉 ﹝ +.SH 蛁 暮 +炵 苀 奪 燴 氪 衄 砱 昢 婓 \fI/etc/skel\fR 醴 翹 狟 溫 离 妏 蚚 氪 隅 砱 紫 ﹝ +.br +森 唳 掛 ◇useradd◆ 蚕 Red Hat 党 蜊 ﹝ +.SH 劑 豢 +祥 褫 陔 崝 妏 蚚 氪 衾 NIS 郪 笢 ﹝ +斕 斛 剕 婓 NIS 侜 督 ん 奻 硒 俴 ﹝ +.SH 紫 偶 +\fI/etc/passwd\fR \- 妏 蚚 氪 梛 瘍 訧 捅 +.br +\fI/etc/shadow\fR \- 妏 蚚 氪 梛 瘍 訧 捅 樓 躇 +.br +\fI/etc/group\fR \- 郪 訧 捅 +.br +\fI/etc/default/useradd\fR \- 隅 砱 訧 捅 +.br +\fI/etc/login.defs\fR \- 炵 苀 嫘 砱 扢 隅 +.br +\fI/etc/skel\fR \- 囀 漪 隅 砱 紫 腔 醴 翹 +.SH SEE ALSO +.BR chfn (1), +.BR chsh (1), +.BR groupadd (8), +.BR groupdel (8), +.BR groupmod (8), +.BR passwd (1), +.BR userdel (8), +.BR usermod (8) +.SH AUTHOR +Julianne Frances Haugh (jfh@tab.com) diff --git a/man/hu/groups.1 b/man/zh_CN/userdel.8 similarity index 61% rename from man/hu/groups.1 rename to man/zh_CN/userdel.8 index 864ca8fe..26552ae4 100644 --- a/man/hu/groups.1 +++ b/man/zh_CN/userdel.8 @@ -25,31 +25,43 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: groups.1,v 1.2 2002/03/09 11:16:16 ankry Exp $ +.\" $Id: userdel.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ .\" -.TH GROUPS 1 -.SH N勼 -groups \- ki甏ja a jelenlegi csoportazonos癃 neveket -.SH 糞TEKINT仉 -.B groups -.RI [ felhaszn嫮 ] -.SH LE炅糜 -A -.B groups -parancs ki甏ja a jelenlegi csoportazonos癃 neveket vagy sz嫥廨t幧eket. -Ha nincs az 廨t幧nek megfelel bejegyz廥 a \fI/etc/group\fR f奫lban, akkor a csoport azonos癃 sz嫥嫢 甏ja ki. -Az opcion嫮is \fIfelhaszn嫮酀fR param彋er eset幯 azokat a csoportokat 甏ja ki, amelyekbe a megadott \fIfelhaszn嫮酀fR tartozik. -.SH MEGJEGYZ仉 -Azok a rendszerek, amelyek nem t嫥ogatj嫜 a konkurrens csoportbe嫮l癃嫳okat, a ki甏t inform塶i鏦at a \fI/etc/group\fR f奫lb鏊 gyjtik. -A felhaszn嫮鏮ak musz奫 a \fBnewgrp\fR vagy a \fBsg\fR parancsot haszn嫮niuk, hogy megv嫮toztass嫜 a jelenlegi val鏚i 廥 effekt癉 csoportazonos癃鎩ukat. -.SH F穗LOK -/etc/group \- inform塶i a csoportokr鏊 -.SH L糜D M乇 -.BR newgrp (1), -.BR getgid (2), -.BR getgroups (2), -.BR getuid (2) -.SH AUTHOR +.TH USERDEL 8 +.SH 靡備 +userdel \- 刉 壺 妏 蚚 氪 梛 瘍 摯 眈 壽 紫 偶 +.SH 逄楊 +.B userdel +[\fB-r\fR] +.I login +.SH 鏡扴 +\fBuserdel\fR 韜 鍔 党 蜊 炵 苀 梛 瘍 紫 +刉 壺 垀 衄 \fIlogin\fR 頗 統 蕉 腔 窒 爺 ﹝ +妏 蚚 氪 靡 備 斛 剕岆 湔 婓 腔 ﹝ +.IP \fB-r\fR +妏 蚚 氪 醴 翹 狟 腔 紫 偶 珨 甜 痄 壺 ﹝ 婓 む 坻 弇 离 奻 腔 紫 +偶 珩 蔚 珨 珨 梑 堤 甜 刉 壺 ﹝ +.SH 紫偶 +\fI/etc/passwd\fR \- 妏 蚚 氪 梛 瘍 訧 蹋 +.br +\fI/etc/shadow\fR \- 妏 蚚 氪 梛 瘍 訧 捅 樓 躇 +.br +\fI/etc/group\fR \- 郪 訧 捅 +.SH 劑豢 +\fBuserdel\fR 祥 埰 勍 斕 痄 壺 淏 婓盄 奻 +腔 妏 蚚 氪 梛 瘍 ﹝ +斕 斛 剕 興 裁 森 梛 瘍 珋 婓 婓 炵 苀 奻 硒 俴 腔 最 唗 符 夔 輛 俴 梛 瘍 +刉 壺 ﹝ +祥 夔 婓 NIS client 傷 痄 壺 NIS 扽 俶 腔 陲 昹 ﹝ +涴 雄 酕 剕 婓 NIS server 傷 奻 硒 俴 ﹝ +.SH SEE ALSO +.BR chfn (1), +.BR chsh (1), +.BR groupadd (8), +.BR groupdel (8), +.BR groupmod (8), +.BR passwd (1), +.BR useradd (8), +.BR usermod (8) +.SH 釬氪 Julianne Frances Haugh (jfh@tab.com) -.SH MAGYAR FORD炆糜 -ifj. Dyekiss Emil diff --git a/man/zh_CN/usermod.8 b/man/zh_CN/usermod.8 new file mode 100644 index 00000000..ccd8d3df --- /dev/null +++ b/man/zh_CN/usermod.8 @@ -0,0 +1,131 @@ +.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $Id: usermod.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" +.TH USERMOD 8 +.SH 靡備 +usermod \- 党 蜊 妏 蚚 氪 梛 瘍 +.SH 逄楊 +.TP 8 +.B usermod +.\" .RB [ -A +.\" .RI { method | \fBDEFAULT\fR "},... ]" +.RB [ -c +.IR comment ] +.RB [ -d +.IR home_dir " [" +.BR -m ]] +.br +.RB [ -e +.IR expire_date ] +.RB [ -f +.IR inactive_time ] +.br +.RB [ -g +.IR initial_group ] +.RB [ -G +.IR group [,...]] +.br +.RB [ -l +.IR login_name ] +.RB [ -s +.IR shell ] +.br +.RB [ -u +.IR uid " [" +.BR -o ]] +.I login +.SH 鏡扴 +\fBusermod\fR 韜 鍔 頗 統 桽 斕 韜 鍔 蹈 奻 硌 隅 腔 窒 爺 党 蜊 炵 苀 梛 +瘍 紫 ﹝ 狟 蹈 峈 \fBusermod\fR 褫 恁 蚚 腔 統 杅 ﹝ + +.\" .IP "\fB-A \fImethod\fR|\fBDEFAULT\fR" +.\" The new value of the user's authentication method. +.\" The authentication method is the name of a program which is responsible +.\" for validating the user's identity. +.\" The string \fBDEFAULT\fR may be used to change the user's authentication +.\" method to the standard system password method. +.IP "\fB-c \fIcomment\fR" +載 陔 妏 蚚 氪 梛 瘍 password 紫 笢 腔 蛁 賤 戲 +ㄛ 珨 啜 岆 妏 蚚 \fBchfn\fR(1) 懂 党 蜊 ﹝ +.IP "\fB-d \fIhome_dir\fR" +載 陔 妏 蚚 氪 陔 腔 腎 醴 翹 ﹝ + 彆 跤 隅 \fB-m\fR 恁 砐 ㄛ 妏 蚚 氪 導 醴 翹 頗 唸 善 陔 腔 醴 翹 +ㄛ 導 醴 翹 祥 湔 婓 寀 膘 跺 陔 腔 ﹝ +.IP "\fB-e \fIexpire_date\fR" +樓 奻 妏 蚚 氪 梛 瘍 礿 砦 ぶ ﹝ ぶ 跡 宒 峈 \fIMM/DD/YY\fR. +.IP "\fB-f \fIinactive_days\fR" +梛 瘍 徹 ぶ 撓 綴 蚗 壅 礿 芋ㄤ 硉 峈 0 奀 +梛 瘍 寀 蕾 覦 掩 礿 ﹝ 奧 絞 硉 峈 -1 奀 寀 壽敕森髡夔 +﹝啎 扢 硉 峈 -1﹝ +.IP "\fB-g \fIinitial_group\fR" +載 陔 妏 蚚 氪 陔 腔 れ 宎 腎 郪 ﹝ 郪 靡 剕 眒 湔 婓 +﹝ 郪 ID 斛 剕 統 桽 暫 衄 腔 腔 郪 ﹝ 郪 ID 啎 扢 硉 峈 1 ﹝ +.IP "\fB-G \fIgroup,[...]\fR" +隅 砱 妏 蚚 氪 峈 珨 剽 groups 腔 傖 埜 ﹝ 藩 +跺 郪 妏 蚚 "," ⑹ 跡 羲 懂 ㄛ 祥 褫 眕 標 娸 諾 +啞 趼 啋 ﹝ 郪 靡 肮 -g 恁 砐 腔 癹 秶 ﹝ + 彆 妏 蚚 氪 珋 婓 腔 郪 祥 婬 森 蹈 ㄛ 寀 蔚 妏 蚚 氪 蚕 蜆 + 郪 笢 痄 壺 ﹝ +.IP "\fB-l \fIlogin_name\fR" +曹 載 妏 蚚 氪 \fIlogin\fR 奀 腔 靡 備 峈 \fIlogin_name\fR ﹝ +む 衾 祥 曹 ﹝ 杻 梗 岆 ㄛ 妏 蚚 氪 醴 翹 靡 茼 蜆 珩 頗 躲 覂 載 雄 傖 陔 +腔 腎 靡 ﹝ +.IP "\fB-s \fIshell\fR" +硌 隅 陔 腎 shell ﹝ 森 戲 隱 啞 ㄛ 炵 苀 蔚 恁 蚚 炵 苀 啎 扢 shell ﹝ +.IP "\fB-u \fIuid\fR" +妏 蚚 氪 ID 硉 ﹝斛 剕 峈 峔 珨 腔 ID 硉 ㄛ 壺 準 蚚 \fI-o\fR 恁 砐 ﹝ 杅 +趼 祥 褫 峈 蛹 硉﹝啎 扢 峈 郔 苤 祥 腕 苤 衾 99 奧 紨 棒 +崝 樓 ﹝ 0~99 換 苀 奻 岆 悵 隱 跤 炵 苀 梛 瘍 妏 蚚 ﹝ +妏 蚚 氪 醴 翹 攷 狟 垀 衄 腔 紫 偶 醴 翹 む user ID 頗 赻 雄 蜊 曹 ﹝ +溫 婓 妏 蚚 氪 醴 翹 俋 腔 紫 偶 寀 猁 赻 俴 忒 雄 載 雄 ﹝ +.SH 劑豢 +\fBusermod\fR 祥 埰 勍 斕 蜊 曹 淏 婓盄 奻 腔 妏 蚚 氪 梛 瘍 靡 備 ﹝ +絞 usermod 蚚 懂 蜊 曹 user ID, 斛 剕 涴 靡 user 羶 婓 萇 齟 奻 硒 +俴 睡 最 唗﹝ +斕 剒 忒 雄 載 蜊 妏 蚚 氪 腔 crontab 紫 ﹝ +珩 剒 忒 雄 載 蜊 妏 蚚 氪 腔 at 馱 釬 紫 ﹝ +粒 蚚 NIS server 剕 婓 server 奻 載 雄 眈 壽 腔 NIS 扢 隅 ﹝ + +.SH 紫偶 +\fI/etc/passwd\fR \- 妏 蚚 氪 梛 瘍 訧 捅 +.br +\fI/etc/shadow\fR \- 妏 蚚 氪 梛 瘍 訧 捅 樓 躇 +.br +\fI/etc/group\fR \- 郪 訧 捅 +.SH 眈壽恅璃 +.BR chfn (1), +.BR chsh (1), +.BR groupadd (8), +.BR groupdel (8), +.BR groupmod (8), +.BR passwd (1), +.BR useradd (8), +.BR userdel (8) +.SH 釬氪 +Julianne Frances Haugh (jfh@tab.com) diff --git a/man/zh_TW/Makefile.am b/man/zh_TW/Makefile.am new file mode 100644 index 00000000..86659618 --- /dev/null +++ b/man/zh_TW/Makefile.am @@ -0,0 +1,14 @@ +# man pages encoded in Big5 +mandir = @mandir@/zh_TW + +man_MANS = \ + chfn.1 \ + chsh.1 \ + groupadd.8 \ + groupdel.8 \ + groupmod.8 \ + useradd.8 \ + userdel.8 \ + usermod.8 + +EXTRA_DIST = $(man_MANS) diff --git a/man/zh_TW/Makefile.in b/man/zh_TW/Makefile.in new file mode 100644 index 00000000..56672afc --- /dev/null +++ b/man/zh_TW/Makefile.in @@ -0,0 +1,418 @@ +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LIBCRACK = @LIBCRACK@ +LIBCRYPT = @LIBCRYPT@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ +LIBPAM = @LIBPAM@ +LIBS = @LIBS@ +LIBSKEY = @LIBSKEY@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +U = @U@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ + +# man pages encoded in Big5 +mandir = @mandir@/zh_TW +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ + +man_MANS = \ + chfn.1 \ + chsh.1 \ + groupadd.8 \ + groupdel.8 \ + groupmod.8 \ + useradd.8 \ + userdel.8 \ + usermod.8 + + +EXTRA_DIST = $(man_MANS) +subdir = man/zh_TW +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = + +NROFF = nroff +MANS = $(man_MANS) +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/zh_TW/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +man1dir = $(mandir)/man1 +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done + +man8dir = $(mandir)/man8 +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man8dir) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ + rm -f $(DESTDIR)$(man8dir)/$$inst; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(MANS) + +installdirs: + $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 uninstall-man8 + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-man1 install-man8 \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man8 + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/man/zh_TW/chfn.1 b/man/zh_TW/chfn.1 new file mode 100644 index 00000000..e3e833cc --- /dev/null +++ b/man/zh_TW/chfn.1 @@ -0,0 +1,64 @@ +.\" +.\" chfn.1 -- change your finger information +.\" (c) 1994 by salvatore valente +.\" +.\" this program is free software. you can redistribute it and +.\" modify it under the terms of the gnu general public license. +.\" there is no warranty. +.\" +.\" $Author: kloczek $ +.\" $Revision: 1.1 $ +.\" $Date: 2003/04/28 02:14:04 $ +.\" +.TH CHFN 1 "October 13 1994" "chfn" "Linux Reference Manual" +.SH 名稱 +chfn \- 改 變 你 的 finger 訊 息 +.SH 語法 +.B chfn +[\ \-f\ full-name\ ] [\ \-o\ office\ ] [\ \-p\ office-phone\ ] +[\ \-h\ home-phone\ ] [\ \-u\ ] [\ \-v\ ] [\ username\ ] +.SH 描述 +.B chfn +是 用 來 改 變 你 的 finger 訊 息 。 訊 息 是 存 放 在 +.I /etc/passwd 檔 內 。 可 藉 由 +.B finger +來 顯 示 你 的 訊 息 。 Linux +.B finger +命 令 會 顯 示 四 段 訊 息 ， 這 些 訊 息 均 可 藉 由 +.B chfn +改 變 +: 真 實 姓 名 ， 工 作 地 點 電 話 ， 及 你 家 的 電 話 。 +.SS 命令列 +每 一 段 訊 息 均 可 在 命 令 列 上 指 定 。 如 沒 有 給 定 訊 息 ， +.B chfn +進 入 交 談 模 式 +.SS INTERACTIVE MODE +交談模式 +.B chfn +會 在 每 一 欄 前 提 示 。 在 提 示 狀 態 下 ， 你 就 可 輸 入 新 的 訊 息 或 +是 按 return 而 不 改 變 。 +輸 入 "none" 則 表 示 該 欄 空 白 。 +.SH 選項 +.TP +.I "\-f, \-\-full-name" +真 實 姓 名 +.TP +.I "\-o, \-\-office" +辦 工 室 號 碼 +.TP +.I "\-p, \-\-office-phone" +辦 公 室 電 話 +.TP +.I "\-h, \-\-home-phone" +家 裡 的 電 話 +.TP +.I "\-u, \-\-help" +秀 出 使 用 說 明 短 訊 。 +.TP +.I "-v, \-\-version" +秀 出 版 本 訊 息 。 +.SH "相關文件" +.BR finger (1), +.BR passwd (5) +.SH 作者 +Salvatore Valente diff --git a/man/zh_TW/chsh.1 b/man/zh_TW/chsh.1 new file mode 100644 index 00000000..4007816f --- /dev/null +++ b/man/zh_TW/chsh.1 @@ -0,0 +1,51 @@ +.\" +.\" chsh.1 -- change your login shell +.\" (c) 1994 by salvatore valente +.\" +.\" this program is free software. you can redistribute it and +.\" modify it under the terms of the gnu general public license. +.\" there is no warranty. +.\" +.\" $Author: kloczek $ +.\" $Revision: 1.1 $ +.\" $Date: 2003/04/28 02:14:04 $ +.\" +.TH CHSH 1 "October 13 1994" "chsh" "Linux Reference Manual" +.SH 名稱 +chsh \- 更換你登入時所用的shell +.SH 語法 +.B chsh +[\ \-s\ shell\ ] [\ \-l\ ] [\ \-u\ ] [\ \-v\ ] [\ username\ ] +.SH 描述 +.B chsh +用來更換你登入時所用的shell +。在命令列沒指定shell。 +.B chsh +會提示一個給你。 +.SS 有效的shell +.B chsh +可用指定路徑全名的方式來指定任何一個可執行的檔案。 +然而，如果此 shell並沒紀錄在 +.I /etc/shells +檔上，則chsh會提出警告訊息。 +.SH 選項 +.TP +.I "\-s, \-\-shell" +變更你的登入shell. +.TP +.I "\-l, \-\-list-shells" +列出紀錄在 +.I /etc/shells +的shell。 +.TP +.I "\-u, \-\-help" +使用短訊。 +.TP +.I "-v, \-\-version" +版本資訊 +.SH "相關文件" +.BR login (1), +.BR passwd (5), +.BR shells (5) +.SH 作者 +Salvatore Valente diff --git a/man/zh_TW/groupadd.8 b/man/zh_TW/groupadd.8 new file mode 100644 index 00000000..87a0b2ac --- /dev/null +++ b/man/zh_TW/groupadd.8 @@ -0,0 +1,92 @@ +.\" Copyright 1991, Julianne Frances Haugh +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $Id: groupadd.8,v 1.3 2004/01/05 01:08:38 kloczek Exp $ +.\" +.TH GROUPADD 8 +.SH 名稱 +groupadd \- 建 立 新 群 組 +.SH 語法 +\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] \fIgroup\fR +.SH 描述 +\fBgroupadd\fR +可 指 定 群 組 名 稱 來 建 立 新 的 群 組 帳 號 。 +需 要 時 可 從 系 統 中 取 得 新 群 組 值 。 +\fBgroupadd\fR 有 下 列 選 項 可 用 。 +.IP "\fB-g \fIgid\fR" +group's ID 值 。 +除 非 使 用 \fB-o\fR 參 數 不 然 該 值 必 須 是 唯 一 ， 不 可 相 同 。 +數 值 不 可 為 負 。 +預 設 為 最 小 不 得 小 於 500 而 逐 次 增 加 。 0~499 傳 統 上 +是 保 留 給 \fI系統帳號\fR 使 用 。 +.IP \fB-r\fR + + +此 參 數 是 用 來 建 立 \fI系統帳號\fR 。 +的 UID 會 比 定 義 在 系 統 檔 上 /etc/login.defs. +的 UID_MIN 來 的 小 。 注 意 useradd 此 用 法 所 建 +立 的 帳 號 不 會 建 立 使 用 者 目 錄 ， 也 不 會 +在 乎 紀 錄 在 /etc/login.defs. 的 定 義 值 。 如 +果 你 想 要 有 使 用 者 目 錄 須 額 外 指 定 -m 參 +數 來 建 立 系 統 帳 號 。 這 是 RED HAT 額 外 增 +設 的 選 項 。 +它 會 自 動 幫 你 選 定 一 個 小 於 499 的 \fIgif\fR +不 需 要 再 加 上 \fB-g\fR 參 數 。 +.br +這 是 RED HAT 額 外 增 設 的 選 項 。 + +.IP \fB-f\fR +This is \fIforce\fR flag. +新 增 一 個 已 經 存 在 的 群 組 帳 號 ， 系 統 會 出 +現 錯 誤 訊 息 然 後 結 束 \fBgroupadd\fR 。 + 如 果 是 這 樣 的 情 況 ， 不 會 新 增 這 個 群 組 +( 如 果 是 這 個 情 況 下 ， 系 統 不 會 再 新 增 一 次 ) +.br +也 可 同 時 加 上 \fB-g\fR 選 項 +當 你 加 上 一 個 \fIgid\fR ， 此 時 \fIgid\fR +就 不 用 是 唯 一 值 ， 可 不 加 \fB-o\fR 參 數 ， +建 好 群 組 後 會 顯 結 果 +(adding a group as neither \fB-g\fR or \fB-o\fR options were +specified). + +.br +這 是 RED HAT 額 外 增 設 的 選 項 。 +.SH 檔案 +\fI/etc/group\fR \- 群 組 資 訊 +.br +\fI/etc/gshadow\fR \- 群 組 資 訊 加 密 +.SH 相關文件 +.BR chfn (1), +.BR chsh (1), +.BR useradd (8), +.BR userdel (8), +.BR usermod (8), +.BR passwd (1), +.BR groupdel (8), +.BR groupmod (8) +.SH 作者 +Julianne Frances Haugh (jfh@tab.com) diff --git a/man/dpasswd.8 b/man/zh_TW/groupdel.8 similarity index 67% rename from man/dpasswd.8 rename to man/zh_TW/groupdel.8 index b44a516b..a614e850 100644 --- a/man/dpasswd.8 +++ b/man/zh_TW/groupdel.8 @@ -1,5 +1,4 @@ -.\"$Id: dpasswd.8,v 1.9 2001/12/22 05:40:01 kloczek Exp $ -.\" Copyright 1991, Julianne Frances Haugh +.\" Copyright 1991 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,27 +24,34 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.TH DPASSWD 8 -.SH NAME -\fBdpasswd\fR - change dialup password -.SH SYNOPSIS -\fBdpasswd\fR [(\fB-af\fR|\fB-d\fR)] \fIshell\fR -.SH DESCRIPTION -\fBdpasswd\fR adds, deletes, and updates dialup passwords for user -login shells. -The dialup password is prompted for after a user's password has been -authenticated whenever the user logs in over a dialup line. -\fBdpasswd\fR will prompt for the new password twice to insure it -has been entered correctly. +.\" +.\" $Id: groupdel.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" +.TH GROUPDEL 8 +.SH 名稱 +groupdel \- 刪除群組 +.SH 語法 +.B groupdel +.I group +.SH 描述 +\fBgroupdel\fR 命令會修改系統帳號檔，會刪除所有已經存在的\fIgroup\fR. +群組名須存在。 .PP -The \fIshell\fR argument must be the complete pathname of the login -program. -.SH FILES -.br -/etc/d_passwd -.br -/etc/dialups -.SH SEE ALSO -.BR login (1) -.SH AUTHOR -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +你須手動確認一下所有的檔案系統確保有沒有檔案還是沒修正群組名變成群組ID。 +.SH 警告 +如果有任何一個群組的使用者在線上的話就不能移除該群組。 +最好先移除使用者後再移除群組。 +.SH 檔案 +\fI/etc/group\fR \- 群組資訊 +\fI/etc/gshadow\fR \- 群組資訊加密 +.SH 相關文件 +.BR chfn (1), +.BR chsh (1), +.BR useradd (8), +.BR userdel (8), +.BR usermod (8), +.BR passwd (1), +.BR groupadd (8), +.BR groupmod (8) +.SH 作者 +Julianne Frances Haugh (jfh@tab.com) diff --git a/man/pl/dpasswd.8 b/man/zh_TW/groupmod.8 similarity index 60% rename from man/pl/dpasswd.8 rename to man/zh_TW/groupmod.8 index ce6b485c..6bdd6fd6 100644 --- a/man/pl/dpasswd.8 +++ b/man/zh_TW/groupmod.8 @@ -1,5 +1,3 @@ -.\" $Id: dpasswd.8,v 1.4 2001/01/27 02:55:54 kloczek Exp $ -.\" {PTM/WK/1999-09-17} .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -26,29 +24,45 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.TH DPASSWD 8 -.SH NAZWA -\fBdpasswd\fR - zmie has這 telefoniczne -.SH SKｘDNIA -\fBdpasswd\fR [(\fB-a\fR|\fB-d\fR)] \fIpow這ka\fR -.SH OPIS -\fBdpasswd\fR dodaje, usuwa i aktualizuje has豉 telefoniczne (dialup -passwords) dla pow這k logowania u篡tkownik闚. -Ka盥orazowo, gdy u篡tkownik loguje si przez lini telefoniczn, -膨dane jest od niego has這 telefoniczne (po poprawnym uwierzytelnieniu -jego w豉snego has豉). -.PP -\fBdpasswd\fR b璠zie prosi o podanie nowego has豉 dwukrotnie, by upewni -si, 瞠 zosta這 ono poprawnie wprowadzone. -.PP -Argument \fIpow這ka\fR musi by pe軟, 軼ie磬ow nazw programu zg這szenia -(logowania). -.SH PLIKI +.\" +.\" $Id: groupmod.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" +.TH GROUPMOD 8 +.SH 名稱 +groupmod \- 修 改 群 組 +.SH 語法 +.B groupmod +[\fB-g\fI gid \fR[\fB-o\fR]] +[\fB-n\fI group_name \fR] +.I group +.SH 描述 + +\fBgroupmod\fR 命 令 會 參 照 你 命 令 列 上 指 定 的 部 份 +修 改 系 統 帳 號 檔 。 下 列 為 \fIgroupmod\fR 可 選 用 的 參 數 。 + +.IP "\fB-g \fIgid\fR" +群 組 I D 值 。 +必 須 為 唯 一 的 ID 值 ， 除 非 用 -o 選 項 。 +數 字 不 可 為 負 值。預 設 為 最 +小 不 得 小 於 99 而 逐 次 增 加 。 0~99 傳 統 上 +是 保 留 給 系 統 帳 號 使 用 。 +如 果 有 檔 案 使 用 舊 的 群 組 ID ， 而 這 時 候 你 新 增 的 群 組 ID +恰 好 與 舊 的 相 同 ， 這 樣 的 話 +你 要 手 動 改 一 下 這 些 檔 案 的 群 組 ID 。 +.IP "\fB-n \fIgroup_name\fR" +更 改 群 組 名 。 +.SH 檔案 +\fI/etc/group\fR \- 群 組 資 訊 .br -.I /etc/d_passwd -.br -.I /etc/dialups -.SH ZOBACZ TAK浩 -.BR login (1) -.SH AUTOR -Julianne Frances Haugh (jockgrrl@ix.netcom.com) +\fI/etc/gshadow\fR \- 群 組 資 訊 加 密 +.SH 相關文件 +.BR chfn (1), +.BR chsh (1), +.BR useradd (8), +.BR userdel (8), +.BR usermod (8), +.BR passwd (1), +.BR groupadd (8), +.BR groupdel (8) +.SH 作者 +Julianne Frances Haugh (jfh@tab.com) diff --git a/man/zh_TW/useradd.8 b/man/zh_TW/useradd.8 new file mode 100644 index 00000000..82581f79 --- /dev/null +++ b/man/zh_TW/useradd.8 @@ -0,0 +1,198 @@ +.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $Id: useradd.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" +.TH USERADD 8 +.SH 名 稱 +useradd \- 帳 號 建 立 或 更 新 新 使 用 者 的 資 訊 +.SH 語 法 +.TP 8 +.B useradd +.\" .RB [ -A +.\" .RI { method | \fBDEFAULT\fR "},... ]" +.RB [ -c +.IR comment ] +.RB [ -d +.IR home_dir ] +.br +.RB [ -e +.IR expire_date ] +.RB [ -f +.IR inactive_time ] +.br +.RB [ -g +.IR initial_group ] +.RB [ -G +.IR group [,...]] +.br +.RB [ -m " [" -k +.IR skeleton_dir ] " |" " " -M ] +.RB [ -s +.IR shell ] +.br +.RB [ -u +.IR uid " [" +.BR -o ]] +.RB [ -n ] +.RB [ -r ] +.I login +.TP 8 +.B useradd +\fB-D\fR +[\fB-g\fI default_group\fR] +[\fB-b\fI default_home\fR] +.br +[\fB-f\fI default_inactive\fR] +[\fB-e\fI default_expire_date\fR] +.br +[\fB-s\fI default_shell\fR] +.SH 描 述 +.SS 新 帳 號 建 立 +當 不 加 \fB-D\fR 參 數 , \fBuseradd\fR 指 令 使 用 命 令 列 來 指 定 +新 帳 號 的 設 定 值 and 使 用 系 統 上 的 預 設 值 . +新 使 用 者 帳 號 將 產 生 一 些 系 統 檔 案 ， 使 用 者 目 錄 建 立 ， +拷 備 起 始 檔 案 等 +， 這 些 均 可 以 利 用 命 令列 選 項 指 定 。 此 版 本 為 Red Hat Linux 提 供 +， 可 幫 每 個 新 加 入 的 使 用 者 建 立 個 別 的 group , 毋 須 添 加 \fB-n\fR +選 項 。 +\fBuseradd\fR 可 使 用 的 選 項 為 +.\" .IP "\fB-A {\fImethod\fR|\fBDEFAULT\fR},..." +.\" The value of the user's authentication method. +.\" The authentication method is the name of a program which is responsible +.\" for validating the user's identity. +.\" The string \fBDEFAULT\fR may be used to change the user's authentication +.\" method to the standard system password method. +.\" This is a comma-separated list of program names. +.\" It may include \fBDEFAULT\fR exactly once. +.IP "\fB-c \fIcomment\fR" +新 帳 號 password 檔 的 說 明 欄 。 +.IP "\fB-d \fIhome_dir\fR" +新 帳 號 每 次 登 入 時 所 使 用 的 \fIhome_dir\fR 。 +預 設 值 為 \fIdefault_home\fR 內 \fIlogin\fR 名 稱 ， 並 當 成 登 入 時 目 錄 +名 稱 。 +.IP "\fB-e \fIexpire_date\fR" +帳 號 終 止 日 期 。 日 期 的 指 定 格 式 為 \fIMM/DD/YY\fR 。 +.IP "\fB-f \fIinactive_days\fR" +帳 號 過 期 幾 日 後 永 久 停 權 。 +當 值 為 0 時 帳 號 則 立 刻 被 停 權 。 +而 當 值 為 -1 時 則 關 閉 此 功\ 能 ， 預 設 值 為 -1 +.IP "\fB-g \fIinitial_group\fR" +group 名 稱 或 以 數 字 來 做 為 使 用 者 登 入 起 始 群 組 (group) 。 +群 組 名 須 為 現 有 存 在 的 名 稱 。 +群 組 數 字 也 須 為 現 有 存 在 的 群 組 。 +預 設 的 群 組 數 字 為 1 。 +.IP "\fB-G \fIgroup,[...]\fR" +定 義 此 使 用 者 為 此 一 堆 groups 的 成 員 。 +每 個 群 組 使 用 "," 區 格 開 來 ， 不 可 以 夾 雜 空 白 字 元 。 + 群 組 名 同 \fB-g\fR 選 項 的 限 制 。 +定 義 值 為 使用 者 的 起 始 群 組 。 +.IP \fB-m\fR +使 用 者 目 錄 如 不 存 在 則 自 動 建 立 。 +如 使 用 \fB-k\fR 選 項 \fIskeleton_dir\fR 內 的 檔 案 將 複 製 至 使 用 者 目 +錄 下 。 +然 而 在 \fI/etc/skel\fR 目 錄 下 的 檔 案 也 會 複 製 過 去 取 代 。 +任 何 在 \fIskeleton_dir\fR or \fI/etc/skel\fR 的 目 錄 也 相 同 會 在 使 用 者 +目 錄 下 一 一 建 立 。 +The \fB-k\fR 同 \fB-m\fR +不 建 立 目 錄 以 及 不 複 製 任 何 檔 案 為 預 設 值 。 +.IP \fB-M\fR +不 建 立 使 用 者 目 錄 ， 即 使 \fI/etc/login.defs\fR 系 統 檔 設 定 要 建 +立 使 用 者 目 錄 。 +.IP \fB-n\fR +預 設 值 使 用 者 群 組 與 使 用 者 名 稱 會 相 同 。 此 選 項 將 取 消 此 預 +設 值 。 +.IP \fB-r\fR +此 參 數 是 用 來 建 立 系 統 帳 號 。 系 統 帳 號 的 UID 會 比 定 義 在 系 +統 檔 上 \fI/etc/login.defs\fR. +的 UID_MIN 來 的 小 。 注 意 \fBuseradd\fR 此 用 法 所 建 立 的 帳 號 不 會 +建 立 使 用 者 目 錄 +， 也 不 會 在 乎 紀 錄 在 \fI/etc/login.defs\fR. 的 定 義 值 。 +如 果 你 想 要 有 使 用 者 目 錄 須 額 外 指 定 \fB-m\fR 參 數 來 建 立 系 +統 帳 號 。 +這 是 RED HAT 額 外 增 設 的 選 項 。 +.IP "\fB-s \fIshell\fR" +使 用 者 登 入 後 使 用 的 shell 名 稱 。 +預 設 為 不 填 寫 ， 這 樣 系 統 會 幫 你 指 定 預 設 的 登 入 shell 。 +.IP "\fB-u \fIuid\fR" +使 用 者 的 ID 值 。 必 須 為 唯 一 的 ID 值 ， 除 非 用 \fI-o\fR 選 項 。 +數 字 不 可 為 負 值。預 設 為 最 小 不 得 小 於 99 而 逐 次 增 加 。 +0~99 傳 統 上 是 保 留 給 系 統 帳 號 使 用 。 + +.SS 改 變 預 設 值 +當 \fB-D\fR 選 項 出 現 時 ， \fBuseradd\fR 秀 出 現 在 的 預 設 值 ， 或 是 藉 +由 +命 令 列 的 方 式 更 新 預 設 值 。 +可 用 選 項 為 ： +.IP "\fB-b \fIdefault_home\fR" +定 義 使 用 者 所 屬 目 錄 的 前 一 個 目 錄 。 +使 用 者 名 稱 會 附 加 在 \fIdefault_home\fR 後 面 +用 來 建 立 新 使 用 者 的 目 錄 。 +當 然 使 用 \fB-d\fI 後 則 此 選 項 無 效 。 +.IP "\fB-e \fIdefault_expire_date\fR" +使 用 者 帳 號 停 止 日 期 。 +.IP "\fB-f \fIdefault_inactive\fR" +帳 號 過 期 幾 日 後 停 權 。 +.IP "\fB-g \fIdefault_group\fR" +新 帳 號 起 始 群 組 名 或 ID 。 +群 組 名 須 為 現 有 存 在 的 名 稱 。 +群 組 I D 也 須 為 現 有 存 在 的 群 組 。 +.IP "\fB-s \fIdefault_shell\fR" +使 用 者 登 入 後 使 用 的 shell 名 稱 。 +往 後 新 加 入 的 帳 號 都 將 使 用 此 shell. +.PP +如 不 指 定 任 何 參 數 ， \fBuseradd\fR 顯 示 目 前 預 設 的 值 。 +.SH 注 記 +系 統 管 理 者 有 義 務 在 \fI/etc/skel\fR 目 錄 下 放 置 使 用 者 定 義 檔 。 +.br +此 版 本 『useradd』 由 Red Hat 修 改 。 +.SH 警 告 +不 可 新 增 使 用 者 於 NIS 群 組 中 。 +你 必 須 在 NIS 伺 服 器 上 執 行 。 +.SH 檔 案 +\fI/etc/passwd\fR \- 使 用 者 帳 號 資 訊 +.br +\fI/etc/shadow\fR \- 使 用 者 帳 號 資 訊 加 密 +.br +\fI/etc/group\fR \- 群 組 資 訊 +.br +\fI/etc/default/useradd\fR \- 定 義 資 訊 +.br +\fI/etc/login.defs\fR \- 系 統 廣 義 設 定 +.br +\fI/etc/skel/\fR \- 內 含 定 義 檔 的 目 錄 +.SH SEE ALSO +.BR chfn (1), +.BR chsh (1), +.BR groupadd (8), +.BR groupdel (8), +.BR groupmod (8), +.BR passwd (1), +.BR userdel (8), +.BR usermod (8) +.SH AUTHOR +Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/userdel.8 b/man/zh_TW/userdel.8 similarity index 61% rename from man/it/userdel.8 rename to man/zh_TW/userdel.8 index 98049beb..23421880 100644 --- a/man/it/userdel.8 +++ b/man/zh_TW/userdel.8 @@ -1,72 +1,67 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: userdel.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH USERDEL 8 -.SH NOME -userdel \- Rimuove l'account di un utente ed i file relativi -.SH SINTASSI -.B userdel -[\fB-r\fR] -.I login -.SH DESCRIZIONE -Il comando \fBuserdel\fR modifica i file di account del sistema, rimuovendo -tutte le voci che si riferiscono a \fIlogin\fR. -L'utente nominato deve esistere. -.IP \fB-r\fR -I file nella home directory dell'utente verranno rimossi insieme alla home -directory stessa. -I file collocati in altri file system dovranno essere ricercati e rimossi -manualmente. -.SH FILE -/etc/passwd \- informazioni sugli account di utenti -.br -/etc/shadow \- informazioni sicure sugli account di utenti -.br -/etc/group \- informazioni sui gruppi -.SH CAVEAT -\fBuserdel\fR non permetter di rimuovere alcun account se l'utente -attualmente connesso. -Occorre uccidere qualunque processo in esecuzione che appartenga ad un account -che si sta rimuovendo. -Non possibile rimuovere nessun attributo NIS su un client NIS. -Questo deve essere fatto sul server NIS. -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR passwd (1), -.BR useradd (8), -.BR usermod (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) +.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $Id: userdel.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" +.TH USERDEL 8 +.SH 名稱 +userdel \- 刪 除 使 用 者 帳 號 及 相 關 檔 案 +.SH 語法 +.B userdel +[\fB-r\fR] +.I login +.SH 描述 +\fBuserdel\fR 命 令 修 改 系 統 帳 號 檔 +刪 除 所 有 \fIlogin\fR 會 參 考 的 部 份 。 +使 用 者 名 稱 必 須是 存 在 的 。 +.IP \fB-r\fR +使 用 者 目 錄 下 的 檔 案 一 並 移 除 。 在 其 他 位 置 上 的 檔 +案 也 將 一 一 找 出 並 刪 除 。 +.SH 檔案 +\fI/etc/passwd\fR \- 使 用 者 帳 號 資 料 +.br +\fI/etc/shadow\fR \- 使 用 者 帳 號 資 訊 加 密 +.br +\fI/etc/group\fR \- 群 組 資 訊 +.SH 警告 +\fBuserdel\fR 不 允 許 你 移 除 正 在線 上 +的 使 用 者 帳 號 。 +你 必 須 砍 掉 此 帳 號 現 在 在 系 統 上 執 行 的 程 序 才 能 進 行 帳 號 +刪 除 。 +不 能 在 NIS client 端 移 除 NIS 屬 性 的 東 西 。 +這 動 做 須 在 NIS server 端 上 執 行 。 +.SH SEE ALSO +.BR chfn (1), +.BR chsh (1), +.BR groupadd (8), +.BR groupdel (8), +.BR groupmod (8), +.BR passwd (1), +.BR useradd (8), +.BR usermod (8) +.SH 作者 +Julianne Frances Haugh (jfh@tab.com) diff --git a/man/zh_TW/usermod.8 b/man/zh_TW/usermod.8 new file mode 100644 index 00000000..458067a3 --- /dev/null +++ b/man/zh_TW/usermod.8 @@ -0,0 +1,131 @@ +.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $Id: usermod.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" +.TH USERMOD 8 +.SH 名稱 +usermod \- 修 改 使 用 者 帳 號 +.SH 語法 +.TP 8 +.B usermod +.\" .RB [ -A +.\" .RI { method | \fBDEFAULT\fR "},... ]" +.RB [ -c +.IR comment ] +.RB [ -d +.IR home_dir " [" +.BR -m ]] +.br +.RB [ -e +.IR expire_date ] +.RB [ -f +.IR inactive_time ] +.br +.RB [ -g +.IR initial_group ] +.RB [ -G +.IR group [,...]] +.br +.RB [ -l +.IR login_name ] +.RB [ -s +.IR shell ] +.br +.RB [ -u +.IR uid " [" +.BR -o ]] +.I login +.SH 描述 +\fBusermod\fR 命 令 會 參 照 你 命 令 列 上 指 定 的 部 份 修 改 系 統 帳 +號 檔 。 下 列 為 \fBusermod\fR 可 選 用 的 參 數 。 + +.\" .IP "\fB-A \fImethod\fR|\fBDEFAULT\fR" +.\" The new value of the user's authentication method. +.\" The authentication method is the name of a program which is responsible +.\" for validating the user's identity. +.\" The string \fBDEFAULT\fR may be used to change the user's authentication +.\" method to the standard system password method. +.IP "\fB-c \fIcomment\fR" +更 新 使 用 者 帳 號 password 檔 中 的 注 解 欄 +， 一 般 是 使 用 \fBchfn\fR(1) 來 修 改 。 +.IP "\fB-d \fIhome_dir\fR" +更 新 使 用 者 新 的 登 入 目 錄 。 +如 果 給 定 \fB-m\fR 選 項 ， 使 用 者 舊 目 錄 會 搬 到 新 的 目 錄 去 +，如 舊 目 錄 不 存 在 則 建 個 新 的 。 +.IP "\fB-e \fIexpire_date\fR" +加 上 使 用 者 帳 號 停 止 日 期 。 日 期 格 式 為 \fIMM/DD/YY\fR. +.IP "\fB-f \fIinactive_days\fR" +帳 號 過 期 幾 日 後 永 久 停 權。當 值 為 0 時 +帳 號 則 立 刻 被 停 權 。 而 當 值 為 -1 時 則 關閉此功\能 +。預 設 值 為 -1。 +.IP "\fB-g \fIinitial_group\fR" +更 新 使 用 者 新 的 起 始 登 入 群 組 。 群 組 名 須 已 存 在 +。群 組 ID 必 須 參 照 既 有 的 的 群 組 。 群 組 ID 預 設 值 為 1 。 +.IP "\fB-G \fIgroup,[...]\fR" +定 義 使 用 者 為 一 堆 groups 的 成 員 。 每 +個 群 組 使 用 "," 區 格 開 來 ， 不 可 以 夾 雜 空 +白 字 元 。 群 組 名 同 -g 選 項 的 限 制 。 +如 果 使 用 者 現 在 的 群 組 不 再 此 列 ， 則 將 使 用 者 由 該 +群 組 中 移 除 。 +.IP "\fB-l \fIlogin_name\fR" +變 更 使 用 者 \fIlogin\fR 時 的 名 稱 為 \fIlogin_name\fR 。 +其 於 不 變 。 特 別 是 ， 使 用 者 目 錄 名 應 該 也 會 跟 著 更 動 成 新 +的 登 入 名 。 +.IP "\fB-s \fIshell\fR" +指 定 新 登 入 shell 。 如 此 欄 留 白 ， 系 統 將 選 用 系 統 預 設 shell 。 +.IP "\fB-u \fIuid\fR" +使 用 者 ID 值 。必 須 為 唯 一 的 ID 值 ， 除 非 用 \fI-o\fR 選 項 。 數 +字 不 可 為 負 值。預 設 為 最 小 不 得 小 於 99 而 逐 次 +增 加 。 0~99 傳 統 上 是 保 留 給 系 統 帳 號 使 用 。 +使 用 者 目 錄 樹 下 所 有 的 檔 案 目 錄 其 user ID 會 自 動 改 變 。 +放 在 使 用 者 目 錄 外 的 檔 案 則 要 自 行 手 動 更 動 。 +.SH 警告 +\fBusermod\fR 不 允 許 你 改 變 正 在線 上 的 使 用 者 帳 號 名 稱 。 +當 usermod 用 來 改 變 user ID, 必 須 確 認 這 名 user 沒 在 電 腦 上 執 +行 任 何 程 序。 +你 需 手 動 更 改 使 用 者 的 crontab 檔 。 +也 需 手 動 更 改 使 用 者 的 at 工 作 檔 。 +採 用 NIS server 須 在 server 上 更 動 相 關 的 NIS 設 定 。 + +.SH 檔案 +\fI/etc/passwd\fR \- 使 用 者 帳 號 資 訊 +.br +\fI/etc/shadow\fR \- 使 用 者 帳 號 資 訊 加 密 +.br +\fI/etc/group\fR \- 群 組 資 訊 +.SH 相關文件 +.BR chfn (1), +.BR chsh (1), +.BR groupadd (8), +.BR groupdel (8), +.BR groupmod (8), +.BR passwd (1), +.BR useradd (8), +.BR userdel (8) +.SH 作者 +Julianne Frances Haugh (jfh@tab.com) diff --git a/missing b/missing index 0a7fb5a2..fc54c64e 100755 --- a/missing +++ b/missing @@ -1,6 +1,6 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -78,7 +78,7 @@ Supported PROGRAM values: ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.3 - GNU automake" + echo "missing 0.4 - GNU automake" ;; -*) @@ -87,7 +87,12 @@ Supported PROGRAM values: exit 1 ;; - aclocal) + aclocal*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want @@ -97,6 +102,11 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; autoconf) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -106,6 +116,11 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; autoheader) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -124,7 +139,12 @@ WARNING: \`$1' is missing on your system. You should only need it if touch $touch_files ;; - automake) + automake*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. @@ -135,6 +155,34 @@ WARNING: \`$1' is missing on your system. You should only need it if while read f; do touch "$f"; done ;; + autom4te) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is needed, and you do not seem to have it handy on your + system. You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + bison|yacc) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if @@ -189,6 +237,11 @@ WARNING: \`$1' is missing on your system. You should only need it if ;; help2man) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified a dependency of a manual page. You may need the @@ -240,23 +293,23 @@ WARNING: \`$1' is missing on your system. You should only need it if # Look for gnutar/gtar before invocation to avoid ugly error # messages. if (gnutar --version > /dev/null 2>&1); then - gnutar ${1+"$@"} && exit 0 + gnutar "$@" && exit 0 fi if (gtar --version > /dev/null 2>&1); then - gtar ${1+"$@"} && exit 0 + gtar "$@" && exit 0 fi firstarg="$1" if shift; then case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" ${1+"$@"} && exit 0 + tar "$firstarg" "$@" && exit 0 ;; esac case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" ${1+"$@"} && exit 0 + tar "$firstarg" "$@" && exit 0 ;; esac fi @@ -273,7 +326,7 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments. WARNING: \`$1' is needed, and you do not seem to have it handy on your system. You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 diff --git a/mkinstalldirs b/mkinstalldirs index 4f58503e..d2d5f21b 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -4,37 +4,108 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ - errstatus=0 +dirmode="" + +usage="\ +Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" 1>&2 + exit 0 + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac +done for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift + if test -d "$file"; then + shift + else + break + fi +done - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac +case $# in + 0) exit 0 ;; +esac - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" +case $dirmode in + '') + if mkdir -p -- . 2>/dev/null; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + fi + ;; + *) + if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + fi + ;; +esac - mkdir "$pathcomp" || lasterr=$? +for file +do + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi - fi + pathcomp= + for d + do + pathcomp="$pathcomp$d" + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac - pathcomp="$pathcomp/" - done + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi + + pathcomp="$pathcomp/" + done done exit $errstatus +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# End: # mkinstalldirs ends here diff --git a/po/ChangeLog b/po/ChangeLog deleted file mode 100644 index 748bbe81..00000000 --- a/po/ChangeLog +++ /dev/null @@ -1,44 +0,0 @@ -2002-03-13 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - -2002-03-13 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - -2002-03-13 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - -2002-03-13 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - -2002-03-12 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - -2002-03-08 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - -2002-02-18 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - -2002-02-17 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - -2002-02-17 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - -2002-01-06 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - -2002-01-06 gettextize - - * Makefile.in.in: Upgrade to gettext-0.10.40. - diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 00000000..622ae936 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1 @@ +cs de el fr ja ko pl ru sv uk diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 32b73765..27b721aa 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,18 +1,16 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper +# Makefile for PO directory in any package using GNU gettext. +# Copyright (C) 1995-1997, 2000-2003 by Ulrich Drepper # -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License but which still want to provide support for the GNU gettext +# functionality. +# Please note that the actual code of GNU gettext is covered by the GNU +# General Public License and is *not* in the public domain. PACKAGE = @PACKAGE@ VERSION = @VERSION@ -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - SHELL = /bin/sh @SET_MAKE@ @@ -29,74 +27,124 @@ gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) -CC = @CC@ GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ MSGMERGE = msgmerge - -DEFS = @DEFS@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ - -INCLUDES = -I.. -I$(top_srcdir)/intl - -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) +MSGMERGE_UPDATE = @MSGMERGE@ --update +MSGINIT = msginit +MSGCONV = msgconv +MSGFILTER = msgfilter POFILES = @POFILES@ GMOFILES = @GMOFILES@ -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ -$(POFILES) $(GMOFILES) +UPDATEPOFILES = @UPDATEPOFILES@ +DUMMYPOFILES = @DUMMYPOFILES@ +DISTFILES.common = Makefile.in.in remove-potcdate.sin \ +$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) +DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \ +$(POFILES) $(GMOFILES) \ +$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) POTFILES = \ CATALOGS = @CATALOGS@ +# Makevars gets inserted here. (Don't remove this line!) + .SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo - -.c.o: - $(COMPILE) $< - -.po.pox: - $(MAKE) $(PACKAGE).pot - $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update .po.mo: - $(MSGFMT) -o $@ $< + @echo "$(MSGFMT) -c -o $@ $<"; \ + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ .po.gmo: - file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + +.sin.sed: + sed -e '/^#/d' $< > t-$@ + mv t-$@ $@ all: all-@USE_NLS@ -all-yes: $(CATALOGS) +all-yes: stamp-po all-no: -# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', +# stamp-po is a timestamp denoting the last time at which the CATALOGS have +# been loosely updated. Its purpose is that when a developer or translator +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +# invocations of "make" will do nothing. This timestamp would not be necessary +# if updating the $(CATALOGS) would always touch them; however, the rule for +# $(POFILES) has been designed to not touch files that don't need to be +# changed. +stamp-po: $(srcdir)/$(DOMAIN).pot + test -z "$(CATALOGS)" || $(MAKE) $(CATALOGS) + @echo "touch stamp-po" + @echo timestamp > stamp-poT + @mv stamp-poT stamp-po + +# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', # otherwise packages like GCC can not be built if only parts of the source # have been downloaded. -$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ - --add-comments --keyword=_ --keyword=N_ \ +# This target rebuilds $(DOMAIN).pot; it is an expensive operation. +# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ --files-from=$(srcdir)/POTFILES.in \ - && test ! -f $(PACKAGE).po \ - || ( rm -f $(srcdir)/$(PACKAGE).pot \ - && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' + test ! -f $(DOMAIN).po || { \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ + else \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + else \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + } + +# This rule has no dependencies: we don't need to update $(DOMAIN).pot at +# every "make" invocation, only create it when it is missing. +# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. +$(srcdir)/$(DOMAIN).pot: + $(MAKE) $(DOMAIN).pot-update + +# This target rebuilds a PO file if $(DOMAIN).pot has changed. +# Note that a PO file is not touched if it doesn't need to be changed. +$(POFILES): $(srcdir)/$(DOMAIN).pot + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext"; then \ + if test "$(PACKAGE)" = "gettext-tools"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + for file in Makevars; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ else \ : ; \ fi @@ -106,41 +154,118 @@ install-data-yes: all @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ $(mkinstalldirs) $(DESTDIR)$$dir; \ - if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - echo "installing $(srcdir)/$$cat as" \ - "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ - fi; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ + fi; \ + done; \ + done + +install-strip: install + +installdirs: installdirs-exec installdirs-data +installdirs-exec: +installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi +installdirs-data-no: +installdirs-data-yes: + $(mkinstalldirs) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + fi; \ + done; \ done # Define this as empty until I found a useful application. installcheck: -uninstall: - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ - done - if test "$(PACKAGE)" = "gettext"; then \ - rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ +uninstall: uninstall-exec uninstall-data +uninstall-exec: +uninstall-data: uninstall-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in $(DISTFILES.common) Makevars.template; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ else \ : ; \ fi +uninstall-data-no: +uninstall-data-yes: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + done; \ + done check: all -dvi info tags TAGS ID: +info dvi ps pdf html tags TAGS ctags CTAGS ID: mostlyclean: - rm -f core core.* *.pox $(PACKAGE).po *.new.po + rm -f remove-potcdate.sed + rm -f stamp-poT + rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po rm -fr *.o clean: mostlyclean @@ -151,7 +276,7 @@ distclean: clean maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f $(GMOFILES) + rm -f stamp-po $(GMOFILES) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: @@ -160,37 +285,69 @@ dist distdir: # This is a separate target because 'update-po' must be executed before. dist2: $(DISTFILES) dists="$(DISTFILES)"; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + dists="$$dists Makevars.template"; \ + fi; \ + if test -f $(srcdir)/ChangeLog; then \ + dists="$$dists ChangeLog"; \ + fi; \ + for i in 0 1 2 3 4 5 6 7 8 9; do \ + if test -f $(srcdir)/ChangeLog.$$i; then \ + dists="$$dists ChangeLog.$$i"; \ + fi; \ + done; \ + if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - cp -p $$dir/$$file $(distdir); \ + if test -f $$file; then \ + cp -p $$file $(distdir); \ + else \ + cp -p $(srcdir)/$$file $(distdir); \ + fi; \ done update-po: Makefile - $(MAKE) $(PACKAGE).pot - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ - cd $(srcdir); \ - catalogs='$(GMOFILES)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - echo "$$lang:"; \ - if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ - mv -f $$lang.new.po $$lang.po; \ - else \ - echo "msgmerge for $$cat failed!"; \ - rm -f $$lang.new.po; \ - fi; \ - done + $(MAKE) $(DOMAIN).pot-update + test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) $(MAKE) update-gmo +# General rule for updating PO files. + +.nop.po-update: + @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + cd $(srcdir); \ + if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$lang.po failed!" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi + +$(DUMMYPOFILES): + update-gmo: Makefile $(GMOFILES) @: -Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in +Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status +force: + # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 00000000..8b09f53b --- /dev/null +++ b/po/Makevars @@ -0,0 +1,25 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Free Software Foundation, Inc. + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = diff --git a/po/POTFILES.in b/po/POTFILES.in index 2a0a8aaf..d21a5970 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -45,8 +45,6 @@ libmisc/utmp.c libmisc/valid.c libmisc/xmalloc.c lib/commonio.c -lib/dialchk.c -lib/dialup.c lib/encrypt.c lib/fputsx.c lib/getdef.c @@ -85,13 +83,11 @@ lib/strcasecmp.c lib/strdup.c lib/strerror.c lib/strstr.c -lib/tcfsio.c lib/utent.c src/chage.c src/chfn.c src/chpasswd.c src/chsh.c -src/dpasswd.c src/expiry.c src/faillog.c src/gpasswd.c diff --git a/po/Rules-quot b/po/Rules-quot new file mode 100644 index 00000000..5f46d237 --- /dev/null +++ b/po/Rules-quot @@ -0,0 +1,42 @@ +# Special Makefile rules for English message catalogs with quotation marks. + +DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot + +.SUFFIXES: .insert-header .po-update-en + +en@quot.po-update: en@quot.po-update-en +en@boldquot.po-update: en@boldquot.po-update-en + +.insert-header.po-update-en: + @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + ll=`echo $$lang | sed -e 's/@.*//'`; \ + LC_ALL=C; export LC_ALL; \ + cd $(srcdir); \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "creation of $$lang.po failed!" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi + +en@quot.insert-header: insert-header.sin + sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header + +en@boldquot.insert-header: insert-header.sin + sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header + +mostlyclean: mostlyclean-quot +mostlyclean-quot: + rm -f *.insert-header diff --git a/po/boldquot.sed b/po/boldquot.sed new file mode 100644 index 00000000..4b937aa5 --- /dev/null +++ b/po/boldquot.sed @@ -0,0 +1,10 @@ +s/"\([^"]*\)"/\1/g +s/`\([^`']*\)'/\1/g +s/ '\([^`']*\)' / \1 /g +s/ '\([^`']*\)'$/ \1/g +s/^'\([^`']*\)' /\1 /g +s//""/g +s///g +s///g +s///g +s///g diff --git a/po/cs.gmo b/po/cs.gmo index 0b2235e1..4aae4ed1 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 3635f524..2c310ead 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,707 +1,616 @@ # Czech translation of shadow-utils. -# Ji齶 Pavlovsk , 1999-2000 +# Ji穩 Pavlovsk羸 , 1999-2000 # msgid "" msgstr "" "Project-Id-Version: shadow-utils-20000902\n" -"POT-Creation-Date: 2002-03-12 12:16+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" "PO-Revision-Date: 2000-09-23 19:58+0200\n" -"Last-Translator: Ji齶 Pavlovsk \n" +"Last-Translator: Ji穩 Pavlovsk羸 \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libmisc/addgrps.c:60 +#: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" -msgstr "Varov嫕: skupina %s je nezn嫥塿n" +msgstr "Varov獺n穩: skupina %s je nezn獺m獺\n" -#: libmisc/addgrps.c:71 +#: libmisc/addgrps.c:68 msgid "Warning: too many groups\n" -msgstr "Varov嫕: p齶li mnoho skupin\n" +msgstr "Varov獺n穩: p穩li禳 mnoho skupin\n" -#: libmisc/age.c:77 +#: libmisc/age.c:72 msgid "Your password has expired." -msgstr "Platnost va鈹ho hesla vypr鈹la." +msgstr "Platnost va禳eho hesla vypr禳ela." -#: libmisc/age.c:80 +#: libmisc/age.c:75 msgid "Your password is inactive." -msgstr "Va鈹 heslo je vypnuto." +msgstr "Va禳e heslo je vypnuto." -#: libmisc/age.c:83 +#: libmisc/age.c:78 msgid "Your login has expired." -msgstr "Platnost va鈹ho 鋈u vypr鈹la." +msgstr "Platnost va禳eho 繳tu vypr禳ela." -#: libmisc/age.c:96 +#: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " Kontaktujte spr嫛ce syst幦u.\n" +msgstr " Kontaktujte spr獺vce syst矇mu.\n" -#: libmisc/age.c:99 +#: libmisc/age.c:93 msgid " Choose a new password.\n" -msgstr " Zvolte nov heslo.\n" +msgstr " Zvolte nov矇 heslo.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:168 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "Platnost va鈹ho heslo vypr寤 za %ld dn.\n" +msgstr "Platnost va禳eho heslo vypr禳穩 za %ld dn轡.\n" -#: libmisc/age.c:178 +#: libmisc/age.c:172 msgid "Your password will expire tomorrow.\n" -msgstr "Platnost va鈹ho heslo vypr寤 z癃ra.\n" +msgstr "Platnost va禳eho heslo vypr禳穩 z穩tra.\n" -#: libmisc/age.c:180 +#: libmisc/age.c:174 msgid "Your password will expire today.\n" -msgstr "Platnost va鈹ho heslo vypr寤 dnes.\n" +msgstr "Platnost va禳eho heslo vypr禳穩 dnes.\n" -#: libmisc/chowntty.c:113 +#: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" -msgstr "TTY %s nelze zm髶it." +msgstr "TTY %s nelze zmnit" -#: libmisc/env.c:160 +#: libmisc/env.c:155 msgid "Environment overflow\n" -msgstr "P鷫te鋀n prost鷫d燡n" +msgstr "Peteen穩 prosted穩\n" -#: libmisc/env.c:200 +#: libmisc/env.c:195 #, c-format msgid "You may not change $%s\n" -msgstr "Nem躨ete zm髶it $%s\n" +msgstr "Nem轡鱉ete zmnit $%s\n" -#: libmisc/failure.c:238 +#: libmisc/failure.c:230 #, c-format msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "Po鋀t %2$s od posledn璫o p鷡hl廜en: %1$d. Posledn: %3$s na %4$s\n" +msgstr "Poet %2$s od posledn穩ho pihl獺禳en穩: %1$d. Posledn穩: %3$s na %4$s.\n" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failures" -msgstr "selh嫕" +msgstr "selh獺n穩" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failure" -msgstr "selh嫕" +msgstr "selh獺n穩" -#: libmisc/limits.c:397 +#: libmisc/limits.c:396 msgid "Too many logins.\n" -msgstr "P齶li mnoho soub儩nch p鷡hl廜en.\n" +msgstr "P穩li禳 mnoho soub鱉n羸ch pihl獺禳en穩.\n" -#: libmisc/login_desrpc.c:63 +#: libmisc/login_desrpc.c:59 #, c-format msgid "Password does not decrypt secret key for %s.\n" -msgstr "T璥to heslem nelze de隘frovat tajn kl膻 pro %s.\n" +msgstr "T穩mto heslem nelze de禳ifrovat tajn羸 kl穩 pro %s.\n" -#: libmisc/login_desrpc.c:69 +#: libmisc/login_desrpc.c:66 #, c-format msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Tajn kl膻 pro %s nelze nastavit. Je keyserv d幦on v provozu?\n" +msgstr "Tajn羸 kl穩 pro %s nelze nastavit. Je keyserv d矇mon v provozu?\n" -#: libmisc/mail.c:62 libmisc/mail.c:77 +#: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." -msgstr "M嫢e novou po靖u." +msgstr "M獺te novou po禳tu." -#: libmisc/mail.c:73 +#: libmisc/mail.c:72 msgid "No mail." -msgstr "Nem嫢e 擔dnou po靖u." +msgstr "Nem獺te 鱉獺dnou po禳tu." -#: libmisc/mail.c:75 +#: libmisc/mail.c:74 msgid "You have mail." -msgstr "M嫢e po靖u." +msgstr "M獺te po禳tu." -#: libmisc/obscure.c:281 src/passwd.c:244 +#: libmisc/obscure.c:271 src/passwd.c:183 #, c-format msgid "Bad password: %s. " -msgstr "Heslo %s je chybn. " +msgstr "Heslo %s je chybn矇. " -#: libmisc/pam_pass.c:42 +#: libmisc/pam_pass.c:38 #, c-format msgid "passwd: pam_start() failed, error %d\n" -msgstr "passwd: vol嫕 pam_start() selhalo, chyba %d\n" +msgstr "passwd: vol獺n穩 pam_start() selhalo, chyba %d\n" -#: libmisc/pam_pass.c:49 +#: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/setupenv.c:211 +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" +msgstr "" + +#: libmisc/setupenv.c:208 #, c-format msgid "Unable to cd to \"%s\"\n" -msgstr "Nelze nastavit aktu嫮n adres暟 na \"%s\".\n" +msgstr "Nelze nastavit aktu獺ln穩 adres獺 na \"%s\"\n" -#: libmisc/setupenv.c:219 +#: libmisc/setupenv.c:216 msgid "No directory, logging in with HOME=/" -msgstr "桑dn adres暟, nastavuji HOME na /" +msgstr "鬚獺dn羸 adres獺, nastavuji HOME na /" -#: libmisc/shell.c:78 -#, c-format -msgid "Executing shell %s\n" -msgstr "Spou靖璥 shell %s.\n" - -#. -#. * Obviously something is really wrong - I can't figure out -#. * how to execute this stupid shell, so I might as well give -#. * up in disgust ... -#. -#: libmisc/shell.c:122 +#: libmisc/shell.c:119 #, c-format msgid "Cannot execute %s" -msgstr "%s nelze spustit." +msgstr "%s nelze spustit" -#: libmisc/sub.c:61 +#: libmisc/sub.c:55 #, c-format msgid "Invalid root directory \"%s\"\n" -msgstr "Chybn ko鷫nov adres暟 \"%s\"\n" +msgstr "Chybn羸 koenov羸 adres獺 \"%s\"\n" -#: libmisc/sub.c:73 +#: libmisc/sub.c:67 #, c-format msgid "Can't change root directory to \"%s\"\n" -msgstr "Nelze nastavit ko鷫nov adres暟 na \"%s\".\n" +msgstr "Nelze nastavit koenov羸 adres獺 na \"%s\"\n" -#: libmisc/xmalloc.c:28 +#: libmisc/xmalloc.c:24 #, c-format msgid "malloc(%d) failed\n" -msgstr "vol嫕 malloc(%d) selhalo\n" +msgstr "vol獺n穩 malloc(%d) selhalo\n" -#: lib/dialchk.c:71 -msgid "Dialup Password: " -msgstr "Heslo pro p齶stup vyt摜enou linkou:" - -#: lib/getdef.c:276 +#: lib/getdef.c:274 msgid "Could not allocate space for config info.\n" -msgstr "Nemohu alokovat dostatek m疄ta pro konfigura鋝 daje.\n" +msgstr "Nemohu alokovat dostatek m穩sta pro konfiguran穩 繳daje.\n" -#. -#. * Item was never found. -#. -#: lib/getdef.c:330 +#: lib/getdef.c:328 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -"konfigura鋝 chyba - nezn嫥 p鷫dm鮅 '%s' (informujte spr嫛ce syst幦u)\n" +"konfiguran穩 chyba - nezn獺m羸 pedmt '%s' (informujte spr獺vce syst矇mu)\n" -#: lib/getdef.c:417 -#, c-format -msgid "error - lookup '%s' failed\n" -msgstr "chyba - hled嫕 '%s' bylo nesp儦n嬞n" - -#: lib/getdef.c:425 -#, c-format -msgid "%s not found\n" -msgstr "%s nenalezeno\n" - -#. -#. * get the password from her, and set the salt for -#. * the decryption from the group file. -#. -#: lib/pwauth.c:54 src/newgrp.c:348 +#: lib/pwauth.c:54 src/newgrp.c:343 msgid "Password: " msgstr "Heslo: " #: lib/pwauth.c:56 #, c-format msgid "%s's Password: " -msgstr "Heslo u養vatele %s:" +msgstr "Heslo u鱉ivatele %s:" -#: lib/pwauth.c:270 +#: lib/pwauth.c:247 msgid "(Echo on) " msgstr "(Echo zapnuto)" #: lib/strerror.c:20 #, c-format msgid "Unknown error %d" -msgstr "Nezn嫥 chyba %d" +msgstr "Nezn獺m獺 chyba %d" -#: src/chage.c:116 -#, c-format +#: src/chage.c:118 msgid "" -"Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" -"\t[-I inactive] [-E expire] [-d last_day] user\n" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -"Pou養t: %s [-l] [-m min_dn鸋 [-M max_dn鸋 [-W varov嫕燱\n" -"\t[-I vypnut燱 [-E vypr鈹n燱 [-d posledn den] u養vatel\n" +"Pou鱉it穩: chage [-l] [-m min_dn轡] [-M max_dn轡] [-W varov獺n穩]\n" +" [-I vypnut穩] [-E vypr禳en穩] [-d posledn穩 den] u鱉ivatel\n" -#: src/chage.c:122 -#, c-format -msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" -msgstr "" -"Pou養t: %s [-l] [-m min_dn鸋 [-M max_dn鸋 [-d posledn den] u養vatel\n" - -#: src/chage.c:157 +#: src/chage.c:152 msgid "" "Enter the new value, or press ENTER for the default\n" "\n" msgstr "" -"Zadejte novou hodnotu, nebo stiskn鮅e ENTER pro pou養t implicitn hodnoty\n" +"Zadejte novou hodnotu, nebo stisknte ENTER pro pou鱉it穩 implicitn穩 hodnoty\n" "\n" -#: src/chage.c:160 +#: src/chage.c:155 msgid "Minimum Password Age" -msgstr "Minim嫮n st暟 hesla" +msgstr "Minim獺ln穩 st獺穩 hesla" -#: src/chage.c:166 +#: src/chage.c:161 msgid "Maximum Password Age" -msgstr "maxim嫮n st暟 hesla" +msgstr "maxim獺ln穩 st獺穩 hesla" -#: src/chage.c:174 +#: src/chage.c:169 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "Posledn zm髶a hesla (YYYY-MM-DD)" +msgstr "Posledn穩 zmna hesla (YYYY-MM-DD)" + +#: src/chage.c:177 +msgid "Password Expiration Warning" +msgstr "Varov獺n穩 o vypr禳en穩 platnosti hesla" #: src/chage.c:183 -msgid "Password Expiration Warning" -msgstr "Varov嫕 o vypr鈹n platnosti hesla" - -#: src/chage.c:189 msgid "Password Inactive" -msgstr "Vypnut heslo" +msgstr "Vypnut矇 heslo" -#: src/chage.c:197 +#: src/chage.c:191 msgid "Account Expiration Date (YYYY-MM-DD)" -msgstr "Vypr鈹n platnosti 鋈u (YYYY-MM-DD)" +msgstr "Vypr禳en穩 platnosti 繳tu (YYYY-MM-DD)" -#. -#. * Start with the easy numbers - the number of days before the -#. * password can be changed, the number of days after which the -#. * password must be chaged, the number of days before the password -#. * expires that the user is told, and the number of days after the -#. * password expires that the account becomes unusable. -#. -#: src/chage.c:248 +#: src/chage.c:241 #, c-format msgid "Minimum:\t%ld\n" msgstr "Minimum:\t%ld\n" -#: src/chage.c:249 +#: src/chage.c:242 #, c-format msgid "Maximum:\t%ld\n" msgstr "Maximum:\t%ld\n" -#: src/chage.c:251 +#: src/chage.c:243 #, c-format msgid "Warning:\t%ld\n" -msgstr "Varov嫕:\t%ld\n" +msgstr "Varov獺n穩:\t%ld\n" -#: src/chage.c:252 +#: src/chage.c:244 #, c-format msgid "Inactive:\t%ld\n" -msgstr "Vypnut:\t%ld\n" +msgstr "Vypnut穩:\t%ld\n" -#. -#. * The "last change" date is either "Never" or the date the password -#. * was last modified. The date is the number of days since 1/1/1970. -#. -#: src/chage.c:260 +#: src/chage.c:251 msgid "Last Change:\t\t" -msgstr "Posledn zm髶a:\t\t" +msgstr "Posledn穩 zmna:\t\t" -#: src/chage.c:262 src/chage.c:276 src/chage.c:293 src/chage.c:306 +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 msgid "Never\n" msgstr "Nikdy\n" -#. -#. * The password expiration date is determined from the last change -#. * date plus the number of days the password is valid for. -#. -#: src/chage.c:273 +#: src/chage.c:264 msgid "Password Expires:\t" -msgstr "Platnost hesla vypr寤:\t" +msgstr "Platnost hesla vypr禳穩:\t" -#. -#. * The account becomes inactive if the password is expired for more -#. * than "inactdays". The expiration date is calculated and the -#. * number of inactive days is added. The resulting date is when the -#. * active will be disabled. -#. -#: src/chage.c:290 +#: src/chage.c:280 msgid "Password Inactive:\t" -msgstr "Vypnut heslo:\t" +msgstr "Vypnut矇 heslo:\t" -#. -#. * The account will expire on the given date regardless of the -#. * password expiring or not. -#. -#: src/chage.c:304 +#: src/chage.c:294 msgid "Account Expires:\t" -msgstr "Platnost hesla vypr寤:\t" +msgstr "Platnost hesla vypr禳穩:\t" -#: src/chage.c:468 +#: src/chage.c:445 #, c-format msgid "%s: do not include \"l\" with other flags\n" -msgstr "%s: nepou橙vejte \"l\" s ostatn璥i p齶znaky\n" +msgstr "%s: nepou鱉穩vejte \"l\" s ostatn穩mi p穩znaky\n" -#: src/chage.c:481 src/chage.c:652 src/login.c:518 +#: src/chage.c:458 src/chage.c:588 src/login.c:503 #, c-format msgid "%s: permission denied\n" -msgstr "%s: p齶stup odm癃nut\n" +msgstr "%s: p穩stup odm穩tnut\n" -#: src/chage.c:512 src/chpasswd.c:139 src/groupadd.c:529 src/groupdel.c:322 -#: src/groupmod.c:520 src/newusers.c:381 src/useradd.c:1754 src/userdel.c:717 -#: src/usermod.c:1732 +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" -msgstr "%s: chyba p鷡 vytv暟en ov檟ovac metody\n" +msgstr "%s: chyba pi vytv獺en穩 ovovac穩 metody\n" -#: src/chage.c:533 src/chpasswd.c:157 -#, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: soubor s hesly nelze zamknout\n" - -#: src/chage.c:544 src/chpasswd.c:162 +#: src/chage.c:510 src/chpasswd.c:159 #, c-format msgid "%s: can't open password file\n" -msgstr "%s: soubor s hesly nelze otev齶t\n" +msgstr "%s: soubor s hesly nelze otev穩t\n" -#: src/chage.c:552 +#: src/chage.c:518 #, c-format msgid "%s: unknown user: %s\n" -msgstr "%s: u養vatel %s je nezn嫥\n" +msgstr "%s: u鱉ivatel %s je nezn獺m羸\n" -#: src/chage.c:571 +#: src/chage.c:536 #, c-format msgid "%s: can't lock shadow password file" -msgstr "%s: soubor se st璯ovmi hesly nelze zamknout" +msgstr "%s: soubor se st穩nov羸mi hesly nelze zamknout" -#: src/chage.c:579 +#: src/chage.c:544 #, c-format msgid "%s: can't open shadow password file" -msgstr "%s: soubor se st璯ovmi hesly nelze otev齶t" +msgstr "%s: soubor se st穩nov羸mi hesly nelze otev穩t" -#: src/chage.c:674 +#: src/chage.c:605 #, c-format msgid "Changing the aging information for %s\n" -msgstr "M髶璥 informace o u養vateli %s.\n" +msgstr "Mn穩m informace o u鱉ivateli %s\n" -#: src/chage.c:677 +#: src/chage.c:608 #, c-format msgid "%s: error changing fields\n" -msgstr "%s: chyba p鷡 zm髶 polo頡k\n" +msgstr "%s: chyba pi zmn polo鱉ek\n" -#: src/chage.c:705 src/chage.c:771 src/pwunconv.c:174 +#: src/chage.c:632 src/pwunconv.c:138 #, c-format msgid "%s: can't update password file\n" msgstr "%s: soubor s hesly nelze aktualizovat\n" -#: src/chage.c:737 src/pwunconv.c:168 +#: src/chage.c:661 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "%s: soubor se st璯ovmi hesly nelze aktualizovat\n" +msgstr "%s: soubor se st穩nov羸mi hesly nelze aktualizovat\n" -#: src/chage.c:789 src/chage.c:805 src/chfn.c:570 src/chsh.c:382 -#: src/passwd.c:747 src/passwd.c:859 +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 msgid "Error updating the DBM password entry.\n" -msgstr "Chyba p鷡 aktualizaci DBM datab嫙e hesel.\n" +msgstr "Chyba pi aktualizaci DBM datab獺ze hesel.\n" -#: src/chage.c:823 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "%s: soubor se st璯ovmi hesly nelze p鷫psat\n" +msgstr "%s: soubor se st穩nov羸mi hesly nelze pepsat\n" -#: src/chage.c:838 +#: src/chage.c:707 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "%s: soubor s hesly nelze p鷫psat\n" +msgstr "%s: soubor s hesly nelze pepsat\n" -#: src/chage.c:857 src/chpasswd.c:343 src/groupadd.c:590 src/groupdel.c:409 -#: src/groupmod.c:604 src/newusers.c:628 src/useradd.c:1869 src/userdel.c:849 -#: src/usermod.c:1811 +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: nelze odemknout soubor\n" -#: src/chfn.c:83 +#: src/chfn.c:84 #, c-format msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" "\t[-h home_ph] [-o other] [user]\n" msgstr "" -"Pou養t: %s [-f jm幯o] [-r 鴈slo m疄tnosti] [-w telefon do zam鮀tn嫕燱\n" -"\t[-h telefon dom鸋 [-o ostatn燱 [u養vatel]\n" +"Pou鱉it穩: %s [-f jm矇no] [-r 穩slo m穩stnosti] [-w telefon do zamstn獺n穩]\n" +"\t[-h telefon dom轡] [-o ostatn穩] [u鱉ivatel]\n" -#: src/chfn.c:88 +#: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -"Pou養t: %s [-f jm幯o] [-r 鴈slo m疄tnosti] [-w telefon do zam鮀tn嫕燱\n" -"\t[-h telefon dom鸋\n" +"Pou鱉it穩: %s [-f jm矇no] [-r 穩slo m穩stnosti] [-w telefon do zamstn獺n穩]\n" +"\t[-h telefon dom轡]\n" -#: src/chfn.c:139 +#: src/chfn.c:140 msgid "Enter the new value, or press ENTER for the default\n" msgstr "" -"Zadejte novou hodnotu, nebo stiskn鮅e ENTER pro pou養t implicitn hodnoty\n" +"Zadejte novou hodnotu, nebo stisknte ENTER pro pou鱉it穩 implicitn穩 hodnoty\n" -#: src/chfn.c:142 +#: src/chfn.c:143 msgid "Full Name" -msgstr "Cel jm幯o" +msgstr "Cel矇 jm矇no" -#: src/chfn.c:144 +#: src/chfn.c:145 #, c-format msgid "\tFull Name: %s\n" -msgstr "\tCel jm幯o: %s\n" +msgstr "\tCel矇 jm矇no: %s\n" -#: src/chfn.c:147 +#: src/chfn.c:148 msgid "Room Number" -msgstr "疄lo m疄tnosti" +msgstr "穩slo m穩stnosti" -#: src/chfn.c:149 +#: src/chfn.c:150 #, c-format msgid "\tRoom Number: %s\n" -msgstr "\t疄lo m疄tnosti: %s\n" +msgstr "\t穩slo m穩stnosti: %s\n" -#: src/chfn.c:152 +#: src/chfn.c:153 msgid "Work Phone" -msgstr "Telefon do zam鮀tn嫕" +msgstr "Telefon do zamstn獺n穩" -#: src/chfn.c:154 +#: src/chfn.c:155 #, c-format msgid "\tWork Phone: %s\n" -msgstr "\tTelefon do zam鮀tn嫕: %s\n" +msgstr "\tTelefon do zamstn獺n穩: %s\n" -#: src/chfn.c:157 +#: src/chfn.c:158 msgid "Home Phone" -msgstr "Telefon dom" +msgstr "Telefon dom轡" -#: src/chfn.c:159 +#: src/chfn.c:160 #, c-format msgid "\tHome Phone: %s\n" -msgstr "\tTelefon dom: %s\n" +msgstr "\tTelefon dom轡: %s\n" -#: src/chfn.c:162 +#: src/chfn.c:163 msgid "Other" -msgstr "Ostatn" +msgstr "Ostatn穩" -#: src/chfn.c:271 src/chfn.c:281 src/chfn.c:291 src/chfn.c:301 src/chfn.c:311 -#: src/chfn.c:379 src/passwd.c:1115 +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 #, c-format msgid "%s: Permission denied.\n" -msgstr "%s: p齶stup odm癃nut\n" +msgstr "%s: p穩stup odm穩tnut.\n" -#: src/chfn.c:332 src/chsh.c:190 src/passwd.c:1165 +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 #, c-format msgid "%s: Unknown user %s\n" -msgstr "%s: u養vatel %s je nezn嫥\n" +msgstr "%s: u鱉ivatel %s je nezn獺m羸\n" -#: src/chfn.c:341 src/chsh.c:198 src/passwd.c:1096 +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 #, c-format msgid "%s: Cannot determine your user name.\n" -msgstr "%s: va鈹 u養vatelsk jm幯o nelze zjistit\n" +msgstr "%s: va禳e u鱉ivatelsk矇 jm矇no nelze zjistit.\n" -#: src/chfn.c:358 src/chsh.c:215 +#: src/chfn.c:359 src/chsh.c:210 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "%s: u養vatele `%s' nelze na NIS klientu zm髶it\n" +msgstr "%s: u鱉ivatele `%s' nelze na NIS klientu zmnit.\n" -#: src/chfn.c:366 src/chsh.c:223 +#: src/chfn.c:367 src/chsh.c:218 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: `%s' je hlavn璥 NIS serverem pro tohoto klienta\n" +msgstr "%s: `%s' je hlavn穩m NIS serverem pro tohoto klienta.\n" -#: src/chfn.c:441 +#: src/chfn.c:442 #, c-format msgid "Changing the user information for %s\n" -msgstr "M髶璥 informace o u養vateli %s\n" +msgstr "Mn穩m informace o u鱉ivateli %s\n" -#: src/chfn.c:450 +#: src/chfn.c:451 #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s: jm幯o (\"%s\") je chybn嬞n" +msgstr "%s: jm矇no (\"%s\") je chybn矇\n" -#: src/chfn.c:456 +#: src/chfn.c:457 #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "%s: 鴈slo m疄tnosti (\"%s\") je chybn嬞n" +msgstr "%s: 穩slo m穩stnosti (\"%s\") je chybn矇\n" -#: src/chfn.c:462 +#: src/chfn.c:463 #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "%s: telefonn 鴈slo do zam鮀tn嫕 (\"%s\") je chybn嬞n" +msgstr "%s: telefonn穩 穩slo do zamstn獺n穩 (\"%s\") je chybn矇\n" -#: src/chfn.c:468 +#: src/chfn.c:469 #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s: telefonn 鴈slo dom (\"%s\") je chybn嬞n" +msgstr "%s: telefonn穩 穩slo dom轡 (\"%s\") je chybn矇\n" -#: src/chfn.c:475 +#: src/chfn.c:476 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s: \"%s\" obsahuje chybn znaky\n" +msgstr "%s: \"%s\" obsahuje chybn矇 znaky\n" -#: src/chfn.c:488 +#: src/chfn.c:489 #, c-format msgid "%s: fields too long\n" -msgstr "%s: polo餒a je p齶li dlouh塿n" +msgstr "%s: polo鱉ka je p穩li禳 dlouh獺\n" -#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277 +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 msgid "Cannot change ID to root.\n" -msgstr "Nelze zm髶it ID na root.\n" +msgstr "Nelze zmnit ID na root.\n" -#: src/chfn.c:519 src/chsh.c:331 src/passwd.c:656 src/passwd.c:811 +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 msgid "Cannot lock the password file; try again later.\n" -msgstr "Nelze zamknout soubor s hesly; zkuste to pozd骹i.\n" +msgstr "Nelze zamknout soubor s hesly; zkuste to pozdji.\n" -#: src/chfn.c:525 src/chsh.c:337 src/passwd.c:661 src/passwd.c:816 +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 msgid "Cannot open the password file.\n" -msgstr "Soubor s hesly nelze otev齶t.\n" +msgstr "Soubor s hesly nelze otev穩t.\n" -#: src/chfn.c:542 src/chsh.c:352 src/passwd.c:667 src/usermod.c:1348 +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 #, c-format msgid "%s: %s not found in /etc/passwd\n" -msgstr "%s: %s se v /etc/passwd nenal憴塿n" +msgstr "%s: %s se v /etc/passwd nenal矇z獺\n" -#: src/chfn.c:561 src/chsh.c:373 src/passwd.c:740 src/passwd.c:852 +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 msgid "Error updating the password entry.\n" -msgstr "Chyba p鷡 aktualizaci polo餒y v souboru s hesly.\n" +msgstr "Chyba pi aktualizaci polo鱉ky v souboru s hesly.\n" -#: src/chfn.c:585 src/chsh.c:397 src/passwd.c:755 src/passwd.c:867 +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 msgid "Cannot commit password file changes.\n" -msgstr "Nelze prov廥t zm髶y v souboru s hesly.\n" +msgstr "Nelze prov矇st zmny v souboru s hesly.\n" -#: src/chfn.c:592 src/chsh.c:404 +#: src/chfn.c:593 src/chsh.c:399 msgid "Cannot unlock the password file.\n" msgstr "Soubor s hesly nelze odemknout.\n" -#: src/chpasswd.c:66 +#: src/chpasswd.c:67 #, c-format -msgid "usage: %s [-e]\n" -msgstr "Pou養t: %s [-e]\n" +msgid "Usage: %s [-e]\n" +msgstr "Pou鱉it穩: %s [-e]\n" -#: src/chpasswd.c:171 src/pwconv.c:94 +#: src/chpasswd.c:154 +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: soubor s hesly nelze zamknout\n" + +#: src/chpasswd.c:168 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" -msgstr "%s: soubor se st璯ovmi hesly nelze zamknout\n" +msgstr "%s: soubor se st穩nov羸mi hesly nelze zamknout\n" -#: src/chpasswd.c:177 src/gpasswd.c:596 src/pwconv.c:99 src/pwunconv.c:103 -#: src/pwunconv.c:108 +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s: soubor se st璯ovmi hesly nelze otev齶t\n" +msgstr "%s: soubor se st穩nov羸mi hesly nelze otev穩t\n" -#: src/chpasswd.c:200 src/newusers.c:460 +#: src/chpasswd.c:197 src/newusers.c:441 #, c-format msgid "%s: line %d: line too long\n" -msgstr "%s: 鸅dek %d je p齶li dlouh\n" +msgstr "%s: 獺dek %d je p穩li禳 dlouh羸\n" -#: src/chpasswd.c:220 +#: src/chpasswd.c:217 #, c-format msgid "%s: line %d: missing new password\n" -msgstr "%s: 鸅dek %d: chyb nov heslo\n" +msgstr "%s: 獺dek %d: chyb穩 nov矇 heslo\n" -#: src/chpasswd.c:237 +#: src/chpasswd.c:234 #, c-format msgid "%s: line %d: unknown user %s\n" -msgstr "%s: 鸅dek %d: u養vatel %s je nezn嫥\n" +msgstr "%s: 獺dek %d: u鱉ivatel %s je nezn獺m羸\n" -#: src/chpasswd.c:290 +#: src/chpasswd.c:280 #, c-format msgid "%s: line %d: cannot update password entry\n" -msgstr "%s: 鸅dek %d: polo餒u v souboru s hesly nelze aktualizovat\n" +msgstr "%s: 獺dek %d: polo鱉ku v souboru s hesly nelze aktualizovat\n" -#: src/chpasswd.c:307 src/newusers.c:588 +#: src/chpasswd.c:297 src/newusers.c:569 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: chyba, zm髶y budou ignorov嫕y\n" +msgstr "%s: chyba, zmny budou ignorov獺ny\n" -#: src/chpasswd.c:319 +#: src/chpasswd.c:309 #, c-format msgid "%s: error updating shadow file\n" -msgstr "%s: chyba p鷡 aktualizaci souboru se st璯ovmi hesly\n" +msgstr "%s: chyba pi aktualizaci souboru se st穩nov羸mi hesly\n" -#: src/chpasswd.c:328 +#: src/chpasswd.c:318 #, c-format msgid "%s: error updating password file\n" -msgstr "%s: chyba p鷡 aktualizaci souboru s hesly\n" +msgstr "%s: chyba pi aktualizaci souboru s hesly\n" -#: src/chsh.c:75 +#: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" -msgstr "Pou養t: %s [-s shell] [jm幯o]\n" - -#: src/chsh.c:89 -msgid "Enter the new value, or press return for the default\n" -msgstr "" -"Zadejte novou hodnotu, nebo stiskn鮅e ENTER pro pou養t implicitn hodnoty\n" +msgstr "Pou鱉it穩: %s [-s shell] [jm矇no]\n" #: src/chsh.c:90 -msgid "Login Shell" -msgstr "Implicitn shell" +msgid "Enter the new value, or press return for the default\n" +msgstr "" +"Zadejte novou hodnotu, nebo stisknte ENTER pro pou鱉it穩 implicitn穩 hodnoty\n" -#: src/chsh.c:239 src/chsh.c:253 +#: src/chsh.c:91 +msgid "Login Shell" +msgstr "Implicitn穩 shell" + +#: src/chsh.c:234 src/chsh.c:248 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "Nem躨ete zm髶it shell pro %s.\n" +msgstr "Nem轡鱉ete zmnit shell pro %s.\n" -#: src/chsh.c:282 +#: src/chsh.c:277 #, c-format msgid "Changing the login shell for %s\n" -msgstr "M髶璥 implicitn shell pro %s\n" +msgstr "Mn穩m implicitn穩 shell pro %s\n" -#: src/chsh.c:294 +#: src/chsh.c:289 #, c-format msgid "%s: Invalid entry: %s\n" -msgstr "%s: chybn polo餒a %s\n" +msgstr "%s: chybn獺 polo鱉ka %s\n" -#: src/chsh.c:301 +#: src/chsh.c:296 #, c-format msgid "%s is an invalid shell.\n" -msgstr "Shell %s je chybn.\n" - -#: src/dpasswd.c:52 -#, c-format -msgid "Usage: %s [-(a|d)] shell\n" -msgstr "Pou養t: %s [-(ald)] shell\n" - -#: src/dpasswd.c:115 -msgid "Shell password: " -msgstr "Heslo shellu: " - -#: src/dpasswd.c:121 -msgid "re-enter Shell password: " -msgstr "zadejte znovu heslo shellu: " - -#: src/dpasswd.c:129 -#, c-format -msgid "%s: Passwords do not match, try again.\n" -msgstr "%s: hesla se li寤, zkuste to znovu\n" - -#: src/dpasswd.c:149 -#, c-format -msgid "%s: can't create %s" -msgstr "%s: %s nelze vytvo鷡t" - -#: src/dpasswd.c:155 -#, c-format -msgid "%s: can't open %s" -msgstr "%s: %s nelze otev齶t" - -#: src/dpasswd.c:183 -#, c-format -msgid "%s: Shell %s not found.\n" -msgstr "%s: Shell %s nebyl nalezen.\n" +msgstr "Shell %s je chybn羸.\n" #: src/expiry.c:59 msgid "Usage: expiry {-f|-c}\n" -msgstr "Pou養t: expiry {-f|-c}\n" +msgstr "Pou鱉it穩: expiry {-f|-c}\n" #: src/expiry.c:113 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" -msgstr "%s: VAROV篾! Mus m癃 opr嫛n髶 superu養vatele!\n" +msgstr "%s: VAROVN! Mus穩 m穩t opr獺vnn穩 superu鱉ivatele!\n" #: src/expiry.c:124 #, c-format msgid "%s: unknown user\n" -msgstr "%s: nezn嫥 u養vatel\n" +msgstr "%s: nezn獺m羸 u鱉ivatel\n" #: src/faillog.c:77 #, c-format -msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" -msgstr "Pou養t: %s [-a|-u u養vatel] [-m max] [-r] [-t dny] [-l zamkn sek]\n" +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +msgstr "Pou鱉it穩: %s [-a|-u u鱉ivatel] [-m max] [-r] [-t dny] [-l zamkn sek]\n" #: src/faillog.c:131 src/lastlog.c:96 #, c-format msgid "Unknown User: %s\n" -msgstr "U養vatel %s je nezn嫥.\n" +msgstr "Nezn獺m羸 u鱉ivatel: %s\n" #: src/faillog.c:212 msgid "Username Failures Maximum Latest\n" -msgstr "Jm幯o Chyb Maximum Posledn燡n" +msgstr "Jm矇no Chyb Maximum Posledn穩\n" #: src/faillog.c:229 #, c-format @@ -716,138 +625,132 @@ msgstr " [%lds zbylo]" #: src/faillog.c:237 #, c-format msgid " [%lds lock]" -msgstr " [%lds z嫥ek]" +msgstr " [%lds z獺mek]" #: src/gpasswd.c:78 #, c-format -msgid "usage: %s [-r|-R] group\n" -msgstr "Pou養t: %s [r|-R] skupina\n" +msgid "Usage: %s [-r|-R] group\n" +msgstr "Pou鱉it穩: %s [r|-R] skupina\n" #: src/gpasswd.c:79 #, c-format msgid " %s [-a user] group\n" -msgstr " %s [-a u養vatel] skupina\n" +msgstr " %s [-a u鱉ivatel] skupina\n" #: src/gpasswd.c:80 #, c-format msgid " %s [-d user] group\n" -msgstr " %s [-d u養vatel] skupina\n" +msgstr " %s [-d u鱉ivatel] skupina\n" #: src/gpasswd.c:83 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" -msgstr " %s [-A u養vatel,...] [-M u養vatel,...] skupina\n" +msgstr " %s [-A u鱉ivatel,...] [-M u鱉ivatel,...] skupina\n" #: src/gpasswd.c:85 #, c-format msgid " %s [-M user,...] group\n" -msgstr " %s [-M u養vatel,...] skupina\n" +msgstr " %s [-M u鱉ivatel,...] skupina\n" #: src/gpasswd.c:146 src/gpasswd.c:230 #, c-format msgid "%s: unknown user %s\n" -msgstr "%s: u養vatel %s je nezn嫥\n" +msgstr "%s: u鱉ivatel %s je nezn獺m羸\n" #: src/gpasswd.c:157 msgid "Permission denied.\n" -msgstr "P齶stup odm癃nut.\n" +msgstr "P穩stup odm穩tnut.\n" #: src/gpasswd.c:243 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s: p鷫p璯a -A funguje pouze se st璯ovmi hesly skupin\n" +msgstr "%s: pep穩na -A funguje pouze se st穩nov羸mi hesly skupin\n" #: src/gpasswd.c:294 msgid "Who are you?\n" msgstr "Kdo jste?\n" -#: src/gpasswd.c:313 src/newgrp.c:297 +#: src/gpasswd.c:313 src/newgrp.c:292 #, c-format msgid "unknown group: %s\n" -msgstr "skupina %s je nezn嫥塿n" +msgstr "skupina %s je nezn獺m獺\n" #: src/gpasswd.c:422 #, c-format msgid "Adding user %s to group %s\n" -msgstr "P鷡d嫛嫥 u養vatele %s do skupiny %s.\n" +msgstr "Pid獺v獺m u鱉ivatele %s do skupiny %s\n" #: src/gpasswd.c:440 #, c-format msgid "Removing user %s from group %s\n" -msgstr "Odstra璷ji u養vatele %s ze skupiny %s\n" +msgstr "Odstrauji u鱉ivatele %s ze skupiny %s\n" #: src/gpasswd.c:454 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s: 鋩en %s je nezn嫥\n" +msgstr "%s: len %s je nezn獺m羸\n" #: src/gpasswd.c:501 #, c-format msgid "%s: Not a tty\n" -msgstr "%s: Nejedn se o tty\n" +msgstr "%s: Nejedn獺 se o tty\n" -#. -#. * A new password is to be entered and it must be encrypted, etc. -#. * The password will be prompted for twice, and both entries must be -#. * identical. There is no need to validate the old password since -#. * the invoker is either the group owner, or root. -#. #: src/gpasswd.c:522 #, c-format msgid "Changing the password for group %s\n" -msgstr "M髶璥 heslo skupiny %s\n" +msgstr "Mn穩m heslo skupiny %s\n" #: src/gpasswd.c:525 msgid "New Password: " -msgstr "Nov heslo: " +msgstr "Nov矇 heslo: " -#: src/gpasswd.c:530 src/passwd.c:365 +#: src/gpasswd.c:530 src/passwd.c:281 msgid "Re-enter new password: " -msgstr "Zadejte op鮅 nov heslo: " +msgstr "Zadejte opt nov矇 heslo: " #: src/gpasswd.c:542 msgid "They don't match; try again" -msgstr "Neshoduj se; zkuste to op鮅" +msgstr "Neshoduj穩 se; zkuste to opt" #: src/gpasswd.c:546 #, c-format msgid "%s: Try again later\n" -msgstr "%s: Zkuste to pozd骹i\n" +msgstr "%s: Zkuste to pozdji\n" #: src/gpasswd.c:578 #, c-format msgid "%s: can't get lock\n" -msgstr "%s: nelze z疄kat z嫥ek\n" +msgstr "%s: nelze z穩skat z獺mek\n" #: src/gpasswd.c:584 #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s: nelze z疄kat z嫥ek pro soubor se st璯ovmi hesly\n" +msgstr "%s: nelze z穩skat z獺mek pro soubor se st穩nov羸mi hesly\n" #: src/gpasswd.c:590 #, c-format msgid "%s: can't open file\n" -msgstr "%s: nelze otev齶t soubor\n" +msgstr "%s: nelze otev穩t soubor\n" #: src/gpasswd.c:602 #, c-format msgid "%s: can't update entry\n" -msgstr "%s: nelze aktualizovat polo餒u\n" +msgstr "%s: nelze aktualizovat polo鱉ku\n" #: src/gpasswd.c:608 #, c-format msgid "%s: can't update shadow entry\n" -msgstr "%s: nelze aktualizovat polo餒u souboru se st璯ovmi hesly\n" +msgstr "%s: nelze aktualizovat polo鱉ku souboru se st穩nov羸mi hesly\n" #: src/gpasswd.c:615 #, c-format msgid "%s: can't re-write file\n" -msgstr "%s: nelze p鷫psat soubor\n" +msgstr "%s: nelze pepsat soubor\n" #: src/gpasswd.c:621 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s: nelze p鷫psat soubor se st璯ovmi hesly\n" +msgstr "%s: nelze pepsat soubor se st穩nov羸mi hesly\n" #: src/gpasswd.c:630 #, c-format @@ -857,147 +760,141 @@ msgstr "%s: nelze odemknout soubor\n" #: src/gpasswd.c:635 #, c-format msgid "%s: can't update DBM files\n" -msgstr "%s: nelze aktualizovat soubory s DBM datab嫙emi\n" +msgstr "%s: nelze aktualizovat soubory s DBM datab獺zemi\n" #: src/gpasswd.c:642 #, c-format msgid "%s: can't update DBM shadow files\n" -msgstr "%s: nelze aktualizovat soubory s DBM datab嫙emi st璯ovch hesel\n" +msgstr "%s: nelze aktualizovat soubory s DBM datab獺zemi st穩nov羸ch hesel\n" -#: src/groupadd.c:101 -msgid "usage: groupadd [-g gid [-o]] group\n" -msgstr "Pou養t: groupadd [-g gid [-o]] skupina\n" +#: src/groupadd.c:102 +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" +msgstr "Pou鱉it穩: groupadd [-g gid [-o]] [-f] skupina\n" -#: src/groupadd.c:167 src/groupadd.c:192 src/groupmod.c:179 src/groupmod.c:228 -#: src/useradd.c:970 src/usermod.c:552 src/usermod.c:695 +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s: chyba p鷡 p鷡d嫛嫕 polo餒y souboru se skupinami\n" +msgstr "%s: chyba pi pid獺v獺n穩 polo鱉ky souboru se skupinami\n" -#: src/groupadd.c:178 src/groupadd.c:203 src/groupmod.c:197 src/useradd.c:981 -#: src/usermod.c:564 src/usermod.c:708 +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 #, c-format msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: nelze p鷡dat polo餒u do souboru s dbm datab嫙 skupin\n" +msgstr "%s: nelze pidat polo鱉ku do souboru s dbm datab獺z穩 skupin\n" -#: src/groupadd.c:255 src/useradd.c:1034 +#: src/groupadd.c:256 src/useradd.c:977 #, c-format msgid "%s: name %s is not unique\n" -msgstr "%s: jm幯o %s nen jedine鋝嬞n" +msgstr "%s: jm矇no %s nen穩 jedinen矇\n" -#: src/groupadd.c:270 +#: src/groupadd.c:271 #, c-format msgid "%s: gid %u is not unique\n" -msgstr "%s: uid %u nen jedine鋝嬞n" +msgstr "%s: uid %u nen穩 jedinen矇\n" -#: src/groupadd.c:294 +#: src/groupadd.c:295 #, c-format msgid "%s: can't get unique gid\n" -msgstr "%s: nelze vytvo鷡t jedine鋝 gid\n" +msgstr "%s: nelze vytvoit jedinen矇 gid\n" -#. -#. * All invalid group names land here. -#. -#: src/groupadd.c:317 src/groupmod.c:341 +#: src/groupadd.c:318 src/groupmod.c:342 #, c-format msgid "%s: %s is a not a valid group name\n" -msgstr "%s: %s nen platnm jm幯em skupiny\n" +msgstr "%s: %s nen穩 platn羸m jm矇nem skupiny\n" -#: src/groupadd.c:346 src/groupmod.c:366 +#: src/groupadd.c:347 src/groupmod.c:367 #, c-format msgid "%s: invalid group %s\n" -msgstr "%s: chybn skupina %s\n" +msgstr "%s: chybn獺 skupina %s\n" -#: src/groupadd.c:363 src/useradd.c:1313 +#: src/groupadd.c:364 src/useradd.c:1173 #, c-format msgid "%s: -O requires NAME=VALUE\n" -msgstr "%s: p鷫p璯a -O vy靠duje argument typu JM冇O=HODNOTA\n" +msgstr "%s: pep穩na -O vy鱉aduje argument typu JMNO=HODNOTA\n" -#: src/groupadd.c:407 src/groupdel.c:173 src/groupmod.c:401 src/useradd.c:1428 -#: src/userdel.c:312 src/usermod.c:576 +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 #, c-format msgid "%s: cannot rewrite group file\n" -msgstr "%s: soubor se skupinami nelze p鷫psat\n" +msgstr "%s: soubor se skupinami nelze pepsat\n" -#: src/groupadd.c:415 src/groupdel.c:179 src/groupmod.c:409 src/useradd.c:1437 -#: src/userdel.c:319 src/usermod.c:722 +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 #, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s: soubor se st璯ovmi skupinami nelze p鷫psat\n" +msgstr "%s: soubor se st穩nov羸mi skupinami nelze pepsat\n" -#: src/groupadd.c:433 src/groupdel.c:198 src/groupmod.c:427 src/userdel.c:403 +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: soubor se skupinami nelze zamknout\n" -#: src/groupadd.c:438 src/groupdel.c:202 src/groupmod.c:432 +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 #, c-format msgid "%s: unable to open group file\n" -msgstr "%s: soubor se skupinami nelze otev齶t\n" +msgstr "%s: soubor se skupinami nelze otev穩t\n" -#: src/groupadd.c:445 src/groupdel.c:207 src/groupmod.c:439 src/userdel.c:414 +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: soubor se st璯ovmi skupinami nelze zamknout\n" +msgstr "%s: soubor se st穩nov羸mi skupinami nelze zamknout\n" -#: src/groupadd.c:451 src/groupdel.c:212 src/groupmod.c:445 +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: soubor se st璯ovmi skupinami nelze otev齶t\n" +msgstr "%s: soubor se st穩nov羸mi skupinami nelze otev穩t\n" -#: src/groupadd.c:562 +#: src/groupadd.c:563 #, c-format msgid "%s: group %s exists\n" -msgstr "%s: skupina %s ji existuje\n" +msgstr "%s: skupina %s ji鱉 existuje\n" -#: src/groupdel.c:92 -msgid "usage: groupdel group\n" -msgstr "Pou養t: groupdel skupina\n" +#: src/groupdel.c:88 +msgid "Usage: groupdel group\n" +msgstr "Pou鱉it穩: groupdel skupina\n" -#: src/groupdel.c:110 src/groupmod.c:184 src/groupmod.c:233 +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 #, c-format msgid "%s: error removing group entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y ze souboru se skupinami\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru se skupinami\n" -#: src/groupdel.c:122 src/groupmod.c:204 +#: src/groupdel.c:119 src/groupmod.c:205 #, c-format msgid "%s: error removing group dbm entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y ze souboru s dbm datab嫙 skupin\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru s dbm datab獺z穩 skupin\n" -#: src/groupdel.c:137 +#: src/groupdel.c:135 #, c-format msgid "%s: error removing shadow group entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y ze souboru se st璯ovmi skupinami\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru se st穩nov羸mi skupinami\n" -#: src/groupdel.c:150 src/groupmod.c:254 +#: src/groupdel.c:149 src/groupmod.c:255 #, c-format msgid "%s: error removing shadow group dbm entry\n" msgstr "" -"%s: chyba p鷡 odstra犦v嫕 polo餒y ze souboru s dbm datab嫙 st璯ovch " +"%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru s dbm datab獺z穩 st穩nov羸ch " "skupin\n" -#. -#. * Can't remove the group. -#. -#: src/groupdel.c:254 +#: src/groupdel.c:255 #, c-format msgid "%s: cannot remove user's primary group.\n" -msgstr "%s: prim嫫n skupinu u養vatele nelze odstranit\n" +msgstr "%s: prim獺rn穩 skupinu u鱉ivatele nelze odstranit.\n" -#: src/groupdel.c:355 src/groupmod.c:550 +#: src/groupdel.c:359 src/groupmod.c:551 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: skupina %s neexistuje\n" -#: src/groupdel.c:369 src/groupmod.c:566 +#: src/groupdel.c:373 src/groupmod.c:567 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: skupina %s je NIS skupinou\n" -#: src/groupdel.c:375 src/groupmod.c:571 src/userdel.c:776 src/usermod.c:1045 +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 #, c-format msgid "%s: %s is the NIS master\n" -msgstr "%s: %s je hlavn璥 NIS serverem\n" +msgstr "%s: %s je hlavn穩m NIS serverem\n" #: src/groupmems.c:95 msgid "Member already exists\n" @@ -1008,7 +905,7 @@ msgid "Member to remove could not be found\n" msgstr "" #: src/groupmems.c:158 -msgid "usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" msgstr "" #: src/groupmems.c:201 @@ -1029,46 +926,46 @@ msgstr "Soubor se skupinami nelze zamknout\n" #: src/groupmems.c:220 msgid "Unable to open group file\n" -msgstr "Soubor se skupinami nelze otev齶t\n" +msgstr "Soubor se skupinami nelze otev穩t\n" #: src/groupmems.c:240 msgid "Cannot close group file\n" -msgstr "Soubor se skupinami nelze otev齶t\n" +msgstr "Soubor se skupinami nelze otev穩t\n" -#: src/groupmod.c:103 -msgid "usage: groupmod [-g gid [-o]] [-n name] group\n" -msgstr "Pou養t: groupmod [-g gid [-o]] [-n jm幯o] skupina\n" +#: src/groupmod.c:104 +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "Pou鱉it穩: groupmod [-g gid [-o]] [-n jm矇no] skupina\n" -#: src/groupmod.c:161 +#: src/groupmod.c:162 #, c-format msgid "%s: %s not found in /etc/group\n" -msgstr "%s: %s se v /etc/group nenal憴塿n" +msgstr "%s: %s se v /etc/group nenal矇z獺\n" -#: src/groupmod.c:247 +#: src/groupmod.c:248 #, c-format msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: nelze p鷡dat polo餒u do souboru s dbm datab嫙 st璯ovch skupin\n" +msgstr "%s: nelze pidat polo鱉ku do souboru s dbm datab獺z穩 st穩nov羸ch skupin\n" -#: src/groupmod.c:300 +#: src/groupmod.c:301 #, c-format msgid "%s: %u is not a unique gid\n" -msgstr "%s: gid %u nen jedine鋝嬞n" +msgstr "%s: gid %u nen穩 jedinen矇\n" -#: src/groupmod.c:330 +#: src/groupmod.c:331 #, c-format msgid "%s: %s is not a unique name\n" -msgstr "%s: jm幯o %s nen jedine鋝嬞n" +msgstr "%s: jm矇no %s nen穩 jedinen矇\n" #: src/groups.c:59 #, c-format msgid "unknown user %s\n" -msgstr "u養vatel %s je nezn嫥\n" +msgstr "u鱉ivatel %s je nezn獺m羸\n" #: src/grpck.c:87 #, c-format msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "" -"Pou養t: %s [-r] [-s] [soubor se skupinami [soubor se st璯ovmi skupinami]]\n" +"Pou鱉it穩: %s [-r] [-s] [soubor se skupinami [soubor se st穩nov羸mi skupinami]]\n" #: src/grpck.c:90 #, c-format @@ -1093,80 +990,64 @@ msgstr "%s: soubor %s nelze zamknout\n" #: src/pwck.c:251 #, c-format msgid "%s: cannot open file %s\n" -msgstr "%s: soubor %s nelze otev齶t\n" +msgstr "%s: soubor %s nelze otev穩t\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:311 msgid "invalid group file entry\n" -msgstr "chybn polo餒a v souboru se skupinami\n" +msgstr "chybn獺 polo鱉ka v souboru se skupinami\n" #: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 #: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 #: src/pwck.c:543 #, c-format msgid "delete line `%s'? " -msgstr "smazat 鸅dek `%s'?" +msgstr "smazat 獺dek `%s'?" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:374 msgid "duplicate group entry\n" -msgstr "tato polo餒a se v souboru se skupinami vyskytuje v獳ekr嫢\n" +msgstr "tato polo鱉ka se v souboru se skupinami vyskytuje v穩cekr獺t\n" #: src/grpck.c:391 #, c-format msgid "invalid group name `%s'\n" -msgstr "jm幯o skupiny `%s' je chybn嬞n" +msgstr "jm矇no skupiny `%s' je chybn矇\n" #: src/grpck.c:418 #, c-format msgid "group %s: no user %s\n" -msgstr "skupina %s: u養vatel %s neexistuje\n" +msgstr "skupina %s: u鱉ivatel %s neexistuje\n" #: src/grpck.c:420 src/grpck.c:590 #, c-format msgid "delete member `%s'? " -msgstr "smazat 鋩ena `%s'? " +msgstr "smazat lena `%s'? " -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:457 msgid "invalid shadow group file entry\n" -msgstr "chybn polo餒a v souboru se st璯ovmi skupinami\n" +msgstr "chybn獺 polo鱉ka v souboru se st穩nov羸mi skupinami\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:520 msgid "duplicate shadow group entry\n" -msgstr "duplikovan polo餒a v souboru se st璯ovmi skupinami\n" +msgstr "duplikovan獺 polo鱉ka v souboru se st穩nov羸mi skupinami\n" #: src/grpck.c:537 msgid "no matching group file entry\n" -msgstr "v souboru se skupinami neexistuje odpov獮aj獳 polo餒a\n" +msgstr "v souboru se skupinami neexistuje odpov穩daj穩c穩 polo鱉ka\n" #: src/grpck.c:558 #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "st璯ov skupina %s: administr嫢or %s neexistuje\n" +msgstr "st穩nov獺 skupina %s: administr獺tor %s neexistuje\n" #: src/grpck.c:560 #, c-format msgid "delete administrative member `%s'? " -msgstr "smazat administr嫢ora `%s'? " +msgstr "smazat administr獺tora `%s'? " #: src/grpck.c:588 #, c-format msgid "shadow group %s: no user %s\n" -msgstr "st璯ov skupina %s: u養vatel %s neexistuje\n" +msgstr "st穩nov獺 skupina %s: u鱉ivatel %s neexistuje\n" #: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 #, c-format @@ -1176,17 +1057,17 @@ msgstr "%s: soubor %s nelze aktualizovat\n" #: src/grpck.c:647 src/pwck.c:612 #, c-format msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: soubory byly aktualizov嫕y; spus裨e mkpasswd\n" +msgstr "%s: soubory byly aktualizov獺ny; spus聽te mkpasswd\n" #: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 #, c-format msgid "%s: no changes\n" -msgstr "%s: 擔dn zm髶y nebyly provedeny\n" +msgstr "%s: 鱉獺dn矇 zmny nebyly provedeny\n" #: src/grpck.c:651 src/pwck.c:616 #, c-format msgid "%s: the files have been updated\n" -msgstr "%s: soubory byly aktualizov嫕y\n" +msgstr "%s: soubory byly aktualizov獺ny\n" #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format @@ -1196,216 +1077,203 @@ msgstr "%s: soubor se skupinami nelze zamknout\n" #: src/grpconv.c:65 src/grpunconv.c:61 #, c-format msgid "%s: can't open group file\n" -msgstr "%s: soubor se skupinami nelze otev齶t\n" +msgstr "%s: soubor se skupinami nelze otev穩t\n" #: src/grpconv.c:70 src/grpunconv.c:66 #, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: soubor se st璯ovmi skupinami nelze zamknout\n" +msgstr "%s: soubor se st穩nov羸mi skupinami nelze zamknout\n" #: src/grpconv.c:76 src/grpunconv.c:72 #, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: soubor se st璯ovmi skupinami nelze otev齶t\n" +msgstr "%s: soubor se st穩nov羸mi skupinami nelze otev穩t\n" #: src/grpconv.c:94 #, c-format msgid "%s: can't remove shadow group %s\n" -msgstr "%s: polo餒u st璯ov skupiny %s nelze odstranit\n" +msgstr "%s: polo鱉ku st穩nov矇 skupiny %s nelze odstranit\n" -#: src/grpconv.c:138 src/pwconv.c:153 +#: src/grpconv.c:133 src/pwconv.c:154 #, c-format msgid "%s: can't update shadow entry for %s\n" -msgstr "%s: polo餒u %s souboru se st璯ovmi hesly nelze aktualizovat\n" +msgstr "%s: polo鱉ku %s souboru se st穩nov羸mi hesly nelze aktualizovat\n" -#: src/grpconv.c:148 src/grpunconv.c:91 +#: src/grpconv.c:143 src/grpunconv.c:91 #, c-format msgid "%s: can't update entry for group %s\n" -msgstr "%s: polo餒u skupiny %s nelze odstranit\n" +msgstr "%s: polo鱉ku skupiny %s nelze odstranit\n" -#: src/grpconv.c:155 src/grpunconv.c:99 +#: src/grpconv.c:150 src/grpunconv.c:99 #, c-format msgid "%s: can't update shadow group file\n" -msgstr "%s: soubor se st璯ovmi hesly nelze aktualizovat\n" +msgstr "%s: soubor se st穩nov羸mi hesly nelze aktualizovat\n" -#: src/grpconv.c:160 src/grpunconv.c:105 +#: src/grpconv.c:155 src/grpunconv.c:105 #, c-format msgid "%s: can't update group file\n" msgstr "%s: soubor s hesly nelze aktualizovat\n" -#: src/grpconv.c:175 src/grpunconv.c:127 -#, c-format -msgid "%s: not configured for shadow group support.\n" -msgstr "%s: podpora pro st璯ov hesla skupin nen nakonfigurov嫕a\n" - #: src/grpunconv.c:110 #, c-format msgid "%s: can't delete shadow group file\n" -msgstr "%s: soubor se st璯ovmi hesly skupin nelze smazat\n" +msgstr "%s: soubor se st穩nov羸mi hesly skupin nelze smazat\n" #: src/id.c:53 -msgid "usage: id [-a]\n" -msgstr "Pou養t: id [-a]\n" +msgid "Usage: id [-a]\n" +msgstr "Pou鱉it穩: id [-a]\n" #: src/id.c:55 -msgid "usage: id\n" -msgstr "Pou養t: id\n" +msgid "Usage: id\n" +msgstr "Pou鱉it穩: id\n" -#. -#. * Start off the group message. It will be of the format -#. * -#. * groups=###(aaa),###(aaa),###(aaa) -#. * -#. * where "###" is a numerical value and "aaa" is the -#. * corresponding name for each respective numerical value. -#. #: src/id.c:169 msgid " groups=" msgstr " skupiny=" #: src/lastlog.c:110 src/lastlog.c:116 #, c-format -msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n" +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" msgstr "" #: src/lastlog.c:181 msgid "Username Port From Latest\n" -msgstr "U養vatel Port Z Naposledy\n" +msgstr "U鱉ivatel Port Z Naposledy\n" #: src/lastlog.c:183 msgid "Username Port Latest\n" -msgstr "U養vatel Port Naposledy\n" +msgstr "U鱉ivatel Port Naposledy\n" -#: src/lastlog.c:197 +#: src/lastlog.c:198 msgid "**Never logged in**" -msgstr "**Nikdy nebyl p鷡hl廜en**" +msgstr "**Nikdy nebyl pihl獺禳en**" -#: src/login.c:185 +#: src/login.c:175 #, c-format -msgid "usage: %s [-p] [name]\n" -msgstr "Pou養t: %s [-p] jm幯o\n" +msgid "Usage: %s [-p] [name]\n" +msgstr "Pou鱉it穩: %s [-p] jm矇no\n" -#: src/login.c:188 +#: src/login.c:178 #, c-format msgid " %s [-p] [-h host] [-f name]\n" -msgstr " %s [-p] [-h po鴈ta醊 [-f jm幯o]\n" +msgstr " %s [-p] [-h po穩ta] [-f jm矇no]\n" -#: src/login.c:190 +#: src/login.c:180 #, c-format msgid " %s [-p] -r host\n" -msgstr " %s [-p] -r po鴈ta醆n" +msgstr " %s [-p] -r po穩ta\n" -#: src/login.c:274 +#: src/login.c:259 msgid "Invalid login time\n" -msgstr "Chybn 醀s p鷡hl廜en燡n" +msgstr "Chybn羸 as pihl獺禳en穩\n" -#: src/login.c:329 +#: src/login.c:314 msgid "" "\n" "System closed for routine maintenance\n" msgstr "" "\n" -"Syst幦 byl uzav鷫n kv灦i pravideln dr鞍.\n" +"Syst矇m byl uzaven kv轡li pravideln矇 繳dr鱉b.\n" -#: src/login.c:340 +#: src/login.c:325 msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[Odpojen p鷫sko鋀no -- u養vatel root sm bt p鷡hl廜en.]\n" +"[Odpojen穩 peskoeno -- u鱉ivatel root sm穩 b羸t pihl獺禳en.]\n" -#: src/login.c:377 +#: src/login.c:362 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" "\n" -"Vypr鈹l 醀sov limit (%d vte鷡n) pro p鷡hl廜en.\n" +"Vypr禳el asov羸 limit (%d vtein) pro pihl獺禳en穩.\n" -#: src/login.c:689 +#: src/login.c:648 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " na `%.100s' z `%.200s'" -#: src/login.c:693 +#: src/login.c:652 #, c-format msgid " on `%.100s'" msgstr " na `%.100s'" -#: src/login.c:852 +#: src/login.c:811 #, c-format msgid "" "\n" "%s login: " msgstr "" "\n" -"P鷡hla雊vac jm幯o na %s: " +"Pihla禳ovac穩 jm矇no na %s: " -#: src/login.c:855 +#: src/login.c:814 msgid "login: " -msgstr "P鷡hla雊vac jm幯o: " +msgstr "Pihla禳ovac穩 jm矇no: " -#: src/login.c:1071 src/sulogin.c:233 +#: src/login.c:1013 src/sulogin.c:205 msgid "Login incorrect" -msgstr "Chybn p鷡hl廜en" +msgstr "Chybn矇 pihl獺禳en穩" -#: src/login.c:1265 +#: src/login.c:1193 msgid "Warning: login re-enabled after temporary lockout.\n" -msgstr "Varov嫕: po do醀sn幦 z嫜azu je p鷡hla雊v嫕 op鮅 povoleno\n" +msgstr "Varov獺n穩: po doasn矇m z獺kazu je pihla禳ov獺n穩 opt povoleno.\n" -#: src/login.c:1278 +#: src/login.c:1207 #, c-format msgid "Last login: %s on %s" -msgstr "Posledn p鷡hl廜en: %s na %s" +msgstr "Posledn穩 pihl獺禳en穩: %s na %s" -#: src/login.c:1281 +#: src/login.c:1210 #, c-format msgid "Last login: %.19s on %s" -msgstr "Posledn p鷡hl廜en: %.19s na %s" +msgstr "Posledn穩 pihl獺禳en穩: %.19s na %s" -#: src/login.c:1287 +#: src/login.c:1216 #, c-format msgid " from %.*s" msgstr " z %.*s" -#: src/login.c:1364 +#: src/login.c:1293 msgid "Starting rad_login\n" -msgstr "Spou靖璥 rad_login\n" +msgstr "Spou禳t穩m rad_login\n" #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" -msgstr "%s: syst幦 neobsahuje 擔dnou DBM datab嫙i - nen co d骴at\n" +msgstr "%s: syst矇m neobsahuje 鱉獺dnou DBM datab獺zi - nen穩 co dlat\n" #: src/mkpasswd.c:232 src/mkpasswd.c:237 #, c-format msgid "%s: cannot overwrite file %s\n" -msgstr "%s: soubor %s nelze p鷫psat\n" +msgstr "%s: soubor %s nelze pepsat\n" #: src/mkpasswd.c:252 #, c-format msgid "%s: cannot open DBM files for %s\n" -msgstr "%s: soubory s DBM datab嫙emi pro %s nelze otev齶t\n" +msgstr "%s: soubory s DBM datab獺zemi pro %s nelze otev穩t\n" #: src/mkpasswd.c:287 #, c-format msgid "%s: the beginning with " -msgstr "%s: za魨tek s " +msgstr "%s: za獺tek s " #: src/mkpasswd.c:288 msgid " is too long\n" -msgstr " polo餒a je p齶li dlouh塿n" +msgstr " polo鱉ka je p穩li禳 dlouh獺\n" #: src/mkpasswd.c:315 #, c-format msgid "%s: error parsing line \"%s\"\n" -msgstr "%s: chyba p鷡 zpracov嫕 鸅dku \"%s\"\n" +msgstr "%s: chyba pi zpracov獺n穩 獺dku \"%s\"\n" #: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338 msgid "adding record for name " -msgstr "p鷡d嫛嫥 z嫙nam pro jm幯o" +msgstr "pid獺v獺m z獺znam pro jm矇no" #: src/mkpasswd.c:324 src/mkpasswd.c:329 src/mkpasswd.c:334 src/mkpasswd.c:339 #: src/mkpasswd.c:345 src/mkpasswd.c:351 src/mkpasswd.c:356 src/mkpasswd.c:361 @@ -1415,377 +1283,316 @@ msgstr "" #: src/mkpasswd.c:344 src/mkpasswd.c:350 src/mkpasswd.c:355 src/mkpasswd.c:360 #, c-format msgid "%s: error adding record for " -msgstr "%s: chyba p鷡 zad嫛嫕 z嫙namu pro jm幯o " +msgstr "%s: chyba pi zad獺v獺n穩 z獺znamu pro jm矇no " #: src/mkpasswd.c:378 #, c-format msgid "added %d entries, longest was %d\n" -msgstr "po鋀t p鷡danch polo頡k: %d; d幨ka nejv鮅寤: %d\n" +msgstr "poet pidan羸ch polo鱉ek: %d; d矇lka nejvt禳穩: %d\n" #: src/mkpasswd.c:392 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" -msgstr "Pou養t: %s [-vf] [-p|g|sp|sg] soubor\n" +msgstr "Pou鱉it穩: %s [-vf] [-p|g|sp|sg] soubor\n" #: src/mkpasswd.c:395 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" -msgstr "Pou養t: %s [-vf] [-p|g|sp] soubor\n" +msgstr "Pou鱉it穩: %s [-vf] [-p|g|sp] soubor\n" #: src/mkpasswd.c:398 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" -msgstr "Pou養t: %s [-vf] [-p|g] soubor\n" +msgstr "Pou鱉it穩: %s [-vf] [-p|g] soubor\n" #: src/newgrp.c:61 -msgid "usage: newgrp [-] [group]\n" -msgstr "Pou養t: newgrp [-] [skupina]\n" +msgid "Usage: newgrp [-] [group]\n" +msgstr "Pou鱉it穩: newgrp [-] [skupina]\n" #: src/newgrp.c:63 -msgid "usage: sg group [[-c] command]\n" -msgstr "Pou養t: sg skupina [[-c] p齶kaz]\n" +msgid "Usage: sg group [[-c] command]\n" +msgstr "Pou鱉it穩: sg skupina [[-c] p穩kaz]\n" -#: src/newgrp.c:136 +#: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" -msgstr "uid %u je nezn嫥嬞n" +msgstr "uid %u je nezn獺m矇\n" -#: src/newgrp.c:219 +#: src/newgrp.c:214 #, c-format msgid "unknown gid: %lu\n" -msgstr "gid %lu je nezn嫥嬞n" +msgstr "gid %lu je nezn獺m矇\n" -#: src/newgrp.c:365 src/newgrp.c:374 +#: src/newgrp.c:360 src/newgrp.c:369 msgid "Sorry.\n" msgstr "Lituji.\n" -#: src/newgrp.c:472 +#: src/newgrp.c:469 msgid "too many groups\n" -msgstr "p齶li mnoho skupin\n" +msgstr "p穩li禳 mnoho skupin\n" #: src/newusers.c:78 #, c-format msgid "Usage: %s [input]\n" -msgstr "Pou養t: %s [vstup]\n" +msgstr "Pou鱉it穩: %s [vstup]\n" -#: src/newusers.c:407 +#: src/newusers.c:388 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s: soubor /etc/passwd nelze zamknout\n" +msgstr "%s: soubor /etc/passwd nelze zamknout.\n" -#: src/newusers.c:419 +#: src/newusers.c:400 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s: soubory nelze zamknout. Zkuste to op鮅 pozd骹i.\n" +msgstr "%s: soubory nelze zamknout. Zkuste to opt pozdji.\n" -#: src/newusers.c:435 +#: src/newusers.c:416 #, c-format msgid "%s: can't open files\n" -msgstr "%s: soubory nelze otev齶t\n" +msgstr "%s: soubory nelze otev穩t\n" + +#: src/newusers.c:461 +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: 獺dek %d: chybn羸 獺dek\n" #: src/newusers.c:480 #, c-format -msgid "%s: line %d: invalid line\n" -msgstr "%s: 鸅dek %d: chybn 鸅dek\n" - -#: src/newusers.c:499 -#, c-format msgid "%s: line %d: can't create GID\n" -msgstr "%s: 鸅dek %d: nelze vytvo鷡t GID\n" +msgstr "%s: 獺dek %d: nelze vytvoit GID\n" -#: src/newusers.c:515 +#: src/newusers.c:496 #, c-format msgid "%s: line %d: can't create UID\n" -msgstr "%s: 鸅dek %d: nelze vytvo鷡t UID\n" +msgstr "%s: 獺dek %d: nelze vytvoit UID\n" -#: src/newusers.c:528 +#: src/newusers.c:509 #, c-format msgid "%s: line %d: cannot find user %s\n" -msgstr "%s: 鸅dek %d: u養vatele %s nelze nal憴t\n" +msgstr "%s: 獺dek %d: u鱉ivatele %s nelze nal矇zt\n" -#: src/newusers.c:537 +#: src/newusers.c:518 #, c-format msgid "%s: line %d: can't update password\n" -msgstr "%s: 鸅dek %d: heslo nelze aktualizovat\n" +msgstr "%s: 獺dek %d: heslo nelze aktualizovat\n" -#: src/newusers.c:555 +#: src/newusers.c:536 #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "%s: 鸅dek %d: vol嫕 mkdir selhalo\n" +msgstr "%s: 獺dek %d: vol獺n穩 mkdir selhalo\n" -#: src/newusers.c:561 +#: src/newusers.c:542 #, c-format msgid "%s: line %d: chown failed\n" -msgstr "%s: 鸅dek %d: vol嫕 chown selhalo\n" +msgstr "%s: 獺dek %d: vol獺n穩 chown selhalo\n" -#: src/newusers.c:571 +#: src/newusers.c:552 #, c-format msgid "%s: line %d: can't update entry\n" -msgstr "%s: 鸅dek %d: polo餒u nelze aktualizovat\n" +msgstr "%s: 獺dek %d: polo鱉ku nelze aktualizovat\n" -#: src/newusers.c:603 +#: src/newusers.c:584 #, c-format msgid "%s: error updating files\n" -msgstr "%s: chyba p鷡 aktualizaci soubor鱭n" +msgstr "%s: chyba pi aktualizaci soubor轡\n" -#: src/passwd.c:174 +#: src/passwd.c:155 #, c-format -msgid "usage: %s [-f|-s] [name]\n" -msgstr "Pou養t: %s [-f|-s] [jm幯o]\n" +msgid "Usage: %s [-f|-s] [name]\n" +msgstr "Pou鱉it穩: %s [-f|-s] [jm矇no]\n" -#: src/passwd.c:178 +#: src/passwd.c:159 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" -msgstr " %s [-x max] [-n min] [-w varov嫕燱 [-i vypnut燱 jm幯o\n" +msgstr " %s [-x max] [-n min] [-w varov獺n穩] [-i vypnut穩] jm矇no\n" -#: src/passwd.c:180 +#: src/passwd.c:161 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" -msgstr " %s {-l|-u|-d|-S|-e} jm幯o\n" +msgstr " %s {-l|-u|-d|-S|-e} jm矇no\n" -#: src/passwd.c:283 -#, c-format -msgid "User %s has a TCFS key, his old password is required.\n" -msgstr "U養vatel %s m TCFS kl膻, je t鷫ba jeho star heslo.\n" - -#: src/passwd.c:286 -msgid "You can use -t option to force the change.\n" -msgstr "M躨ete pou橙t p鷫p璯a -t pro vynucen zm髶y.\n" - -#: src/passwd.c:292 +#: src/passwd.c:216 msgid "Old password: " -msgstr "Star heslo: " +msgstr "Star矇 heslo: " -#: src/passwd.c:301 +#: src/passwd.c:225 #, c-format msgid "Incorrect password for `%s'\n" -msgstr "Chybn heslo pro `%s'\n" +msgstr "Chybn矇 heslo pro `%s'\n" -#: src/passwd.c:314 -#, c-format -msgid "Warning: user %s has a TCFS key.\n" -msgstr "Varov嫕: u養vatele %s m TCFS kl膻.\n" - -#: src/passwd.c:333 +#: src/passwd.c:249 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -"Zadejte nov heslo (po鋀t znak v intervalu %d a %d).\n" -"Pou養jte kombinaci velkch a malch p疄men s 鴈slicemi.\n" +"Zadejte nov矇 heslo (poet znak轡 v intervalu %d a鱉 %d).\n" +"Pou鱉ijte kombinaci velk羸ch a mal羸ch p穩smen s 穩slicemi.\n" -#: src/passwd.c:339 +#: src/passwd.c:255 msgid "New password: " -msgstr "Nov heslo: " +msgstr "Nov矇 heslo: " -#: src/passwd.c:350 +#: src/passwd.c:266 msgid "Try again.\n" msgstr "Zkuste to znovu.\n" -#: src/passwd.c:361 +#: src/passwd.c:277 msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"Varov嫕: slab heslo (pokud jej opravdu chcete pou橙t, zadejte jej znovu).\n" +"Varov獺n穩: slab矇 heslo (pokud jej opravdu chcete pou鱉穩t, zadejte jej znovu).\n" -#: src/passwd.c:371 +#: src/passwd.c:287 msgid "They don't match; try again.\n" -msgstr "Neshoduj se; zkuste to znovu.\n" +msgstr "Neshoduj穩 se; zkuste to znovu.\n" -#: src/passwd.c:451 src/passwd.c:469 +#: src/passwd.c:364 src/passwd.c:382 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "Heslo pro %s nelze zm髶it.\n" +msgstr "Heslo pro %s nelze zmnit.\n" -#: src/passwd.c:494 +#: src/passwd.c:396 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "Lituji, ale heslo pro %s nelze je靖 zm髶it.\n" +msgstr "Lituji, ale heslo pro %s nelze je禳t zmnit.\n" -#: src/passwd.c:614 +#: src/passwd.c:479 #, c-format msgid "%s: out of memory\n" -msgstr "%s: do雍a pam儢\n" +msgstr "%s: do禳la pam聽\n" -#: src/passwd.c:769 -msgid "Cannot lock the TCFS key database; try again later\n" -msgstr "Nelze zamknout datab嫙i TCFS kl膻. Zkuste to pozd骹i.\n" - -#: src/passwd.c:777 -msgid "Cannot open the TCFS key database.\n" -msgstr "Nelze otev齶t datab嫙i TCFS kl膻.\n" - -#: src/passwd.c:785 -msgid "Error updating the TCFS key database.\n" -msgstr "Chyba p鷡 aktualizaci datab嫙e TCFS kl膻.\n" - -#: src/passwd.c:792 -msgid "Cannot commit TCFS changes.\n" -msgstr "Nelze zm髶it TCFS datab嫙i.\n" - -#: src/passwd.c:975 +#: src/passwd.c:730 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: %s nelze spustit" -#: src/passwd.c:1077 +#: src/passwd.c:815 #, c-format msgid "%s: repository %s not supported\n" -msgstr "%s: lo駐a %s nen podporov嫕a\n" +msgstr "%s: 繳lo鱉na %s nen穩 podporov獺na\n" -#: src/passwd.c:1152 +#: src/passwd.c:890 #, c-format msgid "%s: Permission denied\n" -msgstr "%s: p齶stup odm癃nut\n" +msgstr "%s: p穩stup odm穩tnut\n" -#: src/passwd.c:1176 +#: src/passwd.c:914 #, c-format msgid "You may not change the password for %s.\n" -msgstr "Nesm癃e zm髶it heslo pro %s.\n" +msgstr "Nesm穩te zmnit heslo pro %s.\n" -#: src/passwd.c:1242 +#: src/passwd.c:962 #, c-format msgid "Changing password for %s\n" -msgstr "M髶璥 heslo u養vatele %s\n" +msgstr "Mn穩m heslo u鱉ivatele %s\n" -#: src/passwd.c:1246 +#: src/passwd.c:966 #, c-format msgid "The password for %s is unchanged.\n" -msgstr "Heslo u養vatele %s nebylo zm髶髶o.\n" +msgstr "Heslo u鱉ivatele %s nebylo zmnno.\n" -#: src/passwd.c:1297 +#: src/passwd.c:1016 msgid "Password changed.\n" -msgstr "Heslo bylo zm髶髶o.\n" +msgstr "Heslo bylo zmnno.\n" #: src/pwck.c:87 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgstr "" -"Pou養t: %s [-q] [-r] [-s] [soubor s hesly [soubor se st璯ovmi hesly]]\n" +"Pou鱉it穩: %s [-q] [-r] [-s] [soubor s hesly [soubor se st穩nov羸mi hesly]]\n" #: src/pwck.c:90 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" -msgstr "Pou養t: %s [-q] [-r] [-s] [soubor s hesly]\n" +msgstr "Pou鱉it穩: %s [-q] [-r] [-s] [soubor s hesly]\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:295 msgid "invalid password file entry\n" -msgstr "chybn polo餒a v souboru s hesly\n" +msgstr "chybn獺 polo鱉ka v souboru s hesly\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:357 msgid "duplicate password entry\n" -msgstr "duplikovan polo餒a v souboru s hesly\n" +msgstr "duplikovan獺 polo鱉ka v souboru s hesly\n" #: src/pwck.c:373 #, c-format msgid "invalid user name '%s'\n" -msgstr "chybn u養vatelsk jm幯o '%s'\n" +msgstr "chybn矇 u鱉ivatelsk矇 jm矇no '%s'\n" -#. -#. * No primary group, just give a warning -#. #: src/pwck.c:388 #, c-format msgid "user %s: no group %u\n" -msgstr "u養vatel %s: skupina %u neexistuje\n" +msgstr "u鱉ivatel %s: skupina %u neexistuje\n" #: src/pwck.c:404 #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "u養vatel %s: adres暟 %s neexistuje\n" +msgstr "u鱉ivatel %s: adres獺 %s neexistuje\n" -#. -#. * Login shell doesn't exist, give a warning -#. #: src/pwck.c:420 #, c-format msgid "user %s: program %s does not exist\n" -msgstr "u養vatel %s: program %s neexistuje\n" +msgstr "u鱉ivatel %s: program %s neexistuje\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:456 msgid "invalid shadow password file entry\n" -msgstr "chybn polo餒a v souboru se st璯ovmi hesly\n" +msgstr "chybn獺 polo鱉ka v souboru se st穩nov羸mi hesly\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:518 msgid "duplicate shadow password entry\n" -msgstr "duplikovan polo餒a v souboru se st璯ovmi hesly\n" +msgstr "duplikovan獺 polo鱉ka v souboru se st穩nov羸mi hesly\n" -#. -#. * Tell the user this entry has no matching -#. * /etc/passwd entry and ask them to delete it. -#. #: src/pwck.c:542 msgid "no matching password file entry\n" -msgstr "chyb polo餒a v souboru s hesly\n" +msgstr "chyb穩 polo鱉ka v souboru s hesly\n" #: src/pwck.c:560 #, c-format msgid "user %s: last password change in the future\n" -msgstr "u養vatel %s: posledn zm髶a hesla v budoucnosti\n" +msgstr "u鱉ivatel %s: posledn穩 zmna hesla v budoucnosti\n" -#: src/pwconv.c:84 src/pwunconv.c:93 +#: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" msgstr "%s: soubor s hesly nelze zamknout\n" -#: src/pwconv.c:89 src/pwunconv.c:98 +#: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s: soubor s hesly nelze otev齶t\n" +msgstr "%s: soubor s hesly nelze otev穩t\n" -#: src/pwconv.c:117 +#: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "%s: polo餒u souboru s hesly pro u養vatele %s nelze odstranit\n" +msgstr "%s: polo鱉ku souboru s hesly pro u鱉ivatele %s nelze odstranit\n" -#: src/pwconv.c:163 +#: src/pwconv.c:164 #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "%s: polo餒u souboru s hesly pro u養vatele %s nelze aktualizovat\n" +msgstr "%s: polo鱉ku souboru s hesly pro u鱉ivatele %s nelze aktualizovat\n" -#: src/pwconv.c:170 +#: src/pwconv.c:171 #, c-format msgid "%s: can't update shadow file\n" -msgstr "%s: soubor se st璯ovmi hesly nelze aktualizovat\n" +msgstr "%s: soubor se st穩nov羸mi hesly nelze aktualizovat\n" -#: src/pwconv.c:175 +#: src/pwconv.c:176 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: soubor s hesly nelze aktualizovat\n" -#: src/pwunconv.c:50 -#, c-format -msgid "%s: Shadow passwords are not configured.\n" -msgstr "%s: st璯ov hesla nejsou nakonfigurov嫕a\n" - -#: src/pwunconv.c:160 +#: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s: polo餒u pro u養vatele %s nelze aktualizovat\n" +msgstr "%s: polo鱉ku pro u鱉ivatele %s nelze aktualizovat\n" -#: src/pwunconv.c:181 +#: src/pwunconv.c:145 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s: nem躨ete smazat soubor se st璯ovmi hesly\n" +msgstr "%s: nem轡鱉ete smazat soubor se st穩nov羸mi hesly\n" #: src/su.c:133 msgid "Sorry." @@ -1794,7 +1601,7 @@ msgstr "Lituji." #: src/su.c:216 #, c-format msgid "%s: must be run from a terminal\n" -msgstr "%s: mus bt spu靖髶o z termin嫮u\n" +msgstr "%s: mus穩 b羸t spu禳tno z termin獺lu\n" #: src/su.c:306 #, c-format @@ -1804,17 +1611,16 @@ msgstr "%s: pam_start: chyba %d\n" #: src/su.c:336 #, c-format msgid "Unknown id: %s\n" -msgstr "Id %s je nezn嫥.\n" +msgstr "Id %s je nezn獺m矇.\n" #: src/su.c:373 src/su.c:390 #, c-format msgid "You are not authorized to su %s\n" -msgstr "Nejste opr嫛n髶 pou橙vat su %s\n" +msgstr "Nejste opr獺vnn pou鱉穩vat su %s\n" -#. require own password #: src/su.c:385 msgid "(Enter your own password.)" -msgstr "(Zadejte va鈹 heslo.)" +msgstr "(Zadejte va禳e heslo.)" #: src/su.c:419 #, c-format @@ -1825,605 +1631,658 @@ msgstr "" "%s: %s\n" "(Ignoruji)\n" -#: src/su.c:626 +#: src/su.c:609 msgid "No shell\n" -msgstr "桑dn shell\n" +msgstr "鬚獺dn羸 shell\n" -#: src/suauth.c:100 +#: src/suauth.c:105 msgid "Access to su to that account DENIED.\n" -msgstr "Z tohoto 鋈u je p齶stup k su ZAK績篾.\n" +msgstr "Z tohoto 繳tu je p穩stup k su ZAKZN.\n" -#: src/suauth.c:107 +#: src/suauth.c:113 msgid "Password authentication bypassed.\n" -msgstr "Ov檟ov嫕 heslem vynech嫕o.\n" +msgstr "Ovov獺n穩 heslem vynech獺no.\n" -#: src/suauth.c:114 +#: src/suauth.c:122 msgid "Please enter your OWN password as authentication.\n" -msgstr "Pro ov檟en zadejte VA呷 vlastn heslo.\n" +msgstr "Pro oven穩 zadejte VAE vlastn穩 heslo.\n" -#. must be a password file! -#: src/sulogin.c:132 +#: src/sulogin.c:118 msgid "No password file\n" msgstr "Soubor s hesly neexistuje\n" -#. -#. * Fail secure -#. -#: src/sulogin.c:174 +#: src/sulogin.c:160 msgid "No password entry for 'root'\n" -msgstr "V datab嫙i nen polo餒a pro u養vatele 'root'\n" +msgstr "V datab獺zi nen穩 polo鱉ka pro u鱉ivatele 'root'\n" -#: src/sulogin.c:190 +#: src/sulogin.c:176 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" "\n" -"Stiskn鮅e control-d pro norm嫮n spu靖髶 syst幦u,\n" -"(nebo zadejte heslo u養vatele root pro dr鞍u syst幦u):" +"Stisknte control-d pro norm獺ln穩 spu禳tn穩 syst矇mu,\n" +"(nebo zadejte heslo u鱉ivatele root pro 繳dr鱉bu syst矇mu):" -#. make new environment active -#: src/sulogin.c:243 +#: src/sulogin.c:212 msgid "Entering System Maintenance Mode\n" -msgstr "Vstupuji do re養mu dr鞍y syst幦u\n" +msgstr "Vstupuji do re鱉imu 繳dr鱉by syst矇mu\n" -#: src/useradd.c:251 +#: src/useradd.c:234 #, c-format msgid "%s: rebuild the group database\n" -msgstr "%s: vytvo黂e znovu datab嫙i skupin\n" +msgstr "%s: vytvote znovu datab獺zi skupin\n" -#: src/useradd.c:260 +#: src/useradd.c:243 #, c-format msgid "%s: rebuild the shadow group database\n" -msgstr "%s: vytvo黂e znovu datab嫙i st璯ovch skupin\n" +msgstr "%s: vytvote znovu datab獺zi st穩nov羸ch skupin\n" -#: src/useradd.c:295 src/useradd.c:309 src/usermod.c:981 src/usermod.c:995 +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 #, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "%s: chybn numerick argument `%s'\n" +msgstr "%s: chybn羸 numerick羸 argument `%s'\n" -#: src/useradd.c:365 +#: src/useradd.c:349 #, c-format msgid "%s: unknown gid %s\n" -msgstr "%s: gid %s je nezn嫥嬞n" +msgstr "%s: gid %s je nezn獺m矇\n" -#: src/useradd.c:373 src/useradd.c:676 src/useradd.c:1269 src/usermod.c:260 -#: src/usermod.c:1128 +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 #, c-format msgid "%s: unknown group %s\n" -msgstr "%s: skupina %s je nezn嫥塿n" +msgstr "%s: skupina %s je nezn獺m獺\n" -#: src/useradd.c:440 -#, c-format -msgid "group=%s,%u basedir=%s skel=%s\n" -msgstr "skupina=%s,%u z嫜lad. adr.=%s skel=%s\n" - -#: src/useradd.c:444 -#, c-format -msgid "shell=%s " -msgstr "shell=%s " - -#: src/useradd.c:446 -#, c-format -msgid "inactive=%ld expire=%s" -msgstr "vypnut=%ld vypr鈹n=%s" - -#: src/useradd.c:450 +#: src/useradd.c:419 #, c-format msgid "GROUP=%u\n" msgstr "SKUPINA=%u\n" -#: src/useradd.c:451 +#: src/useradd.c:420 #, c-format msgid "HOME=%s\n" -msgstr "DOM磷 ADRES遽=%s\n" +msgstr "DOMC ADRES=%s\n" -#: src/useradd.c:453 +#: src/useradd.c:422 #, c-format msgid "INACTIVE=%ld\n" -msgstr "VYPNUT=%ld\n" +msgstr "VYPNUT=%ld\n" -#: src/useradd.c:454 +#: src/useradd.c:423 #, c-format msgid "EXPIRE=%s\n" -msgstr "VYPR呷N=%s\n" +msgstr "VYPREN=%s\n" -#: src/useradd.c:456 +#: src/useradd.c:425 #, c-format msgid "SHELL=%s\n" -msgstr "INTERPRET P媏KAZ=%s\n" +msgstr "INTERPRET PKAZ躓=%s\n" -#: src/useradd.c:457 +#: src/useradd.c:426 #, c-format msgid "SKEL=%s\n" msgstr "SKELETON=%s\n" -#: src/useradd.c:498 +#: src/useradd.c:462 #, c-format msgid "%s: cannot create new defaults file\n" -msgstr "%s: nemohu vytvo鷡t nov soubor s implicitn璥i hodnotami\n" +msgstr "%s: nemohu vytvoit nov羸 soubor s implicitn穩mi hodnotami\n" -#: src/useradd.c:503 -#, fuzzy, c-format +#: src/useradd.c:467 +#, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: nemohu vytvo鷡t nov soubor s implicitn璥i hodnotami\n" +msgstr "%s: nemohu vytvoit nov羸 soubor s implicitn穩mi hodnotami\n" -#: src/useradd.c:596 src/useradd.c:608 +#: src/useradd.c:552 src/useradd.c:564 #, c-format msgid "%s: rename: %s" -msgstr "%s: p鷫jmenovat: %s" +msgstr "%s: pejmenovat: %s" -#: src/useradd.c:697 src/usermod.c:281 +#: src/useradd.c:657 src/usermod.c:265 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: skupina `%s' je NIS skupinou\n" -#: src/useradd.c:706 src/usermod.c:290 +#: src/useradd.c:666 src/usermod.c:274 #, c-format msgid "%s: too many groups specified (max %d).\n" -msgstr "%s: zad嫕o p齶li mnoho skupin (max %d).\n" +msgstr "%s: zad獺no p穩li禳 mnoho skupin (max %d).\n" -#: src/useradd.c:738 src/usermod.c:322 -#, c-format -msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" -msgstr "Pou養t: %s [-u uid [-o]] [-g skupina [-G skupina,...] \n" +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "Pou鱉it穩: useradd [-u uid [-o]] [-g skupina [-G skupina,...] \n" -#: src/useradd.c:742 -msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" -msgstr "\t\t [-d dom塶 adr.] [-s shell] [-c koment暟] [-m [-k 鈴blona]]\n" +#: src/useradd.c:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" +msgstr "" +" [-d dom獺c穩 adr.] [-s shell] [-c koment獺]\n" +" [-m [-k 禳ablona]]\n" -#: src/useradd.c:745 src/usermod.c:329 -#, fuzzy -msgid "[-f inactive] [-e expire ] " -msgstr " [-f vypnut燱 [-e vypr鈹n燱 " +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" +msgstr " [-f vypnut穩] [-e vypr禳en穩]\n" -#: src/useradd.c:748 -msgid "[-A program] " -msgstr "[-A program] " +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" +msgstr " useradd -D [-g skupina [-b z獺kladn穩 adr.] [-s shell]\n" -#: src/useradd.c:750 -msgid "[-p passwd] name\n" -msgstr "[-p heslo] jm幯o\n" - -#: src/useradd.c:753 -#, c-format -msgid " %s\t-D [-g group] [-b base] [-s shell]\n" -msgstr " %s -D [-g skupina [-b z嫜ladn adr.] [-s shell]\n" - -#: src/useradd.c:756 -#, fuzzy -msgid "\t\t[-f inactive] [-e expire ]\n" -msgstr "\t\t [-f vypnut燱 [-e vypr鈹n燱\n" - -#: src/useradd.c:850 src/usermod.c:480 +#: src/useradd.c:793 src/usermod.c:461 #, c-format msgid "%s: error locking group file\n" -msgstr "%s: chyba p鷡 zamyk嫕 souboru se skupinami\n" +msgstr "%s: chyba pi zamyk獺n穩 souboru se skupinami\n" -#: src/useradd.c:855 src/usermod.c:486 +#: src/useradd.c:798 src/usermod.c:467 #, c-format msgid "%s: error opening group file\n" -msgstr "%s: chyba p鷡 otev甏嫕 souboru se skupinami\n" +msgstr "%s: chyba pi otev穩r獺n穩 souboru se skupinami\n" -#: src/useradd.c:862 src/usermod.c:597 +#: src/useradd.c:805 src/usermod.c:578 #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s: chyba p鷡 zamyk嫕 souboru se st璯ovmi hesly\n" +msgstr "%s: chyba pi zamyk獺n穩 souboru se st穩nov羸mi hesly\n" -#: src/useradd.c:867 src/usermod.c:603 +#: src/useradd.c:810 src/usermod.c:584 #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s: chyba p鷡 otev甏嫕 souboru se st璯ovmi hesly\n" +msgstr "%s: chyba pi otev穩r獺n穩 souboru se st穩nov羸mi hesly\n" -#: src/useradd.c:1039 +#: src/useradd.c:982 #, c-format msgid "%s: uid %u is not unique\n" -msgstr "%s uid %u nen jedine鋝嬞n" +msgstr "%s uid %u nen穩 jedinen矇\n" -#: src/useradd.c:1069 +#: src/useradd.c:1012 #, c-format msgid "%s: can't get unique uid\n" -msgstr "%s: nemohu z疄kat jedine鋝 uid\n" +msgstr "%s: nemohu z穩skat jedinen矇 uid\n" -#: src/useradd.c:1174 src/useradd.c:1325 src/usermod.c:1075 src/usermod.c:1086 -#: src/usermod.c:1096 src/usermod.c:1143 src/usermod.c:1187 -#, c-format -msgid "%s: invalid field `%s'\n" -msgstr "%s: chybn polo餒a `%s'\n" - -#: src/useradd.c:1189 +#: src/useradd.c:1049 #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s: chybn z嫜ladn adres暟 `%s'\n" +msgstr "%s: chybn羸 z獺kladn穩 adres獺 `%s'\n" -#: src/useradd.c:1199 +#: src/useradd.c:1059 #, c-format msgid "%s: invalid comment `%s'\n" -msgstr "%s: chybn koment暟 `%s'\n" +msgstr "%s: chybn羸 koment獺 `%s'\n" -#: src/useradd.c:1210 +#: src/useradd.c:1070 #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s: chybn dom塶 adres暟 `%s'\n" +msgstr "%s: chybn羸 dom獺c穩 adres獺 `%s'\n" -#: src/useradd.c:1229 src/usermod.c:1110 +#: src/useradd.c:1089 src/usermod.c:858 #, c-format msgid "%s: invalid date `%s'\n" -msgstr "%s: chybn datum `%s'\n" +msgstr "%s: chybn矇 datum `%s'\n" -#: src/useradd.c:1242 +#: src/useradd.c:1102 #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "%s: p鷫p璯a -e vy靠duje st璯ov hesla\n" +msgstr "%s: pep穩na -e vy鱉aduje st穩nov獺 hesla\n" -#: src/useradd.c:1258 +#: src/useradd.c:1118 #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "%s: p鷫p璯a -f vy靠duje st璯ov hesla\n" +msgstr "%s: pep穩na -f vy鱉aduje st穩nov獺 hesla\n" -#: src/useradd.c:1336 +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: chybn獺 polo鱉ka `%s'\n" + +#: src/useradd.c:1196 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s: chybn shell `%s'\n" +msgstr "%s: chybn羸 shell `%s'\n" -#: src/useradd.c:1377 +#: src/useradd.c:1237 #, c-format msgid "%s: invalid user name '%s'\n" -msgstr "%s: chybn u養vatelsk jm幯o `%s'\n" +msgstr "%s: chybn矇 u鱉ivatelsk矇 jm矇no `%s'\n" -#: src/useradd.c:1413 src/userdel.c:298 src/usermod.c:1255 +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 #, c-format msgid "%s: cannot rewrite password file\n" -msgstr "%s: soubor s hesly nelze p鷫psat\n" +msgstr "%s: soubor s hesly nelze pepsat\n" -#: src/useradd.c:1420 src/userdel.c:303 src/usermod.c:1262 +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "%s: soubor se st璯ovmi hesly nelze p鷫psat\n" +msgstr "%s: soubor se st穩nov羸mi hesly nelze pepsat\n" -#: src/useradd.c:1461 src/userdel.c:367 src/usermod.c:1296 +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: soubor s hesly nelze zamknout\n" -#: src/useradd.c:1466 src/userdel.c:372 src/usermod.c:1301 +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 #, c-format msgid "%s: unable to open password file\n" -msgstr "%s: soubor s hesly nelze otev齶t\n" +msgstr "%s: soubor s hesly nelze otev穩t\n" -#: src/useradd.c:1474 src/userdel.c:379 src/usermod.c:1308 +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "%s: soubor se st璯ovmi hesly nelze zamknout\n" +msgstr "%s: soubor se st穩nov羸mi hesly nelze zamknout\n" -#: src/useradd.c:1481 src/userdel.c:385 src/usermod.c:1314 +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "%s: soubor se st璯ovmi hesly nelze otev齶t\n" +msgstr "%s: soubor se st穩nov羸mi hesly nelze otev穩t\n" -#: src/useradd.c:1580 src/usermod.c:1405 -#, c-format -msgid "%s: error adding authentication method\n" -msgstr "%s: chyba p鷡 vytv暟en ov檟ovac metody\n" - -#: src/useradd.c:1604 +#: src/useradd.c:1435 #, c-format msgid "%s: error adding new password entry\n" -msgstr "%s: chyba p鷡 vytv暟en nov polo餒y v souboru s hesly\n" +msgstr "%s: chyba pi vytv獺en穩 nov矇 polo鱉ky v souboru s hesly\n" -#: src/useradd.c:1618 +#: src/useradd.c:1449 #, c-format msgid "%s: error updating password dbm entry\n" -msgstr "%s: chyba p鷡 aktualizaci polo餒y dbm datab嫙e hesel\n" +msgstr "%s: chyba pi aktualizaci polo鱉ky dbm datab獺ze hesel\n" -#: src/useradd.c:1634 src/usermod.c:1471 +#: src/useradd.c:1465 src/usermod.c:1151 #, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "%s: chyba p鷡 vytv暟en nov polo餒y v souboru se st璯ovmi hesly\n" +msgstr "%s: chyba pi vytv獺en穩 nov矇 polo鱉ky v souboru se st穩nov羸mi hesly\n" -#: src/useradd.c:1650 src/usermod.c:1488 +#: src/useradd.c:1481 src/usermod.c:1168 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: chyba p鷡 aktualizaci polo餒y dbm datab嫙e st璯ovch hesel\n" +msgstr "%s: chyba pi aktualizaci polo鱉ky dbm datab獺ze st穩nov羸ch hesel\n" -#: src/useradd.c:1682 +#: src/useradd.c:1513 #, c-format msgid "%s: cannot create directory %s\n" -msgstr "%s: adres暟 %s nelze vytvo鷡t\n" +msgstr "%s: adres獺 %s nelze vytvoit\n" -#: src/useradd.c:1806 src/usermod.c:1233 +#: src/useradd.c:1634 src/usermod.c:981 #, c-format msgid "%s: user %s exists\n" -msgstr "%s: u養vatel %s ji existuje\n" +msgstr "%s: u鱉ivatel %s ji鱉 existuje\n" -#: src/useradd.c:1821 +#: src/useradd.c:1649 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1854 +#: src/useradd.c:1687 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" -msgstr "%s: varov嫕: CREATE_HOME nen podporov嫕o, pou養jte p鷫p璯a -m\n" +msgstr "%s: varov獺n穩: CREATE_HOME nen穩 podporov獺no, pou鱉ijte pep穩na -m\n" -#: src/userdel.c:129 +#: src/userdel.c:124 #, c-format -msgid "usage: %s [-r] name\n" -msgstr "Pou養t: %s [-r] jm幯o\n" +msgid "Usage: %s [-r] name\n" +msgstr "Pou鱉it穩: %s [-r] jm矇no\n" -#: src/userdel.c:181 src/userdel.c:267 +#: src/userdel.c:176 src/userdel.c:262 #, c-format msgid "%s: error updating group entry\n" -msgstr "%s: polo餒u souboru se skupinami nelze aktualizovat\n" +msgstr "%s: polo鱉ku souboru se skupinami nelze aktualizovat\n" -#: src/userdel.c:191 src/userdel.c:276 +#: src/userdel.c:186 src/userdel.c:271 #, c-format msgid "%s: cannot update dbm group entry\n" -msgstr "%s: polo餒u dbm datab嫙e skupin nelze aktualizovat\n" +msgstr "%s: polo鱉ku dbm datab獺ze skupin nelze aktualizovat\n" -#: src/userdel.c:219 +#: src/userdel.c:214 #, c-format msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: polo餒u dbm datab嫙e skupin nelze odstranit\n" +msgstr "%s: polo鱉ku dbm datab獺ze skupin nelze odstranit\n" -#: src/userdel.c:308 +#: src/userdel.c:379 #, c-format -msgid "%s: cannot rewrite TCFS key file\n" -msgstr "%s: soubor s TCFS kl膻i nelze p鷫psat\n" +msgid "%s: cannot open group file\n" +msgstr "%s: soubor se skupinami nelze otev穩t\n" -#: src/userdel.c:392 +#: src/userdel.c:390 #, c-format -msgid "%s: cannot lock TCFS key file\n" -msgstr "%s: soubor s TCFS kl膻i nelze zamknout\n" - -#: src/userdel.c:397 -#, c-format -msgid "%s: cannot open TCFS key file\n" -msgstr "%s: soubor s TCFS kl膻i nelze otev齶t\n" +msgid "%s: cannot open shadow group file\n" +msgstr "%s: soubor se st穩nov羸mi skupinami nelze otev穩t\n" #: src/userdel.c:408 #, c-format -msgid "%s: cannot open group file\n" -msgstr "%s: soubor se skupinami nelze otev齶t\n" - -#: src/userdel.c:419 -#, c-format -msgid "%s: cannot open shadow group file\n" -msgstr "%s: soubor se st璯ovmi skupinami nelze otev齶t\n" - -#: src/userdel.c:451 src/userdel.c:468 -#, c-format -msgid "%s: error deleting authentication\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 ov檟ovac metody\n" - -#: src/userdel.c:479 -#, c-format msgid "%s: error deleting password entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y ze souboru s hesly\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru s hesly\n" -#: src/userdel.c:485 +#: src/userdel.c:412 #, c-format msgid "%s: error deleting shadow password entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y ze souboru se st璯ovmi hesly\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru se st穩nov羸mi hesly\n" -#: src/userdel.c:496 -#, c-format -msgid "%s: error deleting TCFS entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 TCFS polo餒y\n" - -#: src/userdel.c:510 +#: src/userdel.c:421 #, c-format msgid "%s: error deleting password dbm entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y z dbm datab嫙e hesel\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky z dbm datab獺ze hesel\n" -#: src/userdel.c:533 +#: src/userdel.c:440 #, c-format msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y z dbm datab嫙e st璯ovch hesel\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky z dbm datab獺ze st穩nov羸ch hesel\n" -#: src/userdel.c:569 +#: src/userdel.c:484 #, c-format msgid "%s: user %s is currently logged in\n" -msgstr "%s: u養vatel %s je pr嫛 p鷡hl廜en\n" +msgstr "%s: u鱉ivatel %s je pr獺v pihl獺禳en\n" -#: src/userdel.c:659 +#: src/userdel.c:594 #, c-format msgid "%s: warning: %s not owned by %s, not removing\n" -msgstr "%s: varov嫕: vlastn璭em %s nen %s, nema骷 jej\n" +msgstr "%s: varov獺n穩: vlastn穩kem %s nen穩 %s, nema鱉u jej\n" -#: src/userdel.c:666 +#: src/userdel.c:600 #, c-format msgid "%s: warning: can't remove " -msgstr "%s: varov嫕: nemohu smazat " +msgstr "%s: varov獺n穩: nemohu smazat " -#: src/userdel.c:758 src/usermod.c:1023 +#: src/userdel.c:703 src/usermod.c:783 #, c-format msgid "%s: user %s does not exist\n" -msgstr "%s: u養vatel %s neexistuje\n" +msgstr "%s: u鱉ivatel %s neexistuje\n" -#: src/userdel.c:770 src/usermod.c:1039 +#: src/userdel.c:718 src/usermod.c:799 #, c-format msgid "%s: user %s is a NIS user\n" -msgstr "%s: u養vatel %s je NIS u養vatelem\n" +msgstr "%s: u鱉ivatel %s je NIS u鱉ivatelem\n" -#: src/userdel.c:799 +#: src/userdel.c:756 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s: vlastn璭em %s nen %s, nema骷 jej\n" +msgstr "%s: vlastn穩kem %s nen穩 %s, nema鱉u jej\n" -#: src/userdel.c:818 +#: src/userdel.c:779 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" -msgstr "%s: adres暟 %s nebudu mazat (je to dom塶 adres暟 u養vatele %s)\n" +msgstr "%s: adres獺 %s nebudu mazat (je to dom獺c穩 adres獺 u鱉ivatele %s)\n" -#: src/userdel.c:830 +#: src/userdel.c:793 #, c-format msgid "%s: error removing directory %s\n" -msgstr "%s: chyba p鷡 maz嫕 adres暟e %s\n" +msgstr "%s: chyba pi maz獺n穩 adres獺e %s\n" -#: src/usermod.c:326 +#: src/usermod.c:306 +#, c-format +msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "Pou鱉it穩: %s [-u uid [-o]] [-g skupina [-G skupina,...] \n" + +#: src/usermod.c:310 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" -msgstr "\t\t[-d dom塶 adr. [-m]] [-s shell] [-c koment暟] [-l nov jm幯o]\n" +msgstr "\t\t[-d dom獺c穩 adr. [-m]] [-s shell] [-c koment獺] [-l nov矇 jm矇no]\n" -#: src/usermod.c:332 -msgid "[-A {DEFAULT|program},... ] " -msgstr "[-A {DEFAULT|program},...] " +#: src/usermod.c:313 +#, fuzzy +msgid "[-f inactive] [-e expire] " +msgstr "[-f vypnut穩] [-e vypr禳en穩] " -#: src/usermod.c:334 +#: src/usermod.c:315 msgid "[-p passwd] [-L|-U] name\n" -msgstr "[-p heslo] [-L|-U] jm幯o\n" +msgstr "[-p heslo] [-L|-U] jm矇no\n" -#: src/usermod.c:514 +#: src/usermod.c:495 #, c-format msgid "%s: out of memory in update_group\n" -msgstr "%s nedostatek pam鮅i v update_group\n" +msgstr "%s nedostatek pamti v update_group\n" -#: src/usermod.c:641 +#: src/usermod.c:622 #, c-format msgid "%s: out of memory in update_gshadow\n" -msgstr "%s: nedostatek pam鮅i v update_gshadow\n" +msgstr "%s: nedostatek pamti v update_gshadow\n" -#: src/usermod.c:1210 +#: src/usermod.c:958 #, c-format msgid "%s: no flags given\n" -msgstr "%s: 擔dn p鷫p璯a鋀\n" +msgstr "%s: 鱉獺dn矇 pep穩nae\n" -#: src/usermod.c:1217 +#: src/usermod.c:965 #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s: p鷫p璯a鋀 -e a -f vy靠duj st璯ov hesla\n" +msgstr "%s: pep穩nae -e a -f vy鱉aduj穩 st穩nov獺 hesla\n" -#: src/usermod.c:1239 +#: src/usermod.c:987 #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s uid %lu nen jedine鋝嬞n" +msgstr "%s uid %lu nen穩 jedinen矇\n" -#: src/usermod.c:1392 -#, c-format -msgid "%s: error deleting authentication method\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 ov檟ovac metody\n" - -#: src/usermod.c:1418 -#, c-format -msgid "%s: error changing authentication method\n" -msgstr "%s: chyba p鷡 zm髶 ov檟ovac metody\n" - -#: src/usermod.c:1436 +#: src/usermod.c:1116 #, c-format msgid "%s: error changing password entry\n" -msgstr "%s: chyba p鷡 zm髶 polo餒y v souboru s hesly\n" +msgstr "%s: chyba pi zmn polo鱉ky v souboru s hesly\n" -#: src/usermod.c:1442 +#: src/usermod.c:1122 #, c-format msgid "%s: error removing password entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y ze souboru s hesly\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru s hesly\n" -#: src/usermod.c:1451 +#: src/usermod.c:1131 #, c-format msgid "%s: error adding password dbm entry\n" -msgstr "%s: chyba p鷡 p鷡d嫛嫕 polo餒y do dbm datab嫙e hesel\n" +msgstr "%s: chyba pi pid獺v獺n穩 polo鱉ky do dbm datab獺ze hesel\n" -#: src/usermod.c:1459 +#: src/usermod.c:1139 #, c-format msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y z dbm datab嫙e hesel\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky z dbm datab獺ze hesel\n" -#: src/usermod.c:1478 +#: src/usermod.c:1158 #, c-format msgid "%s: error removing shadow password entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y ze souboru se st璯ovmi hesly\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru se st穩nov羸mi hesly\n" -#: src/usermod.c:1495 +#: src/usermod.c:1175 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: chyba p鷡 odstra犦v嫕 polo餒y z dbm datab嫙e st璯ovch hesel\n" +msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky z dbm datab獺ze st穩nov羸ch hesel\n" -#: src/usermod.c:1524 +#: src/usermod.c:1204 #, c-format msgid "%s: directory %s exists\n" -msgstr "%s: adres暟 %s ji existuje\n" +msgstr "%s: adres獺 %s ji鱉 existuje\n" -#: src/usermod.c:1533 +#: src/usermod.c:1213 #, c-format msgid "%s: can't create %s\n" -msgstr "%s: %s nelze vytvo鷡t\n" +msgstr "%s: %s nelze vytvoit\n" -#: src/usermod.c:1539 +#: src/usermod.c:1219 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s: vol嫕 chown pro %s selhalo\n" +msgstr "%s: vol獺n穩 chown pro %s selhalo\n" -#: src/usermod.c:1556 +#: src/usermod.c:1236 #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "%s: adres暟 %s nelze na %s p鷫jmenovat\n" +msgstr "%s: adres獺 %s nelze na %s pejmenovat\n" -#. better leave it alone -#: src/usermod.c:1653 +#: src/usermod.c:1333 #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "%s: varov嫕: vlastn璭em %s nen %s\n" +msgstr "%s: varov獺n穩: vlastn穩kem %s nen穩 %s\n" -#: src/usermod.c:1659 +#: src/usermod.c:1339 msgid "failed to change mailbox owner" -msgstr "chyba p鷡 zm髶 vlastn璭a schr嫕ky" +msgstr "chyba pi zmn vlastn穩ka schr獺nky" -#: src/usermod.c:1667 +#: src/usermod.c:1347 msgid "failed to rename mailbox" -msgstr "chyba p鷡 p鷫jmenov嫛嫕 schr嫕ky" +msgstr "chyba pi pejmenov獺v獺n穩 schr獺nky" -#: src/vipw.c:104 +#: src/vipw.c:105 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" "\n" -"%s: %s je beze zm髶y\n" +"%s: %s je beze zmny\n" -#: src/vipw.c:132 +#: src/vipw.c:133 msgid "Couldn't lock file" msgstr "Soubor nelze zamknout" -#: src/vipw.c:141 +#: src/vipw.c:142 msgid "Couldn't make backup" -msgstr "Z嫮ohov嫕 nelze prov廥t." +msgstr "Z獺lohov獺n穩 nelze prov矇st." -#: src/vipw.c:206 +#: src/vipw.c:200 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" -msgstr "%s: %s nelze obnovit: %s (zm髶y jsou v %s)\n" +msgstr "%s: %s nelze obnovit: %s (zmny jsou v %s)\n" -#: src/vipw.c:244 +#: src/vipw.c:238 msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" msgstr "" -"Pou養t:\n" +"Pou鱉it穩:\n" "`vipw' edituje /etc/passwd `vipw -s' edituje /etc/shadow\n" "`vigr' edituje /etc/group `vigr -s' edituje /etc/gshadow\n" +#, fuzzy +#~ msgid "Can't create mail spool for user %s.\n" +#~ msgstr "%s: polo鱉ku pro u鱉ivatele %s nelze aktualizovat\n" + +#~ msgid "User %s has a TCFS key, his old password is required.\n" +#~ msgstr "U鱉ivatel %s m獺 TCFS kl穩, je teba jeho star矇 heslo.\n" + +#~ msgid "You can use -t option to force the change.\n" +#~ msgstr "M轡鱉ete pou鱉穩t pep穩na -t pro vynucen穩 zmny.\n" + +#~ msgid "Warning: user %s has a TCFS key.\n" +#~ msgstr "Varov獺n穩: u鱉ivatele %s m獺 TCFS kl穩.\n" + +#~ msgid "Cannot lock the TCFS key database; try again later\n" +#~ msgstr "Nelze zamknout datab獺zi TCFS kl穩轡. Zkuste to pozdji.\n" + +#~ msgid "Cannot open the TCFS key database.\n" +#~ msgstr "Nelze otev穩t datab獺zi TCFS kl穩轡.\n" + +#~ msgid "Error updating the TCFS key database.\n" +#~ msgstr "Chyba pi aktualizaci datab獺ze TCFS kl穩轡.\n" + +#~ msgid "Cannot commit TCFS changes.\n" +#~ msgstr "Nelze zmnit TCFS datab獺zi.\n" + +#~ msgid "%s: cannot rewrite TCFS key file\n" +#~ msgstr "%s: soubor s TCFS kl穩i nelze pepsat\n" + +#~ msgid "%s: cannot lock TCFS key file\n" +#~ msgstr "%s: soubor s TCFS kl穩i nelze zamknout\n" + +#~ msgid "%s: cannot open TCFS key file\n" +#~ msgstr "%s: soubor s TCFS kl穩i nelze otev穩t\n" + +#~ msgid "%s: error deleting TCFS entry\n" +#~ msgstr "%s: chyba pi odstraov獺n穩 TCFS polo鱉ky\n" + +#~ msgid " [-f inactive] [-e expire]" +#~ msgstr " [-f vypnut穩] [-e vypr禳en穩]" + +#~ msgid "%s: error deleting authentication\n" +#~ msgstr "%s: chyba pi odstraov獺n穩 ovovac穩 metody\n" + +#, fuzzy +#~ msgid "[-A {DEFAULT|program},...] " +#~ msgstr "[-A {DEFAULT|program},...] " + +#~ msgid "%s: error deleting authentication method\n" +#~ msgstr "%s: chyba pi odstraov獺n穩 ovovac穩 metody\n" + +#~ msgid "%s: error adding authentication method\n" +#~ msgstr "%s: chyba pi vytv獺en穩 ovovac穩 metody\n" + +#~ msgid "%s: error changing authentication method\n" +#~ msgstr "%s: chyba pi zmn ovovac穩 metody\n" + +#~ msgid "[-A program] " +#~ msgstr "[-A program] " + +#~ msgid "[-p passwd] name\n" +#~ msgstr "[-p heslo] jm矇no\n" + +#~ msgid "error - lookup '%s' failed\n" +#~ msgstr "chyba - hled獺n穩 '%s' bylo ne繳sp禳n矇\n" + +#~ msgid "%s not found\n" +#~ msgstr "%s nenalezeno\n" + +#~ msgid "%s: not configured for shadow group support.\n" +#~ msgstr "%s: podpora pro st穩nov獺 hesla skupin nen穩 nakonfigurov獺na\n" + +#~ msgid "%s: Shadow passwords are not configured.\n" +#~ msgstr "%s: st穩nov獺 hesla nejsou nakonfigurov獺na\n" + +#, fuzzy +#~ msgid "Usage: %s [-l] user\n" +#~ msgstr "Pou鱉it穩: %s [-e]\n" + +#~ msgid "Executing shell %s\n" +#~ msgstr "Spou禳t穩m shell %s\n" + +#~ msgid "Dialup Password: " +#~ msgstr "Heslo pro p穩stup vyt獺enou linkou:" + +#~ msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" +#~ msgstr "" +#~ "Pou鱉it穩: %s [-l] [-m min_dn轡] [-M max_dn轡] [-d posledn穩 den] u鱉ivatel\n" + +#~ msgid "Usage: %s [-(a|d)] shell\n" +#~ msgstr "Pou鱉it穩: %s [-(ald)] shell\n" + +#~ msgid "Shell password: " +#~ msgstr "Heslo shellu: " + +#~ msgid "re-enter Shell password: " +#~ msgstr "zadejte znovu heslo shellu: " + +#~ msgid "%s: Passwords do not match, try again.\n" +#~ msgstr "%s: hesla se li禳穩, zkuste to znovu.\n" + +#~ msgid "%s: can't create %s" +#~ msgstr "%s: %s nelze vytvoit" + +#~ msgid "%s: can't open %s" +#~ msgstr "%s: %s nelze otev穩t" + +#~ msgid "%s: Shell %s not found.\n" +#~ msgstr "%s: Shell %s nebyl nalezen.\n" + +#~ msgid "group=%s,%u basedir=%s skel=%s\n" +#~ msgstr "skupina=%s,%u z獺klad. adr.=%s skel=%s\n" + +#~ msgid "shell=%s " +#~ msgstr "shell=%s " + +#~ msgid "inactive=%ld expire=%s" +#~ msgstr "vypnut穩=%ld vypr禳en穩=%s" + +#, fuzzy +#~ msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +#~ msgstr "Pou鱉it穩: %s [-u uid [-o]] [-g skupina [-G skupina,...] \n" + #~ msgid "%s: gid %ld is not unique\n" -#~ msgstr "%s: gid %ld nen jedine鋝嬞n" +#~ msgstr "%s: gid %ld nen穩 jedinen矇\n" #, fuzzy #~ msgid "unknown gid: %u\n" -#~ msgstr "gid %d je nezn嫥嬞n" +#~ msgstr "gid %d je nezn獺m矇\n" #~ msgid "%s: uid %d is not unique\n" -#~ msgstr "%s: uid %d nen jedine鋝嬞n" +#~ msgstr "%s: uid %d nen穩 jedinen矇\n" #~ msgid "user %s: bad UID (%d)\n" -#~ msgstr "u養vatel %s: chybn UID (%d)\n" +#~ msgstr "u鱉ivatel %s: chybn矇 UID (%d)\n" #~ msgid "%s: no aging information present\n" -#~ msgstr "%s: chyb informace\n" +#~ msgstr "%s: chyb穩 informace\n" #~ msgid "group %s: bad GID (%d)\n" -#~ msgstr "skupina %s: chybn GID (%d)\n" +#~ msgstr "skupina %s: chybn矇 GID (%d)\n" #~ msgid "%s: permission denied (shell).\n" -#~ msgstr "%s: p齶stup odm癃nut (shell)\n" +#~ msgstr "%s: p穩stup odm穩tnut (shell)\n" diff --git a/po/de.gmo b/po/de.gmo index 10d46071..9621996d 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index d750541c..79d24d64 100644 --- a/po/de.po +++ b/po/de.po @@ -6,195 +6,169 @@ msgid "" msgstr "" "Project-Id-Version: shadow 19990709\n" -"POT-Creation-Date: 2002-03-12 12:16+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" "PO-Revision-Date: 2002-03-11 12:02-0100\n" "Last-Translator: Frank Schmid \n" "Language-Team: Frank Schmid \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libmisc/addgrps.c:60 +#: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Warnung: Gruppe %s ist unbekannt\n" -#: libmisc/addgrps.c:71 +#: libmisc/addgrps.c:68 msgid "Warning: too many groups\n" msgstr "Warnung: zu viele Gruppen\n" -#: libmisc/age.c:77 +#: libmisc/age.c:72 msgid "Your password has expired." msgstr "Ihr Kennwort ist abgelaufen." -#: libmisc/age.c:80 +#: libmisc/age.c:75 msgid "Your password is inactive." msgstr "Ihr Kennwort ist inaktiv." -#: libmisc/age.c:83 +#: libmisc/age.c:78 msgid "Your login has expired." msgstr "Ihr Account ist abgelaufen." -#: libmisc/age.c:96 +#: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " Verst鄚digen Sie den Systemadministrator.\n" +msgstr " Verst瓣ndigen Sie den Systemadministrator.\n" -#: libmisc/age.c:99 +#: libmisc/age.c:93 msgid " Choose a new password.\n" -msgstr " W鄣len Sie ein neues Kennwort.\n" +msgstr " W瓣hlen Sie ein neues Kennwort.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:168 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "Ihr Kennwort l酳ft in %ld Tagen ab.\n" +msgstr "Ihr Kennwort l瓣uft in %ld Tagen ab.\n" -#: libmisc/age.c:178 +#: libmisc/age.c:172 msgid "Your password will expire tomorrow.\n" -msgstr "Ihr Kennwort l酳ft morgen ab.\n" +msgstr "Ihr Kennwort l瓣uft morgen ab.\n" -#: libmisc/age.c:180 +#: libmisc/age.c:174 msgid "Your password will expire today.\n" -msgstr "Ihr Kennwort l酳ft heute ab.\n" +msgstr "Ihr Kennwort l瓣uft heute ab.\n" -#: libmisc/chowntty.c:113 +#: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" -msgstr "tty %s kann nicht ge鄚dert werden" +msgstr "tty %s kann nicht ge瓣ndert werden" -#: libmisc/env.c:160 +#: libmisc/env.c:155 msgid "Environment overflow\n" -msgstr "Umgebungsberlauf\n" +msgstr "Umgebungs羹berlauf\n" -#: libmisc/env.c:200 +#: libmisc/env.c:195 #, c-format msgid "You may not change $%s\n" -msgstr "Sie k霵nen $%s nicht 鄚dern\n" +msgstr "Sie k繹nnen $%s nicht 瓣ndern\n" -#: libmisc/failure.c:238 +#: libmisc/failure.c:230 #, c-format msgid "%d %s since last login. Last was %s on %s.\n" msgstr "%d %s seit letzter Verbindung. Die letzte war am %s auf %s.\n" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failures" msgstr "Fehlanmeldungen" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failure" msgstr "Fehlanmeldung" -#: libmisc/limits.c:397 +#: libmisc/limits.c:396 msgid "Too many logins.\n" msgstr "Zu viele Verbindungen.\n" -#: libmisc/login_desrpc.c:63 +#: libmisc/login_desrpc.c:59 #, c-format msgid "Password does not decrypt secret key for %s.\n" -msgstr "Kennwort entschlsselt den Schlssel fr %s nicht.\n" +msgstr "Kennwort entschl羹sselt den Schl羹ssel f羹r %s nicht.\n" -#: libmisc/login_desrpc.c:69 +#: libmisc/login_desrpc.c:66 #, c-format msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Kann den Schlssel von %s nicht setzen: l酳ft der keyserv-Dienst ?\n" +msgstr "Kann den Schl羹ssel von %s nicht setzen: l瓣uft der keyserv-Dienst ?\n" -#: libmisc/mail.c:62 libmisc/mail.c:77 +#: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Sie haben neue Post." -#: libmisc/mail.c:73 +#: libmisc/mail.c:72 msgid "No mail." msgstr "Keine Post vorhanden." -#: libmisc/mail.c:75 +#: libmisc/mail.c:74 msgid "You have mail." msgstr "Sie haben Post." -#: libmisc/obscure.c:281 src/passwd.c:244 +#: libmisc/obscure.c:271 src/passwd.c:183 #, c-format msgid "Bad password: %s. " msgstr "Schlechtes Kennwort: %s. " -#: libmisc/pam_pass.c:42 +#: libmisc/pam_pass.c:38 #, c-format msgid "passwd: pam_start() failed, error %d\n" msgstr "passwd: pam_start() fehlgeschlagen, Fehler %d\n" -#: libmisc/pam_pass.c:49 +#: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/setupenv.c:211 +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" +msgstr "" + +#: libmisc/setupenv.c:208 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Kann nicht in Verzeichnis \"%s\" wechseln\n" -#: libmisc/setupenv.c:219 +#: libmisc/setupenv.c:216 msgid "No directory, logging in with HOME=/" msgstr "Kein Verzeichnis, Anmeldung mit HOME=/" -#: libmisc/shell.c:78 -#, c-format -msgid "Executing shell %s\n" -msgstr "Fhre shell %s aus\n" - -#. -#. * Obviously something is really wrong - I can't figure out -#. * how to execute this stupid shell, so I might as well give -#. * up in disgust ... -#. -#: libmisc/shell.c:122 +#: libmisc/shell.c:119 #, c-format msgid "Cannot execute %s" -msgstr "Kann %s nicht ausfhren" +msgstr "Kann %s nicht ausf羹hren" -#: libmisc/sub.c:61 +#: libmisc/sub.c:55 #, c-format msgid "Invalid root directory \"%s\"\n" -msgstr "Ungltiges Basis-Verzeichnis \"%s\"\n" +msgstr "Ung羹ltiges Basis-Verzeichnis \"%s\"\n" -#: libmisc/sub.c:73 +#: libmisc/sub.c:67 #, c-format msgid "Can't change root directory to \"%s\"\n" -msgstr "Kann Basisverzeichnis nicht nach \"%s\" 鄚dern\n" +msgstr "Kann Basisverzeichnis nicht nach \"%s\" 瓣ndern\n" -#: libmisc/xmalloc.c:28 +#: libmisc/xmalloc.c:24 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) fehlgeschlagen\n" -#: lib/dialchk.c:71 -msgid "Dialup Password: " -msgstr "Anwahl-Kennwort: " - -#: lib/getdef.c:276 +#: lib/getdef.c:274 msgid "Could not allocate space for config info.\n" -msgstr "Kann keinen Speicherplatz fr Konfigurationsinformation reservieren.\n" +msgstr "Kann keinen Speicherplatz f羹r Konfigurationsinformation reservieren.\n" -#. -#. * Item was never found. -#. -#: lib/getdef.c:330 +#: lib/getdef.c:328 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -"Konfigurationsfehler - Element '%s' unbekannt (Administrator verst鄚digen)\n" +"Konfigurationsfehler - Element '%s' unbekannt (Administrator verst瓣ndigen)\n" -#: lib/getdef.c:417 -#, c-format -msgid "error - lookup '%s' failed\n" -msgstr "Fehler - Kann '%s' nicht finden\n" - -#: lib/getdef.c:425 -#, c-format -msgid "%s not found\n" -msgstr "%s nicht gefunden\n" - -#. -#. * get the password from her, and set the salt for -#. * the decryption from the group file. -#. -#: lib/pwauth.c:54 src/newgrp.c:348 +#: lib/pwauth.c:54 src/newgrp.c:343 msgid "Password: " msgstr "Kennwort: " @@ -203,7 +177,7 @@ msgstr "Kennwort: " msgid "%s's Password: " msgstr "Kennwort von %s: " -#: lib/pwauth.c:270 +#: lib/pwauth.c:247 msgid "(Echo on) " msgstr "(Echo an) " @@ -212,204 +186,167 @@ msgstr "(Echo an) " msgid "Unknown error %d" msgstr "Unbekannter Fehler %d" -#: src/chage.c:116 -#, c-format +#: src/chage.c:118 msgid "" -"Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" -"\t[-I inactive] [-E expire] [-d last_day] user\n" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -"Syntax: %s [-l] [-m min_tage] [-M max_tage] [-W warnung]\n" -"\t[-I inaktiv] [-E ablauf] [-d letzter_tag] Benutzer\n" +"Syntax: chage [-l] [-m min_tage] [-M max_tage] [-W warnung]\n" +" [-I inaktiv] [-E ablauf] [-d letzter_tag] Benutzer\n" -#: src/chage.c:122 -#, c-format -msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" -msgstr "" -"Syntax: %s [-l] [-m min_tage] [-M max_tage] [-d letzter_tag] Benutzer\n" - -#: src/chage.c:157 +#: src/chage.c:152 #, fuzzy msgid "" "Enter the new value, or press ENTER for the default\n" "\n" msgstr "" -"Geben Sie einen neuen Wert an oder ENTER fr den Standardwert\n" +"Geben Sie einen neuen Wert an oder ENTER f羹r den Standardwert\n" "\n" -#: src/chage.c:160 +#: src/chage.c:155 msgid "Minimum Password Age" msgstr "Minimales Kennwortalter" -#: src/chage.c:166 +#: src/chage.c:161 msgid "Maximum Password Age" msgstr "Maximales Kennwortalter" -#: src/chage.c:174 +#: src/chage.c:169 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "Letzte Kennwort鄚derung (JJJJ-MM-TT)" +msgstr "Letzte Kennwort瓣nderung (JJJJ-MM-TT)" + +#: src/chage.c:177 +msgid "Password Expiration Warning" +msgstr "Warnung falls Kennwort abl瓣uft" #: src/chage.c:183 -msgid "Password Expiration Warning" -msgstr "Warnung falls Kennwort abl酳ft" - -#: src/chage.c:189 msgid "Password Inactive" msgstr "Kennwort inaktiv" -#: src/chage.c:197 +#: src/chage.c:191 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Ablaufdatum des Accounts (JJJJ-MM-TT)" -#. -#. * Start with the easy numbers - the number of days before the -#. * password can be changed, the number of days after which the -#. * password must be chaged, the number of days before the password -#. * expires that the user is told, and the number of days after the -#. * password expires that the account becomes unusable. -#. -#: src/chage.c:248 +#: src/chage.c:241 #, c-format msgid "Minimum:\t%ld\n" msgstr "Minimum :\t%ld\n" -#: src/chage.c:249 +#: src/chage.c:242 #, c-format msgid "Maximum:\t%ld\n" msgstr "Maximum :\t%ld\n" -#: src/chage.c:251 +#: src/chage.c:243 #, c-format msgid "Warning:\t%ld\n" msgstr "Warnung :\t%ld\n" -#: src/chage.c:252 +#: src/chage.c:244 #, c-format msgid "Inactive:\t%ld\n" msgstr "Inaktiv :\t%ld\n" -#. -#. * The "last change" date is either "Never" or the date the password -#. * was last modified. The date is the number of days since 1/1/1970. -#. -#: src/chage.c:260 +#: src/chage.c:251 msgid "Last Change:\t\t" -msgstr "Letzte 瓏derung :\t\t" +msgstr "Letzte nderung :\t\t" -#: src/chage.c:262 src/chage.c:276 src/chage.c:293 src/chage.c:306 +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 msgid "Never\n" msgstr "Nie\n" -#. -#. * The password expiration date is determined from the last change -#. * date plus the number of days the password is valid for. -#. -#: src/chage.c:273 +#: src/chage.c:264 msgid "Password Expires:\t" -msgstr "Kennwort l酳ft ab :\t" +msgstr "Kennwort l瓣uft ab :\t" -#. -#. * The account becomes inactive if the password is expired for more -#. * than "inactdays". The expiration date is calculated and the -#. * number of inactive days is added. The resulting date is when the -#. * active will be disabled. -#. -#: src/chage.c:290 +#: src/chage.c:280 msgid "Password Inactive:\t" msgstr "Kennwort inaktiv:\t" -#. -#. * The account will expire on the given date regardless of the -#. * password expiring or not. -#. -#: src/chage.c:304 +#: src/chage.c:294 msgid "Account Expires:\t" -msgstr "Account l酳ft ab:\t" +msgstr "Account l瓣uft ab:\t" -#: src/chage.c:468 +#: src/chage.c:445 #, c-format msgid "%s: do not include \"l\" with other flags\n" -msgstr "%s : benutzen Sie nicht \"l\" mit anderen Optionen\n" +msgstr "%s: benutzen Sie nicht \"l\" mit anderen Optionen\n" -#: src/chage.c:481 src/chage.c:652 src/login.c:518 +#: src/chage.c:458 src/chage.c:588 src/login.c:503 #, c-format msgid "%s: permission denied\n" -msgstr "%s : Zugriff verweigert\n" +msgstr "%s: Zugriff verweigert\n" -#: src/chage.c:512 src/chpasswd.c:139 src/groupadd.c:529 src/groupdel.c:322 -#: src/groupmod.c:520 src/newusers.c:381 src/useradd.c:1754 src/userdel.c:717 -#: src/usermod.c:1732 +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" -msgstr "%s : PAM-Authentifizierung fehlgeschlagen\n" +msgstr "%s: PAM-Authentifizierung fehlgeschlagen\n" -#: src/chage.c:533 src/chpasswd.c:157 -#, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: kann Kennwortdatei nicht sperren\n" - -#: src/chage.c:544 src/chpasswd.c:162 +#: src/chage.c:510 src/chpasswd.c:159 #, c-format msgid "%s: can't open password file\n" -msgstr "%s: Kann Kennwortdatei nicht 鐪fnen\n" +msgstr "%s: Kann Kennwortdatei nicht 繹ffnen\n" -#: src/chage.c:552 +#: src/chage.c:518 #, c-format msgid "%s: unknown user: %s\n" msgstr "%s: unbekannter Benutzer: %s\n" -#: src/chage.c:571 +#: src/chage.c:536 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: Kann Shadow-Datei nicht sperren" -#: src/chage.c:579 +#: src/chage.c:544 #, c-format msgid "%s: can't open shadow password file" -msgstr "%s : Kann Shadow-Datei nicht 鐪fnen" +msgstr "%s: Kann Shadow-Datei nicht 繹ffnen" -#: src/chage.c:674 +#: src/chage.c:605 #, c-format msgid "Changing the aging information for %s\n" -msgstr "瓏dere die Kennwortalterung fr %s\n" +msgstr "ndere die Kennwortalterung f羹r %s\n" -#: src/chage.c:677 +#: src/chage.c:608 #, c-format msgid "%s: error changing fields\n" -msgstr "%s : Fehler beim 鄚dern der Felder\n" +msgstr "%s: Fehler beim 瓣ndern der Felder\n" -#: src/chage.c:705 src/chage.c:771 src/pwunconv.c:174 +#: src/chage.c:632 src/pwunconv.c:138 #, c-format msgid "%s: can't update password file\n" -msgstr "%s : Kann Kennwortdatei nicht aktualisieren\n" +msgstr "%s: Kann Kennwortdatei nicht aktualisieren\n" -#: src/chage.c:737 src/pwunconv.c:168 +#: src/chage.c:661 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "%s : Kann Shadow-Datei nicht aktualisieren\n" +msgstr "%s: Kann Shadow-Datei nicht aktualisieren\n" -#: src/chage.c:789 src/chage.c:805 src/chfn.c:570 src/chsh.c:382 -#: src/passwd.c:747 src/passwd.c:859 +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 msgid "Error updating the DBM password entry.\n" msgstr "Fehler beim aktualisieren des DBM-Kennworteintrags.\n" -#: src/chage.c:823 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "%s : Kann die Shadow-Datei nicht neu erstellen\n" +msgstr "%s: Kann die Shadow-Datei nicht neu erstellen\n" -#: src/chage.c:838 +#: src/chage.c:707 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "%s : Kann die Kennwortdatei nicht neu erstellen\n" +msgstr "%s: Kann die Kennwortdatei nicht neu erstellen\n" -#: src/chage.c:857 src/chpasswd.c:343 src/groupadd.c:590 src/groupdel.c:409 -#: src/groupmod.c:604 src/newusers.c:628 src/useradd.c:1869 src/userdel.c:849 -#: src/usermod.c:1811 +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM chauthtok fehlgeschlagen\n" -#: src/chfn.c:83 +#: src/chfn.c:84 #, c-format msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" @@ -418,268 +355,239 @@ msgstr "" "Syntax: %s [-f name] [-r raum] [-w tel_gesch]\n" "\t[-h tel_privat] [-o sonstiges] [Benutzer]\n" -#: src/chfn.c:88 +#: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "Syntax: %s [-f name] [-r raum] [-w tel_gesch] [-h tel_privat]\n" -#: src/chfn.c:139 +#: src/chfn.c:140 msgid "Enter the new value, or press ENTER for the default\n" -msgstr "Geben Sie einen neuen Wert an oder ENTER fr den Standardwert\n" +msgstr "Geben Sie einen neuen Wert an oder ENTER f羹r den Standardwert\n" -#: src/chfn.c:142 +#: src/chfn.c:143 msgid "Full Name" msgstr "Name" -#: src/chfn.c:144 +#: src/chfn.c:145 #, c-format msgid "\tFull Name: %s\n" -msgstr "\tName : %s\n" +msgstr "\tName: %s\n" -#: src/chfn.c:147 +#: src/chfn.c:148 msgid "Room Number" msgstr "Raum" -#: src/chfn.c:149 +#: src/chfn.c:150 #, c-format msgid "\tRoom Number: %s\n" -msgstr "\tRaum : %s\n" +msgstr "\tRaum: %s\n" -#: src/chfn.c:152 +#: src/chfn.c:153 msgid "Work Phone" -msgstr "Telefon gesch輎tlich" +msgstr "Telefon gesch瓣ftlich" -#: src/chfn.c:154 +#: src/chfn.c:155 #, c-format msgid "\tWork Phone: %s\n" -msgstr "\tTelefon gesch輎tlich : %s\n" +msgstr "\tTelefon gesch瓣ftlich: %s\n" -#: src/chfn.c:157 +#: src/chfn.c:158 msgid "Home Phone" msgstr "Telefon privat" -#: src/chfn.c:159 +#: src/chfn.c:160 #, c-format msgid "\tHome Phone: %s\n" -msgstr "\tTelefon privat : %s\n" +msgstr "\tTelefon privat: %s\n" -#: src/chfn.c:162 +#: src/chfn.c:163 msgid "Other" msgstr "Sonstiges" -#: src/chfn.c:271 src/chfn.c:281 src/chfn.c:291 src/chfn.c:301 src/chfn.c:311 -#: src/chfn.c:379 src/passwd.c:1115 +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 #, c-format msgid "%s: Permission denied.\n" msgstr "%s: Zugriff verweigert.\n" -#: src/chfn.c:332 src/chsh.c:190 src/passwd.c:1165 +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 #, c-format msgid "%s: Unknown user %s\n" msgstr "%s: Benutzer %s unbekannt\n" -#: src/chfn.c:341 src/chsh.c:198 src/passwd.c:1096 +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Kann Ihren Benutzernamen nicht feststellen.\n" -#: src/chfn.c:358 src/chsh.c:215 +#: src/chfn.c:359 src/chsh.c:210 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "%s: Kann den Benutzer `%' nicht auf dem NIS-Client 鄚dern.\n" +msgstr "%s: Kann den Benutzer `%s' nicht auf dem NIS-Client 瓣ndern.\n" -#: src/chfn.c:366 src/chsh.c:223 +#: src/chfn.c:367 src/chsh.c:218 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: `%s' ist der NIS-Master fr diesen Client.\n" +msgstr "%s: `%s' ist der NIS-Master f羹r diesen Client.\n" -#: src/chfn.c:441 +#: src/chfn.c:442 #, c-format msgid "Changing the user information for %s\n" -msgstr "瓏dere Benutzerinformationen fr %s\n" +msgstr "ndere Benutzerinformationen f羹r %s\n" -#: src/chfn.c:450 +#: src/chfn.c:451 #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s : Name ungltig: \"%s\"\n" +msgstr "%s: Name ung羹ltig: \"%s\"\n" -#: src/chfn.c:456 +#: src/chfn.c:457 #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "%s : Raumnummer ungltig: \"%s\"\n" +msgstr "%s: Raumnummer ung羹ltig: \"%s\"\n" -#: src/chfn.c:462 +#: src/chfn.c:463 #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "%s : Telefon (gesch輎tlich) ungltig: \"%s\"\n" +msgstr "%s: Telefon (gesch瓣ftlich) ung羹ltig: \"%s\"\n" -#: src/chfn.c:468 +#: src/chfn.c:469 #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s : Telefon (privat) ungltig: \"%s\"\n" +msgstr "%s: Telefon (privat) ung羹ltig: \"%s\"\n" -#: src/chfn.c:475 +#: src/chfn.c:476 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s : \"%s\" enth鄟t ungltige Zeichen\n" +msgstr "%s: \"%s\" enth瓣lt ung羹ltige Zeichen\n" -#: src/chfn.c:488 +#: src/chfn.c:489 #, c-format msgid "%s: fields too long\n" msgstr "%s: Feld zu lang\n" -#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277 +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 msgid "Cannot change ID to root.\n" -msgstr "Kann ID nicht zu root 鄚dern.\n" +msgstr "Kann ID nicht zu root 瓣ndern.\n" -#: src/chfn.c:519 src/chsh.c:331 src/passwd.c:656 src/passwd.c:811 +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 msgid "Cannot lock the password file; try again later.\n" msgstr "" -"Kann die Kennwortdatei nicht sperren; versuchen Sie es sp酹er nocheinmal.\n" +"Kann die Kennwortdatei nicht sperren; versuchen Sie es sp瓣ter nocheinmal.\n" -#: src/chfn.c:525 src/chsh.c:337 src/passwd.c:661 src/passwd.c:816 +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 msgid "Cannot open the password file.\n" -msgstr "Kann die Kennwortdatei nicht 鐪fnen.\n" +msgstr "Kann die Kennwortdatei nicht 繹ffnen.\n" -#: src/chfn.c:542 src/chsh.c:352 src/passwd.c:667 src/usermod.c:1348 +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s nicht in /etc/passwd gefunden\n" -#: src/chfn.c:561 src/chsh.c:373 src/passwd.c:740 src/passwd.c:852 +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 msgid "Error updating the password entry.\n" msgstr "Fehler beim aktualisieren des Kennworteintrags.\n" -#: src/chfn.c:585 src/chsh.c:397 src/passwd.c:755 src/passwd.c:867 +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 msgid "Cannot commit password file changes.\n" -msgstr "Kann 瓏derungen in der Kennwortdatei nicht schreiben.\n" +msgstr "Kann nderungen in der Kennwortdatei nicht schreiben.\n" -#: src/chfn.c:592 src/chsh.c:404 +#: src/chfn.c:593 src/chsh.c:399 msgid "Cannot unlock the password file.\n" msgstr "Kann die Kennwortdatei nicht entsperren.\n" -#: src/chpasswd.c:66 +#: src/chpasswd.c:67 #, c-format -msgid "usage: %s [-e]\n" +msgid "Usage: %s [-e]\n" msgstr "Syntax: %s [-e]\n" -#: src/chpasswd.c:171 src/pwconv.c:94 +#: src/chpasswd.c:154 +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: kann Kennwortdatei nicht sperren\n" + +#: src/chpasswd.c:168 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: Kann die Shadow-Datei nicht sperren\n" -#: src/chpasswd.c:177 src/gpasswd.c:596 src/pwconv.c:99 src/pwunconv.c:103 -#: src/pwunconv.c:108 +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s: Kann die Shadow-Datei nicht 鐪fnen\n" +msgstr "%s: Kann die Shadow-Datei nicht 繹ffnen\n" -#: src/chpasswd.c:200 src/newusers.c:460 +#: src/chpasswd.c:197 src/newusers.c:441 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: Zeile %d: Zeile zu lang\n" -#: src/chpasswd.c:220 +#: src/chpasswd.c:217 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: Zeile %d: Neues Kennwort fehlt\n" -#: src/chpasswd.c:237 +#: src/chpasswd.c:234 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: Zeile %d: Benutzer %s unbekannt\n" -#: src/chpasswd.c:290 +#: src/chpasswd.c:280 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: Zeile %d: Kann Kennworteintrag nicht aktualisieren\n" -#: src/chpasswd.c:307 src/newusers.c:588 +#: src/chpasswd.c:297 src/newusers.c:569 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: Fehler entdeckt, 瓏derungen werden verworfen\n" +msgstr "%s: Fehler entdeckt, nderungen werden verworfen\n" -#: src/chpasswd.c:319 +#: src/chpasswd.c:309 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: Fehler beim aktualisieren der Shadow-Datei\n" -#: src/chpasswd.c:328 +#: src/chpasswd.c:318 #, c-format msgid "%s: error updating password file\n" msgstr "%s: Fehler beim Aktualisieren der Kennwortdatei\n" -#: src/chsh.c:75 +#: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Syntax: %s [-s shell] [Name]\n" -#: src/chsh.c:89 +#: src/chsh.c:90 #, fuzzy msgid "Enter the new value, or press return for the default\n" -msgstr "Geben Sie einen neuen Wert ein oder ENTER fr den Standardwert\n" +msgstr "Geben Sie einen neuen Wert ein oder ENTER f羹r den Standardwert\n" -#: src/chsh.c:90 +#: src/chsh.c:91 msgid "Login Shell" msgstr "Login-Shell" -#: src/chsh.c:239 src/chsh.c:253 +#: src/chsh.c:234 src/chsh.c:248 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "Sie drfen die Shell fr %s nicht 鄚dern.\n" +msgstr "Sie d羹rfen die Shell f羹r %s nicht 瓣ndern.\n" -#: src/chsh.c:282 +#: src/chsh.c:277 #, c-format msgid "Changing the login shell for %s\n" -msgstr "瓏dere die Login-Shell fr %s\n" +msgstr "ndere die Login-Shell f羹r %s\n" -#: src/chsh.c:294 +#: src/chsh.c:289 #, c-format msgid "%s: Invalid entry: %s\n" -msgstr "%s: Ungltiger Eintrag : %s\n" +msgstr "%s: Ung羹ltiger Eintrag: %s\n" -#: src/chsh.c:301 +#: src/chsh.c:296 #, c-format msgid "%s is an invalid shell.\n" -msgstr "%s ist eine ungltige Shell.\n" - -#: src/dpasswd.c:52 -#, c-format -msgid "Usage: %s [-(a|d)] shell\n" -msgstr "Syntax: %s [-(a|d)] shell\n" - -#: src/dpasswd.c:115 -msgid "Shell password: " -msgstr "Shell-Kennwort : " - -#: src/dpasswd.c:121 -msgid "re-enter Shell password: " -msgstr "Best酹igen die das Shell-Kennwort : " - -#: src/dpasswd.c:129 -#, c-format -msgid "%s: Passwords do not match, try again.\n" -msgstr "" -"%s : Die Kennw顤ter stimmen nicht berein; versuchen Sie es nocheinmal.\n" - -#: src/dpasswd.c:149 -#, c-format -msgid "%s: can't create %s" -msgstr "%s: Kann %s nicht erstellen" - -#: src/dpasswd.c:155 -#, c-format -msgid "%s: can't open %s" -msgstr "%s : Kann %s nicht 鐪fnen" - -#: src/dpasswd.c:183 -#, c-format -msgid "%s: Shell %s not found.\n" -msgstr "%s : Shell %s nicht gefunden.\n" +msgstr "%s ist eine ung羹ltige Shell.\n" #: src/expiry.c:59 msgid "Usage: expiry {-f|-c}\n" -msgstr "Syntax : expiry {-f|-c}\n" +msgstr "Syntax: expiry {-f|-c}\n" #: src/expiry.c:113 #, c-format @@ -689,11 +597,11 @@ msgstr "%s: WARNUNG! Muss set-UID root sein\n" #: src/expiry.c:124 #, c-format msgid "%s: unknown user\n" -msgstr "%s : Unbekannter Benutzer\n" +msgstr "%s: Unbekannter Benutzer\n" #: src/faillog.c:77 #, c-format -msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" msgstr "Syntax: %s [-a|-u Benutzer] [-m max] [-r] [-t tage] [-l sek_sperre]\n" #: src/faillog.c:131 src/lastlog.c:96 @@ -713,7 +621,7 @@ msgstr " %s an %s" #: src/faillog.c:233 #, c-format msgid " [%lds left]" -msgstr " [%lds brig]" +msgstr " [%lds 羹brig]" #: src/faillog.c:237 #, c-format @@ -722,7 +630,7 @@ msgstr " [%lds Sperre]" #: src/gpasswd.c:78 #, c-format -msgid "usage: %s [-r|-R] group\n" +msgid "Usage: %s [-r|-R] group\n" msgstr "Syntax: %s [-r|-R] Gruppe\n" #: src/gpasswd.c:79 @@ -748,7 +656,7 @@ msgstr " %s [-M Benutzer,...] Gruppe\n" #: src/gpasswd.c:146 src/gpasswd.c:230 #, c-format msgid "%s: unknown user %s\n" -msgstr "%s : Benutzer %s unbekannt\n" +msgstr "%s: Benutzer %s unbekannt\n" #: src/gpasswd.c:157 msgid "Permission denied.\n" @@ -757,21 +665,21 @@ msgstr "Zugriff verweigert.\n" #: src/gpasswd.c:243 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s : Shadow-Gruppen-Kennw顤ter fr -A ben飆igt\n" +msgstr "%s: Shadow-Gruppen-Kennw繹rter f羹r -A ben繹tigt\n" #: src/gpasswd.c:294 msgid "Who are you?\n" msgstr "Wer sind Sie?\n" -#: src/gpasswd.c:313 src/newgrp.c:297 +#: src/gpasswd.c:313 src/newgrp.c:292 #, c-format msgid "unknown group: %s\n" -msgstr "Unbekannte Gruppe : %s\n" +msgstr "Unbekannte Gruppe: %s\n" #: src/gpasswd.c:422 #, c-format msgid "Adding user %s to group %s\n" -msgstr "Fge Benutzer %s zu Gruppe %s hinzu\n" +msgstr "F羹ge Benutzer %s zu Gruppe %s hinzu\n" #: src/gpasswd.c:440 #, c-format @@ -781,223 +689,211 @@ msgstr "Entferne Benutzer %s aus der Gruppe %s\n" #: src/gpasswd.c:454 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s : Mitglied %s unbekannt\n" +msgstr "%s: Mitglied %s unbekannt\n" #: src/gpasswd.c:501 #, c-format msgid "%s: Not a tty\n" -msgstr "%s : Kein tty\n" +msgstr "%s: Kein tty\n" -#. -#. * A new password is to be entered and it must be encrypted, etc. -#. * The password will be prompted for twice, and both entries must be -#. * identical. There is no need to validate the old password since -#. * the invoker is either the group owner, or root. -#. #: src/gpasswd.c:522 #, c-format msgid "Changing the password for group %s\n" -msgstr "瓏dere Kennwort fr die Gruppe %s\n" +msgstr "ndere Kennwort f羹r die Gruppe %s\n" #: src/gpasswd.c:525 msgid "New Password: " msgstr "Neues Kennwort: " -#: src/gpasswd.c:530 src/passwd.c:365 +#: src/gpasswd.c:530 src/passwd.c:281 msgid "Re-enter new password: " msgstr "Kennwort wiederholen: " #: src/gpasswd.c:542 msgid "They don't match; try again" -msgstr "Keine 鈁ereinstimmung; versuchen Sie es nocheinmal" +msgstr "Keine bereinstimmung; versuchen Sie es nocheinmal" #: src/gpasswd.c:546 #, c-format msgid "%s: Try again later\n" -msgstr "%s: Versuchen Sie es sp酹er nocheinmal\n" +msgstr "%s: Versuchen Sie es sp瓣ter nocheinmal\n" #: src/gpasswd.c:578 #, c-format msgid "%s: can't get lock\n" -msgstr "%s : Kann Sperre nicht lesen\n" +msgstr "%s: Kann Sperre nicht lesen\n" #: src/gpasswd.c:584 #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s : Kann Sperre nicht aus Shadow-Datei lesen\n" +msgstr "%s: Kann Sperre nicht aus Shadow-Datei lesen\n" #: src/gpasswd.c:590 #, c-format msgid "%s: can't open file\n" -msgstr "%s : Kann Datei nicht 鐪fnen\n" +msgstr "%s: Kann Datei nicht 繹ffnen\n" #: src/gpasswd.c:602 #, c-format msgid "%s: can't update entry\n" -msgstr "%s : Eintrag kann nicht aktualisiert werden\n" +msgstr "%s: Eintrag kann nicht aktualisiert werden\n" #: src/gpasswd.c:608 #, c-format msgid "%s: can't update shadow entry\n" -msgstr "%s : Shadow-Eintrag kann nicht aktualisiert werden\n" +msgstr "%s: Shadow-Eintrag kann nicht aktualisiert werden\n" #: src/gpasswd.c:615 #, c-format msgid "%s: can't re-write file\n" -msgstr "%s : Datei kann nicht neu erstellt werden\n" +msgstr "%s: Datei kann nicht neu erstellt werden\n" #: src/gpasswd.c:621 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s : Shadow-Datei kann nicht neu erstellt werden\n" +msgstr "%s: Shadow-Datei kann nicht neu erstellt werden\n" #: src/gpasswd.c:630 #, c-format msgid "%s: can't unlock file\n" -msgstr "%s : Datei kann nicht entsperrt werden\n" +msgstr "%s: Datei kann nicht entsperrt werden\n" #: src/gpasswd.c:635 #, c-format msgid "%s: can't update DBM files\n" -msgstr "%s : DBM-Dateien k霵nen nicht aktualisiert werden\n" +msgstr "%s: DBM-Dateien k繹nnen nicht aktualisiert werden\n" #: src/gpasswd.c:642 #, c-format msgid "%s: can't update DBM shadow files\n" -msgstr "%s : DBM-Shadow-Dateien k霵nen nicht aktualisiert werden\n" +msgstr "%s: DBM-Shadow-Dateien k繹nnen nicht aktualisiert werden\n" -#: src/groupadd.c:101 -msgid "usage: groupadd [-g gid [-o]] group\n" -msgstr "Syntax: groupadd [-g gid [-o]] Gruppe\n" +#: src/groupadd.c:102 +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" +msgstr "Syntax: groupadd [-g gid [-o]] [-f] Gruppe\n" -#: src/groupadd.c:167 src/groupadd.c:192 src/groupmod.c:179 src/groupmod.c:228 -#: src/useradd.c:970 src/usermod.c:552 src/usermod.c:695 +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s : Fehler beim Hinzufgen eines neuen Gruppeneintrags\n" +msgstr "%s: Fehler beim Hinzuf羹gen eines neuen Gruppeneintrags\n" -#: src/groupadd.c:178 src/groupadd.c:203 src/groupmod.c:197 src/useradd.c:981 -#: src/usermod.c:564 src/usermod.c:708 +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 #, c-format msgid "%s: cannot add new dbm group entry\n" -msgstr "%s : Kann keinen neuen DBM-Gruppen-Eintrag hinzufgen\n" +msgstr "%s: Kann keinen neuen DBM-Gruppen-Eintrag hinzuf羹gen\n" -#: src/groupadd.c:255 src/useradd.c:1034 +#: src/groupadd.c:256 src/useradd.c:977 #, c-format msgid "%s: name %s is not unique\n" -msgstr "%s : Name %s ist nicht eindeutig\n" +msgstr "%s: Name %s ist nicht eindeutig\n" -#: src/groupadd.c:270 +#: src/groupadd.c:271 #, c-format msgid "%s: gid %u is not unique\n" -msgstr "%s : GID %u ist nicht eindeutig\n" +msgstr "%s: GID %u ist nicht eindeutig\n" -#: src/groupadd.c:294 +#: src/groupadd.c:295 #, c-format msgid "%s: can't get unique gid\n" -msgstr "%s : Kann keine eindeutige GID feststellen\n" +msgstr "%s: Kann keine eindeutige GID feststellen\n" -#. -#. * All invalid group names land here. -#. -#: src/groupadd.c:317 src/groupmod.c:341 +#: src/groupadd.c:318 src/groupmod.c:342 #, c-format msgid "%s: %s is a not a valid group name\n" -msgstr "%s : %s ist kein gltiger Gruppenname\n" +msgstr "%s: %s ist kein g羹ltiger Gruppenname\n" -#: src/groupadd.c:346 src/groupmod.c:366 +#: src/groupadd.c:347 src/groupmod.c:367 #, c-format msgid "%s: invalid group %s\n" -msgstr "%s : Ungltige Gruppe %s\n" +msgstr "%s: Ung羹ltige Gruppe %s\n" -#: src/groupadd.c:363 src/useradd.c:1313 +#: src/groupadd.c:364 src/useradd.c:1173 #, c-format msgid "%s: -O requires NAME=VALUE\n" -msgstr "%s : -O ben飆igt NAME=WERT\n" +msgstr "%s: -O ben繹tigt NAME=WERT\n" -#: src/groupadd.c:407 src/groupdel.c:173 src/groupmod.c:401 src/useradd.c:1428 -#: src/userdel.c:312 src/usermod.c:576 +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 #, c-format msgid "%s: cannot rewrite group file\n" -msgstr "%s : Kann Gruppendatei nicht neu erstellen\n" +msgstr "%s: Kann Gruppendatei nicht neu erstellen\n" -#: src/groupadd.c:415 src/groupdel.c:179 src/groupmod.c:409 src/useradd.c:1437 -#: src/userdel.c:319 src/usermod.c:722 +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 #, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s : Kann Shadow-Gruppendatei nicht neu erstellen\n" +msgstr "%s: Kann Shadow-Gruppendatei nicht neu erstellen\n" -#: src/groupadd.c:433 src/groupdel.c:198 src/groupmod.c:427 src/userdel.c:403 +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s : Kann Gruppendatei nicht sperren\n" +msgstr "%s: Kann Gruppendatei nicht sperren\n" -#: src/groupadd.c:438 src/groupdel.c:202 src/groupmod.c:432 +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 #, c-format msgid "%s: unable to open group file\n" -msgstr "%s : Kann Gruppendatei nicht 鐪fnen\n" +msgstr "%s: Kann Gruppendatei nicht 繹ffnen\n" -#: src/groupadd.c:445 src/groupdel.c:207 src/groupmod.c:439 src/userdel.c:414 +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s : Kann Shadow-Gruppendatei nicht sperren\n" +msgstr "%s: Kann Shadow-Gruppendatei nicht sperren\n" -#: src/groupadd.c:451 src/groupdel.c:212 src/groupmod.c:445 +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s : Kann Shadow-Gruppendatei nicht 鐪fnen\n" +msgstr "%s: Kann Shadow-Gruppendatei nicht 繹ffnen\n" -#: src/groupadd.c:562 +#: src/groupadd.c:563 #, c-format msgid "%s: group %s exists\n" -msgstr "%s : Gruppe %s bereits vorhanden\n" +msgstr "%s: Gruppe %s bereits vorhanden\n" -#: src/groupdel.c:92 -msgid "usage: groupdel group\n" +#: src/groupdel.c:88 +msgid "Usage: groupdel group\n" msgstr "Syntax: groupdel Gruppe\n" -#: src/groupdel.c:110 src/groupmod.c:184 src/groupmod.c:233 +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 #, c-format msgid "%s: error removing group entry\n" -msgstr "%s : Fehler beim Entfernen des Gruppeneintrags\n" +msgstr "%s: Fehler beim Entfernen des Gruppeneintrags\n" -#: src/groupdel.c:122 src/groupmod.c:204 +#: src/groupdel.c:119 src/groupmod.c:205 #, c-format msgid "%s: error removing group dbm entry\n" -msgstr "%s : Fehler beim Entfernen des DBM-Gruppeneintrags\n" +msgstr "%s: Fehler beim Entfernen des DBM-Gruppeneintrags\n" -#: src/groupdel.c:137 +#: src/groupdel.c:135 #, c-format msgid "%s: error removing shadow group entry\n" -msgstr "%s : Fehler beim Entfernen des Shadow-Gruppeneintrags\n" +msgstr "%s: Fehler beim Entfernen des Shadow-Gruppeneintrags\n" -#: src/groupdel.c:150 src/groupmod.c:254 +#: src/groupdel.c:149 src/groupmod.c:255 #, c-format msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s : Fehler beim Entfernen des DBM-Shadow-Gruppeneintrags\n" +msgstr "%s: Fehler beim Entfernen des DBM-Shadow-Gruppeneintrags\n" -#. -#. * Can't remove the group. -#. -#: src/groupdel.c:254 +#: src/groupdel.c:255 #, c-format msgid "%s: cannot remove user's primary group.\n" -msgstr "%s : Kann die prim酺e Gruppe des Benutzers nicht entfernen.\n" +msgstr "%s: Kann die prim瓣re Gruppe des Benutzers nicht entfernen.\n" -#: src/groupdel.c:355 src/groupmod.c:550 +#: src/groupdel.c:359 src/groupmod.c:551 #, c-format msgid "%s: group %s does not exist\n" -msgstr "%s : Gruppe %s existiert nicht\n" +msgstr "%s: Gruppe %s existiert nicht\n" -#: src/groupdel.c:369 src/groupmod.c:566 +#: src/groupdel.c:373 src/groupmod.c:567 #, c-format msgid "%s: group %s is a NIS group\n" -msgstr "%s : Gruppe %s ist eine NIS-Gruppe\n" +msgstr "%s: Gruppe %s ist eine NIS-Gruppe\n" -#: src/groupdel.c:375 src/groupmod.c:571 src/userdel.c:776 src/usermod.c:1045 +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 #, c-format msgid "%s: %s is the NIS master\n" -msgstr "%s : %s ist der NIS-Master\n" +msgstr "%s: %s ist der NIS-Master\n" #: src/groupmems.c:95 msgid "Member already exists\n" @@ -1008,16 +904,16 @@ msgid "Member to remove could not be found\n" msgstr "Zu entfernendes Mitglied nicht gefunden\n" #: src/groupmems.c:158 -msgid "usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" msgstr "Syntax: groupmems -a Benutzer | -d Benutzer | -D | -l [-g Gruppe]\n" #: src/groupmems.c:201 msgid "Only root can add members to different groups\n" -msgstr "Nur root kann Mitglieder zu verschiedenen Gruppen hinzufgen\n" +msgstr "Nur root kann Mitglieder zu verschiedenen Gruppen hinzuf羹gen\n" #: src/groupmems.c:206 msgid "Group access is required\n" -msgstr "Gruppen-Zugriff ben飆igt\n" +msgstr "Gruppen-Zugriff ben繹tigt\n" #: src/groupmems.c:210 msgid "Not primary owner of current group\n" @@ -1029,35 +925,35 @@ msgstr "Kann Gruppendatei nicht sperren\n" #: src/groupmems.c:220 msgid "Unable to open group file\n" -msgstr "Kann Gruppendatei nicht 鐪fnen\n" +msgstr "Kann Gruppendatei nicht 繹ffnen\n" #: src/groupmems.c:240 msgid "Cannot close group file\n" -msgstr "Kann Gruppendatei nicht schlie絽n\n" +msgstr "Kann Gruppendatei nicht schlieen\n" -#: src/groupmod.c:103 -msgid "usage: groupmod [-g gid [-o]] [-n name] group\n" -msgstr "Syntax : groupmod [-g gid [-o]] [-n Name] Gruppe\n" +#: src/groupmod.c:104 +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "Syntax: groupmod [-g gid [-o]] [-n Name] Gruppe\n" -#: src/groupmod.c:161 +#: src/groupmod.c:162 #, c-format msgid "%s: %s not found in /etc/group\n" -msgstr "%s : %s nicht in /etc/group gefunden\n" +msgstr "%s: %s nicht in /etc/group gefunden\n" -#: src/groupmod.c:247 +#: src/groupmod.c:248 #, c-format msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s : Kann DBM-Shadow-Gruppeneintrag nicht hinzufgen\n" +msgstr "%s: Kann DBM-Shadow-Gruppeneintrag nicht hinzuf羹gen\n" -#: src/groupmod.c:300 +#: src/groupmod.c:301 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u ist keine eindeutige GID\n" -#: src/groupmod.c:330 +#: src/groupmod.c:331 #, c-format msgid "%s: %s is not a unique name\n" -msgstr "%s : %s ist kein eindeutiger Name\n" +msgstr "%s: %s ist kein eindeutiger Name\n" #: src/groups.c:59 #, c-format @@ -1086,33 +982,25 @@ msgstr "" #: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s : Kann Datei %s nicht sperren\n" +msgstr "%s: Kann Datei %s nicht sperren\n" #: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:202 src/pwck.c:242 #: src/pwck.c:251 #, c-format msgid "%s: cannot open file %s\n" -msgstr "%s : Kann Datei %s nicht 鐪fnen\n" +msgstr "%s: Kann Datei %s nicht 繹ffnen\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:311 msgid "invalid group file entry\n" -msgstr "Ungltiger Eintrag in Gruppendatei\n" +msgstr "Ung羹ltiger Eintrag in Gruppendatei\n" #: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 #: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 #: src/pwck.c:543 #, c-format msgid "delete line `%s'? " -msgstr "Zeile `%s' l飉chen? " +msgstr "Zeile `%s' l繹schen? " -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:374 msgid "duplicate group entry\n" msgstr "Doppelter Gruppeneintrag\n" @@ -1120,30 +1008,22 @@ msgstr "Doppelter Gruppeneintrag\n" #: src/grpck.c:391 #, c-format msgid "invalid group name `%s'\n" -msgstr "Gruppenname `%s' ungltig\n" +msgstr "Gruppenname `%s' ung羹ltig\n" #: src/grpck.c:418 #, c-format msgid "group %s: no user %s\n" -msgstr "Gruppe %s : Kein Benutzer %s\n" +msgstr "Gruppe %s: Kein Benutzer %s\n" #: src/grpck.c:420 src/grpck.c:590 #, c-format msgid "delete member `%s'? " -msgstr "Mitglied `%s' l飉chen? " +msgstr "Mitglied `%s' l繹schen? " -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:457 msgid "invalid shadow group file entry\n" -msgstr "Ungltiger Shadow-Gruppeneintrag\n" +msgstr "Ung羹ltiger Shadow-Gruppeneintrag\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:520 msgid "duplicate shadow group entry\n" msgstr "Doppelter Shadow-Gruppeneintrag\n" @@ -1155,32 +1035,32 @@ msgstr "Kein passender Gruppeneintrag\n" #: src/grpck.c:558 #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "Shadow-Gruppe %s : Benutzer %s ist kein Administrator\n" +msgstr "Shadow-Gruppe %s: Benutzer %s ist kein Administrator\n" #: src/grpck.c:560 #, c-format msgid "delete administrative member `%s'? " -msgstr "Administratives Mitglied `%s' l飉chen?" +msgstr "Administratives Mitglied `%s' l繹schen?" #: src/grpck.c:588 #, c-format msgid "shadow group %s: no user %s\n" -msgstr "Shadow-Gruppe %s : kein Benutzer %s\n" +msgstr "Shadow-Gruppe %s: kein Benutzer %s\n" #: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 #, c-format msgid "%s: cannot update file %s\n" -msgstr "%s : Kann Datei %s nicht aktualisieren\n" +msgstr "%s: Kann Datei %s nicht aktualisieren\n" #: src/grpck.c:647 src/pwck.c:612 #, c-format msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s : Die Dateien wurden aktualisiert; starten Sie mkpasswd\n" +msgstr "%s: Die Dateien wurden aktualisiert; starten Sie mkpasswd\n" #: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 #, c-format msgid "%s: no changes\n" -msgstr "%s: keine 瓏derungen\n" +msgstr "%s: keine nderungen\n" #: src/grpck.c:651 src/pwck.c:616 #, c-format @@ -1195,7 +1075,7 @@ msgstr "%s: Kann Gruppendatei nicht sperren\n" #: src/grpconv.c:65 src/grpunconv.c:61 #, c-format msgid "%s: can't open group file\n" -msgstr "%s: Kann Gruppendatei nicht 鐪fnen\n" +msgstr "%s: Kann Gruppendatei nicht 繹ffnen\n" #: src/grpconv.c:70 src/grpunconv.c:66 #, c-format @@ -1205,68 +1085,54 @@ msgstr "%s: Kann Shadow-Gruppendatei nicht sperren\n" #: src/grpconv.c:76 src/grpunconv.c:72 #, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: Kann Shadow-Gruppendatei nicht 鐪fnen\n" +msgstr "%s: Kann Shadow-Gruppendatei nicht 繹ffnen\n" #: src/grpconv.c:94 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: Kann Shadow-Gruppe %s nicht entfernen\n" -#: src/grpconv.c:138 src/pwconv.c:153 +#: src/grpconv.c:133 src/pwconv.c:154 #, c-format msgid "%s: can't update shadow entry for %s\n" -msgstr "%s: Kann Shadow-Eintrag fr %s nicht aktualisieren\n" +msgstr "%s: Kann Shadow-Eintrag f羹r %s nicht aktualisieren\n" -#: src/grpconv.c:148 src/grpunconv.c:91 +#: src/grpconv.c:143 src/grpunconv.c:91 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: Kann Gruppeneintrag %s nicht aktualisieren\n" -#: src/grpconv.c:155 src/grpunconv.c:99 +#: src/grpconv.c:150 src/grpunconv.c:99 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht aktualisieren\n" -#: src/grpconv.c:160 src/grpunconv.c:105 +#: src/grpconv.c:155 src/grpunconv.c:105 #, c-format msgid "%s: can't update group file\n" msgstr "%s: Kann Gruppendatei nicht aktualisieren\n" -#: src/grpconv.c:175 src/grpunconv.c:127 -#, c-format -msgid "%s: not configured for shadow group support.\n" -msgstr "%s: Shadow-Gruppen-Untersttzung nicht konfiguriert.\n" - #: src/grpunconv.c:110 #, c-format msgid "%s: can't delete shadow group file\n" -msgstr "%s: Kann Shadow-Gruppendatei nicht l飉chen\n" +msgstr "%s: Kann Shadow-Gruppendatei nicht l繹schen\n" #: src/id.c:53 -msgid "usage: id [-a]\n" +msgid "Usage: id [-a]\n" msgstr "Syntax: id [-a]\n" #: src/id.c:55 -msgid "usage: id\n" +msgid "Usage: id\n" msgstr "Syntax: id\n" -#. -#. * Start off the group message. It will be of the format -#. * -#. * groups=###(aaa),###(aaa),###(aaa) -#. * -#. * where "###" is a numerical value and "aaa" is the -#. * corresponding name for each respective numerical value. -#. #: src/id.c:169 msgid " groups=" msgstr " Gruppen=" #: src/lastlog.c:110 src/lastlog.c:116 -#, c-format -msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n" -msgstr "" -"Syntax: %s [<-u|--login> Login-Name] [<-t|--time> Tage] [<-h|--help>]\n" +#, fuzzy, c-format +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" +msgstr "Syntax: %s [(-u|--login) Login] [(-t|--time) Tage] [(-h|--help)]\n" #: src/lastlog.c:181 msgid "Username Port From Latest\n" @@ -1276,30 +1142,30 @@ msgstr "Benutzer Port Von Letzter\n" msgid "Username Port Latest\n" msgstr "Benutzer Port Letzter\n" -#: src/lastlog.c:197 +#: src/lastlog.c:198 msgid "**Never logged in**" msgstr "**Nie angemeldet **" -#: src/login.c:185 +#: src/login.c:175 #, c-format -msgid "usage: %s [-p] [name]\n" +msgid "Usage: %s [-p] [name]\n" msgstr "Syntax: %s [-p] [Name]\n" -#: src/login.c:188 +#: src/login.c:178 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h Host] [-f Name]\n" -#: src/login.c:190 +#: src/login.c:180 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r Host\n" -#: src/login.c:274 +#: src/login.c:259 msgid "Invalid login time\n" -msgstr "Ungltige Anmeldezeit\n" +msgstr "Ung羹ltige Anmeldezeit\n" -#: src/login.c:329 +#: src/login.c:314 msgid "" "\n" "System closed for routine maintenance\n" @@ -1307,7 +1173,7 @@ msgstr "" "\n" "System wegen Wartungsarbeiten geschlossen\n" -#: src/login.c:340 +#: src/login.c:325 msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" @@ -1315,7 +1181,7 @@ msgstr "" "\n" "[Trennung abgebrochen -- root-Login erlaubt.]\n" -#: src/login.c:377 +#: src/login.c:362 #, c-format msgid "" "\n" @@ -1324,17 +1190,17 @@ msgstr "" "\n" "Login: Timeout nach %d Sekunden.\n" -#: src/login.c:689 +#: src/login.c:648 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " an `%.100s' von `%.200s'" -#: src/login.c:693 +#: src/login.c:652 #, c-format msgid " on `%.100s'" msgstr " an `%.100s'" -#: src/login.c:852 +#: src/login.c:811 #, c-format msgid "" "\n" @@ -1343,51 +1209,51 @@ msgstr "" "\n" "%s login: " -#: src/login.c:855 +#: src/login.c:814 msgid "login: " msgstr "login: " -#: src/login.c:1071 src/sulogin.c:233 +#: src/login.c:1013 src/sulogin.c:205 msgid "Login incorrect" msgstr "Login fehlerhaft" -#: src/login.c:1265 +#: src/login.c:1193 msgid "Warning: login re-enabled after temporary lockout.\n" -msgstr "Warnung: Login reaktiviert nach tempor酺er Sperre.\n" +msgstr "Warnung: Login reaktiviert nach tempor瓣rer Sperre.\n" -#: src/login.c:1278 +#: src/login.c:1207 #, c-format msgid "Last login: %s on %s" msgstr "Letzte Verbindung: %s an %s" -#: src/login.c:1281 +#: src/login.c:1210 #, c-format msgid "Last login: %.19s on %s" msgstr "Letzte Verbindung: %.19s an %s" -#: src/login.c:1287 +#: src/login.c:1216 #, c-format msgid " from %.*s" msgstr " von %.*s" -#: src/login.c:1364 +#: src/login.c:1293 msgid "Starting rad_login\n" msgstr "Starte rad_login\n" #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" -msgstr "%s : Keine DBM-Datenbank gefunden - Aktion abgebrochen\n" +msgstr "%s: Keine DBM-Datenbank gefunden - Aktion abgebrochen\n" #: src/mkpasswd.c:232 src/mkpasswd.c:237 #, c-format msgid "%s: cannot overwrite file %s\n" -msgstr "%s : Kann Datei %s nicht berschreiben\n" +msgstr "%s: Kann Datei %s nicht 羹berschreiben\n" #: src/mkpasswd.c:252 #, c-format msgid "%s: cannot open DBM files for %s\n" -msgstr "%s : Kann DBM-Dateien fr %s nicht 鐪fnen\n" +msgstr "%s: Kann DBM-Dateien f羹r %s nicht 繹ffnen\n" #: src/mkpasswd.c:287 #, c-format @@ -1401,11 +1267,11 @@ msgstr " ist zu lang\n" #: src/mkpasswd.c:315 #, c-format msgid "%s: error parsing line \"%s\"\n" -msgstr "%s : Fehler beim Einlesen von Zeile \"%s\"\n" +msgstr "%s: Fehler beim Einlesen von Zeile \"%s\"\n" #: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338 msgid "adding record for name " -msgstr "Hinzufgen von " +msgstr "Hinzuf羹gen von " #: src/mkpasswd.c:324 src/mkpasswd.c:329 src/mkpasswd.c:334 src/mkpasswd.c:339 #: src/mkpasswd.c:345 src/mkpasswd.c:351 src/mkpasswd.c:356 src/mkpasswd.c:361 @@ -1415,17 +1281,17 @@ msgstr "" #: src/mkpasswd.c:344 src/mkpasswd.c:350 src/mkpasswd.c:355 src/mkpasswd.c:360 #, c-format msgid "%s: error adding record for " -msgstr "%s: Fehler beim Hinzufgen von " +msgstr "%s: Fehler beim Hinzuf羹gen von " #: src/mkpasswd.c:378 #, c-format msgid "added %d entries, longest was %d\n" -msgstr "%d Eintr輍e hinzugefgt, der l鄚gste war %d\n" +msgstr "%d Eintr瓣ge hinzugef羹gt, der l瓣ngste war %d\n" #: src/mkpasswd.c:392 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" -msgstr "Syntax: %s [-vf ] [-p|g|sp|sg] Datei\n" +msgstr "Syntax: %s [-vf] [-p|g|sp|sg] Datei\n" #: src/mkpasswd.c:395 #, c-format @@ -1438,28 +1304,28 @@ msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Syntax: %s [-vf] [-p|g] Datei\n" #: src/newgrp.c:61 -msgid "usage: newgrp [-] [group]\n" +msgid "Usage: newgrp [-] [group]\n" msgstr "Syntax: newgrp [-] [Gruppe]\n" #: src/newgrp.c:63 -msgid "usage: sg group [[-c] command]\n" +msgid "Usage: sg group [[-c] command]\n" msgstr "Syntax: sg Gruppe [[-c] Befehl]\n" -#: src/newgrp.c:136 +#: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" msgstr "Unbekannte UID: %u\n" -#: src/newgrp.c:219 +#: src/newgrp.c:214 #, c-format msgid "unknown gid: %lu\n" msgstr "Unbekannte GID: %lu\n" -#: src/newgrp.c:365 src/newgrp.c:374 +#: src/newgrp.c:360 src/newgrp.c:369 msgid "Sorry.\n" msgstr "Entschuldigung.\n" -#: src/newgrp.c:472 +#: src/newgrp.c:469 msgid "too many groups\n" msgstr "zu viele Gruppen\n" @@ -1468,124 +1334,109 @@ msgstr "zu viele Gruppen\n" msgid "Usage: %s [input]\n" msgstr "Syntax: %s [Eingabe]\n" -#: src/newusers.c:407 +#: src/newusers.c:388 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s : Kann /etc/passwd nicht sperren.\n" +msgstr "%s: Kann /etc/passwd nicht sperren.\n" -#: src/newusers.c:419 +#: src/newusers.c:400 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s : Kann Dateien nicht sperren, versuchen Sie es sp酹er nocheinmal\n" +msgstr "%s: Kann Dateien nicht sperren, versuchen Sie es sp瓣ter nocheinmal\n" -#: src/newusers.c:435 +#: src/newusers.c:416 #, c-format msgid "%s: can't open files\n" -msgstr "%s : Kann Dateien nicht 鐪fnen\n" +msgstr "%s: Kann Dateien nicht 繹ffnen\n" + +#: src/newusers.c:461 +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: Zeile %d: Ung羹ltige Zeile\n" #: src/newusers.c:480 #, c-format -msgid "%s: line %d: invalid line\n" -msgstr "%s : Zeile %d : Ungltige Zeile\n" - -#: src/newusers.c:499 -#, c-format msgid "%s: line %d: can't create GID\n" -msgstr "%s : Zeile %d : Kann GID nicht erstellen\n" +msgstr "%s: Zeile %d: Kann GID nicht erstellen\n" -#: src/newusers.c:515 +#: src/newusers.c:496 #, c-format msgid "%s: line %d: can't create UID\n" -msgstr "%s : Zeile %d : Kann UID nicht erstellen\n" +msgstr "%s: Zeile %d: Kann UID nicht erstellen\n" -#: src/newusers.c:528 +#: src/newusers.c:509 #, c-format msgid "%s: line %d: cannot find user %s\n" -msgstr "%s : Zeile %d : Kann Benutzer %s nicht finden\n" +msgstr "%s: Zeile %d: Kann Benutzer %s nicht finden\n" -#: src/newusers.c:537 +#: src/newusers.c:518 #, c-format msgid "%s: line %d: can't update password\n" -msgstr "%s : Zeile %d : Kann Kennwort nicht aktualisieren\n" +msgstr "%s: Zeile %d: Kann Kennwort nicht aktualisieren\n" -#: src/newusers.c:555 +#: src/newusers.c:536 #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "%s : Zeile %d : mkdir fehlgeschlagen\n" +msgstr "%s: Zeile %d: mkdir fehlgeschlagen\n" -#: src/newusers.c:561 +#: src/newusers.c:542 #, c-format msgid "%s: line %d: chown failed\n" -msgstr "%s : Zeile %d : chown fehlgeschlagen\n" +msgstr "%s: Zeile %d: chown fehlgeschlagen\n" -#: src/newusers.c:571 +#: src/newusers.c:552 #, c-format msgid "%s: line %d: can't update entry\n" -msgstr "%s : Zeile %d : Kann Eintrag nicht aktualisieren\n" +msgstr "%s: Zeile %d: Kann Eintrag nicht aktualisieren\n" -#: src/newusers.c:603 +#: src/newusers.c:584 #, c-format msgid "%s: error updating files\n" -msgstr "%s : Fehler beim Aktualisieren von Dateien\n" +msgstr "%s: Fehler beim Aktualisieren von Dateien\n" -#: src/passwd.c:174 +#: src/passwd.c:155 #, c-format -msgid "usage: %s [-f|-s] [name]\n" +msgid "Usage: %s [-f|-s] [name]\n" msgstr "Syntax: %s [-f|-s] [Name]\n" -#: src/passwd.c:178 +#: src/passwd.c:159 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x max] [-n min] [-w Warnung] [-i Inaktiv] Name\n" -#: src/passwd.c:180 +#: src/passwd.c:161 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} Name\n" -#: src/passwd.c:283 -#, c-format -msgid "User %s has a TCFS key, his old password is required.\n" -msgstr "" -"Benutzer besitzt einen TCFS-Schlssel, sein altes Kennwort wird ben飆igt.\n" - -#: src/passwd.c:286 -msgid "You can use -t option to force the change.\n" -msgstr "Sie k霵nen die -t Option benutzen um die 瓏derungen durchzufhren.\n" - -#: src/passwd.c:292 +#: src/passwd.c:216 msgid "Old password: " msgstr "Altes Kennwort: " -#: src/passwd.c:301 +#: src/passwd.c:225 #, c-format msgid "Incorrect password for `%s'\n" -msgstr "Falsches Kennwort fr `%s'\n" +msgstr "Falsches Kennwort f羹r `%s'\n" -#: src/passwd.c:314 -#, c-format -msgid "Warning: user %s has a TCFS key.\n" -msgstr "Warnung: Benutzer %s besitzt einen TCFS-Schlssel.\n" - -#: src/passwd.c:333 +#: src/passwd.c:249 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -"Geben Sie das neue Kennwort ein (mindestens %d, h鐼hstens %d Zeichen)\n" -"Bitte benutzen Sie eine Kombination von Gro-/Kleinbuchstaben und\n" +"Geben Sie das neue Kennwort ein (mindestens %d, h繹chstens %d Zeichen)\n" +"Bitte benutzen Sie eine Kombination von Gro-/Kleinbuchstaben und\n" "Ziffern.\n" -#: src/passwd.c:339 +#: src/passwd.c:255 msgid "New password: " msgstr "Neues Kennwort: " -#: src/passwd.c:350 +#: src/passwd.c:266 msgid "Try again.\n" msgstr "Versuchen Sie es nocheinmal...\n" -#: src/passwd.c:361 +#: src/passwd.c:277 msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" @@ -1594,76 +1445,58 @@ msgstr "" "Warnung: Schlechtes Kennwort (Geben Sie es nocheinmal ein, um\n" "es trotzdem zu verwenden).\n" -#: src/passwd.c:371 +#: src/passwd.c:287 msgid "They don't match; try again.\n" msgstr "Sie sind nicht identisch; versuchen Sie es nocheinmal...\n" -#: src/passwd.c:451 src/passwd.c:469 +#: src/passwd.c:364 src/passwd.c:382 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "Das Kennwort fr %s kann nicht ge鄚dert werden.\n" +msgstr "Das Kennwort f羹r %s kann nicht ge瓣ndert werden.\n" -#: src/passwd.c:494 +#: src/passwd.c:396 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "Das Kennwort fr %s kan z.Zt. nicht ge鄚dert werden.\n" +msgstr "Das Kennwort f羹r %s kan z.Zt. nicht ge瓣ndert werden.\n" -#: src/passwd.c:614 +#: src/passwd.c:479 #, c-format msgid "%s: out of memory\n" -msgstr "%s : Zu wenig Speicher\n" +msgstr "%s: Zu wenig Speicher\n" -#: src/passwd.c:769 -msgid "Cannot lock the TCFS key database; try again later\n" -msgstr "" -"Kann die TCFS-Datenbank nicht sperren; versuchen Sie es\n" -"sp酹er nocheinmal\n" - -#: src/passwd.c:777 -msgid "Cannot open the TCFS key database.\n" -msgstr "Kann die TCFS-Datenbank nicht 鐪fnen.\n" - -#: src/passwd.c:785 -msgid "Error updating the TCFS key database.\n" -msgstr "Fehler beim Aktualisieren der TCFS-Datenbank.\n" - -#: src/passwd.c:792 -msgid "Cannot commit TCFS changes.\n" -msgstr "Kann die TCFS-瓏derungen nicht schreiben.\n" - -#: src/passwd.c:975 +#: src/passwd.c:730 #, c-format msgid "%s: Cannot execute %s" -msgstr "%s : Kann %s nicht ausfhren" +msgstr "%s: Kann %s nicht ausf羹hren" -#: src/passwd.c:1077 +#: src/passwd.c:815 #, c-format msgid "%s: repository %s not supported\n" -msgstr "%s: Speicher %s nicht untersttzt\n" +msgstr "%s: Speicher %s nicht unterst羹tzt\n" -#: src/passwd.c:1152 +#: src/passwd.c:890 #, c-format msgid "%s: Permission denied\n" -msgstr "%s : Zugriff verweigert\n" +msgstr "%s: Zugriff verweigert\n" -#: src/passwd.c:1176 +#: src/passwd.c:914 #, c-format msgid "You may not change the password for %s.\n" -msgstr "Sie drfen das Kennwort fr %s nicht 鄚dern.\n" +msgstr "Sie d羹rfen das Kennwort f羹r %s nicht 瓣ndern.\n" -#: src/passwd.c:1242 +#: src/passwd.c:962 #, c-format msgid "Changing password for %s\n" -msgstr "瓏dere Kennwort fr %s\n" +msgstr "ndere Kennwort f羹r %s\n" -#: src/passwd.c:1246 +#: src/passwd.c:966 #, c-format msgid "The password for %s is unchanged.\n" -msgstr "Das Kennwort fr %s wurde nicht ge鄚dert.\n" +msgstr "Das Kennwort f羹r %s wurde nicht ge瓣ndert.\n" -#: src/passwd.c:1297 +#: src/passwd.c:1016 msgid "Password changed.\n" -msgstr "Kennwort ge鄚dert.\n" +msgstr "Kennwort ge瓣ndert.\n" #: src/pwck.c:87 #, c-format @@ -1675,18 +1508,10 @@ msgstr "Syntax: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Syntax: %s [-q] [-r] [-s] [passwd]\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:295 msgid "invalid password file entry\n" -msgstr "Ungltiger Eintrag in Kennwortdatei\n" +msgstr "Ung羹ltiger Eintrag in Kennwortdatei\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:357 msgid "duplicate password entry\n" msgstr "Doppelter Kennworteintrag\n" @@ -1694,11 +1519,8 @@ msgstr "Doppelter Kennworteintrag\n" #: src/pwck.c:373 #, c-format msgid "invalid user name '%s'\n" -msgstr "Ungltiger Benutzername '%s'\n" +msgstr "Ung羹ltiger Benutzername '%s'\n" -#. -#. * No primary group, just give a warning -#. #: src/pwck.c:388 #, c-format msgid "user %s: no group %u\n" @@ -1707,36 +1529,21 @@ msgstr "Benutzer %s: Keine Gruppe %u\n" #: src/pwck.c:404 #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "Benutzer %s : Verzeichnis %s nicht vorhanden\n" +msgstr "Benutzer %s: Verzeichnis %s nicht vorhanden\n" -#. -#. * Login shell doesn't exist, give a warning -#. #: src/pwck.c:420 #, c-format msgid "user %s: program %s does not exist\n" -msgstr "Benutzer %s : Programm %s nicht vorhanden\n" +msgstr "Benutzer %s: Programm %s nicht vorhanden\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:456 msgid "invalid shadow password file entry\n" -msgstr "Ungltiger Shadow-Kennworteintrag\n" +msgstr "Ung羹ltiger Shadow-Kennworteintrag\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:518 msgid "duplicate shadow password entry\n" msgstr "Doppelter Shadow-Kennworteintrag\n" -#. -#. * Tell the user this entry has no matching -#. * /etc/passwd entry and ask them to delete it. -#. #: src/pwck.c:542 msgid "no matching password file entry\n" msgstr "Kein passender Kennworteintrag gefunden\n" @@ -1744,52 +1551,47 @@ msgstr "Kein passender Kennworteintrag gefunden\n" #: src/pwck.c:560 #, c-format msgid "user %s: last password change in the future\n" -msgstr "Benutzer %s : Letzte Kennwort鄚derung liegt in der Zukunft\n" +msgstr "Benutzer %s: Letzte Kennwort瓣nderung liegt in der Zukunft\n" -#: src/pwconv.c:84 src/pwunconv.c:93 +#: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s : Kann Kennwortdatei nicht sperren\n" +msgstr "%s: Kann Kennwortdatei nicht sperren\n" -#: src/pwconv.c:89 src/pwunconv.c:98 +#: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s : Kann Kennwortdatei nicht 鐪fnen\n" +msgstr "%s: Kann Kennwortdatei nicht 繹ffnen\n" -#: src/pwconv.c:117 +#: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "%s : Kann Shadow-Eintrag fr %s nicht l飉chen\n" +msgstr "%s: Kann Shadow-Eintrag f羹r %s nicht l繹schen\n" -#: src/pwconv.c:163 +#: src/pwconv.c:164 #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "%s : Kann Kennworteintrag fr %s nicht aktualisieren\n" +msgstr "%s: Kann Kennworteintrag f羹r %s nicht aktualisieren\n" -#: src/pwconv.c:170 +#: src/pwconv.c:171 #, c-format msgid "%s: can't update shadow file\n" -msgstr "%s : Kann Shadow-Datei nicht aktualisieren\n" +msgstr "%s: Kann Shadow-Datei nicht aktualisieren\n" -#: src/pwconv.c:175 +#: src/pwconv.c:176 #, c-format msgid "%s: can't update passwd file\n" -msgstr "%s : Kann Kennwortdatei nicht aktualisieren\n" +msgstr "%s: Kann Kennwortdatei nicht aktualisieren\n" -#: src/pwunconv.c:50 -#, c-format -msgid "%s: Shadow passwords are not configured.\n" -msgstr "%s : Shadow-Kennw顤ter sind nicht konfiguriert.\n" - -#: src/pwunconv.c:160 +#: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s : Kann Eintrag fr Benutzer %s nicht aktualisieren\n" +msgstr "%s: Kann Eintrag f羹r Benutzer %s nicht aktualisieren\n" -#: src/pwunconv.c:181 +#: src/pwunconv.c:145 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s : Kann Shadow-Datei nicht l飉chen\n" +msgstr "%s: Kann Shadow-Datei nicht l繹schen\n" #: src/su.c:133 msgid "Sorry." @@ -1798,12 +1600,12 @@ msgstr "Entschuldigung." #: src/su.c:216 #, c-format msgid "%s: must be run from a terminal\n" -msgstr "%s : Muss von einem Terminal gestartet werden\n" +msgstr "%s: Muss von einem Terminal gestartet werden\n" #: src/su.c:306 #, c-format msgid "%s: pam_start: error %d\n" -msgstr "%s : pam_start : Fehler %d\n" +msgstr "%s: pam_start: Fehler %d\n" #: src/su.c:336 #, c-format @@ -1814,10 +1616,9 @@ msgstr "Unbekannte ID: %s\n" #, fuzzy, c-format msgid "You are not authorized to su %s\n" msgstr "" -"Sie drfen su %s nicht\n" +"Sie d羹rfen su %s nicht\n" " " -#. require own password #: src/su.c:385 msgid "(Enter your own password.)" msgstr "(Geben Sie Ihr eigenes Kennwort an.)" @@ -1831,35 +1632,31 @@ msgstr "" "%s: %s\n" "(Ignoriert)\n" -#: src/su.c:626 +#: src/su.c:609 msgid "No shell\n" msgstr "Keine Shell\n" -#: src/suauth.c:100 +#: src/suauth.c:105 msgid "Access to su to that account DENIED.\n" msgstr "Zugriff auf su zu diesem Account VERWEIGERT.\n" -#: src/suauth.c:107 +#: src/suauth.c:113 msgid "Password authentication bypassed.\n" msgstr "Kennwort-Authentifizierung umgangen.\n" -#: src/suauth.c:114 +#: src/suauth.c:122 msgid "Please enter your OWN password as authentication.\n" msgstr "Bitte geben Sie Ihr EIGENES Kennwort als Authentifizierung an.\n" -#. must be a password file! -#: src/sulogin.c:132 +#: src/sulogin.c:118 msgid "No password file\n" msgstr "Keine Kennwortdatei\n" -#. -#. * Fail secure -#. -#: src/sulogin.c:174 +#: src/sulogin.c:160 msgid "No password entry for 'root'\n" -msgstr "Kein Kennworteintrag fr 'root'\n" +msgstr "Kein Kennworteintrag f羹r 'root'\n" -#: src/sulogin.c:190 +#: src/sulogin.c:176 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1867,547 +1664,482 @@ msgid "" msgstr "" "\n" "Geben Sie Strg-D ein, um normal zu starten\n" -"(oder geben Sie das root-Kennwort ein zur Systemwartung) : " +"(oder geben Sie das root-Kennwort ein zur Systemwartung): " -#. make new environment active -#: src/sulogin.c:243 +#: src/sulogin.c:212 msgid "Entering System Maintenance Mode\n" msgstr "Starte im Systemwartungs-Modus\n" -#: src/useradd.c:251 +#: src/useradd.c:234 #, c-format msgid "%s: rebuild the group database\n" -msgstr "%s : Baue die Gruppendatenbank neu auf\n" +msgstr "%s: Baue die Gruppendatenbank neu auf\n" -#: src/useradd.c:260 +#: src/useradd.c:243 #, c-format msgid "%s: rebuild the shadow group database\n" -msgstr "%s : Baue die Shadow-Gruppendatenbank neu auf\n" +msgstr "%s: Baue die Shadow-Gruppendatenbank neu auf\n" -#: src/useradd.c:295 src/useradd.c:309 src/usermod.c:981 src/usermod.c:995 +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 #, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "%s : Ungltiges nummerisches Argument `%s'\n" +msgstr "%s: Ung羹ltiges nummerisches Argument `%s'\n" -#: src/useradd.c:365 +#: src/useradd.c:349 #, c-format msgid "%s: unknown gid %s\n" -msgstr "%s : GID %s unbekannt\n" +msgstr "%s: GID %s unbekannt\n" -#: src/useradd.c:373 src/useradd.c:676 src/useradd.c:1269 src/usermod.c:260 -#: src/usermod.c:1128 +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 #, c-format msgid "%s: unknown group %s\n" -msgstr "%s : Gruppe %s unbekannt\n" +msgstr "%s: Gruppe %s unbekannt\n" -#: src/useradd.c:440 -#, c-format -msgid "group=%s,%u basedir=%s skel=%s\n" -msgstr "Gruppe=%s,%u Basisverzeichnis=%s Vorlage=%s\n" - -#: src/useradd.c:444 -#, c-format -msgid "shell=%s " -msgstr "Shell=%s " - -#: src/useradd.c:446 -#, c-format -msgid "inactive=%ld expire=%s" -msgstr "Inaktiv=%ld Ablauf=%s" - -#: src/useradd.c:450 +#: src/useradd.c:419 #, c-format msgid "GROUP=%u\n" msgstr "GROUP=%u\n" -#: src/useradd.c:451 +#: src/useradd.c:420 #, c-format msgid "HOME=%s\n" msgstr "HOME=%s\n" -#: src/useradd.c:453 +#: src/useradd.c:422 #, c-format msgid "INACTIVE=%ld\n" msgstr "INACTIVE=%ld\n" -#: src/useradd.c:454 +#: src/useradd.c:423 #, c-format msgid "EXPIRE=%s\n" msgstr "EXPIRE=%s\n" -#: src/useradd.c:456 +#: src/useradd.c:425 #, c-format msgid "SHELL=%s\n" msgstr "SHELL=%s\n" -#: src/useradd.c:457 +#: src/useradd.c:426 #, c-format msgid "SKEL=%s\n" msgstr "SKEL=%s\n" -#: src/useradd.c:498 +#: src/useradd.c:462 #, c-format msgid "%s: cannot create new defaults file\n" -msgstr "%s : Kann keine neue Datei mit Standardwerten erstellen\n" +msgstr "%s: Kann keine neue Datei mit Standardwerten erstellen\n" -#: src/useradd.c:503 +#: src/useradd.c:467 #, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: Kann die neue Datei mit Standardwerten nicht 鐪fnen\n" +msgstr "%s: Kann die neue Datei mit Standardwerten nicht 繹ffnen\n" -#: src/useradd.c:596 src/useradd.c:608 +#: src/useradd.c:552 src/useradd.c:564 #, c-format msgid "%s: rename: %s" -msgstr "%s : Umbenennen: %s" +msgstr "%s: Umbenennen: %s" -#: src/useradd.c:697 src/usermod.c:281 +#: src/useradd.c:657 src/usermod.c:265 #, c-format msgid "%s: group `%s' is a NIS group.\n" -msgstr "%s : Die Gruppe `%s' ist eine NIS-Gruppe.\n" +msgstr "%s: Die Gruppe `%s' ist eine NIS-Gruppe.\n" -#: src/useradd.c:706 src/usermod.c:290 +#: src/useradd.c:666 src/usermod.c:274 #, c-format msgid "%s: too many groups specified (max %d).\n" -msgstr "%s : Zu viele Gruppen angegeben (max %d).\n" +msgstr "%s: Zu viele Gruppen angegeben (max %d).\n" -#: src/useradd.c:738 src/usermod.c:322 -#, c-format -msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" -msgstr "Syntax: %s\t[-u uid [-o]] [-g Gruppe] [-G Gruppe,...] \n" +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "Syntax: useradd [-u uid [-o]] [-g Gruppe] [-G Gruppe,...] \n" -#: src/useradd.c:742 -msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" -msgstr "\t\t[-d home] [-s Shell] [-c Kommentar] [-m [-k Vorlage]]\n" +#: src/useradd.c:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" +msgstr "" +" [-d home] [-s Shell] [-c Kommentar] [-m [-k Vorlage]]\n" -#: src/useradd.c:745 src/usermod.c:329 -msgid "[-f inactive] [-e expire ] " -msgstr "[-f inaktiv] [-e Ablauf ] " +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" +msgstr " [-f inaktiv] [-e Ablauf]\n" -#: src/useradd.c:748 -msgid "[-A program] " -msgstr "[-A Programm] " +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" +msgstr " useradd -D [-g Gruppe] [-b Basis] [-s Shell]\n" -#: src/useradd.c:750 -msgid "[-p passwd] name\n" -msgstr "[-p Kennwort] Name\n" - -#: src/useradd.c:753 -#, c-format -msgid " %s\t-D [-g group] [-b base] [-s shell]\n" -msgstr " %s\t-D [-g Gruppe] [-b Basis] [-s Shell]\n" - -#: src/useradd.c:756 -msgid "\t\t[-f inactive] [-e expire ]\n" -msgstr "\t\t[-f inaktiv] [-e Ablauf ]\n" - -#: src/useradd.c:850 src/usermod.c:480 +#: src/useradd.c:793 src/usermod.c:461 #, c-format msgid "%s: error locking group file\n" -msgstr "%s : Kann Gruppendatei nicht sperren\n" +msgstr "%s: Kann Gruppendatei nicht sperren\n" -#: src/useradd.c:855 src/usermod.c:486 +#: src/useradd.c:798 src/usermod.c:467 #, c-format msgid "%s: error opening group file\n" -msgstr "%s : Kann Gruppendatei nicht 鐪fnen\n" +msgstr "%s: Kann Gruppendatei nicht 繹ffnen\n" -#: src/useradd.c:862 src/usermod.c:597 +#: src/useradd.c:805 src/usermod.c:578 #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s : Kann Shadow-Gruppendatei nicht sperren\n" +msgstr "%s: Kann Shadow-Gruppendatei nicht sperren\n" -#: src/useradd.c:867 src/usermod.c:603 +#: src/useradd.c:810 src/usermod.c:584 #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s : Kann Shadow-Gruppendatei nicht 鐪fnen\n" +msgstr "%s: Kann Shadow-Gruppendatei nicht 繹ffnen\n" -#: src/useradd.c:1039 +#: src/useradd.c:982 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: UID %u ist nicht eindeutig\n" -#: src/useradd.c:1069 +#: src/useradd.c:1012 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: Kann keine eindeutige UID finden\n" -#: src/useradd.c:1174 src/useradd.c:1325 src/usermod.c:1075 src/usermod.c:1086 -#: src/usermod.c:1096 src/usermod.c:1143 src/usermod.c:1187 -#, c-format -msgid "%s: invalid field `%s'\n" -msgstr "%s: Feld `%s' ungltig\n" - -#: src/useradd.c:1189 +#: src/useradd.c:1049 #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s: Ungltiges Basisverzeichnis `%s'\n" +msgstr "%s: Ung羹ltiges Basisverzeichnis `%s'\n" -#: src/useradd.c:1199 +#: src/useradd.c:1059 #, c-format msgid "%s: invalid comment `%s'\n" -msgstr "%s: Kommentar `%s' ungltig\n" +msgstr "%s: Kommentar `%s' ung羹ltig\n" -#: src/useradd.c:1210 +#: src/useradd.c:1070 #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s: Homeverzeichnis `%s' ungltig\n" +msgstr "%s: Homeverzeichnis `%s' ung羹ltig\n" -#: src/useradd.c:1229 src/usermod.c:1110 +#: src/useradd.c:1089 src/usermod.c:858 #, c-format msgid "%s: invalid date `%s'\n" -msgstr "%s: Datum `%s' ungltig\n" +msgstr "%s: Datum `%s' ung羹ltig\n" -#: src/useradd.c:1242 +#: src/useradd.c:1102 #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "%s: Shadow-Kennw顤ter fr -e ben飆igt\n" +msgstr "%s: Shadow-Kennw繹rter f羹r -e ben繹tigt\n" -#: src/useradd.c:1258 +#: src/useradd.c:1118 #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "%s: Shadow-Kennw顤ter fr -f ben飆igt\n" +msgstr "%s: Shadow-Kennw繹rter f羹r -f ben繹tigt\n" -#: src/useradd.c:1336 +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: Feld `%s' ung羹ltig\n" + +#: src/useradd.c:1196 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s: Shell `%s' ist ungltig\n" +msgstr "%s: Shell `%s' ist ung羹ltig\n" -#: src/useradd.c:1377 +#: src/useradd.c:1237 #, c-format msgid "%s: invalid user name '%s'\n" -msgstr "%s: Benutzername `%s' ungltig\n" +msgstr "%s: Benutzername `%s' ung羹ltig\n" -#: src/useradd.c:1413 src/userdel.c:298 src/usermod.c:1255 +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: Kann Kennwortdatei nicht neu erstellen\n" -#: src/useradd.c:1420 src/userdel.c:303 src/usermod.c:1262 +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: Kann Shadow-Kennwortdatei nicht neu erstellen\n" -#: src/useradd.c:1461 src/userdel.c:367 src/usermod.c:1296 +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: Kann Kennwortdatei nicht sperren\n" -#: src/useradd.c:1466 src/userdel.c:372 src/usermod.c:1301 +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 #, c-format msgid "%s: unable to open password file\n" -msgstr "%s: Kann Kennwortdatei nicht 鐪fnen\n" +msgstr "%s: Kann Kennwortdatei nicht 繹ffnen\n" -#: src/useradd.c:1474 src/userdel.c:379 src/usermod.c:1308 +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: Kann Shadow-Kennwortdatei nicht sperren\n" -#: src/useradd.c:1481 src/userdel.c:385 src/usermod.c:1314 +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "%s: Kann Shadow-Kennwortdatei nicht 鐪fnen\n" +msgstr "%s: Kann Shadow-Kennwortdatei nicht 繹ffnen\n" -#: src/useradd.c:1580 src/usermod.c:1405 -#, c-format -msgid "%s: error adding authentication method\n" -msgstr "%s: Fehler beim Hinzufgen der Authentifizierungs-Methode\n" - -#: src/useradd.c:1604 +#: src/useradd.c:1435 #, c-format msgid "%s: error adding new password entry\n" -msgstr "%s: Fehler beim Hinzufgen eines neuen Kennworteintrags\n" +msgstr "%s: Fehler beim Hinzuf羹gen eines neuen Kennworteintrags\n" -#: src/useradd.c:1618 +#: src/useradd.c:1449 #, c-format msgid "%s: error updating password dbm entry\n" msgstr "%s: Fehler beim Aktualisieren des DBM-Kennworteintrags\n" -#: src/useradd.c:1634 src/usermod.c:1471 +#: src/useradd.c:1465 src/usermod.c:1151 #, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "%s: Fehler beim Hinzufgen des neuen Shadow-Kennworteintrags\n" +msgstr "%s: Fehler beim Hinzuf羹gen des neuen Shadow-Kennworteintrags\n" -#: src/useradd.c:1650 src/usermod.c:1488 +#: src/useradd.c:1481 src/usermod.c:1168 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" msgstr "%s: Fehler beim Aktualisieren des Shadow-DBM-Kennworteintrags\n" -#: src/useradd.c:1682 +#: src/useradd.c:1513 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: Kann Verzeichnis %s nicht erstellen\n" -#: src/useradd.c:1806 src/usermod.c:1233 +#: src/useradd.c:1634 src/usermod.c:981 #, c-format msgid "%s: user %s exists\n" msgstr "%s: Benutzer %s vorhanden\n" -#: src/useradd.c:1821 +#: src/useradd.c:1649 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" "%s: Gruppe %s vorhanden - Wenn Sie den Benutzer zur Gruppe\n" -"hinzufgen wollen, benutzen Sie -g.\n" +"hinzuf羹gen wollen, benutzen Sie -g.\n" -#: src/useradd.c:1854 +#: src/useradd.c:1687 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -"%s: Warnung: CREATE_HOME nicht untersttzt, verwenden Sie stattdessen -m.\n" +"%s: Warnung: CREATE_HOME nicht unterst羹tzt, verwenden Sie stattdessen -m.\n" -#: src/userdel.c:129 +#: src/userdel.c:124 #, c-format -msgid "usage: %s [-r] name\n" +msgid "Usage: %s [-r] name\n" msgstr "Syntax: %s [-r] Name\n" -#: src/userdel.c:181 src/userdel.c:267 +#: src/userdel.c:176 src/userdel.c:262 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: Fehler beim Aktualisieren des Gruppeneintrags\n" -#: src/userdel.c:191 src/userdel.c:276 +#: src/userdel.c:186 src/userdel.c:271 #, c-format msgid "%s: cannot update dbm group entry\n" msgstr "%s: Kann DBM-Gruppeneintrag nicht aktualisieren\n" -#: src/userdel.c:219 +#: src/userdel.c:214 #, c-format msgid "%s: cannot remove dbm group entry\n" msgstr "%s: Kann DBM-Gruppeneintrag nicht entfernen\n" -#: src/userdel.c:308 +#: src/userdel.c:379 #, c-format -msgid "%s: cannot rewrite TCFS key file\n" -msgstr "%s: Kann TCFS-Datei nicht neu erstellen\n" +msgid "%s: cannot open group file\n" +msgstr "%s: Kann Gruppendatei nicht 繹ffnen\n" -#: src/userdel.c:392 +#: src/userdel.c:390 #, c-format -msgid "%s: cannot lock TCFS key file\n" -msgstr "%s: Kann TCFS-Datei nicht sperren\n" - -#: src/userdel.c:397 -#, c-format -msgid "%s: cannot open TCFS key file\n" -msgstr "%s: Kann TCFS-Datei nicht 鐪fnen\n" +msgid "%s: cannot open shadow group file\n" +msgstr "%s: Kann Shadow-Gruppendatei nicht 繹ffnen\n" #: src/userdel.c:408 #, c-format -msgid "%s: cannot open group file\n" -msgstr "%s: Kann Gruppendatei nicht 鐪fnen\n" - -#: src/userdel.c:419 -#, c-format -msgid "%s: cannot open shadow group file\n" -msgstr "%s: Kann Shadow-Gruppendatei nicht 鐪fnen\n" - -#: src/userdel.c:451 src/userdel.c:468 -#, c-format -msgid "%s: error deleting authentication\n" -msgstr "%s: Fehler beim L飉chen der Authentifizierung\n" - -#: src/userdel.c:479 -#, c-format msgid "%s: error deleting password entry\n" -msgstr "%s: Fehler beim L飉chen des Kennworteintrags\n" +msgstr "%s: Fehler beim L繹schen des Kennworteintrags\n" -#: src/userdel.c:485 +#: src/userdel.c:412 #, c-format msgid "%s: error deleting shadow password entry\n" -msgstr "%s : Fehler beim L飉chen des Shadow-Kennworteintrags\n" +msgstr "%s: Fehler beim L繹schen des Shadow-Kennworteintrags\n" -#: src/userdel.c:496 -#, c-format -msgid "%s: error deleting TCFS entry\n" -msgstr "%s: Fehler beim L飉chen des TCFS-Eintrags\n" - -#: src/userdel.c:510 +#: src/userdel.c:421 #, c-format msgid "%s: error deleting password dbm entry\n" -msgstr "%s: Fehler beim L飉chen des DBM-Kennworteintrags\n" +msgstr "%s: Fehler beim L繹schen des DBM-Kennworteintrags\n" -#: src/userdel.c:533 +#: src/userdel.c:440 #, c-format msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: Fehler beim L飉chen des Shadow-DBM-Kennworteintrags\n" +msgstr "%s: Fehler beim L繹schen des Shadow-DBM-Kennworteintrags\n" -#: src/userdel.c:569 +#: src/userdel.c:484 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: Benutzer %s ist z.Zt. angemeldet\n" -#: src/userdel.c:659 +#: src/userdel.c:594 #, c-format msgid "%s: warning: %s not owned by %s, not removing\n" -msgstr "%s: Warnung: %s nicht in Besitz von %s, L飉chen abgebrochen\n" +msgstr "%s: Warnung: %s nicht in Besitz von %s, L繹schen abgebrochen\n" -#: src/userdel.c:666 +#: src/userdel.c:600 #, c-format msgid "%s: warning: can't remove " -msgstr "%s: Warnung: Kann nicht l飉chen " +msgstr "%s: Warnung: Kann nicht l繹schen " -#: src/userdel.c:758 src/usermod.c:1023 +#: src/userdel.c:703 src/usermod.c:783 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: Benutzer %s nicht vorhanden\n" -#: src/userdel.c:770 src/usermod.c:1039 +#: src/userdel.c:718 src/usermod.c:799 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: Benutzer %s ist ein NIS-Benutzer\n" -#: src/userdel.c:799 +#: src/userdel.c:756 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s: %s nicht im Besitz von %s, L飉chen abgebrochen\n" +msgstr "%s: %s nicht im Besitz von %s, L繹schen abgebrochen\n" -#: src/userdel.c:818 +#: src/userdel.c:779 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -"%s: Verzeichnis %s wird nicht gel飉cht (wrde das Homeverzeichnis des\n" -"Benutzers %s l飉chen\n" +"%s: Verzeichnis %s wird nicht gel繹scht (w羹rde das Homeverzeichnis des\n" +"Benutzers %s l繹schen\n" -#: src/userdel.c:830 +#: src/userdel.c:793 #, c-format msgid "%s: error removing directory %s\n" -msgstr "%s: Fehler beim L飉chen des Verzeichnisses %s\n" +msgstr "%s: Fehler beim L繹schen des Verzeichnisses %s\n" -#: src/usermod.c:326 +#: src/usermod.c:306 +#, c-format +msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "Syntax: %s\t[-u uid [-o]] [-g Gruppe] [-G Gruppe,...] \n" + +#: src/usermod.c:310 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "\t\t[-d Home [-m]] [-s Shell] [-c Kommentar] [-l Neuer_Name]\n" -#: src/usermod.c:332 -msgid "[-A {DEFAULT|program},... ] " -msgstr "[-A {DEFAULT|Programm},... ] " +#: src/usermod.c:313 +msgid "[-f inactive] [-e expire] " +msgstr "[-f inaktiv] [-e Ablauf] " -#: src/usermod.c:334 +#: src/usermod.c:315 msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p Kennwort] [-L|-U] Name\n" -#: src/usermod.c:514 +#: src/usermod.c:495 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: Zu wenig Speicher in update_group\n" -#: src/usermod.c:641 +#: src/usermod.c:622 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: Zu wenig Speicher in update_gshadow\n" -#: src/usermod.c:1210 +#: src/usermod.c:958 #, c-format msgid "%s: no flags given\n" msgstr "%s: Keine Optionen angegeben\n" -#: src/usermod.c:1217 +#: src/usermod.c:965 #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s: Shadow-Kennw顤ter fr -e und -f ben飆igt\n" +msgstr "%s: Shadow-Kennw繹rter f羹r -e und -f ben繹tigt\n" -#: src/usermod.c:1239 +#: src/usermod.c:987 #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s : UID %lu ist nicht eindeutig\n" +msgstr "%s: UID %lu ist nicht eindeutig\n" -#: src/usermod.c:1392 -#, c-format -msgid "%s: error deleting authentication method\n" -msgstr "%s: Fehler beim L飉chen der Authentifizierungs-Methode\n" - -#: src/usermod.c:1418 -#, c-format -msgid "%s: error changing authentication method\n" -msgstr "%s: Fehler beim 瓏dern der Authentifizierungs-Methode\n" - -#: src/usermod.c:1436 +#: src/usermod.c:1116 #, c-format msgid "%s: error changing password entry\n" -msgstr "%s: Fehler beim 瓏dern des Kennworteintrags\n" +msgstr "%s: Fehler beim ndern des Kennworteintrags\n" -#: src/usermod.c:1442 +#: src/usermod.c:1122 #, c-format msgid "%s: error removing password entry\n" -msgstr "%s: Fehler beim L飉chen des Kennworteintrags\n" +msgstr "%s: Fehler beim L繹schen des Kennworteintrags\n" -#: src/usermod.c:1451 +#: src/usermod.c:1131 #, c-format msgid "%s: error adding password dbm entry\n" -msgstr "%s: Fehler beim Hinzufgen des DBM-Kennworteintrags\n" +msgstr "%s: Fehler beim Hinzuf羹gen des DBM-Kennworteintrags\n" -#: src/usermod.c:1459 +#: src/usermod.c:1139 #, c-format msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: Fehler beim L飉chen des DBM-Kennworteintrags\n" +msgstr "%s: Fehler beim L繹schen des DBM-Kennworteintrags\n" -#: src/usermod.c:1478 +#: src/usermod.c:1158 #, c-format msgid "%s: error removing shadow password entry\n" -msgstr "%s: Fehler beim L飉chen des Shadow-Kennworteintrags\n" +msgstr "%s: Fehler beim L繹schen des Shadow-Kennworteintrags\n" -#: src/usermod.c:1495 +#: src/usermod.c:1175 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" msgstr "%s: Fehler beim Entfernen des Shadow-DBM-Kennworteintrags\n" -#: src/usermod.c:1524 +#: src/usermod.c:1204 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: Verzeichnis %s vorhanden\n" -#: src/usermod.c:1533 +#: src/usermod.c:1213 #, c-format msgid "%s: can't create %s\n" msgstr "%s: Kann %s nicht erstellen\n" -#: src/usermod.c:1539 +#: src/usermod.c:1219 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s: Kann den Besitzer von %s nicht 鄚dern\n" +msgstr "%s: Kann den Besitzer von %s nicht 瓣ndern\n" -#: src/usermod.c:1556 +#: src/usermod.c:1236 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: Kann das Verzeichnis %s nicht nach %s umbenennen\n" -#. better leave it alone -#: src/usermod.c:1653 +#: src/usermod.c:1333 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: Warnung: %s nicht im Besitz von %s\n" -#: src/usermod.c:1659 +#: src/usermod.c:1339 msgid "failed to change mailbox owner" -msgstr "Fehler beim 瓏dern des Postfach-Besitzers" +msgstr "Fehler beim ndern des Postfach-Besitzers" -#: src/usermod.c:1667 +#: src/usermod.c:1347 msgid "failed to rename mailbox" msgstr "Fehler beim Umbenennen des Postfachs" -#: src/vipw.c:104 +#: src/vipw.c:105 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" "\n" -"%s: %s wurde nicht ge鄚dert\n" +"%s: %s wurde nicht ge瓣ndert\n" -#: src/vipw.c:132 +#: src/vipw.c:133 msgid "Couldn't lock file" msgstr "Datei konnte nicht gesperrt werden" -#: src/vipw.c:141 +#: src/vipw.c:142 msgid "Couldn't make backup" msgstr "Sicherung konnte nicht erstellt werden" -#: src/vipw.c:206 +#: src/vipw.c:200 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "" "%s: Wiederherstellung von %s fehlgeschlagen: %s\n" -"(Ihre 瓏derungen befinden sich in %s)\n" +"(Ihre nderungen befinden sich in %s)\n" -#: src/vipw.c:244 +#: src/vipw.c:238 msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" @@ -2417,6 +2149,133 @@ msgstr "" "`vipw' bearbeitet /etc/passwd `vipw -s' bearbeitet /etc/shadow\n" "`vigr' bearbeitet /etc/group `vigr -s' bearbeitet /etc/gshadow\n" +#, fuzzy +#~ msgid "Can't create mail spool for user %s.\n" +#~ msgstr "%s: Kann Eintrag f羹r Benutzer %s nicht aktualisieren\n" + +#~ msgid "User %s has a TCFS key, his old password is required.\n" +#~ msgstr "" +#~ "Benutzer %s besitzt einen TCFS-Schl羹ssel, sein altes Kennwort wird " +#~ "ben繹tigt.\n" + +#~ msgid "You can use -t option to force the change.\n" +#~ msgstr "" +#~ "Sie k繹nnen die -t Option benutzen um die nderungen durchzuf羹hren.\n" + +#~ msgid "Warning: user %s has a TCFS key.\n" +#~ msgstr "Warnung: Benutzer %s besitzt einen TCFS-Schl羹ssel.\n" + +#~ msgid "Cannot lock the TCFS key database; try again later\n" +#~ msgstr "" +#~ "Kann die TCFS-Datenbank nicht sperren; versuchen Sie es\n" +#~ "sp瓣ter nocheinmal\n" + +#~ msgid "Cannot open the TCFS key database.\n" +#~ msgstr "Kann die TCFS-Datenbank nicht 繹ffnen.\n" + +#~ msgid "Error updating the TCFS key database.\n" +#~ msgstr "Fehler beim Aktualisieren der TCFS-Datenbank.\n" + +#~ msgid "Cannot commit TCFS changes.\n" +#~ msgstr "Kann die TCFS-nderungen nicht schreiben.\n" + +#~ msgid "%s: cannot rewrite TCFS key file\n" +#~ msgstr "%s: Kann TCFS-Datei nicht neu erstellen\n" + +#~ msgid "%s: cannot lock TCFS key file\n" +#~ msgstr "%s: Kann TCFS-Datei nicht sperren\n" + +#~ msgid "%s: cannot open TCFS key file\n" +#~ msgstr "%s: Kann TCFS-Datei nicht 繹ffnen\n" + +#~ msgid "%s: error deleting TCFS entry\n" +#~ msgstr "%s: Fehler beim L繹schen des TCFS-Eintrags\n" + +#~ msgid " [-f inactive] [-e expire]" +#~ msgstr " [-f inaktiv] [-e Ablauf] " + +#~ msgid "%s: error deleting authentication\n" +#~ msgstr "%s: Fehler beim L繹schen der Authentifizierung\n" + +#~ msgid "[-A {DEFAULT|program},...] " +#~ msgstr "[-A {DEFAULT|Programm},...] " + +#~ msgid "%s: error deleting authentication method\n" +#~ msgstr "%s: Fehler beim L繹schen der Authentifizierungs-Methode\n" + +#~ msgid "%s: error adding authentication method\n" +#~ msgstr "%s: Fehler beim Hinzuf羹gen der Authentifizierungs-Methode\n" + +#~ msgid "%s: error changing authentication method\n" +#~ msgstr "%s: Fehler beim ndern der Authentifizierungs-Methode\n" + +#~ msgid "[-A program] " +#~ msgstr "[-A Programm] " + +#~ msgid "[-p passwd] name\n" +#~ msgstr "[-p Kennwort] Name\n" + +#~ msgid "error - lookup '%s' failed\n" +#~ msgstr "Fehler - Kann '%s' nicht finden\n" + +#~ msgid "%s not found\n" +#~ msgstr "%s nicht gefunden\n" + +#~ msgid "%s: not configured for shadow group support.\n" +#~ msgstr "%s: Shadow-Gruppen-Unterst羹tzung nicht konfiguriert.\n" + +#~ msgid "%s: Shadow passwords are not configured.\n" +#~ msgstr "%s: Shadow-Kennw繹rter sind nicht konfiguriert.\n" + +#, fuzzy +#~ msgid "Usage: %s [-l] user\n" +#~ msgstr "Syntax: %s [-e]\n" + +#~ msgid "Executing shell %s\n" +#~ msgstr "F羹hre shell %s aus\n" + +#~ msgid "Dialup Password: " +#~ msgstr "Anwahl-Kennwort: " + +#~ msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" +#~ msgstr "" +#~ "Syntax: %s [-l] [-m min_tage] [-M max_tage] [-d letzter_tag] Benutzer\n" + +#~ msgid "Usage: %s [-(a|d)] shell\n" +#~ msgstr "Syntax: %s [-(a|d)] shell\n" + +#~ msgid "Shell password: " +#~ msgstr "Shell-Kennwort: " + +#~ msgid "re-enter Shell password: " +#~ msgstr "Best瓣tigen die das Shell-Kennwort: " + +#~ msgid "%s: Passwords do not match, try again.\n" +#~ msgstr "" +#~ "%s: Die Kennw繹rter stimmen nicht 羹berein; versuchen Sie es nocheinmal.\n" + +#~ msgid "%s: can't create %s" +#~ msgstr "%s: Kann %s nicht erstellen" + +#~ msgid "%s: can't open %s" +#~ msgstr "%s: Kann %s nicht 繹ffnen" + +#~ msgid "%s: Shell %s not found.\n" +#~ msgstr "%s: Shell %s nicht gefunden.\n" + +#~ msgid "group=%s,%u basedir=%s skel=%s\n" +#~ msgstr "Gruppe=%s,%u Basisverzeichnis=%s Vorlage=%s\n" + +#~ msgid "shell=%s " +#~ msgstr "Shell=%s " + +#~ msgid "inactive=%ld expire=%s" +#~ msgstr "Inaktiv=%ld Ablauf=%s" + +#, fuzzy +#~ msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +#~ msgstr "Syntax: %s\t[-u uid [-o]] [-g Gruppe] [-G Gruppe,...] \n" + #~ msgid "%s: gid %ld is not unique\n" #~ msgstr "%s: GID %ld ist nicht eindeutig\n" @@ -2425,7 +2284,7 @@ msgstr "" #~ msgstr "GID unbekannt: %d\n" #~ msgid "%s: uid %d is not unique\n" -#~ msgstr "%s : UID %d ist nicht eindeutig\n" +#~ msgstr "%s: UID %d ist nicht eindeutig\n" #~ msgid "user %s: bad UID (%d)\n" #~ msgstr "Benutzer %s: fehlerhafte UID (%d)\n" diff --git a/po/el.gmo b/po/el.gmo index 0c2a40f3..4e1c0813 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index 9187771c..c0f00d6b 100644 --- a/po/el.po +++ b/po/el.po @@ -5,1007 +5,905 @@ msgid "" msgstr "" "Project-Id-Version: Shadow 980726\n" -"POT-Creation-Date: 2002-03-12 12:16+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" +"PO-Revision-Date: 1998-12-28 20:35:31+0100\n" "Last-Translator: Nikos Mavroyanopoulos \n" "Language-Team: Hellenic \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-7\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8-bit\n" -#: libmisc/addgrps.c:60 +#: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" -msgstr "哢櫇毈瀔檽踠: 塨薋黀 瀌塤 %s\n" +msgstr "怷庰庣帤怷怷巹庢庢: 峎帠彖庢 怷弮峎帤帢 %s\n" -#: libmisc/addgrps.c:71 +#: libmisc/addgrps.c:68 msgid "Warning: too many groups\n" -msgstr "哢櫇毈瀔檽踠: 厞錭椯 瀌塤殣\n" +msgstr "怷庰庣帤怷怷巹庢庢: 怷弇弇峟 怷弮峎帤庰\n" -#: libmisc/age.c:77 +#: libmisc/age.c:72 msgid "Your password has expired." -msgstr "孲 黼膻賚敳濋 鶋 歃樥 錞鍷." +msgstr "峇怷 彖庛庢弮帢庣庥 帢 峟庰庣 弇峸徆庰庣." -#: libmisc/age.c:80 +#: libmisc/age.c:75 msgid "Your password is inactive." -msgstr "孲 黼膻賚敳濋 鶋 橀罅 摿樇殥裼." +msgstr "峇怷 彖庛庢弮帢庣庥 帢 庰巹彖帢庣 帢彖庰彖庰帠." -#: libmisc/age.c:83 +#: libmisc/age.c:78 msgid "Your login has expired." -msgstr " 蕅僸蕓 樥齘儌 鶋 歃樥 錞鍷." +msgstr " 庥帤庣庥 庰庣帤怷 帢 峟庰庣 弇峸徆庰庣." -#: libmisc/age.c:96 +#: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " 黴濋毉薋縶黀 懤 鐐 僸暠樥齌黀 鐐 黼黀碡敳濿.\n" +msgstr " 庣庥怷庣彖彖峸庰 弮庰 怷彖 帤庣帢庰庣庣峸 怷 峸弮帢怷.\n" -#: libmisc/age.c:99 +#: libmisc/age.c:93 msgid " Choose a new password.\n" -msgstr " 黴澣楏醲 楜 縻 黼膻賚敳濋.\n" +msgstr " 庣弇峟徆庰 峟彖帢 彖峟怷 彖庛庢弮帢庣庥.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:168 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "孲 黼膻賚敳濋 鶋 魨 錞鍷 鵴 %ld 徾鼫.\n" +msgstr "峇怷 彖庛庢弮帢庣庥 帢 庛帢 弇峸徆庰庣 庰 %ld 弮峟庰.\n" -#: libmisc/age.c:178 +#: libmisc/age.c:172 msgid "Your password will expire tomorrow.\n" -msgstr "孲 黼膻賚敳濋 鶋 魨 錞鍷 榶齌.\n" +msgstr "峇怷 彖庛庢弮帢庣庥 帢 庛帢 弇峸徆庰庣 帢庣怷.\n" -#: libmisc/age.c:180 +#: libmisc/age.c:174 msgid "Your password will expire today.\n" -msgstr "孲 黼膻賚敳濋 鶋 魨 錞鍷 鶀懤鼁.\n" +msgstr "峇怷 彖庛庢弮帢庣庥 帢 庛帢 弇峸徆庰庣 峸弮庰帢.\n" -#: libmisc/chowntty.c:113 +#: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" -msgstr "鍵罍摐葐 摠錆蜛 tty %s" +msgstr "帤彖帢弮巹帢 帢弇弇帢帠峸 tty %s" -#: libmisc/env.c:160 +#: libmisc/env.c:155 msgid "Environment overflow\n" -msgstr "涾殥灚蜎澞 謥齌瘌錭瀍鐐瀙n" +msgstr "峊庰庰巹弇庣庢 庰庣帣峎弇弇怷彖怷\n" -#: libmisc/env.c:200 +#: libmisc/env.c:195 #, c-format msgid "You may not change $%s\n" -msgstr "櫻 斶瀎橀醲 罅 摠醏鍷醲 鐐 $%s\n" +msgstr "庰彖 弮怷庰巹庰 彖帢 帢弇弇峎徆庰庰 怷 $%s\n" -#: libmisc/failure.c:238 +#: libmisc/failure.c:230 #, c-format msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s 摫 鐋 醲錼蘟摲 橀鵿儌. 醲錼蘟摲 禂摿 黀澽 %s 黀 %s.\n" +msgstr "%d %s 帢 庢彖 庰弇庰帢巹帢 庰巹怷帤怷. 庰弇庰帢巹帢 峸帢彖 庣 %s 怷 %s.\n" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failures" -msgstr "摫濻蘙蜌" +msgstr "帢怷巹庰" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failure" -msgstr "摫濻蘙葐" +msgstr "帢怷巹帢" -#: libmisc/limits.c:397 +#: libmisc/limits.c:396 msgid "Too many logins.\n" -msgstr "厞錭椯 橀鵿儌 黀 匷黀賚.\n" +msgstr "怷弇弇峟 庰巹怷帤怷庣 怷 庢弮帢.\n" -#: libmisc/login_desrpc.c:63 +#: libmisc/login_desrpc.c:59 #, c-format msgid "Password does not decrypt secret key for %s.\n" -msgstr "孲 黼膻賚敳濋 麧 摫氋僸膬豵毇 鐐 檁黀濋 膹樥魠 蜒 鐐() %s.\n" +msgstr "峇怷 彖庛庢弮帢庣庥 帤庰彖 帢怷庥帤庣庥怷怷庣庰巹 怷 弮庣庥 庥弇庰庣帤巹 帠庣帢 怷(彖) %s.\n" -#: libmisc/login_desrpc.c:69 +#: libmisc/login_desrpc.c:66 #, c-format msgid "Could not set %s's secret key: is the keyserv daemon running?\n" msgstr "" -"櫻 橀罅 勯罅鏸 罅 醲鳺 鐐 檁黀濋 膹樥魠 鐐 %s: 髑醲錼裎摋 駹n" -"僸摓瀌澞轘 膹樥僸;\n" +"庰彖 庰巹彖帢庣 帤彖帢彖 彖帢 庰庛庰巹 怷 弮庣庥 庥弇庰庣帤巹 怷 %s: 庥庰弇庰巹帢庣 怷\n" +"帤庣帢庥怷弮庣峸 庥弇庰庣帤庣彖;\n" -#: libmisc/mail.c:62 libmisc/mail.c:77 +#: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." -msgstr "跪殦 縻 蜤塙憼酃." +msgstr "庰庰 彖峟帢 帠峎弮弮帢帢." -#: libmisc/mail.c:73 +#: libmisc/mail.c:72 msgid "No mail." -msgstr "忯縻罅 蜤塙憼." +msgstr "帢彖峟彖帢 帠峎弮弮帢." -#: libmisc/mail.c:75 +#: libmisc/mail.c:74 msgid "You have mail." -msgstr "跪殦 蜤塙憼酃." +msgstr "庰庰 帠峎弮弮帢帢." -#: libmisc/obscure.c:281 src/passwd.c:244 +#: libmisc/obscure.c:271 src/passwd.c:183 #, c-format msgid "Bad password: %s. " -msgstr "忯蕓 黼膻賚敳濋: %s. " +msgstr "帢庥 彖庛庢弮帢庣庥: %s. " -#: libmisc/pam_pass.c:42 +#: libmisc/pam_pass.c:38 #, c-format msgid "passwd: pam_start() failed, error %d\n" -msgstr "黼膻賚敳濋: pam_start() 摫椼蘙, 鼭塝憼 %d\n" +msgstr "彖庛庢弮帢庣庥: pam_start() 帢峟庰, 峎弇弮帢 %d\n" -#: libmisc/pam_pass.c:49 +#: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" -msgstr "黼膻賚敳濋: %s\n" +msgstr "彖庛庢弮帢庣庥: %s\n" -#: libmisc/setupenv.c:211 +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" +msgstr "" + +#: libmisc/setupenv.c:208 #, c-format msgid "Unable to cd to \"%s\"\n" -msgstr "鍵罍摐葐 摠錆蜛 罼酃錪蜧 黀瀍 \"%s\"\n" +msgstr "帤彖帢弮巹帢 帢弇弇帢帠峸 庥帢帢弇帠怷 怷彖 \"%s\"\n" -#: libmisc/setupenv.c:219 +#: libmisc/setupenv.c:216 msgid "No directory, logging in with HOME=/" -msgstr "釱麌 罼轗錝蜧, 樥鶋裺蜛 懤 昒婧圴柉岏埡冾譁=/" +msgstr "峓巹 庥帢峎弇怷帠怷, 庰庣帢帠帠峸 弮庰 峇峞_峇=/" -#: libmisc/shell.c:78 -#, c-format -msgid "Executing shell %s\n" -msgstr "髑轕錼鵰 灒毉燽 %s\n" - -#. -#. * Obviously something is really wrong - I can't figure out -#. * how to execute this stupid shell, so I might as well give -#. * up in disgust ... -#. -#: libmisc/shell.c:122 +#: libmisc/shell.c:119 #, c-format msgid "Cannot execute %s" -msgstr "鍵罍摐葐 樏轕錼鵰 %s" +msgstr "帤彖帢弮巹帢 庰庥峟弇庰庢 %s" -#: libmisc/sub.c:61 +#: libmisc/sub.c:55 #, c-format msgid "Invalid root directory \"%s\"\n" -msgstr "杹 楯艕厴 貘酃壝濋 罼轗錝蜧 \"%s\"\n" +msgstr "庢 峟帠庥怷 帢庣庥 庥帢峎弇怷帠怷 \"%s\"\n" -#: libmisc/sub.c:73 +#: libmisc/sub.c:67 #, c-format msgid "Can't change root directory to \"%s\"\n" -msgstr "鍵罍摐葐 摠錆蜛 鐐 貘酃壝濋燽 罼酃錪蜧 鵴 \"%s\"\n" +msgstr "帤彖帢弮巹帢 帢弇弇帢帠峸 怷 帢庣庥怷 庥帢帢弇帠怷 庰 \"%s\"\n" -#: libmisc/xmalloc.c:28 +#: libmisc/xmalloc.c:24 #, c-format msgid "malloc(%d) failed\n" -msgstr " 膹祼 malloc(%d) 摫椼蘙嫹n" +msgstr " 庥弇峸庢 malloc(%d) 帢峟庰\n" -#: lib/dialchk.c:71 -msgid "Dialup Password: " -msgstr "郚膻賚敳濋 鐋錼穱臄縤 匷罽殢趛: " - -#: lib/getdef.c:276 +#: lib/getdef.c:274 msgid "Could not allocate space for config info.\n" -msgstr "鍵罍摐葐 鬾鶂氁鵰 觾厴 蜒 謻趡濼瀎蜌 僸摐壚鵰.\n" +msgstr "帤彖帢弮巹帢 帤峟弮庰庢 怷 帠庣帢 弇庢怷怷巹庰 帤庣帢弮庢.\n" -#. -#. * Item was never found. -#. -#: lib/getdef.c:330 +#: lib/getdef.c:328 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -"鼭塝憼 僸摐壚鵰 - 塨薋黀 摿鏻耪蜉樇 '%s' (樥儌豵毇裍醲 鐐 " -"僸暠樥齌黀)\n" +"峎弇弮帢 帤庣帢弮庢 - 峎帠彖怷 帢彖庣庥庰巹弮庰彖怷 '%s' (庰庣帤怷怷庣庰巹庰 怷彖 " +"帤庣帢庰庣庣峸)\n" -#: lib/getdef.c:417 -#, c-format -msgid "error - lookup '%s' failed\n" -msgstr "鼭塝憼 - 摿撂禂踠 '%s' 摫椼蘙嫹n" - -#: lib/getdef.c:425 -#, c-format -msgid "%s not found\n" -msgstr "%s 麧 碫楴賙嫹n" - -#. -#. * get the password from her, and set the salt for -#. * the decryption from the group file. -#. -#: lib/pwauth.c:54 src/newgrp.c:348 +#: lib/pwauth.c:54 src/newgrp.c:343 msgid "Password: " -msgstr "郚膻賚敳濋: " +msgstr "峉彖庛庢弮帢庣庥: " #: lib/pwauth.c:56 #, c-format msgid "%s's Password: " -msgstr "孲 %s 鐐 郚膻賚敳濋: " +msgstr "峇怷 %s 怷 峉彖庛庢弮帢庣庥: " -#: lib/pwauth.c:270 +#: lib/pwauth.c:247 msgid "(Echo on) " msgstr "" #: lib/strerror.c:20 #, c-format msgid "Unknown error %d" -msgstr "錨薋黀 鼭塝憼 %d" +msgstr "帠彖怷 峎弇弮帢 %d" -#: src/chage.c:116 -#, c-format +#: src/chage.c:118 msgid "" -"Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" -"\t[-I inactive] [-E expire] [-d last_day] user\n" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -"郩祼: %s [-l] [-m 槶暠_徾鼫瀧 [-M 懤粿徾鼫瀧 [-W 貘櫇毈.]\n" -"\t[-I 摿樇殥裼] [-E 錞鍡] [-d 醲錼蘟摲塺徾鼁] 虀祼鐋瀙n" +"峓峸庢: chage [-l] [-m 庰弇帢_弮峟庰] [-M 弮庰帠_弮峟庰] [-W 怷庰庣帤.]\n" +" [-I 帢彖庰彖庰帠] [-E 弇峸徆庢] [-d 庰弇庰帢巹帢_弮峟帢] 峸庢\n" -#: src/chage.c:122 -#, c-format -msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" -msgstr "" -"郩祼: %s [-l] [-m 槶媸_徾鼫瀧 [-M 懤粿徾鼫瀧 [-d 醲錼蘟摲塺徾鼁] 虀祼鐋瀙n" - -#: src/chage.c:157 +#: src/chage.c:152 msgid "" "Enter the new value, or press ENTER for the default\n" "\n" msgstr "" -"體鶈蜲醲 鐋 縻 鏻徻, 謮楻醲 ENTER 蜒 鐋 貘氋摜瀎澞徾耬\n" +"庣峎帠庰庰 庢彖 彖峟帢 庣弮峸, 峸 庣峟庰 ENTER 帠庣帢 庢彖 怷庥帢庛怷庣弮峟彖庢\n" "\n" -#: src/chage.c:160 +#: src/chage.c:155 msgid "Minimum Password Age" -msgstr "欥膲醲鼩 僸塱耪殧 黼膻賚敳濋燽" +msgstr "庣庥庰庢 帤庣峎庥庰庣帢 彖庛庢弮帢庣庥怷" -#: src/chage.c:166 +#: src/chage.c:161 msgid "Maximum Password Age" -msgstr "枍蜒黀 僸塱耪殧 黼膻賚敳濋燽" +msgstr "峟帠庣庢 帤庣峎庥庰庣帢 彖庛庢弮帢庣庥怷" -#: src/chage.c:174 +#: src/chage.c:169 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "婍錼蘟摲 摠錆蜛 黼膻賚敳濋燽 (跂跂-昍-Я)" +msgstr "峇庰弇庰帢巹帢 帢弇弇帢帠峸 彖庛庢弮帢庣庥怷 (峓峓峓峓--)" + +#: src/chage.c:177 +msgid "Password Expiration Warning" +msgstr "怷庰庣帤怷怷巹庢庢 弇峸徆庢 彖庛庢弮帢庣庥怷" #: src/chage.c:183 -msgid "Password Expiration Warning" -msgstr "哢櫇毈瀔檽踠 錞鍡 黼膻賚敳濋燽" - -#: src/chage.c:189 msgid "Password Inactive" -msgstr "鍚樇殥裼 黼膻賚敳濋" +msgstr "彖庰彖庰帠 彖庛庢弮帢庣庥" -#: src/chage.c:197 +#: src/chage.c:191 msgid "Account Expiration Date (YYYY-MM-DD)" -msgstr "④殥瀌賝葐 咑鍡 呤蝁齌摷斀 (跂跂-昍-Я)" +msgstr "弮庰怷弮庢彖巹帢 峸徆庢 怷帠帢庣帢弮怷 (峓峓峓峓--)" -#. -#. * Start with the easy numbers - the number of days before the -#. * password can be changed, the number of days after which the -#. * password must be chaged, the number of days before the password -#. * expires that the user is told, and the number of days after the -#. * password expires that the account becomes unusable. -#. -#: src/chage.c:248 +#: src/chage.c:241 #, c-format msgid "Minimum:\t%ld\n" -msgstr "鱔媸澞鐐:\t%ld\n" +msgstr "弇峎庣怷:\t%ld\n" -#: src/chage.c:249 +#: src/chage.c:242 #, c-format msgid "Maximum:\t%ld\n" -msgstr "枍蜒黀:\t%ld\n" +msgstr "峟帠庣怷:\t%ld\n" -#: src/chage.c:251 +#: src/chage.c:243 #, c-format msgid "Warning:\t%ld\n" -msgstr "哢櫇毈瀔檽踠:\t%ld\n" +msgstr "怷庰庣帤怷怷巹庢庢:\t%ld\n" -#: src/chage.c:252 +#: src/chage.c:244 #, c-format msgid "Inactive:\t%ld\n" -msgstr "鍚樇殥裼:\t%ld\n" +msgstr "彖庰彖庰帠:\t%ld\n" -#. -#. * The "last change" date is either "Never" or the date the password -#. * was last modified. The date is the number of days since 1/1/1970. -#. -#: src/chage.c:260 +#: src/chage.c:251 msgid "Last Change:\t\t" -msgstr "婍錼蘟摲 摠錆蜛:\t\t" +msgstr "峇庰弇庰帢巹帢 帢弇弇帢帠峸:\t\t" -#: src/chage.c:262 src/chage.c:276 src/chage.c:293 src/chage.c:306 +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 msgid "Never\n" -msgstr "厞轕\n" +msgstr "怷峟\n" -#. -#. * The password expiration date is determined from the last change -#. * date plus the number of days the password is valid for. -#. -#: src/chage.c:273 +#: src/chage.c:264 msgid "Password Expires:\t" -msgstr "孲 黼膻賚敳濋 錞蜲:\t" +msgstr "峇怷 彖庛庢弮帢庣庥 弇峸帠庰庣:\t" -#. -#. * The account becomes inactive if the password is expired for more -#. * than "inactdays". The expiration date is calculated and the -#. * number of inactive days is added. The resulting date is when the -#. * active will be disabled. -#. -#: src/chage.c:290 +#: src/chage.c:280 msgid "Password Inactive:\t" -msgstr "鍚樇殥裼 黼膻賚敳濋:\t" +msgstr "彖庰彖庰帠 彖庛庢弮帢庣庥:\t" -#. -#. * The account will expire on the given date regardless of the -#. * password expiring or not. -#. -#: src/chage.c:304 +#: src/chage.c:294 msgid "Account Expires:\t" -msgstr "孲 黼膻賚敳濋 錞蜲:\t" +msgstr "峇怷 彖庛庢弮帢庣庥 弇峸帠庰庣:\t" -#: src/chage.c:468 +#: src/chage.c:445 #, c-format msgid "%s: do not include \"l\" with other flags\n" -msgstr "%s: 俉 懞 黼斶殥澣摐瘌翴醲 鐐 \"l\" 懤 鏻 塝錼 樇麧蛶樥瀙n" +msgstr "%s: 帢 弮庢彖 弮庰庣弇帢弮帣峎彖庰庰 怷 \"l\" 弮庰 庣 峎弇弇庰 庰彖帤庰巹徆庰庣\n" -#: src/chage.c:481 src/chage.c:652 src/login.c:518 +#: src/chage.c:458 src/chage.c:588 src/login.c:503 #, c-format msgid "%s: permission denied\n" -msgstr "%s: 塤樥 摫瀎麌灕賙嫹n" +msgstr "%s: 峎帤庰庣帢 帢怷巹庛庢庥庰\n" -#: src/chage.c:512 src/chpasswd.c:139 src/groupadd.c:529 src/groupdel.c:322 -#: src/groupmod.c:520 src/newusers.c:381 src/useradd.c:1754 src/userdel.c:717 -#: src/usermod.c:1732 +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" -msgstr "%s: 郣塝憼 罼轗 鐋 貘瀀魶聬 懤噰儌 槴摓麌禊鵰瀙n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 弮庰庛帤怷 庰徆帢庥巹帣庢\n" -#: src/chage.c:533 src/chpasswd.c:157 -#, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 黼膻賚敳濋燡n" - -#: src/chage.c:544 src/chpasswd.c:162 +#: src/chage.c:510 src/chpasswd.c:159 #, c-format msgid "%s: can't open password file\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:552 +#: src/chage.c:518 #, c-format msgid "%s: unknown user: %s\n" -msgstr "%s: 塨薋黀濿 虀祼鐋: %s\n" +msgstr "%s: 峎帠彖怷 峸庢: %s\n" -#: src/chage.c:571 +#: src/chage.c:536 #, fuzzy, c-format msgid "%s: can't lock shadow password file" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:579 +#: src/chage.c:544 #, fuzzy, c-format msgid "%s: can't open shadow password file" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:674 +#: src/chage.c:605 #, c-format msgid "Changing the aging information for %s\n" -msgstr "鍛錆蜛 謻趡濼瀎澸 虀臩 蜒 鐐 %s\n" +msgstr "弇弇帢帠峸 弇庢怷怷庣彖 彖怷 帠庣帢 怷彖 %s\n" -#: src/chage.c:677 +#: src/chage.c:608 #, c-format msgid "%s: error changing fields\n" -msgstr "%s: 郣塝憼 罼轗 鐋 摠錆蜛 謥魠燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢弇弇帢帠峸 庰帤巹彖\n" -#: src/chage.c:705 src/chage.c:771 src/pwunconv.c:174 +#: src/chage.c:632 src/pwunconv.c:138 #, c-format msgid "%s: can't update password file\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:737 src/pwunconv.c:168 +#: src/chage.c:661 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:789 src/chage.c:805 src/chfn.c:570 src/chsh.c:382 -#: src/passwd.c:747 src/passwd.c:859 +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 msgid "Error updating the DBM password entry.\n" msgstr "" -"郣塝憼 罼轗 鐋 摿摿歈鵰 鐋 罼酃觾鼩鵰 黀 dbm 摙灚蜍 黼膻賚敳濋.\n" +"峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庢 庥帢帢庢庢 怷 dbm 帢庰巹怷 彖庛庢弮帢庣庥彖.\n" -#: src/chage.c:823 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "%s: 撦罍摐葐 歑摿樍蜤暡硻 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:838 +#: src/chage.c:707 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "%s: 撦罍摐葐 歑摿樍蜤暡硻 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:857 src/chpasswd.c:343 src/groupadd.c:590 src/groupdel.c:409 -#: src/groupmod.c:604 src/newusers.c:628 src/useradd.c:1869 src/userdel.c:849 -#: src/usermod.c:1811 +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: 撦罍摐葐 鍷膹樥噘憼鐐 摙灚蜍騱n" +msgstr "%s: 帢帤彖帢弮巹帢 徆庰庥弇庰庣帤弮帢怷 帢庰巹怷\n" -#: src/chfn.c:83 +#: src/chfn.c:84 #, c-format msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" "\t[-h home_ph] [-o other] [user]\n" msgstr "" -"Usage: %s [-f 謻碖殣_臩憼] [-r 摙蛵餩嘵憼轚瀦] [-w 鐋螒殥蝁鵸摥]\n" -"\t[-h 鐋螒毉罃摥] [-o 塝錝] [虀祼鐋瀧\n" +"Usage: %s [-f 弇峸庰_彖怷弮帢] [-r 帢巹庛弮_帤弮帢巹怷] [-w 庢弇_庰帠帢巹帢]\n" +"\t[-h 庢弇_怷庣庥巹帢] [-o 峎弇弇怷] [峸庢]\n" -#: src/chfn.c:88 +#: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -"郩祼: %s [-f 謻碖殣_臩憼] [-r 摙氆餩嘵憼轚瀦] [-w 鐋螒嘵憼轚瀦]\n" -"[-h 鐋螒毉罃摥]\n" +"峓峸庢: %s [-f 弇峸庰_彖怷弮帢] [-r 帢庣庛弮_帤弮帢巹怷] [-w 庢弇_帤弮帢巹怷]\n" +"[-h 庢弇_怷庣庥巹帢]\n" -#: src/chfn.c:139 +#: src/chfn.c:140 msgid "Enter the new value, or press ENTER for the default\n" -msgstr "體鶈蜲醲 鐋 縻 鏻徻, 謮楻醲 ENTER 蜒 鐋 貘氋摜瀎澞徾耬\n" +msgstr "庣峎帠庰庰 庢彖 彖峟帢 庣弮峸, 峸 庣峟庰 ENTER 帠庣帢 庢彖 怷庥帢庛怷庣弮峟彖庢\n" -#: src/chfn.c:142 +#: src/chfn.c:143 msgid "Full Name" -msgstr "剕碖殣 臩憼" +msgstr "弇峸庰 彖怷弮帢" -#: src/chfn.c:144 +#: src/chfn.c:145 #, c-format msgid "\tFull Name: %s\n" -msgstr "\t剕碖殣 潤瀌: %s\n" +msgstr "\t弇峸庰 彖怷弮帢: %s\n" -#: src/chfn.c:147 +#: src/chfn.c:148 msgid "Room Number" -msgstr "闌氆檇 嘵憼轚瀦" +msgstr "庣庛弮 帤弮帢巹怷" -#: src/chfn.c:149 +#: src/chfn.c:150 #, c-format msgid "\tRoom Number: %s\n" -msgstr "\t闌氆檇 蠡憼轚瀦: %s\n" +msgstr "\t庣庛弮 弮帢巹怷: %s\n" -#: src/chfn.c:152 +#: src/chfn.c:153 msgid "Work Phone" -msgstr "婌錧穱臩 囑蝁鵸摥" +msgstr "峇庢弇峟彖怷 帠帢巹帢" -#: src/chfn.c:154 +#: src/chfn.c:155 #, c-format msgid "\tWork Phone: %s\n" -msgstr "\t婌錧穱臩 囑蝁鵸摥: %s\n" +msgstr "\t峇庢弇峟彖怷 帠帢巹帢: %s\n" -#: src/chfn.c:157 +#: src/chfn.c:158 msgid "Home Phone" -msgstr "婌錧穱臩 矨罃摥" +msgstr "峇庢弇峟彖怷 庣庥巹帢" -#: src/chfn.c:159 +#: src/chfn.c:160 #, c-format msgid "\tHome Phone: %s\n" -msgstr "\t婌錧穱臩 毉罃摥: %s\n" +msgstr "\t峇庢弇峟彖怷 怷庣庥巹帢: %s\n" -#: src/chfn.c:162 +#: src/chfn.c:163 msgid "Other" -msgstr "鍛錝" +msgstr "弇弇怷" -#: src/chfn.c:271 src/chfn.c:281 src/chfn.c:291 src/chfn.c:301 src/chfn.c:311 -#: src/chfn.c:379 src/passwd.c:1115 +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 #, c-format msgid "%s: Permission denied.\n" -msgstr "%s: 嗡樥 摫瀎麌灕賙.\n" +msgstr "%s: 帤庰庣帢 帢怷巹庛庢庥庰.\n" -#: src/chfn.c:332 src/chsh.c:190 src/passwd.c:1165 +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 #, c-format msgid "%s: Unknown user %s\n" -msgstr "%s: 錨薋黀濿 虀祼鐋 %s\n" +msgstr "%s: 帠彖怷 怷 峸庢 %s\n" -#: src/chfn.c:341 src/chsh.c:198 src/passwd.c:1096 +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 #, c-format msgid "%s: Cannot determine your user name.\n" -msgstr "%s: 櫻 橀罅 勯罅鏸 罅 罼鴄齌黀橀 鐐 臩憼 虀祼鐋 鶋.\n" +msgstr "%s: 庰彖 庰巹彖帢庣 帤彖帢彖 彖帢 庥帢庛怷庣庰巹 怷 彖怷弮帢 峸庢 帢.\n" -#: src/chfn.c:358 src/chsh.c:215 +#: src/chfn.c:359 src/chsh.c:210 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "%s: 撦罍摐葐 摠錆蜛 虀祼鐋 `%s' 黀瀍 NIS 槴臝趡殦燽懤臩.\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢弇弇帢帠峸 峸庢 `%s' 怷彖 NIS 庰徆庢庰怷弮庰彖怷.\n" -#: src/chfn.c:366 src/chsh.c:223 +#: src/chfn.c:367 src/chsh.c:218 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: `%s' 橀罅 蕡齌濿 僸摓瀌澞轘 NIS 蜒'斠鏸 鐐 槴臝趡殦燽懤臩.\n" +msgstr "%s: `%s' 庰巹彖帢庣 怷 庥庣怷 帤庣帢庥怷弮庣峸 NIS 帠庣'帢彖 怷彖 庰徆庢庰怷弮庰彖怷.\n" -#: src/chfn.c:441 +#: src/chfn.c:442 #, c-format msgid "Changing the user information for %s\n" -msgstr "鍛錆蜛 謻趡濼瀎澸 虀祼鐋 蜒 鐐 %s\n" +msgstr "弇弇帢帠峸 弇庢怷怷庣彖 峸庢 帠庣帢 怷彖 %s\n" -#: src/chfn.c:450 +#: src/chfn.c:451 #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s: 杹 楯艕厴 臩憼: `%s'\n" +msgstr "%s: 庢 峟帠庥怷 彖怷弮帢: `%s'\n" -#: src/chfn.c:456 +#: src/chfn.c:457 #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "%s: 杹 楯艕厴 摙氆檇 嘵憼轚瀦: `%s'\n" +msgstr "%s: 庢 峟帠庥怷 帢庣庛弮 帤弮帢巹怷: `%s'\n" -#: src/chfn.c:462 +#: src/chfn.c:463 #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "%s: 杹 楯艕厴 鐋錧穱臩 殥蝁鵸摥: `%s'\n" +msgstr "%s: 庢 峟帠庥怷 庢弇峟彖怷 庰帠帢巹帢: `%s'\n" -#: src/chfn.c:468 +#: src/chfn.c:469 #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s: 杹 楯艕厴 鐋錧穱臩 毉罃摥: `%s'\n" +msgstr "%s: 庢 峟帠庥怷 庢弇峟彖怷 怷庣庥巹帢: `%s'\n" -#: src/chfn.c:475 +#: src/chfn.c:476 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s: \"%s\" 謥齌歃樥 懞 楯艕厴蘪 欒鼁臲碖殣\n" +msgstr "%s: \"%s\" 庰庣峟庰庣 弮庢 峟帠庥怷 帢帢庥峸庰\n" -#: src/chfn.c:488 +#: src/chfn.c:489 #, c-format msgid "%s: fields too long\n" -msgstr "%s: 厞錔 憼膲橎 謥魠塿n" +msgstr "%s: 怷弇 弮帢庥庣峎 庰帤巹帢\n" -#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277 +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 msgid "Cannot change ID to root.\n" -msgstr "鍵罍摐葐 摠錆蜛 酃蘟鐋酃 虀祼鐋 鵴 root.\n" +msgstr "帤彖帢弮巹帢 帢弇弇帢帠峸 帢庢帢 峸庢 庰 root.\n" -#: src/chfn.c:519 src/chsh.c:331 src/passwd.c:656 src/passwd.c:811 +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 msgid "Cannot lock the password file; try again later.\n" -msgstr "鍵罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 黼膻賚敳濋. 矓膦幪黀 摙裼醲鼁.\n" +msgstr "帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖. 怷庥庣弮峎庰 帢帠庰帢.\n" -#: src/chfn.c:525 src/chsh.c:337 src/passwd.c:661 src/passwd.c:816 +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 msgid "Cannot open the password file.\n" -msgstr "鍵罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 黼膻賚敳濋.\n" +msgstr "帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖.\n" -#: src/chfn.c:542 src/chsh.c:352 src/passwd.c:667 src/usermod.c:1348 +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 #, c-format msgid "%s: %s not found in /etc/passwd\n" -msgstr "%s: %s 麧 碫楴賙 黀 /etc/passwd\n" +msgstr "%s: %s 帤庰彖 帣峟庛庢庥庰 怷 /etc/passwd\n" -#: src/chfn.c:561 src/chsh.c:373 src/passwd.c:740 src/passwd.c:852 +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 msgid "Error updating the password entry.\n" -msgstr "郣塝憼 罼轗 鐋 摿摿歈鵰 罼酃觾鼩鵰 黀 摙灚蜍 黼膻賚敳濋.\n" +msgstr "峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖.\n" -#: src/chfn.c:585 src/chsh.c:397 src/passwd.c:755 src/passwd.c:867 +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 msgid "Cannot commit password file changes.\n" -msgstr "鍵罍摐葐 樥鶋裺蜛 鐒 摠錆裻 黀 摙灚蜍 黼膻賚敳濋.\n" +msgstr "帤彖帢弮巹帢 庰庣帢帠帠峸 彖 帢弇弇帢帠彖 怷 帢庰巹怷 彖庛庢弮帢庣庥彖.\n" -#: src/chfn.c:592 src/chsh.c:404 +#: src/chfn.c:593 src/chsh.c:399 msgid "Cannot unlock the password file.\n" -msgstr "鍵罍摐葐 鍷膹樥噘憼鐐 鐐 摙灚蜍 黼膻賚敳濋燡n" +msgstr "帤彖帢弮巹帢 徆庰庥弇庰庣帤弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chpasswd.c:66 +#: src/chpasswd.c:67 +#, fuzzy, c-format +msgid "Usage: %s [-e]\n" +msgstr "峸庢: %s [-e]\n" + +#: src/chpasswd.c:154 #, c-format -msgid "usage: %s [-e]\n" -msgstr "虀祼: %s [-e]\n" +msgid "%s: can't lock password file\n" +msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chpasswd.c:171 src/pwconv.c:94 +#: src/chpasswd.c:168 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chpasswd.c:177 src/gpasswd.c:596 src/pwconv.c:99 src/pwunconv.c:103 -#: src/pwunconv.c:108 +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chpasswd.c:200 src/newusers.c:460 +#: src/chpasswd.c:197 src/newusers.c:441 #, c-format msgid "%s: line %d: line too long\n" -msgstr "%s: 蜤摐徻 %d: 豵錔 懤蜡錣 蜤摐徻\n" +msgstr "%s: 帠帢弮弮峸 %d: 怷弇 弮庰帠峎弇庢 帠帢弮弮峸\n" -#: src/chpasswd.c:220 +#: src/chpasswd.c:217 #, c-format msgid "%s: line %d: missing new password\n" -msgstr "%s: 蜤摐徻 %d: 楋錼澮 縻瀦 黼膻賚敳濋燽\n" +msgstr "%s: 帠帢弮弮峸 %d: 峟弇弇庰庣庢 彖峟怷 彖庛庢弮帢庣庥怷\n" -#: src/chpasswd.c:237 +#: src/chpasswd.c:234 #, c-format msgid "%s: line %d: unknown user %s\n" -msgstr "%s: 蜤摐徻 %d: 塨薋黀濿 虀祼鐋 %s\n" +msgstr "%s: 帠帢弮弮峸 %d: 峎帠彖怷 峸庢 %s\n" -#: src/chpasswd.c:290 +#: src/chpasswd.c:280 #, c-format msgid "%s: line %d: cannot update password entry\n" -msgstr "%s: 蜤摐徻 %d: 撦罍摐葐 摿摿歈鵰 罼酃觾鼩鵰 黼膻賚敳濋燽\n" +msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 彖庛庢弮帢庣庥怷\n" -#: src/chpasswd.c:307 src/newusers.c:588 +#: src/chpasswd.c:297 src/newusers.c:569 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: 鍚澥縻蘟賙 鼭塝憼, 毉 摠錆蜙 摦臩碄賙摿\n" +msgstr "%s: 彖庣彖峟庢庥庰 峎弇弮帢, 怷庣 帢弇弇帢帠峟 帢帠彖怷峸庛庢庥帢彖\n" -#: src/chpasswd.c:319 +#: src/chpasswd.c:309 #, c-format msgid "%s: error updating shadow file\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 摿摿歈鵰 罼酃蠮麎鵴 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庰彖 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chpasswd.c:328 +#: src/chpasswd.c:318 #, c-format msgid "%s: error updating password file\n" -msgstr "%s: 郣塝憼 罼轗 鐋 摿摿歈鵰 罼酃蠮麎鵴 黀 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庰彖 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chsh.c:75 +#: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" -msgstr "郩祼: %s [-s 灒毉瀧 [臩憼]\n" - -#: src/chsh.c:89 -msgid "Enter the new value, or press return for the default\n" -msgstr "體鶈蜲醲 鐋 縻 鏻徻, 謮楻醲 ENTER 蜒 鐋 貘氋摜瀎澞徾耬\n" +msgstr "峓峸庢: %s [-s 弇怷庣] [彖怷弮帢]\n" #: src/chsh.c:90 -msgid "Login Shell" -msgstr "忡錴獿 體齘儌" +msgid "Enter the new value, or press return for the default\n" +msgstr "庣峎帠庰庰 庢彖 彖峟帢 庣弮峸, 峸 庣峟庰 ENTER 帠庣帢 庢彖 怷庥帢庛怷庣弮峟彖庢\n" -#: src/chsh.c:239 src/chsh.c:253 +#: src/chsh.c:91 +msgid "Login Shell" +msgstr "峟弇怷 庣帤怷" + +#: src/chsh.c:234 src/chsh.c:248 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "櫻 斶瀎橀醲 罅 摠醏鍷醲 鐐 灒毉 蜒 鐐() %s.\n" +msgstr "庰彖 弮怷庰巹庰 彖帢 帢弇弇峎徆庰庰 怷 弇怷庣 帠庣帢 怷(彖) %s.\n" -#: src/chsh.c:282 +#: src/chsh.c:277 #, c-format msgid "Changing the login shell for %s\n" -msgstr "鍛醏蜛 鐐 灒毉燽 蜒 鐐 %s\n" +msgstr "弇弇峎帠峸 怷 弇怷庣怷 帠庣帢 怷彖 %s\n" -#: src/chsh.c:294 +#: src/chsh.c:289 #, c-format msgid "%s: Invalid entry: %s\n" -msgstr "%s: 杹 楯艕鼩 罼酃觾鼩鵰: %s\n" +msgstr "%s: 庢 峟帠庥庢 庥帢帢庢庢: %s\n" -#: src/chsh.c:301 +#: src/chsh.c:296 #, c-format msgid "%s is an invalid shell.\n" -msgstr "%s 麧 橀罅 楯艕厴 灒毉.\n" - -#: src/dpasswd.c:52 -#, c-format -msgid "Usage: %s [-(a|d)] shell\n" -msgstr "郩祼: %s [-(ald)] 灒毉瀙n" - -#: src/dpasswd.c:115 -msgid "Shell password: " -msgstr "郚膻賚敳濋 灒毉燽: " - -#: src/dpasswd.c:121 -msgid "re-enter Shell password: " -msgstr "黴摿樥鶈蜲醲 鐐 黼膻賚敳濋 灒毉燽: " - -#: src/dpasswd.c:129 -#, c-format -msgid "%s: Passwords do not match, try again.\n" -msgstr "%s: 婛 黼膻賚敳濋 麧 酃濄橎緮罍, 儌膦幪黀 鍕縰.\n" - -#: src/dpasswd.c:149 -#, c-format -msgid "%s: can't create %s" -msgstr "%s: 撦罍摐葐 儃擩瀦鼖葐 鐐 %s" - -#: src/dpasswd.c:155 -#, c-format -msgid "%s: can't open %s" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 鐐 %s" - -#: src/dpasswd.c:183 -#, c-format -msgid "%s: Shell %s not found.\n" -msgstr "%s: 灒毉 %s 麧 碫楴賙.\n" +msgstr "%s 帤庰彖 庰巹彖帢庣 峟帠庥怷 弇怷庣.\n" #: src/expiry.c:59 msgid "Usage: expiry {-f|-c}\n" -msgstr "郩祼: expiry {-f|-c}\n" +msgstr "峓峸庢: expiry {-f|-c}\n" #: src/expiry.c:113 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "" -"%s: 倳珃瓬! 哢椲樥 罅 歃樥 醲鳺 鐐 bit 謯鼁觾鼩鵰 酃蘟鐋酃 root!\n" +"%s: 峞峉峓! 峟庰庣 彖帢 峟庰庣 庰庛庰巹 怷 bit 帢帢庢庢 帢庢帢 root!\n" #: src/expiry.c:124 #, c-format msgid "%s: unknown user\n" -msgstr "%s: 塨薋黀濿 虀祼鐋瀙n" +msgstr "%s: 峎帠彖怷 峸庢\n" #: src/faillog.c:77 -#, c-format -msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +#, fuzzy, c-format +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" msgstr "" -"虀祼: %s [-a|-u 虀祼鐋瀧 [-m 懤箂 [-r] [-t 徾鼫瀧 [-l 麧蘟殥錼贄塺膹樥踃\n" +"峸庢: %s [-a|-u 峸庢] [-m 弮庰帠] [-r] [-t 弮峟庰] [-l 帤庰庰弇庰帢_庥弇庰庣帤]\n" #: src/faillog.c:131 src/lastlog.c:96 #, c-format msgid "Unknown User: %s\n" -msgstr "錨薋黀濿 虀祼鐋: %s\n" +msgstr "帠彖怷 峸庢: %s\n" #: src/faillog.c:212 msgid "Username Failures Maximum Latest\n" -msgstr "潤瀌塺郩祼鐋 闋濻蘙蜌 枍蜒黀 婍錼蘟摲塿n" +msgstr "彖怷弮帢_峓峸庢 怷巹庰 峟帠庣怷 峇庰弇庰帢巹帢\n" #: src/faillog.c:229 #, c-format msgid " %s on %s" -msgstr " %s 黀 %s" +msgstr " %s 怷 %s" #: src/faillog.c:233 #, c-format msgid " [%lds left]" -msgstr " [%lds 摫椷樥罅燱" +msgstr " [%lds 帢峟弮庰庣彖帢彖]" #: src/faillog.c:237 #, c-format msgid " [%lds lock]" -msgstr " [%lds 膹橀嘵憼]" +msgstr " [%lds 庥弇庰巹帤弮帢]" #: src/gpasswd.c:78 -#, c-format -msgid "usage: %s [-r|-R] group\n" -msgstr "虀祼: %s [-r|-R] 瀌塤塿n" +#, fuzzy, c-format +msgid "Usage: %s [-r|-R] group\n" +msgstr "峸庢: %s [-r|-R] 怷弮峎帤帢\n" #: src/gpasswd.c:79 #, c-format msgid " %s [-a user] group\n" -msgstr " %s [-a 虀祼鐋瀧 瀌塤塿n" +msgstr " %s [-a 峸庢] 怷弮峎帤帢\n" #: src/gpasswd.c:80 #, c-format msgid " %s [-d user] group\n" -msgstr " %s [-d 虀祼鐋瀧 瀌塤塿n" +msgstr " %s [-d 峸庢] 怷弮峎帤帢\n" #: src/gpasswd.c:83 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" -msgstr " %s [-A 虀祼鐋,...] [-M 虀祼鐋,...] 瀌塤塿n" +msgstr " %s [-A 峸庢,...] [-M 峸庢,...] 怷弮峎帤帢\n" #: src/gpasswd.c:85 #, c-format msgid " %s [-M user,...] group\n" -msgstr " %s [-M 虀祼鐋,...] 瀌塤塿n" +msgstr " %s [-M 峸庢,...] 怷弮峎帤帢\n" #: src/gpasswd.c:146 src/gpasswd.c:230 #, c-format msgid "%s: unknown user %s\n" -msgstr "%s: 塨薋黀濿 虀祼鐋 %s\n" +msgstr "%s: 峎帠彖怷 峸庢 %s\n" #: src/gpasswd.c:157 msgid "Permission denied.\n" -msgstr "嗡樥 摫瀎麌灕賙.\n" +msgstr "帤庰庣帢 帢怷巹庛庢庥庰.\n" #: src/gpasswd.c:243 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s: 鵳澸儃 黼膻賚敳濋 瀌塤 摫摋鐐薀摋 蜒 鐐 -A\n" +msgstr "%s: 庥庣帤庢 彖庛庢弮帢庣庥峎 怷弮峎帤彖 帢帢庣怷彖帢庣 帠庣帢 怷 -A\n" #: src/gpasswd.c:294 msgid "Who are you?\n" -msgstr "厞濈 橀鶋;\n" +msgstr "怷庣怷 庰巹帢庣;\n" -#: src/gpasswd.c:313 src/newgrp.c:297 +#: src/gpasswd.c:313 src/newgrp.c:292 #, c-format msgid "unknown group: %s\n" -msgstr "塨薋黀 瀌塤: %s\n" +msgstr "峎帠彖庢 怷弮峎帤帢: %s\n" #: src/gpasswd.c:422 #, c-format msgid "Adding user %s to group %s\n" -msgstr "哢瀀魶聬 鐐 虀祼鐋 %s 黀賝 瀌塤 %s\n" +msgstr "怷庛峸庥庢 怷 峸庢 %s 庢彖 怷弮峎帤帢 %s\n" #: src/gpasswd.c:440 #, c-format msgid "Removing user %s from group %s\n" -msgstr "灌摦鵘氍 鐐 虀祼鐋 %s 摫 鐋 瀌塤 %s\n" +msgstr "庣帢帠峎庢 怷 峸庢 %s 帢 庢彖 怷弮峎帤帢 %s\n" #: src/gpasswd.c:454 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s: 塨薋黀 徾錝 %s\n" +msgstr "%s: 峎帠彖怷 弮峟弇怷 %s\n" #: src/gpasswd.c:501 #, c-format msgid "%s: Not a tty\n" -msgstr "%s: 櫻 橀罅 tty\n" +msgstr "%s: 庰彖 庰巹彖帢庣 tty\n" -#. -#. * A new password is to be entered and it must be encrypted, etc. -#. * The password will be prompted for twice, and both entries must be -#. * identical. There is no need to validate the old password since -#. * the invoker is either the group owner, or root. -#. #: src/gpasswd.c:522 #, c-format msgid "Changing the password for group %s\n" -msgstr "鍛錆蜛 鐐 黼膻碡敳濿 蜒 鐋 瀌塤 %s\n" +msgstr "弇弇帢帠峸 怷 彖庛峸弮帢怷 帠庣帢 庢彖 怷弮峎帤帢 %s\n" #: src/gpasswd.c:525 msgid "New Password: " -msgstr "俍 郚膻賚敳濋: " +msgstr "峟怷 峉彖庛庢弮帢庣庥: " -#: src/gpasswd.c:530 src/passwd.c:365 +#: src/gpasswd.c:530 src/passwd.c:281 msgid "Re-enter new password: " -msgstr "黴摿樥鶈蜲醲 鐐 縻 黼膻賚敳濋: " +msgstr "帢彖庰庣峎帠庰庰 怷 彖峟怷 彖庛庢弮帢庣庥: " #: src/gpasswd.c:542 msgid "They don't match; try again" -msgstr "櫻 酃濄橎緮罍. 矓膦幪黀 鍕縰" +msgstr "庰彖 帢庣庣峎庤怷彖. 怷庥庣弮峎庰 徆帢彖峎" #: src/gpasswd.c:546 #, c-format msgid "%s: Try again later\n" -msgstr "%s: 挓罅儌膦幪黀 摙裼醲鼁\n" +msgstr "%s: 帢彖帢帤怷庥庣弮峎庰 帢帠庰帢\n" #: src/gpasswd.c:578 #, c-format msgid "%s: can't get lock\n" -msgstr "%s: 鍵罍摐葐 儃擩瀦鼖葐 膹樥噘憼鐐瀙n" +msgstr "%s: 帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 庥弇庰庣帤弮帢怷\n" #: src/gpasswd.c:584 #, c-format msgid "%s: can't get shadow lock\n" msgstr "" -"%s: 鍵罍摐葐 儃擩瀦鼖葐 膹樥噘憼鐐 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +"%s: 帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" #: src/gpasswd.c:590 #, c-format msgid "%s: can't open file\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷\n" #: src/gpasswd.c:602 #, c-format msgid "%s: can't update entry\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 罼酃觾鼩鵰瀙n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢\n" #: src/gpasswd.c:608 #, c-format msgid "%s: can't update shadow entry\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" #: src/gpasswd.c:615 #, c-format msgid "%s: can't re-write file\n" -msgstr "%s: 撦罍摐葐 歑摿樍蜤暡硻 摙灚蜍騱n" +msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 帢庰巹怷\n" #: src/gpasswd.c:621 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s: 撦罍摐葐 歑摿樍蜤暡硻 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" #: src/gpasswd.c:630 #, c-format msgid "%s: can't unlock file\n" -msgstr "%s: 撦罍摐葐 鍷膹樥噘憼鐐 摙灚蜍騱n" +msgstr "%s: 帢帤彖帢弮巹帢 徆庰庥弇庰庣帤弮帢怷 帢庰巹怷\n" #: src/gpasswd.c:635 #, c-format msgid "%s: can't update DBM files\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 鐒 DBM 摙灚裐燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 彖 DBM 帢庰巹彖\n" #: src/gpasswd.c:642 #, c-format msgid "%s: can't update DBM shadow files\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 鐒 DBM 摙灚裐 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 彖 DBM 帢庰巹彖 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/groupadd.c:101 -msgid "usage: groupadd [-g gid [-o]] group\n" -msgstr "虀祼: groupadd [-g gid [-o]] 瀌塤塿n" +#: src/groupadd.c:102 +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" +msgstr "峸庢: groupadd [-g gid [-o]] [-f] 怷弮峎帤帢\n" -#: src/groupadd.c:167 src/groupadd.c:192 src/groupmod.c:179 src/groupmod.c:228 -#: src/useradd.c:970 src/usermod.c:552 src/usermod.c:695 +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s: 郣塝憼 罼轗 鐋 貘瀀魶聬 縻摥 罼酃觾鼩鵰 黀 摙灚蜍 瀌塤燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 彖峟帢 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupadd.c:178 src/groupadd.c:203 src/groupmod.c:197 src/useradd.c:981 -#: src/usermod.c:564 src/usermod.c:708 +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 #, c-format msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: 撦罍摐葐 貘瀀魶聬 縻摥 dbm 罼酃觾鼩鵰 黀 摙灚蜍 瀌塤燡n" +msgstr "%s: 帢帤彖帢弮巹帢 怷庛峸庥庢 彖峟帢 dbm 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupadd.c:255 src/useradd.c:1034 +#: src/groupadd.c:256 src/useradd.c:977 #, c-format msgid "%s: name %s is not unique\n" -msgstr "%s: 孲 臩憼 %s 麧 橀罅 斀罅僸蕓\n" +msgstr "%s: 峇怷 彖怷弮帢 %s 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥\n" -#: src/groupadd.c:270 +#: src/groupadd.c:271 #, c-format msgid "%s: gid %u is not unique\n" -msgstr "%s: 孲 uid %u 麧 橀罅 斀罅僸蕓\n" +msgstr "%s: 峇怷 uid %u 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥\n" -#: src/groupadd.c:294 +#: src/groupadd.c:295 #, c-format msgid "%s: can't get unique gid\n" -msgstr "%s: 撦罍摐葐 濆鼫鵰 斀罅僸膬 gid\n" +msgstr "%s: 帢帤彖帢弮巹帢 庰庰庢 弮怷彖帢帤庣庥怷 gid\n" -#. -#. * All invalid group names land here. -#. -#: src/groupadd.c:317 src/groupmod.c:341 +#: src/groupadd.c:318 src/groupmod.c:342 #, c-format msgid "%s: %s is a not a valid group name\n" -msgstr "%s: 孲 %s 麧 橀罅 楯艕厴 臩憼 瀌塤摥\n" +msgstr "%s: 峇怷 %s 帤庰彖 庰巹彖帢庣 峟帠庥怷 彖怷弮帢 怷弮峎帤帢\n" -#: src/groupadd.c:346 src/groupmod.c:366 +#: src/groupadd.c:347 src/groupmod.c:367 #, c-format msgid "%s: invalid group %s\n" -msgstr "%s: 杹 楯艕鼩 瀌塤 `%s'\n" +msgstr "%s: 庢 峟帠庥庢 怷弮峎帤帢 `%s'\n" -#: src/groupadd.c:363 src/useradd.c:1313 +#: src/groupadd.c:364 src/useradd.c:1173 #, c-format msgid "%s: -O requires NAME=VALUE\n" -msgstr "%s: -O 摫摋醲 槨玶=埩昒\n" +msgstr "%s: -O 帢帢庣庰巹 =峇\n" -#: src/groupadd.c:407 src/groupdel.c:173 src/groupmod.c:401 src/useradd.c:1428 -#: src/userdel.c:312 src/usermod.c:576 +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 #, c-format msgid "%s: cannot rewrite group file\n" -msgstr "%s: 撦罍摐葐 歑摿樍蜤暡硻 鐐 摙灚蜍 瀌塤燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupadd.c:415 src/groupdel.c:179 src/groupmod.c:409 src/useradd.c:1437 -#: src/userdel.c:319 src/usermod.c:722 +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 #, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s: 撦罍摐葐 歑摿樍蜤暡硻 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/groupadd.c:433 src/groupdel.c:198 src/groupmod.c:427 src/userdel.c:403 +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s: 鍵罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 瀌塤燡n" +msgstr "%s: 帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupadd.c:438 src/groupdel.c:202 src/groupmod.c:432 +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 #, c-format msgid "%s: unable to open group file\n" -msgstr "%s: 鍵罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 瀌塤燡n" +msgstr "%s: 帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupadd.c:445 src/groupdel.c:207 src/groupmod.c:439 src/userdel.c:414 +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: 鍵罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "%s: 帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/groupadd.c:451 src/groupdel.c:212 src/groupmod.c:445 +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: 鍵罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "%s: 帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/groupadd.c:562 +#: src/groupadd.c:563 #, c-format msgid "%s: group %s exists\n" -msgstr "%s: 瀌塤 %s 臝塱灚嬞n" +msgstr "%s: 怷弮峎帤帢 %s 峎庰庣\n" -#: src/groupdel.c:92 -msgid "usage: groupdel group\n" -msgstr "虀祼: groupdel 瀌塤塿n" +#: src/groupdel.c:88 +#, fuzzy +msgid "Usage: groupdel group\n" +msgstr "峸庢: groupdel 怷弮峎帤帢\n" -#: src/groupdel.c:110 src/groupmod.c:184 src/groupmod.c:233 +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 #, c-format msgid "%s: error removing group entry\n" -msgstr "%s: 郣塝憼 罼轗 鐋 僸摦鼁巑 罼酃觾鼩鵰 瀌塤摥\n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷弮峎帤帢\n" -#: src/groupdel.c:122 src/groupmod.c:204 +#: src/groupdel.c:119 src/groupmod.c:205 #, c-format msgid "%s: error removing group dbm entry\n" -msgstr "%s: 郣塝憼 罼轗 鐋 僸摦鼁巑 罼酃觾鼩鵰 黀 dbm 摙灚蜍 瀌塤燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 dbm 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupdel.c:137 +#: src/groupdel.c:135 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 暡摲鼫鵰 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋 " -"瀌塤燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 " +"怷弮峎帤彖\n" -#: src/groupdel.c:150 src/groupmod.c:254 +#: src/groupdel.c:149 src/groupmod.c:255 #, c-format msgid "%s: error removing shadow group dbm entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 暡摲鼫鵰 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#. -#. * Can't remove the group. -#. -#: src/groupdel.c:254 +#: src/groupdel.c:255 #, c-format msgid "%s: cannot remove user's primary group.\n" -msgstr "%s: 撦罍摐葐 暡摲鼫鵰 鐋 貘酃壝濋硻 瀌塤摥 鐐 虀祼鐋.\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢帢巹庰庢 庢 帢庣庥峸 怷弮峎帤帢 怷 峸庢.\n" -#: src/groupdel.c:355 src/groupmod.c:550 +#: src/groupdel.c:359 src/groupmod.c:551 #, c-format msgid "%s: group %s does not exist\n" -msgstr "%s: 瀌塤 %s 麧 臝塱灚嬞n" +msgstr "%s: 怷弮峎帤帢 %s 帤庰彖 峎庰庣\n" -#: src/groupdel.c:369 src/groupmod.c:566 +#: src/groupdel.c:373 src/groupmod.c:567 #, c-format msgid "%s: group %s is a NIS group\n" -msgstr "%s: 瀌塤 %s 橀罅 NIS 瀌塤塿n" +msgstr "%s: 怷弮峎帤帢 %s 庰巹彖帢庣 NIS 怷弮峎帤帢\n" -#: src/groupdel.c:375 src/groupmod.c:571 src/userdel.c:776 src/usermod.c:1045 +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 #, c-format msgid "%s: %s is the NIS master\n" -msgstr "%s: %s 橀罅 蕡齌濿 僸摓瀌澞轘 NIS\n" +msgstr "%s: %s 庰巹彖帢庣 怷 庥庣怷 帤庣帢庥怷弮庣峸 NIS\n" #: src/groupmems.c:95 msgid "Member already exists\n" @@ -1016,7 +914,7 @@ msgid "Member to remove could not be found\n" msgstr "" #: src/groupmems.c:158 -msgid "usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" msgstr "" #: src/groupmems.c:201 @@ -1034,62 +932,63 @@ msgstr "" #: src/groupmems.c:215 #, fuzzy msgid "Unable to lock group file\n" -msgstr "鍵罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 瀌塤燡n" +msgstr "帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 怷弮峎帤彖\n" #: src/groupmems.c:220 #, fuzzy msgid "Unable to open group file\n" -msgstr "鍵罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 瀌塤燡n" +msgstr "帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 怷弮峎帤彖\n" #: src/groupmems.c:240 #, fuzzy msgid "Cannot close group file\n" -msgstr "撦罍摐葐 摿檽蜵敳濿 摙灚蜍 瀌塤燡n" +msgstr "帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupmod.c:103 -msgid "usage: groupmod [-g gid [-o]] [-n name] group\n" -msgstr "虀祼: groupmod [-g gid [-o]] [-n 臩憼] 瀌塤塿n" +#: src/groupmod.c:104 +#, fuzzy +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "峸庢: groupmod [-g gid [-o]] [-n 彖怷弮帢] 怷弮峎帤帢\n" -#: src/groupmod.c:161 +#: src/groupmod.c:162 #, fuzzy, c-format msgid "%s: %s not found in /etc/group\n" -msgstr "%s: %s 麧 碫楴賙 黀 /etc/passwd\n" +msgstr "%s: %s 帤庰彖 帣峟庛庢庥庰 怷 /etc/passwd\n" -#: src/groupmod.c:247 +#: src/groupmod.c:248 #, c-format msgid "%s: cannot add new dbm shadow group entry\n" msgstr "" -"%s: 撦罍摐葐 貘瀀魶聬 縻摥 dbm 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋 " -"瀌塤燡n" +"%s: 帢帤彖帢弮巹帢 怷庛峸庥庢 彖峟帢 dbm 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 " +"怷弮峎帤彖\n" -#: src/groupmod.c:300 +#: src/groupmod.c:301 #, fuzzy, c-format msgid "%s: %u is not a unique gid\n" -msgstr "%s: 孲 %ld 麧 橀罅 斀罅僸蕓 gid\n" +msgstr "%s: 峇怷 %ld 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥 gid\n" -#: src/groupmod.c:330 +#: src/groupmod.c:331 #, c-format msgid "%s: %s is not a unique name\n" -msgstr "%s: 孲 %s 麧 橀罅 斀罅僸蕓 臩憼\n" +msgstr "%s: 峇怷 %s 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥 彖怷弮帢\n" #: src/groups.c:59 #, c-format msgid "unknown user %s\n" -msgstr "塨薋黀濿 虀祼鐋: %s\n" +msgstr "峎帠彖怷 峸庢: %s\n" #: src/grpck.c:87 #, fuzzy, c-format msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" -msgstr "郩祼: %s [-r] [-s] [group [gshadow]]\n" +msgstr "峓峸庢: %s [-r] [-s] [group [gshadow]]\n" #: src/grpck.c:90 #, fuzzy, c-format msgid "Usage: %s [-r] [-s] [group]\n" -msgstr "郩祼: %s [-r] [-s] [group]\n" +msgstr "峓峸庢: %s [-r] [-s] [group]\n" #: src/grpck.c:108 src/pwck.c:108 msgid "No" -msgstr "祅" +msgstr "庣" #: src/grpck.c:192 src/pwck.c:175 #, c-format @@ -1099,259 +998,232 @@ msgstr "" #: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 %s\n" #: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:202 src/pwck.c:242 #: src/pwck.c:251 #, c-format msgid "%s: cannot open file %s\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 摙灚蜍 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 帢庰巹怷 %s\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:311 msgid "invalid group file entry\n" -msgstr "杹 楯艕鼩 罼酃觾鼩鵰 黀 摙灚蜍 瀌塤燡n" +msgstr "庢 峟帠庥庢 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" #: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 #: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 #: src/pwck.c:543 #, c-format msgid "delete line `%s'? " -msgstr "僸摦鼁巑 蜤摐徻 `%s'; " +msgstr "帤庣帢帠帢峸 帠帢弮弮峸 `%s'; " -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:374 msgid "duplicate group entry\n" -msgstr "摿鏻蜤暡 罼酃觾鼩鵰 黀 摙灚蜍 瀌塤燡n" +msgstr "帢彖庣帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" #: src/grpck.c:391 #, c-format msgid "invalid group name `%s'\n" -msgstr "杹 楯艕厴 臩憼 瀌塤摥 `%s'\n" +msgstr "庢 峟帠庥怷 彖怷弮帢 怷弮峎帤帢 `%s'\n" #: src/grpck.c:418 #, c-format msgid "group %s: no user %s\n" -msgstr "瀌塤 %s: 麧 臝塱灚 虀祼鐋 %s\n" +msgstr "怷弮峎帤帢 %s: 帤庰彖 峎庰庣 峸庢 %s\n" #: src/grpck.c:420 src/grpck.c:590 #, c-format msgid "delete member `%s'? " -msgstr "僸摦鼁巑 徾錝蘪 `%s'; " +msgstr "帤庣帢帠帢峸 弮峟弇怷 `%s'; " -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:457 msgid "invalid shadow group file entry\n" -msgstr "杹 楯艕鼩 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "庢 峟帠庥庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:520 msgid "duplicate shadow group entry\n" -msgstr "摿鏻蜤暡 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "帢彖庣帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" #: src/grpck.c:537 msgid "no matching group file entry\n" -msgstr "櫻 碫楴賙 罼酃觾鼩鵰 黀 摙灚蜍 瀌塤 豵 罅 酃濄橎緪嬞n" +msgstr "庰彖 帣峟庛庢庥庰 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖 怷 彖帢 帢庣庣峎庤庰庣\n" #: src/grpck.c:558 #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "鵳澸儃 瀌塤 %s: 櫻 臝塱灚 僸暠樥齌黀硻 虀祼鐋 %s\n" +msgstr "庥庣帤庢 怷弮峎帤帢 %s: 庰彖 峎庰庣 帤庣帢庰庣庣峸 峸庢 %s\n" #: src/grpck.c:560 #, c-format msgid "delete administrative member `%s'? " -msgstr "僸摦鼁巑 僸暠樥齌黀濋燽 徾錝蘪 `%s'; " +msgstr "帤庣帢帠帢峸 帤庣帢庰庣庣庣庥怷 弮峟弇怷 `%s'; " #: src/grpck.c:588 #, c-format msgid "shadow group %s: no user %s\n" -msgstr "鵳澸儃 瀌塤 %s: 麧 臝塱灚 虀祼鐋 %s\n" +msgstr "庥庣帤庢 怷弮峎帤帢 %s: 帤庰彖 峎庰庣 峸庢 %s\n" #: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 #, c-format msgid "%s: cannot update file %s\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 摙灚蜍 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 帢庰巹怷 %s\n" #: src/grpck.c:647 src/pwck.c:612 #, c-format msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: 酃 摙灚葐 摿摿澒鳿罼. 髑醲錧黀 mkpasswd\n" +msgstr "%s: 帢 帢庰巹帢 帢彖帢彖庰庛庢庥帢彖. 庥庰弇峟庰 mkpasswd\n" #: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 #, c-format msgid "%s: no changes\n" -msgstr "%s: 罼擩 摠錆蜛\n" +msgstr "%s: 庥帢弮庣峎 帢弇弇帢帠峸\n" #: src/grpck.c:651 src/pwck.c:616 #, c-format msgid "%s: the files have been updated\n" -msgstr "%s: 酃 摙灚葐 摿摿澒鳿罼燡n" +msgstr "%s: 帢 帢庰巹帢 帢彖帢彖庰庛庢庥帢彖\n" #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 瀌塤燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 怷弮峎帤彖\n" #: src/grpconv.c:65 src/grpunconv.c:61 #, c-format msgid "%s: can't open group file\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 瀌塤燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 怷弮峎帤彖\n" #: src/grpconv.c:70 src/grpunconv.c:66 #, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" #: src/grpconv.c:76 src/grpunconv.c:72 #, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" #: src/grpconv.c:94 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "" -"%s: 撦罍摐葐 暡摲鼫鵰 鐋 瀌塤摥 %s, 摫 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" -"瀌塤燡n" +"%s: 帢帤彖帢弮巹帢 帢帢巹庰庢 庢 怷弮峎帤帢 %s, 帢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" +"怷弮峎帤彖\n" -#: src/grpconv.c:138 src/pwconv.c:153 +#: src/grpconv.c:133 src/pwconv.c:154 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "" -"%s: 撦罍摐葐 摿摿歈鵰 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋 蜒 鐐 %" +"%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 帠庣帢 怷彖 %" "s\n" -#: src/grpconv.c:148 src/grpunconv.c:91 +#: src/grpconv.c:143 src/grpunconv.c:91 #, c-format msgid "%s: can't update entry for group %s\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 罼酃觾鼩鵰 蜒 鐋 瀌塤 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 帠庣帢 庢彖 怷弮峎帤帢 %s\n" -#: src/grpconv.c:155 src/grpunconv.c:99 +#: src/grpconv.c:150 src/grpunconv.c:99 #, c-format msgid "%s: can't update shadow group file\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/grpconv.c:160 src/grpunconv.c:105 +#: src/grpconv.c:155 src/grpunconv.c:105 #, c-format msgid "%s: can't update group file\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 蜒 鐐 摙灚蜍 瀌塤燡n" - -#: src/grpconv.c:175 src/grpunconv.c:127 -#, c-format -msgid "%s: not configured for shadow group support.\n" -msgstr "%s: 櫻 橀罅 僸摐瀎穱徾臩 蜒 鵳澸儃 黼膻賚敳濋 瀌塤.\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 帠庣帢 怷 帢庰巹怷 怷弮峎帤彖\n" #: src/grpunconv.c:110 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "" -"%s: 櫻 橀罅 勯罅鏸 罅 僸摦鼁欈 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +"%s: 庰彖 庰巹彖帢庣 帤彖帢彖 彖帢 帤庣帢帠帢庰巹 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" #: src/id.c:53 -msgid "usage: id [-a]\n" -msgstr "虀祼: id [-a]\n" +#, fuzzy +msgid "Usage: id [-a]\n" +msgstr "峸庢: id [-a]\n" #: src/id.c:55 -msgid "usage: id\n" -msgstr "虀祼: id\n" +#, fuzzy +msgid "Usage: id\n" +msgstr "峸庢: id\n" -#. -#. * Start off the group message. It will be of the format -#. * -#. * groups=###(aaa),###(aaa),###(aaa) -#. * -#. * where "###" is a numerical value and "aaa" is the -#. * corresponding name for each respective numerical value. -#. #: src/id.c:169 msgid " groups=" -msgstr " 瀌塤殣=" +msgstr " 怷弮峎帤庰=" #: src/lastlog.c:110 src/lastlog.c:116 #, c-format -msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n" +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" msgstr "" #: src/lastlog.c:181 msgid "Username Port From Latest\n" -msgstr "潤瀌塺郩祼鐋 鼁 闋 婍錼蘟摲塿n" +msgstr "彖怷弮帢_峓峸庢 帢 峇庰弇庰帢巹帢\n" #: src/lastlog.c:183 msgid "Username Port Latest\n" -msgstr "潤瀌塺郩祼鐋 鼁 婍錼蘟摲塿n" +msgstr "彖怷弮帢_峓峸庢 帢 峇庰弇庰帢巹帢\n" -#: src/lastlog.c:197 +#: src/lastlog.c:198 msgid "**Never logged in**" -msgstr "**忯擩 橀鵿儌 黀 匷黀賚**" +msgstr "**帢弮庣峎 庰巹怷帤怷 怷 庢弮帢**" -#: src/login.c:185 -#, c-format -msgid "usage: %s [-p] [name]\n" -msgstr "虀祼: %s [-p] [臩憼]\n" +#: src/login.c:175 +#, fuzzy, c-format +msgid "Usage: %s [-p] [name]\n" +msgstr "峸庢: %s [-p] [彖怷弮帢]\n" -#: src/login.c:188 +#: src/login.c:178 #, c-format msgid " %s [-p] [-h host] [-f name]\n" -msgstr " %s [-p] [-h 匷黀賚塴 [-f 臩憼]\n" +msgstr " %s [-p] [-h 庢弮帢] [-f 彖怷弮帢]\n" -#: src/login.c:190 +#: src/login.c:180 #, c-format msgid " %s [-p] -r host\n" -msgstr " %s [-p] -r 匷黀賚塿n" +msgstr " %s [-p] -r 庢弮帢\n" -#: src/login.c:274 +#: src/login.c:259 msgid "Invalid login time\n" -msgstr "攬攠錎楜 鼁 樥齘儌騱n" +msgstr "帢弇弮峟彖庢 帢 庰庣帤怷\n" -#: src/login.c:329 +#: src/login.c:314 msgid "" "\n" "System closed for routine maintenance\n" msgstr "" "\n" -"孲 匷黀賚 椻錼澞 蜒 黼薀碖踠 厴蘟蜁摥\n" +"峇怷 庢弮帢 峟庥弇庰庣庰 帠庣帢 彖峸庢庢 怷巹彖帢\n" -#: src/login.c:340 +#: src/login.c:325 msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[凊鵘罼檟 摫瀀罽殢趛 -- 橀鵿儌 鐐 root 歑殦鵘謦.]\n" +"[帢峎庥帢弮庢 帢怷彖帤庰庢 -- 庰巹怷帤怷 怷 root 庰庰峎庢.]\n" -#: src/login.c:377 +#: src/login.c:362 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" "\n" -" 僸撦濋摷葐 樥齘儌 醲儵敳裍鐋耪 懤轗 摫 %d 麧蘟殥錼贄.\n" +" 帤庣帢帤庣庥帢巹帢 庰庣帤怷 庰弮帢巹庢庥庰 弮庰峎 帢 %d 帤庰庰弇庰帢.\n" -#: src/login.c:689 +#: src/login.c:648 #, c-format msgid " on `%.100s' from `%.200s'" -msgstr " 黀 `%.100s' 摫 `%.200s'" +msgstr " 怷 `%.100s' 帢 `%.200s'" -#: src/login.c:693 +#: src/login.c:652 #, c-format msgid " on `%.100s'" -msgstr " 黀 `%.100s'" +msgstr " 怷 `%.100s'" -#: src/login.c:852 +#: src/login.c:811 #, c-format msgid "" "\n" @@ -1360,73 +1232,73 @@ msgstr "" "\n" "%s login: " -#: src/login.c:855 +#: src/login.c:814 msgid "login: " msgstr "login: " -#: src/login.c:1071 src/sulogin.c:233 +#: src/login.c:1013 src/sulogin.c:205 msgid "Login incorrect" -msgstr "灌撦濋摷葐 樥齘儌 摫椼蘙" +msgstr "庣帢帤庣庥帢巹帢 庰庣帤怷 帢峟庰" -#: src/login.c:1265 +#: src/login.c:1193 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" -"哢櫇毈瀔檽踠: 橀鵿儌 歑摿樇殥蜧豵歕鳿耪 懤轗 摫 貘瀀齌薤 摫氋錼澞檇.\n" +"怷庰庣帤怷怷巹庢庢: 庰巹怷帤怷 庰帢彖庰彖庰帠怷怷庣峸庛庢庥庰 弮庰峎 帢 怷庣彖 帢怷庥弇庰庣弮.\n" -#: src/login.c:1278 +#: src/login.c:1207 #, c-format msgid "Last login: %s on %s" -msgstr "婍錼蘟摲 橀鵿儌: %s 黀 %s" +msgstr "峇庰弇庰帢巹帢 庰巹怷帤怷: %s 怷 %s" -#: src/login.c:1281 +#: src/login.c:1210 #, c-format msgid "Last login: %.19s on %s" -msgstr "婍錼蘟摲 橀鵿儌: %.19s 黀 %s" +msgstr "峇庰弇庰帢巹帢 庰巹怷帤怷: %.19s 怷 %s" -#: src/login.c:1287 +#: src/login.c:1216 #, c-format msgid " from %.*s" -msgstr " 摫 %.*s" +msgstr " 帢 %.*s" -#: src/login.c:1364 +#: src/login.c:1293 msgid "Starting rad_login\n" -msgstr "貲摙鍡 rad_login\n" +msgstr "彖帢徆庢 rad_login\n" #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" msgstr "" -"%s: 櫻 臝塱灚 DBM 瘌鵰 麧儌徾薋 黀 匷黀賚 - 罼擩 樇楒蜲殧 麧 " -"樏醲錼裎摋\n" +"%s: 庰彖 峎庰庣 DBM 帣峎庢 帤庰帤怷弮峟彖彖 怷 庢弮帢 - 庥帢弮庣峎 庰彖峟帠庰庣帢 帤庰彖 " +"庰庥庰弇庰巹帢庣\n" #: src/mkpasswd.c:232 src/mkpasswd.c:237 #, c-format msgid "%s: cannot overwrite file %s\n" -msgstr "%s: 撦罍摐葐 樍蜤暡硻 謣薋 摫 鐐 摙灚蜍 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 庰帠帠帢峸 峎彖 帢 怷 帢庰巹怷 %s\n" #: src/mkpasswd.c:252 #, c-format msgid "%s: cannot open DBM files for %s\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 DBM 摙灚裐 蜒 鐐 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 DBM 帢庰巹彖 帠庣帢 怷 %s\n" #: src/mkpasswd.c:287 #, c-format msgid "%s: the beginning with " -msgstr "%s: 摙斖 懤 " +msgstr "%s: 庢 帢峸 弮庰 " #: src/mkpasswd.c:288 #, fuzzy msgid " is too long\n" -msgstr " 厞錔 憼膲橎 謥魠塿n" +msgstr " 怷弇 弮帢庥庣峎 庰帤巹帢\n" #: src/mkpasswd.c:315 #, c-format msgid "%s: error parsing line \"%s\"\n" -msgstr "%s: 郣塝憼 罼轗 鐋 歑槴殥蝁鵸 鐋 蜤摐徻 \"%s\"\n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 庰庰徆庰帠帢巹帢 庢 帠帢弮弮峸 \"%s\"\n" #: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338 msgid "adding record for name " -msgstr "貘瀀魶聬 罼酃觾鼩鵰 蜒 臩憼 " +msgstr "怷庛峸庥庢 庥帢帢庢庢 帠庣帢 彖怷弮帢 " #: src/mkpasswd.c:324 src/mkpasswd.c:329 src/mkpasswd.c:334 src/mkpasswd.c:339 #: src/mkpasswd.c:345 src/mkpasswd.c:351 src/mkpasswd.c:356 src/mkpasswd.c:361 @@ -1436,410 +1308,348 @@ msgstr "" #: src/mkpasswd.c:344 src/mkpasswd.c:350 src/mkpasswd.c:355 src/mkpasswd.c:360 #, c-format msgid "%s: error adding record for " -msgstr "%s: 郣塝憼 罼轗 鐋 貘瀀魶聬 罼酃觾鼩鵰 蜒 " +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 庥帢帢庢庢 帠庣帢 " #: src/mkpasswd.c:378 #, c-format msgid "added %d entries, longest was %d\n" -msgstr "貘瀀轕鳿罼 %d 罼酃蠮麎鵴澽, 懤蝁錔醲鼩 禂摿 %d\n" +msgstr "怷峟庛庢庥帢彖 %d 庥帢帢峸庰庣, 庢 弮庰帠帢弇庰庢 峸帢彖 %d\n" #: src/mkpasswd.c:392 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" -msgstr "郩祼: %s [-vf] [-p|g|sp|sg] 摙灚蜍\n" +msgstr "峓峸庢: %s [-vf] [-p|g|sp|sg] 帢庰巹怷\n" #: src/mkpasswd.c:395 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" -msgstr "郩祼: %s [-vf] [-p|g|sp] 摙灚蜍\n" +msgstr "峓峸庢: %s [-vf] [-p|g|sp] 帢庰巹怷\n" #: src/mkpasswd.c:398 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" -msgstr "郩祼: %s [-vf] [-p|g] 摙灚蜍\n" +msgstr "峓峸庢: %s [-vf] [-p|g] 帢庰巹怷\n" #: src/newgrp.c:61 -msgid "usage: newgrp [-] [group]\n" -msgstr "虀祼: newgrp [-] [瀌塤塴\n" +#, fuzzy +msgid "Usage: newgrp [-] [group]\n" +msgstr "峸庢: newgrp [-] [怷弮峎帤帢]\n" #: src/newgrp.c:63 -msgid "usage: sg group [[-c] command]\n" -msgstr "虀祼: sg 瀌塤 [[-c] 樇鐐錞]\n" +#, fuzzy +msgid "Usage: sg group [[-c] command]\n" +msgstr "峸庢: sg 怷弮峎帤帢 [[-c] 庰彖怷弇峸]\n" -#: src/newgrp.c:136 +#: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" -msgstr "塨薋黀 uid: %u\n" +msgstr "峎帠彖怷 uid: %u\n" -#: src/newgrp.c:219 +#: src/newgrp.c:214 #, c-format msgid "unknown gid: %lu\n" -msgstr "塨薋黀 gid: %lu\n" +msgstr "峎帠彖怷 gid: %lu\n" -#: src/newgrp.c:365 src/newgrp.c:374 +#: src/newgrp.c:360 src/newgrp.c:369 msgid "Sorry.\n" -msgstr "坫謣憼.\n" +msgstr "峎弮帢庣.\n" -#: src/newgrp.c:472 +#: src/newgrp.c:469 msgid "too many groups\n" -msgstr "謣鼁 豵錭椯 瀌塤殣\n" +msgstr "峎帢 怷弇弇峟 怷弮峎帤庰\n" #: src/newusers.c:78 #, c-format msgid "Usage: %s [input]\n" -msgstr "郩祼: %s [橀鵿儌瀧\n" +msgstr "峓峸庢: %s [庰巹怷帤怷]\n" -#: src/newusers.c:407 +#: src/newusers.c:388 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 鐐 /etc/passwd.\n" +msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 /etc/passwd.\n" -#: src/newusers.c:419 +#: src/newusers.c:400 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 摙灚裐, 鍕罅儌膦幪黀 摙裼醲鼁\n" +msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 帢庰巹彖, 徆帢彖帢帤怷庥庣弮峎庰 帢帠庰帢\n" -#: src/newusers.c:435 +#: src/newusers.c:416 #, c-format msgid "%s: can't open files\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 鐒 摙灚裐燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 彖 帢庰巹彖\n" + +#: src/newusers.c:461 +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: 帠帢弮弮峸 %d: 弮庢 峟帠庥庢 帠帢弮弮峸\n" #: src/newusers.c:480 #, c-format -msgid "%s: line %d: invalid line\n" -msgstr "%s: 蜤摐徻 %d: 懞 楯艕鼩 蜤摐徻\n" - -#: src/newusers.c:499 -#, c-format msgid "%s: line %d: can't create GID\n" -msgstr "%s: 蜤摐徻 %d: 撦罍摐葐 儃擩瀦鼖葐 GID\n" +msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 GID\n" -#: src/newusers.c:515 +#: src/newusers.c:496 #, c-format msgid "%s: line %d: can't create UID\n" -msgstr "%s: 蜤摐徻 %d: 撦罍摐葐 儃擩瀦鼖葐 UID\n" +msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 UID\n" -#: src/newusers.c:528 +#: src/newusers.c:509 #, c-format msgid "%s: line %d: cannot find user %s\n" -msgstr "%s: 蜤摐徻 %d: 撦罍摐葐 濆鼫鵰 虀祼鐋 %s\n" +msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 庰庰庢 峸庢 %s\n" -#: src/newusers.c:537 +#: src/newusers.c:518 #, c-format msgid "%s: line %d: can't update password\n" -msgstr "%s: 蜤摐徻 %d: 撦罍摐葐 摿摿歈鵰 黼膻賚敳濋燽\n" +msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 彖庛庢弮帢庣庥怷\n" -#: src/newusers.c:555 +#: src/newusers.c:536 #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "%s: 蜤摐徻 %d: 摫濻蘙葐 儃擩瀦鼖葐 罼酃錪蜧(mkdir)\n" +msgstr "%s: 帠帢弮弮峸 %d: 帢怷巹帢 帤庢弮庣怷帠巹帢 庥帢帢弇帠怷(mkdir)\n" -#: src/newusers.c:561 +#: src/newusers.c:542 #, c-format msgid "%s: line %d: chown failed\n" -msgstr "%s: 蜤摐徻 %d: 摫濻蘙葐 摠錆蜛 毈濈臲禂(chown)\n" +msgstr "%s: 帠帢弮弮峸 %d: 帢怷巹帢 帢弇弇帢帠峸 庣帤庣怷庥峸庢(chown)\n" -#: src/newusers.c:571 +#: src/newusers.c:552 #, c-format msgid "%s: line %d: can't update entry\n" -msgstr "%s: 蜤摐徻 %d: 撦罍摐葐 摿摿歈鵰 罼酃觾鼩鵰瀙n" +msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢\n" -#: src/newusers.c:603 +#: src/newusers.c:584 #, c-format msgid "%s: error updating files\n" -msgstr "%s: 郣塝憼 罼轗 鐋 樇賚楒鵰 摙灚裐燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 庰彖庢弮峟庢 帢庰巹彖\n" -#: src/passwd.c:174 -#, c-format -msgid "usage: %s [-f|-s] [name]\n" -msgstr "虀祼: %s [-f|-s] [臩憼]\n" +#: src/passwd.c:155 +#, fuzzy, c-format +msgid "Usage: %s [-f|-s] [name]\n" +msgstr "峸庢: %s [-f|-s] [彖怷弮帢]\n" -#: src/passwd.c:178 +#: src/passwd.c:159 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" -msgstr " %s [-x 懤.] [-n 槶媸.] [-w 貘櫇毈.] [-i 摿樇殥裼] 臩憼\n" +msgstr " %s [-x 弮庰帠.] [-n 庰弇峎.] [-w 怷庰庣帤.] [-i 帢彖庰彖庰帠] 彖怷弮帢\n" -#: src/passwd.c:180 +#: src/passwd.c:161 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" -msgstr " %s {-l|-u|-d|-S|-e} 臩憼\n" +msgstr " %s {-l|-u|-d|-S|-e} 彖怷弮帢\n" -#: src/passwd.c:283 -#, c-format -msgid "User %s has a TCFS key, his old password is required.\n" -msgstr " 虀祼鐋 %s 歃樥 膹樥魠 TCFS, 摫摋醲裎摋 鐐 謯錁 黼膻賚敳濋.\n" - -#: src/passwd.c:286 -msgid "You can use -t option to force the change.\n" -msgstr "" -"泫瀎橀醲 罅 虀踠濇瀔毉祼殦 鐋 -t 謯鵘懤鐙 蜒 罅 槴摿摦縔鵴醲 鐋燡n" -"貘摦憼鐐豵蛖鵰 鐋 摠錆蜛.\n" - -#: src/passwd.c:292 +#: src/passwd.c:216 msgid "Old password: " -msgstr "凊錁 郚膻賚敳濋: " +msgstr "帢弇庣 峉彖庛庢弮帢庣庥: " -#: src/passwd.c:301 +#: src/passwd.c:225 #, c-format msgid "Incorrect password for `%s'\n" -msgstr "攬攠錎楜 黼膻賚敳濋 蜒 鐐 `%s'\n" +msgstr "帢弇弮峟彖怷 彖庛庢弮帢庣庥 帠庣帢 怷彖 `%s'\n" -#: src/passwd.c:314 -#, c-format -msgid "Warning: user %s has a TCFS key.\n" -msgstr "哢櫇毈瀔檽踠: 虀祼鐋 %s 歃樥 膹樥魠 TCFS.\n" - -#: src/passwd.c:333 +#: src/passwd.c:249 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -"體鶈蜲醲 鐐 縻 黼膻賚敳濋 (槶媸澞鐐 %d, 徾蜒黀 %d 欒鼁臲碖殣)\n" -"凊鼁罼錌 虀踠濇瀔毉祼醲 楜 黼罽礭鶂 摫 耪攠錆葐 罼 擩膲 蜤塙憼酃\n" -"罼噮 罼 摙氆斀.\n" +"庣峎帠庰庰 怷 彖峟怷 彖庛庢弮帢庣庥 (庰弇峎庣怷 %d, 弮峟帠庣怷 %d 帢帢庥峸庰)\n" +"帢帢庥帢弇 庢庣弮怷怷庣峸庰 峟彖帢 彖帤帢弮 帢 庥庰帢弇帢巹帢 庥帢庣 弮庣庥峎 帠峎弮弮帢帢\n" +"庥帢庛 庥帢庣 帢庣庛弮怷.\n" -#: src/passwd.c:339 +#: src/passwd.c:255 msgid "New password: " -msgstr "俍 郚膻賚敳濋: " +msgstr "峟怷 峉彖庛庢弮帢庣庥: " -#: src/passwd.c:350 +#: src/passwd.c:266 msgid "Try again.\n" -msgstr "挓罅儌膦幪黀.\n" +msgstr "帢彖帢帤怷庥庣弮峎庰.\n" -#: src/passwd.c:361 +#: src/passwd.c:277 msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"哢瀀濷: 撦罅斀 黼膻賚敳濋 (樥鶈蜲轕 鐐 謣錁 蜒 罅 鐐 虀踠濇瀔毉祼殦).\n" +"怷怷峸: 帢帤彖帢弮怷 彖庛庢弮帢庣庥 (庰庣峎帠庰峟 怷 峎弇庣 帠庣帢 彖帢 怷 庢庣弮怷怷庣峸庰庰).\n" -#: src/passwd.c:371 +#: src/passwd.c:287 msgid "They don't match; try again.\n" -msgstr "櫻 酃濄橎緮罍. 矓膦幪黀 鍕縰.\n" +msgstr "庰彖 帢庣庣峎庤怷彖. 怷庥庣弮峎庰 徆帢彖峎.\n" -#: src/passwd.c:451 src/passwd.c:469 +#: src/passwd.c:364 src/passwd.c:382 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "孲 黼膻賚敳濋 蜒 鐐 %s 麧 斶瀎橀 罅 摠醏鍷.\n" +msgstr "峇怷 彖庛庢弮帢庣庥 帠庣帢 怷彖 %s 帤庰彖 弮怷庰巹 彖帢 帢弇弇峎徆庰庣.\n" -#: src/passwd.c:494 +#: src/passwd.c:396 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "郚蝂懞, 鐐 黼膻賚敳濋 蜒 鐐 %s 麧 斶瀎橀 罅 摠醏鍷 摓懞.\n" +msgstr "峉帠彖弮庢, 怷 彖庛庢弮帢庣庥 帠庣帢 怷彖 %s 帤庰彖 弮怷庰巹 彖帢 帢弇弇峎徆庰庣 帢庥弮庢.\n" -#: src/passwd.c:614 +#: src/passwd.c:479 #, c-format msgid "%s: out of memory\n" -msgstr "%s: 麧 臝塱灚 槶濆鳺鼩 擨碡蔌n" +msgstr "%s: 帤庰彖 峎庰庣 庰弇庰庛庰庢 弮彖峸弮庢\n" -#: src/passwd.c:769 -msgid "Cannot lock the TCFS key database; try again later\n" -msgstr "鍵罍摐葐 膹樥噘憼鐐 鐋 瘌鵰 膹樥僸 鐐 TCFS. 矓膦幪黀 摙裼醲鼁\n" - -#: src/passwd.c:777 -msgid "Cannot open the TCFS key database.\n" -msgstr "鍵罍摐葐 摿檽蜵敳濿 鐋 瘌鵰 膹樥僸 鐐 TCFS.\n" - -#: src/passwd.c:785 -msgid "Error updating the TCFS key database.\n" -msgstr "郣塝憼 罼轗 鐋 摿摿歈鵰 鐋 瘌鵰 膹樥僸 鐐 TCFS.\n" - -#: src/passwd.c:792 -msgid "Cannot commit TCFS changes.\n" -msgstr "鍵罍摐葐 纆瀔檽踠趛 鐒 摠錆裻 黀 TCFS.\n" - -#: src/passwd.c:975 +#: src/passwd.c:730 #, c-format msgid "%s: Cannot execute %s" -msgstr "%s: 鍵罍摐葐 樏轕錼鵰 鐐 %s" +msgstr "%s: 帤彖帢弮巹帢 庰庥峟弇庰庢 怷 %s" -#: src/passwd.c:1077 +#: src/passwd.c:815 #, c-format msgid "%s: repository %s not supported\n" -msgstr "%s: 摫歞碅 %s 麧 臝瀀鐋麌緪酃嬞n" +msgstr "%s: 庢 帢怷庛峸庥庢 %s 帤庰彖 怷庢巹庤庰帢庣\n" -#: src/passwd.c:1152 +#: src/passwd.c:890 #, c-format msgid "%s: Permission denied\n" -msgstr "%s: 嗡樥 摫瀎麌灕賙嫹n" +msgstr "%s: 帤庰庣帢 帢怷巹庛庢庥庰\n" -#: src/passwd.c:1176 +#: src/passwd.c:914 #, c-format msgid "You may not change the password for %s.\n" -msgstr "櫻 斶瀎橀醲 罅 摠醏鍷醲 鐐 黼膻賚敳濋 蜒 鐐() %s.\n" +msgstr "庰彖 弮怷庰巹庰 彖帢 帢弇弇峎徆庰庰 怷 彖庛庢弮帢庣庥 帠庣帢 怷(彖) %s.\n" -#: src/passwd.c:1242 +#: src/passwd.c:962 #, c-format msgid "Changing password for %s\n" -msgstr "鍛錆蜛 黼膻賚敳濋燽 蜒 鐐 %s\n" +msgstr "弇弇帢帠峸 彖庛庢弮帢庣庥怷 帠庣帢 怷彖 %s\n" -#: src/passwd.c:1246 +#: src/passwd.c:966 #, c-format msgid "The password for %s is unchanged.\n" -msgstr "孲 黼膻賚敳濋 蜒 鐐 %s 麧 塝錆鍷.\n" +msgstr "峇怷 彖庛庢弮帢庣庥 帠庣帢 怷彖 %s 帤庰彖 峎弇弇帢徆庰.\n" -#: src/passwd.c:1297 +#: src/passwd.c:1016 msgid "Password changed.\n" -msgstr "孲 黼膻賚敳濋 塝錆鍷.\n" +msgstr "峇怷 彖庛庢弮帢庣庥 峎弇弇帢徆庰.\n" #: src/pwck.c:87 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" -msgstr "郩祼: %s [-q] [-r] [-s] [passwd [shadow]]\n" +msgstr "峓峸庢: %s [-q] [-r] [-s] [passwd [shadow]]\n" #: src/pwck.c:90 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" -msgstr "郩祼: %s [-q] [-r] [-s] [passwd]\n" +msgstr "峓峸庢: %s [-q] [-r] [-s] [passwd]\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:295 msgid "invalid password file entry\n" -msgstr "杹 楯艕鼩 罼酃觾鼩鵰 黀 摙灚蜍 黼膻賚敳濋燡n" +msgstr "庢 峟帠庥庢 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:357 msgid "duplicate password entry\n" -msgstr "摿鏻蜤暡 罼酃觾鼩鵰 黀 摙灚蜍 黼膻賚敳濋燡n" +msgstr "帢彖庣帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" #: src/pwck.c:373 #, c-format msgid "invalid user name '%s'\n" -msgstr "杹 楯艕厴 臩憼 虀祼鐋 '%s'\n" +msgstr "庢 峟帠庥怷 彖怷弮帢 峸庢 '%s'\n" -#. -#. * No primary group, just give a warning -#. #: src/pwck.c:388 #, c-format msgid "user %s: no group %u\n" -msgstr "虀祼鐋 %s: 罼擩 瀌塤 %u\n" +msgstr "峸庢 %s: 庥帢弮庣峎 怷弮峎帤帢 %u\n" #: src/pwck.c:404 #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "虀祼鐋 %s: 罼轗錝蜧 %s 麧 臝塱灚嬞n" +msgstr "峸庢 %s: 怷 庥帢峎弇怷帠怷 %s 帤庰彖 峎庰庣\n" -#. -#. * Login shell doesn't exist, give a warning -#. #: src/pwck.c:420 #, c-format msgid "user %s: program %s does not exist\n" -msgstr "虀祼鐋 %s: 鐐 貘蜤摐憼 %s 麧 臝塱灚嬞n" +msgstr "峸庢 %s: 怷 帠帢弮弮帢 %s 帤庰彖 峎庰庣\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:456 msgid "invalid shadow password file entry\n" -msgstr "杹 楯艕鼩 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "庢 峟帠庥庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:518 msgid "duplicate shadow password entry\n" -msgstr "摿鏻蜤暡 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "帢彖庣帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#. -#. * Tell the user this entry has no matching -#. * /etc/passwd entry and ask them to delete it. -#. #: src/pwck.c:542 msgid "no matching password file entry\n" -msgstr "櫻 碫楴賙 罼酃觾鼩鵰 黀 摙灚蜍 黼膻賚敳濋 豵 罅 酃濄葐緪嬞n" +msgstr "庰彖 帣峟庛庢庥庰 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖 怷 彖帢 帢庣巹帢庤庰庣\n" #: src/pwck.c:560 #, c-format msgid "user %s: last password change in the future\n" -msgstr "虀祼鐋 %s: 醲錼蘟摲 摠錆蜛 黼膻賚敳濋燽 黀 徾錭瀍\n" +msgstr "峸庢 %s: 庰弇庰帢巹帢 帢弇弇帢帠峸 彖庛庢弮帢庣庥怷 怷 弮峟弇弇怷彖\n" -#: src/pwconv.c:84 src/pwunconv.c:93 +#: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/pwconv.c:89 src/pwunconv.c:98 +#: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/pwconv.c:117 -#, c-format +#: src/pwconv.c:118 +#, fuzzy, c-format msgid "%s: can't remove shadow entry for %s\n" msgstr "" -"撦罍摐葐 暡摲鼫鵰 罼酃觾鼩鵰 蜒 鐐 %s, 摫 鐐 摙灚蜍 鵳澺噘 " -"黼膻賚敳濋燡n" +"%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 帠庣帢 怷彖 %" +"s\n" -#: src/pwconv.c:163 +#: src/pwconv.c:164 #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 罼酃觾鼩鵰 黼膻賚敳濋燽 蜒 鐐 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 彖庛庢弮帢庣庥怷 帠庣帢 怷彖 %s\n" -#: src/pwconv.c:170 +#: src/pwconv.c:171 #, c-format msgid "%s: can't update shadow file\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 罼酃觾鼩鵰 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/pwconv.c:175 +#: src/pwconv.c:176 #, c-format msgid "%s: can't update passwd file\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/pwunconv.c:50 -#, c-format -msgid "%s: Shadow passwords are not configured.\n" -msgstr "%s: 婛 鵳澸儃 黼膻賚敳濋 麧 歃瀦 僸摐瀎穱鳺.\n" - -#: src/pwunconv.c:160 +#: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 罼酃觾鼩鵰 蜒 鐐 虀祼鐋 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 帠庣帢 怷彖 峸庢 %s\n" -#: src/pwunconv.c:181 +#: src/pwunconv.c:145 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s: 櫻 橀罅 勯罅鏸 罅 僸摦鼁欈 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 庰彖 庰巹彖帢庣 帤彖帢彖 彖帢 帤庣帢帠帢庰巹 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" #: src/su.c:133 msgid "Sorry." -msgstr "坫謣憼." +msgstr "峎弮帢庣." #: src/su.c:216 #, c-format msgid "%s: must be run from a terminal\n" -msgstr "%s: 貘椲樥 罅 樏醲錼黀橀 摫 醲儵敳濋\n" +msgstr "%s: 峟庰庣 彖帢 庰庥庰弇庰庰巹 帢 庰弮帢庣庥\n" #: src/su.c:306 #, c-format msgid "%s: pam_start: error %d\n" -msgstr "%s: pam_start: 鼭塝憼 %d\n" +msgstr "%s: pam_start: 峎弇弮帢 %d\n" #: src/su.c:336 #, c-format msgid "Unknown id: %s\n" -msgstr "錨薋黀 酃蘟鐋酃: %s\n" +msgstr "帠彖庢 帢庢帢: %s\n" #: src/su.c:373 src/su.c:390 #, c-format msgid "You are not authorized to su %s\n" -msgstr "櫻 歃殦 塤樥 蜒 su %s\n" +msgstr "庰彖 峟庰庰 峎帤庰庣帢 帠庣帢 su %s\n" -#. require own password #: src/su.c:385 msgid "(Enter your own password.)" -msgstr "(體鶈蜲醲 鐐 僸蕓 鶋 黼膻賚敳濋.)" +msgstr "(庣峎帠庰庰 怷 帤庣庥 帢 彖庛庢弮帢庣庥.)" #: src/su.c:419 #, c-format @@ -1848,633 +1658,688 @@ msgid "" "(Ignored)\n" msgstr "" "%s: %s\n" -"(錨臩碄賙)\n" +"(帠彖怷峸庛庢庥庰)\n" -#: src/su.c:626 +#: src/su.c:609 msgid "No shell\n" -msgstr "櫻 臝塱灚 灒毉瀙n" +msgstr "庰彖 峎庰庣 弇怷庣\n" -#: src/suauth.c:100 +#: src/suauth.c:105 msgid "Access to su to that account DENIED.\n" -msgstr "哢鶌摷 黀 su 鵴 斠鏸 鐐 錝蝁齌摷檇 蹊虰в.\n" +msgstr "帣帢庢 庢 su 庰 帢彖 怷彖 弇怷帠帢庣帢弮 峞.\n" -#: src/suauth.c:107 +#: src/suauth.c:113 msgid "Password authentication bypassed.\n" -msgstr "凊鵘罼檟 槴摓麌禊鵰 懤 黼膻賚敳濋.\n" +msgstr "帢峎庥帢弮庢 庰徆帢庥巹帣庢 弮庰 彖庛庢弮帢庣庥.\n" -#: src/suauth.c:114 +#: src/suauth.c:122 msgid "Please enter your OWN password as authentication.\n" -msgstr "凊鼁罼錌 樥鶈蜲醲 鐐 馨庌 鶋 黼膻賚敳濋 蜒 槴摓麌禊鵰.\n" +msgstr "帢帢庥帢弇 庰庣峎帠庰庰 怷 帢 彖庛庢弮帢庣庥 帠庣帢 庰徆帢庥巹帣庢.\n" -#. must be a password file! -#: src/sulogin.c:132 +#: src/sulogin.c:118 msgid "No password file\n" -msgstr "櫻 臝塱灚 摙灚蜍 黼膻賚敳濋燡n" +msgstr "庰彖 峎庰庣 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#. -#. * Fail secure -#. -#: src/sulogin.c:174 +#: src/sulogin.c:160 msgid "No password entry for 'root'\n" -msgstr "櫻 臝塱灚 罼酃觾鼩鵰 黼膻賚敳濋燽 蜒 鐐 'root'\n" +msgstr "庰彖 峎庰庣 庥帢帢庢庢 彖庛庢弮帢庣庥怷 帠庣帢 怷彖 'root'\n" -#: src/sulogin.c:190 +#: src/sulogin.c:176 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" "\n" -"剕賙鐙瀇檶祼醲 control-d 蜒 罅 黼翴曫鵴醲 懤 鐋 罼臩臄縤 楜摙鍡,\n" -"( 噘黀 鐐 黼膻賚敳濋 鐐 root 蜒 黼薀碖踠 鐐 黼黀碡敳濿):" +"弇庢庥怷弇怷帠峸庰 control-d 帠庣帢 彖帢 彖庰巹庰庰 弮庰 庢彖 庥帢彖怷彖庣庥峸 峟彖帢徆庢,\n" +"(峸 帤庰 怷 彖庛庢弮帢庣庥 怷 root 帠庣帢 彖峸庢庢 怷 峸弮帢怷):" -#. make new environment active -#: src/sulogin.c:243 +#: src/sulogin.c:212 msgid "Entering System Maintenance Mode\n" -msgstr "貲摙鍡 忯轗黀摷趛 郚薀碖踠趛 郚黀碡敳濿\n" +msgstr "彖帢徆庢 帢峎帢庢 峉彖峸庢庢 峉峸弮帢怷\n" -#: src/useradd.c:251 +#: src/useradd.c:234 #, c-format msgid "%s: rebuild the group database\n" -msgstr "%s: 歑摿摓轚黀 鐋 瘌鵰 麧儌徾薋 瀌塤燡n" +msgstr "%s: 庰帢彖帢庥巹庰 庢彖 帣峎庢 帤庰帤怷弮峟彖彖 怷弮峎帤彖\n" -#: src/useradd.c:260 +#: src/useradd.c:243 #, c-format msgid "%s: rebuild the shadow group database\n" -msgstr "%s: 歑摿摓轚黀 鐋 瘌鵰 麧儌徾薋 鐒 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "%s: 庰帢彖帢庥巹庰 庢彖 帣峎庢 帤庰帤怷弮峟彖彖 彖 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/useradd.c:295 src/useradd.c:309 src/usermod.c:981 src/usermod.c:995 +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 #, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "%s: 杹 楯艕鼩 摙氆懞鏻縤 謯鵘懤鐙濿 `%s'\n" +msgstr "%s: 庢 峟帠庥庢 帢庣庛弮庢庣庥峸 帢峎弮庰怷 `%s'\n" -#: src/useradd.c:365 +#: src/useradd.c:349 #, c-format msgid "%s: unknown gid %s\n" -msgstr "%s: 塨薋黀 gid %s\n" +msgstr "%s: 峎帠彖怷 gid %s\n" -#: src/useradd.c:373 src/useradd.c:676 src/useradd.c:1269 src/usermod.c:260 -#: src/usermod.c:1128 +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 #, c-format msgid "%s: unknown group %s\n" -msgstr "%s: 塨薋黀 瀌塤 %s\n" +msgstr "%s: 峎帠彖庢 怷弮峎帤帢 %s\n" -#: src/useradd.c:440 -#, c-format -msgid "group=%s,%u basedir=%s skel=%s\n" -msgstr "瀌塤=%s,%u 皸鶅蕓瀖罼酃=%s 鵳槶=%s\n" - -#: src/useradd.c:444 -#, c-format -msgid "shell=%s " -msgstr "灒毉=%s " - -#: src/useradd.c:446 -#, c-format -msgid "inactive=%ld expire=%s" -msgstr "摿樇殥裼=%ld 錞鍡=%s" - -#: src/useradd.c:450 +#: src/useradd.c:419 #, c-format msgid "GROUP=%u\n" -msgstr "玶謐=%u\n" +msgstr "=%u\n" -#: src/useradd.c:451 +#: src/useradd.c:420 #, c-format msgid "HOME=%s\n" -msgstr "昒婧圴珃_岏埡冾譁=%s\n" +msgstr "峇峞峉_峇峉=%s\n" -#: src/useradd.c:453 +#: src/useradd.c:422 #, c-format msgid "INACTIVE=%ld\n" -msgstr "趨攪竊譁=%ld\n" +msgstr "峞峉=%ld\n" -#: src/useradd.c:454 +#: src/useradd.c:423 #, c-format msgid "EXPIRE=%s\n" -msgstr "侞恉=%s\n" +msgstr "=%s\n" -#: src/useradd.c:456 +#: src/useradd.c:425 #, c-format msgid "SHELL=%s\n" -msgstr "岒劼笰=%s\n" +msgstr "峊峖峉=%s\n" -#: src/useradd.c:457 +#: src/useradd.c:426 #, c-format msgid "SKEL=%s\n" -msgstr "蚘攣=%s\n" +msgstr "峉=%s\n" -#: src/useradd.c:498 +#: src/useradd.c:462 #, c-format msgid "%s: cannot create new defaults file\n" -msgstr "%s: 撦罍摐葐 儃擩瀦鼖葐 縻瀦 摙灚蜍 貘氋摜瀎澞徾薋 嚬鳻裍潁燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 彖峟怷 帢庰巹怷 怷庥帢庛怷庣弮峟彖彖 庛弮巹庰彖\n" -#: src/useradd.c:503 +#: src/useradd.c:467 #, fuzzy, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: 撦罍摐葐 儃擩瀦鼖葐 縻瀦 摙灚蜍 貘氋摜瀎澞徾薋 嚬鳻裍潁燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 彖峟怷 帢庰巹怷 怷庥帢庛怷庣弮峟彖彖 庛弮巹庰彖\n" -#: src/useradd.c:596 src/useradd.c:608 +#: src/useradd.c:552 src/useradd.c:564 #, c-format msgid "%s: rename: %s" -msgstr "%s: 懤鐐臩憼鵸: %s" +msgstr "%s: 弮庰怷彖怷弮帢巹帢: %s" -#: src/useradd.c:697 src/usermod.c:281 +#: src/useradd.c:657 src/usermod.c:265 #, c-format msgid "%s: group `%s' is a NIS group.\n" -msgstr "%s: 瀌塤 `%s' 橀罅 NIS 瀌塤.\n" +msgstr "%s: 怷弮峎帤帢 `%s' 庰巹彖帢庣 NIS 怷弮峎帤帢.\n" -#: src/useradd.c:706 src/usermod.c:290 +#: src/useradd.c:666 src/usermod.c:274 #, c-format msgid "%s: too many groups specified (max %d).\n" -msgstr "%s: 哢瀀僸瀎裍鐋罼 臝殥碨錁縥 瀌塤殣 (懤. %d).\n" +msgstr "%s: 怷帤庣怷巹庢庥帢彖 庰帣怷弇庣庥峟 怷弮峎帤庰 (弮庰帠. %d).\n" -#: src/useradd.c:738 src/usermod.c:322 -#, c-format -msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" -msgstr "虀祼: %s\t[-u uid [-o]] [-g 瀌塤塴 [-G 瀌塤,...] \n" +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "峸庢: useradd [-u uid [-o]] [-g 怷弮峎帤帢] [-G 怷弮峎帤帢,...] \n" -#: src/useradd.c:742 -msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" +#: src/useradd.c:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" -"\t\t[-d 懞鐙濋瀖罼轗錝蜧瀧 [-s 灒毉瀧 [-c 齀錁駸\n" -"\t\t[-m [-k 罼薤罅瀧]\n" +" [-d 弮庢庣庥_庥帢峎弇怷帠怷] [-s 弇怷庣] [-c 弇庣怷]\n" +" [-m [-k 庥帢彖彖帢]]\n" -#: src/useradd.c:745 src/usermod.c:329 -msgid "[-f inactive] [-e expire ] " -msgstr "[-f 摿樇殥裼] [-e 錞鍡] " +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" +msgstr " [-f 帢彖庰彖庰帠] [-e 弇峸徆庢]\n" -#: src/useradd.c:748 -msgid "[-A program] " -msgstr "[-A 貘蜤摐憼] " +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" +msgstr " useradd -D [-g 怷弮峎帤帢] [-b 帣峎庢] [-s 弇怷庣]\n" -#: src/useradd.c:750 -msgid "[-p passwd] name\n" -msgstr "[-p 黼膻賚敳濋] 臩憼\n" - -#: src/useradd.c:753 -#, c-format -msgid " %s\t-D [-g group] [-b base] [-s shell]\n" -msgstr " %s\t-D [-g 瀌塤塴 [-b 瘌鵰] [-s 灒毉瀧\n" - -#: src/useradd.c:756 -msgid "\t\t[-f inactive] [-e expire ]\n" -msgstr "\t\t[-f 摿樇殥裼] [-e 錞鍡]\n" - -#: src/useradd.c:850 src/usermod.c:480 +#: src/useradd.c:793 src/usermod.c:461 #, c-format msgid "%s: error locking group file\n" -msgstr "%s: 郣塝憼 罼轗 鐐 膹橀嘵憼 鐐 摙灚蜍 瀌塤燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 怷 庥弇庰巹帤弮帢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/useradd.c:855 src/usermod.c:486 +#: src/useradd.c:798 src/usermod.c:467 #, c-format msgid "%s: error opening group file\n" -msgstr "%s: 郣塝憼 罼轗 鐐 塥毉蜵 鐐 摙灚蜍 瀌塤燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 怷 峎彖怷庣帠弮帢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/useradd.c:862 src/usermod.c:597 +#: src/useradd.c:805 src/usermod.c:578 #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s: 郣塝憼 罼轗 鐐 膹橀嘵憼 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 怷 庥弇庰巹帤弮帢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/useradd.c:867 src/usermod.c:603 +#: src/useradd.c:810 src/usermod.c:584 #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s: 郣塝憼 罼轗 鐐 塥毉蜵 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 怷 峎彖怷庣帠弮帢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/useradd.c:1039 +#: src/useradd.c:982 #, c-format msgid "%s: uid %u is not unique\n" -msgstr "%s: 孲 uid %ld 麧 橀罅 斀罅僸蕓\n" +msgstr "%s: 峇怷 uid %u 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥\n" -#: src/useradd.c:1069 +#: src/useradd.c:1012 #, c-format msgid "%s: can't get unique uid\n" -msgstr "%s: 撦罍摐葐 氁鼫鵰 斀罅僸膬 uid\n" +msgstr "%s: 帢帤彖帢弮巹帢 庰庰庢 弮怷彖帢帤庣庥怷 uid\n" -#: src/useradd.c:1174 src/useradd.c:1325 src/usermod.c:1075 src/usermod.c:1086 -#: src/usermod.c:1096 src/usermod.c:1143 src/usermod.c:1187 -#, c-format -msgid "%s: invalid field `%s'\n" -msgstr "%s: 杹 楯艕厴 謥魠 `%s'\n" - -#: src/useradd.c:1189 +#: src/useradd.c:1049 #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s: 杹 楯艕厴 罼轗錝蜧 瘌鵰 `%s'\n" +msgstr "%s: 庢 峟帠庥怷 庥帢峎弇怷帠怷 帣峎庢 `%s'\n" -#: src/useradd.c:1199 +#: src/useradd.c:1059 #, c-format msgid "%s: invalid comment `%s'\n" -msgstr "%s: 杹 楯艕厴 齀錁 `%s'\n" +msgstr "%s: 庢 峟帠庥怷 弇庣怷 `%s'\n" -#: src/useradd.c:1210 +#: src/useradd.c:1070 #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s: 杹 楯艕厴 懞鐙濋 罼轗錝蜧 虀祼鐋 `%s'\n" +msgstr "%s: 庢 峟帠庥怷 弮庢庣庥 庥帢峎弇怷帠怷 峸庢 `%s'\n" -#: src/useradd.c:1229 src/usermod.c:1110 +#: src/useradd.c:1089 src/usermod.c:858 #, c-format msgid "%s: invalid date `%s'\n" -msgstr "%s: 杹 楯艕鼩 賚殥瀌賝葐 `%s'\n" +msgstr "%s: 庢 峟帠庥庢 庢弮庰怷弮庢彖巹帢 `%s'\n" -#: src/useradd.c:1242 +#: src/useradd.c:1102 #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "%s: 鵳澸儃 黼膻賚敳濋 摫摋鐐薀摋 蜒 鐐 -e\n" +msgstr "%s: 庥庣帤庢 彖庛庢弮帢庣庥峎 帢帢庣怷彖帢庣 帠庣帢 怷 -e\n" -#: src/useradd.c:1258 +#: src/useradd.c:1118 #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "%s: 鵳澸儃 黼膻賚敳濋 摫摋鐐薀摋 蜒 -f\n" +msgstr "%s: 庥庣帤庢 彖庛庢弮帢庣庥峎 帢帢庣怷彖帢庣 帠庣帢 -f\n" -#: src/useradd.c:1336 +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: 庢 峟帠庥怷 庰帤巹怷 `%s'\n" + +#: src/useradd.c:1196 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s: 杹 楯艕厴 灒毉 `%s'\n" +msgstr "%s: 庢 峟帠庥怷 弇怷庣 `%s'\n" -#: src/useradd.c:1377 +#: src/useradd.c:1237 #, c-format msgid "%s: invalid user name '%s'\n" -msgstr "%s: 杹 楯艕厴 臩憼 虀祼鐋 `%s'\n" +msgstr "%s: 庢 峟帠庥怷 彖怷弮帢 峸庢 `%s'\n" -#: src/useradd.c:1413 src/userdel.c:298 src/usermod.c:1255 +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 #, c-format msgid "%s: cannot rewrite password file\n" -msgstr "%s: 撦罍摐葐 歑摿樍蜤暡硻 鐐 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1420 src/userdel.c:303 src/usermod.c:1262 +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "%s: 撦罍摐葐 歑摿樍蜤暡硻 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1461 src/userdel.c:367 src/usermod.c:1296 +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 #, c-format msgid "%s: unable to lock password file\n" -msgstr "%s: 鍵罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1466 src/userdel.c:372 src/usermod.c:1301 +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 #, c-format msgid "%s: unable to open password file\n" -msgstr "%s: 鍵罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1474 src/userdel.c:379 src/usermod.c:1308 +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1481 src/userdel.c:385 src/usermod.c:1314 +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1580 src/usermod.c:1405 -#, c-format -msgid "%s: error adding authentication method\n" -msgstr "%s: 郣塝憼 罼轗 鐋 貘瀀魶聬 懤噰儌 槴摓麌禊鵰瀙n" - -#: src/useradd.c:1604 +#: src/useradd.c:1435 #, c-format msgid "%s: error adding new password entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 貘瀀魶聬 縻摥 罼酃觾鼩鵰 黀 摙灚蜍 黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 彖峟帢 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1618 +#: src/useradd.c:1449 #, c-format msgid "%s: error updating password dbm entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 摿摿歈鵰 罼酃蠮麎鵴 黀 dbm 摙灚蜍 黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庰彖 怷 dbm 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1634 src/usermod.c:1471 +#: src/useradd.c:1465 src/usermod.c:1151 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 貘瀀魶聬 縻摥 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 " -"黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 彖峟帢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 " +"彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1650 src/usermod.c:1488 +#: src/useradd.c:1481 src/usermod.c:1168 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 摿摿歈鵰 罼酃蠮麎鵴 黀 dbm 摙灚蜍 鵳澺噘 " -"黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庰彖 怷 dbm 帢庰巹怷 庥庣帤彖 " +"彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1682 +#: src/useradd.c:1513 #, c-format msgid "%s: cannot create directory %s\n" -msgstr "%s: 撦罍摐葐 儃擩瀦鼖葐 罼酃錪蜧 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 庥帢帢弇帠怷 %s\n" -#: src/useradd.c:1806 src/usermod.c:1233 +#: src/useradd.c:1634 src/usermod.c:981 #, c-format msgid "%s: user %s exists\n" -msgstr "%s: 虀祼鐋 %s 臝塱灚嬞n" +msgstr "%s: 峸庢 %s 峎庰庣\n" -#: src/useradd.c:1821 +#: src/useradd.c:1649 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1854 +#: src/useradd.c:1687 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -#: src/userdel.c:129 -#, c-format -msgid "usage: %s [-r] name\n" -msgstr "虀祼: %s [-r] 臩憼\n" +#: src/userdel.c:124 +#, fuzzy, c-format +msgid "Usage: %s [-r] name\n" +msgstr "峸庢: %s [-r] 彖怷弮帢\n" -#: src/userdel.c:181 src/userdel.c:267 +#: src/userdel.c:176 src/userdel.c:262 #, c-format msgid "%s: error updating group entry\n" -msgstr "%s: 郣塝憼 罼轗 鐋 摿摿歈鵰 罼酃蠮麎鵰 瀌塤摥\n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庢 怷弮峎帤帢\n" -#: src/userdel.c:191 src/userdel.c:276 +#: src/userdel.c:186 src/userdel.c:271 #, c-format msgid "%s: cannot update dbm group entry\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 鐋 dbm 罼酃觾鼩鵰 黀 摙灚蜍 瀌塤燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庢 dbm 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/userdel.c:219 +#: src/userdel.c:214 #, fuzzy, c-format msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: 撦罍摐葐 摿摿歈鵰 鐋 dbm 罼酃觾鼩鵰 黀 摙灚蜍 瀌塤燡n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庢 dbm 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/userdel.c:308 +#: src/userdel.c:379 #, c-format -msgid "%s: cannot rewrite TCFS key file\n" -msgstr "%s: 撦罍摐葐 歑摿樍蜤暡硻 鐐 摙灚蜍 膹樥僸 鐐 TCFS\n" +msgid "%s: cannot open group file\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/userdel.c:392 +#: src/userdel.c:390 #, c-format -msgid "%s: cannot lock TCFS key file\n" -msgstr "%s: 撦罍摐葐 膹樥噘憼鐐 鐐 摙灚蜍 膹樥僸 鐐 TCFS\n" - -#: src/userdel.c:397 -#, c-format -msgid "%s: cannot open TCFS key file\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 鐐 摙灚蜍 膹樥僸 鐐 TCFS\n" +msgid "%s: cannot open shadow group file\n" +msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" #: src/userdel.c:408 #, c-format -msgid "%s: cannot open group file\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 摙灚蜍 瀌塤燡n" - -#: src/userdel.c:419 -#, c-format -msgid "%s: cannot open shadow group file\n" -msgstr "%s: 撦罍摐葐 摿檽蜵敳濿 摙灚蜍 鵳澺噘 黼膻賚敳濋 瀌塤燡n" - -#: src/userdel.c:451 src/userdel.c:468 -#, c-format -msgid "%s: error deleting authentication\n" -msgstr "%s: 郣塝憼 罼轗 鐋 僸摦鼁巑 槴摓麌禊鵰瀙n" - -#: src/userdel.c:479 -#, c-format msgid "%s: error deleting password entry\n" -msgstr "%s: 郣塝憼 罼轗 鐋 僸摦鼁巑 罼酃觾鼩鵰 黀 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/userdel.c:485 +#: src/userdel.c:412 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 僸摦鼁巑 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/userdel.c:496 -#, c-format -msgid "%s: error deleting TCFS entry\n" -msgstr "%s: 郣塝憼 罼轗 鐋 僸摦鼁巑 罼酃觾鼩鵰 鐐 TCFS\n" - -#: src/userdel.c:510 +#: src/userdel.c:421 #, c-format msgid "%s: error deleting password dbm entry\n" -msgstr "%s: 郣塝憼 罼轗 鐋 僸摦鼁巑 罼酃觾鼩鵰 黀 dbm 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 dbm 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/userdel.c:533 +#: src/userdel.c:440 #, c-format msgid "%s: error deleting shadow passwd dbm entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 僸摦鼁巑 罼酃觾鼩鵰 黀 dbm 摙灚蜍 鵳澺噘 " -"黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 dbm 帢庰巹怷 庥庣帤彖 " +"彖庛庢弮帢庣庥彖\n" -#: src/userdel.c:569 +#: src/userdel.c:484 #, c-format msgid "%s: user %s is currently logged in\n" -msgstr "%s: 虀祼鐋 %s 碫裍耪酃 黀 匷黀賚塿n" +msgstr "%s: 峸庢 %s 帣巹庥庰帢庣 怷 庢弮帢\n" -#: src/userdel.c:659 +#: src/userdel.c:594 #, c-format msgid "%s: warning: %s not owned by %s, not removing\n" -msgstr "%s: 貘櫇毈瀔檽踠: 孲 %s 麧 摿碅樥 黀瀍 %s, 麧 僸摦鵘欈酃嬞n" +msgstr "%s: 怷庰庣帤怷怷巹庢庢: 峇怷 %s 帤庰彖 帢彖峸庥庰庣 怷彖 %s, 帤庰彖 帤庣帢帠峎庰帢庣\n" -#: src/userdel.c:666 +#: src/userdel.c:600 #, c-format msgid "%s: warning: can't remove " -msgstr "%s: 貘櫇毈瀔檽踠: 撦罍摐葐 僸摦鼁巑 " +msgstr "%s: 怷庰庣帤怷怷巹庢庢: 帢帤彖帢弮巹帢 帤庣帢帠帢峸 " -#: src/userdel.c:758 src/usermod.c:1023 +#: src/userdel.c:703 src/usermod.c:783 #, c-format msgid "%s: user %s does not exist\n" -msgstr "%s: 虀祼鐋 %s 麧 臝塱灚嬞n" +msgstr "%s: 峸庢 %s 帤庰彖 峎庰庣\n" -#: src/userdel.c:770 src/usermod.c:1039 +#: src/userdel.c:718 src/usermod.c:799 #, c-format msgid "%s: user %s is a NIS user\n" -msgstr "%s: 虀祼鐋 %s 橀罅 NIS 虀祼鐋瀙n" +msgstr "%s: 峸庢 %s 庰巹彖帢庣 NIS 峸庢\n" -#: src/userdel.c:799 +#: src/userdel.c:756 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s: 孲 %s 麧 摿碅樥 黀瀍 %s, 麧 暡摋鼫裎摋\n" +msgstr "%s: 峇怷 %s 帤庰彖 帢彖峸庥庰庣 怷彖 %s, 帤庰彖 帢帢庣庰巹帢庣\n" -#: src/userdel.c:818 +#: src/userdel.c:779 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -"%s: 櫻 僸摦鵘欈酃 罼轗錝蜧 %s (魨 暡摋厴鵴 鐐 懞鐙濋 罼轗錝蜧 鐐 " -"虀祼鐋 %s)\n" +"%s: 庰彖 帤庣帢帠峎庰帢庣 怷 庥帢峎弇怷帠怷 %s (庛帢 帢帢庣怷庰 怷彖 弮庢庣庥 庥帢峎弇怷帠怷 怷 " +"峸庢 %s)\n" -#: src/userdel.c:830 +#: src/userdel.c:793 #, c-format msgid "%s: error removing directory %s\n" -msgstr "%s: 郣塝憼 罼轗 鐋 僸摦鼁巑 鐐 罼酃錪蜧 %s\n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 怷 庥帢帢弇帠怷 %s\n" -#: src/usermod.c:326 +#: src/usermod.c:306 +#, fuzzy, c-format +msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "峸庢: %s\t[-u uid [-o]] [-g 怷弮峎帤帢] [-G 怷弮峎帤帢,...] \n" + +#: src/usermod.c:310 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" +"\t\t[-d 弮庢庣庥_庥帢峎弇怷帠怷 [-m]] [-s 弇怷庣] [-c 弇庣怷]\n" +"\t\t[-l 彖峟怷_彖怷弮帢]\n" -#: src/usermod.c:332 +#: src/usermod.c:313 #, fuzzy -msgid "[-A {DEFAULT|program},... ] " -msgstr "[-A {DEFAULT|貘蜤摐憼},...] " +msgid "[-f inactive] [-e expire] " +msgstr "[-f 帢彖庰彖庰帠] [-e 弇峸徆庢] " -#: src/usermod.c:334 +#: src/usermod.c:315 msgid "[-p passwd] [-L|-U] name\n" -msgstr "[-p 黼膻賚敳濋] [-L|-U] 臩憼\n" +msgstr "[-p 彖庛庢弮帢庣庥] [-L|-U] 彖怷弮帢\n" -#: src/usermod.c:514 +#: src/usermod.c:495 #, c-format msgid "%s: out of memory in update_group\n" -msgstr "%s: 麧 臝塱灚 槶濆鳺鼩 擨碡 黀 update_group\n" +msgstr "%s: 帤庰彖 峎庰庣 庰弇庰庛庰庢 弮彖峸弮庢 怷 update_group\n" -#: src/usermod.c:641 +#: src/usermod.c:622 #, c-format msgid "%s: out of memory in update_gshadow\n" -msgstr "%s: 黀 update_gshadow\n" +msgstr "%s: 怷 update_gshadow\n" -#: src/usermod.c:1210 +#: src/usermod.c:958 #, c-format msgid "%s: no flags given\n" -msgstr "%s: 櫻 噉鳿罼 樇麧蛶樥瀙n" +msgstr "%s: 庰彖 帤庛庢庥帢彖 庰彖帤庰巹徆庰庣\n" -#: src/usermod.c:1217 +#: src/usermod.c:965 #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s: 鵳澸儃 黼膻賚敳濋 摫摋鐐薀摋 蜒 鐐 -e 罼 -f\n" +msgstr "%s: 庥庣帤庢 彖庛庢弮帢庣庥峎 帢帢庣怷彖帢庣 帠庣帢 怷 -e 庥帢庣 -f\n" -#: src/usermod.c:1239 +#: src/usermod.c:987 #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s: 孲 uid %lu 麧 橀罅 斀罅僸蕓\n" +msgstr "%s: 峇怷 uid %lu 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥\n" -#: src/usermod.c:1392 -#, c-format -msgid "%s: error deleting authentication method\n" -msgstr "%s: 郣塝憼 罼轗 鐋 僸摦鼁巑 懤噰儌 槴摓麌禊鵰瀙n" - -#: src/usermod.c:1418 -#, c-format -msgid "%s: error changing authentication method\n" -msgstr "%s: 郣塝憼 罼轗 鐋 摠錆蜛 懤噰儌 槴摓麌禊鵰瀙n" - -#: src/usermod.c:1436 +#: src/usermod.c:1116 #, c-format msgid "%s: error changing password entry\n" -msgstr "%s: 郣塝憼 罼轗 鐋 摠錆蜛 罼酃觾鼩鵰 黼膻賚敳濋燽\n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢弇弇帢帠峸 庥帢帢庢庢 彖庛庢弮帢庣庥怷\n" -#: src/usermod.c:1442 +#: src/usermod.c:1122 #, c-format msgid "%s: error removing password entry\n" -msgstr "%s: 郣塝憼 罼轗 鐋 暡摲鼫鵰 罼酃觾鼩鵰 黀 摙灚蜍 黼膻賚敳濋燡n" +msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/usermod.c:1451 +#: src/usermod.c:1131 #, c-format msgid "%s: error adding password dbm entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 貘瀀魶聬 縻摥 罼酃觾鼩鵰 黀 dbm 摙灚蜍 黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 彖峟帢 庥帢帢庢庢 怷 dbm 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/usermod.c:1459 +#: src/usermod.c:1139 #, c-format msgid "%s: error removing passwd dbm entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 暡摲鼫鵰 罼酃觾鼩鵰 摫 鐐 dbm 摙灚蜍 黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 帢 怷 dbm 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/usermod.c:1478 +#: src/usermod.c:1158 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 暡摲鼫鵰 罼酃觾鼩鵰 黀 摙灚蜍 鵳澺噘 黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/usermod.c:1495 +#: src/usermod.c:1175 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" msgstr "" -"%s: 郣塝憼 罼轗 鐋 暡摲鼫鵰 罼酃觾鼩鵰 黀 dbm 摙灚蜍 鵳澺噘 " -"黼膻賚敳濋燡n" +"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 怷 dbm 帢庰巹怷 庥庣帤彖 " +"彖庛庢弮帢庣庥彖\n" -#: src/usermod.c:1524 +#: src/usermod.c:1204 #, c-format msgid "%s: directory %s exists\n" -msgstr "%s: 罼轗錝蜧 %s 臝塱灚嬞n" +msgstr "%s: 怷 庥帢峎弇怷帠怷 %s 峎庰庣\n" -#: src/usermod.c:1533 +#: src/usermod.c:1213 #, c-format msgid "%s: can't create %s\n" -msgstr "%s: 撦罍摐葐 儃擩瀦鼖葐 鐐 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 怷 %s\n" -#: src/usermod.c:1539 +#: src/usermod.c:1219 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s: 鍵罍摐葐 摠錆蜛 毈濈臲禂(chown) 鐐 %s\n" +msgstr "%s: 帤彖帢弮巹帢 帢弇弇帢帠峸 庣帤庣怷庥峸庢(chown) 怷 %s\n" -#: src/usermod.c:1556 +#: src/usermod.c:1236 #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "%s: 撦罍摐葐 懤鐐臩憼鵸摥 鐐 罼酃錪蜧 %s 鵴 %s\n" +msgstr "%s: 帢帤彖帢弮巹帢 弮庰怷彖怷弮帢巹帢 怷 庥帢帢弇帠怷 %s 庰 %s\n" -#. better leave it alone -#: src/usermod.c:1653 +#: src/usermod.c:1333 #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "%s: 貘櫇毈瀔檽踠: 孲 %s 麧 摿碅樥 黀瀍 %s\n" +msgstr "%s: 怷庰庣帤怷怷巹庢庢: 峇怷 %s 帤庰彖 帢彖峸庥庰庣 怷彖 %s\n" -#: src/usermod.c:1659 +#: src/usermod.c:1339 msgid "failed to change mailbox owner" -msgstr "摫濻蘙葐 摠錆蜛 鐐 毈濈臲禂 鐐 蜤摐憼鐐膦禊轚瀦" +msgstr "帢怷巹帢 帢弇弇帢帠峸 怷 庣帤庣怷庥峸庢 怷 帠帢弮弮帢怷庥庣帣巹怷" -#: src/usermod.c:1667 +#: src/usermod.c:1347 msgid "failed to rename mailbox" -msgstr "摫濻蘙葐 懤鐐臩憼鵸摥 蜤摐憼鐐膦禊轚瀦" +msgstr "帢怷巹帢 弮庰怷彖怷弮帢巹帢 帠帢弮弮帢怷庥庣帣巹怷" -#: src/vipw.c:104 +#: src/vipw.c:105 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" "\n" -"%s: 孲 %s 麧 塝錆鍷\n" +"%s: 峇怷 %s 帤庰彖 峎弇弇帢徆庰\n" -#: src/vipw.c:132 +#: src/vipw.c:133 #, fuzzy msgid "Couldn't lock file" -msgstr "撦罍摐葐 鍷膹樥噘憼鐐 摙灚蜍騱n" +msgstr "帢帤彖帢弮巹帢 徆庰庥弇庰庣帤弮帢怷 帢庰巹怷\n" -#: src/vipw.c:141 +#: src/vipw.c:142 msgid "Couldn't make backup" msgstr "" -#: src/vipw.c:206 +#: src/vipw.c:200 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" -msgstr "%s: 撦罍摐葐 歑摿暡瀎壼 %s: %s (毉 摠錆蜙 橀罅 黀 %s)\n" +msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖帢怷峎 %s: %s (怷庣 帢弇弇帢帠峟 庰巹彖帢庣 怷 %s)\n" -#: src/vipw.c:244 +#: src/vipw.c:238 msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" msgstr "" -"郩祼:\n" -"`vipw' 匷薀摷樥 鐐 /etc/passwd `vipw -s' 黼薀嫇鵴 鐐 /etc/shadow\n" -"`vigr' 匷薀摷樥 鐐 /etc/group `vigr -s' 黼薀嫇鵴 鐐 /etc/gshadow\n" +"峓峸庢:\n" +"`vipw' 彖帢庰庣 怷 /etc/passwd `vipw -s' 彖峎庰庣 怷 /etc/shadow\n" +"`vigr' 彖帢庰庣 怷 /etc/group `vigr -s' 彖峎庰庣 怷 /etc/gshadow\n" + +#, fuzzy +#~ msgid "Can't create mail spool for user %s.\n" +#~ msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 帠庣帢 怷彖 峸庢 %s\n" + +#~ msgid "User %s has a TCFS key, his old password is required.\n" +#~ msgstr " 峸庢 %s 峟庰庣 庥弇庰庣帤巹 TCFS, 帢帢庣庰巹帢庣 怷 帢弇庣 彖庛庢弮帢庣庥.\n" + +#~ msgid "You can use -t option to force the change.\n" +#~ msgstr "" +#~ "怷庰巹庰 彖帢 庢庣弮怷怷庣峸庰庰 庢彖 -t 帢峎弮庰怷 帠庣帢 彖帢 庰徆帢彖帢帠庥峎庰庰 庢彖\n" +#~ "帢帠弮帢怷怷巹庢庢 庢 帢弇弇帢帠峸.\n" + +#~ msgid "Warning: user %s has a TCFS key.\n" +#~ msgstr "怷庰庣帤怷怷巹庢庢: 峸庢 %s 峟庰庣 庥弇庰庣帤巹 TCFS.\n" + +#~ msgid "Cannot lock the TCFS key database; try again later\n" +#~ msgstr "" +#~ "帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 庢 帣峎庢 庥弇庰庣帤庣彖 怷 TCFS. 怷庥庣弮峎庰 帢帠庰帢\n" + +#~ msgid "Cannot open the TCFS key database.\n" +#~ msgstr "帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 庢 帣峎庢 庥弇庰庣帤庣彖 怷 TCFS.\n" + +#~ msgid "Error updating the TCFS key database.\n" +#~ msgstr "峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庢 帣峎庢 庥弇庰庣帤庣彖 怷 TCFS.\n" + +#~ msgid "Cannot commit TCFS changes.\n" +#~ msgstr "帤彖帢弮巹帢 弇怷怷巹庢庢 彖 帢弇弇帢帠彖 怷 TCFS.\n" + +#~ msgid "%s: cannot rewrite TCFS key file\n" +#~ msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 怷 帢庰巹怷 庥弇庰庣帤庣彖 怷 TCFS\n" + +#~ msgid "%s: cannot lock TCFS key file\n" +#~ msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥弇庰庣帤庣彖 怷 TCFS\n" + +#~ msgid "%s: cannot open TCFS key file\n" +#~ msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 庥弇庰庣帤庣彖 怷 TCFS\n" + +#~ msgid "%s: error deleting TCFS entry\n" +#~ msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 TCFS\n" + +#~ msgid " [-f inactive] [-e expire]" +#~ msgstr " [-f 帢彖庰彖庰帠] [-e 弇峸徆庢] " + +#~ msgid "%s: error deleting authentication\n" +#~ msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庰徆帢庥巹帣庢\n" + +#, fuzzy +#~ msgid "[-A {DEFAULT|program},...] " +#~ msgstr "[-A {DEFAULT|帠帢弮弮帢},...] " + +#~ msgid "%s: error deleting authentication method\n" +#~ msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 弮庰庛帤怷 庰徆帢庥巹帣庢\n" + +#~ msgid "%s: error adding authentication method\n" +#~ msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 弮庰庛帤怷 庰徆帢庥巹帣庢\n" + +#~ msgid "%s: error changing authentication method\n" +#~ msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢弇弇帢帠峸 弮庰庛帤怷 庰徆帢庥巹帣庢\n" + +#~ msgid "[-A program] " +#~ msgstr "[-A 帠帢弮弮帢] " + +#~ msgid "[-p passwd] name\n" +#~ msgstr "[-p 彖庛庢弮帢庣庥] 彖怷弮帢\n" + +#~ msgid "error - lookup '%s' failed\n" +#~ msgstr "峎弇弮帢 - 庢 帢彖帢庤峸庢庢 '%s' 帢峟庰\n" + +#~ msgid "%s not found\n" +#~ msgstr "%s 帤庰彖 帣峟庛庢庥庰\n" + +#~ msgid "%s: not configured for shadow group support.\n" +#~ msgstr "%s: 庰彖 庰巹彖帢庣 帤庣帢弮怷弮峟彖怷 帠庣帢 庥庣帤庢 彖庛庢弮帢庣庥峎 怷弮峎帤彖.\n" + +#~ msgid "%s: Shadow passwords are not configured.\n" +#~ msgstr "%s: 峇帢 庥庣帤庢 彖庛庢弮帢庣庥峎 帤庰彖 峟怷彖 帤庣帢弮怷庛庰巹.\n" + +#, fuzzy +#~ msgid "Usage: %s [-l] user\n" +#~ msgstr "峸庢: %s [-e]\n" + +#~ msgid "Executing shell %s\n" +#~ msgstr "庥峟弇庰庢 弇怷庣怷 %s\n" + +#~ msgid "Dialup Password: " +#~ msgstr "峉彖庛庢弮帢庣庥 庢弇庰彖庣庥峸 彖帤庰庢: " + +#~ msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" +#~ msgstr "" +#~ "峓峸庢: %s [-l] [-m 庰弇峎_弮峟庰] [-M 弮庰帠_弮峟庰] [-d 庰弇庰帢巹帢_弮峟帢] " +#~ "峸庢\n" + +#~ msgid "Usage: %s [-(a|d)] shell\n" +#~ msgstr "峓峸庢: %s [-(ald)] 弇怷庣\n" + +#~ msgid "Shell password: " +#~ msgstr "峉彖庛庢弮帢庣庥 弇怷庣怷: " + +#~ msgid "re-enter Shell password: " +#~ msgstr "帢彖庰庣峎帠庰庰 怷 彖庛庢弮帢庣庥 弇怷庣怷: " + +#~ msgid "%s: Passwords do not match, try again.\n" +#~ msgstr "%s: 峇帢 彖庛庢弮帢庣庥峎 帤庰彖 帢庣庣峎庤怷彖, 帤怷庥庣弮峎庰 徆帢彖峎.\n" + +#~ msgid "%s: can't create %s" +#~ msgstr "%s: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 怷 %s" + +#~ msgid "%s: can't open %s" +#~ msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 %s" + +#~ msgid "%s: Shell %s not found.\n" +#~ msgstr "%s: 弇怷庣 %s 帤庰彖 帣峟庛庢庥庰.\n" + +#~ msgid "group=%s,%u basedir=%s skel=%s\n" +#~ msgstr "怷弮峎帤帢=%s,%u 帣帢庣庥_庥帢帢弇=%s 庥庰弇=%s\n" + +#~ msgid "shell=%s " +#~ msgstr "弇怷庣=%s " + +#~ msgid "inactive=%ld expire=%s" +#~ msgstr "帢彖庰彖庰帠=%ld 弇峸徆庢=%s" + +#~ msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +#~ msgstr "峸庢: %s\t[-u uid [-o]] [-g 怷弮峎帤帢] [-G 怷弮峎帤帢,...] \n" #~ msgid "%s: gid %ld is not unique\n" -#~ msgstr "%s: 孲 gid %ld 麧 橀罅 斀罅僸蕓\n" +#~ msgstr "%s: 峇怷 gid %ld 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥\n" #, fuzzy #~ msgid "unknown gid: %u\n" -#~ msgstr "塨薋黀 gid: %d\n" +#~ msgstr "峎帠彖怷 gid: %d\n" #~ msgid "%s: uid %d is not unique\n" -#~ msgstr "%s: 孲 uid %d 麧 橀罅 斀罅僸蕓\n" +#~ msgstr "%s: 峇怷 uid %d 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥\n" #~ msgid "user %s: bad UID (%d)\n" -#~ msgstr "虀祼鐋 %s: 錆膻摷徾臩 UID (%d)\n" +#~ msgstr "峸庢 %s: 弇帢彖庛帢弮峟彖怷 UID (%d)\n" #~ msgid "%s: no aging information present\n" -#~ msgstr "%s: 櫻 臝塱艬罍 謻趡濼瀎蜌 蜛鼁薃趛\n" +#~ msgstr "%s: 庰彖 峎怷彖 弇庢怷怷巹庰 帠峸帢彖庢\n" #~ msgid "group %s: bad GID (%d)\n" -#~ msgstr "瀌塤 %s: 醏鴄 GID (%d)\n" +#~ msgstr "怷弮峎帤帢 %s: 弇峎庛怷 GID (%d)\n" #~ msgid "%s: permission denied (shell).\n" -#~ msgstr "%s: 塤樥 摫瀎麌灕賙 (灒毉)\n" +#~ msgstr "%s: 峎帤庰庣帢 帢怷巹庛庢庥庰 (弇怷庣)\n" #~ msgid "Incorrect password for %s.\n" -#~ msgstr "攬攠錎楜 黼膻賚敳濋 蜒 鐐 %s.\n" +#~ msgstr "帢弇弮峟彖怷 彖庛庢弮帢庣庥 帠庣帢 怷彖 %s.\n" #~ msgid "group not found\n" -#~ msgstr " 瀌塤 麧 碫楴賙嫹n" +#~ msgstr "庢 怷弮峎帤帢 帤庰彖 帣峟庛庢庥庰\n" diff --git a/po/en@boldquot.header b/po/en@boldquot.header new file mode 100644 index 00000000..fedb6a06 --- /dev/null +++ b/po/en@boldquot.header @@ -0,0 +1,25 @@ +# All this catalog "translates" are quotation characters. +# The msgids must be ASCII and therefore cannot contain real quotation +# characters, only substitutes like grave accent (0x60), apostrophe (0x27) +# and double quote (0x22). These substitutes look strange; see +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html +# +# This catalog translates grave accent (0x60) and apostrophe (0x27) to +# left single quotation mark (U+2018) and right single quotation mark (U+2019). +# It also translates pairs of apostrophe (0x27) to +# left single quotation mark (U+2018) and right single quotation mark (U+2019) +# and pairs of quotation mark (0x22) to +# left double quotation mark (U+201C) and right double quotation mark (U+201D). +# +# When output to an UTF-8 terminal, the quotation characters appear perfectly. +# When output to an ISO-8859-1 terminal, the single quotation marks are +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to +# grave/acute accent (by libiconv), and the double quotation marks are +# transliterated to 0x22. +# When output to an ASCII terminal, the single quotation marks are +# transliterated to apostrophes, and the double quotation marks are +# transliterated to 0x22. +# +# This catalog furthermore displays the text between the quotation marks in +# bold face, assuming the VT100/XTerm escape sequences. +# diff --git a/po/en@quot.header b/po/en@quot.header new file mode 100644 index 00000000..a9647fc3 --- /dev/null +++ b/po/en@quot.header @@ -0,0 +1,22 @@ +# All this catalog "translates" are quotation characters. +# The msgids must be ASCII and therefore cannot contain real quotation +# characters, only substitutes like grave accent (0x60), apostrophe (0x27) +# and double quote (0x22). These substitutes look strange; see +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html +# +# This catalog translates grave accent (0x60) and apostrophe (0x27) to +# left single quotation mark (U+2018) and right single quotation mark (U+2019). +# It also translates pairs of apostrophe (0x27) to +# left single quotation mark (U+2018) and right single quotation mark (U+2019) +# and pairs of quotation mark (0x22) to +# left double quotation mark (U+201C) and right double quotation mark (U+201D). +# +# When output to an UTF-8 terminal, the quotation characters appear perfectly. +# When output to an ISO-8859-1 terminal, the single quotation marks are +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to +# grave/acute accent (by libiconv), and the double quotation marks are +# transliterated to 0x22. +# When output to an ASCII terminal, the single quotation marks are +# transliterated to apostrophes, and the double quotation marks are +# transliterated to 0x22. +# diff --git a/po/fr.gmo b/po/fr.gmo index b0de8c92..b206d6c7 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 8592fd3b..2e0bdeb5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,198 +6,172 @@ msgid "" msgstr "" "Project-Id-Version: shadow 19990709\n" -"POT-Creation-Date: 2002-03-12 12:16+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" "PO-Revision-Date: 1999-07-09 20:02+0200\n" "Last-Translator: Vincent Renardias \n" "Language-Team: Vincent Renardias \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libmisc/addgrps.c:60 +#: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Avertissement: le groupe %s est inconnu\n" -#: libmisc/addgrps.c:71 +#: libmisc/addgrps.c:68 msgid "Warning: too many groups\n" msgstr "Avertissement: trop de groupes\n" -#: libmisc/age.c:77 +#: libmisc/age.c:72 msgid "Your password has expired." -msgstr "Votre mot de passe a expir." +msgstr "Votre mot de passe a expir矇." -#: libmisc/age.c:80 +#: libmisc/age.c:75 msgid "Your password is inactive." -msgstr "Votre mot de passe est d廥activ." +msgstr "Votre mot de passe est d矇sactiv矇." -#: libmisc/age.c:83 +#: libmisc/age.c:78 msgid "Your login has expired." -msgstr "Votre compte a expir." +msgstr "Votre compte a expir矇." -#: libmisc/age.c:96 +#: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " Contactez l'administrateur syst鋗e.\n" +msgstr " Contactez l'administrateur syst癡me.\n" -#: libmisc/age.c:99 +#: libmisc/age.c:93 msgid " Choose a new password.\n" msgstr " Choisissez un nouveau mot de passe.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:168 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Votre mot de passe expirera dans %ld jours.\n" -#: libmisc/age.c:178 +#: libmisc/age.c:172 msgid "Your password will expire tomorrow.\n" msgstr "Votre mot de passe expirera demain.\n" -#: libmisc/age.c:180 +#: libmisc/age.c:174 msgid "Your password will expire today.\n" msgstr "Votre mot de passe expirera aujourd'hui.\n" -#: libmisc/chowntty.c:113 +#: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" msgstr "Impossible de changer le tty %s" -#: libmisc/env.c:160 +#: libmisc/env.c:155 msgid "Environment overflow\n" -msgstr "D廧assement de l'environnement\n" +msgstr "D矇passement de l'environnement\n" -#: libmisc/env.c:200 +#: libmisc/env.c:195 #, c-format msgid "You may not change $%s\n" msgstr "Vous ne pouvez pas changer $%s\n" -#: libmisc/failure.c:238 +#: libmisc/failure.c:230 #, c-format msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s depuis la derni鋨e connexion. La derni鋨e fut le %s sur %s.\n" +msgstr "%d %s depuis la derni癡re connexion. La derni癡re fut le %s sur %s.\n" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failures" -msgstr "嶰hecs" +msgstr "矇checs" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failure" -msgstr "嶰hec" +msgstr "矇chec" -#: libmisc/limits.c:397 +#: libmisc/limits.c:396 msgid "Too many logins.\n" msgstr "Trop de connexions.\n" -#: libmisc/login_desrpc.c:63 +#: libmisc/login_desrpc.c:59 #, c-format msgid "Password does not decrypt secret key for %s.\n" -msgstr "Le mot de passe ne d嶰rypte pas le cl secr彋e pour %s.\n" +msgstr "Le mot de passe ne d矇crypte pas le cl矇 secr矇te pour %s.\n" -#: libmisc/login_desrpc.c:69 +#: libmisc/login_desrpc.c:66 #, c-format msgid "Could not set %s's secret key: is the keyserv daemon running?\n" msgstr "" -"Impossible de changer la cl secr彋e de %s : le daemon keyserv fonctionne-t-" +"Impossible de changer la cl矇 secr矇te de %s: le daemon keyserv fonctionne-t-" "il?\n" -#: libmisc/mail.c:62 libmisc/mail.c:77 +#: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Vous avez des nouveaux messages." -#: libmisc/mail.c:73 +#: libmisc/mail.c:72 msgid "No mail." msgstr "Pas de courier." -#: libmisc/mail.c:75 +#: libmisc/mail.c:74 msgid "You have mail." msgstr "Vous avez du courier." -#: libmisc/obscure.c:281 src/passwd.c:244 +#: libmisc/obscure.c:271 src/passwd.c:183 #, c-format msgid "Bad password: %s. " msgstr "Mauvais mot de passe: %s. " -#: libmisc/pam_pass.c:42 +#: libmisc/pam_pass.c:38 #, c-format msgid "passwd: pam_start() failed, error %d\n" -msgstr "passwd: 嶰hec de pam_start(), erreur %d\n" +msgstr "passwd: 矇chec de pam_start(), erreur %d\n" -#: libmisc/pam_pass.c:49 +#: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/setupenv.c:211 +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" +msgstr "" + +#: libmisc/setupenv.c:208 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Impossible d'aller dans \"%s\"\n" -#: libmisc/setupenv.c:219 +#: libmisc/setupenv.c:216 msgid "No directory, logging in with HOME=/" -msgstr "Pas de r廧ertoire, connexion avec HOME=/" +msgstr "Pas de r矇pertoire, connexion avec HOME=/" -#: libmisc/shell.c:78 -#, c-format -msgid "Executing shell %s\n" -msgstr "Ex嶰ution du shell %s\n" - -#. -#. * Obviously something is really wrong - I can't figure out -#. * how to execute this stupid shell, so I might as well give -#. * up in disgust ... -#. -#: libmisc/shell.c:122 +#: libmisc/shell.c:119 #, c-format msgid "Cannot execute %s" -msgstr "Impossible d'ex嶰uter %s" +msgstr "Impossible d'ex矇cuter %s" -#: libmisc/sub.c:61 +#: libmisc/sub.c:55 #, c-format msgid "Invalid root directory \"%s\"\n" -msgstr "R廧ertoire root \"%s\" non valide\n" +msgstr "R矇pertoire root \"%s\" non valide\n" -#: libmisc/sub.c:73 +#: libmisc/sub.c:67 #, c-format msgid "Can't change root directory to \"%s\"\n" -msgstr "Impossible de changer le r廧ertoire racine en \"%s\"\n" +msgstr "Impossible de changer le r矇pertoire racine en \"%s\"\n" -#: libmisc/xmalloc.c:28 +#: libmisc/xmalloc.c:24 #, c-format msgid "malloc(%d) failed\n" -msgstr "嶰hec de malloc(%d)\n" +msgstr "矇chec de malloc(%d)\n" -#: lib/dialchk.c:71 -msgid "Dialup Password: " -msgstr "Mot de passe dialup : " - -#: lib/getdef.c:276 +#: lib/getdef.c:274 msgid "Could not allocate space for config info.\n" msgstr "Impossible d'allouer l'espace pour l'information sur la conf.\n" -#. -#. * Item was never found. -#. -#: lib/getdef.c:330 +#: lib/getdef.c:328 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -"erreur de configuration - 幨幦ent '%s' inconnu (avertissez " +"erreur de configuration - 矇l矇ment '%s' inconnu (avertissez " "l'administrateur)\n" -#: lib/getdef.c:417 -#, c-format -msgid "error - lookup '%s' failed\n" -msgstr "erreur - 嶰hec de la recherche de '%s'\n" - -#: lib/getdef.c:425 -#, c-format -msgid "%s not found\n" -msgstr "%s non trouv嬞n" - -#. -#. * get the password from her, and set the salt for -#. * the decryption from the group file. -#. -#: lib/pwauth.c:54 src/newgrp.c:348 +#: lib/pwauth.c:54 src/newgrp.c:343 msgid "Password: " msgstr "Mot de passe: " @@ -206,7 +180,7 @@ msgstr "Mot de passe: " msgid "%s's Password: " msgstr "Mot de passe de %s: " -#: lib/pwauth.c:270 +#: lib/pwauth.c:247 msgid "(Echo on) " msgstr "" @@ -215,204 +189,167 @@ msgstr "" msgid "Unknown error %d" msgstr "Erreur %d inconnue" -#: src/chage.c:116 -#, c-format +#: src/chage.c:118 msgid "" -"Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" -"\t[-I inactive] [-E expire] [-d last_day] user\n" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -"Usage: %s [-l] [-m min_jourss] [-M max_jours] [-W avertissement]\n" -"\t[-I inactif] [-E expire] [-d dernier_jour] utilisateur\n" +"Usage: chage [-l] [-m min_jourss] [-M max_jours] [-W avertissement]\n" +" [-I inactif] [-E expire] [-d dernier_jour] utilisateur\n" -#: src/chage.c:122 -#, 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:157 +#: src/chage.c:152 #, fuzzy msgid "" "Enter the new value, or press ENTER for the default\n" "\n" msgstr "" -"Entrez la nouvelle valeur ou tapes Entr嶪 pour la valeur par d嶨aut\n" +"Entrez la nouvelle valeur ou tapes Entr矇e pour la valeur par d矇faut\n" "\n" -#: src/chage.c:160 +#: src/chage.c:155 msgid "Minimum Password Age" msgstr "Age minimum du mot de passe" -#: src/chage.c:166 +#: src/chage.c:161 msgid "Maximum Password Age" msgstr "Age maximum du mot de passe" -#: src/chage.c:174 +#: src/chage.c:169 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Dernier changement de mot de passe (YYYY-MM-DD)" -#: src/chage.c:183 +#: src/chage.c:177 msgid "Password Expiration Warning" msgstr "Avertissement d'expiration de mot de passe" -#: src/chage.c:189 +#: src/chage.c:183 msgid "Password Inactive" -msgstr "Mot de passe d廥activ" +msgstr "Mot de passe d矇sactiv矇" -#: src/chage.c:197 +#: src/chage.c:191 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Date d'expiration du compte (YYYY-MM-DD)" -#. -#. * Start with the easy numbers - the number of days before the -#. * password can be changed, the number of days after which the -#. * password must be chaged, the number of days before the password -#. * expires that the user is told, and the number of days after the -#. * password expires that the account becomes unusable. -#. -#: src/chage.c:248 +#: src/chage.c:241 #, c-format msgid "Minimum:\t%ld\n" msgstr "Minimum :\t%ld\n" -#: src/chage.c:249 +#: src/chage.c:242 #, c-format msgid "Maximum:\t%ld\n" msgstr "Maximum :\t%ld\n" -#: src/chage.c:251 +#: src/chage.c:243 #, c-format msgid "Warning:\t%ld\n" msgstr "Avertissement :\t%ld\n" -#: src/chage.c:252 +#: src/chage.c:244 #, c-format msgid "Inactive:\t%ld\n" -msgstr "D廥activ :\t%ld\n" +msgstr "D矇sactiv矇 :\t%ld\n" -#. -#. * The "last change" date is either "Never" or the date the password -#. * was last modified. The date is the number of days since 1/1/1970. -#. -#: src/chage.c:260 +#: src/chage.c:251 msgid "Last Change:\t\t" msgstr "Dernier changement :\t\t" -#: src/chage.c:262 src/chage.c:276 src/chage.c:293 src/chage.c:306 +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 msgid "Never\n" msgstr "Jamais\n" -#. -#. * The password expiration date is determined from the last change -#. * date plus the number of days the password is valid for. -#. -#: src/chage.c:273 +#: src/chage.c:264 msgid "Password Expires:\t" msgstr "Expiration du mot de passe :\t" -#. -#. * The account becomes inactive if the password is expired for more -#. * than "inactdays". The expiration date is calculated and the -#. * number of inactive days is added. The resulting date is when the -#. * active will be disabled. -#. -#: src/chage.c:290 +#: src/chage.c:280 msgid "Password Inactive:\t" -msgstr "Mot de passe d廥activ:\t" +msgstr "Mot de passe d矇sactiv矇:\t" -#. -#. * The account will expire on the given date regardless of the -#. * password expiring or not. -#. -#: src/chage.c:304 +#: src/chage.c:294 msgid "Account Expires:\t" msgstr "Expiration du mot de passe:\t" -#: src/chage.c:468 +#: src/chage.c:445 #, c-format msgid "%s: do not include \"l\" with other flags\n" -msgstr "%s : ne pas include \"l\" avec les autres drapeaux\n" +msgstr "%s: ne pas include \"l\" avec les autres drapeaux\n" -#: src/chage.c:481 src/chage.c:652 src/login.c:518 +#: src/chage.c:458 src/chage.c:588 src/login.c:503 #, c-format msgid "%s: permission denied\n" -msgstr "%s : permission refus嶪\n" +msgstr "%s: permission refus矇e\n" -#: src/chage.c:512 src/chpasswd.c:139 src/groupadd.c:529 src/groupdel.c:322 -#: src/groupmod.c:520 src/newusers.c:381 src/useradd.c:1754 src/userdel.c:717 -#: src/usermod.c:1732 +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" -msgstr "%s : erreur lors de l'ajout de la m彋hode d'authentification\n" +msgstr "%s: erreur lors de l'ajout de la m矇thode d'authentification\n" -#: src/chage.c:533 src/chpasswd.c:157 -#, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: impossible de v廨ouiller de fichier de mots de passe\n" - -#: src/chage.c:544 src/chpasswd.c:162 +#: src/chage.c:510 src/chpasswd.c:159 #, 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:552 +#: src/chage.c:518 #, c-format msgid "%s: unknown user: %s\n" msgstr "%s: utilisateur inconnu: %s\n" -#: src/chage.c:571 +#: src/chage.c:536 #, c-format msgid "%s: can't lock shadow password file" -msgstr "%s: impossible de v廨ouiller le fichier shadow password" +msgstr "%s: impossible de v矇rouiller le fichier shadow password" -#: src/chage.c:579 +#: src/chage.c:544 #, c-format msgid "%s: can't open shadow password file" -msgstr "%s : impossible d'ouvrir le fichier shadow password" +msgstr "%s: impossible d'ouvrir le fichier shadow password" -#: src/chage.c:674 +#: src/chage.c:605 #, c-format msgid "Changing the aging information for %s\n" msgstr "Changement des informations sur l'age pour %s\n" -#: src/chage.c:677 +#: src/chage.c:608 #, c-format msgid "%s: error changing fields\n" -msgstr "%s : erreur lors du changement des champs\n" +msgstr "%s: erreur lors du changement des champs\n" -#: src/chage.c:705 src/chage.c:771 src/pwunconv.c:174 +#: src/chage.c:632 src/pwunconv.c:138 #, c-format msgid "%s: can't update password file\n" -msgstr "%s : impossible de mettre jour le fichier passwd\n" +msgstr "%s: impossible de mettre jour le fichier passwd\n" -#: src/chage.c:737 src/pwunconv.c:168 +#: src/chage.c:661 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "%s : impossible de mettre jour le fichier shadow password\n" +msgstr "%s: impossible de mettre jour le fichier shadow password\n" -#: src/chage.c:789 src/chage.c:805 src/chfn.c:570 src/chsh.c:382 -#: src/passwd.c:747 src/passwd.c:859 +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 msgid "Error updating the DBM password entry.\n" -msgstr "Erreur durant la mise jour de l'entr嶪 du mot de passe DBM.\n" +msgstr "Erreur durant la mise jour de l'entr矇e du mot de passe DBM.\n" -#: src/chage.c:823 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "%s : impossible de re-嶰rire le fichier shadow password\n" +msgstr "%s: impossible de re-矇crire le fichier shadow password\n" -#: src/chage.c:838 +#: src/chage.c:707 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "%s : impossible de re-嶰rire le fichier password\n" +msgstr "%s: impossible de re-矇crire le fichier password\n" -#: src/chage.c:857 src/chpasswd.c:343 src/groupadd.c:590 src/groupdel.c:409 -#: src/groupmod.c:604 src/newusers.c:628 src/useradd.c:1869 src/userdel.c:849 -#: src/usermod.c:1811 +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: impossible de d憝廨ouiller le fichier\n" +msgstr "%s: impossible de d矇v矇rouiller le fichier\n" -#: src/chfn.c:83 +#: src/chfn.c:84 #, c-format msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" @@ -421,282 +358,254 @@ msgstr "" "Usage: %s [-f nom_complet] [-r no_bureau] [-w tel_bureau]\n" "\t[-h tel_perso] [-o autre] [utilisateur]\n" -#: src/chfn.c:88 +#: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "Usage: %s [-f nom_complet] [-w no_bureau] [-h tel_bureau]\n" -#: src/chfn.c:139 +#: src/chfn.c:140 msgid "Enter the new value, or press ENTER for the default\n" -msgstr "Entrez la nouvelle valeur ou tapez Entr嶪 pour le d嶨aut\n" +msgstr "Entrez la nouvelle valeur ou tapez Entr矇e pour le d矇faut\n" -#: src/chfn.c:142 +#: src/chfn.c:143 msgid "Full Name" msgstr "Nom complet" -#: src/chfn.c:144 +#: src/chfn.c:145 #, c-format msgid "\tFull Name: %s\n" -msgstr "\tNom complet : %s\n" +msgstr "\tNom complet: %s\n" -#: src/chfn.c:147 +#: src/chfn.c:148 msgid "Room Number" msgstr "No de bureau" -#: src/chfn.c:149 +#: src/chfn.c:150 #, c-format msgid "\tRoom Number: %s\n" -msgstr "\tNo de bureau : %s\n" +msgstr "\tNo de bureau: %s\n" -#: src/chfn.c:152 +#: src/chfn.c:153 msgid "Work Phone" -msgstr "T幨廧hone travail" +msgstr "T矇l矇phone travail" -#: src/chfn.c:154 +#: src/chfn.c:155 #, c-format msgid "\tWork Phone: %s\n" -msgstr "\tT幨廧hone travail : %s\n" +msgstr "\tT矇l矇phone travail: %s\n" -#: src/chfn.c:157 +#: src/chfn.c:158 msgid "Home Phone" -msgstr "T幨廧hone perso" +msgstr "T矇l矇phone perso" -#: src/chfn.c:159 +#: src/chfn.c:160 #, c-format msgid "\tHome Phone: %s\n" -msgstr "\tT幨廧hone perso : %s\n" +msgstr "\tT矇l矇phone perso: %s\n" -#: src/chfn.c:162 +#: src/chfn.c:163 msgid "Other" msgstr "Autre" -#: src/chfn.c:271 src/chfn.c:281 src/chfn.c:291 src/chfn.c:301 src/chfn.c:311 -#: src/chfn.c:379 src/passwd.c:1115 +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 #, c-format msgid "%s: Permission denied.\n" -msgstr "%s: Permission refus嶪.\n" +msgstr "%s: Permission refus矇e.\n" -#: src/chfn.c:332 src/chsh.c:190 src/passwd.c:1165 +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 #, c-format msgid "%s: Unknown user %s\n" msgstr "%s: Utilisateur %s inconnu\n" -#: src/chfn.c:341 src/chsh.c:198 src/passwd.c:1096 +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 #, c-format msgid "%s: Cannot determine your user name.\n" -msgstr "%s: Impossible de d彋erminer votre nom d'utilisateur.\n" +msgstr "%s: Impossible de d矇terminer votre nom d'utilisateur.\n" -#: src/chfn.c:358 src/chsh.c:215 +#: src/chfn.c:359 src/chsh.c:210 #, 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:366 src/chsh.c:223 +#: src/chfn.c:367 src/chsh.c:218 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: `%s' est le ma褾re NIS pour ce client.\n" +msgstr "%s: `%s' est le ma簾tre NIS pour ce client.\n" -#: src/chfn.c:441 +#: src/chfn.c:442 #, c-format msgid "Changing the user information for %s\n" msgstr "Changement de l'information utilisateur pour %s\n" -#: src/chfn.c:450 +#: src/chfn.c:451 #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s : nom non valide : \"%s\"\n" +msgstr "%s: nom non valide: \"%s\"\n" -#: src/chfn.c:456 +#: src/chfn.c:457 #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "%s : no de bureau non valide : \"%s\"\n" +msgstr "%s: no de bureau non valide: \"%s\"\n" -#: src/chfn.c:462 +#: src/chfn.c:463 #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "%s : t幨廧hone du bureau non valide : \"%s\"\n" +msgstr "%s: t矇l矇phone du bureau non valide: \"%s\"\n" -#: src/chfn.c:468 +#: src/chfn.c:469 #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s : t幨廧hone perso non valide : \"%s\"\n" +msgstr "%s: t矇l矇phone perso non valide: \"%s\"\n" -#: src/chfn.c:475 +#: src/chfn.c:476 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s : \"%s\" contient des caract鋨es non valide\n" +msgstr "%s: \"%s\" contient des caract癡res non valide\n" -#: src/chfn.c:488 +#: src/chfn.c:489 #, c-format msgid "%s: fields too long\n" msgstr "%s: champs trop longs\n" -#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277 +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 msgid "Cannot change ID to root.\n" msgstr "Impossible de changer l'ID en root.\n" -#: src/chfn.c:519 src/chsh.c:331 src/passwd.c:656 src/passwd.c:811 +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 msgid "Cannot lock the password file; try again later.\n" msgstr "" -"Impossible de v廨ouiller le fichier de mots de passe; essayez plus tard.\n" +"Impossible de v矇rouiller le fichier de mots de passe; essayez plus tard.\n" -#: src/chfn.c:525 src/chsh.c:337 src/passwd.c:661 src/passwd.c:816 +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 msgid "Cannot open the password file.\n" msgstr "Impossible d'ouvrir le fichier de mots de passe.\n" -#: src/chfn.c:542 src/chsh.c:352 src/passwd.c:667 src/usermod.c:1348 +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 #, c-format msgid "%s: %s not found in /etc/passwd\n" -msgstr "%s: %s non trouv dans /etc/passwd\n" +msgstr "%s: %s non trouv矇 dans /etc/passwd\n" -#: src/chfn.c:561 src/chsh.c:373 src/passwd.c:740 src/passwd.c:852 +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 msgid "Error updating the password entry.\n" -msgstr "Erreur durant la mise jour du mot de passe.\n" +msgstr "Erreur durant la mise jour du mot de passe.\n" -#: src/chfn.c:585 src/chsh.c:397 src/passwd.c:755 src/passwd.c:867 +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 msgid "Cannot commit password file changes.\n" msgstr "Impossible de valider le changement de mot de passe.\n" -#: src/chfn.c:592 src/chsh.c:404 +#: src/chfn.c:593 src/chsh.c:399 msgid "Cannot unlock the password file.\n" -msgstr "Impossible de d憝廨ouiller le fichier de mots de passe.\n" +msgstr "Impossible de d矇v矇rouiller le fichier de mots de passe.\n" -#: src/chpasswd.c:66 +#: src/chpasswd.c:67 #, c-format -msgid "usage: %s [-e]\n" -msgstr "usage: %s [-e]\n" +msgid "Usage: %s [-e]\n" +msgstr "Usage: %s [-e]\n" -#: src/chpasswd.c:171 src/pwconv.c:94 +#: src/chpasswd.c:154 +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: impossible de v矇rouiller de fichier de mots de passe\n" + +#: src/chpasswd.c:168 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" -msgstr "%s: impossible de v廨ouiller le fichier shadow\n" +msgstr "%s: impossible de v矇rouiller le fichier shadow\n" -#: src/chpasswd.c:177 src/gpasswd.c:596 src/pwconv.c:99 src/pwunconv.c:103 -#: src/pwunconv.c:108 +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: impossible d'ouvrir le fichier shadow\n" -#: src/chpasswd.c:200 src/newusers.c:460 +#: src/chpasswd.c:197 src/newusers.c:441 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: ligne %d: ligne trop longue\n" -#: src/chpasswd.c:220 +#: src/chpasswd.c:217 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: ligne %d: nouveau mot de passe manquant\n" -#: src/chpasswd.c:237 +#: src/chpasswd.c:234 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: ligne %d: utilisateur %s inconnu\n" -#: src/chpasswd.c:290 +#: src/chpasswd.c:280 #, c-format msgid "%s: line %d: cannot update password entry\n" -msgstr "%s: ligne %d: impossible de mettre le mot de passe jour\n" +msgstr "%s: ligne %d: impossible de mettre le mot de passe jour\n" -#: src/chpasswd.c:307 src/newusers.c:588 +#: src/chpasswd.c:297 src/newusers.c:569 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: erreur d彋ect嶪; changements ignor廥\n" +msgstr "%s: erreur d矇tect矇e; changements ignor矇s\n" -#: src/chpasswd.c:319 +#: src/chpasswd.c:309 #, c-format msgid "%s: error updating shadow file\n" -msgstr "%s: erreur lors de la mise jour du fichier shadow\n" +msgstr "%s: erreur lors de la mise jour du fichier shadow\n" -#: src/chpasswd.c:328 +#: src/chpasswd.c:318 #, c-format msgid "%s: error updating password file\n" -msgstr "%s: erreur lors de la mise jour du fichier de mots de passe\n" +msgstr "%s: erreur lors de la mise jour du fichier de mots de passe\n" -#: src/chsh.c:75 +#: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Usage: %s [-s shell] [nom]\n" -#: src/chsh.c:89 +#: src/chsh.c:90 #, fuzzy msgid "Enter the new value, or press return for the default\n" -msgstr "Entrez la nouvelle valeur ou tapez Entr嶪 pour le d嶨aut\n" +msgstr "Entrez la nouvelle valeur ou tapez Entr矇e pour le d矇faut\n" -#: src/chsh.c:90 +#: src/chsh.c:91 msgid "Login Shell" msgstr "Shell de login" -#: src/chsh.c:239 src/chsh.c:253 +#: src/chsh.c:234 src/chsh.c:248 #, 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:282 +#: src/chsh.c:277 #, c-format msgid "Changing the login shell for %s\n" msgstr "Changement du shell de login pour %s\n" -#: src/chsh.c:294 +#: src/chsh.c:289 #, c-format msgid "%s: Invalid entry: %s\n" -msgstr "%s: Entr嶪 non valide : %s\n" +msgstr "%s: Entr矇e non valide: %s\n" -#: src/chsh.c:301 +#: src/chsh.c:296 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s n'est pas un shell valide.\n" -#: src/dpasswd.c:52 -#, c-format -msgid "Usage: %s [-(a|d)] shell\n" -msgstr "Usage: %s [-(a|d)] shell\n" - -#: src/dpasswd.c:115 -msgid "Shell password: " -msgstr "Mot de passe shell : " - -#: src/dpasswd.c:121 -msgid "re-enter Shell password: " -msgstr "Confirmez le mot de passe shell : " - -#: src/dpasswd.c:129 -#, c-format -msgid "%s: Passwords do not match, try again.\n" -msgstr "%s : Les mots de passe ne correspondent pas, essayez encore.\n" - -#: src/dpasswd.c:149 -#, c-format -msgid "%s: can't create %s" -msgstr "%s: impossible de cr嶪r %s" - -#: src/dpasswd.c:155 -#, c-format -msgid "%s: can't open %s" -msgstr "%s : impossible d'ouvrir %s" - -#: src/dpasswd.c:183 -#, c-format -msgid "%s: Shell %s not found.\n" -msgstr "%s : Shell %s non trouv.\n" - #: src/expiry.c:59 msgid "Usage: expiry {-f|-c}\n" -msgstr "Usage : expiry {-f|-c}\n" +msgstr "Usage: expiry {-f|-c}\n" #: src/expiry.c:113 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" -msgstr "%s: AVERTISSEMENT! Devrait 皻re set-UID root!\n" +msgstr "%s: AVERTISSEMENT! Devrait 礙tre set-UID root!\n" #: src/expiry.c:124 #, c-format msgid "%s: unknown user\n" -msgstr "%s : utilisateur inconnu\n" +msgstr "%s: utilisateur inconnu\n" #: src/faillog.c:77 #, c-format -msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" -msgstr "usage: %s [-a|-u utilisateur] [-m max] [-r] [-t jours] [-l sec_ver]\n" +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +msgstr "Usage: %s [-a|-u utilisateur] [-m max] [-r] [-t jours] [-l sec_ver]\n" #: src/faillog.c:131 src/lastlog.c:96 #, c-format @@ -705,7 +614,7 @@ msgstr "Utilisateur %s inconnu\n" #: src/faillog.c:212 msgid "Username Failures Maximum Latest\n" -msgstr "Utilisateur 丱hecs Maximum Dernier\n" +msgstr "Utilisateur checs Maximum Dernier\n" #: src/faillog.c:229 #, c-format @@ -724,8 +633,8 @@ msgstr " [%lds verrou]" #: src/gpasswd.c:78 #, c-format -msgid "usage: %s [-r|-R] group\n" -msgstr "usage: %s [-r|-R] groupe\n" +msgid "Usage: %s [-r|-R] group\n" +msgstr "Usage: %s [-r|-R] groupe\n" #: src/gpasswd.c:79 #, c-format @@ -750,25 +659,25 @@ msgstr " %s [-M utilisateur,...] groupe\n" #: src/gpasswd.c:146 src/gpasswd.c:230 #, c-format msgid "%s: unknown user %s\n" -msgstr "%s : utilisateur %s inconnu\n" +msgstr "%s: utilisateur %s inconnu\n" #: src/gpasswd.c:157 msgid "Permission denied.\n" -msgstr "Permission refus嶪.\n" +msgstr "Permission refus矇e.\n" #: src/gpasswd.c:243 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s : mots de passe shadow n嶰essaires pour -A\n" +msgstr "%s: mots de passe shadow n矇cessaires pour -A\n" #: src/gpasswd.c:294 msgid "Who are you?\n" -msgstr "Qui 皻es vous?\n" +msgstr "Qui 礙tes vous?\n" -#: src/gpasswd.c:313 src/newgrp.c:297 +#: src/gpasswd.c:313 src/newgrp.c:292 #, c-format msgid "unknown group: %s\n" -msgstr "groupe inconnu : %s\n" +msgstr "groupe inconnu: %s\n" #: src/gpasswd.c:422 #, c-format @@ -783,19 +692,13 @@ msgstr "Retrait de l'utilisateur %s du groupe %s\n" #: src/gpasswd.c:454 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s : membre %s inconnu\n" +msgstr "%s: membre %s inconnu\n" #: src/gpasswd.c:501 #, c-format msgid "%s: Not a tty\n" -msgstr "%s : N'est pas un tty\n" +msgstr "%s: N'est pas un tty\n" -#. -#. * A new password is to be entered and it must be encrypted, etc. -#. * The password will be prompted for twice, and both entries must be -#. * identical. There is no need to validate the old password since -#. * the invoker is either the group owner, or root. -#. #: src/gpasswd.c:522 #, c-format msgid "Changing the password for group %s\n" @@ -803,203 +706,197 @@ msgstr "Changement du mot de passe pour le group %s\n" #: src/gpasswd.c:525 msgid "New Password: " -msgstr "Nouveau mot de passe : " +msgstr "Nouveau mot de passe: " -#: src/gpasswd.c:530 src/passwd.c:365 +#: src/gpasswd.c:530 src/passwd.c:281 msgid "Re-enter new password: " -msgstr "Nouveau mot de passe ( nouveau) : " +msgstr "Nouveau mot de passe ( nouveau): " #: src/gpasswd.c:542 msgid "They don't match; try again" -msgstr "Ils ne sont pas identiques; essayez nouveau" +msgstr "Ils ne sont pas identiques; essayez nouveau" #: src/gpasswd.c:546 #, c-format msgid "%s: Try again later\n" -msgstr "%s: Essayez nouveau plus tard\n" +msgstr "%s: Essayez nouveau plus tard\n" #: src/gpasswd.c:578 #, c-format msgid "%s: can't get lock\n" -msgstr "%s : impossible d'obtenir le verrou\n" +msgstr "%s: impossible d'obtenir le verrou\n" #: src/gpasswd.c:584 #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s : impossible d'obtenir le verrou sur shadow\n" +msgstr "%s: impossible d'obtenir le verrou sur shadow\n" #: src/gpasswd.c:590 #, c-format msgid "%s: can't open file\n" -msgstr "%s : impossible d'ouvrir le fichier\n" +msgstr "%s: impossible d'ouvrir le fichier\n" #: src/gpasswd.c:602 #, c-format msgid "%s: can't update entry\n" -msgstr "%s : impossible de mettre jour l'entr嶪\n" +msgstr "%s: impossible de mettre jour l'entr矇e\n" #: src/gpasswd.c:608 #, c-format msgid "%s: can't update shadow entry\n" -msgstr "%s : impossible de mettre jour l'entr嶪 shadow\n" +msgstr "%s: impossible de mettre jour l'entr矇e shadow\n" #: src/gpasswd.c:615 #, c-format msgid "%s: can't re-write file\n" -msgstr "%s : impossible de re-嶰rire le fichier\n" +msgstr "%s: impossible de re-矇crire le fichier\n" #: src/gpasswd.c:621 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s : impossible de re-嶰rire le fichier shadow\n" +msgstr "%s: impossible de re-矇crire le fichier shadow\n" #: src/gpasswd.c:630 #, c-format msgid "%s: can't unlock file\n" -msgstr "%s : impossible de d憝廨ouiller le fichier\n" +msgstr "%s: impossible de d矇v矇rouiller le fichier\n" #: src/gpasswd.c:635 #, c-format msgid "%s: can't update DBM files\n" -msgstr "%s : impossible de mettre jours les fichiers DBM\n" +msgstr "%s: impossible de mettre jours les fichiers DBM\n" #: src/gpasswd.c:642 #, c-format msgid "%s: can't update DBM shadow files\n" -msgstr "%s : impossible de mettre jours les fichiers DBM shadow\n" +msgstr "%s: impossible de mettre jours les fichiers DBM shadow\n" -#: src/groupadd.c:101 -msgid "usage: groupadd [-g gid [-o]] group\n" -msgstr "usage: groupadd [-g gid [-o]] groupe\n" +#: src/groupadd.c:102 +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" +msgstr "Usage: groupadd [-g gid [-o]] [-f] groupe\n" -#: src/groupadd.c:167 src/groupadd.c:192 src/groupmod.c:179 src/groupmod.c:228 -#: src/useradd.c:970 src/usermod.c:552 src/usermod.c:695 +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s : erreur durant l'addition du nouveau groupe\n" +msgstr "%s: erreur durant l'addition du nouveau groupe\n" -#: src/groupadd.c:178 src/groupadd.c:203 src/groupmod.c:197 src/useradd.c:981 -#: src/usermod.c:564 src/usermod.c:708 +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 #, c-format msgid "%s: cannot add new dbm group entry\n" -msgstr "%s : impossible d'ajouter une nouvelle entr嶪 pour le groupe dbm\n" +msgstr "%s: impossible d'ajouter une nouvelle entr矇e pour le groupe dbm\n" -#: src/groupadd.c:255 src/useradd.c:1034 +#: src/groupadd.c:256 src/useradd.c:977 #, c-format msgid "%s: name %s is not unique\n" -msgstr "%s : le nom %s n'est pas unique\n" +msgstr "%s: le nom %s n'est pas unique\n" -#: src/groupadd.c:270 +#: src/groupadd.c:271 #, c-format msgid "%s: gid %u is not unique\n" -msgstr "%s : l'uid %u n'est pas unique\n" +msgstr "%s: l'uid %u n'est pas unique\n" -#: src/groupadd.c:294 +#: src/groupadd.c:295 #, c-format msgid "%s: can't get unique gid\n" -msgstr "%s : impossible d'obtenir un gid unique\n" +msgstr "%s: impossible d'obtenir un gid unique\n" -#. -#. * All invalid group names land here. -#. -#: src/groupadd.c:317 src/groupmod.c:341 +#: src/groupadd.c:318 src/groupmod.c:342 #, c-format msgid "%s: %s is a not a valid group name\n" -msgstr "%s : %s n'est pas un nom de groupe valide\n" +msgstr "%s: %s n'est pas un nom de groupe valide\n" -#: src/groupadd.c:346 src/groupmod.c:366 +#: src/groupadd.c:347 src/groupmod.c:367 #, c-format msgid "%s: invalid group %s\n" -msgstr "%s : groupe %s non valide\n" +msgstr "%s: groupe %s non valide\n" -#: src/groupadd.c:363 src/useradd.c:1313 +#: src/groupadd.c:364 src/useradd.c:1173 #, c-format msgid "%s: -O requires NAME=VALUE\n" -msgstr "%s : -O requiert NAME=VALEUR\n" +msgstr "%s: -O requiert NAME=VALEUR\n" -#: src/groupadd.c:407 src/groupdel.c:173 src/groupmod.c:401 src/useradd.c:1428 -#: src/userdel.c:312 src/usermod.c:576 +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 #, c-format msgid "%s: cannot rewrite group file\n" -msgstr "%s : impossible de re-嶰rire le fichier group\n" +msgstr "%s: impossible de re-矇crire le fichier group\n" -#: src/groupadd.c:415 src/groupdel.c:179 src/groupmod.c:409 src/useradd.c:1437 -#: src/userdel.c:319 src/usermod.c:722 +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 #, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s : impossible de re-嶰rire le fichier shadow group\n" +msgstr "%s: impossible de re-矇crire le fichier shadow group\n" -#: src/groupadd.c:433 src/groupdel.c:198 src/groupmod.c:427 src/userdel.c:403 +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s : impossible de v廨ouiller le fichier group\n" +msgstr "%s: impossible de v矇rouiller le fichier group\n" -#: src/groupadd.c:438 src/groupdel.c:202 src/groupmod.c:432 +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 #, c-format msgid "%s: unable to open group file\n" -msgstr "%s : impossible d'ouvrir le fichier group\n" +msgstr "%s: impossible d'ouvrir le fichier group\n" -#: src/groupadd.c:445 src/groupdel.c:207 src/groupmod.c:439 src/userdel.c:414 +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s : impossible de v廨ouiller le fichier group\n" +msgstr "%s: impossible de v矇rouiller le fichier group\n" -#: src/groupadd.c:451 src/groupdel.c:212 src/groupmod.c:445 +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s : impossible d'ouvrir le fichier shadow group\n" +msgstr "%s: impossible d'ouvrir le fichier shadow group\n" -#: src/groupadd.c:562 +#: src/groupadd.c:563 #, c-format msgid "%s: group %s exists\n" -msgstr "%s : le groupe %s existe\n" +msgstr "%s: le groupe %s existe\n" -#: src/groupdel.c:92 -msgid "usage: groupdel group\n" -msgstr "usage: groupdel groupe\n" +#: src/groupdel.c:88 +msgid "Usage: groupdel group\n" +msgstr "Usage: groupdel groupe\n" -#: src/groupdel.c:110 src/groupmod.c:184 src/groupmod.c:233 +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 #, c-format msgid "%s: error removing group entry\n" -msgstr "%s : erreur lors de retrait de l'entr嶪 du groupe\n" +msgstr "%s: erreur lors de retrait de l'entr矇e du groupe\n" -#: src/groupdel.c:122 src/groupmod.c:204 +#: src/groupdel.c:119 src/groupmod.c:205 #, c-format msgid "%s: error removing group dbm entry\n" -msgstr "%s : erreur lors du retrait de l'entr嶪 dbm du groupe\n" +msgstr "%s: erreur lors du retrait de l'entr矇e dbm du groupe\n" -#: src/groupdel.c:137 +#: src/groupdel.c:135 #, c-format msgid "%s: error removing shadow group entry\n" -msgstr "%s : erreur lors du retrait de l'entr嶪 shadow du groupe\n" +msgstr "%s: erreur lors du retrait de l'entr矇e shadow du groupe\n" -#: src/groupdel.c:150 src/groupmod.c:254 +#: src/groupdel.c:149 src/groupmod.c:255 #, c-format msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s : erreur lors du retrait de l'entr嶪 dbm shadow du groupe\n" +msgstr "%s: erreur lors du retrait de l'entr矇e dbm shadow du groupe\n" -#. -#. * Can't remove the group. -#. -#: src/groupdel.c:254 +#: src/groupdel.c:255 #, c-format msgid "%s: cannot remove user's primary group.\n" -msgstr "%s : impossible d'enlever l'utilisateur de son groupe primaire.\n" +msgstr "%s: impossible d'enlever l'utilisateur de son groupe primaire.\n" -#: src/groupdel.c:355 src/groupmod.c:550 +#: src/groupdel.c:359 src/groupmod.c:551 #, c-format msgid "%s: group %s does not exist\n" -msgstr "%s : le groupe %s n'existe pas\n" +msgstr "%s: le groupe %s n'existe pas\n" -#: src/groupdel.c:369 src/groupmod.c:566 +#: src/groupdel.c:373 src/groupmod.c:567 #, c-format msgid "%s: group %s is a NIS group\n" -msgstr "%s : le groupe %s est un groupe NIS\n" +msgstr "%s: le groupe %s est un groupe NIS\n" -#: src/groupdel.c:375 src/groupmod.c:571 src/userdel.c:776 src/usermod.c:1045 +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 #, c-format msgid "%s: %s is the NIS master\n" -msgstr "%s : %s est le ma褾re NIS\n" +msgstr "%s: %s est le ma簾tre NIS\n" #: src/groupmems.c:95 msgid "Member already exists\n" @@ -1010,7 +907,7 @@ msgid "Member to remove could not be found\n" msgstr "" #: src/groupmems.c:158 -msgid "usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" msgstr "" #: src/groupmems.c:201 @@ -1027,7 +924,7 @@ msgstr "" #: src/groupmems.c:215 msgid "Unable to lock group file\n" -msgstr "Impossible de v廨ouiller le fichier group\n" +msgstr "Impossible de v矇rouiller le fichier group\n" #: src/groupmems.c:220 msgid "Unable to open group file\n" @@ -1037,29 +934,29 @@ msgstr "Impossible d'ouvrir le fichier group\n" msgid "Cannot close group file\n" msgstr "Impossible d'ouvrir le fichier group\n" -#: src/groupmod.c:103 -msgid "usage: groupmod [-g gid [-o]] [-n name] group\n" -msgstr "usage : groupmod [-g gid [-o]] [-n nom] groupe\n" +#: src/groupmod.c:104 +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "Usage: groupmod [-g gid [-o]] [-n nom] groupe\n" -#: src/groupmod.c:161 +#: src/groupmod.c:162 #, c-format msgid "%s: %s not found in /etc/group\n" -msgstr "%s : %s non trouv dans /etc/group\n" +msgstr "%s: %s non trouv矇 dans /etc/group\n" -#: src/groupmod.c:247 +#: src/groupmod.c:248 #, c-format msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s : impossible d'ajouter une nouvelle entr嶪 dbm shadow group\n" +msgstr "%s: impossible d'ajouter une nouvelle entr矇e dbm shadow group\n" -#: src/groupmod.c:300 +#: src/groupmod.c:301 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u n'est pas un gid unique\n" -#: src/groupmod.c:330 +#: src/groupmod.c:331 #, c-format msgid "%s: %s is not a unique name\n" -msgstr "%s : %s n'est pas un nom unique\n" +msgstr "%s: %s n'est pas un nom unique\n" #: src/groups.c:59 #, c-format @@ -1088,21 +985,17 @@ msgstr "" #: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s : impossible de v廨ouiller le fichier %s\n" +msgstr "%s: impossible de v矇rouiller le fichier %s\n" #: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:202 src/pwck.c:242 #: src/pwck.c:251 #, c-format msgid "%s: cannot open file %s\n" -msgstr "%s : impossible d'ouvrir le fichier %s\n" +msgstr "%s: impossible d'ouvrir le fichier %s\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:311 msgid "invalid group file entry\n" -msgstr "entr嶪 dans le fichier group non valide\n" +msgstr "entr矇e dans le fichier group non valide\n" #: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 #: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 @@ -1111,13 +1004,9 @@ msgstr "entr msgid "delete line `%s'? " msgstr "effacer la ligne `%s'? " -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:374 msgid "duplicate group entry\n" -msgstr "entr嶪 de groupe dupliqu嶪\n" +msgstr "entr矇e de groupe dupliqu矇e\n" #: src/grpck.c:391 #, c-format @@ -1127,37 +1016,29 @@ msgstr "nom de groupe `%s' non valide\n" #: src/grpck.c:418 #, c-format msgid "group %s: no user %s\n" -msgstr "groupe %s : pas d'utilisateur %s\n" +msgstr "groupe %s: pas d'utilisateur %s\n" #: src/grpck.c:420 src/grpck.c:590 #, c-format msgid "delete member `%s'? " msgstr "effacer le membre `%s'? " -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:457 msgid "invalid shadow group file entry\n" -msgstr "entr嶪 non valide dans le fichier shadow group\n" +msgstr "entr矇e non valide dans le fichier shadow group\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:520 msgid "duplicate shadow group entry\n" -msgstr "entr嶪 dupliqu嶪 dans le fichier shadow group\n" +msgstr "entr矇e dupliqu矇e dans le fichier shadow group\n" #: src/grpck.c:537 msgid "no matching group file entry\n" -msgstr "aucune entr嶪 dans le fichier group correspondante\n" +msgstr "aucune entr矇e dans le fichier group correspondante\n" #: src/grpck.c:558 #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "groupe shadow %s : aucun administrateur %s\n" +msgstr "groupe shadow %s: aucun administrateur %s\n" #: src/grpck.c:560 #, c-format @@ -1167,228 +1048,215 @@ msgstr "effacer le membre administrateur `%s' ?" #: src/grpck.c:588 #, c-format msgid "shadow group %s: no user %s\n" -msgstr "groupe shadow %s : aucun utilisateur %s\n" +msgstr "groupe shadow %s: aucun utilisateur %s\n" #: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 #, c-format msgid "%s: cannot update file %s\n" -msgstr "%s : impossible de mettre jour le fichier %s\n" +msgstr "%s: impossible de mettre jour le fichier %s\n" #: src/grpck.c:647 src/pwck.c:612 #, c-format msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s : les fichiers ont 彋 mis jour; ex嶰utez mkpasswd\n" +msgstr "%s: les fichiers ont 矇t矇 mis jour; ex矇cutez mkpasswd\n" #: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format +#, fuzzy, c-format msgid "%s: no changes\n" -msgstr "" +msgstr "%s: erreur lors du changement des champs\n" #: src/grpck.c:651 src/pwck.c:616 -#, c-format +#, fuzzy, c-format msgid "%s: the files have been updated\n" -msgstr "" +msgstr "%s: les fichiers ont 矇t矇 mis jour; ex矇cutez mkpasswd\n" #: src/grpconv.c:60 src/grpunconv.c:56 -#, c-format +#, fuzzy, c-format msgid "%s: can't lock group file\n" -msgstr "" +msgstr "%s: impossible de d矇v矇rouiller le fichier\n" #: src/grpconv.c:65 src/grpunconv.c:61 -#, c-format +#, fuzzy, c-format msgid "%s: can't open group file\n" -msgstr "" +msgstr "%s: impossible d'ouvrir le fichier group\n" #: src/grpconv.c:70 src/grpunconv.c:66 -#, c-format +#, fuzzy, c-format msgid "%s: can't lock shadow group file\n" -msgstr "" +msgstr "%s: impossible de v矇rouiller le fichier shadow\n" #: src/grpconv.c:76 src/grpunconv.c:72 -#, c-format +#, fuzzy, c-format msgid "%s: can't open shadow group file\n" -msgstr "" +msgstr "%s: impossible d'ouvrir le fichier shadow group\n" #: src/grpconv.c:94 -#, c-format +#, fuzzy, c-format msgid "%s: can't remove shadow group %s\n" -msgstr "" +msgstr "%s: impossible d'enlever l'entr矇e shadow pour %s\n" -#: src/grpconv.c:138 src/pwconv.c:153 -#, c-format +#: src/grpconv.c:133 src/pwconv.c:154 +#, fuzzy, c-format msgid "%s: can't update shadow entry for %s\n" -msgstr "" +msgstr "%s: impossible de mettre jour l'entr矇e shadow\n" -#: src/grpconv.c:148 src/grpunconv.c:91 -#, c-format +#: src/grpconv.c:143 src/grpunconv.c:91 +#, fuzzy, c-format msgid "%s: can't update entry for group %s\n" -msgstr "" +msgstr "%s: impossible de mettre jour l'entr矇e %s\n" -#: src/grpconv.c:155 src/grpunconv.c:99 -#, c-format +#: src/grpconv.c:150 src/grpunconv.c:99 +#, fuzzy, c-format msgid "%s: can't update shadow group file\n" -msgstr "" +msgstr "%s: impossible de mettre jour le fichier shadow\n" -#: src/grpconv.c:160 src/grpunconv.c:105 -#, c-format +#: src/grpconv.c:155 src/grpunconv.c:105 +#, fuzzy, c-format msgid "%s: can't update group file\n" -msgstr "" - -#: src/grpconv.c:175 src/grpunconv.c:127 -#, c-format -msgid "%s: not configured for shadow group support.\n" -msgstr "" +msgstr "%s: impossible de mettre jour le fichier passwd\n" #: src/grpunconv.c:110 -#, c-format +#, fuzzy, c-format msgid "%s: can't delete shadow group file\n" -msgstr "" +msgstr "%s: impossible de re-矇crire le fichier shadow group\n" #: src/id.c:53 -msgid "usage: id [-a]\n" -msgstr "Usage : id [-a]\n" +msgid "Usage: id [-a]\n" +msgstr "Usage: id [-a]\n" #: src/id.c:55 -msgid "usage: id\n" -msgstr "Usage : id\n" +msgid "Usage: id\n" +msgstr "Usage: id\n" -#. -#. * Start off the group message. It will be of the format -#. * -#. * groups=###(aaa),###(aaa),###(aaa) -#. * -#. * where "###" is a numerical value and "aaa" is the -#. * corresponding name for each respective numerical value. -#. #: src/id.c:169 msgid " groups=" msgstr " groupes=" #: src/lastlog.c:110 src/lastlog.c:116 #, c-format -msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n" +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" msgstr "" #: src/lastlog.c:181 msgid "Username Port From Latest\n" -msgstr "Utilisateur Port Venant de Derni鋨e\n" +msgstr "Utilisateur Port Venant de Derni癡re\n" #: src/lastlog.c:183 msgid "Username Port Latest\n" -msgstr "Utilisateur Port Derni鋨e\n" +msgstr "Utilisateur Port Derni癡re\n" -#: src/lastlog.c:197 +#: src/lastlog.c:198 msgid "**Never logged in**" -msgstr "**Jamais connect**" +msgstr "**Jamais connect矇**" -#: src/login.c:185 +#: src/login.c:175 #, c-format -msgid "usage: %s [-p] [name]\n" -msgstr "Usage : %s [-p] [nom]\n" +msgid "Usage: %s [-p] [name]\n" +msgstr "Usage: %s [-p] [nom]\n" -#: src/login.c:188 +#: src/login.c:178 #, c-format msgid " %s [-p] [-h host] [-f name]\n" -msgstr " %s [-p] [-h h矌e] [-f nom]\n" +msgstr " %s [-p] [-h h繫te] [-f nom]\n" -#: src/login.c:190 +#: src/login.c:180 #, c-format msgid " %s [-p] -r host\n" -msgstr " %s [-p] -r h矌e\n" +msgstr " %s [-p] -r h繫te\n" -#: src/login.c:274 +#: src/login.c:259 msgid "Invalid login time\n" msgstr "Heure de connexion non valide\n" -#: src/login.c:329 +#: src/login.c:314 msgid "" "\n" "System closed for routine maintenance\n" msgstr "" "\n" -"Syst鋗e ferm pour maintenance\n" +"Syst癡me ferm矇 pour maintenance\n" -#: src/login.c:340 +#: src/login.c:325 msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[Disconnexion court-circuit嶪 -- login root authoris.]\n" +"[Disconnexion court-circuit矇e -- login root authoris矇.]\n" -#: src/login.c:377 +#: src/login.c:362 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" "\n" -"Tentative de connexion: d幨ai de %s secondes d廧ass.\n" +"Tentative de connexion: d矇lai de %d secondes d矇pass矇.\n" -#: src/login.c:689 +#: src/login.c:648 #, c-format msgid " on `%.100s' from `%.200s'" -msgstr " sur `%.100s' partir de `%.200s'" +msgstr " sur `%.100s' partir de `%.200s'" -#: src/login.c:693 +#: src/login.c:652 #, c-format msgid " on `%.100s'" msgstr " sur `%.100s'" -#: src/login.c:852 +#: src/login.c:811 #, c-format msgid "" "\n" "%s login: " msgstr "" "\n" -"% login: " +"%s login: " -#: src/login.c:855 +#: src/login.c:814 msgid "login: " msgstr "login: " -#: src/login.c:1071 src/sulogin.c:233 +#: src/login.c:1013 src/sulogin.c:205 msgid "Login incorrect" msgstr "Login incorrect" -#: src/login.c:1265 +#: src/login.c:1193 msgid "Warning: login re-enabled after temporary lockout.\n" -msgstr "Avertissement: login r嶧ctiv apr鋊 une d廥activation temporaire.\n" +msgstr "Avertissement: login r矇activ矇 apr癡s une d矇sactivation temporaire.\n" -#: src/login.c:1278 +#: src/login.c:1207 #, c-format msgid "Last login: %s on %s" -msgstr "Derni鋨e connexion : le %s sur %s" +msgstr "Derni癡re connexion: le %s sur %s" -#: src/login.c:1281 +#: src/login.c:1210 #, c-format msgid "Last login: %.19s on %s" -msgstr "Derni鋨e connexion : le %.19s sur %s" +msgstr "Derni癡re connexion: le %.19s sur %s" -#: src/login.c:1287 +#: src/login.c:1216 #, c-format msgid " from %.*s" -msgstr " partir de %.*s" +msgstr " partir de %.*s" -#: src/login.c:1364 +#: src/login.c:1293 msgid "Starting rad_login\n" -msgstr "D幦arrage de rad_login\n" +msgstr "D矇marrage de rad_login\n" #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" -msgstr "%s : pas de base de donn嶪s DBM sur le syst鋗e - aucune action prise\n" +msgstr "%s: pas de base de donn矇es DBM sur le syst癡me - aucune action prise\n" #: src/mkpasswd.c:232 src/mkpasswd.c:237 #, c-format msgid "%s: cannot overwrite file %s\n" -msgstr "%s : impossible d'嶰raser le fichier %s\n" +msgstr "%s: impossible d'矇craser le fichier %s\n" #: src/mkpasswd.c:252 #, c-format msgid "%s: cannot open DBM files for %s\n" -msgstr "%s : impossible d'ouvrir les fichiers DBM pour %s\n" +msgstr "%s: impossible d'ouvrir les fichiers DBM pour %s\n" #: src/mkpasswd.c:287 #, c-format @@ -1402,7 +1270,7 @@ msgstr " champs trop longs\n" #: src/mkpasswd.c:315 #, c-format msgid "%s: error parsing line \"%s\"\n" -msgstr "%s : erreur lors l'analyse de la ligne \"%s\"\n" +msgstr "%s: erreur lors l'analyse de la ligne \"%s\"\n" #: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338 msgid "adding record for name " @@ -1414,19 +1282,19 @@ msgid "\n" msgstr "" #: src/mkpasswd.c:344 src/mkpasswd.c:350 src/mkpasswd.c:355 src/mkpasswd.c:360 -#, c-format +#, fuzzy, c-format msgid "%s: error adding record for " -msgstr "" +msgstr "%s: erreur lors de l'ajout de la nouvelle entr矇e\n" #: src/mkpasswd.c:378 #, c-format msgid "added %d entries, longest was %d\n" -msgstr "%d entr嶪s ajout嶪s, la plus longue fut %d\n" +msgstr "%d entr矇es ajout矇es, la plus longue fut %d\n" #: src/mkpasswd.c:392 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" -msgstr "Usage : %s [-vf ] [-p|g|sp|sg] fichier\n" +msgstr "Usage: %s [-vf] [-p|g|sp|sg] fichier\n" #: src/mkpasswd.c:395 #, c-format @@ -1436,235 +1304,202 @@ msgstr "Usage: %s [-vf] [-p|g|sp] fichier\n" #: src/mkpasswd.c:398 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" -msgstr "Usage : %s [-vf] [-p|g] fichier\n" +msgstr "Usage: %s [-vf] [-p|g] fichier\n" #: src/newgrp.c:61 -msgid "usage: newgrp [-] [group]\n" +msgid "Usage: newgrp [-] [group]\n" msgstr "Usage: newgrp [-] [groupe]\n" #: src/newgrp.c:63 -msgid "usage: sg group [[-c] command]\n" +msgid "Usage: sg group [[-c] command]\n" msgstr "Usage: sg groupe [[-c] commande]\n" -#: src/newgrp.c:136 +#: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" msgstr "uid inconnue: %u\n" -#: src/newgrp.c:219 +#: src/newgrp.c:214 #, c-format msgid "unknown gid: %lu\n" msgstr "gid inconnu: %lu\n" -#: src/newgrp.c:365 src/newgrp.c:374 +#: src/newgrp.c:360 src/newgrp.c:369 msgid "Sorry.\n" -msgstr "D廥ol ;-)\n" +msgstr "D矇sol矇.\n" -#: src/newgrp.c:472 +#: src/newgrp.c:469 msgid "too many groups\n" msgstr "trop de groupes\n" #: src/newusers.c:78 #, c-format msgid "Usage: %s [input]\n" -msgstr "Usage: %s [entr嶪]\n" +msgstr "Usage: %s [entr矇e]\n" -#: src/newusers.c:407 +#: src/newusers.c:388 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s : impossible de v廨ouiller /etc/passwd.\n" +msgstr "%s: impossible de v矇rouiller /etc/passwd.\n" -#: src/newusers.c:419 +#: src/newusers.c:400 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s : impossible de v廨ouiller les fichiers, essayez plus tard\n" +msgstr "%s: impossible de v矇rouiller les fichiers, essayez plus tard\n" -#: src/newusers.c:435 +#: src/newusers.c:416 #, c-format msgid "%s: can't open files\n" -msgstr "%s : impossible d'ouvrir les fichiers\n" +msgstr "%s: impossible d'ouvrir les fichiers\n" + +#: src/newusers.c:461 +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: ligne %d: ligne non valide\n" #: src/newusers.c:480 #, c-format -msgid "%s: line %d: invalid line\n" -msgstr "%s : ligne %d : ligne non valide\n" - -#: src/newusers.c:499 -#, c-format msgid "%s: line %d: can't create GID\n" -msgstr "%s : ligne %d : impossible de cr嶪r le GID\n" +msgstr "%s: ligne %d: impossible de cr矇er le GID\n" -#: src/newusers.c:515 +#: src/newusers.c:496 #, c-format msgid "%s: line %d: can't create UID\n" -msgstr "%s : ligne %d : impossible de cr嶪r le GID\n" +msgstr "%s: ligne %d: impossible de cr矇er le GID\n" -#: src/newusers.c:528 +#: src/newusers.c:509 #, c-format msgid "%s: line %d: cannot find user %s\n" -msgstr "%s : ligne %d : impossible de trouver l'utilisateur %s\n" +msgstr "%s: ligne %d: impossible de trouver l'utilisateur %s\n" -#: src/newusers.c:537 +#: src/newusers.c:518 #, c-format msgid "%s: line %d: can't update password\n" -msgstr "%s : ligne %d : impossible de mettre le mot de passe jour\n" +msgstr "%s: ligne %d: impossible de mettre le mot de passe jour\n" -#: src/newusers.c:555 +#: src/newusers.c:536 #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "%s : ligne %d : 嶰hec de mkdir\n" +msgstr "%s: ligne %d: 矇chec de mkdir\n" -#: src/newusers.c:561 +#: src/newusers.c:542 #, c-format msgid "%s: line %d: chown failed\n" -msgstr "%s : ligne %d : 嶰hec de chown\n" +msgstr "%s: ligne %d: 矇chec de chown\n" -#: src/newusers.c:571 +#: src/newusers.c:552 #, c-format msgid "%s: line %d: can't update entry\n" -msgstr "%s : ligne %d : impossible de mettre l'entr嶪 jour\n" +msgstr "%s: ligne %d: impossible de mettre l'entr矇e jour\n" -#: src/newusers.c:603 +#: src/newusers.c:584 #, c-format msgid "%s: error updating files\n" -msgstr "%s : erreur lors de la mise jour des fichiers\n" +msgstr "%s: erreur lors de la mise jour des fichiers\n" -#: src/passwd.c:174 +#: src/passwd.c:155 #, c-format -msgid "usage: %s [-f|-s] [name]\n" +msgid "Usage: %s [-f|-s] [name]\n" msgstr "Usage: %s [-f|-s] [nom]\n" -#: src/passwd.c:178 +#: src/passwd.c:159 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x max] [-n min] [-w avert] [-i inact] nom\n" -#: src/passwd.c:180 +#: src/passwd.c:161 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nom\n" -#: src/passwd.c:283 -#, c-format -msgid "User %s has a TCFS key, his old password is required.\n" -msgstr "" -"L'utilisateur %s a une cl TCFS, son ancien mot de passe est n嶰essaire.\n" - -#: src/passwd.c:286 -msgid "You can use -t option to force the change.\n" -msgstr "Vous pouvez utiliser l'option -t pour forcer le changement.\n" - -#: src/passwd.c:292 +#: src/passwd.c:216 msgid "Old password: " -msgstr "Ancien mot de passe : " +msgstr "Ancien mot de passe: " -#: src/passwd.c:301 +#: src/passwd.c:225 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Mot de passe incorrect pour `%s'\n" -#: src/passwd.c:314 -#, c-format -msgid "Warning: user %s has a TCFS key.\n" -msgstr "Avertissement : l'utilisateur %s a une cl TCFS.\n" - -#: src/passwd.c:333 +#: src/passwd.c:249 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" "Entrez le nouveau mot de passe (minimum de %d, maximum de %d\n" -"caract鋨es). Utilisez une combinaison de lettres en majuscule/minuscule\n" +"caract癡res). Utilisez une combinaison de lettres en majuscule/minuscule\n" "et de nombres.\n" -#: src/passwd.c:339 +#: src/passwd.c:255 msgid "New password: " -msgstr "Nouveau mot de passe : " +msgstr "Nouveau mot de passe: " -#: src/passwd.c:350 +#: src/passwd.c:266 msgid "Try again.\n" msgstr "Essaye encore...\n" -#: src/passwd.c:361 +#: src/passwd.c:277 msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"Avertissement : mot de passe simpliste (tapez le nouveau pour l'utiliser\n" -"quand m瘱e).\n" +"Avertissement: mot de passe simpliste (tapez le nouveau pour l'utiliser\n" +"quand m礙me).\n" -#: src/passwd.c:371 +#: src/passwd.c:287 msgid "They don't match; try again.\n" msgstr "Ils ne sont pas identique; essaye encore...\n" -#: src/passwd.c:451 src/passwd.c:469 +#: src/passwd.c:364 src/passwd.c:382 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "Le mot de passe pour %s ne peut 皻re chang.\n" +msgstr "Le mot de passe pour %s ne peut 礙tre chang矇.\n" -#: src/passwd.c:494 +#: src/passwd.c:396 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "D廥ol, le mot de passe pour %s ne peux pas encore 皻re chang.\n" +msgstr "D矇sol矇, le mot de passe pour %s ne peux pas encore 礙tre chang矇.\n" -#: src/passwd.c:614 +#: src/passwd.c:479 #, c-format msgid "%s: out of memory\n" -msgstr "%s : plus de m幦oire\n" +msgstr "%s: plus de m矇moire\n" -#: src/passwd.c:769 -msgid "Cannot lock the TCFS key database; try again later\n" -msgstr "" -"Impossible de v廨ouiller la base de donn嶪s de cl廥 TCFS; essayez 赨n" -"nouveau plus tard\n" - -#: src/passwd.c:777 -msgid "Cannot open the TCFS key database.\n" -msgstr "Impossible d'ouvrir la base de cl廥 TCFS.\n" - -#: src/passwd.c:785 -msgid "Error updating the TCFS key database.\n" -msgstr "Erreur lors de la mise jour de la base de cl廥 TCFS.\n" - -#: src/passwd.c:792 -msgid "Cannot commit TCFS changes.\n" -msgstr "Impossible de valider les changements TCFS.\n" - -#: src/passwd.c:975 +#: src/passwd.c:730 #, c-format msgid "%s: Cannot execute %s" -msgstr "%s : Impossible d'ex嶰uter %s" +msgstr "%s: Impossible d'ex矇cuter %s" -#: src/passwd.c:1077 -#, c-format +#: src/passwd.c:815 +#, fuzzy, c-format msgid "%s: repository %s not supported\n" -msgstr "" +msgstr "utilisateur %s: le r矇pertoire %s n'existe pas\n" -#: src/passwd.c:1152 +#: src/passwd.c:890 #, c-format msgid "%s: Permission denied\n" -msgstr "%s : Permission refus嶪\n" +msgstr "%s: Permission refus矇e\n" -#: src/passwd.c:1176 +#: src/passwd.c:914 #, c-format msgid "You may not change the password for %s.\n" msgstr "Vous ne pouvez pas changer le mot de passe de %s.\n" -#: src/passwd.c:1242 +#: src/passwd.c:962 #, c-format msgid "Changing password for %s\n" msgstr "Changement du mot de passe de %s\n" -#: src/passwd.c:1246 +#: src/passwd.c:966 #, c-format msgid "The password for %s is unchanged.\n" -msgstr "Le mot de passe pour %s est inchang.\n" +msgstr "Le mot de passe pour %s est inchang矇.\n" -#: src/passwd.c:1297 +#: src/passwd.c:1016 msgid "Password changed.\n" -msgstr "Mot de passe chang.\n" +msgstr "Mot de passe chang矇.\n" #: src/pwck.c:87 #, c-format @@ -1676,30 +1511,19 @@ msgstr "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Usage: %s [-q] [-r] [-s] [passwd]\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:295 msgid "invalid password file entry\n" -msgstr "entr嶪 non valide dans le fichier password\n" +msgstr "entr矇e non valide dans le fichier password\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:357 msgid "duplicate password entry\n" -msgstr "entr嶪 dupliqu嶪 dans password\n" +msgstr "entr矇e dupliqu矇e dans password\n" #: src/pwck.c:373 #, c-format msgid "invalid user name '%s'\n" msgstr "nom d'utilisateur '%s' non valide\n" -#. -#. * No primary group, just give a warning -#. #: src/pwck.c:388 #, c-format msgid "user %s: no group %u\n" @@ -1708,116 +1532,95 @@ msgstr "utilisateur %s: aucun groupe %u\n" #: src/pwck.c:404 #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "utilisateur %s : le r廧ertoire %s n'existe pas\n" +msgstr "utilisateur %s: le r矇pertoire %s n'existe pas\n" -#. -#. * Login shell doesn't exist, give a warning -#. #: src/pwck.c:420 #, c-format msgid "user %s: program %s does not exist\n" -msgstr "utilisateur %s : le programme %s n'existe pas\n" +msgstr "utilisateur %s: le programme %s n'existe pas\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:456 msgid "invalid shadow password file entry\n" -msgstr "entr嶪 shadow password non valide\n" +msgstr "entr矇e shadow password non valide\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:518 msgid "duplicate shadow password entry\n" -msgstr "entr嶪 shadow password dupliqu嶪\n" +msgstr "entr矇e shadow password dupliqu矇e\n" -#. -#. * Tell the user this entry has no matching -#. * /etc/passwd entry and ask them to delete it. -#. #: src/pwck.c:542 msgid "no matching password file entry\n" -msgstr "aucune entr嶪 correspondante dans le fichier password\n" +msgstr "aucune entr矇e correspondante dans le fichier password\n" #: src/pwck.c:560 #, c-format msgid "user %s: last password change in the future\n" msgstr "" -"utilisateur %s : date du dernier changement de mot de passe dans le futur\n" +"utilisateur %s: date du dernier changement de mot de passe dans le futur\n" -#: src/pwconv.c:84 src/pwunconv.c:93 +#: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s : impossible de v廨ouiller le fichier passwd\n" +msgstr "%s: impossible de v矇rouiller le fichier passwd\n" -#: src/pwconv.c:89 src/pwunconv.c:98 +#: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s : impossible d'ouvrir le fichier passwd\n" +msgstr "%s: impossible d'ouvrir le fichier passwd\n" -#: src/pwconv.c:117 +#: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "%s : impossible d'enlever l'entr嶪 shadow pour %s\n" +msgstr "%s: impossible d'enlever l'entr矇e shadow pour %s\n" -#: src/pwconv.c:163 +#: src/pwconv.c:164 #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "%s : impossible de mettre jour le mot de passe de %s\n" +msgstr "%s: impossible de mettre jour le mot de passe de %s\n" -#: src/pwconv.c:170 +#: src/pwconv.c:171 #, c-format msgid "%s: can't update shadow file\n" -msgstr "%s : impossible de mettre jour le fichier shadow\n" +msgstr "%s: impossible de mettre jour le fichier shadow\n" -#: src/pwconv.c:175 +#: src/pwconv.c:176 #, c-format msgid "%s: can't update passwd file\n" -msgstr "%s : impossible de mettre jour le fichier passwd\n" +msgstr "%s: impossible de mettre jour le fichier passwd\n" -#: src/pwunconv.c:50 -#, c-format -msgid "%s: Shadow passwords are not configured.\n" -msgstr "%s : Les mots de passe shadow ne sont pas configur廥.\n" - -#: src/pwunconv.c:160 +#: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s : impossible de mettre jour l'entr嶪 %s\n" +msgstr "%s: impossible de mettre jour l'entr矇e %s\n" -#: src/pwunconv.c:181 +#: src/pwunconv.c:145 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s : impossible d'effacer le fichier shadow\n" +msgstr "%s: impossible d'effacer le fichier shadow\n" #: src/su.c:133 msgid "Sorry." -msgstr "D廥ol ;-)" +msgstr "D矇sol矇." #: src/su.c:216 #, c-format msgid "%s: must be run from a terminal\n" -msgstr "%s : doit 皻re lanc partir d'un terminal\n" +msgstr "%s: doit 礙tre lanc矇 partir d'un terminal\n" #: src/su.c:306 #, c-format msgid "%s: pam_start: error %d\n" -msgstr "%s : pam_start : erreur %d\n" +msgstr "%s: pam_start: erreur %d\n" #: src/su.c:336 #, c-format msgid "Unknown id: %s\n" -msgstr "ID inconnue : %s\n" +msgstr "ID inconnue: %s\n" #: src/su.c:373 src/su.c:390 #, fuzzy, c-format msgid "You are not authorized to su %s\n" -msgstr "Vous n'皻es pas authoris廥 " +msgstr "Vous n'礙tes pas authoris矇s " -#. require own password #: src/su.c:385 msgid "(Enter your own password.)" msgstr "(Entrez votre propre mot de passe.)" @@ -1829,608 +1632,661 @@ msgid "" "(Ignored)\n" msgstr "" "%s: %s\n" -"(Ignor)\n" +"(Ignor矇)\n" -#: src/su.c:626 +#: src/su.c:609 msgid "No shell\n" msgstr "Pas de shell\n" -#: src/suauth.c:100 +#: src/suauth.c:105 msgid "Access to su to that account DENIED.\n" -msgstr "Acc鋊 su partir de ce compte REFUS.\n" +msgstr "Acc癡s su partir de ce compte REFUS.\n" -#: src/suauth.c:107 +#: src/suauth.c:113 msgid "Password authentication bypassed.\n" -msgstr "Authentification par mot de passe court-circuit嶪.\n" +msgstr "Authentification par mot de passe court-circuit矇e.\n" -#: src/suauth.c:114 +#: src/suauth.c:122 msgid "Please enter your OWN password as authentication.\n" msgstr "Entrez VOTRE mot de passe comme identification.\n" -#. must be a password file! -#: src/sulogin.c:132 +#: src/sulogin.c:118 msgid "No password file\n" msgstr "Pas de fichier de mot de passe\n" -#. -#. * Fail secure -#. -#: src/sulogin.c:174 +#: src/sulogin.c:160 msgid "No password entry for 'root'\n" -msgstr "Pas d'entr嶪 pour le mot de passe de 'root'\n" +msgstr "Pas d'entr矇e pour le mot de passe de 'root'\n" -#: src/sulogin.c:190 +#: src/sulogin.c:176 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" "\n" -"Tapez control-d pour proc嶮er au d幦arrage normal,\n" -"(ou donnez le mot de passe de root pour la maintenance) : " +"Tapez control-d pour proc矇der au d矇marrage normal,\n" +"(ou donnez le mot de passe de root pour la maintenance): " -#. make new environment active -#: src/sulogin.c:243 +#: src/sulogin.c:212 msgid "Entering System Maintenance Mode\n" -msgstr "Entr嶪 du syst鋗e en mode maintenance\n" +msgstr "Entr矇e du syst癡me en mode maintenance\n" -#: src/useradd.c:251 +#: src/useradd.c:234 #, c-format msgid "%s: rebuild the group database\n" -msgstr "%s : reconstruction de la base de donn嶪s des groupes\n" +msgstr "%s: reconstruction de la base de donn矇es des groupes\n" -#: src/useradd.c:260 +#: src/useradd.c:243 #, c-format msgid "%s: rebuild the shadow group database\n" -msgstr "%s : reconstruction de la base de donn嶪s des groupes shadow\n" +msgstr "%s: reconstruction de la base de donn矇es des groupes shadow\n" -#: src/useradd.c:295 src/useradd.c:309 src/usermod.c:981 src/usermod.c:995 +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 #, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "%s : argument num廨ique `%s' non valide\n" +msgstr "%s: argument num矇rique `%s' non valide\n" -#: src/useradd.c:365 +#: src/useradd.c:349 #, c-format msgid "%s: unknown gid %s\n" -msgstr "%s : gid %s inconnu\n" +msgstr "%s: gid %s inconnu\n" -#: src/useradd.c:373 src/useradd.c:676 src/useradd.c:1269 src/usermod.c:260 -#: src/usermod.c:1128 +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 #, c-format msgid "%s: unknown group %s\n" -msgstr "%s : groupe %s inconnu\n" +msgstr "%s: groupe %s inconnu\n" -#: src/useradd.c:440 -#, c-format -msgid "group=%s,%u basedir=%s skel=%s\n" -msgstr "group=%s,%u r廧_base=%s skel=%s\n" - -#: src/useradd.c:444 -#, c-format -msgid "shell=%s " -msgstr "shell=%s " - -#: src/useradd.c:446 -#, c-format -msgid "inactive=%ld expire=%s" -msgstr "inactif=%ld expire=%s" - -#: src/useradd.c:450 +#: src/useradd.c:419 #, c-format msgid "GROUP=%u\n" msgstr "GROUP=%u\n" -#: src/useradd.c:451 +#: src/useradd.c:420 #, c-format msgid "HOME=%s\n" msgstr "HOME=%s\n" -#: src/useradd.c:453 +#: src/useradd.c:422 #, c-format msgid "INACTIVE=%ld\n" msgstr "INACTIVE=%ld\n" -#: src/useradd.c:454 +#: src/useradd.c:423 #, c-format msgid "EXPIRE=%s\n" msgstr "EXPIRE=%s\n" -#: src/useradd.c:456 +#: src/useradd.c:425 #, c-format msgid "SHELL=%s\n" msgstr "SHELL=%s\n" -#: src/useradd.c:457 +#: src/useradd.c:426 #, c-format msgid "SKEL=%s\n" msgstr "SKEL=%s\n" -#: src/useradd.c:498 +#: src/useradd.c:462 #, c-format msgid "%s: cannot create new defaults file\n" -msgstr "%s : impossible de cr嶪r un nouveau fichier de d嶨auts\n" +msgstr "%s: impossible de cr矇er un nouveau fichier de d矇fauts\n" -#: src/useradd.c:503 +#: src/useradd.c:467 #, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: impossible de cr嶪r un nouveau fichier de d嶨auts\n" +msgstr "%s: impossible de cr矇er un nouveau fichier de d矇fauts\n" -#: src/useradd.c:596 src/useradd.c:608 +#: src/useradd.c:552 src/useradd.c:564 #, c-format msgid "%s: rename: %s" -msgstr "%s : rename : %s" +msgstr "%s: rename: %s" -#: src/useradd.c:697 src/usermod.c:281 +#: src/useradd.c:657 src/usermod.c:265 #, c-format msgid "%s: group `%s' is a NIS group.\n" -msgstr "%s : le groupe `%s' est un groupe NIS.\n" +msgstr "%s: le groupe `%s' est un groupe NIS.\n" -#: src/useradd.c:706 src/usermod.c:290 +#: src/useradd.c:666 src/usermod.c:274 #, c-format msgid "%s: too many groups specified (max %d).\n" -msgstr "%s : trop de groupes sp嶰ifi廥 (max %d).\n" +msgstr "%s: trop de groupes sp矇cifi矇s (max %d).\n" -#: src/useradd.c:738 src/usermod.c:322 -#, 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" +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "Usage: useradd [-u uid [-o]] [-g groupe] [-G groupe,...] \n" -#: src/useradd.c:742 -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:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" +msgstr "" +" [-d home] [-s shell] [-c commentaire] [-m [-k template]]\n" -#: src/useradd.c:745 src/usermod.c:329 -msgid "[-f inactive] [-e expire ] " -msgstr "[-f inactif] [-e expire ] " +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" +msgstr " [-f inactif] [-e expire]\n" -#: src/useradd.c:748 -msgid "[-A program] " -msgstr "[-A program] " +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" +msgstr " useradd -D [-g groupe] [-b base] [-s shell]\n" -#: src/useradd.c:750 -msgid "[-p passwd] name\n" -msgstr "[-p mot-de-passe] nom\n" - -#: src/useradd.c:753 -#, c-format -msgid " %s\t-D [-g group] [-b base] [-s shell]\n" -msgstr " %s\t-D [-g groupe] [-b base] [-s shell]\n" - -#: src/useradd.c:756 -msgid "\t\t[-f inactive] [-e expire ]\n" -msgstr "\t\t[-f inactif] [-e expire ]\n" - -#: src/useradd.c:850 src/usermod.c:480 +#: src/useradd.c:793 src/usermod.c:461 #, c-format msgid "%s: error locking group file\n" -msgstr "%s : erreur lors du v廨ouillage du fichier de groupe\n" +msgstr "%s: erreur lors du v矇rouillage du fichier de groupe\n" -#: src/useradd.c:855 src/usermod.c:486 +#: src/useradd.c:798 src/usermod.c:467 #, c-format msgid "%s: error opening group file\n" -msgstr "%s : erreur lors d'ouverture du fichier de groupe\n" +msgstr "%s: erreur lors d'ouverture du fichier de groupe\n" -#: src/useradd.c:862 src/usermod.c:597 +#: src/useradd.c:805 src/usermod.c:578 #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s : erreur lors du v廨ouillage du fichier shadow group\n" +msgstr "%s: erreur lors du v矇rouillage du fichier shadow group\n" -#: src/useradd.c:867 src/usermod.c:603 +#: src/useradd.c:810 src/usermod.c:584 #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s : erreur lors de l'ouverture du fichier shadow group\n" +msgstr "%s: erreur lors de l'ouverture du fichier shadow group\n" -#: src/useradd.c:1039 +#: src/useradd.c:982 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: l'uid %u n'est pas unique\n" -#: src/useradd.c:1069 +#: src/useradd.c:1012 #, c-format msgid "%s: can't get unique uid\n" -msgstr "%s : impossible d'obtenir un uid unique\n" +msgstr "%s: impossible d'obtenir un uid unique\n" -#: src/useradd.c:1174 src/useradd.c:1325 src/usermod.c:1075 src/usermod.c:1086 -#: src/usermod.c:1096 src/usermod.c:1143 src/usermod.c:1187 -#, c-format -msgid "%s: invalid field `%s'\n" -msgstr "%s : champs `%s' non valide\n" - -#: src/useradd.c:1189 +#: src/useradd.c:1049 #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s : r廧ertoire de base non valide `%s'\n" +msgstr "%s: r矇pertoire de base non valide `%s'\n" -#: src/useradd.c:1199 +#: src/useradd.c:1059 #, c-format msgid "%s: invalid comment `%s'\n" -msgstr "%s : commentaire `%s' non valide\n" +msgstr "%s: commentaire `%s' non valide\n" -#: src/useradd.c:1210 +#: src/useradd.c:1070 #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s : r廧ertoire personnel `%s' non valide\n" +msgstr "%s: r矇pertoire personnel `%s' non valide\n" -#: src/useradd.c:1229 src/usermod.c:1110 +#: src/useradd.c:1089 src/usermod.c:858 #, c-format msgid "%s: invalid date `%s'\n" -msgstr "%s : date `%s' non valide\n" +msgstr "%s: date `%s' non valide\n" -#: src/useradd.c:1242 +#: src/useradd.c:1102 #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "%s : mots de passe shadow n嶰essaires pour -e\n" +msgstr "%s: mots de passe shadow n矇cessaires pour -e\n" -#: src/useradd.c:1258 +#: src/useradd.c:1118 #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "%s : mots de passe shadow n嶰essaires pour -f\n" +msgstr "%s: mots de passe shadow n矇cessaires pour -f\n" -#: src/useradd.c:1336 +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: champs `%s' non valide\n" + +#: src/useradd.c:1196 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s : shell `%s' non valide\n" +msgstr "%s: shell `%s' non valide\n" -#: src/useradd.c:1377 +#: src/useradd.c:1237 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: nom d'utilisateur `%s' non valide\n" -#: src/useradd.c:1413 src/userdel.c:298 src/usermod.c:1255 +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 #, c-format msgid "%s: cannot rewrite password file\n" -msgstr "%s : impossible de re嶰rire le fichier de mots de passe\n" +msgstr "%s: impossible de re矇crire le fichier de mots de passe\n" -#: src/useradd.c:1420 src/userdel.c:303 src/usermod.c:1262 +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "%s : impossible de re嶰rire le fichier shadow\n" +msgstr "%s: impossible de re矇crire le fichier shadow\n" -#: src/useradd.c:1461 src/userdel.c:367 src/usermod.c:1296 +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 #, c-format msgid "%s: unable to lock password file\n" -msgstr "%s : impossible de v廨ouiller le fichier de mots de passe\n" +msgstr "%s: impossible de v矇rouiller le fichier de mots de passe\n" -#: src/useradd.c:1466 src/userdel.c:372 src/usermod.c:1301 +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 #, c-format msgid "%s: unable to open password file\n" -msgstr "%s : impossible d'ouvrir le fichier de mots de passe\n" +msgstr "%s: impossible d'ouvrir le fichier de mots de passe\n" -#: src/useradd.c:1474 src/userdel.c:379 src/usermod.c:1308 +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "%s : impossible de v廨ouiller le fichier de mots de passe\n" +msgstr "%s: impossible de v矇rouiller le fichier de mots de passe\n" -#: src/useradd.c:1481 src/userdel.c:385 src/usermod.c:1314 +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "%s : impossible d'ouvrir le fichier shadow\n" +msgstr "%s: impossible d'ouvrir le fichier shadow\n" -#: src/useradd.c:1580 src/usermod.c:1405 -#, c-format -msgid "%s: error adding authentication method\n" -msgstr "%s : erreur lors de l'ajout de la m彋hode d'authentification\n" - -#: src/useradd.c:1604 +#: src/useradd.c:1435 #, c-format msgid "%s: error adding new password entry\n" -msgstr "%s : erreur lors de l'ajout de la nouvelle entr嶪\n" +msgstr "%s: erreur lors de l'ajout de la nouvelle entr矇e\n" -#: src/useradd.c:1618 +#: src/useradd.c:1449 #, c-format msgid "%s: error updating password dbm entry\n" -msgstr "%s : erreur lors de la mise jour de l'entr嶪 dbm\n" +msgstr "%s: erreur lors de la mise jour de l'entr矇e dbm\n" -#: src/useradd.c:1634 src/usermod.c:1471 +#: src/useradd.c:1465 src/usermod.c:1151 #, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "%s : erreur lors de l'ajout de la nouvelle entr嶪 shadow\n" +msgstr "%s: erreur lors de l'ajout de la nouvelle entr矇e shadow\n" -#: src/useradd.c:1650 src/usermod.c:1488 +#: src/useradd.c:1481 src/usermod.c:1168 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s : erreur lors de la mise jour de l'entr嶪 shadow passwd dbm\n" +msgstr "%s: erreur lors de la mise jour de l'entr矇e shadow passwd dbm\n" -#: src/useradd.c:1682 +#: src/useradd.c:1513 #, c-format msgid "%s: cannot create directory %s\n" -msgstr "%s : impossible de cr嶪r le r廧ertoire %s\n" +msgstr "%s: impossible de cr矇er le r矇pertoire %s\n" -#: src/useradd.c:1806 src/usermod.c:1233 +#: src/useradd.c:1634 src/usermod.c:981 #, c-format msgid "%s: user %s exists\n" -msgstr "%s : l'utilisateur %s existe\n" +msgstr "%s: l'utilisateur %s existe\n" -#: src/useradd.c:1821 +#: src/useradd.c:1649 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1854 +#: src/useradd.c:1687 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" -msgstr "" -"%s : avertissement : CREATE_HOME non support, utilisez -m la place.\n" +msgstr "%s: avertissement: CREATE_HOME non support矇, utilisez -m la place.\n" -#: src/userdel.c:129 +#: src/userdel.c:124 #, c-format -msgid "usage: %s [-r] name\n" -msgstr "Usage : %s [-r] nom\n" +msgid "Usage: %s [-r] name\n" +msgstr "Usage: %s [-r] nom\n" -#: src/userdel.c:181 src/userdel.c:267 +#: src/userdel.c:176 src/userdel.c:262 #, c-format msgid "%s: error updating group entry\n" -msgstr "%s : erreur lors de la mise jour de l'entr嶪 group\n" +msgstr "%s: erreur lors de la mise jour de l'entr矇e group\n" -#: src/userdel.c:191 src/userdel.c:276 +#: src/userdel.c:186 src/userdel.c:271 #, c-format msgid "%s: cannot update dbm group entry\n" -msgstr "%s : impossible de mettre jour l'entr嶪 dbm group\n" +msgstr "%s: impossible de mettre jour l'entr矇e dbm group\n" -#: src/userdel.c:219 +#: src/userdel.c:214 #, c-format msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: impossible de mettre jour l'entr嶪 dbm group\n" +msgstr "%s: impossible de mettre jour l'entr矇e dbm group\n" -#: src/userdel.c:308 +#: src/userdel.c:379 #, c-format -msgid "%s: cannot rewrite TCFS key file\n" -msgstr "%s : impossible de re嶰rire le fichier de cl廥 TCFS\n" +msgid "%s: cannot open group file\n" +msgstr "%s: impossible d'ouvrir le fichier group\n" -#: src/userdel.c:392 +#: src/userdel.c:390 #, c-format -msgid "%s: cannot lock TCFS key file\n" -msgstr "%s : impossible de v廨ouiller le fichier de cl廥 TCFS\n" - -#: src/userdel.c:397 -#, c-format -msgid "%s: cannot open TCFS key file\n" -msgstr "%s : impossible d'ouvrir le fichier de cl廥 TCFS\n" +msgid "%s: cannot open shadow group file\n" +msgstr "%s: impossible d'ouvrir le fichier shadow group\n" #: src/userdel.c:408 #, c-format -msgid "%s: cannot open group file\n" -msgstr "%s : impossible d'ouvrir le fichier group\n" - -#: src/userdel.c:419 -#, c-format -msgid "%s: cannot open shadow group file\n" -msgstr "%s : impossible d'ouvrir le fichier shadow group\n" - -#: src/userdel.c:451 src/userdel.c:468 -#, c-format -msgid "%s: error deleting authentication\n" -msgstr "%s : erreur lors de l'effacement de l'authentification\n" - -#: src/userdel.c:479 -#, c-format msgid "%s: error deleting password entry\n" -msgstr "%s : erreur lors de la suppression de l'entr嶪 dans /etc/passwd\n" +msgstr "%s: erreur lors de la suppression de l'entr矇e dans /etc/passwd\n" -#: src/userdel.c:485 +#: src/userdel.c:412 #, c-format msgid "%s: error deleting shadow password entry\n" -msgstr "%s : erreur lors de la suppression de l'entr嶪 dans /etc/shadow\n" +msgstr "%s: erreur lors de la suppression de l'entr矇e dans /etc/shadow\n" -#: src/userdel.c:496 -#, c-format -msgid "%s: error deleting TCFS entry\n" -msgstr "%s : erreur lors de l'effacement de l'entr嶪 TCFS\n" - -#: src/userdel.c:510 +#: src/userdel.c:421 #, c-format msgid "%s: error deleting password dbm entry\n" -msgstr "%s : erreur lors de l'effacement de l'entr嶪 dbm du mot de passe\n" +msgstr "%s: erreur lors de l'effacement de l'entr矇e dbm du mot de passe\n" -#: src/userdel.c:533 +#: src/userdel.c:440 #, c-format msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s : erreur lors de l'effacement de l'entr嶪 shadow passwd dbm\n" +msgstr "%s: erreur lors de l'effacement de l'entr矇e shadow passwd dbm\n" -#: src/userdel.c:569 +#: src/userdel.c:484 #, c-format msgid "%s: user %s is currently logged in\n" -msgstr "%s : l'utilisateur %s est connect嬞n" +msgstr "%s: l'utilisateur %s est connect矇\n" -#: src/userdel.c:659 +#: src/userdel.c:594 #, c-format msgid "%s: warning: %s not owned by %s, not removing\n" -msgstr "%s : avertissement : %s n'appartient pas %s, non enlev嬞n" +msgstr "%s: avertissement: %s n'appartient pas %s, non enlev矇\n" -#: src/userdel.c:666 +#: src/userdel.c:600 #, c-format msgid "%s: warning: can't remove " -msgstr "%s : impossible d'enlever " +msgstr "%s: impossible d'enlever " -#: src/userdel.c:758 src/usermod.c:1023 +#: src/userdel.c:703 src/usermod.c:783 #, c-format msgid "%s: user %s does not exist\n" -msgstr "%s : l'utilisateur %s n'existe pas\n" +msgstr "%s: l'utilisateur %s n'existe pas\n" -#: src/userdel.c:770 src/usermod.c:1039 +#: src/userdel.c:718 src/usermod.c:799 #, c-format msgid "%s: user %s is a NIS user\n" -msgstr "%s : le compte %s est un compte NIS\n" +msgstr "%s: le compte %s est un compte NIS\n" -#: src/userdel.c:799 +#: src/userdel.c:756 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s : %s n'appartient pas %s, non enlev嬞n" +msgstr "%s: %s n'appartient pas %s, non enlev矇\n" -#: src/userdel.c:818 +#: src/userdel.c:779 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -"%s : r廧ertoire %s non enlev (cela enl憝erait le r廧ertoire personnel de %" +"%s: r矇pertoire %s non enlev矇 (cela enl矇verait le r矇pertoire personnel de %" "s)\n" -#: src/userdel.c:830 +#: src/userdel.c:793 #, c-format msgid "%s: error removing directory %s\n" -msgstr "%s : erreur lors de l'effacement du r廧ertoire %s\n" +msgstr "%s: erreur lors de l'effacement du r矇pertoire %s\n" -#: src/usermod.c:326 +#: src/usermod.c:306 +#, 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" + +#: src/usermod.c:310 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:332 -msgid "[-A {DEFAULT|program},... ] " -msgstr "[-A {D丌AUT|programme},... ] " +#: src/usermod.c:313 +#, fuzzy +msgid "[-f inactive] [-e expire] " +msgstr "[-f inactif] [-e expire] " -#: src/usermod.c:334 +#: src/usermod.c:315 msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p mot-de-passe] [-L|-U] nom\n" -#: src/usermod.c:514 +#: src/usermod.c:495 #, c-format msgid "%s: out of memory in update_group\n" -msgstr "%s : plus de m幦oire pour update_group\n" +msgstr "%s: plus de m矇moire pour update_group\n" -#: src/usermod.c:641 +#: src/usermod.c:622 #, c-format msgid "%s: out of memory in update_gshadow\n" -msgstr "%s : plus de m幦oire pour update_gshadow\n" +msgstr "%s: plus de m矇moire pour update_gshadow\n" -#: src/usermod.c:1210 +#: src/usermod.c:958 #, c-format msgid "%s: no flags given\n" -msgstr "%s : aucun drapeau donn嬞n" +msgstr "%s: aucun drapeau donn矇\n" -#: src/usermod.c:1217 +#: src/usermod.c:965 #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s : mots de passe shadow n嶰essaires pour -e ou -f\n" +msgstr "%s: mots de passe shadow n矇cessaires pour -e ou -f\n" -#: src/usermod.c:1239 +#: src/usermod.c:987 #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s : l'uid %lu n'est pas unique\n" +msgstr "%s: l'uid %lu n'est pas unique\n" -#: src/usermod.c:1392 -#, c-format -msgid "%s: error deleting authentication method\n" -msgstr "%s : erreur lors de l'effacement de la m彋hode d'authentification\n" - -#: src/usermod.c:1418 -#, c-format -msgid "%s: error changing authentication method\n" -msgstr "%s : erreur lors du changement de la m彋hode d'authentification\n" - -#: src/usermod.c:1436 +#: src/usermod.c:1116 #, c-format msgid "%s: error changing password entry\n" -msgstr "%s : erreur lors du changement de l'entr嶪 dans /etc/passwd\n" +msgstr "%s: erreur lors du changement de l'entr矇e dans /etc/passwd\n" -#: src/usermod.c:1442 +#: src/usermod.c:1122 #, c-format msgid "%s: error removing password entry\n" -msgstr "%s : erreur lors de l'effacement du mot de passe\n" +msgstr "%s: erreur lors de l'effacement du mot de passe\n" -#: src/usermod.c:1451 -#, c-format +#: src/usermod.c:1131 +#, fuzzy, c-format msgid "%s: error adding password dbm entry\n" -msgstr "" +msgstr "%s: erreur lors de la mise jour de l'entr矇e dbm\n" -#: src/usermod.c:1459 -#, c-format +#: src/usermod.c:1139 +#, fuzzy, c-format msgid "%s: error removing passwd dbm entry\n" -msgstr "" +msgstr "%s: erreur lors de l'effacement du mot de passe\n" -#: src/usermod.c:1478 -#, c-format +#: src/usermod.c:1158 +#, fuzzy, c-format msgid "%s: error removing shadow password entry\n" -msgstr "" +msgstr "%s: erreur lors de l'effacement du mot de passe\n" -#: src/usermod.c:1495 -#, c-format +#: src/usermod.c:1175 +#, fuzzy, c-format msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "" +msgstr "%s: erreur lors de l'effacement de l'entr矇e shadow passwd dbm\n" -#: src/usermod.c:1524 +#: src/usermod.c:1204 #, c-format msgid "%s: directory %s exists\n" -msgstr "%s : le r廧ertoire %s existe\n" +msgstr "%s: le r矇pertoire %s existe\n" -#: src/usermod.c:1533 +#: src/usermod.c:1213 #, c-format msgid "%s: can't create %s\n" -msgstr "%s : impossible de cr嶪r %s\n" +msgstr "%s: impossible de cr矇er %s\n" -#: src/usermod.c:1539 +#: src/usermod.c:1219 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s : impossible de changer le propri鋈aire de %s\n" +msgstr "%s: impossible de changer le propri癡taire de %s\n" -#: src/usermod.c:1556 +#: src/usermod.c:1236 #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "%s : impossible de renommer le r廧ertoire %s en %s\n" +msgstr "%s: impossible de renommer le r矇pertoire %s en %s\n" -#. better leave it alone -#: src/usermod.c:1653 +#: src/usermod.c:1333 #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "%s : avertissement : %s n'appartient pas %s\n" +msgstr "%s: avertissement: %s n'appartient pas %s\n" -#: src/usermod.c:1659 +#: src/usermod.c:1339 msgid "failed to change mailbox owner" -msgstr "嶰hec du changement de propri鋈aire de la mailbox" +msgstr "矇chec du changement de propri癡taire de la mailbox" -#: src/usermod.c:1667 +#: src/usermod.c:1347 msgid "failed to rename mailbox" -msgstr "嶰hec du renommage de la mailbox" +msgstr "矇chec du renommage de la mailbox" -#: src/vipw.c:104 +#: src/vipw.c:105 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" "\n" -"%s : %s est inchang嬞n" +"%s: %s est inchang矇\n" -#: src/vipw.c:132 +#: src/vipw.c:133 msgid "Couldn't lock file" -msgstr "Impossible de v廨ouiller le fichier" +msgstr "Impossible de v矇rouiller le fichier" -#: src/vipw.c:141 +#: src/vipw.c:142 msgid "Couldn't make backup" msgstr "Impossible de faire une sauvegarde" -#: src/vipw.c:206 +#: src/vipw.c:200 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" -msgstr "%s : impossible de restaurer %s : %s (vos changements sont dans %s)\n" +msgstr "%s: impossible de restaurer %s: %s (vos changements sont dans %s)\n" -#: src/vipw.c:244 +#: src/vipw.c:238 msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" msgstr "" "Usage :\n" -"`vipw' 嶮ite /etc/passwd `vipw -s' 嶮ite /etc/shadow\n" -"`vigr' 嶮ite /etc/group `vigr -s' 嶮ite /etc/gshadow\n" +"`vipw' 矇dite /etc/passwd `vipw -s' 矇dite /etc/shadow\n" +"`vigr' 矇dite /etc/group `vigr -s' 矇dite /etc/gshadow\n" + +#, fuzzy +#~ msgid "Can't create mail spool for user %s.\n" +#~ msgstr "%s: impossible de mettre jour l'entr矇e %s\n" + +#~ msgid "User %s has a TCFS key, his old password is required.\n" +#~ msgstr "" +#~ "L'utilisateur %s a une cl矇 TCFS, son ancien mot de passe est n矇cessaire.\n" + +#~ msgid "You can use -t option to force the change.\n" +#~ msgstr "Vous pouvez utiliser l'option -t pour forcer le changement.\n" + +#~ msgid "Warning: user %s has a TCFS key.\n" +#~ msgstr "Avertissement: l'utilisateur %s a une cl矇 TCFS.\n" + +#~ msgid "Cannot lock the TCFS key database; try again later\n" +#~ msgstr "" +#~ "Impossible de v矇rouiller la base de donn矇es de cl矇s TCFS; essayez \n" +#~ "nouveau plus tard\n" + +#~ msgid "Cannot open the TCFS key database.\n" +#~ msgstr "Impossible d'ouvrir la base de cl矇s TCFS.\n" + +#~ msgid "Error updating the TCFS key database.\n" +#~ msgstr "Erreur lors de la mise jour de la base de cl矇s TCFS.\n" + +#~ msgid "Cannot commit TCFS changes.\n" +#~ msgstr "Impossible de valider les changements TCFS.\n" + +#~ msgid "%s: cannot rewrite TCFS key file\n" +#~ msgstr "%s: impossible de re矇crire le fichier de cl矇s TCFS\n" + +#~ msgid "%s: cannot lock TCFS key file\n" +#~ msgstr "%s: impossible de v矇rouiller le fichier de cl矇s TCFS\n" + +#~ msgid "%s: cannot open TCFS key file\n" +#~ msgstr "%s: impossible d'ouvrir le fichier de cl矇s TCFS\n" + +#~ msgid "%s: error deleting TCFS entry\n" +#~ msgstr "%s: erreur lors de l'effacement de l'entr矇e TCFS\n" + +#~ msgid " [-f inactive] [-e expire]" +#~ msgstr " [-f inactif] [-e expire] " + +#~ msgid "%s: error deleting authentication\n" +#~ msgstr "%s: erreur lors de l'effacement de l'authentification\n" + +#~ msgid "[-A {DEFAULT|program},...] " +#~ msgstr "[-A {DFAUT|programme},...] " + +#~ msgid "%s: error deleting authentication method\n" +#~ msgstr "%s: erreur lors de l'effacement de la m矇thode d'authentification\n" + +#~ msgid "%s: error adding authentication method\n" +#~ msgstr "%s: erreur lors de l'ajout de la m矇thode d'authentification\n" + +#~ msgid "%s: error changing authentication method\n" +#~ msgstr "%s: erreur lors du changement de la m矇thode d'authentification\n" + +#~ msgid "[-A program] " +#~ msgstr "[-A program] " + +#~ msgid "[-p passwd] name\n" +#~ msgstr "[-p mot-de-passe] nom\n" + +#~ msgid "error - lookup '%s' failed\n" +#~ msgstr "erreur - 矇chec de la recherche de '%s'\n" + +#~ msgid "%s not found\n" +#~ msgstr "%s non trouv矇\n" + +#, fuzzy +#~ msgid "%s: not configured for shadow group support.\n" +#~ msgstr "%s: impossible de re-矇crire le fichier shadow group\n" + +#~ msgid "%s: Shadow passwords are not configured.\n" +#~ msgstr "%s: Les mots de passe shadow ne sont pas configur矇s.\n" + +#, fuzzy +#~ msgid "Usage: %s [-l] user\n" +#~ msgstr "Usage: %s [-e]\n" + +#~ msgid "Executing shell %s\n" +#~ msgstr "Ex矇cution du shell %s\n" + +#~ msgid "Dialup Password: " +#~ msgstr "Mot de passe dialup: " + +#~ 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" + +#~ msgid "Usage: %s [-(a|d)] shell\n" +#~ msgstr "Usage: %s [-(a|d)] shell\n" + +#~ msgid "Shell password: " +#~ msgstr "Mot de passe shell: " + +#~ msgid "re-enter Shell password: " +#~ msgstr "Confirmez le mot de passe shell: " + +#~ msgid "%s: Passwords do not match, try again.\n" +#~ msgstr "%s: Les mots de passe ne correspondent pas, essayez encore.\n" + +#~ msgid "%s: can't create %s" +#~ msgstr "%s: impossible de cr矇er %s" + +#~ msgid "%s: can't open %s" +#~ msgstr "%s: impossible d'ouvrir %s" + +#~ msgid "%s: Shell %s not found.\n" +#~ msgstr "%s: Shell %s non trouv矇.\n" + +#~ msgid "group=%s,%u basedir=%s skel=%s\n" +#~ msgstr "group=%s,%u r矇p_base=%s skel=%s\n" + +#~ msgid "shell=%s " +#~ msgstr "shell=%s " + +#~ msgid "inactive=%ld expire=%s" +#~ msgstr "inactif=%ld expire=%s" #~ msgid "%s: gid %ld is not unique\n" -#~ msgstr "%s : le gid %ld n'est pas unique\n" +#~ msgstr "%s: le gid %ld n'est pas unique\n" #, fuzzy #~ msgid "unknown gid: %u\n" -#~ msgstr "gid inconnu : %d\n" +#~ msgstr "gid inconnu: %d\n" #~ msgid "%s: uid %d is not unique\n" -#~ msgstr "%s : l'uid %d n'est pas unique\n" +#~ msgstr "%s: l'uid %d n'est pas unique\n" #~ msgid "user %s: bad UID (%d)\n" -#~ msgstr "utilisateur %s : mauvais UID (%d)\n" +#~ msgstr "utilisateur %s: mauvais UID (%d)\n" #~ msgid "%s: no aging information present\n" -#~ msgstr "%s : aucune information sur l'age\n" +#~ msgstr "%s: aucune information sur l'age\n" #~ msgid "group %s: bad GID (%d)\n" -#~ msgstr "groupe %s : mauvais GID (%d)\n" +#~ msgstr "groupe %s: mauvais GID (%d)\n" #~ msgid "%s: permission denied (shell).\n" -#~ msgstr "%s : permission refus嶪 (shell).\n" +#~ msgstr "%s: permission refus矇e (shell).\n" diff --git a/po/insert-header.sin b/po/insert-header.sin new file mode 100644 index 00000000..b26de01f --- /dev/null +++ b/po/insert-header.sin @@ -0,0 +1,23 @@ +# Sed script that inserts the file called HEADER before the header entry. +# +# At each occurrence of a line starting with "msgid ", we execute the following +# commands. At the first occurrence, insert the file. At the following +# occurrences, do nothing. The distinction between the first and the following +# occurrences is achieved by looking at the hold space. +/^msgid /{ +x +# Test if the hold space is empty. +s/m/m/ +ta +# Yes it was empty. First occurrence. Read the file. +r HEADER +# Output the file's contents by reading the next line. But don't lose the +# current line while doing this. +g +N +bb +:a +# The hold space was nonempty. Following occurrences. Do nothing. +x +:b +} diff --git a/po/ja.gmo b/po/ja.gmo index 6e99a833..0d1563d4 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index d1ff1b80..827eb3cf 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,710 +5,621 @@ msgid "" msgstr "" "Project-Id-Version: shadow 1990827\n" -"POT-Creation-Date: 2002-03-12 12:16+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" "PO-Revision-Date: 2000-06-18 120:22+0900\n" "Last-Translator: Yasuyuki Furukawa \n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8-bit\n" -#: libmisc/addgrps.c:60 +#: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" -msgstr "煞屢: 尕抸卅弘伙□皿 %s匹允\n" +msgstr "霅血: 銝芥啜怒潦 %s扼\n" -#: libmisc/addgrps.c:71 +#: libmisc/addgrps.c:68 msgid "Warning: too many groups\n" -msgstr "煞屢: 弘伙□皿互聶允亢引允\n" +msgstr "霅血: 啜怒潦憭整\n" -#: libmisc/age.c:77 +#: libmisc/age.c:72 msgid "Your password has expired." -msgstr "丐卅凶及由旦伐□玉反渝蜃互濠木引仄凶." +msgstr "芥柴嫘胯潦舀整." -#: libmisc/age.c:80 +#: libmisc/age.c:75 msgid "Your password is inactive." -msgstr "丐卅凶及由旦伐□玉反inactive匹允." +msgstr "芥柴嫘胯潦疳nactive扼." -#: libmisc/age.c:83 +#: libmisc/age.c:78 msgid "Your login has expired." -msgstr "丐卅凶及伕弘奶件反渝蜃互濠木引仄凶." +msgstr "芥柴准啜扎喋舀整." -#: libmisc/age.c:96 +#: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " 扑旦氾丞棟咥樊午鍬襟仄化仁分今中.\n" +msgstr " 瑯嫘蝞∠函貉艾.\n" -#: libmisc/age.c:99 +#: libmisc/age.c:93 msgid " Choose a new password.\n" -msgstr " 蕙仄中由旦伐□玉毛薊鎗仄化仁分今中.\n" +msgstr " 啜嫘胯潦豢艾.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:168 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "丐卅凶及由旦伐□玉反%ldゥ醱卞渝蜃互濠木引允.\n" +msgstr "芥柴嫘胯潦%ld乩葉急整.\n" -#: libmisc/age.c:178 +#: libmisc/age.c:172 msgid "Your password will expire tomorrow.\n" -msgstr "丐卅凶及由旦伐□玉反抸ゥ卞渝蜃互濠木引允.\n" +msgstr "芥柴嫘胯潦舀乓急整.\n" -#: libmisc/age.c:180 +#: libmisc/age.c:174 msgid "Your password will expire today.\n" -msgstr "丐卅凶及由旦伐□玉反呿ゥ渝蜃濠木匹允.\n" +msgstr "芥柴嫘胯潦舀祆交扼.\n" -#: libmisc/chowntty.c:113 +#: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" -msgstr "TTY %s毛庍凳匹五引六氏" +msgstr "TTY %s憭氬扼整" -#: libmisc/env.c:160 +#: libmisc/env.c:155 msgid "Environment overflow\n" -msgstr "棕雁左□田□白伕□匹允\n" +msgstr "啣芥潦潦准潦扼\n" -#: libmisc/env.c:200 +#: libmisc/env.c:195 #, c-format msgid "You may not change $%s\n" -msgstr "$%s毛庍凳匹五引六氏\n" +msgstr "$%s憭氬扼整\n" -#: libmisc/failure.c:238 +#: libmisc/failure.c:230 #, c-format msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "瘉詨及伕弘奶件井日 %d %s. 瘉詨及伕弘奶件反 %s, 穴扑件 %s.\n" +msgstr "敺柴准啜扎喋 %d %s. 敺柴准啜扎喋 %s, 瑯 %s.\n" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failures" -msgstr "撩л" +msgstr "憭望" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failure" -msgstr "撩л" +msgstr "憭望" -#: libmisc/limits.c:397 +#: libmisc/limits.c:396 msgid "Too many logins.\n" -msgstr "伕弘奶件互聶允亢引允.\n" +msgstr "准啜扎喋憭整.\n" -#: libmisc/login_desrpc.c:63 +#: libmisc/login_desrpc.c:59 #, c-format msgid "Password does not decrypt secret key for %s.\n" -msgstr "由旦伐□玉反%s及輲弩陘繵饕磄葭匹五引六氏.\n" +msgstr "嫘胯潦%s桃撖萸瑕儔扼整.\n" -#: libmisc/login_desrpc.c:69 +#: libmisc/login_desrpc.c:66 #, c-format msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "%s及輲弩陘聸葸磥リ迨牏誘韝リ楔: keyserv犯□乒件互粟が仄化引允井?\n" +msgstr "%s桃撖萸閮剖扼整扼: keyserv潦Ｕ喋韏瑕艾整?\n" -#: libmisc/mail.c:62 libmisc/mail.c:77 +#: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." -msgstr "蕙仄中丟□伙互侳化中引允." +msgstr "啜∼潦怒乓艾整." -#: libmisc/mail.c:73 +#: libmisc/mail.c:72 msgid "No mail." -msgstr "丟□伙反丐曰引六氏." +msgstr "∼潦怒胯整." -#: libmisc/mail.c:75 +#: libmisc/mail.c:74 msgid "You have mail." -msgstr "丟□伙互丐曰引允." +msgstr "∼潦怒整." -#: libmisc/obscure.c:281 src/passwd.c:244 +#: libmisc/obscure.c:271 src/passwd.c:183 #, c-format msgid "Bad password: %s. " -msgstr "尕懇卅由旦伐□玉匹允: %s." +msgstr "銝甇芥嫘胯潦扼: %s." -#: libmisc/pam_pass.c:42 +#: libmisc/pam_pass.c:38 #, c-format msgid "passwd: pam_start() failed, error %d\n" -msgstr "" +msgstr "passwd: pam_start: 具押 %d\n" -#: libmisc/pam_pass.c:49 +#: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" -msgstr "由旦伐□玉: %s\n" +msgstr "嫘胯潦: %s\n" -#: libmisc/setupenv.c:211 -#, c-format -msgid "Unable to cd to \"%s\"\n" -msgstr "\"%s\"尺犯奴伊弁玄伉庍凳匹五引六氏\n" - -#: libmisc/setupenv.c:219 -msgid "No directory, logging in with HOME=/" -msgstr "犯奴伊弁玄伉互丐曰引六氏. HOME=/ 午仄化伕弘奶件仄引允" - -#: libmisc/shell.c:78 -#, c-format -msgid "Executing shell %s\n" -msgstr "扑尼伙%s及撢墊醱\n" - -#. -#. * Obviously something is really wrong - I can't figure out -#. * how to execute this stupid shell, so I might as well give -#. * up in disgust ... -#. -#: libmisc/shell.c:122 -#, c-format -msgid "Cannot execute %s" -msgstr "%s毛撢墊匹五引六氏" - -#: libmisc/sub.c:61 -#, c-format -msgid "Invalid root directory \"%s\"\n" -msgstr "尕懇卅伙□玄犯奴伊弁玄伉 \"%s\" 匹允 \n" - -#: libmisc/sub.c:73 -#, c-format -msgid "Can't change root directory to \"%s\"\n" -msgstr "伙□玄犯奴伊弁玄伉毛 \"%s\"尺庍凳匹五引六氏\n" - -#: libmisc/xmalloc.c:28 -#, c-format -msgid "malloc(%d) failed\n" -msgstr "malloc(%d) 卞撩л仄引仄凶\n" - -#: lib/dialchk.c:71 -msgid "Dialup Password: " -msgstr "母奶失伙失永皿由旦伐□玉: " - -#: lib/getdef.c:276 -msgid "Could not allocate space for config info.\n" -msgstr "澀爛樹扷迕及塢五芢恟互割忡匹五引六氏匹仄凶.\n" - -#. -#. * Item was never found. -#. -#: lib/getdef.c:330 -#, c-format -msgid "configuration error - unknown item '%s' (notify administrator)\n" -msgstr "澀爛巨仿□ - 尕抸卅失奶氾丞 '%s'匹允 (notify administrator)\n" - -#: lib/getdef.c:417 -#, c-format -msgid "error - lookup '%s' failed\n" +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" msgstr "" -#: lib/getdef.c:425 +#: libmisc/setupenv.c:208 #, c-format -msgid "%s not found\n" -msgstr "%s反葦尥井曰引六氏\n" +msgid "Unable to cd to \"%s\"\n" +msgstr "\"%s\"詻研胯芸氬扼整\n" -#. -#. * get the password from her, and set the salt for -#. * the decryption from the group file. -#. -#: lib/pwauth.c:54 src/newgrp.c:348 +#: libmisc/setupenv.c:216 +msgid "No directory, logging in with HOME=/" +msgstr "研胯芥整. HOME=/ 具艾准啜扎喋整" + +#: libmisc/shell.c:119 +#, c-format +msgid "Cannot execute %s" +msgstr "%s摰銵扼整" + +#: libmisc/sub.c:55 +#, c-format +msgid "Invalid root directory \"%s\"\n" +msgstr "銝甇芥怒潦研胯 \"%s\" 扼 \n" + +#: libmisc/sub.c:67 +#, c-format +msgid "Can't change root directory to \"%s\"\n" +msgstr "怒潦研胯芥 \"%s\"詨氬扼整\n" + +#: libmisc/xmalloc.c:24 +#, c-format +msgid "malloc(%d) failed\n" +msgstr "malloc(%d) 怠仃整\n" + +#: lib/getdef.c:274 +msgid "Could not allocate space for config info.\n" +msgstr "閮剖梁具桃征摰寥蝣箔扼整扼.\n" + +#: lib/getdef.c:328 +#, c-format +msgid "configuration error - unknown item '%s' (notify administrator)\n" +msgstr "閮剖具押 - 銝芥Ｕ扎 '%s'扼 (notify administrator)\n" + +#: lib/pwauth.c:54 src/newgrp.c:343 msgid "Password: " -msgstr "由旦伐□玉: " +msgstr "嫘胯潦: " #: lib/pwauth.c:56 #, c-format msgid "%s's Password: " -msgstr "%s及由旦伐□玉: " +msgstr "%s柴嫘胯潦: " -#: lib/pwauth.c:270 +#: lib/pwauth.c:247 msgid "(Echo on) " msgstr "" #: lib/strerror.c:20 #, c-format msgid "Unknown error %d" -msgstr "尕抸卅巨仿□ %d" +msgstr "銝芥具押 %d" -#: src/chage.c:116 -#, c-format +#: src/chage.c:118 msgid "" -"Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" -"\t[-I inactive] [-E expire] [-d last_day] user\n" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -"銀迕芊: %s [-l] [-m 瘉凝ゥ醒] [-M 瘉釐ゥ醒] [-W 煞屢]\n" -"\t[-I 拑躲] [-E 渝蜃濠木] [-d 瘉詨ゥ] 交□扒\n" +"雿輻冽: chage [-l] [-m 撠交財 [-M 憭扳交財 [-W 霅血]\n" +" [-I ∪鉛 [-E ] [-d 敺包 艾潦跚n" -#: src/chage.c:122 -#, c-format -msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" -msgstr "銀迕芊: %s [-l] [-m 瘉凝ゥ醒] [-M 瘉釐ゥ醒] [-d 瘉詨ゥ] 交□扒\n" - -#: src/chage.c:157 +#: src/chage.c:152 #, fuzzy msgid "" "Enter the new value, or press ENTER for the default\n" "\n" msgstr "" -"蕙仄中襖毛ェ恘仄化仁分今中, 伓賞澀爛襖毛厙迕允月卞反伉正□件毛瓷仄化仁分今" -"中.\n" +"啜扎亙艾, 璅皞閮剖扎拍具怒胯芥踴潦喋潦艾" +".\n" "\n" -#: src/chage.c:160 +#: src/chage.c:155 msgid "Minimum Password Age" -msgstr "瘉凝由旦伐□玉庍凳尕第Хゥ醒" +msgstr "撠嫘胯潦憭港航賣交" -#: src/chage.c:166 +#: src/chage.c:161 msgid "Maximum Password Age" -msgstr "瘉釐由旦伐□玉庍凳第Хゥ醒" +msgstr "憭扼嫘胯潦憭游航賣交" -#: src/chage.c:174 +#: src/chage.c:169 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "瘉詨由旦伐□玉庍凳ゥ尥 (YYYY-MM-DD)" +msgstr "敺嫘胯潦憭湔乩 (YYYY-MM-DD)" + +#: src/chage.c:177 +msgid "Password Expiration Warning" +msgstr "嫘胯潦霅血交" #: src/chage.c:183 -msgid "Password Expiration Warning" -msgstr "由旦伐□玉渝蜃濠木煞屢ゥ醒" - -#: src/chage.c:189 msgid "Password Inactive" -msgstr "由旦伐□玉拑躲ゥ醒" +msgstr "嫘胯潦∪寞交" -#: src/chage.c:197 +#: src/chage.c:191 msgid "Account Expiration Date (YYYY-MM-DD)" -msgstr "失市它件玄渝蜃濠木ゥ尥 (YYYY-MM-DD)" +msgstr "Ｕ怒艾喋乩 (YYYY-MM-DD)" -#. -#. * Start with the easy numbers - the number of days before the -#. * password can be changed, the number of days after which the -#. * password must be chaged, the number of days before the password -#. * expires that the user is told, and the number of days after the -#. * password expires that the account becomes unusable. -#. -#: src/chage.c:248 +#: src/chage.c:241 #, c-format msgid "Minimum:\t%ld\n" -msgstr "瘉凝:\t%ld\n" +msgstr "撠:\t%ld\n" -#: src/chage.c:249 +#: src/chage.c:242 #, c-format msgid "Maximum:\t%ld\n" -msgstr "瘉釐:\t%ld\n" +msgstr "憭:\t%ld\n" -#: src/chage.c:251 +#: src/chage.c:243 #, c-format msgid "Warning:\t%ld\n" -msgstr "煞屢:\t%ld\n" +msgstr "霅血:\t%ld\n" -#: src/chage.c:252 +#: src/chage.c:244 #, c-format msgid "Inactive:\t%ld\n" -msgstr "拑躲:\t%ld\n" +msgstr "∪:\t%ld\n" -#. -#. * The "last change" date is either "Never" or the date the password -#. * was last modified. The date is the number of days since 1/1/1970. -#. -#: src/chage.c:260 +#: src/chage.c:251 msgid "Last Change:\t\t" -msgstr "瘉嗤及庍凳:\t\t" +msgstr "餈桀:\t\t" -#: src/chage.c:262 src/chage.c:276 src/chage.c:293 src/chage.c:306 +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 msgid "Never\n" -msgstr "卅仄:\n" +msgstr "芥:\n" -#. -#. * The password expiration date is determined from the last change -#. * date plus the number of days the password is valid for. -#. -#: src/chage.c:273 +#: src/chage.c:264 msgid "Password Expires:\t" -msgstr "由旦伐□玉渝蜃:\t" +msgstr "嫘胯潦:\t" -#. -#. * The account becomes inactive if the password is expired for more -#. * than "inactdays". The expiration date is calculated and the -#. * number of inactive days is added. The resulting date is when the -#. * active will be disabled. -#. -#: src/chage.c:290 +#: src/chage.c:280 msgid "Password Inactive:\t" -msgstr "由旦伐□玉拑躲:\t" +msgstr "嫘胯潦∪:\t" -#. -#. * The account will expire on the given date regardless of the -#. * password expiring or not. -#. -#: src/chage.c:304 +#: src/chage.c:294 msgid "Account Expires:\t" -msgstr "失市它件玄渝蜃濠木:\t" +msgstr "Ｕ怒艾喋:\t" -#: src/chage.c:468 +#: src/chage.c:445 #, c-format msgid "%s: do not include \"l\" with other flags\n" -msgstr "%s: 職及白仿弘及凶戶 \"l\" 左皿扑亦件反殖引六月仇午互匹五引六氏\n" +msgstr "%s: 隞柴押啜柴 \"l\" 芥瑯扼喋臬怒整具扼整\n" -#: src/chage.c:481 src/chage.c:652 src/login.c:518 +#: src/chage.c:458 src/chage.c:588 src/login.c:503 #, c-format msgid "%s: permission denied\n" -msgstr "%s: 腺蜃互丐曰引六氏\n" +msgstr "%s: 璅拚整\n" -#: src/chage.c:512 src/chpasswd.c:139 src/groupadd.c:529 src/groupdel.c:322 -#: src/groupmod.c:520 src/newusers.c:381 src/useradd.c:1754 src/userdel.c:717 -#: src/usermod.c:1732 +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" -msgstr "田奶田旦卞方勻化由旦伐□玉毛ロ據仄引允.\n" +msgstr "扎嫘怒艾嫘胯潦隤閮潦整.\n" -#: src/chage.c:533 src/chpasswd.c:157 -#, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: 由旦伐□玉白央奶伙毛伕永弁匹五引六氏\n" - -#: src/chage.c:544 src/chpasswd.c:162 +#: src/chage.c:510 src/chpasswd.c:159 #, c-format msgid "%s: can't open password file\n" -msgstr "%s: 由旦伐□玉白央奶伙互釩仃引六氏\n" +msgstr "%s: 嫘胯潦∼扎怒整\n" -#: src/chage.c:552 +#: src/chage.c:518 #, c-format msgid "%s: unknown user: %s\n" -msgstr "%s: 尕抸卅交□扒匹允: %s\n" +msgstr "%s: 銝芥艾潦嗚扼: %s\n" -#: src/chage.c:571 +#: src/chage.c:536 #, fuzzy, c-format msgid "%s: can't lock shadow password file" -msgstr "扑乓玉它’由旦伐□玉’白央奶伙毛伕永弁匹五引六氏\n" +msgstr "瑯艾颯嫘胯潦颯∼扎怒准胯扼整\n" -#: src/chage.c:579 +#: src/chage.c:544 #, fuzzy, c-format msgid "%s: can't open shadow password file" -msgstr "%s: 扑乓玉它’由旦伐□玉’白央奶伙毛釩仃引六氏\n" +msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒整\n" -#: src/chage.c:674 +#: src/chage.c:605 #, c-format msgid "Changing the aging information for %s\n" -msgstr "%s及渝蜃樹扷毛庍凳醱\n" +msgstr "%s格晞憭港葉\n" -#: src/chage.c:677 +#: src/chage.c:608 #, c-format msgid "%s: error changing fields\n" -msgstr "%s: 嫩杴庍凳匹巨仿□互粟仇曰引仄凶\n" +msgstr "%s: 桀氬扼具押潦韏瑯整\n" -#: src/chage.c:705 src/chage.c:771 src/pwunconv.c:174 +#: src/chage.c:632 src/pwunconv.c:138 #, c-format msgid "%s: can't update password file\n" -msgstr "%s: 由旦伐□玉’白央奶伙毛凳蕙仄引六氏\n" +msgstr "%s: 嫘胯潦颯∼扎怒湔啜整\n" -#: src/chage.c:737 src/pwunconv.c:168 +#: src/chage.c:661 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "%s: 扑乓玉它’由旦伐□玉’白央奶伙毛凳蕙仄引六氏\n" +msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒湔啜整\n" -#: src/chage.c:789 src/chage.c:805 src/chfn.c:570 src/chsh.c:382 -#: src/passwd.c:747 src/passwd.c:859 +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 +#, fuzzy msgid "Error updating the DBM password entry.\n" -msgstr "" +msgstr "嫘胯潦亙格湔啜柴具押潦扼.\n" -#: src/chage.c:823 -#, c-format +#: src/chage.c:693 +#, fuzzy, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "" +msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒扎扼整\n" -#: src/chage.c:838 +#: src/chage.c:707 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "%s: 由旦伐□玉’白央奶伙毛曉踏五匹五引六氏\n" +msgstr "%s: 嫘胯潦颯∼扎怒銝詻扼整\n" -#: src/chage.c:857 src/chpasswd.c:343 src/groupadd.c:590 src/groupdel.c:409 -#: src/groupmod.c:604 src/newusers.c:628 src/useradd.c:1869 src/userdel.c:849 -#: src/usermod.c:1811 +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: 白央奶伙毛伕永弁匹五引六氏\n" +msgstr "%s: ∼扎怒准胯扼整\n" -#: src/chfn.c:83 +#: src/chfn.c:84 #, c-format msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" "\t[-h home_ph] [-o other] [user]\n" msgstr "" -"銀迕芊: %s [-f 白伙生□丞] [-r 伙□丞No] [-w 縝樺TEL]\n" -"\t[-h 憤鎘TEL] [-o 公及職] [交□扒]\n" +"雿輻冽: %s [-f 怒潦] [-r 怒潦No] [-w 瑕幅EL]\n" +"\t[-h 芸TEL] [-o 桐] [艾潦跑\n" -#: src/chfn.c:88 +#: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" -msgstr "銀迕芊: %s [-f 白伙生□丞] [-r 伙□丞No] [-w 縝樺TEL] [-h 憤鎘TEL]\n" +msgstr "雿輻冽: %s [-f 怒潦] [-r 怒潦No] [-w 瑕幅EL] [-h 芸TEL]\n" -#: src/chfn.c:139 +#: src/chfn.c:140 msgid "Enter the new value, or press ENTER for the default\n" msgstr "" -"蕙仄中襖毛ェ恘仄化仁分今中, 伓賞澀爛襖毛厙迕允月卞反 伉正□件毛瓷仄化仁分今" -"中.\n" +"啜扎亙艾, 璅皞閮剖扎拍具怒 芥踴潦喋潦艾" +".\n" -#: src/chfn.c:142 +#: src/chfn.c:143 msgid "Full Name" -msgstr "白伙生□丞" +msgstr "怒潦" -#: src/chfn.c:144 +#: src/chfn.c:145 #, c-format msgid "\tFull Name: %s\n" -msgstr "\t白伙生□丞: %s\n" +msgstr "\t怒潦: %s\n" -#: src/chfn.c:147 +#: src/chfn.c:148 msgid "Room Number" -msgstr "朿盒砦" +msgstr "典芸" -#: src/chfn.c:149 +#: src/chfn.c:150 #, c-format msgid "\tRoom Number: %s\n" -msgstr "\t朿盒砦: %s\n" +msgstr "\t典芸: %s\n" -#: src/chfn.c:152 +#: src/chfn.c:153 msgid "Work Phone" -msgstr "縝樺齬狪砦" +msgstr "瑕湧餉店芸" -#: src/chfn.c:154 +#: src/chfn.c:155 #, c-format msgid "\tWork Phone: %s\n" -msgstr "\t縝樺齬狪砦: %s\n" +msgstr "\t瑕湧餉店芸: %s\n" -#: src/chfn.c:157 +#: src/chfn.c:158 msgid "Home Phone" -msgstr "憤鎘齬狪砦" +msgstr "芸餉店芸" -#: src/chfn.c:159 +#: src/chfn.c:160 #, c-format msgid "\tHome Phone: %s\n" -msgstr "\t憤鎘齬狪砦: %s\n" +msgstr "\t芸餉店芸: %s\n" -#: src/chfn.c:162 +#: src/chfn.c:163 msgid "Other" -msgstr "公及職" +msgstr "桐" -#: src/chfn.c:271 src/chfn.c:281 src/chfn.c:291 src/chfn.c:301 src/chfn.c:311 -#: src/chfn.c:379 src/passwd.c:1115 +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 #, c-format msgid "%s: Permission denied.\n" -msgstr "%s: 腺蜃互丐曰引六氏.\n" +msgstr "%s: 璅拚整.\n" -#: src/chfn.c:332 src/chsh.c:190 src/passwd.c:1165 +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 #, c-format msgid "%s: Unknown user %s\n" -msgstr "%s: 尕抸卅交□扒 %s\n" +msgstr "%s: 銝芥艾潦 %s\n" -#: src/chfn.c:341 src/chsh.c:198 src/passwd.c:1096 +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 #, c-format msgid "%s: Cannot determine your user name.\n" -msgstr "%s: 丐卅凶及交□扒抩毛衝磥リ迨牏誘.\n" +msgstr "%s: 芥柴艾潦嗅文扼整.\n" -#: src/chfn.c:358 src/chsh.c:215 +#: src/chfn.c:359 src/chsh.c:210 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "%s: NIS弁仿奶失件玄曉匹交□扒`%s'反庍凳匹五引六氏.\n" +msgstr "%s: NIS胯押扎Ｕ喋銝扼艾潦跆%s'臬氬扼整.\n" -#: src/chfn.c:366 src/chsh.c:223 +#: src/chfn.c:367 src/chsh.c:218 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: `%s'互仇及弁仿奶失件玄迕及NIS穴旦正□匹允.\n" +msgstr "%s: `%s'柴胯押扎Ｕ喋具奘IS嫘踴潦扼.\n" -#: src/chfn.c:441 +#: src/chfn.c:442 #, c-format msgid "Changing the user information for %s\n" -msgstr "%s及交□扒樹扷庍凳醱\n" +msgstr "%s柴艾潦嗆勗港葉\n" -#: src/chfn.c:450 +#: src/chfn.c:451 #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s: 交□扒抩互尕懇匹允: \"%s\"\n" +msgstr "%s: 艾潦嗅銝甇扼: \"%s\"\n" -#: src/chfn.c:456 +#: src/chfn.c:457 #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "%s: 朿盒砦璊界埬竣リ: \"%s\"\n" +msgstr "%s: 典芸瑯銝甇扼: \"%s\"\n" -#: src/chfn.c:462 +#: src/chfn.c:463 #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "%s: 縝樺齬狪砦璊界埬竣リ: \"%s\"\n" +msgstr "%s: 瑕湧餉店芸瑯銝甇扼: \"%s\"\n" -#: src/chfn.c:468 +#: src/chfn.c:469 #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s: 憤鎘齬狪砦璊界埬竣リ: \"%s\"\n" +msgstr "%s: 芸餉店芸瑯銝甇扼: \"%s\"\n" -#: src/chfn.c:475 +#: src/chfn.c:476 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s: \"%s\" 反尕懇卅妐儂毛殖氏匹中引允\n" +msgstr "%s: \"%s\" 臭甇芣摮怒扼整\n" -#: src/chfn.c:488 +#: src/chfn.c:489 #, c-format msgid "%s: fields too long\n" -msgstr "%s: ェ恘ま芢互贏聊亢引允\n" +msgstr "%s: 亙摰嫘琿整\n" -#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277 +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 msgid "Cannot change ID to root.\n" -msgstr "ID毛root尺庍凳匹五引六氏.\n" +msgstr "IDroot詨氬扼整.\n" -#: src/chfn.c:519 src/chsh.c:331 src/passwd.c:656 src/passwd.c:811 +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 msgid "Cannot lock the password file; try again later.\n" -msgstr "由旦伐□玉’白央奶伙毛伕永弁匹五引六氏; 詨匹手丹域蘸魂仄化仁分今中.\n" +msgstr "嫘胯潦颯∼扎怒准胯扼整; 敺扼銝摨西岫艾.\n" -#: src/chfn.c:525 src/chsh.c:337 src/passwd.c:661 src/passwd.c:816 +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 msgid "Cannot open the password file.\n" -msgstr "由旦伐□玉’白央奶伙毛釩仃引六氏.\n" +msgstr "嫘胯潦颯∼扎怒整.\n" -#: src/chfn.c:542 src/chsh.c:352 src/passwd.c:667 src/usermod.c:1348 +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 #, c-format msgid "%s: %s not found in /etc/passwd\n" -msgstr "%s: %s反 /etc/passwd醱卞葦尥井曰引六氏\n" +msgstr "%s: %s /etc/passwd銝准怨隞整\n" -#: src/chfn.c:561 src/chsh.c:373 src/passwd.c:740 src/passwd.c:852 +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 msgid "Error updating the password entry.\n" -msgstr "由旦伐□玉ェ恘及凳蕙及巨仿□匹允.\n" +msgstr "嫘胯潦亙格湔啜柴具押潦扼.\n" -#: src/chfn.c:585 src/chsh.c:397 src/passwd.c:755 src/passwd.c:867 +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 msgid "Cannot commit password file changes.\n" -msgstr "由旦伐□玉’白央奶伙及庍凳毛割爛(commit)匹五引六氏.\n" +msgstr "嫘胯潦颯∼扎怒桀氬蝣箏(commit)扼整.\n" -#: src/chfn.c:592 src/chsh.c:404 +#: src/chfn.c:593 src/chsh.c:399 msgid "Cannot unlock the password file.\n" -msgstr "由旦伐□玉’白央奶伙毛伕永弁荸輪匹五引六氏.\n" +msgstr "嫘胯潦颯∼扎怒准航圾扎扼整.\n" -#: src/chpasswd.c:66 +#: src/chpasswd.c:67 #, c-format -msgid "usage: %s [-e]\n" -msgstr "銀迕芊: %s [-e]\n" +msgid "Usage: %s [-e]\n" +msgstr "雿輻冽: %s [-e]\n" -#: src/chpasswd.c:171 src/pwconv.c:94 +#: src/chpasswd.c:154 +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: 嫘胯潦∼扎怒准胯扼整\n" + +#: src/chpasswd.c:168 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" -msgstr "%s: 扑乓玉它’白央奶伙毛伕永弁匹五引六氏\n" +msgstr "%s: 瑯艾颯∼扎怒准胯扼整\n" -#: src/chpasswd.c:177 src/gpasswd.c:596 src/pwconv.c:99 src/pwunconv.c:103 -#: src/pwunconv.c:108 +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s: 扑乓玉它’白央奶伙毛釩仃引六氏\n" +msgstr "%s: 瑯艾颯∼扎怒整\n" -#: src/chpasswd.c:200 src/newusers.c:460 +#: src/chpasswd.c:197 src/newusers.c:441 #, c-format msgid "%s: line %d: line too long\n" -msgstr "%s: %d 墊: 1墊互贏聊亢引允\n" +msgstr "%s: %d 銵: 1銵琿整\n" -#: src/chpasswd.c:220 +#: src/chpasswd.c:217 #, c-format msgid "%s: line %d: missing new password\n" -msgstr "%s: %d 墊: 蕙筋由旦伐□玉互丐曰引六氏\n" +msgstr "%s: %d 銵: 啗嫘胯潦整\n" -#: src/chpasswd.c:237 +#: src/chpasswd.c:234 #, c-format msgid "%s: line %d: unknown user %s\n" -msgstr "%s: %d 墊: 尕抸卅交□扒 %s 匹允\n" +msgstr "%s: %d 銵: 銝芥艾潦 %s 扼\n" -#: src/chpasswd.c:290 +#: src/chpasswd.c:280 #, c-format msgid "%s: line %d: cannot update password entry\n" -msgstr "%s: %d 墊: 由旦伐□玉ェ恘毛凳蕙匹五引六氏\n" +msgstr "%s: %d 銵: 嫘胯潦亙湔啜扼整\n" -#: src/chpasswd.c:307 src/newusers.c:588 +#: src/chpasswd.c:297 src/newusers.c:569 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: 巨仿□互腹請今木引仄凶, 庍凳反拑躲卞卅曰引仄凶\n" +msgstr "%s: 具押潦璊箝整, 憭氬舐∪嫘怒芥整\n" -#: src/chpasswd.c:319 +#: src/chpasswd.c:309 #, c-format msgid "%s: error updating shadow file\n" -msgstr "%s: 扑乓玉它’白央奶伙及凳蕙卞巨仿□匹允\n" +msgstr "%s: 瑯艾颯∼扎怒格湔啜怒具押潦扼\n" -#: src/chpasswd.c:328 +#: src/chpasswd.c:318 #, c-format msgid "%s: error updating password file\n" -msgstr "%s: 由旦伐□玉’白央奶伙及凳蕙及巨仿□匹允\n" +msgstr "%s: 嫘胯潦颯∼扎怒格湔啜柴具押潦扼\n" -#: src/chsh.c:75 +#: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" -msgstr "銀迕芊: %s [-s 扑尼伙] [交□扒抩]\n" +msgstr "雿輻冽: %s [-s 瑯扼侷 [艾潦嗅]\n" -#: src/chsh.c:89 +#: src/chsh.c:90 #, fuzzy msgid "Enter the new value, or press return for the default\n" msgstr "" -"蕙仄中襖毛ェ恘仄化仁分今中, 伓賞澀爛襖毛厙迕允月卞反 伉正□件毛瓷仄化仁分今" -"中.\n" +"啜扎亙艾, 璅皞閮剖扎拍具怒 芥踴潦喋潦艾" +".\n" -#: src/chsh.c:90 +#: src/chsh.c:91 msgid "Login Shell" -msgstr "伕弘奶件’扑尼伙" +msgstr "准啜扎喋颯瑯扼" -#: src/chsh.c:239 src/chsh.c:253 +#: src/chsh.c:234 src/chsh.c:248 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "丐卅凶互 %s及扑尼伙毛庍凳允月仇午反匹五引六氏.\n" +msgstr "芥 %s柴瑯扼怒憭氬具胯扼整.\n" -#: src/chsh.c:282 +#: src/chsh.c:277 #, c-format msgid "Changing the login shell for %s\n" -msgstr "%s及伕弘奶件扑尼伙毛庍凳醱\n" +msgstr "%s柴准啜扎喋瑯扼怒憭港葉\n" -#: src/chsh.c:294 +#: src/chsh.c:289 #, c-format msgid "%s: Invalid entry: %s\n" -msgstr "%s: 尕懇卅ェ恘: %s\n" +msgstr "%s: 銝甇芸亙: %s\n" -#: src/chsh.c:301 +#: src/chsh.c:296 #, c-format msgid "%s is an invalid shell.\n" -msgstr "%s反尕懇卅扑尼伙匹允.\n" - -#: src/dpasswd.c:52 -#, c-format -msgid "Usage: %s [-(a|d)] shell\n" -msgstr "銀迕芊: %s [-(a|d)] 扑尼伙\n" - -#: src/dpasswd.c:115 -msgid "Shell password: " -msgstr "扑尼伙由旦伐□玉: " - -#: src/dpasswd.c:121 -msgid "re-enter Shell password: " -msgstr "扑尼伙由旦伐□玉及瘋ェ恘: " - -#: src/dpasswd.c:129 -#, c-format -msgid "%s: Passwords do not match, try again.\n" -msgstr "%s: 由旦伐□玉互域譙仄引六氏, 手丹域蘸云湊中仄引允.\n" - -#: src/dpasswd.c:149 -#, c-format -msgid "%s: can't create %s" -msgstr "%s: %s毛綜嶽匹五引六氏" - -#: src/dpasswd.c:155 -#, c-format -msgid "%s: can't open %s" -msgstr "%s: %s毛釩仃引六氏" - -#: src/dpasswd.c:183 -#, c-format -msgid "%s: Shell %s not found.\n" -msgstr "%s: 扑尼伙 %s互葦尥井曰引六氏.\n" +msgstr "%s臭甇芥瑯扼怒扼.\n" #: src/expiry.c:59 msgid "Usage: expiry {-f|-c}\n" -msgstr "銀迕芊: expiry {-f|-c}\n" +msgstr "雿輻冽: expiry {-f|-c}\n" #: src/expiry.c:113 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" -msgstr "%s: 煞屢! set-UID root今木化卅仁化反卅曰引六氏!\n" +msgstr "%s: 霅血! set-UID root艾芥艾胯芥整!\n" #: src/expiry.c:124 #, c-format msgid "%s: unknown user\n" -msgstr "%s: 尕抸卅交□扒匹允\n" +msgstr "%s: 銝芥艾潦嗚扼\n" #: src/faillog.c:77 #, c-format -msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" -msgstr "銀迕芊: %s [-a|-u 交□扒] [-m 瘉釐] [-r] [-t ゥ醒] [-l 伕永弁卍]\n" +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +msgstr "雿輻冽: %s [-a|-u 艾潦跑 [-m 憭吞 [-r] [-t 交財 [-l 准舐]\n" #: src/faillog.c:131 src/lastlog.c:96 #, c-format msgid "Unknown User: %s\n" -msgstr "尕抸卅交□扒匹允: %s\n" +msgstr "銝芥艾潦嗚扼: %s\n" #: src/faillog.c:212 msgid "Username Failures Maximum Latest\n" -msgstr "交□扒抩 撩л 瘉釐 瘉嗤\n" +msgstr "艾潦嗅 憭望 憭 餈\n" #: src/faillog.c:229 -#, c-format +#, fuzzy, c-format msgid " %s on %s" -msgstr "" +msgstr "餈柴准啜扎: %s on %s" #: src/faillog.c:233 #, c-format @@ -722,282 +633,272 @@ msgstr "" #: src/gpasswd.c:78 #, c-format -msgid "usage: %s [-r|-R] group\n" -msgstr "銀迕芊: %s [-r|-R] 弘伙□皿\n" +msgid "Usage: %s [-r|-R] group\n" +msgstr "雿輻冽: %s [-r|-R] 啜怒潦\n" #: src/gpasswd.c:79 #, c-format msgid " %s [-a user] group\n" -msgstr "" +msgstr " %s [-d 艾潦跑 啜怒潦\n" #: src/gpasswd.c:80 #, c-format msgid " %s [-d user] group\n" -msgstr " %s [-d 交□扒] 弘伙□皿\n" +msgstr " %s [-d 艾潦跑 啜怒潦\n" #: src/gpasswd.c:83 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" -msgstr " %s [-A 交□扒,...] [-M 交□扒,...] 弘伙□皿\n" +msgstr " %s [-A 艾潦,...] [-M 艾潦,...] 啜怒潦\n" #: src/gpasswd.c:85 #, c-format msgid " %s [-M user,...] group\n" -msgstr " %s [-M 交□扒,...] 弘伙□皿\n" +msgstr " %s [-M 艾潦,...] 啜怒潦\n" #: src/gpasswd.c:146 src/gpasswd.c:230 #, c-format msgid "%s: unknown user %s\n" -msgstr "%s: 尕抸卅交□扒 %s 匹允\n" +msgstr "%s: 銝芥艾潦 %s 扼\n" #: src/gpasswd.c:157 msgid "Permission denied.\n" -msgstr "失弁本旦腺互蛐搕竣鴗牏楔.\n" +msgstr "Ｕ胯颯寞貝艾整.\n" #: src/gpasswd.c:243 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s: 扑乓玉它’弘伙□皿’由旦伐□玉互 -A卞覆仄化优邰匹允\n" +msgstr "%s: 瑯艾颯啜怒潦颯嫘胯潦 -A怠紋血閬扼\n" #: src/gpasswd.c:294 msgid "Who are you?\n" -msgstr "丐卅凶反簿?\n" +msgstr "芥航狐?\n" -#: src/gpasswd.c:313 src/newgrp.c:297 +#: src/gpasswd.c:313 src/newgrp.c:292 #, c-format msgid "unknown group: %s\n" -msgstr "尕抸卅弘伙□皿匹允: %s\n" +msgstr "銝芥啜怒潦扼: %s\n" #: src/gpasswd.c:422 #, c-format msgid "Adding user %s to group %s\n" -msgstr "交□扒 %s 毛弘伙□皿 %s 井日馨笛\n" +msgstr "艾潦 %s 啜怒潦 %s 餈賢\n" #: src/gpasswd.c:440 #, c-format msgid "Removing user %s from group %s\n" -msgstr "交□扒 %s 毛弘伙□皿 %s 井日綽輪\n" +msgstr "艾潦 %s 啜怒潦 %s 么n" #: src/gpasswd.c:454 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s: 尕抸卅砦 %s匹允\n" +msgstr "%s: 銝芰芸 %s扼\n" #: src/gpasswd.c:501 #, c-format msgid "%s: Not a tty\n" -msgstr "%s: TTY匹反丐曰引六氏\n" +msgstr "%s: TTY扼胯整\n" -#. -#. * A new password is to be entered and it must be encrypted, etc. -#. * The password will be prompted for twice, and both entries must be -#. * identical. There is no need to validate the old password since -#. * the invoker is either the group owner, or root. -#. #: src/gpasswd.c:522 #, c-format msgid "Changing the password for group %s\n" -msgstr "%s弘伙□皿及由旦伐□玉毛庍凳\n" +msgstr "%s啜怒潦柴嫘胯潦憭廄n" #: src/gpasswd.c:525 msgid "New Password: " -msgstr "蕙筋由旦伐□玉: " +msgstr "啗嫘胯潦: " -#: src/gpasswd.c:530 src/passwd.c:365 +#: src/gpasswd.c:530 src/passwd.c:281 msgid "Re-enter new password: " -msgstr "蕙筋由旦伐□玉瘋ェ恘: " +msgstr "啗嫘胯潦亙: " #: src/gpasswd.c:542 msgid "They don't match; try again" -msgstr "域譙仄引六氏; 手丹域蘸云湊中仄引允" +msgstr "銝氬整; 銝摨艾憿整" #: src/gpasswd.c:546 #, c-format msgid "%s: Try again later\n" -msgstr "%s: 詨匹手丹域蘸云湊中仄引允\n" +msgstr "%s: 敺扼銝摨艾憿整\n" #: src/gpasswd.c:578 #, c-format msgid "%s: can't get lock\n" -msgstr "%s: 伕永弁匹五引六氏\n" +msgstr "%s: 准胯扼整\n" #: src/gpasswd.c:584 #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s: 扑乓玉它毛伕永弁匹五引六氏\n" +msgstr "%s: 瑯艾准胯扼整\n" #: src/gpasswd.c:590 #, c-format msgid "%s: can't open file\n" -msgstr "%s: 白央奶伙毛釩仃引六氏\n" +msgstr "%s: ∼扎怒整\n" #: src/gpasswd.c:602 #, c-format msgid "%s: can't update entry\n" -msgstr "%s: 巨件玄伉毛凳蕙匹五引六氏\n" +msgstr "%s: 具喋芥湔啜扼整\n" #: src/gpasswd.c:608 #, c-format msgid "%s: can't update shadow entry\n" -msgstr "%s: 扑乓玉它’巨件玄伉毛凳蕙匹五引六氏\n" +msgstr "%s: 瑯艾颯具喋芥湔啜扼整\n" #: src/gpasswd.c:615 #, c-format msgid "%s: can't re-write file\n" -msgstr "%s: 白央奶伙毛曉踏五匹五引六氏\n" +msgstr "%s: ∼扎怒銝詻扼整\n" #: src/gpasswd.c:621 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s: 扑乓玉它’白央奶伙毛曉踏五匹五引六氏\n" +msgstr "%s: 瑯艾颯∼扎怒銝詻扼整\n" #: src/gpasswd.c:630 #, c-format msgid "%s: can't unlock file\n" -msgstr "%s: 白央奶伙毛伕永弁匹五引六氏\n" +msgstr "%s: ∼扎怒准胯扼整\n" #: src/gpasswd.c:635 #, c-format msgid "%s: can't update DBM files\n" -msgstr "%s: DBM 白央奶伙毛凳蕙匹五引六氏\n" +msgstr "%s: DBM ∼扎怒湔啜扼整\n" #: src/gpasswd.c:642 #, c-format msgid "%s: can't update DBM shadow files\n" -msgstr "%s: DBM 扑乓玉它’白央奶伙毛凳蕙匹五引六氏\n" +msgstr "%s: DBM 瑯艾颯∼扎怒湔啜扼整\n" -#: src/groupadd.c:101 -msgid "usage: groupadd [-g gid [-o]] group\n" -msgstr "銀迕芊: groupadd [-g 弘伙□皿ID [-o]] 弘伙□皿\n" +#: src/groupadd.c:102 +#, fuzzy +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" +msgstr "雿輻冽: groupadd [-g 啜怒潦ID [-o]] 啜怒潦\n" -#: src/groupadd.c:167 src/groupadd.c:192 src/groupmod.c:179 src/groupmod.c:228 -#: src/useradd.c:970 src/usermod.c:552 src/usermod.c:695 +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s: 蕙筋弘伙□皿巨件玄伉尺馨笛及巨仿□匹允\n" +msgstr "%s: 啗啜怒潦具喋芥貉蕭柴具押潦扼\n" -#: src/groupadd.c:178 src/groupadd.c:203 src/groupmod.c:197 src/useradd.c:981 -#: src/usermod.c:564 src/usermod.c:708 +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 #, c-format msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: 蕙筋DBM弘伙□皿’巨件玄伉尺馨笛匹五引六氏\n" +msgstr "%s: 啗DBM啜怒潦颯具喋芥貉蕭扼整\n" -#: src/groupadd.c:255 src/useradd.c:1034 +#: src/groupadd.c:256 src/useradd.c:977 #, c-format msgid "%s: name %s is not unique\n" -msgstr "s: 抩蟆 %s 反褐呁仄化中引允\n" +msgstr "%s: %s 舫銴艾整\n" -#: src/groupadd.c:270 +#: src/groupadd.c:271 #, c-format msgid "%s: gid %u is not unique\n" -msgstr "%s: 交□扒ID %u 互褐呁仄化中引允\n" +msgstr "%s: 艾潦貂D %u 銴艾整\n" -#: src/groupadd.c:294 +#: src/groupadd.c:295 #, c-format msgid "%s: can't get unique gid\n" -msgstr "%s: 域啦及弘伙□皿ID毛潸ぜ匹五引六氏\n" +msgstr "%s: 銝柴啜怒潦ID敺扼整\n" -#. -#. * All invalid group names land here. -#. -#: src/groupadd.c:317 src/groupmod.c:341 +#: src/groupadd.c:318 src/groupmod.c:342 #, c-format msgid "%s: %s is a not a valid group name\n" -msgstr "" +msgstr "%s: %s 臬銴艾整\n" -#: src/groupadd.c:346 src/groupmod.c:366 +#: src/groupadd.c:347 src/groupmod.c:367 #, c-format msgid "%s: invalid group %s\n" -msgstr "%s: 弘伙□皿 %s 反尕贗濠匹允\n" +msgstr "%s: 啜怒潦 %s 臭拙扼\n" -#: src/groupadd.c:363 src/useradd.c:1313 +#: src/groupadd.c:364 src/useradd.c:1173 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "" -#: src/groupadd.c:407 src/groupdel.c:173 src/groupmod.c:401 src/useradd.c:1428 -#: src/userdel.c:312 src/usermod.c:576 -#, fuzzy, c-format +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 +#, c-format msgid "%s: cannot rewrite group file\n" -msgstr "%s: 弘伙□皿’白央奶伙毛釩仃引六氏\n" +msgstr "%s: 啜怒潦颯∼扎怒整\n" -#: src/groupadd.c:415 src/groupdel.c:179 src/groupmod.c:409 src/useradd.c:1437 -#: src/userdel.c:319 src/usermod.c:722 -#, fuzzy, c-format +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 +#, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s: 扑乓玉它’弘伙□皿’白央奶伙互釩仃引六氏\n" +msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" -#: src/groupadd.c:433 src/groupdel.c:198 src/groupmod.c:427 src/userdel.c:403 +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 #, fuzzy, c-format msgid "%s: unable to lock group file\n" -msgstr "%s: 弘伙□皿’白央奶伙毛伕永弁匹五引六氏\n" +msgstr "%s: 啜怒潦颯∼扎怒准胯扼整\n" -#: src/groupadd.c:438 src/groupdel.c:202 src/groupmod.c:432 +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 #, fuzzy, c-format msgid "%s: unable to open group file\n" -msgstr "%s: 弘伙□皿白央奶伙毛釩仃引六氏\n" +msgstr "%s: 啜怒潦∼扎怒整\n" -#: src/groupadd.c:445 src/groupdel.c:207 src/groupmod.c:439 src/userdel.c:414 +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 #, fuzzy, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: 扑乓玉它’弘伙□皿’白央奶伙毛伕永弁匹五引六氏\n" +msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒准胯扼整\n" -#: src/groupadd.c:451 src/groupdel.c:212 src/groupmod.c:445 +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 #, fuzzy, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: 扑乓玉它’弘伙□皿’白央奶伙互釩仃引六氏\n" +msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" -#: src/groupadd.c:562 +#: src/groupadd.c:563 #, fuzzy, c-format msgid "%s: group %s exists\n" -msgstr "%s: 交□扒 %s 反繡箕仄引允\n" +msgstr "%s: 艾潦 %s 臬具整\n" -#: src/groupdel.c:92 -msgid "usage: groupdel group\n" -msgstr "銀迕芊: groupdel 弘伙□皿\n" +#: src/groupdel.c:88 +#, fuzzy +msgid "Usage: groupdel group\n" +msgstr "雿輻冽: groupdel 啜怒潦\n" -#: src/groupdel.c:110 src/groupmod.c:184 src/groupmod.c:233 -#, c-format +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#, fuzzy, c-format msgid "%s: error removing group entry\n" -msgstr "" +msgstr "%s: 啜怒潦颯具喋芥格湔啜柴具押潦扼\n" -#: src/groupdel.c:122 src/groupmod.c:204 -#, c-format +#: src/groupdel.c:119 src/groupmod.c:205 +#, fuzzy, c-format msgid "%s: error removing group dbm entry\n" -msgstr "" +msgstr "%s: 嫘胯潦DBM具喋芸扎柴具押潦扼\n" -#: src/groupdel.c:137 -#, c-format +#: src/groupdel.c:135 +#, fuzzy, c-format msgid "%s: error removing shadow group entry\n" -msgstr "" +msgstr "%s: 瑯艾颯嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/groupdel.c:150 src/groupmod.c:254 -#, c-format +#: src/groupdel.c:149 src/groupmod.c:255 +#, fuzzy, c-format msgid "%s: error removing shadow group dbm entry\n" -msgstr "" +msgstr "%s: 瑯艾嫘胯潦 DBM具喋 桀扎柴具押墦n" -#. -#. * Can't remove the group. -#. -#: src/groupdel.c:254 -#, c-format +#: src/groupdel.c:255 +#, fuzzy, c-format msgid "%s: cannot remove user's primary group.\n" -msgstr "" +msgstr "%s: DBM啜怒潦颯具喋芥湔啜扼整\n" -#: src/groupdel.c:355 src/groupmod.c:550 +#: src/groupdel.c:359 src/groupmod.c:551 #, c-format msgid "%s: group %s does not exist\n" -msgstr "%s: %s弘伙□皿 反繡箕仄引六氏\n" +msgstr "%s: %s啜怒潦 臬具整\n" -#: src/groupdel.c:369 src/groupmod.c:566 +#: src/groupdel.c:373 src/groupmod.c:567 #, c-format msgid "%s: group %s is a NIS group\n" -msgstr "%s: %s弘伙□皿反 NIS 及弘伙□皿匹允\n" +msgstr "%s: %s啜怒潦 NIS 柴啜怒潦扼\n" -#: src/groupdel.c:375 src/groupmod.c:571 src/userdel.c:776 src/usermod.c:1045 +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 #, c-format msgid "%s: %s is the NIS master\n" -msgstr "%s: %s 反 NIS 穴旦正□匹允\n" +msgstr "%s: %s NIS 嫘踴潦扼\n" #: src/groupmems.c:95 msgid "Member already exists\n" @@ -1008,7 +909,7 @@ msgid "Member to remove could not be found\n" msgstr "" #: src/groupmems.c:158 -msgid "usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" msgstr "" #: src/groupmems.c:201 @@ -1026,56 +927,56 @@ msgstr "" #: src/groupmems.c:215 #, fuzzy msgid "Unable to lock group file\n" -msgstr "弘伙□皿’白央奶伙毛伕永弁匹五引六氏\n" +msgstr "啜怒潦颯∼扎怒准胯扼整\n" #: src/groupmems.c:220 #, fuzzy msgid "Unable to open group file\n" -msgstr "弘伙□皿白央奶伙毛釩仃引六氏\n" +msgstr "啜怒潦∼扎怒整\n" #: src/groupmems.c:240 #, fuzzy msgid "Cannot close group file\n" -msgstr "弘伙□皿’白央奶伙毛釩仃引六氏\n" +msgstr "啜怒潦颯∼扎怒整\n" -#: src/groupmod.c:103 -msgid "usage: groupmod [-g gid [-o]] [-n name] group\n" -msgstr "銀迕芊: groupmod [-g 弘伙□皿ID [-o]] [-n 抩蟆] 弘伙□皿\n" +#: src/groupmod.c:104 +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "雿輻冽: groupmod [-g 啜怒潦ID [-o]] [-n ] 啜怒潦\n" -#: src/groupmod.c:161 +#: src/groupmod.c:162 #, c-format msgid "%s: %s not found in /etc/group\n" -msgstr "%s: /etc/group卞 %s 互葦尥井曰引六氏\n" +msgstr "%s: /etc/group %s 閬隞整\n" -#: src/groupmod.c:247 +#: src/groupmod.c:248 #, c-format msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: 蕙筋DBM扑乓玉它’弘伙□皿’巨件玄伉毛馨笛匹五引六氏\n" +msgstr "%s: 啗DBM瑯艾颯啜怒潦颯具喋芥餈賢扼整\n" -#: src/groupmod.c:300 +#: src/groupmod.c:301 #, c-format msgid "%s: %u is not a unique gid\n" -msgstr "%s: %u 反弘伙□皿ID互褐呁仄化中引允\n" +msgstr "%s: %u 胯啜怒潦ID銴艾整\n" -#: src/groupmod.c:330 +#: src/groupmod.c:331 #, c-format msgid "%s: %s is not a unique name\n" -msgstr "%s: %s 反抩蟆互褐呁仄化中引允\n" +msgstr "%s: %s 臬銴艾整\n" #: src/groups.c:59 #, c-format msgid "unknown user %s\n" -msgstr "尕抸卅交□扒匹允 %s\n" +msgstr "銝芥艾潦嗚扼 %s\n" #: src/grpck.c:87 #, c-format msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" -msgstr "銀迕芊: %s [-r] [-s] [弘伙□皿 [弘伙□皿扑乓玉它]]\n" +msgstr "雿輻冽: %s [-r] [-s] [啜怒潦 [啜怒潦瑯因]\n" #: src/grpck.c:90 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" -msgstr "銀迕芊: %s [-r] [-s] [弘伙□皿]\n" +msgstr "雿輻冽: %s [-r] [-s] [啜怒潦]\n" #: src/grpck.c:108 src/pwck.c:108 msgid "No" @@ -1089,288 +990,257 @@ msgstr "" #: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s: 白央奶伙 %s 毛伕永弁匹五引六氏\n" +msgstr "%s: ∼扎 %s 准胯扼整\n" #: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:202 src/pwck.c:242 #: src/pwck.c:251 #, c-format msgid "%s: cannot open file %s\n" -msgstr "%s: 白央奶伙 %s 毛釩仃引六氏\n" +msgstr "%s: ∼扎 %s 整\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:311 msgid "invalid group file entry\n" -msgstr "尕懇卅弘伙□皿’白央奶伙及巨件玄伉匹允\n" +msgstr "銝甇芥啜怒潦颯∼扎怒柴具喋芥扼\n" #: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 #: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 #: src/pwck.c:543 #, c-format msgid "delete line `%s'? " -msgstr "`%s'墊毛綽輪仄引允井? " +msgstr "`%s'銵扎整? " -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:374 msgid "duplicate group entry\n" -msgstr "弘伙□皿巨件玄伉互褐呁仄化中引允\n" +msgstr "啜怒潦具喋芥銴艾整\n" #: src/grpck.c:391 #, c-format msgid "invalid group name `%s'\n" -msgstr "尕懇卅弘伙□皿抩 `%s' 匹允\n" +msgstr "銝甇芥啜怒潦 `%s' 扼\n" #: src/grpck.c:418 #, c-format msgid "group %s: no user %s\n" -msgstr "弘伙□皿 %s: 交□扒 %s 反中引六氏\n" +msgstr "啜怒潦 %s: 艾潦 %s 胯整\n" #: src/grpck.c:420 src/grpck.c:590 #, c-format msgid "delete member `%s'? " -msgstr "丟件田□ `%s' 毛綽輪仄引允井? " +msgstr "∼喋 `%s' 扎整? " -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:457 msgid "invalid shadow group file entry\n" -msgstr "扑乓玉它’弘伙□皿’白央奶伙’巨件玄伉互尕懇匹允\n" +msgstr "瑯艾颯啜怒潦颯∼扎怒颯具喋芥銝甇扼\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:520 msgid "duplicate shadow group entry\n" -msgstr "弘伙□皿巨件玄伉互褐呁仄化中引允\n" +msgstr "啜怒潦具喋芥銴艾整\n" #: src/grpck.c:537 msgid "no matching group file entry\n" -msgstr "弘伙□皿白央奶伙巨件玄伉午域譙仄引六氏\n" +msgstr "啜怒潦∼扎怒具喋芥其氬整\n" #: src/grpck.c:558 -#, c-format +#, fuzzy, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "" +msgstr "啜怒潦 %s: 艾潦 %s 胯整\n" #: src/grpck.c:560 -#, c-format +#, fuzzy, c-format msgid "delete administrative member `%s'? " -msgstr "" +msgstr "∼喋 `%s' 扎整? " #: src/grpck.c:588 -#, c-format +#, fuzzy, c-format msgid "shadow group %s: no user %s\n" -msgstr "" +msgstr "啜怒潦 %s: 艾潦 %s 胯整\n" #: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 -#, c-format +#, fuzzy, c-format msgid "%s: cannot update file %s\n" -msgstr "" +msgstr "%s: ∼扎 %s 整\n" #: src/grpck.c:647 src/pwck.c:612 -#, c-format +#, fuzzy, c-format msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "" +msgstr "%s: ∼扎怒舀湔啜整\n" #: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 #, c-format msgid "%s: no changes\n" -msgstr "%s: 庍凳反丐曰引六氏\n" +msgstr "%s: 憭氬胯整\n" #: src/grpck.c:651 src/pwck.c:616 #, c-format msgid "%s: the files have been updated\n" -msgstr "%s: 白央奶伙反凳蕙今木引仄凶\n" +msgstr "%s: ∼扎怒舀湔啜整\n" #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" -msgstr "%s: 弘伙□皿’白央奶伙毛伕永弁匹五引六氏\n" +msgstr "%s: 啜怒潦颯∼扎怒准胯扼整\n" #: src/grpconv.c:65 src/grpunconv.c:61 #, c-format msgid "%s: can't open group file\n" -msgstr "%s: 弘伙□皿白央奶伙毛釩仃引六氏\n" +msgstr "%s: 啜怒潦∼扎怒整\n" #: src/grpconv.c:70 src/grpunconv.c:66 #, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: 扑乓玉它’弘伙□皿’白央奶伙毛伕永弁匹五引六氏\n" +msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒准胯扼整\n" #: src/grpconv.c:76 src/grpunconv.c:72 #, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: 扑乓玉它’弘伙□皿’白央奶伙互釩仃引六氏\n" +msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" #: src/grpconv.c:94 #, c-format msgid "%s: can't remove shadow group %s\n" -msgstr "%s: 扑乓玉它’弘伙□皿 %s 毛綽輪匹五引六氏\n" +msgstr "%s: 瑯艾颯啜怒潦 %s 扎扼整\n" -#: src/grpconv.c:138 src/pwconv.c:153 +#: src/grpconv.c:133 src/pwconv.c:154 #, c-format msgid "%s: can't update shadow entry for %s\n" -msgstr "%s: %s 及扑乓玉它’巨件玄伉毛凳蕙匹五引六氏\n" +msgstr "%s: %s 柴瑯艾颯具喋芥湔啜扼整\n" -#: src/grpconv.c:148 src/grpunconv.c:91 +#: src/grpconv.c:143 src/grpunconv.c:91 #, c-format msgid "%s: can't update entry for group %s\n" -msgstr "%s: 弘伙□皿 %s 及巨件玄伉毛凳蕙匹五引六氏\n" +msgstr "%s: 啜怒潦 %s 柴具喋芥湔啜扼整\n" -#: src/grpconv.c:155 src/grpunconv.c:99 +#: src/grpconv.c:150 src/grpunconv.c:99 #, c-format msgid "%s: can't update shadow group file\n" -msgstr "%s: 扑乓玉它’弘伙□皿’白央奶伙毛凳蕙匹五引六氏\n" +msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒湔啜扼整\n" -#: src/grpconv.c:160 src/grpunconv.c:105 +#: src/grpconv.c:155 src/grpunconv.c:105 #, c-format msgid "%s: can't update group file\n" -msgstr "%s: 弘伙□皿’白央奶伙毛凳蕙匹五引六氏\n" - -#: src/grpconv.c:175 src/grpunconv.c:127 -#, c-format -msgid "%s: not configured for shadow group support.\n" -msgstr "%s: 扑乓玉它’弘伙□皿’扔禾□玄迕卞澀爛今木化中引六氏\n" +msgstr "%s: 啜怒潦颯∼扎怒湔啜扼整\n" #: src/grpunconv.c:110 #, c-format msgid "%s: can't delete shadow group file\n" -msgstr "%s: 弘伙□皿’白央奶伙毛綽輪匹五引六氏\n" +msgstr "%s: 啜怒潦颯∼扎怒扎扼整\n" #: src/id.c:53 -msgid "usage: id [-a]\n" -msgstr "銀迕芊: id [-a]\n" +msgid "Usage: id [-a]\n" +msgstr "雿輻冽: id [-a]\n" #: src/id.c:55 -msgid "usage: id\n" -msgstr "銀迕芊: id\n" +msgid "Usage: id\n" +msgstr "雿輻冽: id\n" -#. -#. * Start off the group message. It will be of the format -#. * -#. * groups=###(aaa),###(aaa),###(aaa) -#. * -#. * where "###" is a numerical value and "aaa" is the -#. * corresponding name for each respective numerical value. -#. #: src/id.c:169 msgid " groups=" -msgstr " 弘伙□皿=" +msgstr " 啜怒潦=" #: src/lastlog.c:110 src/lastlog.c:116 #, c-format -msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n" +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" msgstr "" #: src/lastlog.c:181 msgid "Username Port From Latest\n" -msgstr "交□扒抩 禾□玄 樺赭 瘉嗤及伕弘奶件\n" +msgstr "艾潦嗅 潦 湔 餈柴准啜扎許n" #: src/lastlog.c:183 msgid "Username Port Latest\n" -msgstr "交□扒抩 禾□玄 瘉嗤及伕弘奶件\n" +msgstr "艾潦嗅 潦 餈柴准啜扎許n" -#: src/lastlog.c:197 +#: src/lastlog.c:198 msgid "**Never logged in**" -msgstr "**域蘸手伕弘奶件反丐曰引六氏**" +msgstr "**銝摨艾准啜扎喋胯整**" -#: src/login.c:185 +#: src/login.c:175 #, c-format -msgid "usage: %s [-p] [name]\n" -msgstr "銀迕芊: %s [-p] [交□扒抩]\n" +msgid "Usage: %s [-p] [name]\n" +msgstr "雿輻冽: %s [-p] [艾潦嗅]\n" -#: src/login.c:188 +#: src/login.c:178 #, c-format msgid " %s [-p] [-h host] [-f name]\n" -msgstr " %s [-p] [-h 石旦玄] [-f 交□扒抩]\n" +msgstr " %s [-p] [-h 嫘] [-f 艾潦嗅]\n" -#: src/login.c:190 +#: src/login.c:180 #, c-format msgid " %s [-p] -r host\n" -msgstr " %s [-p] -r 石旦玄\n" +msgstr " %s [-p] -r 嫘\n" -#: src/login.c:274 +#: src/login.c:259 msgid "Invalid login time\n" -msgstr "伕弘奶件凜棉互尕懇匹允\n" +msgstr "准啜扎單銝甇扼\n" -#: src/login.c:329 +#: src/login.c:314 msgid "" "\n" "System closed for routine maintenance\n" msgstr "" "\n" -"扑旦氾丞反丟件氾瓜件旦伙□民件卞覆仄化岉元引仄凶\n" +"瑯嫘胯∼喋喋嫘怒潦喋怠紋阡整\n" -#: src/login.c:340 +#: src/login.c:325 msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" -#: src/login.c:377 +#: src/login.c:362 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" -"\n" -"%s卍詨及伕弘奶件’正奶丞孺蜃匹允.\n" -#: src/login.c:689 +#: src/login.c:648 #, c-format msgid " on `%.100s' from `%.200s'" msgstr "" -#: src/login.c:693 +#: src/login.c:652 #, c-format msgid " on `%.100s'" msgstr "" -#: src/login.c:852 +#: src/login.c:811 #, c-format msgid "" "\n" "%s login: " msgstr "" "\n" -"%s 伕弘奶件: " +"%s 准啜扎: " -#: src/login.c:855 +#: src/login.c:814 msgid "login: " -msgstr "伕弘奶件: " +msgstr "准啜扎: " -#: src/login.c:1071 src/sulogin.c:233 +#: src/login.c:1013 src/sulogin.c:205 msgid "Login incorrect" -msgstr "伕弘奶件互啜中引允" +msgstr "准啜扎喋整" -#: src/login.c:1265 +#: src/login.c:1193 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" -#: src/login.c:1278 +#: src/login.c:1207 #, c-format msgid "Last login: %s on %s" -msgstr "瘉嗤及伕弘奶件: %s on %s" +msgstr "餈柴准啜扎: %s on %s" -#: src/login.c:1281 +#: src/login.c:1210 #, c-format msgid "Last login: %.19s on %s" -msgstr "瘉嗤及伕弘奶件: %.19s on %s" +msgstr "餈柴准啜扎: %.19s on %s" -#: src/login.c:1287 +#: src/login.c:1216 #, c-format msgid " from %.*s" -msgstr " 樺赭 %.*s" +msgstr " 湔 %.*s" -#: src/login.c:1364 +#: src/login.c:1293 msgid "Starting rad_login\n" msgstr "" @@ -1380,14 +1250,14 @@ msgid "%s: no DBM database on system - no action performed\n" msgstr "" #: src/mkpasswd.c:232 src/mkpasswd.c:237 -#, c-format +#, fuzzy, c-format msgid "%s: cannot overwrite file %s\n" -msgstr "" +msgstr "%s: ∼扎 %s 整\n" #: src/mkpasswd.c:252 -#, c-format +#, fuzzy, c-format msgid "%s: cannot open DBM files for %s\n" -msgstr "" +msgstr "%s: ∼扎 %s 整\n" #: src/mkpasswd.c:287 #, c-format @@ -1397,12 +1267,12 @@ msgstr "" #: src/mkpasswd.c:288 #, fuzzy msgid " is too long\n" -msgstr " ェ恘ま芢互贏聊亢引允\n" +msgstr " 亙摰嫘琿整\n" #: src/mkpasswd.c:315 -#, c-format +#, fuzzy, c-format msgid "%s: error parsing line \"%s\"\n" -msgstr "" +msgstr "%s: ∼扎急湔啜柴具押潦扼\n" #: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338 msgid "adding record for name " @@ -1414,9 +1284,9 @@ msgid "\n" msgstr "" #: src/mkpasswd.c:344 src/mkpasswd.c:350 src/mkpasswd.c:355 src/mkpasswd.c:360 -#, c-format +#, fuzzy, c-format msgid "%s: error adding record for " -msgstr "" +msgstr "%s: 啗啜怒潦具喋芥貉蕭柴具押潦扼\n" #: src/mkpasswd.c:378 #, c-format @@ -1426,395 +1296,332 @@ msgstr "" #: src/mkpasswd.c:392 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" -msgstr "銀迕芊: %s [-vf] [-p|g|sp|sg] 白央奶伙\n" +msgstr "雿輻冽: %s [-vf] [-p|g|sp|sg] ∼扎俞n" #: src/mkpasswd.c:395 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" -msgstr "銀迕芊: %s [-vf] [-p|g|sp] 白央奶伙\n" +msgstr "雿輻冽: %s [-vf] [-p|g|sp] ∼扎俞n" #: src/mkpasswd.c:398 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" -msgstr "銀迕芊: %s [-vf] [-p|g] 白央奶伙\n" +msgstr "雿輻冽: %s [-vf] [-p|g] ∼扎俞n" #: src/newgrp.c:61 -msgid "usage: newgrp [-] [group]\n" -msgstr "銀迕芊: newgrp [-] [弘伙□皿]\n" +msgid "Usage: newgrp [-] [group]\n" +msgstr "雿輻冽: newgrp [-] [啜怒潦]\n" #: src/newgrp.c:63 -msgid "usage: sg group [[-c] command]\n" -msgstr "銀迕芊: sg 弘伙□皿 [[-c] 戊穴件玉]\n" +msgid "Usage: sg group [[-c] command]\n" +msgstr "雿輻冽: sg 啜怒潦 [[-c] 喋喋]\n" -#: src/newgrp.c:136 +#: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" -msgstr "尕抸卅交□扒ID匹允: %u\n" +msgstr "銝芥艾潦貂D扼: %u\n" -#: src/newgrp.c:219 +#: src/newgrp.c:214 #, c-format msgid "unknown gid: %lu\n" -msgstr "尕抸卅弘伙□皿ID匹允: %lu\n" +msgstr "銝芥啜怒潦ID扼: %lu\n" -#: src/newgrp.c:365 src/newgrp.c:374 +#: src/newgrp.c:360 src/newgrp.c:369 msgid "Sorry.\n" -msgstr "蕭仄沭仍介中引六氏.\n" +msgstr "喋閮喋整.\n" -#: src/newgrp.c:472 +#: src/newgrp.c:469 msgid "too many groups\n" -msgstr "弘伙□皿互聶允亢引允\n" +msgstr "啜怒潦憭整\n" #: src/newusers.c:78 #, c-format msgid "Usage: %s [input]\n" -msgstr "銀迕芊: %s [ェ恘]\n" +msgstr "雿輻冽: %s [亙]\n" -#: src/newusers.c:407 +#: src/newusers.c:388 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s: /etc/passwd 毛伕永弁匹五引六氏.\n" +msgstr "%s: /etc/passwd 准胯扼整.\n" -#: src/newusers.c:419 +#: src/newusers.c:400 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s: 白央奶伙毛伕永弁匹五引六氏, 詨匹手丹域蘸魂仄化仁分今中\n" +msgstr "%s: ∼扎怒准胯扼整, 敺扼銝摨西岫艾\n" -#: src/newusers.c:435 +#: src/newusers.c:416 #, c-format msgid "%s: can't open files\n" -msgstr "%s: 白央奶伙毛釩五引允\n" +msgstr "%s: ∼扎怒整\n" + +#: src/newusers.c:461 +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: %d銵: 銝甇銵扼\n" #: src/newusers.c:480 #, c-format -msgid "%s: line %d: invalid line\n" -msgstr "%s: %d墊: 尕懇墊匹允\n" - -#: src/newusers.c:499 -#, c-format msgid "%s: line %d: can't create GID\n" -msgstr "%s: %d墊: 弘伙□皿ID互綜嶽匹五引六氏\n" +msgstr "%s: %d銵: 啜怒潦ID雿扼整\n" -#: src/newusers.c:515 +#: src/newusers.c:496 #, c-format msgid "%s: line %d: can't create UID\n" -msgstr "%s: %d墊: 交□扒ID互綜嶽匹五引六氏\n" +msgstr "%s: %d銵: 艾潦貂D雿扼整\n" -#: src/newusers.c:528 +#: src/newusers.c:509 #, c-format msgid "%s: line %d: cannot find user %s\n" -msgstr "%s: %d墊: 交□扒 %s 互葦尥井曰引六氏\n" +msgstr "%s: %d銵: 艾潦 %s 閬隞整\n" -#: src/newusers.c:537 +#: src/newusers.c:518 #, c-format msgid "%s: line %d: can't update password\n" -msgstr "%s: %d墊: 由旦伐□玉毛凳蕙匹五引六氏\n" +msgstr "%s: %d銵: 嫘胯潦湔啜扼整\n" -#: src/newusers.c:555 +#: src/newusers.c:536 #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "%s: %d墊: mkdir 卞撩л仄引仄凶\n" +msgstr "%s: %d銵: mkdir 怠仃整\n" -#: src/newusers.c:561 +#: src/newusers.c:542 #, c-format msgid "%s: line %d: chown failed\n" -msgstr "%s: %d墊: chown 卞撩л仄引仄凶\n" +msgstr "%s: %d銵: chown 怠仃整\n" -#: src/newusers.c:571 +#: src/newusers.c:552 #, c-format msgid "%s: line %d: can't update entry\n" -msgstr "%s: %d墊: 巨件玄伉毛凳蕙匹五引六氏\n" +msgstr "%s: %d銵: 具喋芥湔啜扼整\n" -#: src/newusers.c:603 +#: src/newusers.c:584 #, c-format msgid "%s: error updating files\n" -msgstr "%s: 白央奶伙凳蕙及巨仿□匹允\n" +msgstr "%s: ∼扎急湔啜柴具押潦扼\n" -#: src/passwd.c:174 +#: src/passwd.c:155 #, c-format -msgid "usage: %s [-f|-s] [name]\n" -msgstr "銀迕芊: %s [-f|-s] [交□扒抩]\n" +msgid "Usage: %s [-f|-s] [name]\n" +msgstr "雿輻冽: %s [-f|-s] [艾潦嗅]\n" -#: src/passwd.c:178 +#: src/passwd.c:159 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" -msgstr " %s [-x 瘉釐] [-n 瘉凝] [-w 煞屢] [-i 拑躲] 交□扒抩\n" +msgstr " %s [-x 憭吞 [-n 撠] [-w 霅血] [-i ∪鉛 艾潦嗅\n" -#: src/passwd.c:180 +#: src/passwd.c:161 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" -msgstr " %s {-l|-u|-d|-S|-e} 交□扒抩\n" +msgstr " %s {-l|-u|-d|-S|-e} 艾潦嗅\n" -#: src/passwd.c:283 -#, c-format -msgid "User %s has a TCFS key, his old password is required.\n" -msgstr "" -"交□扒 %s 反 TCFS平□毛手勻化中引允, 公及交□扒及蛙由旦伐□玉互优邰匹允.\n" - -#: src/passwd.c:286 -msgid "You can use -t option to force the change.\n" -msgstr "雄孺讀卞庍凳毛墊丹卞反, 左皿扑亦件 -t 互优邰匹允\n" - -#: src/passwd.c:292 +#: src/passwd.c:216 msgid "Old password: " -msgstr "衙中由旦伐□玉: " +msgstr "扎嫘胯潦: " -#: src/passwd.c:301 -#, c-format +#: src/passwd.c:225 +#, fuzzy, c-format msgid "Incorrect password for `%s'\n" -msgstr "" +msgstr "%s柴嫘胯潦桀廄n" -#: src/passwd.c:314 -#, c-format -msgid "Warning: user %s has a TCFS key.\n" -msgstr "" - -#: src/passwd.c:333 +#: src/passwd.c:249 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -#: src/passwd.c:339 +#: src/passwd.c:255 msgid "New password: " -msgstr "蕙仄中由旦伐□玉: " +msgstr "啜嫘胯潦: " -#: src/passwd.c:350 +#: src/passwd.c:266 msgid "Try again.\n" -msgstr "手丹域蘸云湊中仄引允.\n" +msgstr "銝摨艾憿整.\n" -#: src/passwd.c:361 +#: src/passwd.c:277 msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"煞屢: 檀中由旦伐□玉匹允 (升丹仄化手銀丹樺寧, 手丹域蘸仇木毛ェ恘仄化仁分今" -"中).\n" +"霅血: 嫘胯潦扼 (押艾雿踴游, 銝摨艾亙艾" +").\n" -#: src/passwd.c:371 +#: src/passwd.c:287 msgid "They don't match; try again.\n" -msgstr "域譙仄引六氏: 手丹域蘸云湊中仄引允.\n" +msgstr "銝氬整: 銝摨艾憿整.\n" -#: src/passwd.c:451 src/passwd.c:469 +#: src/passwd.c:364 src/passwd.c:382 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "%s 及由旦伐□玉反庍凳匹五引六氏.\n" +msgstr "%s 柴嫘胯潦臬氬扼整.\n" -#: src/passwd.c:494 +#: src/passwd.c:396 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "蕭仄沭丐曰引六氏互, %s 及由旦伐□玉反引分庍凳允月仇午反匹五引六氏.\n" +msgstr "喋閮喋整, %s 柴嫘胯潦胯整憭氬具胯扼整.\n" -#: src/passwd.c:614 +#: src/passwd.c:479 #, c-format msgid "%s: out of memory\n" -msgstr "%s: 丟乒伉互凶曰引六氏\n" +msgstr "%s: ∼Ｕ芥整\n" -#: src/passwd.c:769 -msgid "Cannot lock the TCFS key database; try again later\n" -msgstr "TCFS平□犯□正矛□旦毛伕永弁匹五引六氏, 詨匹手丹域蘸魂仄化仁分今中.\n" - -#: src/passwd.c:777 -msgid "Cannot open the TCFS key database.\n" -msgstr "TCFS平□犯□正矛□旦毛釩仃引六氏.\n" - -#: src/passwd.c:785 -msgid "Error updating the TCFS key database.\n" -msgstr "TCFS平□犯□正矛□旦及凳蕙及巨仿□匹允.\n" - -#: src/passwd.c:792 -msgid "Cannot commit TCFS changes.\n" -msgstr "TCFS庍凳毛commit匹五引六氏.\n" - -#: src/passwd.c:975 +#: src/passwd.c:730 #, c-format msgid "%s: Cannot execute %s" -msgstr "%s: %s毛撢墊匹五引六氏" +msgstr "%s: %s摰銵扼整" -#: src/passwd.c:1077 +#: src/passwd.c:815 #, c-format msgid "%s: repository %s not supported\n" -msgstr "%s: 伊禾斥玄伉 %s 反扔禾□玄仄化中引六氏\n" +msgstr "%s: 研詻 %s 胯萸潦艾整\n" -#: src/passwd.c:1152 +#: src/passwd.c:890 #, c-format msgid "%s: Permission denied\n" -msgstr "%s: 腺蜃互丐曰引六氏\n" +msgstr "%s: 璅拚整\n" -#: src/passwd.c:1176 +#: src/passwd.c:914 #, c-format msgid "You may not change the password for %s.\n" -msgstr "丐卅凶反 %s 及由旦伐□玉毛庍凳允月仇午反匹五引六氏.\n" +msgstr "芥 %s 柴嫘胯潦憭氬具胯扼整.\n" -#: src/passwd.c:1242 +#: src/passwd.c:962 #, c-format msgid "Changing password for %s\n" -msgstr "%s及由旦伐□玉及庍凳\n" +msgstr "%s柴嫘胯潦桀廄n" -#: src/passwd.c:1246 +#: src/passwd.c:966 #, c-format msgid "The password for %s is unchanged.\n" -msgstr "%s及由旦伐□玉反庍凳今木引六氏.\n" +msgstr "%s柴嫘胯潦臬氬整.\n" -#: src/passwd.c:1297 +#: src/passwd.c:1016 msgid "Password changed.\n" -msgstr "由旦伐□玉反庍凳今木引仄凶.\n" +msgstr "嫘胯潦臬氬整.\n" #: src/pwck.c:87 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" -msgstr "銀迕: %s [-q] [-r] [-s] [由旦伐□玉 [扑乓玉它]]\n" +msgstr "雿輻: %s [-q] [-r] [-s] [嫘胯潦 [瑯因]\n" #: src/pwck.c:90 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" -msgstr "銀迕: %s [-q] [-r] [-s] [由旦伐□玉]\n" +msgstr "雿輻: %s [-q] [-r] [-s] [嫘胯潦]\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:295 msgid "invalid password file entry\n" -msgstr "由旦伐□玉’白央奶伙’巨件玄伉互尕懇匹允\n" +msgstr "嫘胯潦颯∼扎怒颯具喋芥銝甇扼\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:357 msgid "duplicate password entry\n" -msgstr "由旦伐□玉巨件玄伉互褐呁仄化中引允\n" +msgstr "嫘胯潦具喋芥銴艾整\n" #: src/pwck.c:373 #, c-format msgid "invalid user name '%s'\n" -msgstr "尕懇卅交□扒抩'%s' 匹允\n" +msgstr "銝甇芥艾潦嗅'%s' 扼\n" -#. -#. * No primary group, just give a warning -#. #: src/pwck.c:388 #, c-format msgid "user %s: no group %u\n" -msgstr "交□扒 %s: 弘伙□皿 %u 互丐曰引六氏\n" +msgstr "艾潦 %s: 啜怒潦 %u 整\n" #: src/pwck.c:404 #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "交□扒 %s: 犯奴伊弁玄伉 %s 互繡箕仄引六氏\n" +msgstr "艾潦 %s: 研胯 %s 摮具整\n" -#. -#. * Login shell doesn't exist, give a warning -#. #: src/pwck.c:420 #, c-format msgid "user %s: program %s does not exist\n" -msgstr "交□扒 %s: 皿伕弘仿丞 %s 反繡箕仄引六氏\n" +msgstr "艾潦 %s: 准啜押 %s 臬具整\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:456 msgid "invalid shadow password file entry\n" -msgstr "尕懇卅扑乓玉它’由旦伐□玉’巨件玄伉匹允\n" +msgstr "銝甇芥瑯艾颯嫘胯潦颯具喋芥扼\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:518 msgid "duplicate shadow password entry\n" -msgstr "扑乓玉它’由旦伐□玉’巨件玄伉互褐呁仄化中引允\n" +msgstr "瑯艾颯嫘胯潦颯具喋芥銴艾整\n" -#. -#. * Tell the user this entry has no matching -#. * /etc/passwd entry and ask them to delete it. -#. #: src/pwck.c:542 msgid "no matching password file entry\n" -msgstr "由旦伐□玉’白央奶伙’巨件玄伉午域譙仄引六氏\n" +msgstr "嫘胯潦颯∼扎怒颯具喋芥其氬整\n" #: src/pwck.c:560 #, c-format msgid "user %s: last password change in the future\n" -msgstr "交□扒 %s: 瘉詨及由旦伐□玉庍凳互怳侳卞丐曰引允\n" +msgstr "艾潦 %s: 敺柴嫘胯潦憭氬芣乓怒整\n" -#: src/pwconv.c:84 src/pwunconv.c:93 +#: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s: 由旦伐□玉白央奶伙毛伕永弁匹五引六氏\n" +msgstr "%s: 嫘胯潦∼扎怒准胯扼整\n" -#: src/pwconv.c:89 src/pwunconv.c:98 +#: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s: 由旦伐□玉白央奶伙毛釩仃引六氏\n" +msgstr "%s: 嫘胯潦∼扎怒整\n" -#: src/pwconv.c:117 +#: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "%s: %s及扑乓玉它’巨件玄伉毛綽輪匹五引六氏\n" +msgstr "%s: %s柴瑯艾颯具喋芥扎扼整\n" -#: src/pwconv.c:163 +#: src/pwconv.c:164 #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "%s: %s及由旦伐□玉巨件玄伉毛凳蕙匹五引六氏\n" +msgstr "%s: %s柴嫘胯潦具喋芥湔啜扼整\n" -#: src/pwconv.c:170 +#: src/pwconv.c:171 #, c-format msgid "%s: can't update shadow file\n" -msgstr "%s: 扑乓玉它白央奶伙毛凳蕙匹五引六氏\n" +msgstr "%s: 瑯艾∼扎怒湔啜扼整\n" -#: src/pwconv.c:175 +#: src/pwconv.c:176 #, c-format msgid "%s: can't update passwd file\n" -msgstr "%s: 由旦伐□玉白央奶伙毛凳蕙匹五引六氏\n" +msgstr "%s: 嫘胯潦∼扎怒湔啜扼整\n" -#: src/pwunconv.c:50 -#, c-format -msgid "%s: Shadow passwords are not configured.\n" -msgstr "%s: 扑乓玉它由旦伐□玉互澀爛今木化中引六氏.\n" - -#: src/pwunconv.c:160 +#: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s: 交□扒 %s 及巨件玄伉毛凳蕙匹五引六氏\n" +msgstr "%s: 艾潦 %s 柴具喋芥湔啜扼整\n" -#: src/pwunconv.c:181 +#: src/pwunconv.c:145 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s: 扑乓玉它’由旦伐□玉’白央奶伙毛綽輪匹五引六氏\n" +msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒扎扼整\n" #: src/su.c:133 msgid "Sorry." -msgstr "蕭仄沭仍介中引六氏." +msgstr "喋閮喋整." #: src/su.c:216 #, c-format msgid "%s: must be run from a terminal\n" -msgstr "%s: 羹坱曉井日撢墊仄化仁分今中\n" +msgstr "%s: 蝡舀思摰銵艾\n" #: src/su.c:306 #, c-format msgid "%s: pam_start: error %d\n" -msgstr "%s: pam_start: 巨仿□ %d\n" +msgstr "%s: pam_start: 具押 %d\n" #: src/su.c:336 #, c-format msgid "Unknown id: %s\n" -msgstr "尕抸卅 ID匹允: %s\n" +msgstr "銝 ID扼: %s\n" #: src/su.c:373 src/su.c:390 #, c-format msgid "You are not authorized to su %s\n" -msgstr "丐卅凶反 su %s 卞ロ據匹五引六氏匹仄凶\n" +msgstr "芥 su %s 怨閮潦扼整扼\n" -#. require own password #: src/su.c:385 msgid "(Enter your own password.)" -msgstr "(丐卅凶憤褥及由旦伐□玉毛ェ恘仄化仁分今中.)" +msgstr "(芥芾澈柴嫘胯潦亙艾.)" #: src/su.c:419 #, c-format @@ -1823,608 +1630,664 @@ msgid "" "(Ignored)\n" msgstr "" "%s: %s\n" -"(拑躲)\n" +"(∪)\n" -#: src/su.c:626 +#: src/su.c:609 msgid "No shell\n" -msgstr "扑尼伙互丐曰引六氏\n" +msgstr "瑯扼怒整\n" -#: src/suauth.c:100 +#: src/suauth.c:105 msgid "Access to su to that account DENIED.\n" -msgstr "su匹仇及失市它件玄尺失弁本旦允月仇午毛蛐搕竣鴗牏楔.\n" +msgstr "su扼柴Ｕ怒艾喋詻Ｕ胯颯嫘具艾整.\n" -#: src/suauth.c:107 +#: src/suauth.c:113 msgid "Password authentication bypassed.\n" -msgstr "田奶田旦卞方勻化由旦伐□玉毛ロ據仄引允.\n" +msgstr "扎嫘怒艾嫘胯潦隤閮潦整.\n" -#: src/suauth.c:114 +#: src/suauth.c:122 msgid "Please enter your OWN password as authentication.\n" -msgstr "ロ據午仄化, 丐卅凶赭肣及由旦伐□玉毛ェ恘仄化仁分今中.\n" +msgstr "隤閮潦具, 芥柴嫘胯潦亙艾.\n" -#. must be a password file! -#: src/sulogin.c:132 +#: src/sulogin.c:118 msgid "No password file\n" -msgstr "由旦伐□玉白央奶伙互丐曰引六氏\n" +msgstr "嫘胯潦∼扎怒整\n" -#. -#. * Fail secure -#. -#: src/sulogin.c:174 +#: src/sulogin.c:160 msgid "No password entry for 'root'\n" -msgstr "'root'及由旦伐□玉巨件玄伉互丐曰引六氏\n" +msgstr "'root'柴嫘胯潦具喋芥整\n" -#: src/sulogin.c:190 +#: src/sulogin.c:176 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" -#. make new environment active -#: src/sulogin.c:243 +#: src/sulogin.c:212 msgid "Entering System Maintenance Mode\n" -msgstr "扑旦氾丞丟件氾瓜件旦乒□玉尺ェ曰引允\n" +msgstr "瑯嫘∼喋喋嫘Ｕ潦詨乓整\n" -#: src/useradd.c:251 -#, c-format +#: src/useradd.c:234 +#, fuzzy, c-format msgid "%s: rebuild the group database\n" -msgstr "" +msgstr "%s: 啜怒潦 %s 臭拙扼\n" -#: src/useradd.c:260 -#, c-format +#: src/useradd.c:243 +#, fuzzy, c-format msgid "%s: rebuild the shadow group database\n" -msgstr "" +msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" -#: src/useradd.c:295 src/useradd.c:309 src/usermod.c:981 src/usermod.c:995 -#, c-format +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 +#, fuzzy, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "" +msgstr "%s: 喋∼喋 `%s' 臭甇扼\n" -#: src/useradd.c:365 +#: src/useradd.c:349 #, c-format msgid "%s: unknown gid %s\n" -msgstr "%s: 尕抸卅弘伙□皿ID %s\n" +msgstr "%s: 銝芥啜怒潦ID %s\n" -#: src/useradd.c:373 src/useradd.c:676 src/useradd.c:1269 src/usermod.c:260 -#: src/usermod.c:1128 +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 #, c-format msgid "%s: unknown group %s\n" -msgstr "%s: 尕抸卅弘伙□皿 %s\n" +msgstr "%s: 銝芥啜怒潦 %s\n" -#: src/useradd.c:440 -#, c-format -msgid "group=%s,%u basedir=%s skel=%s\n" -msgstr "弘伙□皿=%s,%u 矛□旦犯奴伊弁玄伉=%s 鋸滇=%s\n" - -#: src/useradd.c:444 -#, c-format -msgid "shell=%s " -msgstr "扑尼伙=%s " - -#: src/useradd.c:446 -#, c-format -msgid "inactive=%ld expire=%s" -msgstr "" - -#: src/useradd.c:450 +#: src/useradd.c:419 #, c-format msgid "GROUP=%u\n" msgstr "" -#: src/useradd.c:451 +#: src/useradd.c:420 #, c-format msgid "HOME=%s\n" msgstr "" -#: src/useradd.c:453 +#: src/useradd.c:422 #, c-format msgid "INACTIVE=%ld\n" msgstr "" -#: src/useradd.c:454 +#: src/useradd.c:423 #, c-format msgid "EXPIRE=%s\n" msgstr "" -#: src/useradd.c:456 +#: src/useradd.c:425 #, c-format msgid "SHELL=%s\n" msgstr "" -#: src/useradd.c:457 +#: src/useradd.c:426 #, c-format msgid "SKEL=%s\n" msgstr "" -#: src/useradd.c:498 -#, c-format +#: src/useradd.c:462 +#, fuzzy, c-format msgid "%s: cannot create new defaults file\n" -msgstr "" +msgstr "%s: 啜怒潦颯∼扎怒整\n" -#: src/useradd.c:503 +#: src/useradd.c:467 #, fuzzy, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: 弘伙□皿’白央奶伙毛釩仃引六氏\n" +msgstr "%s: 啜怒潦颯∼扎怒整\n" -#: src/useradd.c:596 src/useradd.c:608 -#, c-format +#: src/useradd.c:552 src/useradd.c:564 +#, fuzzy, c-format msgid "%s: rename: %s" -msgstr "" +msgstr "%s: %s雿扼整" -#: src/useradd.c:697 src/usermod.c:281 -#, c-format +#: src/useradd.c:657 src/usermod.c:265 +#, fuzzy, c-format msgid "%s: group `%s' is a NIS group.\n" -msgstr "" +msgstr "%s: %s啜怒潦 NIS 柴啜怒潦扼\n" -#: src/useradd.c:706 src/usermod.c:290 +#: src/useradd.c:666 src/usermod.c:274 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "" -#: src/useradd.c:738 src/usermod.c:322 -#, c-format -msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" -msgstr "銀迕芊: %s\t[-u 交□扒ID [-o]] [-g 弘伙□皿] [-G 弘伙□皿,...] \n" +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "雿輻冽: useradd [-u 艾潦貂D [-o]] [-g 啜怒潦] [-G 啜怒潦,...] \n" -#: src/useradd.c:742 -msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" -msgstr "\t\t[-d 石□丞] [-s 扑尼伙] [-c 戊丟件玄] [-m [-k 氾件皿伊□玄]]\n" +#: src/useradd.c:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" +msgstr "" +" [-d 潦] [-s 瑯扼侷 [-c 喋∼喋]\n" +" [-m [-k 喋研潦]]\n" -#: src/useradd.c:745 src/usermod.c:329 -msgid "[-f inactive] [-e expire ] " -msgstr "[-f 拑躲ゥ醒] [-e 渝蜃濠木ゥ] " +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" +msgstr " [-f ∪寞交財 [-e 包\n" -#: src/useradd.c:748 -msgid "[-A program] " -msgstr "[-A 皿伕弘仿丞] " +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" +msgstr " useradd -D [-g 啜怒潦] [-b 潦鉛 [-s 瑯扼侷\n" -#: src/useradd.c:750 -msgid "[-p passwd] name\n" -msgstr "[-p 由旦伐□玉] 交□扒抩\n" - -#: src/useradd.c:753 -#, c-format -msgid " %s\t-D [-g group] [-b base] [-s shell]\n" -msgstr " %s\t-D [-g 弘伙□皿] [-b 矛□旦] [-s 扑尼伙]\n" - -#: src/useradd.c:756 -msgid "\t\t[-f inactive] [-e expire ]\n" -msgstr "\t\t[-f 拑躲ゥ醒] [-e 渝蜃濠木ゥ]\n" - -#: src/useradd.c:850 src/usermod.c:480 -#, c-format +#: src/useradd.c:793 src/usermod.c:461 +#, fuzzy, c-format msgid "%s: error locking group file\n" -msgstr "" +msgstr "%s: 啜怒潦颯∼扎怒准胯扼整\n" -#: src/useradd.c:855 src/usermod.c:486 -#, c-format +#: src/useradd.c:798 src/usermod.c:467 +#, fuzzy, c-format msgid "%s: error opening group file\n" -msgstr "" +msgstr "%s: 啜怒潦颯∼扎怒整\n" -#: src/useradd.c:862 src/usermod.c:597 -#, c-format +#: src/useradd.c:805 src/usermod.c:578 +#, fuzzy, c-format msgid "%s: error locking shadow group file\n" -msgstr "" +msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒准胯扼整\n" -#: src/useradd.c:867 src/usermod.c:603 -#, c-format +#: src/useradd.c:810 src/usermod.c:584 +#, fuzzy, c-format msgid "%s: error opening shadow group file\n" -msgstr "" +msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" -#: src/useradd.c:1039 +#: src/useradd.c:982 #, c-format msgid "%s: uid %u is not unique\n" -msgstr "%s: 交□扒ID %u 互褐呁仄化中引允\n" +msgstr "%s: 艾潦貂D %u 銴艾整\n" -#: src/useradd.c:1069 +#: src/useradd.c:1012 #, c-format msgid "%s: can't get unique uid\n" -msgstr "%s: 域啦及交□扒ID毛潸ぜ匹五引六氏\n" +msgstr "%s: 銝柴艾潦貂D敺扼整\n" -#: src/useradd.c:1174 src/useradd.c:1325 src/usermod.c:1075 src/usermod.c:1086 -#: src/usermod.c:1096 src/usermod.c:1143 src/usermod.c:1187 -#, c-format -msgid "%s: invalid field `%s'\n" -msgstr "" - -#: src/useradd.c:1189 +#: src/useradd.c:1049 #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s: 矛□旦犯奴伊弁玄伉 `%s' 反尕懇匹允\n" +msgstr "%s: 潦嫘研胯 `%s' 臭甇扼\n" -#: src/useradd.c:1199 +#: src/useradd.c:1059 #, c-format msgid "%s: invalid comment `%s'\n" -msgstr "%s: 戊丟件玄 `%s' 反尕懇匹允\n" +msgstr "%s: 喋∼喋 `%s' 臭甇扼\n" -#: src/useradd.c:1210 +#: src/useradd.c:1070 #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s: 石□丞犯奴伊弁玄伉 `%s' 反尕懇匹允\n" +msgstr "%s: 潦研胯 `%s' 臭甇扼\n" -#: src/useradd.c:1229 src/usermod.c:1110 +#: src/useradd.c:1089 src/usermod.c:858 #, c-format msgid "%s: invalid date `%s'\n" -msgstr "%s: ゥ尥 `%s' 反尕懇匹允\n" +msgstr "%s: 乩 `%s' 臭甇扼\n" -#: src/useradd.c:1242 -#, c-format +#: src/useradd.c:1102 +#, fuzzy, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "" +msgstr "%s: 瑯艾颯嫘胯潦怒 -e -e 敹閬扼\n" -#: src/useradd.c:1258 -#, c-format +#: src/useradd.c:1118 +#, fuzzy, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "" +msgstr "%s: 瑯艾颯嫘胯潦怒 -e -e 敹閬扼\n" -#: src/useradd.c:1336 +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, fuzzy, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: 瑯扼 `%s' 臭甇扼\n" + +#: src/useradd.c:1196 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s: 扑尼伙 `%s' 反尕懇匹允\n" +msgstr "%s: 瑯扼 `%s' 臭甇扼\n" -#: src/useradd.c:1377 -#, c-format +#: src/useradd.c:1237 +#, fuzzy, c-format msgid "%s: invalid user name '%s'\n" -msgstr "" +msgstr "銝甇芥艾潦嗅'%s' 扼\n" -#: src/useradd.c:1413 src/userdel.c:298 src/usermod.c:1255 -#, c-format +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 +#, fuzzy, c-format msgid "%s: cannot rewrite password file\n" -msgstr "" +msgstr "%s: 嫘胯潦颯∼扎怒銝詻扼整\n" -#: src/useradd.c:1420 src/userdel.c:303 src/usermod.c:1262 -#, c-format +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 +#, fuzzy, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "" +msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒扎扼整\n" -#: src/useradd.c:1461 src/userdel.c:367 src/usermod.c:1296 -#, c-format +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 +#, fuzzy, c-format msgid "%s: unable to lock password file\n" -msgstr "" +msgstr "%s: 嫘胯潦∼扎怒准胯扼整\n" -#: src/useradd.c:1466 src/userdel.c:372 src/usermod.c:1301 -#, c-format +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 +#, fuzzy, c-format msgid "%s: unable to open password file\n" -msgstr "" +msgstr "%s: 嫘胯潦∼扎怒整\n" -#: src/useradd.c:1474 src/userdel.c:379 src/usermod.c:1308 -#, c-format +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 +#, fuzzy, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "" +msgstr "瑯艾颯嫘胯潦颯∼扎怒准胯扼整\n" -#: src/useradd.c:1481 src/userdel.c:385 src/usermod.c:1314 -#, c-format +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 +#, fuzzy, c-format msgid "%s: cannot open shadow password file\n" -msgstr "" +msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒整\n" -#: src/useradd.c:1580 src/usermod.c:1405 -#, c-format -msgid "%s: error adding authentication method\n" -msgstr "" - -#: src/useradd.c:1604 -#, c-format +#: src/useradd.c:1435 +#, fuzzy, c-format msgid "%s: error adding new password entry\n" -msgstr "" +msgstr "%s: 嫘胯潦DBM具喋芾蕭柴具押潦扼\n" -#: src/useradd.c:1618 -#, c-format +#: src/useradd.c:1449 +#, fuzzy, c-format msgid "%s: error updating password dbm entry\n" -msgstr "" +msgstr "%s: 嫘胯潦DBM具喋芸扎柴具押潦扼\n" -#: src/useradd.c:1634 src/usermod.c:1471 -#, c-format +#: src/useradd.c:1465 src/usermod.c:1151 +#, fuzzy, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "" +msgstr "%s: 瑯艾颯嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/useradd.c:1650 src/usermod.c:1488 -#, c-format +#: src/useradd.c:1481 src/usermod.c:1168 +#, fuzzy, c-format msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "" +msgstr "%s: 瑯艾嫘胯潦 DBM具喋 桀扎柴具押墦n" -#: src/useradd.c:1682 -#, c-format +#: src/useradd.c:1513 +#, fuzzy, c-format msgid "%s: cannot create directory %s\n" -msgstr "" +msgstr "%s: 研胯%s %s詨憭氬扼整\n" -#: src/useradd.c:1806 src/usermod.c:1233 +#: src/useradd.c:1634 src/usermod.c:981 #, c-format msgid "%s: user %s exists\n" -msgstr "%s: 交□扒 %s 反繡箕仄引允\n" +msgstr "%s: 艾潦 %s 臬具整\n" -#: src/useradd.c:1821 +#: src/useradd.c:1649 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -"%s: 弘伙□皿 %s 反繡箕仄引允 ≡ 手仄仇及交□扒毛公及弘伙□皿尺馨笛允月卞反, -" -"g 毛厙迕仄化仁分今中.\n" +"%s: 啜怒潦 %s 臬具整 柴艾潦嗚柴啜怒潦貉蕭怒, -" +"g 拍具艾.\n" -#: src/useradd.c:1854 +#: src/useradd.c:1687 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -#: src/userdel.c:129 +#: src/userdel.c:124 #, c-format -msgid "usage: %s [-r] name\n" -msgstr "銀迕芊: %s [-r] 交□扒抩\n" +msgid "Usage: %s [-r] name\n" +msgstr "雿輻冽: %s [-r] 艾潦嗅\n" -#: src/userdel.c:181 src/userdel.c:267 +#: src/userdel.c:176 src/userdel.c:262 #, c-format msgid "%s: error updating group entry\n" -msgstr "%s: 弘伙□皿’巨件玄伉及凳蕙及巨仿□匹允\n" +msgstr "%s: 啜怒潦颯具喋芥格湔啜柴具押潦扼\n" -#: src/userdel.c:191 src/userdel.c:276 +#: src/userdel.c:186 src/userdel.c:271 #, c-format msgid "%s: cannot update dbm group entry\n" -msgstr "%s: DBM弘伙□皿’巨件玄伉毛凳蕙匹五引六氏\n" +msgstr "%s: DBM啜怒潦颯具喋芥湔啜扼整\n" -#: src/userdel.c:219 +#: src/userdel.c:214 #, fuzzy, c-format msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: DBM弘伙□皿’巨件玄伉毛凳蕙匹五引六氏\n" +msgstr "%s: DBM啜怒潦颯具喋芥湔啜扼整\n" -#: src/userdel.c:308 +#: src/userdel.c:379 #, c-format -msgid "%s: cannot rewrite TCFS key file\n" -msgstr "%s: TCFS平□’白央奶伙毛瘋踏五慇心匹五引六氏\n" +msgid "%s: cannot open group file\n" +msgstr "%s: 啜怒潦颯∼扎怒整\n" -#: src/userdel.c:392 +#: src/userdel.c:390 #, c-format -msgid "%s: cannot lock TCFS key file\n" -msgstr "%s: TCFS平□’白央奶伙毛伕永弁匹五引六氏\n" - -#: src/userdel.c:397 -#, c-format -msgid "%s: cannot open TCFS key file\n" -msgstr "%s: TCFS平□’白央奶伙毛釩仃引六氏\n" +msgid "%s: cannot open shadow group file\n" +msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" #: src/userdel.c:408 #, c-format -msgid "%s: cannot open group file\n" -msgstr "%s: 弘伙□皿’白央奶伙毛釩仃引六氏\n" - -#: src/userdel.c:419 -#, c-format -msgid "%s: cannot open shadow group file\n" -msgstr "%s: 扑乓玉它’弘伙□皿’白央奶伙互釩仃引六氏\n" - -#: src/userdel.c:451 src/userdel.c:468 -#, c-format -msgid "%s: error deleting authentication\n" -msgstr "" - -#: src/userdel.c:479 -#, c-format msgid "%s: error deleting password entry\n" -msgstr "%s: 由旦伐□玉’巨件玄伉綽輪及巨仿□匹允\n" +msgstr "%s: 嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/userdel.c:485 +#: src/userdel.c:412 #, c-format msgid "%s: error deleting shadow password entry\n" -msgstr "%s: 扑乓玉它’由旦伐□玉’巨件玄伉綽輪及巨仿□匹允\n" +msgstr "%s: 瑯艾颯嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/userdel.c:496 -#, c-format -msgid "%s: error deleting TCFS entry\n" -msgstr "%s: TCFS巨件玄伉綽輪及巨仿□匹允\n" - -#: src/userdel.c:510 +#: src/userdel.c:421 #, c-format msgid "%s: error deleting password dbm entry\n" -msgstr "%s: 由旦伐□玉DBM巨件玄伉綽輪及巨仿□匹允\n" +msgstr "%s: 嫘胯潦DBM具喋芸扎柴具押潦扼\n" -#: src/userdel.c:533 -#, c-format +#: src/userdel.c:440 +#, fuzzy, c-format msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "" +msgstr "%s: 瑯艾颯嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/userdel.c:569 +#: src/userdel.c:484 #, c-format msgid "%s: user %s is currently logged in\n" -msgstr "%s: 交□扒 %s 反蜇箕伕弘奶件醱匹允\n" +msgstr "%s: 艾潦 %s 舐曉具准啜扎喃葉扼\n" -#: src/userdel.c:659 +#: src/userdel.c:594 #, c-format msgid "%s: warning: %s not owned by %s, not removing\n" -msgstr "%s: 煞屢: %s反 %s 及赭肣匹反丐曰引六氏, 綽輪反墊中引六氏\n" +msgstr "%s: 霅血: %s %s 格扼胯整, 扎航整\n" -#: src/userdel.c:666 -#, c-format +#: src/userdel.c:600 +#, fuzzy, c-format msgid "%s: warning: can't remove " -msgstr "" +msgstr "%s: 霅血: %s %s格扼胯整\n" -#: src/userdel.c:758 src/usermod.c:1023 +#: src/userdel.c:703 src/usermod.c:783 #, c-format msgid "%s: user %s does not exist\n" -msgstr "%s: 交□扒 %s 反繡箕仄引六氏\n" +msgstr "%s: 艾潦 %s 臬具整\n" -#: src/userdel.c:770 src/usermod.c:1039 +#: src/userdel.c:718 src/usermod.c:799 #, c-format msgid "%s: user %s is a NIS user\n" -msgstr "%s: 交□扒 %s 反 NIS 交□扒匹允\n" +msgstr "%s: 艾潦 %s NIS 艾潦嗚扼\n" -#: src/userdel.c:799 +#: src/userdel.c:756 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s: %s反 %s及赭肣匹反丐曰引六氏, 綽輪反墊中引六氏\n" +msgstr "%s: %s %s格扼胯整, 扎航整\n" -#: src/userdel.c:818 +#: src/userdel.c:779 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" -msgstr "%s: 犯奴伊弁玄伉%s 及綽輪反墊中引六氏 (would remove home of user %s)\n" +msgstr "%s: 研胯%s 桀扎航整 (would remove home of user %s)\n" -#: src/userdel.c:830 +#: src/userdel.c:793 #, c-format msgid "%s: error removing directory %s\n" -msgstr "%s: 犯奴伊弁玄伉 %s 及綽輪及巨仿□匹允\n" +msgstr "%s: 研胯 %s 桀扎柴具押潦扼\n" -#: src/usermod.c:326 +#: src/usermod.c:306 +#, fuzzy, c-format +msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "雿輻冽: %s\t[-u 艾潦貂D [-o]] [-g 啜怒潦] [-G 啜怒潦,...] \n" + +#: src/usermod.c:310 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" -msgstr "\t\t[-d 石□丞 [-m]] [-s 扑尼伙] [-c 戊丟件玄] [-l 蕙筋交□扒抩]\n" +msgstr "\t\t[-d 潦 [-m]] [-s 瑯扼侷 [-c 喋∼喋] [-l 啗艾潦嗅]\n" -#: src/usermod.c:332 +#: src/usermod.c:313 #, fuzzy -msgid "[-A {DEFAULT|program},... ] " -msgstr "[-A {DEFAULT|皿伕弘仿丞},...] " +msgid "[-f inactive] [-e expire] " +msgstr "[-f ∪寞交財 [-e 包 " -#: src/usermod.c:334 +#: src/usermod.c:315 msgid "[-p passwd] [-L|-U] name\n" -msgstr "[-p 由旦伐□玉] [-L|-U] 交□扒抩\n" +msgstr "[-p 嫘胯潦] [-L|-U] 艾潦嗅\n" -#: src/usermod.c:514 +#: src/usermod.c:495 #, c-format msgid "%s: out of memory in update_group\n" -msgstr "%s: update_group 醱卞丟乒伉互尕簫仄引仄凶\n" +msgstr "%s: update_group 銝准怒∼Ｕ芥銝頞喋整\n" -#: src/usermod.c:641 +#: src/usermod.c:622 #, c-format msgid "%s: out of memory in update_gshadow\n" -msgstr "%s: update_shdow 醱卞丟乒伉互尕簫仄引仄凶\n" +msgstr "%s: update_shdow 銝准怒∼Ｕ芥銝頞喋整\n" -#: src/usermod.c:1210 +#: src/usermod.c:958 #, c-format msgid "%s: no flags given\n" -msgstr "%s: 夫午勾手白仿弘互隙爛今木化中引六氏\n" +msgstr "%s: 脯具扎押啜摰艾整\n" -#: src/usermod.c:1217 +#: src/usermod.c:965 #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s: 扑乓玉它’由旦伐□玉卞反 -e 云方太 -e 互优邰匹允\n" +msgstr "%s: 瑯艾颯嫘胯潦怒 -e -e 敹閬扼\n" -#: src/usermod.c:1239 +#: src/usermod.c:987 #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s: 交□扒ID %lu 互褐呁仄化中引允\n" +msgstr "%s: 艾潦貂D %lu 銴艾整\n" -#: src/usermod.c:1392 -#, c-format -msgid "%s: error deleting authentication method\n" -msgstr "%s: 由旦伐□玉ロ據杅芊及綽輪及巨仿□匹允\n" - -#: src/usermod.c:1418 -#, c-format -msgid "%s: error changing authentication method\n" -msgstr "%s: 由旦伐□玉ロ據杅芊及庍凳及巨仿□匹允\n" - -#: src/usermod.c:1436 +#: src/usermod.c:1116 #, c-format msgid "%s: error changing password entry\n" -msgstr "%s: 由旦伐□玉’巨件玄伉庍凳及巨仿□匹允\n" +msgstr "%s: 嫘胯潦颯具喋芸氬柴具押潦扼\n" -#: src/usermod.c:1442 +#: src/usermod.c:1122 #, c-format msgid "%s: error removing password entry\n" -msgstr "%s: 由旦伐□玉’巨件玄伉綽輪及巨仿□匹允\n" +msgstr "%s: 嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/usermod.c:1451 +#: src/usermod.c:1131 #, c-format msgid "%s: error adding password dbm entry\n" -msgstr "%s: 由旦伐□玉DBM巨件玄伉馨笛及巨仿□匹允\n" +msgstr "%s: 嫘胯潦DBM具喋芾蕭柴具押潦扼\n" -#: src/usermod.c:1459 +#: src/usermod.c:1139 #, c-format msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: 由旦伐□玉DBM巨件玄伉綽輪及巨仿□匹允\n" +msgstr "%s: 嫘胯潦DBM具喋芸扎柴具押潦扼\n" -#: src/usermod.c:1478 +#: src/usermod.c:1158 #, c-format msgid "%s: error removing shadow password entry\n" -msgstr "%s: 扑乓玉它’由旦伐□玉’巨件玄伉綽輪及巨仿□匹允\n" +msgstr "%s: 瑯艾颯嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/usermod.c:1495 +#: src/usermod.c:1175 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: 扑乓玉它由旦伐□玉 DBM巨件玄伉 及綽輪及巨仿□\n" +msgstr "%s: 瑯艾嫘胯潦 DBM具喋 桀扎柴具押墦n" -#: src/usermod.c:1524 +#: src/usermod.c:1204 #, c-format msgid "%s: directory %s exists\n" -msgstr "%s: 犯奴伊弁玄伉 %s反繡箕仄引允\n" +msgstr "%s: 研胯 %s臬具整\n" -#: src/usermod.c:1533 +#: src/usermod.c:1213 #, c-format msgid "%s: can't create %s\n" -msgstr "%s: %s毛 綜嶽匹五引六氏\n" +msgstr "%s: %s 雿扼整\n" -#: src/usermod.c:1539 +#: src/usermod.c:1219 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s: %s毛chown匹五引六氏\n" +msgstr "%s: %schown扼整\n" -#: src/usermod.c:1556 +#: src/usermod.c:1236 #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "%s: 犯奴伊弁玄伉%s毛 %s尺抩蟆庍凳匹五引六氏\n" +msgstr "%s: 研胯%s %s詨憭氬扼整\n" -#. better leave it alone -#: src/usermod.c:1653 +#: src/usermod.c:1333 #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "%s: 煞屢: %s 反%s及赭肣匹反丐曰引六氏\n" +msgstr "%s: 霅血: %s %s格扼胯整\n" -#: src/usermod.c:1659 +#: src/usermod.c:1339 msgid "failed to change mailbox owner" -msgstr "mailbox及赭肣樊及庍凳卞撩л仄引仄凶" +msgstr "mailbox格桀氬怠仃整" -#: src/usermod.c:1667 +#: src/usermod.c:1347 msgid "failed to rename mailbox" -msgstr "mailbox及抩蟆庍凳卞撩л仄引仄凶" +msgstr "mailbox桀憭氬怠仃整" -#: src/vipw.c:104 +#: src/vipw.c:105 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" "\n" -"%s: %s 及庍凳反墊歹木引六氏\n" +"%s: %s 桀氬航整\n" -#: src/vipw.c:132 +#: src/vipw.c:133 msgid "Couldn't lock file" -msgstr "白央奶伙毛伕永弁匹五引六氏" +msgstr "∼扎怒准胯扼整" -#: src/vipw.c:141 +#: src/vipw.c:142 msgid "Couldn't make backup" -msgstr "田永弁失永皿毛綜嶽匹五引六氏" +msgstr "胯Ｕ雿扼整" -#: src/vipw.c:206 +#: src/vipw.c:200 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" -msgstr "%s: %s毛汊蛙匹五引六氏匹仄凶: %s (丐卅凶及庍凳反%s卞丐曰引允)\n" +msgstr "%s: %s敺拇扼扼整扼: %s (芥桀氬%s怒整)\n" -#: src/vipw.c:244 +#: src/vipw.c:238 msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" msgstr "" -"銀迕芊:\n" -"`vipw' /etc/passwd 毛彸螂 `vipw -s' /etc/shadow毛彸螂\n" -"`vigr' /etc/group毛彸螂 `vigr -s' /etc/gshadow毛彸螂\n" +"雿輻冽:\n" +"`vipw' /etc/passwd 蝺券 `vipw -s' /etc/shadow蝺券\n" +"`vigr' /etc/group蝺券 `vigr -s' /etc/gshadow蝺券\n" + +#, fuzzy +#~ msgid "Can't create mail spool for user %s.\n" +#~ msgstr "%s: 艾潦 %s 柴具喋芥湔啜扼整\n" + +#~ msgid "User %s has a TCFS key, his old password is required.\n" +#~ msgstr "" +#~ "艾潦 %s TCFS准潦艾整, 柴艾潦嗚格扼嫘胯潦敹閬扼.\n" + +#~ msgid "You can use -t option to force the change.\n" +#~ msgstr "撘瑕嗥怠氬銵怒, 芥瑯扼 -t 敹閬扼\n" + +#, fuzzy +#~ msgid "Warning: user %s has a TCFS key.\n" +#~ msgstr "%s: 艾潦 %s NIS 艾潦嗚扼\n" + +#~ msgid "Cannot lock the TCFS key database; try again later\n" +#~ msgstr "" +#~ "TCFS准潦潦踴潦嫘准胯扼整, 敺扼銝摨西岫艾.\n" + +#~ msgid "Cannot open the TCFS key database.\n" +#~ msgstr "TCFS准潦潦踴潦嫘整.\n" + +#~ msgid "Error updating the TCFS key database.\n" +#~ msgstr "TCFS准潦潦踴潦嫘格湔啜柴具押潦扼.\n" + +#~ msgid "Cannot commit TCFS changes.\n" +#~ msgstr "TCFS憭氬commit扼整.\n" + +#~ msgid "%s: cannot rewrite TCFS key file\n" +#~ msgstr "%s: TCFS准潦颯∼扎怒詻颲潦踴扼整\n" + +#~ msgid "%s: cannot lock TCFS key file\n" +#~ msgstr "%s: TCFS准潦颯∼扎怒准胯扼整\n" + +#~ msgid "%s: cannot open TCFS key file\n" +#~ msgstr "%s: TCFS准潦颯∼扎怒整\n" + +#~ msgid "%s: error deleting TCFS entry\n" +#~ msgstr "%s: TCFS具喋芸扎柴具押潦扼\n" + +#~ msgid " [-f inactive] [-e expire]" +#~ msgstr " [-f ∪寞交財 [-e 包" + +#, fuzzy +#~ msgid "%s: error deleting authentication\n" +#~ msgstr "%s: 嫘胯潦隤閮潭寞桀扎柴具押潦扼\n" + +#, fuzzy +#~ msgid "[-A {DEFAULT|program},...] " +#~ msgstr "[-A {DEFAULT|准啜押},...] " + +#~ msgid "%s: error deleting authentication method\n" +#~ msgstr "%s: 嫘胯潦隤閮潭寞桀扎柴具押潦扼\n" + +#, fuzzy +#~ msgid "%s: error adding authentication method\n" +#~ msgstr "%s: 嫘胯潦隤閮潭寞桀扎柴具押潦扼\n" + +#~ msgid "%s: error changing authentication method\n" +#~ msgstr "%s: 嫘胯潦隤閮潭寞桀氬柴具押潦扼\n" + +#~ msgid "[-A program] " +#~ msgstr "[-A 准啜押] " + +#~ msgid "[-p passwd] name\n" +#~ msgstr "[-p 嫘胯潦] 艾潦嗅\n" + +#~ msgid "%s not found\n" +#~ msgstr "%s航隞整\n" + +#~ msgid "%s: not configured for shadow group support.\n" +#~ msgstr "%s: 瑯艾颯啜怒潦颯萸潦具怨身摰艾整\n" + +#~ msgid "%s: Shadow passwords are not configured.\n" +#~ msgstr "%s: 瑯艾嫘胯潦閮剖艾整.\n" + +#, fuzzy +#~ msgid "Usage: %s [-l] user\n" +#~ msgstr "雿輻冽: %s [-e]\n" + +#~ msgid "Executing shell %s\n" +#~ msgstr "瑯扼%s桀銵銝苒n" + +#~ msgid "Dialup Password: " +#~ msgstr "扎Ｕ怒Ｕ嫘胯潦: " + +#~ msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" +#~ msgstr "雿輻冽: %s [-l] [-m 撠交財 [-M 憭扳交財 [-d 敺包 艾潦跚n" + +#~ msgid "Usage: %s [-(a|d)] shell\n" +#~ msgstr "雿輻冽: %s [-(a|d)] 瑯扼俞n" + +#~ msgid "Shell password: " +#~ msgstr "瑯扼怒嫘胯潦: " + +#~ msgid "re-enter Shell password: " +#~ msgstr "瑯扼怒嫘胯潦桀亙: " + +#~ msgid "%s: Passwords do not match, try again.\n" +#~ msgstr "%s: 嫘胯潦銝氬整, 銝摨艾憿整.\n" + +#~ msgid "%s: can't create %s" +#~ msgstr "%s: %s雿扼整" + +#~ msgid "%s: can't open %s" +#~ msgstr "%s: %s整" + +#~ msgid "%s: Shell %s not found.\n" +#~ msgstr "%s: 瑯扼 %s閬隞整.\n" + +#~ msgid "group=%s,%u basedir=%s skel=%s\n" +#~ msgstr "啜怒潦=%s,%u 潦嫘研胯=%s =%s\n" + +#~ msgid "shell=%s " +#~ msgstr "瑯扼=%s " + +#, fuzzy +#~ msgid "inactive=%ld expire=%s" +#~ msgstr "[-f ∪寞交財 [-e 包 " + +#, fuzzy +#~ msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +#~ msgstr "雿輻冽: %s\t[-u 艾潦貂D [-o]] [-g 啜怒潦] [-G 啜怒潦,...] \n" #~ msgid "%s: gid %ld is not unique\n" -#~ msgstr "%s: 弘伙□皿ID %ld 反褐呁仄化中引允\n" +#~ msgstr "%s: 啜怒潦ID %ld 舫銴艾整\n" #, fuzzy #~ msgid "unknown gid: %u\n" -#~ msgstr "尕抸卅弘伙□皿ID匹允: %d\n" +#~ msgstr "銝芥啜怒潦ID扼: %d\n" #~ msgid "%s: uid %d is not unique\n" -#~ msgstr "%s: 交□扒ID %d 反褐呁仄化中引允\n" +#~ msgstr "%s: 艾潦貂D %d 舫銴艾整\n" #~ msgid "user %s: bad UID (%d)\n" -#~ msgstr "交□扒 %s: 尕懇卅交□扒ID匹丹允 (%d)\n" +#~ msgstr "艾潦 %s: 銝甇芥艾潦貂D扼 (%d)\n" #~ msgid "%s: no aging information present\n" -#~ msgstr "$s: 渝蜃樹扷互丐曰引六氏\n" +#~ msgstr "$s: 晞整\n" #~ msgid "group %s: bad GID (%d)\n" -#~ msgstr "弘伙□皿 %s: 尕懇卅弘伙□皿ID (%d) 匹允\n" +#~ msgstr "啜怒潦 %s: 銝甇芥啜怒潦ID (%d) 扼\n" #~ msgid "%s: permission denied (shell).\n" -#~ msgstr "%s: 腺蜃互蛐搕竣鴗牏楔(扑尼伙).\n" +#~ msgstr "%s: 璅拚艾整(瑯扼).\n" #~ msgid "[-p passwd] [-n] [-r] name\n" -#~ msgstr "[-p 由旦伐□玉] [-n] [-r] 交□扒抩\n" +#~ msgstr "[-p 嫘胯潦] [-n] [-r] 艾潦嗅\n" diff --git a/po/ko.gmo b/po/ko.gmo index d9bad01d..6c6b0d7f 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index 1e150d3d..9bad448a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,705 +5,615 @@ msgid "" msgstr "" "Project-Id-Version: shadow\n" -"POT-Creation-Date: 2002-03-12 12:16+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" "PO-Revision-Date: 2001-02-03 15:09+0900\n" "Last-Translator: Hwang, Sang-Jin \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=euc-kr\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libmisc/addgrps.c:60 +#: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" -msgstr "唳堅: 憲 熱 橈朝 斜瑜(%s)\n" +msgstr "窶赭: 篞賈ㄨ(%s)\n" -#: libmisc/addgrps.c:71 +#: libmisc/addgrps.c:68 msgid "Warning: too many groups\n" -msgstr "唳堅: 斜瑜熱陛 傘鼠 號擠\n" +msgstr "窶赭: 篞賈ㄨ穈 諡 諤\n" -#: libmisc/age.c:77 +#: libmisc/age.c:72 msgid "Your password has expired." -msgstr "ぬ蝶錶萄 餌辨晦и檜 雖陬蝗棲棻." +msgstr "到木 科抱萼 鴔科蛟." -#: libmisc/age.c:80 +#: libmisc/age.c:75 msgid "Your password is inactive." -msgstr "ぬ蝶錶萄 餌辨晦除 蟾婁煎 餌辨й 熱 橈蝗棲棻." +msgstr "到木 科抱萼穈 黕窸潺 科拗 蛟." -#: libmisc/age.c:83 +#: libmisc/age.c:78 msgid "Your login has expired." -msgstr "煎斜檣 餌辨晦и檜 雖陬蝗棲棻" +msgstr "諢篞賄 科抱萼 鴔科蛟" -#: libmisc/age.c:96 +#: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " 衛蝶蠱 婦葬濠諦 鼻氬ж褊衛螃.\n" +msgstr " 欠 窵謔科 渣原.\n" -#: libmisc/age.c:99 +#: libmisc/age.c:93 msgid " Choose a new password.\n" -msgstr " 億煎遴 ぬ蝶錶萄蒂 摹鷗ж撮蹂.\n" +msgstr " 諢 到木諝 賄.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:168 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "ぬ蝶錶萄 餌辨晦и檜 %ld橾縑 部陶棲棻.\n" +msgstr "到木 科抱萼 %ld潰 拘.\n" -#: libmisc/age.c:178 +#: libmisc/age.c:172 msgid "Your password will expire tomorrow.\n" -msgstr "ぬ蝶錶萄 餌辨晦и檜 頂橾 部陶棲棻.\n" +msgstr "到木 科抱萼 渥 拘.\n" -#: libmisc/age.c:180 +#: libmisc/age.c:174 msgid "Your password will expire today.\n" -msgstr "ぬ蝶錶萄 餌辨晦и檜 螃棺 部陶棲棻.\n" +msgstr "到木 科抱萼 月 拘.\n" -#: libmisc/chowntty.c:113 +#: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" -msgstr "tty(欽蜓攪嘐割) %s煎 滲唳й 熱 橈擠" +msgstr "tty(刺圉站) %s諢 貐窶踫 " -#: libmisc/env.c:160 +#: libmisc/env.c:155 msgid "Environment overflow\n" msgstr "" -#: libmisc/env.c:200 +#: libmisc/env.c:195 #, c-format msgid "You may not change $%s\n" -msgstr "$%s朝 滲唳腎橫 氈雖 彊擎匙 偽蝗棲棻\n" +msgstr "$%s 貐窶趟 鴔 窶 穈蛟么n" -#: libmisc/failure.c:238 +#: libmisc/failure.c:230 #, c-format msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "葆雖虞 煎斜檣戲煎睡攪 %d蛻 %s殮棲棻. 葆雖虞 煎斜檣擎 %s 濰模 %s.\n" +msgstr "諤鴔諤 諢篞賄賄潺賱 %d %s. 諤鴔諤 諢篞賄賄 %s 伊 %s.\n" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failures" -msgstr "褒ぬ" +msgstr "欠" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failure" -msgstr "褒ぬ" +msgstr "欠" -#: libmisc/limits.c:397 +#: libmisc/limits.c:396 msgid "Too many logins.\n" -msgstr "煎斜檣熱陛 號蝗棲棻.\n" +msgstr "諢篞賄賄穈 諤蛟.\n" -#: libmisc/login_desrpc.c:63 +#: libmisc/login_desrpc.c:59 #, c-format msgid "Password does not decrypt secret key for %s.\n" -msgstr "ぬ蝶錶萄陛 %s曖 綠塵酈蒂 п戮й 熱 橈擠.\n" +msgstr "到木穈 %s 赬諻月未 渥 .\n" -#: libmisc/login_desrpc.c:69 +#: libmisc/login_desrpc.c:66 #, c-format msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "%s曖 綠塵翮潸蒂 撲薑й 熱 橈蝗棲棻: keyserv等跨檜 ⑷營 褒ч醞殮棲梱?\n" +msgstr "%s 赬諻渥諝 木 蛟: keyserv圉狀 欠鴗篧?\n" -#: libmisc/mail.c:62 libmisc/mail.c:77 +#: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." -msgstr "億煎遴 詭橾檜 紫雜ж艘蝗棲棻." +msgstr "諢 諰潰 麆拗蛟." -#: libmisc/mail.c:73 +#: libmisc/mail.c:72 msgid "No mail." -msgstr "詭橾 橈擠." +msgstr "諰 ." -#: libmisc/mail.c:75 +#: libmisc/mail.c:74 msgid "You have mail." -msgstr "詭橾檜 氈蝗棲棻." +msgstr "諰潰 蛟." -#: libmisc/obscure.c:281 src/passwd.c:244 +#: libmisc/obscure.c:271 src/passwd.c:183 #, c-format msgid "Bad password: %s. " -msgstr "澀跤脹 ぬ蝶錶萄: %s. " +msgstr "諈骰 到木: %s. " -#: libmisc/pam_pass.c:42 +#: libmisc/pam_pass.c:38 #, c-format msgid "passwd: pam_start() failed, error %d\n" -msgstr "ぬ蝶錶萄: pam_start()縑 褒ぬц蝗棲棻, 螃盟 %d\n" +msgstr "到木: pam_start() 欠刮蛟, 月 %d\n" -#: libmisc/pam_pass.c:49 +#: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" -msgstr "ぬ蝶錶萄: %s\n" +msgstr "到木: %s\n" -#: libmisc/setupenv.c:211 +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" +msgstr "" + +#: libmisc/setupenv.c:208 #, c-format msgid "Unable to cd to \"%s\"\n" -msgstr "蛤滓饜葬蒂 \"%s\"煎 檜翕й 熱 橈蝗棲棻\n" +msgstr "謔禺未 \"%s\"諢 渠 蛟么n" -#: libmisc/setupenv.c:219 +#: libmisc/setupenv.c:216 msgid "No directory, logging in with HOME=/" -msgstr "蛤滓饜葬陛 橈擠, 瑞お 蛤滓饜葬(/)煎 煎斜檣м棲棻" +msgstr "謔禹 , 諴刮 謔(/)諢 諢篞賄貲拘" -#: libmisc/shell.c:78 -#, c-format -msgid "Executing shell %s\n" -msgstr "%s 蔗擊 褒чм棲棻\n" - -#. -#. * Obviously something is really wrong - I can't figure out -#. * how to execute this stupid shell, so I might as well give -#. * up in disgust ... -#. -#: libmisc/shell.c:122 +#: libmisc/shell.c:119 #, c-format msgid "Cannot execute %s" -msgstr "%s蒂 褒чй 熱 橈擠" +msgstr "%s諝 欠 " -#: libmisc/sub.c:61 +#: libmisc/sub.c:55 #, c-format msgid "Invalid root directory \"%s\"\n" -msgstr " 蛤滓饜葬 \"%s\"陛 澀跤腎歷蝗棲棻\n" +msgstr " 謔 \"%s\"穈 諈骰蛟么n" -#: libmisc/sub.c:73 +#: libmisc/sub.c:67 #, c-format msgid "Can't change root directory to \"%s\"\n" -msgstr "瑞お 蛤滓饜葬蒂 \"%s\"煎 滲唳й 熱 橈擠\n" +msgstr "諴刮 謔禺未 \"%s\"諢 貐窶踫 \n" -#: libmisc/xmalloc.c:28 +#: libmisc/xmalloc.c:24 #, c-format msgid "malloc(%d) failed\n" -msgstr "malloc(%d)縑 褒ぬц擠\n" +msgstr "malloc(%d) 欠刮\n" -#: lib/dialchk.c:71 -msgid "Dialup Password: " -msgstr "棻檜橡機 ぬ蝶錶萄: " - -#: lib/getdef.c:276 +#: lib/getdef.c:274 msgid "Could not allocate space for config info.\n" -msgstr "撲薑 薑爾蒂 嬪и 奢除 捏虜 й 熱 橈蝗棲棻.\n" +msgstr "木 貐渠未 窸虛 貐渠未 蛟.\n" -#. -#. * Item was never found. -#. -#: lib/getdef.c:330 +#: lib/getdef.c:328 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" -msgstr "撲薑 螃盟 - 憲 熱 橈朝酈 '%s'陛 氈擠 (婦葬濠縑啪 翱塊夥塋)\n" +msgstr "木 月 - '%s'穈 (窵謔科窶 圉趟)\n" -#: lib/getdef.c:417 -#, c-format -msgid "error - lookup '%s' failed\n" -msgstr "螃盟 - '%s'曖 匐儀縑 褒ぬ\n" - -#: lib/getdef.c:425 -#, c-format -msgid "%s not found\n" -msgstr "%s陛 嫦唯腎雖 彊擠\n" - -#. -#. * get the password from her, and set the salt for -#. * the decryption from the group file. -#. -#: lib/pwauth.c:54 src/newgrp.c:348 +#: lib/pwauth.c:54 src/newgrp.c:343 msgid "Password: " -msgstr "ぬ蝶錶萄: " +msgstr "到木: " #: lib/pwauth.c:56 #, c-format msgid "%s's Password: " -msgstr "%s曖 ぬ蝶錶萄: " +msgstr "%s 到木: " -#: lib/pwauth.c:270 +#: lib/pwauth.c:247 msgid "(Echo on) " msgstr "" #: lib/strerror.c:20 #, c-format msgid "Unknown error %d" -msgstr "憲 熱 橈朝 螃盟 %d" +msgstr " 月 %d" -#: src/chage.c:116 -#, c-format +#: src/chage.c:118 msgid "" -"Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" -"\t[-I inactive] [-E expire] [-d last_day] user\n" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -"餌辨徹: %s [-l] [-m 譆模橾熱] [-M 譆渠橾熱] [-W 唳堅橾熱]\n" -"\t[-I 鼠螃牳醹 [-E 虜猿橾熱] [-d 億 ぬ蝶錶萄 滲唳橾] 餌辨濠貲\n" +"科拘: chage [-l] [-m 黖潰] [-M 黖潰] [-W 窶赭潰]\n" +" [-I 諡渣到潰] [-E 諤諴潰] [-d 到木 貐窶趣奭 科拖諈\n" -#: src/chage.c:122 -#, c-format -msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" -msgstr "餌辨徹: %s [-l] [-m 譆模橾熱] [-M 譆渠橾熱] [-W 唳堅橾熱] 餌辨濠\n" - -#: src/chage.c:157 +#: src/chage.c:152 msgid "" "Enter the new value, or press ENTER for the default\n" "\n" msgstr "" -"億煎遴 高擊 厥剪釭, 蛤ィお 高擊 錳и棻賊 ENTER酈蒂 纂撮蹂.\n" +"諢 穈 穇圉, 渣 穈 月庖 ENTER月未 儦賄.\n" "\n" -#: src/chage.c:160 +#: src/chage.c:155 msgid "Minimum Password Age" -msgstr "譆模 ぬ蝶錶萄 翱滄" +msgstr "黖 到木 圉" -#: src/chage.c:166 +#: src/chage.c:161 msgid "Maximum Password Age" -msgstr "譆渠 ぬ蝶錶萄 翱滄" +msgstr "黖 到木 圉" -#: src/chage.c:174 +#: src/chage.c:169 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "葆雖虞 ぬ蝶錶萄 滲唳 (YYYY-MM-DD)" +msgstr "諤鴔諤 到木 貐窶 (YYYY-MM-DD)" + +#: src/chage.c:177 +msgid "Password Expiration Warning" +msgstr "到木 科拘篣域 黕窸 窶赭" #: src/chage.c:183 -msgid "Password Expiration Warning" -msgstr "ぬ蝶錶萄 餌辨虜晦橾 蟾婁 唳堅" - -#: src/chage.c:189 msgid "Password Inactive" -msgstr "ぬ蝶錶萄陛 嶸褲狫 彊擠" +msgstr "到木穈 刮鴔 " -#: src/chage.c:197 +#: src/chage.c:191 msgid "Account Expiration Date (YYYY-MM-DD)" -msgstr "啗薑 餌辨橾 虜晦 橾(YYYY-MM-DD)" +msgstr "窸 科拖 諤篣 (YYYY-MM-DD)" -#. -#. * Start with the easy numbers - the number of days before the -#. * password can be changed, the number of days after which the -#. * password must be chaged, the number of days before the password -#. * expires that the user is told, and the number of days after the -#. * password expires that the account becomes unusable. -#. -#: src/chage.c:248 +#: src/chage.c:241 #, c-format msgid "Minimum:\t%ld\n" -msgstr "譆模:\t%ld\n" +msgstr "黖:\t%ld\n" -#: src/chage.c:249 +#: src/chage.c:242 #, c-format msgid "Maximum:\t%ld\n" -msgstr "譆渠:\t%ld\n" +msgstr "黖:\t%ld\n" -#: src/chage.c:251 +#: src/chage.c:243 #, c-format msgid "Warning:\t%ld\n" -msgstr "唳堅:\t%ld\n" +msgstr "窶赭:\t%ld\n" -#: src/chage.c:252 +#: src/chage.c:244 #, c-format msgid "Inactive:\t%ld\n" -msgstr "嶸褲狫 彊擠:\t%ld\n" +msgstr "刮鴔 :\t%ld\n" -#. -#. * The "last change" date is either "Never" or the date the password -#. * was last modified. The date is the number of days since 1/1/1970. -#. -#: src/chage.c:260 +#: src/chage.c:251 msgid "Last Change:\t\t" -msgstr "葆雖虞 滲唳:\t\t" +msgstr "諤鴔諤 貐窶:\t\t" -#: src/chage.c:262 src/chage.c:276 src/chage.c:293 src/chage.c:306 +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 msgid "Never\n" -msgstr "碳陛\n" +msgstr "賱穈\n" -#. -#. * The password expiration date is determined from the last change -#. * date plus the number of days the password is valid for. -#. -#: src/chage.c:273 +#: src/chage.c:264 msgid "Password Expires:\t" -msgstr "ぬ蝶錶萄 虜晦:\t" +msgstr "到木 諤篣:\t" -#. -#. * The account becomes inactive if the password is expired for more -#. * than "inactdays". The expiration date is calculated and the -#. * number of inactive days is added. The resulting date is when the -#. * active will be disabled. -#. -#: src/chage.c:290 +#: src/chage.c:280 msgid "Password Inactive:\t" -msgstr "ぬ蝶錶萄陛 嶸褲狫 彊擠:\t" +msgstr "到木穈 刮鴔 :\t" -#. -#. * The account will expire on the given date regardless of the -#. * password expiring or not. -#. -#: src/chage.c:304 +#: src/chage.c:294 msgid "Account Expires:\t" -msgstr "啗薑 虜晦:\t" +msgstr "窸 諤篣:\t" -#: src/chage.c:468 +#: src/chage.c:445 #, c-format msgid "%s: do not include \"l\" with other flags\n" -msgstr "%s: \"l\" 諦 л眷 棻艇 flags蒂 んлж雖 蜓匙\n" +msgstr "%s: \"l\" 刷 月斥 flags諝 秒刮鴔 諤窶\n" -#: src/chage.c:481 src/chage.c:652 src/login.c:518 +#: src/chage.c:458 src/chage.c:588 src/login.c:503 #, c-format msgid "%s: permission denied\n" -msgstr "%s: 蕾斬掏и 橈擠\n" +msgstr "%s: 篞澎 \n" -#: src/chage.c:512 src/chpasswd.c:139 src/groupadd.c:529 src/groupdel.c:322 -#: src/groupmod.c:520 src/newusers.c:381 src/useradd.c:1754 src/userdel.c:717 -#: src/usermod.c:1732 +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" -msgstr "%s: 檣隸寞徹 蹺陛ж朝等 螃盟\n" +msgstr "%s: 賄諻拘 黺穈 月\n" -#: src/chage.c:533 src/chpasswd.c:157 -#, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: ぬ蝶錶萄 だ橾擊 lockй 熱 橈蝗棲棻\n" - -#: src/chage.c:544 src/chpasswd.c:162 +#: src/chage.c:510 src/chpasswd.c:159 #, c-format msgid "%s: can't open password file\n" -msgstr "ぬ蝶錶萄 だ橾擊 翮熱陛 橈蝗棲棻\n" +msgstr "%s: 到木 潰 渥穈 蛟么n" -#: src/chage.c:552 +#: src/chage.c:518 #, c-format msgid "%s: unknown user: %s\n" -msgstr "憲熱橈朝 餌辨濠: %s\n" +msgstr "%s: 科拖: %s\n" -#: src/chage.c:571 -#, c-format +#: src/chage.c:536 +#, fuzzy, c-format msgid "%s: can't lock shadow password file" -msgstr "%" +msgstr "%s: 到木 潰 篣 蛟么n" -#: src/chage.c:579 +#: src/chage.c:544 #, c-format msgid "%s: can't open shadow password file" -msgstr "%s: 膠紫辦 ぬ蝶錶萄 だ橾擊 翮熱陛 橈蝗棲棻" +msgstr "%s: 到木 潰 渥穈 蛟" -#: src/chage.c:674 +#: src/chage.c:605 #, c-format msgid "Changing the aging information for %s\n" -msgstr "%s曖 翱滄縑 渠и 薑爾蒂 偵褐м棲棻 %s\n" +msgstr " 圉寢 貐渠未 穈桿拘 %s\n" -#: src/chage.c:677 +#: src/chage.c:608 #, c-format msgid "%s: error changing fields\n" -msgstr "%s: о跡擊 夥紱朝 紫醞 螃盟陛 嫦儅ц蝗棲棻\n" +msgstr "%s: 卿版 諻篨賈 鴗 月穈 諻蛟么n" -#: src/chage.c:705 src/chage.c:771 src/pwunconv.c:174 +#: src/chage.c:632 src/pwunconv.c:138 #, c-format msgid "%s: can't update password file\n" -msgstr "ぬ蝶錶萄 だ橾擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: 到木 潰 域渣 蛟么n" -#: src/chage.c:737 src/pwunconv.c:168 +#: src/chage.c:661 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "膠紫辦 ぬ蝶錶萄 だ橾擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: 到木 潰 域渣 蛟么n" -#: src/chage.c:789 src/chage.c:805 src/chfn.c:570 src/chsh.c:382 -#: src/passwd.c:747 src/passwd.c:859 +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 msgid "Error updating the DBM password entry.\n" -msgstr "DBM む蝶錶萄 殮溘睡碟擊 機等檜お ж朝等 螃盟陛 嫦儅ц蝗棲棻.\n" +msgstr "DBM 木 伙賱 域渣 月穈 諻蛟.\n" -#: src/chage.c:823 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "膠紫辦 ぬ蝶錶萄 だ橾擊 棻衛 濛撩й 熱 橈蝗棲棻\n" +msgstr "%s 到木 潰 木 桶 蛟么n" -#: src/chage.c:838 +#: src/chage.c:707 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "ぬ蝶錶萄 だ橾擊 棻衛 濛撩й 熱 橈蝗棲棻\n" +msgstr "%s 到木 潰 木 桶 蛟么n" -#: src/chage.c:857 src/chpasswd.c:343 src/groupadd.c:590 src/groupdel.c:409 -#: src/groupmod.c:604 src/newusers.c:628 src/useradd.c:1869 src/userdel.c:849 -#: src/usermod.c:1811 +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: だ橾 濡旎擊 ヴ 熱 橈蝗棲棻\n" +msgstr "%s: 篣 蛟么n" -#: src/chfn.c:83 +#: src/chfn.c:84 #, c-format msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" "\t[-h home_ph] [-o other] [user]\n" msgstr "" -"餌辨徹: %s [-f 檜葷] [-r 寞_廓β [-w 霜濰_瞪食醽β\n" -"\t[-h 餵_瞪食醽β [-o 晦顫] [餌辨濠]\n" +"科拘: %s [-f 渠] [-r 諻奇貒窟 [-w 鴔北貒窟\n" +"\t[-h 鴔_貒窟 [-o 篣堅] [科拖]\n" -#: src/chfn.c:88 +#: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -"餌辨徹: %s [-f 檜葷] [-r 寞_廓β [-w 霜濰_瞪食醽β [-h 餵_瞪食醽β\n" +"科拘: %s [-f 渠] [-r 諻奇貒窟 [-w 鴔北貒窟 [-h 鴔_貒窟\n" -#: src/chfn.c:139 +#: src/chfn.c:140 msgid "Enter the new value, or press ENTER for the default\n" -msgstr "億煎遴 高擊 厥剪釭, 蛤ィお蒂 錳ж賊 縛攪蒂 纂撮蹂\n" +msgstr "諢 穈 穇圉, 渣賈未 諰 圉未 儦賄\n" -#: src/chfn.c:142 +#: src/chfn.c:143 msgid "Full Name" -msgstr "檜葷" +msgstr "渠" -#: src/chfn.c:144 +#: src/chfn.c:145 #, c-format msgid "\tFull Name: %s\n" -msgstr "\t檜葷: %s\n" +msgstr "\t渠: %s\n" -#: src/chfn.c:147 +#: src/chfn.c:148 msgid "Room Number" -msgstr "寞 廓" +msgstr "諻 貒" -#: src/chfn.c:149 +#: src/chfn.c:150 #, c-format msgid "\tRoom Number: %s\n" -msgstr "\t寞 廓: %s\n" +msgstr "\t諻 貒: %s\n" -#: src/chfn.c:152 +#: src/chfn.c:153 msgid "Work Phone" -msgstr "霜濰 廓食醽" +msgstr "鴔 貒貒" -#: src/chfn.c:154 +#: src/chfn.c:155 #, c-format msgid "\tWork Phone: %s\n" -msgstr "\t霜濰 瞪食醽: %s\n" +msgstr "\t鴔 貒: %s\n" -#: src/chfn.c:157 +#: src/chfn.c:158 msgid "Home Phone" -msgstr "餵 瞪食醽" +msgstr "鴔 貒" -#: src/chfn.c:159 +#: src/chfn.c:160 #, c-format msgid "\tHome Phone: %s\n" -msgstr "\t餵 瞪食醽: %s\n" +msgstr "\t鴔 貒: %s\n" -#: src/chfn.c:162 +#: src/chfn.c:163 msgid "Other" -msgstr "晦顫" +msgstr "篣堅" -#: src/chfn.c:271 src/chfn.c:281 src/chfn.c:291 src/chfn.c:301 src/chfn.c:311 -#: src/chfn.c:379 src/passwd.c:1115 +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 #, c-format msgid "%s: Permission denied.\n" -msgstr "蕾斬掏и 橈擠.\n" +msgstr "%s: 篞澎 .\n" -#: src/chfn.c:332 src/chsh.c:190 src/passwd.c:1165 +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 #, c-format msgid "%s: Unknown user %s\n" -msgstr "憲熱橈朝 餌辨濠 %s\n" +msgstr "%s: 科拖 %s\n" -#: src/chfn.c:341 src/chsh.c:198 src/passwd.c:1096 +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 #, c-format msgid "%s: Cannot determine your user name.\n" -msgstr "%s: 餌辨濠 檜葷擊 檣衝й 熱 橈蝗棲棻.\n" +msgstr "%s: 科拖 渠 賄 蛟.\n" -#: src/chfn.c:358 src/chsh.c:215 +#: src/chfn.c:359 src/chsh.c:210 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "NIS 贗塭檜樹お縑憮 '%s'曖 餌辨濠 檜葷擊 滲唳й 熱 橈蝗棲棻.\n" +msgstr "%s: NIS 渠潰渥貲賄 '%s' 科拖 渠 貐窶踫 蛟.\n" -#: src/chfn.c:366 src/chsh.c:223 +#: src/chfn.c:367 src/chsh.c:218 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: ⑷營曖 贗塭檜樹お縑 渠ж罹 '%s'陛 NIS 葆蝶攪殮棲棻.\n" +msgstr "%s: 科 渠潰渥貲賄 '%s'穈 NIS 諤欠域.\n" -#: src/chfn.c:441 -#, c-format +#: src/chfn.c:442 +#, fuzzy, c-format msgid "Changing the user information for %s\n" -msgstr "%s縑 渠ж罹 餌辨濠曖 薑爾蒂 夥習棲棻\n" +msgstr " 圉寢 貐渠未 穈桿拘 %s\n" -#: src/chfn.c:450 +#: src/chfn.c:451 #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s: 嶸褲狫 彊朝 檜葷: \"%s\"\n" +msgstr "%s: 刮鴔 渠: \"%s\"\n" -#: src/chfn.c:456 +#: src/chfn.c:457 #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "嶸褲狫 彊朝 寞 廓: \"%s\"\n" +msgstr "%s: 刮鴔 諻 貒: \"%s\"\n" -#: src/chfn.c:462 +#: src/chfn.c:463 #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "嶸褲狫 彊朝 霜濰 瞪食醽: \"%s\"\n" +msgstr "%s 刮鴔 鴔 貒: \"%s\"\n" -#: src/chfn.c:468 +#: src/chfn.c:469 #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s: 嶸褲狫 彊朝 餵 瞪食醽: \"%s\"\n" +msgstr "%s: 刮鴔 鴔 貒: \"%s\"\n" -#: src/chfn.c:475 +#: src/chfn.c:476 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s: \"%s\"擎 瞳瞰ж雖 彊朝 旋濠蒂 んлж堅 氈蝗棲棻\n" +msgstr "%s: \"%s\" 鴔 篣諝 秒刮窸 蛟么n" -#: src/chfn.c:488 +#: src/chfn.c:489 #, c-format msgid "%s: fields too long\n" -msgstr "%s: 殮溘彰嬪陛 傘鼠 梢棲棻\n" +msgstr "%s: 伙穈 諡 篧么n" -#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277 +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 msgid "Cannot change ID to root.\n" -msgstr "瑞お煎 嬴檜蛤 滲唳檜 碳陛棟 м棲棻.\n" +msgstr "諴刮賈 渠 貐窶趣 賱穈 拘.\n" -#: src/chfn.c:519 src/chsh.c:331 src/passwd.c:656 src/passwd.c:811 +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 msgid "Cannot lock the password file; try again later.\n" -msgstr "ぬ蝶錶萄 だ橾擊 lockй 熱 橈蝗棲棻; 釭醞縑 棻衛 衛紫ж褊衛螃.\n" +msgstr "到木 潰 lock 蛟; 鴗 木 原.\n" -#: src/chfn.c:525 src/chsh.c:337 src/passwd.c:661 src/passwd.c:816 +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 msgid "Cannot open the password file.\n" -msgstr "ぬ蝶錶萄 だ橾擊 翮熱陛 橈蝗棲棻.\n" +msgstr "到木 潰 渥穈 蛟.\n" -#: src/chfn.c:542 src/chsh.c:352 src/passwd.c:667 src/usermod.c:1348 +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 #, c-format msgid "%s: %s not found in /etc/passwd\n" -msgstr "%s: %s陛 /etc/passwd縑憮 嫦唯腎雖 彊蝗棲棻\n" +msgstr "%s: %s穈 /etc/passwd 諻窶禺鴔 蛟么n" -#: src/chfn.c:561 src/chsh.c:373 src/passwd.c:740 src/passwd.c:852 +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 msgid "Error updating the password entry.\n" -msgstr "ぬ蝶錶萄 殮溘擊 機等檜おж朝等 螃盟嫦儅.\n" +msgstr "到木 伊 域渣貲 月諻.\n" -#: src/chfn.c:585 src/chsh.c:397 src/passwd.c:755 src/passwd.c:867 +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 msgid "Cannot commit password file changes.\n" -msgstr "ぬ蝶錶萄 だ橾 滲唳擊 籀葬й 熱 橈蝗棲棻.\n" +msgstr "到木 貐窶趣 麮謔秒 蛟.\n" -#: src/chfn.c:592 src/chsh.c:404 +#: src/chfn.c:593 src/chsh.c:399 msgid "Cannot unlock the password file.\n" -msgstr "ぬ蝶錶萄 だ橾擊 lockй 熱 橈蝗棲棻.\n" +msgstr "到木 潰 lock 蛟.\n" -#: src/chpasswd.c:66 +#: src/chpasswd.c:67 +#, fuzzy, c-format +msgid "Usage: %s [-e]\n" +msgstr "科拘: %s [-e]\n" + +#: src/chpasswd.c:154 #, c-format -msgid "usage: %s [-e]\n" -msgstr "餌辨徹: %s [-e]\n" +msgid "%s: can't lock password file\n" +msgstr "%s: 到木 潰 lock 蛟么n" -#: src/chpasswd.c:171 src/pwconv.c:94 +#: src/chpasswd.c:168 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" -msgstr "%s: 膠紫辦 だ橾擊 lockй 熱 橈蝗棲棻\n" +msgstr "%s: 潰 lock 蛟么n" -#: src/chpasswd.c:177 src/gpasswd.c:596 src/pwconv.c:99 src/pwunconv.c:103 -#: src/pwunconv.c:108 +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s: 膠紫辦 だ橾擊 翮 熱 橈蝗棲棻\n" +msgstr "%s: 潰 蛟么n" -#: src/chpasswd.c:200 src/newusers.c:460 +#: src/chpasswd.c:197 src/newusers.c:441 #, c-format msgid "%s: line %d: line too long\n" -msgstr "%s: line %d: 傘鼠 梢棲棻\n" +msgstr "%s: line %d: 諡 篧么n" -#: src/chpasswd.c:220 +#: src/chpasswd.c:217 #, c-format msgid "%s: line %d: missing new password\n" -msgstr "%s: line %d: 億煎遴 ぬ蝶錶萄陛 橈蝗棲棻\n" +msgstr "%s: line %d: 諢 到木穈 蛟么n" -#: src/chpasswd.c:237 +#: src/chpasswd.c:234 #, c-format msgid "%s: line %d: unknown user %s\n" -msgstr "%s: line %d: 憲 熱 橈朝 餌辨濠 %s\n" +msgstr "%s: line %d: 科拖 %s\n" -#: src/chpasswd.c:290 +#: src/chpasswd.c:280 #, c-format msgid "%s: line %d: cannot update password entry\n" -msgstr "%s: line %d: ぬ蝶錶萄 殮溘擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: line %d: 到木 伊 域渣 蛟么n" -#: src/chpasswd.c:307 src/newusers.c:588 +#: src/chpasswd.c:297 src/newusers.c:569 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: 螃盟嫦儅, 滲唳檜 籀葬腎雖 彊懊蝗棲棻\n" +msgstr "%s: 月諻, 貐窶趣 麮謔禺鴔 蛟么n" -#: src/chpasswd.c:319 +#: src/chpasswd.c:309 #, c-format msgid "%s: error updating shadow file\n" -msgstr "%s: 膠紫辦 だ橾擊 機等檜お ж朝等 螃盟嫦儅\n" +msgstr "%s: 潰 域渣 月諻\n" -#: src/chpasswd.c:328 +#: src/chpasswd.c:318 #, c-format msgid "%s: error updating password file\n" -msgstr "%s: ぬ蝶錶萄 だ橾擊 機等檜お ж朝等 螃盟嫦儅\n" +msgstr "%s: 到木 潰 域渣 月諻\n" -#: src/chsh.c:75 +#: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" -msgstr "餌辨徹: %s [-s 蔗] [檜葷]\n" - -#: src/chsh.c:89 -#, fuzzy -msgid "Enter the new value, or press return for the default\n" -msgstr "億煎遴 高擊 厥剪釭, 蛤ィお蒂 錳ж賊 縛攪蒂 纂撮蹂\n" +msgstr "科拘: %s [-s ] [渠]\n" #: src/chsh.c:90 -msgid "Login Shell" -msgstr "煎曹 蔗" +#, fuzzy +msgid "Enter the new value, or press return for the default\n" +msgstr "諢 穈 穇圉, 渣賈未 諰 圉未 儦賄\n" -#: src/chsh.c:239 src/chsh.c:253 +#: src/chsh.c:91 +msgid "Login Shell" +msgstr "諢篣 " + +#: src/chsh.c:234 src/chsh.c:248 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "餌辨濠朝 %s縑 渠и 蔗擊 滲唳й 熱 橈蝗棲棻.\n" +msgstr "科拖 %s 貐窶踫 蛟.\n" -#: src/chsh.c:282 +#: src/chsh.c:277 #, c-format msgid "Changing the login shell for %s\n" -msgstr "%s縑 渠и 煎曹 蔗擊 滲唳ж堅 氈蝗棲棻\n" +msgstr "%s 諢篣 貐窶踫窸 蛟么n" -#: src/chsh.c:294 +#: src/chsh.c:289 #, c-format msgid "%s: Invalid entry: %s\n" -msgstr "%s: 睡瞳瞰и 殮溘: %s\n" +msgstr "%s: 賱 : %s\n" -#: src/chsh.c:301 +#: src/chsh.c:296 #, c-format msgid "%s is an invalid shell.\n" -msgstr "%s朝 睡瞳瞰и 蔗殮棲棻.\n" - -#: src/dpasswd.c:52 -#, c-format -msgid "Usage: %s [-(a|d)] shell\n" -msgstr "餌辨徹: %s [-(a|d)] 蔗\n" - -#: src/dpasswd.c:115 -msgid "Shell password: " -msgstr "蔗 ぬ蝶錶萄: " - -#: src/dpasswd.c:121 -msgid "re-enter Shell password: " -msgstr "蔗 ぬ蝶錶萄蒂 棻衛 殮溘: " - -#: src/dpasswd.c:129 -#, c-format -msgid "%s: Passwords do not match, try again.\n" -msgstr "%s: ぬ蝶錶萄陛 蜃雖 彊蝗棲棻. 棻衛 衛紫ж撮蹂. \n" - -#: src/dpasswd.c:149 -#, c-format -msgid "%s: can't create %s" -msgstr "%s: %s蒂 虜菟 熱 橈蝗棲棻" - -#: src/dpasswd.c:155 -#, c-format -msgid "%s: can't open %s" -msgstr "%s: %s蒂 翮熱陛 橈蝗棲棻" - -#: src/dpasswd.c:183 -#, c-format -msgid "%s: Shell %s not found.\n" -msgstr "%s: %s曖 蔗檜 嫦唯腎雖 橈蝗棲棻.\n" +msgstr "%s 賱 .\n" #: src/expiry.c:59 msgid "Usage: expiry {-f|-c}\n" -msgstr "餌辨徹: 虜晦 {-f|-c}\n" +msgstr "科拘: 諤篣 {-f|-c}\n" #: src/expiry.c:113 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" -msgstr "%s: 唳堅! 奩萄衛 瑞お曖 UID蒂 蜃轎匙!\n" +msgstr "%s: 窶赭! 諻 諴刮賄 UID諝 諤黺窶!\n" #: src/expiry.c:124 #, c-format msgid "%s: unknown user\n" -msgstr "%s: 憲熱橈朝 餌辨濠\n" +msgstr "%s: 科拖\n" #: src/faillog.c:77 -#, c-format -msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" -msgstr "餌辨徹: %s [-a|-u 餌辨濠] [-m 譆渠] [-r] [-t 陳瞼] [-l locksecs]\n" +#, fuzzy, c-format +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +msgstr "科拘: %s [-a|-u 科拖] [-m 黖] [-r] [-t 鴔] [-l locksecs]\n" #: src/faillog.c:131 src/lastlog.c:96 #, c-format msgid "Unknown User: %s\n" -msgstr "憲熱橈朝 餌辨濠: %s\n" +msgstr " 科拖: %s\n" #: src/faillog.c:212 msgid "Username Failures Maximum Latest\n" -msgstr "譆渠 殮溘衛 梱雖 餌辨濠 檜葷 檣隸 褒ぬ\n" +msgstr "黖 伊 篧鴔 科拖 渠 賄 欠沔n" #: src/faillog.c:229 #, c-format msgid " %s on %s" -msgstr "%s 曖 %s" +msgstr "%s %s" #: src/faillog.c:233 #, c-format @@ -716,283 +626,273 @@ msgid " [%lds lock]" msgstr " [%lds lock]" #: src/gpasswd.c:78 -#, c-format -msgid "usage: %s [-r|-R] group\n" -msgstr "餌辨徹: %s [-r|-R] 斜瑜\n" +#, fuzzy, c-format +msgid "Usage: %s [-r|-R] group\n" +msgstr "科拘: %s [-r|-R] 篞賈ㄨ\n" #: src/gpasswd.c:79 #, c-format msgid " %s [-a user] group\n" -msgstr " %s [-a 餌辨濠] 斜瑜\n" +msgstr " %s [-a 科拖] 篞賈ㄨ\n" #: src/gpasswd.c:80 #, c-format msgid " %s [-d user] group\n" -msgstr " %s [-d 餌辨濠] 斜瑜\n" +msgstr " %s [-d 科拖] 篞賈ㄨ\n" #: src/gpasswd.c:83 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" -msgstr " %s [-A 餌辨濠,...] [-M 餌辨濠,...] 斜瑜\n" +msgstr " %s [-A 科拖,...] [-M 科拖,...] 篞賈ㄨ\n" #: src/gpasswd.c:85 #, c-format msgid " %s [-M user,...] group\n" -msgstr " %s [-M 餌辨濠,...] 斜瑜\n" +msgstr " %s [-M 科拖,...] 篞賈ㄨ\n" #: src/gpasswd.c:146 src/gpasswd.c:230 #, c-format msgid "%s: unknown user %s\n" -msgstr "%s: 憲 熱 橈朝 餌辨濠 %s\n" +msgstr "%s: 科拖 %s\n" #: src/gpasswd.c:157 msgid "Permission denied.\n" -msgstr "蕾斬掏и 橈擠.\n" +msgstr "篞澎 .\n" #: src/gpasswd.c:243 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s: -A縑 渠ж罹 膠紫辦 斜瑜 ぬ蝶錶萄陛 в蹂м棲棻\n" +msgstr "%s: -A 篞賈ㄨ 到木穈 拘么n" #: src/gpasswd.c:294 msgid "Who are you?\n" -msgstr "渡褐擎 援掘褊棲梱?\n" +msgstr "寢 窱科卿篧?\n" -#: src/gpasswd.c:313 src/newgrp.c:297 +#: src/gpasswd.c:313 src/newgrp.c:292 #, c-format msgid "unknown group: %s\n" -msgstr "憲 熱 橈朝 斜瑜: %s\n" +msgstr " 篞賈ㄨ: %s\n" #: src/gpasswd.c:422 #, c-format msgid "Adding user %s to group %s\n" -msgstr "%s 斜瑜縑 %s 餌辨濠 蛔煙醞\n" +msgstr "%s 篞賈ㄨ %s 科拖 梵鴗\n" #: src/gpasswd.c:440 #, c-format msgid "Removing user %s from group %s\n" -msgstr "%s 斜瑜 戲煎睡攪 %s 餌辨濠 餉薯醞\n" +msgstr "%s 篞賈ㄨ 潺賱 %s 科拖 原鴗\n" #: src/gpasswd.c:454 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s: 憲 熱 橈朝 斜瑜詹幗 %s\n" +msgstr "%s: 篞賈ㄨ諰月 %s\n" #: src/gpasswd.c:501 #, c-format msgid "%s: Not a tty\n" -msgstr "%s: tty 陛 嬴椒\n" +msgstr "%s: tty 穈 \n" -#. -#. * A new password is to be entered and it must be encrypted, etc. -#. * The password will be prompted for twice, and both entries must be -#. * identical. There is no need to validate the old password since -#. * the invoker is either the group owner, or root. -#. #: src/gpasswd.c:522 #, c-format msgid "Changing the password for group %s\n" -msgstr "%s 斜瑜縑 渠ж罹 ぬ蝶錶萄蒂 滲唳醞\n" +msgstr "%s 篞賈ㄨ 到木諝 貐窶趣\n" #: src/gpasswd.c:525 msgid "New Password: " -msgstr "億煎遴 ぬ蝶錶萄: " +msgstr "諢 到木: " -#: src/gpasswd.c:530 src/passwd.c:365 +#: src/gpasswd.c:530 src/passwd.c:281 msgid "Re-enter new password: " -msgstr "億 ぬ蝶錶萄蒂 棻衛 殮溘ж撮蹂: " +msgstr " 到木諝 木 伕賄: " #: src/gpasswd.c:542 msgid "They don't match; try again" -msgstr "殮溘高檜 橾纂ж雖 彊蝗棲棻; 棻衛 衛紫ж撮蹂" +msgstr "伉 潰鴔 蛟; 木 賄" #: src/gpasswd.c:546 #, c-format msgid "%s: Try again later\n" -msgstr "%s: 釭醞縑 棻衛 衛紫ж撮蹂\n" +msgstr "%s: 鴗 木 賄\n" #: src/gpasswd.c:578 #, c-format msgid "%s: can't get lock\n" -msgstr "%s: 濡旎擊 й 熱 橈蝗棲棻\n" +msgstr "%s: 篣 蛟么n" #: src/gpasswd.c:584 #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s: 膠紫辦 濡旎擊 й 熱 橈蝗棲棻\n" +msgstr "%s: 篣 蛟么n" #: src/gpasswd.c:590 #, c-format msgid "%s: can't open file\n" -msgstr "%s: だ橾擊 翮 熱 橈蝗棲棻\n" +msgstr "%s: 潰 蛟么n" #: src/gpasswd.c:602 #, c-format msgid "%s: can't update entry\n" -msgstr "%s: 殮溘高擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: 伉 域渣 蛟么n" #: src/gpasswd.c:608 #, c-format msgid "%s: can't update shadow entry\n" -msgstr "%s: 膠紫辦 殮溘高擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: 伉 域渣 蛟么n" #: src/gpasswd.c:615 #, c-format msgid "%s: can't re-write file\n" -msgstr "%s: だ橾擊 棻衛 噩 熱 橈蝗棲棻\n" +msgstr "%s: 潰 木 蛟么n" #: src/gpasswd.c:621 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s: 膠紫辦 だ橾擊 棻衛 噩 熱 橈蝗棲棻\n" +msgstr "%s: 潰 木 蛟么n" #: src/gpasswd.c:630 #, c-format msgid "%s: can't unlock file\n" -msgstr "%s: だ橾 濡旎擊 ヴ 熱 橈蝗棲棻\n" +msgstr "%s: 篣 蛟么n" #: src/gpasswd.c:635 #, c-format msgid "%s: can't update DBM files\n" -msgstr "%s: DBM だ橾擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: DBM 潰 域渣 蛟么n" #: src/gpasswd.c:642 #, c-format msgid "%s: can't update DBM shadow files\n" -msgstr "%s: DBM 膠紫辦 だ橾擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: DBM 潰 域渣 蛟么n" -#: src/groupadd.c:101 -msgid "usage: groupadd [-g gid [-o]] group\n" -msgstr "餌辨徹: groupadd [-g gid(斜瑜 嬴檜蛤) [-o]] 斜瑜貲\n" +#: src/groupadd.c:102 +#, fuzzy +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" +msgstr "科拘: groupadd [-g gid(篞賈ㄨ 渠) [-o]] 篞賈ㄨ諈\n" -#: src/groupadd.c:167 src/groupadd.c:192 src/groupmod.c:179 src/groupmod.c:228 -#: src/useradd.c:970 src/usermod.c:552 src/usermod.c:695 +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s: 億煎遴 斜瑜擊 蹺陛ж朝等 螃盟\n" +msgstr "%s: 諢 篞賈ㄨ 黺穈 月\n" -#: src/groupadd.c:178 src/groupadd.c:203 src/groupmod.c:197 src/useradd.c:981 -#: src/usermod.c:564 src/usermod.c:708 +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 #, c-format msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: 億煎遴 dbm 斜瑜 殮溘高擊 蹺陛ж朝等 螃盟\n" +msgstr "%s: 諢 dbm 篞賈ㄨ 伉 黺穈 月\n" -#: src/groupadd.c:255 src/useradd.c:1034 +#: src/groupadd.c:256 src/useradd.c:977 #, c-format msgid "%s: name %s is not unique\n" -msgstr "%s: %s 塢 檜葷擎 瞳瞰ж雖 彊蝗棲棻\n" +msgstr "%s: %s 渠 鴔 蛟么n" -#: src/groupadd.c:270 +#: src/groupadd.c:271 #, c-format msgid "%s: gid %u is not unique\n" -msgstr "%s: uid(餌辨濠 嬴檜蛤) %u 朝 瞳瞰ж雖 彊蝗棲棻\n" +msgstr "%s: uid(科拖 渠) %u 鴔 蛟么n" -#: src/groupadd.c:294 +#: src/groupadd.c:295 #, c-format msgid "%s: can't get unique gid\n" -msgstr "%s: 瞳瞰и gid(斜瑜 嬴檜蛤)蒂 橢擊 熱 橈蝗棲棻\n" +msgstr "%s: gid(篞賈ㄨ 渠)諝 髦 蛟么n" -#. -#. * All invalid group names land here. -#. -#: src/groupadd.c:317 src/groupmod.c:341 +#: src/groupadd.c:318 src/groupmod.c:342 #, c-format msgid "%s: %s is a not a valid group name\n" -msgstr "%s: %s 朝 嶸褲 斜瑜貲檜 嬴椎棲棻\n" +msgstr "%s: %s 刮 篞賈ㄨ諈 么n" -#: src/groupadd.c:346 src/groupmod.c:366 +#: src/groupadd.c:347 src/groupmod.c:367 #, c-format msgid "%s: invalid group %s\n" -msgstr "%s: 嶸褲狫 彊擎 斜瑜 %s\n" +msgstr "%s: 刮鴔 篞賈ㄨ %s\n" -#: src/groupadd.c:363 src/useradd.c:1313 +#: src/groupadd.c:364 src/useradd.c:1173 #, c-format msgid "%s: -O requires NAME=VALUE\n" -msgstr "%s: NAME=VALUE 蒂 嬪п憮朝 -O 褫暮檜 в蹂м棲棻\n" +msgstr "%s: NAME=VALUE 諝 渥 -O 蛙 拘么n" -#: src/groupadd.c:407 src/groupdel.c:173 src/groupmod.c:401 src/useradd.c:1428 -#: src/userdel.c:312 src/usermod.c:576 +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 #, c-format msgid "%s: cannot rewrite group file\n" -msgstr "%s: 斜瑜だ橾擊 棻衛 噩 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ潰 木 蛟么n" -#: src/groupadd.c:415 src/groupdel.c:179 src/groupmod.c:409 src/useradd.c:1437 -#: src/userdel.c:319 src/usermod.c:722 +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 #, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s: 膠紫辦 斜瑜 だ橾擊 棻衛 噩 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 潰 木 蛟么n" -#: src/groupadd.c:433 src/groupdel.c:198 src/groupmod.c:427 src/userdel.c:403 +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s: 斜瑜 だ橾 濡旎擊 й 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 篣 蛟么n" -#: src/groupadd.c:438 src/groupdel.c:202 src/groupmod.c:432 +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 #, c-format msgid "%s: unable to open group file\n" -msgstr "%s: 斜瑜 だ橾擊 翮熱陛 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 潰 渥穈 蛟么n" -#: src/groupadd.c:445 src/groupdel.c:207 src/groupmod.c:439 src/userdel.c:414 +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: 膠紫辦 斜瑜 だ橾 濡旎擊 й 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 篣 蛟么n" -#: src/groupadd.c:451 src/groupdel.c:212 src/groupmod.c:445 +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: 膠紫辦 斜瑜 だ橾擊 翮 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 潰 蛟么n" -#: src/groupadd.c:562 +#: src/groupadd.c:563 #, c-format msgid "%s: group %s exists\n" -msgstr "%s: 斜瑜 %s 朝 襄營м棲棻\n" +msgstr "%s: 篞賈ㄨ %s 魽渥秒拘么n" -#: src/groupdel.c:92 -msgid "usage: groupdel group\n" -msgstr "餌辨徹: groupdel 斜瑜貲\n" +#: src/groupdel.c:88 +#, fuzzy +msgid "Usage: groupdel group\n" +msgstr "科拘: groupdel 篞賈ㄨ諈\n" -#: src/groupdel.c:110 src/groupmod.c:184 src/groupmod.c:233 +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 #, c-format msgid "%s: error removing group entry\n" -msgstr "%s: 斜瑜 殮溘高擊 薯剪ж朝等 螃盟\n" +msgstr "%s: 篞賈ㄨ 伉 穇堅 月\n" -#: src/groupdel.c:122 src/groupmod.c:204 +#: src/groupdel.c:119 src/groupmod.c:205 #, c-format msgid "%s: error removing group dbm entry\n" -msgstr "%s: 斜瑜 dbm 殮溘高擊 薯剪ж朝等 螃盟\n" +msgstr "%s: 篞賈ㄨ dbm 伉 穇堅 月\n" -#: src/groupdel.c:137 +#: src/groupdel.c:135 #, c-format msgid "%s: error removing shadow group entry\n" -msgstr "%s: 膠紫辦 斜瑜 殮溘高擊 薯剪ж朝等 螃盟\n" +msgstr "%s: 篞賈ㄨ 伉 穇堅 月\n" -#: src/groupdel.c:150 src/groupmod.c:254 +#: src/groupdel.c:149 src/groupmod.c:255 #, c-format msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: 膠紫辦 斜瑜 dbm 殮溘高擊 薯剪ж朝等 螃盟\n" +msgstr "%s: 篞賈ㄨ dbm 伉 穇堅 月\n" -#. -#. * Can't remove the group. -#. -#: src/groupdel.c:254 +#: src/groupdel.c:255 #, c-format msgid "%s: cannot remove user's primary group.\n" -msgstr "%s: 餌辨濠曖 primary 斜瑜擊 薯剪й 熱 橈蝗棲棻.\n" +msgstr "%s: 科拖 primary 篞賈ㄨ 穇堅 蛟.\n" -#: src/groupdel.c:355 src/groupmod.c:550 +#: src/groupdel.c:359 src/groupmod.c:551 #, c-format msgid "%s: group %s does not exist\n" -msgstr "%s: 斜瑜 %s 朝 襄營ж雖 彊蝗棲棻\n" +msgstr "%s: 篞賈ㄨ %s 魽渥秒鴔 蛟么n" -#: src/groupdel.c:369 src/groupmod.c:566 +#: src/groupdel.c:373 src/groupmod.c:567 #, c-format msgid "%s: group %s is a NIS group\n" -msgstr "%s: 斜瑜 %s 朝 NIS 斜瑜殮棲棻\n" +msgstr "%s: 篞賈ㄨ %s NIS 篞賈ㄨ么n" -#: src/groupdel.c:375 src/groupmod.c:571 src/userdel.c:776 src/usermod.c:1045 +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 #, c-format msgid "%s: %s is the NIS master\n" -msgstr "%s: %s 朝 NIS 葆蝶攪(master)殮棲棻\n" +msgstr "%s: %s NIS 諤欠(master)么n" #: src/groupmems.c:95 msgid "Member already exists\n" @@ -1003,7 +903,7 @@ msgid "Member to remove could not be found\n" msgstr "" #: src/groupmems.c:158 -msgid "usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" msgstr "" #: src/groupmems.c:201 @@ -1020,58 +920,59 @@ msgstr "" #: src/groupmems.c:215 msgid "Unable to lock group file\n" -msgstr "斜瑜 だ橾 濡旎擊 й 熱 橈蝗棲棻\n" +msgstr "篞賈ㄨ 篣 蛟么n" #: src/groupmems.c:220 msgid "Unable to open group file\n" -msgstr "斜瑜 だ橾擊 翮熱陛 橈蝗棲棻\n" +msgstr "篞賈ㄨ 潰 渥穈 蛟么n" #: src/groupmems.c:240 msgid "Cannot close group file\n" -msgstr "斜瑜 だ橾擊 翮 熱 橈蝗棲棻\n" +msgstr "篞賈ㄨ 潰 蛟么n" -#: src/groupmod.c:103 -msgid "usage: groupmod [-g gid [-o]] [-n name] group\n" -msgstr "餌辨徹: groupmod [-g gid(斜瑜 嬴檜蛤) [-o]] [-n 檜葷] 斜瑜貲\n" +#: src/groupmod.c:104 +#, fuzzy +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "科拘: groupmod [-g gid(篞賈ㄨ 渠) [-o]] [-n 渠] 篞賈ㄨ諈\n" -#: src/groupmod.c:161 +#: src/groupmod.c:162 #, c-format msgid "%s: %s not found in /etc/group\n" -msgstr "%s: %s 朝 /etc/group 縑憮 嫦唯檜 腎雖 彊懊蝗棲棻\n" +msgstr "%s: %s /etc/group 諻窶科 鴔 蛟么n" -#: src/groupmod.c:247 +#: src/groupmod.c:248 #, c-format msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: 億煎遴 dbm 膠紫辦 斜瑜 殮溘高擊 蹺陛й 熱 橈蝗棲棻\n" +msgstr "%s: 諢 dbm 篞賈ㄨ 伉 黺穈 蛟么n" -#: src/groupmod.c:300 +#: src/groupmod.c:301 #, c-format msgid "%s: %u is not a unique gid\n" -msgstr "%s: %u 朝 瞳瞰и gid(斜瑜 嬴檜蛤)陛 嬴椎棲棻\n" +msgstr "%s: %u gid(篞賈ㄨ 渠)穈 么n" -#: src/groupmod.c:330 +#: src/groupmod.c:331 #, c-format msgid "%s: %s is not a unique name\n" -msgstr "%s: %s 朝 瞳瞰и 檜葷檜 嬴椎棲棻\n" +msgstr "%s: %s 渠 么n" #: src/groups.c:59 #, c-format msgid "unknown user %s\n" -msgstr "憲熱橈朝 餌辨濠 %s\n" +msgstr " 科拖 %s\n" #: src/grpck.c:87 #, c-format msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" -msgstr "餌辨徹: %s [-s] [-r] [group [gshadow]]\n" +msgstr "科拘: %s [-s] [-r] [group [gshadow]]\n" #: src/grpck.c:90 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" -msgstr "餌辨徹: %s [-s] [-r] [group]\n" +msgstr "科拘: %s [-s] [-r] [group]\n" #: src/grpck.c:108 src/pwck.c:108 msgid "No" -msgstr "嬴棲螃" +msgstr "" #: src/grpck.c:192 src/pwck.c:175 #, c-format @@ -1081,327 +982,300 @@ msgstr "" #: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s: だ橾 %s 濡旎擊 й 熱 橈蝗棲棻\n" +msgstr "%s: %s 篣 蛟么n" #: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:202 src/pwck.c:242 #: src/pwck.c:251 #, c-format msgid "%s: cannot open file %s\n" -msgstr "%s: だ橾 %s 蒂 翮 熱 橈蝗棲棻\n" +msgstr "%s: %s 諝 蛟么n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:311 msgid "invalid group file entry\n" -msgstr "嶸褲狫 彊擎 斜瑜だ橾 殮溘高\n" +msgstr "刮鴔 篞賈ㄨ 伉\n" #: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 #: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 #: src/pwck.c:543 #, c-format msgid "delete line `%s'? " -msgstr "塭檣 '%s'蒂 雖選梱蹂? " +msgstr "潰 '%s'諝 鴔資? " -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:374 msgid "duplicate group entry\n" -msgstr "斜瑜 殮溘高 犒薯\n" +msgstr "篞賈ㄨ 伉 貐蛙\n" #: src/grpck.c:391 #, c-format msgid "invalid group name `%s'\n" -msgstr "嶸褲狫 彊擎 斜瑜貲 '%s'\n" +msgstr "刮鴔 篞賈ㄨ諈 '%s'\n" #: src/grpck.c:418 #, c-format msgid "group %s: no user %s\n" -msgstr "斜瑜 %s: 餌辨濠 %s 陛 橈蝗棲棻\n" +msgstr "篞賈ㄨ %s: 科拖 %s 穈 蛟么n" #: src/grpck.c:420 src/grpck.c:590 #, c-format msgid "delete member `%s'? " -msgstr "詹幗 '%s'蒂 雖選梱蹂? " +msgstr "諰月 '%s'諝 鴔資? " -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:457 msgid "invalid shadow group file entry\n" -msgstr "嶸褲狫 彊擎 膠紫辦 斜瑜だ橾 殮溘高\n" +msgstr "刮鴔 篞賈ㄨ 伉\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:520 msgid "duplicate shadow group entry\n" -msgstr "膠紫辦 斜瑜 殮溘高 犒薯\n" +msgstr " 篞賈ㄨ 伉 貐蛙\n" #: src/grpck.c:537 msgid "no matching group file entry\n" -msgstr "斜瑜 だ橾 殮溘高檜 橾纂ж雖 彊蝗棲棻\n" +msgstr "篞賈ㄨ 伉 潰鴔 蛟么n" #: src/grpck.c:558 #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "膠紫辦 斜瑜 %s: 婦葬掏и檜 氈朝 餌辨濠 %s 陛 橈蝗棲棻\n" +msgstr " 篞賈ㄨ %s: 窵謔禹 科拖 %s 穈 蛟么n" #: src/grpck.c:560 #, c-format msgid "delete administrative member `%s'? " -msgstr "婦葬 掏и檜 氈朝 詹幗 '%s' 蒂 雖選梱蹂? " +msgstr "窵謔 窷 諰月 '%s' 諝 鴔資? " #: src/grpck.c:588 #, c-format msgid "shadow group %s: no user %s\n" -msgstr "膠紫辦 斜瑜 %s: %s 塢 餌辨濠陛 橈蝗棲棻\n" +msgstr " 篞賈ㄨ %s: %s 科拖穈 蛟么n" #: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 #, c-format msgid "%s: cannot update file %s\n" -msgstr "%s: だ橾 %s 蒂 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: %s 諝 域渣 蛟么n" #: src/grpck.c:647 src/pwck.c:612 #, c-format msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: だ橾檜 機等檜お 腎歷蝗棲棻; mkpasswd 蒂 褒чж褊衛螃\n" +msgstr "%s: 潰 域渣 蛟; mkpasswd 諝 欠原么n" #: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 #, c-format msgid "%s: no changes\n" -msgstr "%s: 滲唳檜 寰 腎歷蝗棲棻\n" +msgstr "%s: 貐窶趣 蛟么n" #: src/grpck.c:651 src/pwck.c:616 #, c-format msgid "%s: the files have been updated\n" -msgstr "%s: だ橾檜 機等檜お 腎歷蝗棲棻\n" +msgstr "%s: 潰 域渣 蛟么n" #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" -msgstr "%s: 斜瑜 だ橾 濡旎擊 й 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 篣 蛟么n" #: src/grpconv.c:65 src/grpunconv.c:61 #, c-format msgid "%s: can't open group file\n" -msgstr "%s: 斜瑜 だ橾擊 翮 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 潰 蛟么n" #: src/grpconv.c:70 src/grpunconv.c:66 #, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: 膠紫辦 斜瑜 だ橾 濡旎擊 й 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 篣 蛟么n" #: src/grpconv.c:76 src/grpunconv.c:72 #, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: 膠紫辦 斜瑜 だ橾擊 翮 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 潰 蛟么n" #: src/grpconv.c:94 #, c-format msgid "%s: can't remove shadow group %s\n" -msgstr "%s: 膠紫辦 斜瑜 %s 蒂 薯剪й 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ %s 諝 穇堅 蛟么n" -#: src/grpconv.c:138 src/pwconv.c:153 +#: src/grpconv.c:133 src/pwconv.c:154 #, c-format msgid "%s: can't update shadow entry for %s\n" -msgstr "%s: %s 縑 渠и 膠紫辦 殮溘高擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: %s 伉 域渣 蛟么n" -#: src/grpconv.c:148 src/grpunconv.c:91 +#: src/grpconv.c:143 src/grpunconv.c:91 #, c-format msgid "%s: can't update entry for group %s\n" -msgstr "%s: %s 斜瑜縑 渠и 殮溘高擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: %s 篞賈ㄨ 伉 域渣 蛟么n" -#: src/grpconv.c:155 src/grpunconv.c:99 +#: src/grpconv.c:150 src/grpunconv.c:99 #, c-format msgid "%s: can't update shadow group file\n" -msgstr "%s: 膠紫辦 斜瑜 だ橾擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 潰 域渣 蛟么n" -#: src/grpconv.c:160 src/grpunconv.c:105 +#: src/grpconv.c:155 src/grpunconv.c:105 #, c-format msgid "%s: can't update group file\n" -msgstr "%s: 斜瑜 だ橾擊 機等檜お й 熱 橈蝗棲棻\n" - -#: src/grpconv.c:175 src/grpunconv.c:127 -#, c-format -msgid "%s: not configured for shadow group support.\n" -msgstr "%s: 膠紫辦 斜瑜 雖錳縑 渠ж罹 ⑽撩檜 腎雖 彊懊蝗棲棻.\n" +msgstr "%s: 篞賈ㄨ 潰 域渣 蛟么n" #: src/grpunconv.c:110 #, c-format msgid "%s: can't delete shadow group file\n" -msgstr "%s: 膠紫辦 斜瑜 だ橾擊 雖選熱 橈蝗棲棻\n" +msgstr "%s: 篞賈ㄨ 潰 鴔賄 蛟么n" #: src/id.c:53 -msgid "usage: id [-a]\n" -msgstr "餌辨徹: id [-a]\n" +#, fuzzy +msgid "Usage: id [-a]\n" +msgstr "科拘: id [-a]\n" #: src/id.c:55 -msgid "usage: id\n" -msgstr "餌辨徹: id\n" +#, fuzzy +msgid "Usage: id\n" +msgstr "科拘: id\n" -#. -#. * Start off the group message. It will be of the format -#. * -#. * groups=###(aaa),###(aaa),###(aaa) -#. * -#. * where "###" is a numerical value and "aaa" is the -#. * corresponding name for each respective numerical value. -#. #: src/id.c:169 msgid " groups=" -msgstr " 斜瑜菟=" +msgstr " 篞賈ㄨ=" #: src/lastlog.c:110 src/lastlog.c:116 #, c-format -msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n" +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" msgstr "" #: src/lastlog.c:181 msgid "Username Port From Latest\n" -msgstr "餌辨濠貲\tんお\t~煎睡攪\t\t譆斬薑爾\n" +msgstr "科拖諈\t秒稞t~諢賱豹t\t黖篞潰貐廄n" #: src/lastlog.c:183 msgid "Username Port Latest\n" -msgstr "餌辨濠貲\t\tんお\t譆斬薑爾\n" +msgstr "科拖諈\t\t秒稞t黖篞潰貐廄n" -#: src/lastlog.c:197 +#: src/lastlog.c:198 msgid "**Never logged in**" -msgstr "**и廓紫 煎曹и瞳檜 橈蝗棲棻**" +msgstr "**貒 諢篣渣 蛟**" -#: src/login.c:185 -#, c-format -msgid "usage: %s [-p] [name]\n" -msgstr "餌辨徹: %s [-p] [檜葷]\n" +#: src/login.c:175 +#, fuzzy, c-format +msgid "Usage: %s [-p] [name]\n" +msgstr "科拘: %s [-p] [渠]\n" -#: src/login.c:188 +#: src/login.c:178 #, c-format msgid " %s [-p] [-h host] [-f name]\n" -msgstr "\t%s [-p][-h ˊ瘋捂燱[-f 檜葷]\n" +msgstr "\t%s [-p][-h 賄欠賈][-f 渠]\n" -#: src/login.c:190 +#: src/login.c:180 #, c-format msgid " %s [-p] -r host\n" -msgstr "\t%s [-p] -r ˊ瘋娉n" +msgstr "\t%s [-p] -r 賄欠稞n" -#: src/login.c:274 +#: src/login.c:259 msgid "Invalid login time\n" -msgstr "嶸褲狫 彊擎 煎曹 衛除(⑷營衛除擎 煎曹掏и 橈擠)\n" +msgstr "刮鴔 諢篣 穈(科穈 諢篣湊 )\n" -#: src/login.c:329 +#: src/login.c:314 msgid "" "\n" "System closed for routine maintenance\n" msgstr "" "\n" -"斬錳雖曖 薑綠蒂 嬪п 衛蝶蠱檜 謙猿腎歷蝗棲棻\n" +"篞潰鴔 赬諝 欠 鮈諴蛟么n" -#: src/login.c:340 +#: src/login.c:325 msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[蕾樓п薯陛 鼠衛腎歷蝗棲棻 -- 瑞お虜 煎曹擊 й 熱 氈蝗棲棻]\n" +"[渥穈 諡渥蛟 -- 諴刮賈 諢篣渥 蛟也\n" -#: src/login.c:377 +#: src/login.c:362 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" "\n" -"%d 蟾醴 煎曹 衛除檜 諫猿腌棲棻.\n" +"%d 黕 諢篣 穈 諴拘.\n" -#: src/login.c:689 +#: src/login.c:648 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " on `%.100s' from `%.200s'" -#: src/login.c:693 +#: src/login.c:652 #, c-format msgid " on `%.100s'" msgstr " on `%.100s'" -#: src/login.c:852 +#: src/login.c:811 #, c-format msgid "" "\n" "%s login: " msgstr "" "\n" -"%s 煎曹: " +"%s 諢篣: " -#: src/login.c:855 +#: src/login.c:814 msgid "login: " -msgstr "煎曹: " +msgstr "諢篣: " -#: src/login.c:1071 src/sulogin.c:233 +#: src/login.c:1013 src/sulogin.c:205 msgid "Login incorrect" -msgstr "煎曹貲檜 蜃雖 彊蝗棲棻" +msgstr "諢篣渠 諤鴔 蛟" -#: src/login.c:1265 +#: src/login.c:1193 msgid "Warning: login re-enabled after temporary lockout.\n" -msgstr "唳堅: 橾衛瞳戲煎 む潑脹菴 棻衛 煎曹й 熱 氈蝗棲棻.\n" +msgstr "窶赭: 潰潺 木 諢篣渣 蛟.\n" -#: src/login.c:1278 +#: src/login.c:1207 #, c-format msgid "Last login: %s on %s" -msgstr "葆雖虞 煎曹: %s on %s" +msgstr "諤鴔諤 諢篣: %s on %s" -#: src/login.c:1281 +#: src/login.c:1210 #, c-format msgid "Last login: %.19s on %s" -msgstr "葆雖虞 煎曹: %.19s on %s" +msgstr "諤鴔諤 諢篣: %.19s on %s" -#: src/login.c:1287 +#: src/login.c:1216 #, c-format msgid " from %.*s" msgstr " from %.*s" -#: src/login.c:1364 +#: src/login.c:1293 msgid "Starting rad_login\n" -msgstr "rad_login 擊 衛濛ж堅 氈蝗棲棻\n" +msgstr "rad_login 窸 蛟么n" #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" msgstr "" -"%s: 衛蝶蠱縑 DBM 等檜攪漆檜蝶陛 橈蝗棲棻 - 評塭憮 橫飩и 匙紫 褒ч腎雖 彊懊蝗" -"棲棻\n" +"%s: 欠 DBM 域渣圉渥曰 蛟 - 圉潰 渠魁 窶 欠鴔 " +"么n" #: src/mkpasswd.c:232 src/mkpasswd.c:237 #, c-format msgid "%s: cannot overwrite file %s\n" -msgstr "%s: だ橾 %s 蒂 啜藥噩 熱 橈蝗棲棻\n" +msgstr "%s: %s 諝 窶寢 蛟么n" #: src/mkpasswd.c:252 #, c-format msgid "%s: cannot open DBM files for %s\n" -msgstr "%s: %s 縑 渠и DBM だ橾擊 翮 熱 橈蝗棲棻\n" +msgstr "%s: %s DBM 潰 蛟么n" #: src/mkpasswd.c:287 #, c-format msgid "%s: the beginning with " -msgstr "%s: ~諦 л眷 衛濛 " +msgstr "%s: ~ 刷 " #: src/mkpasswd.c:288 msgid " is too long\n" -msgstr " 殮溘彰嬪陛 傘鼠 梢棲棻\n" +msgstr " 伙穈 諡 篧么n" #: src/mkpasswd.c:315 #, c-format msgid "%s: error parsing line \"%s\"\n" -msgstr "%s: 塭檣 \"%s\" 擊 碟戮ж朝等 螃盟\n" +msgstr "%s: 潰 \"%s\" 賱 月\n" #: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338 msgid "adding record for name " -msgstr "檜葷縑 渠и 晦煙擊 蹺陛ж堅 氈蝗棲棻 " +msgstr "渠 篣圉 黺穈窸 蛟 " #: src/mkpasswd.c:324 src/mkpasswd.c:329 src/mkpasswd.c:334 src/mkpasswd.c:339 #: src/mkpasswd.c:345 src/mkpasswd.c:351 src/mkpasswd.c:356 src/mkpasswd.c:361 @@ -1411,406 +1285,345 @@ msgstr "" #: src/mkpasswd.c:344 src/mkpasswd.c:350 src/mkpasswd.c:355 src/mkpasswd.c:360 #, c-format msgid "%s: error adding record for " -msgstr "%s: 縑 渠и 晦煙擊 蹺陛ж朝等 螃盟 " +msgstr "%s: 篣圉 黺穈 月 " #: src/mkpasswd.c:378 #, c-format msgid "added %d entries, longest was %d\n" -msgstr "%d 殮溘高檜 蹺陛 腎歷蝗棲棻, 陛濰曹匙擎 %d 殮棲棻\n" +msgstr "%d 伉 黺穈 蛟, 穈伉葩窶 %d 么n" #: src/mkpasswd.c:392 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" -msgstr "餌辨徹: %s [-vf] [-p|sp|sg] だ橾貲\n" +msgstr "科拘: %s [-vf] [-p|sp|sg] 潺\n" #: src/mkpasswd.c:395 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" -msgstr "餌辨徹: %s [-vf][-p|g|sp] だ橾貲\n" +msgstr "科拘: %s [-vf][-p|g|sp] 潺\n" #: src/mkpasswd.c:398 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" -msgstr "餌辨徹: %s [-vf][-p|g] だ橾貲\n" +msgstr "科拘: %s [-vf][-p|g] 潺\n" #: src/newgrp.c:61 -msgid "usage: newgrp [-] [group]\n" -msgstr "餌辨徹: newgrp [-] [斜瑜]\n" +#, fuzzy +msgid "Usage: newgrp [-] [group]\n" +msgstr "科拘: newgrp [-] [篞賈ㄨ]\n" #: src/newgrp.c:63 -msgid "usage: sg group [[-c] command]\n" -msgstr "餌辨徹: sg group [[-c] 貲滄]\n" +#, fuzzy +msgid "Usage: sg group [[-c] command]\n" +msgstr "科拘: sg group [[-c] 諈鉛\n" -#: src/newgrp.c:136 +#: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" -msgstr "憲熱橈朝 uid(餌辨濠 嬴檜蛤): %u\n" +msgstr " uid(科拖 渠): %u\n" -#: src/newgrp.c:219 +#: src/newgrp.c:214 #, c-format msgid "unknown gid: %lu\n" -msgstr "憲熱橈朝 gid(斜瑜 嬴檜蛤): %lu\n" +msgstr " gid(篞賈ㄨ 渠): %lu\n" -#: src/newgrp.c:365 src/newgrp.c:374 +#: src/newgrp.c:360 src/newgrp.c:369 msgid "Sorry.\n" -msgstr "賸歎м棲棻.\n" +msgstr "鴥∮拘.\n" -#: src/newgrp.c:472 +#: src/newgrp.c:469 msgid "too many groups\n" -msgstr "斜瑜菟檜 傘鼠釭 號蝗棲棻\n" +msgstr "篞賈ㄨ木 諡渠 諤蛟么n" #: src/newusers.c:78 #, c-format msgid "Usage: %s [input]\n" -msgstr "餌辨徹:%s [殮溘高]\n" +msgstr "科拘:%s [伉]\n" -#: src/newusers.c:407 +#: src/newusers.c:388 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s: /etc/passwd 濡旎擊 й 熱 橈蝗棲棻.\n" +msgstr "%s: /etc/passwd 篣 蛟.\n" -#: src/newusers.c:419 +#: src/newusers.c:400 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s: だ橾 濡旎擊 й 熱 橈蝗棲棻, 釭醞縑 棻衛 衛紫ж撮蹂\n" +msgstr "%s: 篣 蛟, 鴗 木 賄\n" -#: src/newusers.c:435 +#: src/newusers.c:416 #, c-format msgid "%s: can't open files\n" -msgstr "%s: だ橾擊 翮熱陛 橈蝗棲棻\n" +msgstr "%s: 潰 渥穈 蛟么n" + +#: src/newusers.c:461 +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: 潰 %d: 刮鴔 潰稞n" #: src/newusers.c:480 #, c-format -msgid "%s: line %d: invalid line\n" -msgstr "%s: 塭檣 %d: 嶸褲狫 彊擎 塭檣\n" - -#: src/newusers.c:499 -#, c-format msgid "%s: line %d: can't create GID\n" -msgstr "%s: 塭檣 %d: GID(斜瑜 嬴檜蛤)蒂 虜菟熱 橈蝗棲棻\n" +msgstr "%s: 潰 %d: GID(篞賈ㄨ 渠)諝 諤木 蛟么n" -#: src/newusers.c:515 +#: src/newusers.c:496 #, c-format msgid "%s: line %d: can't create UID\n" -msgstr "%s: 塭檣 %d: UID(餌辨濠 嬴檜蛤)蒂 虜菟熱 橈蝗棲棻\n" +msgstr "%s: 潰 %d: UID(科拖 渠)諝 諤木 蛟么n" -#: src/newusers.c:528 +#: src/newusers.c:509 #, c-format msgid "%s: line %d: cannot find user %s\n" -msgstr "%s: 塭檣 %d: 餌辨濠 %s 蒂 嫦唯й 熱 橈蝗棲棻\n" +msgstr "%s: 潰 %d: 科拖 %s 諝 諻窶秒 蛟么n" -#: src/newusers.c:537 +#: src/newusers.c:518 #, c-format msgid "%s: line %d: can't update password\n" -msgstr "%s: 塭檣 %d: ぬ蝶錶萄蒂 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: 潰 %d: 到木諝 域渣 蛟么n" -#: src/newusers.c:555 +#: src/newusers.c:536 #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "%s: 塭檣 %d: 蛤滓饜葬 虜菟晦蒂 褒ぬц蝗棲棻\n" +msgstr "%s: 潰 %d: 謔 諤曰萼諝 欠刮蛟么n" -#: src/newusers.c:561 +#: src/newusers.c:542 #, c-format msgid "%s: line %d: chown failed\n" -msgstr "%s: 塭檣 %d: chown 擊 褒ぬц蝗棲棻\n" +msgstr "%s: 潰 %d: chown 欠刮蛟么n" -#: src/newusers.c:571 +#: src/newusers.c:552 #, c-format msgid "%s: line %d: can't update entry\n" -msgstr "%s: 塭檣 %d: 殮溘高擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: 潰 %d: 伉 域渣 蛟么n" -#: src/newusers.c:603 +#: src/newusers.c:584 #, c-format msgid "%s: error updating files\n" -msgstr "%s: だ橾擊 機等檜お ж朝等 螃盟\n" +msgstr "%s: 潰 域渣 月\n" -#: src/passwd.c:174 -#, c-format -msgid "usage: %s [-f|-s] [name]\n" -msgstr "餌辨徹: %s [-f|-s][檜葷]\n" +#: src/passwd.c:155 +#, fuzzy, c-format +msgid "Usage: %s [-f|-s] [name]\n" +msgstr "科拘: %s [-f|-s][渠]\n" -#: src/passwd.c:178 +#: src/passwd.c:159 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" -msgstr "\t%s [-x 譆渠][-n 譆模][-w 唳堅][-i 綠側瘓苗 檜葷\n" +msgstr "\t%s [-x 黖][-n 黖][-w 窶赭][-i 赬桶] 渠\n" -#: src/passwd.c:180 +#: src/passwd.c:161 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" -msgstr "\t%s {-l|-u|-d|-S|-e} 檜葷\n" +msgstr "\t%s {-l|-u|-d|-S|-e} 渠\n" -#: src/passwd.c:283 -#, c-format -msgid "User %s has a TCFS key, his old password is required.\n" -msgstr "" -"餌辨濠 %s 朝 TCFS 酈蒂 陛雖堅 氈蝗棲棻, 斜曖 蕨瞪 ぬ蝶錶萄陛 蹂掘腌棲棻.\n" - -#: src/passwd.c:286 -msgid "You can use -t option to force the change.\n" -msgstr "鬼薯煎 滲唳擊 ж晦 嬪п憮朝 -t 褫暮擊 餌辨й 熱 氈蝗棲棻.\n" - -#: src/passwd.c:292 +#: src/passwd.c:216 msgid "Old password: " -msgstr "蕨瞪 ぬ蝶錶萄: " +msgstr " 到木: " -#: src/passwd.c:301 +#: src/passwd.c:225 #, c-format msgid "Incorrect password for `%s'\n" -msgstr "`%s' 縑 渠ж罹 ぬ蝶錶萄陛 蜃雖 彊蝗棲棻\n" +msgstr "`%s' 到木穈 諤鴔 蛟么n" -#: src/passwd.c:314 -#, c-format -msgid "Warning: user %s has a TCFS key.\n" -msgstr "唳堅: 餌辨濠 %s 朝 TCFS 酈蒂 陛雖堅 氈蝗棲棻.\n" - -#: src/passwd.c:333 +#: src/passwd.c:249 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -"億煎遴 ぬ蝶錶萄蒂 殮溘ж撮蹂 (譆模 %d, 譆渠 %d 旋濠)\n" -"鼻ж嬪 旋濠諦 璋濠蒂 褻мж罹 餌辨ж撮蹂.\n" +"諢 到木諝 伕賄 (黖 %d, 黖 %d 篣)\n" +" 篣 恢諝 魽堅拗 科拗賄.\n" -#: src/passwd.c:339 +#: src/passwd.c:255 msgid "New password: " -msgstr "億煎遴 ぬ蝶錶萄: " +msgstr "諢 到木: " -#: src/passwd.c:350 +#: src/passwd.c:266 msgid "Try again.\n" -msgstr "棻衛 衛紫ж撮蹂.\n" +msgstr "木 賄.\n" -#: src/passwd.c:361 +#: src/passwd.c:277 msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"唳堅: 爾寰撩檜 橈朝 ぬ蝶錶萄 (斜楚紫 餌辨ж望 錳и棻賊 棻衛 殮溘ж撮蹂).\n" +"窶赭: 貐渥桿 到木 (篞賈 科拗篣 月庖 木 伕賄).\n" -#: src/passwd.c:371 +#: src/passwd.c:287 msgid "They don't match; try again.\n" -msgstr "殮溘高檜 橾纂ж雖 彊蝗棲棻; 棻衛 衛紫ж撮蹂.\n" +msgstr "伉 潰鴔 蛟; 木 賄.\n" -#: src/passwd.c:451 src/passwd.c:469 +#: src/passwd.c:364 src/passwd.c:382 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "%s 縑 渠и ぬ蝶錶萄朝 滲唳腆 熱 橈蝗棲棻.\n" +msgstr "%s 到木 貐窶趟 蛟.\n" -#: src/passwd.c:494 +#: src/passwd.c:396 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "賸歎м棲棻, %s 縑 渠и ぬ蝶錶萄陛 嬴霜 滲唳檜 腆 熱 橈蝗棲棻.\n" +msgstr "鴥∮拘, %s 到木穈 鴔 貐窶趣 蛟.\n" -#: src/passwd.c:614 +#: src/passwd.c:479 #, c-format msgid "%s: out of memory\n" -msgstr "%s: 詭賅葬 睡褶\n" +msgstr "%s: 諰諈刺收 賱魽崤n" -#: src/passwd.c:769 -msgid "Cannot lock the TCFS key database; try again later\n" -msgstr "TCFS 酈 等檜攪漆檜蝶 濡旎擊 й 熱 橈蝗棲棻; 釭醞縑 棻衛 衛紫ж撮蹂\n" - -#: src/passwd.c:777 -msgid "Cannot open the TCFS key database.\n" -msgstr "TCFS 酈 等檜攪漆檜蝶蒂 翮熱陛 橈蝗棲棻.\n" - -#: src/passwd.c:785 -msgid "Error updating the TCFS key database.\n" -msgstr "TCFs 酈 等檜攪漆檜蝶 機等檜お 醞 螃盟.\n" - -#: src/passwd.c:792 -msgid "Cannot commit TCFS changes.\n" -msgstr "TCFS 滲唳擊 褒чй 熱 橈蝗棲棻.\n" - -#: src/passwd.c:975 +#: src/passwd.c:730 #, c-format msgid "%s: Cannot execute %s" -msgstr "%s: %s 蒂 褒чй 熱 橈蝗棲棻" +msgstr "%s: %s 諝 欠 蛟" -#: src/passwd.c:1077 +#: src/passwd.c:815 #, c-format msgid "%s: repository %s not supported\n" -msgstr "%s: 盪濰模 %s 朝 雖錳檜 腎雖 彊蝗棲棻\n" +msgstr "%s: 伊 %s 鴔 鴔 蛟么n" -#: src/passwd.c:1152 +#: src/passwd.c:890 #, c-format msgid "%s: Permission denied\n" -msgstr "%s: 蕾斬掏и 橈擠\n" +msgstr "%s: 篞澎 \n" -#: src/passwd.c:1176 +#: src/passwd.c:914 #, c-format msgid "You may not change the password for %s.\n" -msgstr "%s 縑 渠и ぬ蝶錶萄蒂 渡褐擎 滲唳й 熱 橈蝗棲棻.\n" +msgstr "%s 到木諝 寢 貐窶踫 蛟.\n" -#: src/passwd.c:1242 +#: src/passwd.c:962 #, c-format msgid "Changing password for %s\n" -msgstr "%s 縑 渠и ぬ蝶錶萄蒂 滲唳醞\n" +msgstr "%s 到木諝 貐窶趣\n" -#: src/passwd.c:1246 +#: src/passwd.c:966 #, c-format msgid "The password for %s is unchanged.\n" -msgstr "%s 縑 渠и ぬ蝶錶萄陛 滲唳腎雖 彊懊蝗棲棻.\n" +msgstr "%s 到木穈 貐窶趟鴔 蛟.\n" -#: src/passwd.c:1297 +#: src/passwd.c:1016 msgid "Password changed.\n" -msgstr "ぬ蝶錶萄陛 滲唳腎歷蝗棲棻.\n" +msgstr "到木穈 貐窶趟蛟.\n" #: src/pwck.c:87 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" -msgstr "餌辨徹: %s [-q] [-r] [-s] [passwd [shadow]]\n" +msgstr "科拘: %s [-q] [-r] [-s] [passwd [shadow]]\n" #: src/pwck.c:90 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" -msgstr "餌辨徹: %s [-q] [-r] [-s] [ぬ蝶錶萄]\n" +msgstr "科拘: %s [-q] [-r] [-s] [到木]\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:295 msgid "invalid password file entry\n" -msgstr "嶸褲狫 彊擎 ぬ蝶錶萄 だ橾 殮溘\n" +msgstr "刮鴔 到木 功n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:357 msgid "duplicate password entry\n" -msgstr "ぬ蝶錶萄 殮溘高 犒薯\n" +msgstr "到木 伉 貐蛙\n" #: src/pwck.c:373 #, c-format msgid "invalid user name '%s'\n" -msgstr "嶸褲狫 彊擎 餌辨濠貲 '%s'\n" +msgstr "刮鴔 科拖諈 '%s'\n" -#. -#. * No primary group, just give a warning -#. #: src/pwck.c:388 #, c-format msgid "user %s: no group %u\n" -msgstr "餌辨濠 %s: 斜瑜檜 橈蝗棲棻 %u\n" +msgstr "科拖 %s: 篞賈ㄨ 蛟 %u\n" #: src/pwck.c:404 #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "餌辨濠 %s: 蛤滓饜葬 %s 朝 襄營ж雖 彊蝗棲棻\n" +msgstr "科拖 %s: 謔 %s 魽渥秒鴔 蛟么n" -#. -#. * Login shell doesn't exist, give a warning -#. #: src/pwck.c:420 #, c-format msgid "user %s: program %s does not exist\n" -msgstr "餌辨濠 %s: Щ煎斜極 %s 朝 襄營ж雖 彊蝗棲棻\n" +msgstr "科拖 %s: 諢篞賈 %s 魽渥秒鴔 蛟么n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:456 msgid "invalid shadow password file entry\n" -msgstr "嶸褲狫 彊擎 膠紫辦 ぬ蝶錶萄 だ橾 殮溘高\n" +msgstr "刮鴔 到木 伉\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:518 msgid "duplicate shadow password entry\n" -msgstr "膠紫辦 ぬ蝶錶萄 殮溘高 犒薯\n" +msgstr " 到木 伉 貐蛙\n" -#. -#. * Tell the user this entry has no matching -#. * /etc/passwd entry and ask them to delete it. -#. #: src/pwck.c:542 msgid "no matching password file entry\n" -msgstr "ぬ蝶錶萄 だ橾 殮溘高檜 橾纂ж雖 彊蝗棲棻\n" +msgstr "到木 伉 潰鴔 蛟么n" #: src/pwck.c:560 #, c-format msgid "user %s: last password change in the future\n" -msgstr "餌辨濠 %s: 葆雖虞 ぬ蝶錶萄朝 釭醞縑 滲唳\n" +msgstr "科拖 %s: 諤鴔諤 到木 鴗 貐窶穀n" -#: src/pwconv.c:84 src/pwunconv.c:93 +#: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s: ぬ蝶錶萄 だ橾 濡旎擊 й 熱 橈蝗棲棻\n" +msgstr "%s: 到木 篣 蛟么n" -#: src/pwconv.c:89 src/pwunconv.c:98 +#: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s: ぬ蝶錶萄 だ橾擊 翮 熱 橈蝗棲棻\n" +msgstr "%s: 到木 潰 蛟么n" -#: src/pwconv.c:117 +#: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "%s: %s 縑 渠и 膠紫辦 殮溘高擊 薯剪й 熱 橈蝗棲棻\n" +msgstr "%s: %s 伉 穇堅 蛟么n" -#: src/pwconv.c:163 +#: src/pwconv.c:164 #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "%s: %s 縑 渠и ぬ蝶錶萄 殮溘高擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: %s 到木 伉 域渣 蛟么n" -#: src/pwconv.c:170 +#: src/pwconv.c:171 #, c-format msgid "%s: can't update shadow file\n" -msgstr "%s: 膠紫辦 だ橾擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: 潰 域渣 蛟么n" -#: src/pwconv.c:175 +#: src/pwconv.c:176 #, c-format msgid "%s: can't update passwd file\n" -msgstr "%s: ぬ蝶錶萄 だ橾擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: 到木 潰 域渣 蛟么n" -#: src/pwunconv.c:50 -#, c-format -msgid "%s: Shadow passwords are not configured.\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄陛 ⑽撩腎雖 彊懊蝗棲棻.\n" - -#: src/pwunconv.c:160 +#: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s: 餌辨濠 %s 縑 渠и 殮溘高擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: 科拖 %s 伉 域渣 蛟么n" -#: src/pwunconv.c:181 +#: src/pwunconv.c:145 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄 だ橾擊 雖選 熱 橈蝗棲棻\n" +msgstr "%s: 到木 潰 鴔 蛟么n" #: src/su.c:133 msgid "Sorry." -msgstr "賸歎м棲棻." +msgstr "鴥∮拘." #: src/su.c:216 #, c-format msgid "%s: must be run from a terminal\n" -msgstr "%s: 攪嘐割縑憮 嫡萄衛 褒ч檜 腎橫螳撿 м棲棻\n" +msgstr "%s: 圉站 諻 欠 渥賄 拘么n" #: src/su.c:306 #, c-format msgid "%s: pam_start: error %d\n" -msgstr "%s: pam_start: 螃盟 %d\n" +msgstr "%s: pam_start: 月 %d\n" #: src/su.c:336 #, c-format msgid "Unknown id: %s\n" -msgstr "憲熱橈朝 嬴檜蛤: %s\n" +msgstr " 渠: %s\n" #: src/su.c:373 src/su.c:390 #, c-format msgid "You are not authorized to su %s\n" -msgstr "渡褐擎 su %s 縑啪 檣隸檜 腎雖 彊懊蝗棲棻\n" +msgstr "寢 su %s 窶 賄 鴔 蛟么n" -#. require own password #: src/su.c:385 msgid "(Enter your own password.)" -msgstr "(濠褐曖 ぬ蝶錶萄蒂 殮溘ж撮蹂.)" +msgstr "( 到木諝 伕賄.)" #: src/su.c:419 #, c-format @@ -1819,610 +1632,665 @@ msgid "" "(Ignored)\n" msgstr "" "%s: %s\n" -"(鼠衛脾)\n" +"(諡渥)\n" -#: src/su.c:626 +#: src/su.c:609 msgid "No shell\n" -msgstr "蔗檜 橈擠\n" +msgstr " \n" -#: src/suauth.c:100 +#: src/suauth.c:105 msgid "Access to su to that account DENIED.\n" -msgstr "檜 橫蘋遴お煎 su煎 蕾斬薯橫ж朝 ъ陛陛 橈擠.\n" +msgstr " 渥僑渣賈 su諢 篞潰渣 穈穈 .\n" -#: src/suauth.c:107 +#: src/suauth.c:113 msgid "Password authentication bypassed.\n" -msgstr "ぬ蝶錶萄 檣隸檜 鼠衛腎歷蝗棲棻.\n" +msgstr "到木 賄 諡渥蛟.\n" -#: src/suauth.c:114 +#: src/suauth.c:122 msgid "Please enter your OWN password as authentication.\n" -msgstr "餌辨濠 濠褐曖 ぬ蝶錶萄蒂 檣隸戲煎賦 殮溘擊 ж褊衛螃.\n" +msgstr "科拖 到木諝 賄潺 伊 原.\n" -#. must be a password file! -#: src/sulogin.c:132 +#: src/sulogin.c:118 msgid "No password file\n" -msgstr "ぬ蝶錶萄 だ橾 橈擠\n" +msgstr "到木 \n" -#. -#. * Fail secure -#. -#: src/sulogin.c:174 +#: src/sulogin.c:160 msgid "No password entry for 'root'\n" -msgstr "'瑞お'縑 渠и ぬ蝶錶萄 だ橾 殮溘高 橈擠\n" +msgstr "'諴刮' 到木 伉 \n" -#: src/sulogin.c:190 +#: src/sulogin.c:176 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" "\n" -"橾奩瞳戲煎 衛濛(normal startup)擊 ж溥賊 control-d 蒂 殮溘ж撮蹂,\n" -"(斜溢雖 彊戲賊 衛蝶蠱 薑綠蒂 嬪ж罹 瑞お ぬ蝶錶萄蒂 殮溘ж撮蹂)" +"潺潺 (normal startup) 月庖 control-d 諝 伕賄,\n" +"(篞賈鴔 潺庖 欠 赬諝 諴刮 到木諝 伕賄)" -#. make new environment active -#: src/sulogin.c:243 +#: src/sulogin.c:212 msgid "Entering System Maintenance Mode\n" -msgstr "衛蝶蠱 薑綠 賅萄煎 菟橫陛堅 氈蝗棲棻\n" +msgstr "欠 赬 諈刺諢 木湊窸 蛟么n" -#: src/useradd.c:251 +#: src/useradd.c:234 #, c-format msgid "%s: rebuild the group database\n" -msgstr "%s: 斜瑜 等檜攪漆檜蝶蒂 棻衛 虜蛙棲棻\n" +msgstr "%s: 篞賈ㄨ 域渣圉渥月未 木 諤卿么n" -#: src/useradd.c:260 +#: src/useradd.c:243 #, c-format msgid "%s: rebuild the shadow group database\n" -msgstr "%s: 膠紫辦 斜瑜 等檜攪漆檜蝶蒂 棻衛 虜蛙棲棻\n" +msgstr "%s: 篞賈ㄨ 域渣圉渥月未 木 諤卿么n" -#: src/useradd.c:295 src/useradd.c:309 src/usermod.c:981 src/usermod.c:995 +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 #, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "%s: 嶸褲狫 彊擎 璋濠 殮溘高 `%s'\n" +msgstr "%s: 刮鴔 恢 伉 `%s'\n" -#: src/useradd.c:365 +#: src/useradd.c:349 #, c-format msgid "%s: unknown gid %s\n" -msgstr "%s: 憲熱橈朝 gid(斜瑜 嬴檜蛤) %s\n" +msgstr "%s: gid(篞賈ㄨ 渠) %s\n" -#: src/useradd.c:373 src/useradd.c:676 src/useradd.c:1269 src/usermod.c:260 -#: src/usermod.c:1128 +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 #, c-format msgid "%s: unknown group %s\n" -msgstr "%s: 憲熱橈朝 斜瑜 %s\n" +msgstr "%s: 篞賈ㄨ %s\n" -#: src/useradd.c:440 -#, c-format -msgid "group=%s,%u basedir=%s skel=%s\n" -msgstr "斜瑜=%s,%u 蟾晦 蛤滓饜葬=%s skel=%s\n" - -#: src/useradd.c:444 -#, c-format -msgid "shell=%s " -msgstr "蔗=%s " - -#: src/useradd.c:446 -#, c-format -msgid "inactive=%ld expire=%s" -msgstr "綠側瘓=%ld 虜晦=%s" - -#: src/useradd.c:450 +#: src/useradd.c:419 #, c-format msgid "GROUP=%u\n" -msgstr "斜瑜=%u\n" +msgstr "篞賈ㄨ=%u\n" -#: src/useradd.c:451 +#: src/useradd.c:420 #, c-format msgid "HOME=%s\n" -msgstr "巡薸瘍銝=%s\n" +msgstr "謔=%s\n" -#: src/useradd.c:453 +#: src/useradd.c:422 #, c-format msgid "INACTIVE=%ld\n" -msgstr "綠側瘓=%ld\n" +msgstr "赬桶=%ld\n" -#: src/useradd.c:454 +#: src/useradd.c:423 #, c-format msgid "EXPIRE=%s\n" -msgstr "虜晦=%s\n" +msgstr "諤篣=%s\n" -#: src/useradd.c:456 +#: src/useradd.c:425 #, c-format msgid "SHELL=%s\n" -msgstr "蔗=%s\n" +msgstr "=%s\n" -#: src/useradd.c:457 +#: src/useradd.c:426 #, c-format msgid "SKEL=%s\n" msgstr "SKEL=%s\n" -#: src/useradd.c:498 +#: src/useradd.c:462 #, c-format msgid "%s: cannot create new defaults file\n" -msgstr "%s: 億煎遴 蛤ィお だ橾擊 虜菟熱 橈蝗棲棻\n" +msgstr "%s: 諢 渣 潰 諤木 蛟么n" -#: src/useradd.c:503 +#: src/useradd.c:467 #, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: 億煎遴 蛤ィお だ橾擊 虜菟熱 橈蝗棲棻\n" +msgstr "%s: 諢 渣 潰 諤木 蛟么n" -#: src/useradd.c:596 src/useradd.c:608 +#: src/useradd.c:552 src/useradd.c:564 #, c-format msgid "%s: rename: %s" -msgstr "%s: 檜葷 營 撲薑: %s" +msgstr "%s: 渠 木: %s" -#: src/useradd.c:697 src/usermod.c:281 +#: src/useradd.c:657 src/usermod.c:265 #, c-format msgid "%s: group `%s' is a NIS group.\n" -msgstr "%s: 斜瑜 `%s' 朝 NIS 斜瑜殮棲棻.\n" +msgstr "%s: 篞賈ㄨ `%s' NIS 篞賈ㄨ.\n" -#: src/useradd.c:706 src/usermod.c:290 +#: src/useradd.c:666 src/usermod.c:274 #, c-format msgid "%s: too many groups specified (max %d).\n" -msgstr "%s: 傘鼠釭 號擎 斜瑜檜 貲衛腎歷蝗棲棻 (譆渠 %d).\n" +msgstr "%s: 諡渠 諤 篞賈ㄨ 諈蛟 (黖 %d).\n" -#: src/useradd.c:738 src/usermod.c:322 -#, c-format -msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" -msgstr "餌辨徹: %s\t[-u uid(餌辨濠 嬴檜蛤) [-o]] [-g 斜瑜貲][-G 斜瑜,...]\n" +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "" +"科拘: useradd [-u uid(科拖 渠) [-o]] [-g 篞賈ㄨ諈][-G 篞賈ㄨ,...]\n" -#: src/useradd.c:742 -msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" -msgstr "\t\t[-d 巡薸瘍銝孫[-s 蔗][-c 瞳蹂餌о][-m [-k template]]\n" +#: src/useradd.c:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" +msgstr "" +" [-d 謔柵[-s ][-c 秒苗[-m [-k template]]\n" -#: src/useradd.c:745 src/usermod.c:329 -msgid "[-f inactive] [-e expire ] " -msgstr "[-f 綠側瘓苗 [-e 虜晦] " +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" +msgstr " [-f 赬桶] [-e 諤篣財\n" -#: src/useradd.c:748 -msgid "[-A program] " -msgstr "[-A Щ煎斜極] " +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" +msgstr " useradd -D [-g 篞賈ㄨ諈][-b 黕篣圉謔柵[-s ]\n" -#: src/useradd.c:750 -msgid "[-p passwd] name\n" -msgstr "[-p ぬ蝶錶萄] 檜葷\n" - -#: src/useradd.c:753 -#, c-format -msgid " %s\t-D [-g group] [-b base] [-s shell]\n" -msgstr "\t%s\t-D [-g 斜瑜貲][-b 蟾晦蛤滓饜葬][-s 蔗]\n" - -#: src/useradd.c:756 -msgid "\t\t[-f inactive] [-e expire ]\n" -msgstr "\t\t[-f 綠側瘓苗 [-e 虜晦]\n" - -#: src/useradd.c:850 src/usermod.c:480 +#: src/useradd.c:793 src/usermod.c:461 #, c-format msgid "%s: error locking group file\n" -msgstr "%s: 斜瑜 だ橾 濡旎擊 ж朝等 螃盟\n" +msgstr "%s: 篞賈ㄨ 篣 月\n" -#: src/useradd.c:855 src/usermod.c:486 +#: src/useradd.c:798 src/usermod.c:467 #, c-format msgid "%s: error opening group file\n" -msgstr "%s: 斜瑜 だ橾擊 罹朝等 螃盟\n" +msgstr "%s: 篞賈ㄨ 潰 禺 月\n" -#: src/useradd.c:862 src/usermod.c:597 +#: src/useradd.c:805 src/usermod.c:578 #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s: 膠紫辦 斜瑜擊 濡斜朝等 螃盟\n" +msgstr "%s: 篞賈ㄨ 篞賈 月\n" -#: src/useradd.c:867 src/usermod.c:603 +#: src/useradd.c:810 src/usermod.c:584 #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s: 斜瑜 だ橾擊 罹朝等 螃盟\n" +msgstr "%s: 篞賈ㄨ 潰 禺 月\n" -#: src/useradd.c:1039 +#: src/useradd.c:982 #, c-format msgid "%s: uid %u is not unique\n" -msgstr "%s: uid(餌辨濠 嬴檜蛤) %u 朝 瞳瞰ж雖 彊蝗棲棻\n" +msgstr "%s: uid(科拖 渠) %u 鴔 蛟么n" -#: src/useradd.c:1069 +#: src/useradd.c:1012 #, c-format msgid "%s: can't get unique uid\n" -msgstr "%s: 瞳瞰и uid(餌辨濠 嬴檜蛤)蒂 橢擊 熱 橈蝗棲棻\n" +msgstr "%s: uid(科拖 渠)諝 髦 蛟么n" -#: src/useradd.c:1174 src/useradd.c:1325 src/usermod.c:1075 src/usermod.c:1086 -#: src/usermod.c:1096 src/usermod.c:1143 src/usermod.c:1187 -#, c-format -msgid "%s: invalid field `%s'\n" -msgstr "%s: `%s' 睡碟擎 嶸褲狫 彊蝗棲棻\n" - -#: src/useradd.c:1189 +#: src/useradd.c:1049 #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s: 晦獄 蛤滓饜葬 `%s' 朝 嶸褲狫 彊蝗棲棻\n" +msgstr "%s: 篣圉雩 謔 `%s' 刮鴔 蛟么n" -#: src/useradd.c:1199 +#: src/useradd.c:1059 #, c-format msgid "%s: invalid comment `%s'\n" -msgstr "%s: 瞳蹂餌о `%s' 擎 嶸褲狫 彊蝗棲棻\n" +msgstr "%s: 秒 `%s' 刮鴔 蛟么n" -#: src/useradd.c:1210 +#: src/useradd.c:1070 #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s: 蛤滓饜葬 `%s' 朝 嶸褲狫 彊蝗棲棻\n" +msgstr "%s: 謔 `%s' 刮鴔 蛟么n" -#: src/useradd.c:1229 src/usermod.c:1110 +#: src/useradd.c:1089 src/usermod.c:858 #, c-format msgid "%s: invalid date `%s'\n" -msgstr "%s: 陳瞼 `%s' 朝 嶸褲狫 彊蝗棲棻\n" +msgstr "%s: 鴔 `%s' 刮鴔 蛟么n" -#: src/useradd.c:1242 +#: src/useradd.c:1102 #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄陛 -e 褫暮擊 蹂掘м棲棻\n" +msgstr "%s: 到木穈 -e 蛙 窱秒拘么n" -#: src/useradd.c:1258 +#: src/useradd.c:1118 #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄陛 -f 褫暮擊 蹂掘м棲棻\n" +msgstr "%s: 到木穈 -f 蛙 窱秒拘么n" -#: src/useradd.c:1336 +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: `%s' 賱賱 刮鴔 蛟么n" + +#: src/useradd.c:1196 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s: 嶸褲狫 彊擎 蔗 `%s'\n" +msgstr "%s: 刮鴔 `%s'\n" -#: src/useradd.c:1377 +#: src/useradd.c:1237 #, c-format msgid "%s: invalid user name '%s'\n" -msgstr "%s: 嶸褲狫 彊擎 餌辨濠貲 `%s'\n" +msgstr "%s: 刮鴔 科拖諈 `%s'\n" -#: src/useradd.c:1413 src/userdel.c:298 src/usermod.c:1255 +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 #, c-format msgid "%s: cannot rewrite password file\n" -msgstr "%s: ぬ蝶錶萄 だ橾擊 棻衛 噩熱陛 橈蝗棲棻\n" +msgstr "%s: 到木 潰 木 賄穈 蛟么n" -#: src/useradd.c:1420 src/userdel.c:303 src/usermod.c:1262 +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄 だ橾擊 棻衛 噩熱陛 橈蝗棲棻\n" +msgstr "%s: 到木 潰 木 賄穈 蛟么n" -#: src/useradd.c:1461 src/userdel.c:367 src/usermod.c:1296 +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 #, c-format msgid "%s: unable to lock password file\n" -msgstr "%s: ぬ蝶錶萄 だ橾 濡旎擊 й 熱 橈蝗棲棻\n" +msgstr "%s: 到木 篣 蛟么n" -#: src/useradd.c:1466 src/userdel.c:372 src/usermod.c:1301 +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 #, c-format msgid "%s: unable to open password file\n" -msgstr "%s: ぬ蝶錶萄 だ橾擊 翮 熱 橈蝗棲棻\n" +msgstr "%s: 到木 潰 蛟么n" -#: src/useradd.c:1474 src/userdel.c:379 src/usermod.c:1308 +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄 だ橾擊 濡旋 熱 橈蝗棲棻\n" +msgstr "%s: 到木 潰 篣 蛟么n" -#: src/useradd.c:1481 src/userdel.c:385 src/usermod.c:1314 +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄 だ橾擊 翮 熱 橈蝗棲棻\n" +msgstr "%s: 到木 潰 蛟么n" -#: src/useradd.c:1580 src/usermod.c:1405 -#, c-format -msgid "%s: error adding authentication method\n" -msgstr "%s: 檣隸寞徹 蹺陛ж朝等 螃盟\n" - -#: src/useradd.c:1604 +#: src/useradd.c:1435 #, c-format msgid "%s: error adding new password entry\n" -msgstr "%s: 億煎遴 ぬ蝶錶萄 殮溘高擊 蹺陛ж朝等 螃盟\n" +msgstr "%s: 諢 到木 伉 黺穈 月\n" -#: src/useradd.c:1618 +#: src/useradd.c:1449 #, c-format msgid "%s: error updating password dbm entry\n" -msgstr "%s: ぬ蝶錶萄 dbm 殮溘高擊 機等檜おж朝等 螃盟\n" +msgstr "%s: 到木 dbm 伉 域渣貲 月\n" -#: src/useradd.c:1634 src/usermod.c:1471 +#: src/useradd.c:1465 src/usermod.c:1151 #, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "%s: 億煎遴 膠紫辦 ぬ蝶錶萄 殮溘高擊 蹺陛ж朝等 螃盟\n" +msgstr "%s: 諢 到木 伉 黺穈 月\n" -#: src/useradd.c:1650 src/usermod.c:1488 +#: src/useradd.c:1481 src/usermod.c:1168 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄 dbm 殮溘高擊 機等檜お ж朝等 螃盟\n" +msgstr "%s: 到木 dbm 伉 域渣 月\n" -#: src/useradd.c:1682 +#: src/useradd.c:1513 #, c-format msgid "%s: cannot create directory %s\n" -msgstr "%s: 蛤滓饜葬 %s 蒂 虜菟 熱 橈蝗棲棻\n" +msgstr "%s: 謔 %s 諝 諤 蛟么n" -#: src/useradd.c:1806 src/usermod.c:1233 +#: src/useradd.c:1634 src/usermod.c:981 #, c-format msgid "%s: user %s exists\n" -msgstr "%s: 餌辨濠 %s 朝 襄營м棲棻\n" +msgstr "%s: 科拖 %s 魽渥秒拘么n" -#: src/useradd.c:1821 +#: src/useradd.c:1649 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1854 +#: src/useradd.c:1687 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -"%s:唳堅: CREATE_HOME 擎 雖錳腎雖 彊蝗棲棻, -m 褫暮擊 渠褐 餌辨ж撮蹂.\n" +"%s:窶赭: CREATE_HOME 鴔鴔 蛟, -m 蛙 科拗賄.\n" -#: src/userdel.c:129 -#, c-format -msgid "usage: %s [-r] name\n" -msgstr "餌辨徹: %s [-r] 檜葷\n" +#: src/userdel.c:124 +#, fuzzy, c-format +msgid "Usage: %s [-r] name\n" +msgstr "科拘: %s [-r] 渠\n" -#: src/userdel.c:181 src/userdel.c:267 +#: src/userdel.c:176 src/userdel.c:262 #, c-format msgid "%s: error updating group entry\n" -msgstr "%s: 斜瑜 殮溘高擊 機等檜おж朝等 螃盟\n" +msgstr "%s: 篞賈ㄨ 伉 域渣貲 月\n" -#: src/userdel.c:191 src/userdel.c:276 +#: src/userdel.c:186 src/userdel.c:271 #, c-format msgid "%s: cannot update dbm group entry\n" -msgstr "%s: dbm 斜瑜 殮溘高擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: dbm 篞賈ㄨ 伉 域渣 蛟么n" -#: src/userdel.c:219 +#: src/userdel.c:214 #, fuzzy, c-format msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: dbm 斜瑜 殮溘高擊 機等檜お й 熱 橈蝗棲棻\n" +msgstr "%s: dbm 篞賈ㄨ 伉 域渣 蛟么n" -#: src/userdel.c:308 +#: src/userdel.c:379 #, c-format -msgid "%s: cannot rewrite TCFS key file\n" -msgstr "%s: TCFS 酈 だ橾擊 棻衛 噩 熱 橈蝗棲棻\n" +msgid "%s: cannot open group file\n" +msgstr "%s: 篞賈ㄨ 潰 蛟么n" -#: src/userdel.c:392 +#: src/userdel.c:390 #, c-format -msgid "%s: cannot lock TCFS key file\n" -msgstr "%s: TCFS 酈 だ橾擊 濡旋 熱 橈蝗棲棻\n" - -#: src/userdel.c:397 -#, c-format -msgid "%s: cannot open TCFS key file\n" -msgstr "%s: TCFS 酈 だ橾擊 翮 熱 橈蝗棲棻\n" +msgid "%s: cannot open shadow group file\n" +msgstr "%s: 篞賈ㄨ 潰 蛟么n" #: src/userdel.c:408 #, c-format -msgid "%s: cannot open group file\n" -msgstr "%s: 斜瑜 だ橾擊 翮 熱 橈蝗棲棻\n" - -#: src/userdel.c:419 -#, c-format -msgid "%s: cannot open shadow group file\n" -msgstr "%s: 膠紫辦 斜瑜 だ橾擊 翮 熱 橈蝗棲棻\n" - -#: src/userdel.c:451 src/userdel.c:468 -#, c-format -msgid "%s: error deleting authentication\n" -msgstr "%s: 檣隸擊 雖辦朝等 螃盟\n" - -#: src/userdel.c:479 -#, c-format msgid "%s: error deleting password entry\n" -msgstr "%s: ぬ蝶錶萄 殮溘高擊 雖辦朝等 螃盟\n" +msgstr "%s: 到木 伉 鴔圉 月\n" -#: src/userdel.c:485 +#: src/userdel.c:412 #, c-format msgid "%s: error deleting shadow password entry\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄 殮溘高擊 雖辦朝等 螃盟\n" +msgstr "%s: 到木 伉 鴔圉 月\n" -#: src/userdel.c:496 -#, c-format -msgid "%s: error deleting TCFS entry\n" -msgstr "%s: TCFS 殮溘高擊 雖辦朝等 螃盟\n" - -#: src/userdel.c:510 +#: src/userdel.c:421 #, c-format msgid "%s: error deleting password dbm entry\n" -msgstr "%s: ぬ蝶錶萄 dbm 殮溘高擊 雖辦朝等 螃盟\n" +msgstr "%s: 到木 dbm 伉 鴔圉 月\n" -#: src/userdel.c:533 +#: src/userdel.c:440 #, c-format msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄 dbm 殮溘高擊 雖辦朝等 螃盟\n" +msgstr "%s: 到木 dbm 伉 鴔圉 月\n" -#: src/userdel.c:569 +#: src/userdel.c:484 #, c-format msgid "%s: user %s is currently logged in\n" -msgstr "%s: 餌辨濠 %s 朝 ⑷營 煎曹и 鼻鷓 殮棲棻\n" +msgstr "%s: 科拖 %s 諢篣渣 么n" -#: src/userdel.c:659 +#: src/userdel.c:594 #, c-format msgid "%s: warning: %s not owned by %s, not removing\n" msgstr "" -"%s: 唳堅: %s 朝 %s 縑 模嶸腎橫 氈雖 彊蝗棲棻, 評塭憮 薯剪腎雖 彊蝗棲棻\n" +"%s: 窶赭: %s %s 鴔 蛟, 圉潰 穇圉鴔 蛟么n" -#: src/userdel.c:666 +#: src/userdel.c:600 #, c-format msgid "%s: warning: can't remove " -msgstr "%s: 唳堅: 薯剪й 熱 橈蝗棲棻 " +msgstr "%s: 窶赭: 穇堅 蛟 " -#: src/userdel.c:758 src/usermod.c:1023 +#: src/userdel.c:703 src/usermod.c:783 #, c-format msgid "%s: user %s does not exist\n" -msgstr "%s: 餌辨濠 %s 朝 襄營ж雖 彊蝗棲棻\n" +msgstr "%s: 科拖 %s 魽渥秒鴔 蛟么n" -#: src/userdel.c:770 src/usermod.c:1039 +#: src/userdel.c:718 src/usermod.c:799 #, c-format msgid "%s: user %s is a NIS user\n" -msgstr "%s: 餌辨濠 %s 朝 NIS 餌辨濠 殮棲棻\n" +msgstr "%s: 科拖 %s NIS 科拖 么n" -#: src/userdel.c:799 +#: src/userdel.c:756 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s: %s 朝 %s 縑 模嶸腎橫 氈雖 彊蝗棲棻, 評塭憮 薯剪腎雖 彊蝗棲棻\n" +msgstr "%s: %s %s 鴔 蛟, 圉潰 穇圉鴔 蛟么n" -#: src/userdel.c:818 +#: src/userdel.c:779 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -"%s: 蛤滓饜葬 %s 朝 薯剪腎雖 彊蝗棲棻 (餌辨濠 %s 曖 蛤滓饜葬陛 雖錶韓 匙殮" -"棲棻)\n" +"%s: 謔 %s 穇圉鴔 蛟 (科拖 %s 謔禹 鴔鴔 窶" +")\n" -#: src/userdel.c:830 +#: src/userdel.c:793 #, c-format msgid "%s: error removing directory %s\n" -msgstr "%s: 蛤滓饜葬 %s 蒂 雖辦朝等 螃盟\n" +msgstr "%s: 謔 %s 諝 鴔圉 月\n" -#: src/usermod.c:326 +#: src/usermod.c:306 +#, fuzzy, c-format +msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "科拘: %s\t[-u uid(科拖 渠) [-o]] [-g 篞賈ㄨ諈][-G 篞賈ㄨ,...]\n" + +#: src/usermod.c:310 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" -msgstr "\t\t[-d 蛤滓饜葬 [-m]] [-s 蔗] [-c 瞳蹂餌о] [-l 億_檜葷]\n" +msgstr "\t\t[-d 謔 [-m]] [-s ] [-c 秒苗 [-l _渠]\n" -#: src/usermod.c:332 -msgid "[-A {DEFAULT|program},... ] " -msgstr "[-A {蛤ィお|Щ煎斜極},...] " +#: src/usermod.c:313 +#, fuzzy +msgid "[-f inactive] [-e expire] " +msgstr "[-f 赬桶] [-e 諤篣財 " -#: src/usermod.c:334 +#: src/usermod.c:315 msgid "[-p passwd] [-L|-U] name\n" -msgstr "[-p ぬ蝶錶萄] -L|-U] 檜葷\n" +msgstr "[-p 到木] -L|-U] 渠\n" -#: src/usermod.c:514 +#: src/usermod.c:495 #, c-format msgid "%s: out of memory in update_group\n" -msgstr "%s: 機等檜お_斜瑜縑 詭賅葬 睡褶\n" +msgstr "%s: 域渣筷篞賈ㄨ 諰諈刺收 賱魽崤n" -#: src/usermod.c:641 +#: src/usermod.c:622 #, c-format msgid "%s: out of memory in update_gshadow\n" -msgstr "%s: 機等檜お_斜瑜膠紫辦縑 詭賅葬 睡褶\n" +msgstr "%s: 域渣筷篞賈ㄨ域 諰諈刺收 賱魽崤n" -#: src/usermod.c:1210 +#: src/usermod.c:958 #, c-format msgid "%s: no flags given\n" -msgstr "%s: 輿橫霞 flag 陛 橈蝗棲棻\n" +msgstr "%s: 鴥潰渥 flag 穈 蛟么n" -#: src/usermod.c:1217 +#: src/usermod.c:965 #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄陛 -e 褫暮婁 -f 褫暮擊 蹂掘м棲棻\n" +msgstr "%s: 到木穈 -e 蛙窸 -f 蛙 窱秒拘么n" -#: src/usermod.c:1239 +#: src/usermod.c:987 #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s: uid(餌辨濠 嬴檜蛤) %u 朝 瞳瞰ж雖 彊蝗棲棻\n" +msgstr "%s: uid(科拖 渠) %lu 鴔 蛟么n" -#: src/usermod.c:1392 -#, c-format -msgid "%s: error deleting authentication method\n" -msgstr "%s: 檣隸寞徹擊 雖辦朝等 螃盟\n" - -#: src/usermod.c:1418 -#, c-format -msgid "%s: error changing authentication method\n" -msgstr "%s: 檣隸寞徹擊 滲唳ж朝等 螃盟\n" - -#: src/usermod.c:1436 +#: src/usermod.c:1116 #, c-format msgid "%s: error changing password entry\n" -msgstr "%s: ぬ蝶錶萄 殮溘高擊 滲唳ж朝等 螃盟\n" +msgstr "%s: 到木 伉 貐窶踫 月\n" -#: src/usermod.c:1442 +#: src/usermod.c:1122 #, c-format msgid "%s: error removing password entry\n" -msgstr "%s: ぬ蝶錶萄 殮溘高擊 薯剪ж朝等 螃盟\n" +msgstr "%s: 到木 伉 穇堅 月\n" -#: src/usermod.c:1451 +#: src/usermod.c:1131 #, c-format msgid "%s: error adding password dbm entry\n" -msgstr "%s: ぬ蝶錶萄 dbm 殮溘高擊 蹺陛ж朝等 螃盟\n" +msgstr "%s: 到木 dbm 伉 黺穈 月\n" -#: src/usermod.c:1459 +#: src/usermod.c:1139 #, c-format msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: ぬ蝶錶萄 dbm 殮溘高擊 薯剪ж朝等 螃盟\n" +msgstr "%s: 到木 dbm 伉 穇堅 月\n" -#: src/usermod.c:1478 +#: src/usermod.c:1158 #, c-format msgid "%s: error removing shadow password entry\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄 殮溘高擊 薯剪ж朝等 螃盟\n" +msgstr "%s: 到木 伉 穇堅 月\n" -#: src/usermod.c:1495 +#: src/usermod.c:1175 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: 膠紫辦 ぬ蝶錶萄 dbm 殮溘高擊 薯剪ж朝等 螃盟\n" +msgstr "%s: 到木 dbm 伉 穇堅 月\n" -#: src/usermod.c:1524 +#: src/usermod.c:1204 #, c-format msgid "%s: directory %s exists\n" -msgstr "%s: 蛤滓饜葬 %s 朝 襄營м棲棻\n" +msgstr "%s: 謔 %s 魽渥秒拘么n" -#: src/usermod.c:1533 +#: src/usermod.c:1213 #, c-format msgid "%s: can't create %s\n" -msgstr "%s: %s 蒂 虜菟 熱 橈蝗棲棻\n" +msgstr "%s: %s 諝 諤 蛟么n" -#: src/usermod.c:1539 +#: src/usermod.c:1219 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s: %s 蒂 chown й 熱 橈蝗棲棻\n" +msgstr "%s: %s 諝 chown 蛟么n" -#: src/usermod.c:1556 +#: src/usermod.c:1236 #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "%s: 蛤滓饜葬 %s 縑憮 %s 煎 檜葷擊 夥羚熱 橈蝗棲棻\n" +msgstr "%s: 謔 %s %s 諢 渠 諻篹 蛟么n" -#. better leave it alone -#: src/usermod.c:1653 +#: src/usermod.c:1333 #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "%s: 唳堅: %s 朝 %s 縑 模嶸腎橫 氈雖 彊蝗棲棻\n" +msgstr "%s: 窶赭: %s %s 鴔 蛟么n" -#: src/usermod.c:1659 +#: src/usermod.c:1339 msgid "failed to change mailbox owner" -msgstr "詭橾夢蝶 模嶸濠蒂 滲唳ж朝等 褒ぬц蝗棲棻" +msgstr "諰潺 諝 貐窶踫 欠刮蛟" -#: src/usermod.c:1667 +#: src/usermod.c:1347 msgid "failed to rename mailbox" -msgstr "詭橾夢蝶曖 檜葷擊 夥紱朝等 褒ぬц蝗棲棻" +msgstr "諰潺木 渠 諻篨賈 欠刮蛟" -#: src/vipw.c:104 +#: src/vipw.c:105 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" "\n" -"%s: %s 朝 滲唳腎雖 彊懊蝗棲棻\n" +"%s: %s 貐窶趟鴔 蛟么n" -#: src/vipw.c:132 +#: src/vipw.c:133 msgid "Couldn't lock file" -msgstr "だ橾擊 濡旋 熱 橈蝗棲棻" +msgstr "潰 篣 蛟" -#: src/vipw.c:141 +#: src/vipw.c:142 msgid "Couldn't make backup" -msgstr "寥機擊 虜菟 熱 橈蝗棲棻" +msgstr "諻桿 諤 蛟" -#: src/vipw.c:206 +#: src/vipw.c:200 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "" -"%s: %s 蒂 犒掘衛鑒 熱 橈蝗棲棻: %s (渡褐曖 滲唳餌о擎 %s 縑 氈蝗棲棻)\n" +"%s: %s 諝 貐虛筋 蛟: %s (寢 貐窶趣秒原 %s 蛟)\n" -#: src/vipw.c:244 +#: src/vipw.c:238 msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" msgstr "" -"餌辨徹:\n" -"`vipw' 朝 /etc/passwd 蒂 ら餵м棲棻\t`vipw -s' 朝 /etc/shadow蒂 ら餵м棲棻\n" -"`vigr' 擎 /etc/group 擊 ら餵м棲棻\t`vigr -s' 朝 /etc/gshadow蒂 ら餵м棲棻\n" +"科拘:\n" +"`vipw' /etc/passwd 諝 賄拘么t`vipw -s' /etc/shadow諝 賄拘么n" +"`vigr' /etc/group 賄拘么t`vigr -s' /etc/gshadow諝 賄拘么n" + +#, fuzzy +#~ msgid "Can't create mail spool for user %s.\n" +#~ msgstr "%s: 科拖 %s 伉 域渣 蛟么n" + +#~ msgid "User %s has a TCFS key, his old password is required.\n" +#~ msgstr "" +#~ "科拖 %s TCFS 月未 穈鴔窸 蛟, 篞賄 到木穈 窱禺拘.\n" + +#~ msgid "You can use -t option to force the change.\n" +#~ msgstr "穈諢 貐窶趣 篣 渥 -t 蛙 科拗 蛟.\n" + +#~ msgid "Warning: user %s has a TCFS key.\n" +#~ msgstr "窶赭: 科拖 %s TCFS 月未 穈鴔窸 蛟.\n" + +#~ msgid "Cannot lock the TCFS key database; try again later\n" +#~ msgstr "" +#~ "TCFS 域渣圉渥 篣 蛟; 鴗 木 賄\n" + +#~ msgid "Cannot open the TCFS key database.\n" +#~ msgstr "TCFS 域渣圉渥月未 渥穈 蛟.\n" + +#~ msgid "Error updating the TCFS key database.\n" +#~ msgstr "TCFs 域渣圉渥 域渣 鴗 月.\n" + +#~ msgid "Cannot commit TCFS changes.\n" +#~ msgstr "TCFS 貐窶趣 欠 蛟.\n" + +#~ msgid "%s: cannot rewrite TCFS key file\n" +#~ msgstr "%s: TCFS 潰 木 蛟么n" + +#~ msgid "%s: cannot lock TCFS key file\n" +#~ msgstr "%s: TCFS 潰 篣 蛟么n" + +#~ msgid "%s: cannot open TCFS key file\n" +#~ msgstr "%s: TCFS 潰 蛟么n" + +#~ msgid "%s: error deleting TCFS entry\n" +#~ msgstr "%s: TCFS 伉 鴔圉 月\n" + +#~ msgid " [-f inactive] [-e expire]" +#~ msgstr " [-f 赬桶] [-e 諤篣財 " + +#~ msgid "%s: error deleting authentication\n" +#~ msgstr "%s: 賄 鴔圉 月\n" + +#, fuzzy +#~ msgid "[-A {DEFAULT|program},...] " +#~ msgstr "[-A {渣腮諢篞賈良,...] " + +#~ msgid "%s: error deleting authentication method\n" +#~ msgstr "%s: 賄諻拘 鴔圉 月\n" + +#~ msgid "%s: error adding authentication method\n" +#~ msgstr "%s: 賄諻拘 黺穈 月\n" + +#~ msgid "%s: error changing authentication method\n" +#~ msgstr "%s: 賄諻拘 貐窶踫 月\n" + +#~ msgid "[-A program] " +#~ msgstr "[-A 諢篞賈沘 " + +#~ msgid "[-p passwd] name\n" +#~ msgstr "[-p 到木] 渠\n" + +#~ msgid "error - lookup '%s' failed\n" +#~ msgstr "月 - '%s' 窶 欠沔n" + +#~ msgid "%s not found\n" +#~ msgstr "%s穈 諻窶禺鴔 \n" + +#~ msgid "%s: not configured for shadow group support.\n" +#~ msgstr "%s: 篞賈ㄨ 鴔 桿 鴔 蛟.\n" + +#~ msgid "%s: Shadow passwords are not configured.\n" +#~ msgstr "%s: 到木穈 梵鴔 蛟.\n" + +#, fuzzy +#~ msgid "Usage: %s [-l] user\n" +#~ msgstr "科拘: %s [-e]\n" + +#~ msgid "Executing shell %s\n" +#~ msgstr "%s 欠拘么n" + +#~ msgid "Dialup Password: " +#~ msgstr "木渥潰 到木: " + +#~ msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" +#~ msgstr "科拘: %s [-l] [-m 黖潰] [-M 黖潰] [-W 窶赭潰] 科拖\n" + +#~ msgid "Usage: %s [-(a|d)] shell\n" +#~ msgstr "科拘: %s [-(a|d)] \n" + +#~ msgid "Shell password: " +#~ msgstr " 到木: " + +#~ msgid "re-enter Shell password: " +#~ msgstr " 到木諝 木 : " + +#~ msgid "%s: Passwords do not match, try again.\n" +#~ msgstr "%s: 到木穈 諤鴔 蛟. 木 賄. \n" + +#~ msgid "%s: can't create %s" +#~ msgstr "%s: %s諝 諤 蛟" + +#~ msgid "%s: can't open %s" +#~ msgstr "%s: %s諝 渥穈 蛟" + +#~ msgid "%s: Shell %s not found.\n" +#~ msgstr "%s: %s 諻窶禺鴔 蛟.\n" + +#~ msgid "group=%s,%u basedir=%s skel=%s\n" +#~ msgstr "篞賈ㄨ=%s,%u 黕篣 謔=%s skel=%s\n" + +#~ msgid "shell=%s " +#~ msgstr "=%s " + +#~ msgid "inactive=%ld expire=%s" +#~ msgstr "赬桶=%ld 諤篣=%s" + +#~ msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +#~ msgstr "科拘: %s\t[-u uid(科拖 渠) [-o]] [-g 篞賈ㄨ諈][-G 篞賈ㄨ,...]\n" #~ msgid "%s: gid %ld is not unique\n" -#~ msgstr "%s: gid(斜瑜 嬴檜蛤) %ld 朝 瞳瞰ж雖 彊蝗棲棻\n" +#~ msgstr "%s: gid(篞賈ㄨ 渠) %ld 鴔 蛟么n" #, fuzzy #~ msgid "unknown gid: %u\n" -#~ msgstr "憲熱橈朝 gid: %d\n" +#~ msgstr " gid: %d\n" #~ msgid "%s: uid %d is not unique\n" -#~ msgstr "%s: uid(餌辨濠 嬴檜蛤) %d 朝 瞳瞰ж雖 彊蝗棲棻\n" +#~ msgstr "%s: uid(科拖 渠) %d 鴔 蛟么n" #~ msgid "user %s: bad UID (%d)\n" -#~ msgstr "餌辨濠 %s: 謠雖 彊擎 UID(餌辨濠 嬴檜蛤) (%d)\n" +#~ msgstr "科拖 %s: 鮈鴔 UID(科拖 渠) (%d)\n" #~ msgid "%s: no aging information present\n" -#~ msgstr "%s: 翱滄縑 渠и 橫集и 薑爾紫 釭顫釭雖 彊蝗棲棻\n" +#~ msgstr "%s: 圉寢 渠 貐渠 鴔 蛟么n" #~ msgid "group %s: bad GID (%d)\n" -#~ msgstr "斜瑜 %s: 謠雖彊擎 GID(斜瑜 嬴檜蛤) (%d)\n" +#~ msgstr "篞賈ㄨ %s: 鮈鴔 GID(篞賈ㄨ 渠) (%d)\n" #~ msgid "%s: permission denied (shell).\n" -#~ msgstr "%s: 蕾斬掏и 橈擠 (蔗).\n" +#~ msgstr "%s: 篞澎 ().\n" diff --git a/po/pl.gmo b/po/pl.gmo index c529228b..a54cbfc5 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 15a70008..e1bff056 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,708 +1,617 @@ # shadow.pot Polish translation. # Copyright (C) 1999 Free Software Foundation, Inc. -# Arkadiusz Mi鄂iewicz , 1999. +# Arkadiusz Mikiewicz , 1999. # msgid "" msgstr "" "Project-Id-Version: shadow-981228\n" -"POT-Creation-Date: 2002-03-12 12:16+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" "PO-Revision-Date: 1999-03-02 22:29+01:00\n" -"Last-Translator: Arkadiusz Mi鄂iewicz \n" +"Last-Translator: Arkadiusz Mikiewicz \n" "Language-Team: PL \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libmisc/addgrps.c:60 +#: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" -msgstr "Ostrze瞠nie: nieznana grupa %s\n" +msgstr "Ostrze髒enie: nieznana grupa %s\n" -#: libmisc/addgrps.c:71 +#: libmisc/addgrps.c:68 msgid "Warning: too many groups\n" -msgstr "Ostrze瞠nie: zbyt wiele grup\n" +msgstr "Ostrze髒enie: zbyt wiele grup\n" -#: libmisc/age.c:77 +#: libmisc/age.c:72 msgid "Your password has expired." -msgstr "Twoje has這 straci這 wa積o嗆." +msgstr "Twoje haso stracio wa髒no." -#: libmisc/age.c:80 +#: libmisc/age.c:75 msgid "Your password is inactive." -msgstr "Twoje has這 jest nieaktywne." +msgstr "Twoje haso jest nieaktywne." -#: libmisc/age.c:83 +#: libmisc/age.c:78 msgid "Your login has expired." -msgstr "Twoje konto straci這 wa積o嗆." +msgstr "Twoje konto stracio wa髒no." -#: libmisc/age.c:96 +#: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " Skontaktuj si z administratorem systemu.\n" +msgstr " Skontaktuj si z administratorem systemu.\n" -#: libmisc/age.c:99 +#: libmisc/age.c:93 msgid " Choose a new password.\n" -msgstr " Wybierz nowe has這.\n" +msgstr " Wybierz nowe haso.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:168 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "Twoje has這 straci wa積o嗆 w ci庵u %ld dni.\n" +msgstr "Twoje haso straci wa髒no w cigu %ld dni.\n" -#: libmisc/age.c:178 +#: libmisc/age.c:172 msgid "Your password will expire tomorrow.\n" -msgstr "Jutro twoje has這 straci wa積o嗆.\n" +msgstr "Jutro twoje haso straci wa髒no.\n" -#: libmisc/age.c:180 +#: libmisc/age.c:174 msgid "Your password will expire today.\n" -msgstr "Dzi twoje has這 straci wa積o嗆.\n" +msgstr "Dzi twoje haso straci wa髒no.\n" -#: libmisc/chowntty.c:113 +#: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" -msgstr "Nie mo積a zmieni tty %s" +msgstr "Nie mo髒na zmieni tty %s" -#: libmisc/env.c:160 +#: libmisc/env.c:155 msgid "Environment overflow\n" -msgstr "Przepe軟ienie 鈔odowiska\n" +msgstr "Przepenienie rodowiska\n" -#: libmisc/env.c:200 +#: libmisc/env.c:195 #, c-format msgid "You may not change $%s\n" -msgstr "Nie mo瞠sz zmienia $%s\n" +msgstr "Nie mo髒esz zmienia $%s\n" -#: libmisc/failure.c:238 +#: libmisc/failure.c:230 #, c-format msgid "%d %s since last login. Last was %s on %s.\n" msgstr "" "%d %s od ostatniego logowania. Ostatnie logowanie: dnia %s na terminalu %" "s.\n" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failures" msgstr "niepowodzenia" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failure" msgstr "niepowodzenie" -#: libmisc/limits.c:397 +#: libmisc/limits.c:396 msgid "Too many logins.\n" msgstr "Zbyt wiele otwartych sesji.\n" -#: libmisc/login_desrpc.c:63 +#: libmisc/login_desrpc.c:59 #, c-format msgid "Password does not decrypt secret key for %s.\n" -msgstr "Tym has貫m nie mo積a zdeszyfrowa tajnego klucza dla %s.\n" +msgstr "Tym hasem nie mo髒na odszyfrowa tajnego klucza dla %s.\n" -#: libmisc/login_desrpc.c:69 +#: libmisc/login_desrpc.c:66 #, c-format msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Nie mog ustawi tajnego klucza dla %s: czy serwer kluczy dzia豉?\n" +msgstr "Nie mo髒na ustawi tajnego klucza dla %s: czy serwer kluczy dziaa?\n" -#: libmisc/mail.c:62 libmisc/mail.c:77 +#: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." -msgstr "Masz now poczt." +msgstr "Masz now poczt." -#: libmisc/mail.c:73 +#: libmisc/mail.c:72 msgid "No mail." msgstr "Nie masz poczty." -#: libmisc/mail.c:75 +#: libmisc/mail.c:74 msgid "You have mail." -msgstr "Masz poczt." +msgstr "Masz poczt." -#: libmisc/obscure.c:281 src/passwd.c:244 +#: libmisc/obscure.c:271 src/passwd.c:183 #, c-format msgid "Bad password: %s. " -msgstr "Z貫 has這: %s. " +msgstr "Ze haso: %s. " -#: libmisc/pam_pass.c:42 +#: libmisc/pam_pass.c:38 #, c-format msgid "passwd: pam_start() failed, error %d\n" -msgstr "passwd: pam_start() nie powiod這 si, b陰d %d\n" +msgstr "passwd: pam_start() nie powiodo si, bd %d\n" -#: libmisc/pam_pass.c:49 +#: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/setupenv.c:211 +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" +msgstr "passwd: haso zostao zmienione\n" + +#: libmisc/setupenv.c:208 #, c-format msgid "Unable to cd to \"%s\"\n" -msgstr "Nie mog zmieni katalogu na \"%s\"\n" +msgstr "Nie mo髒na zmieni katalogu na \"%s\"\n" -#: libmisc/setupenv.c:219 +#: libmisc/setupenv.c:216 msgid "No directory, logging in with HOME=/" -msgstr "Brak katalogu, loguj z HOME=/" +msgstr "Brak katalogu, loguj z HOME=/" -#: libmisc/shell.c:78 -#, c-format -msgid "Executing shell %s\n" -msgstr "Uruchamiam pow這k %s\n" - -#. -#. * Obviously something is really wrong - I can't figure out -#. * how to execute this stupid shell, so I might as well give -#. * up in disgust ... -#. -#: libmisc/shell.c:122 +#: libmisc/shell.c:119 #, c-format msgid "Cannot execute %s" -msgstr "Nie mog uruchomi %s" +msgstr "Nie mo髒na uruchomi %s" -#: libmisc/sub.c:61 +#: libmisc/sub.c:55 #, c-format msgid "Invalid root directory \"%s\"\n" -msgstr "Nieprawid這wy katalog g堯wny \"%s\"\n" +msgstr "Nieprawidowy katalog g籀wny \"%s\"\n" -#: libmisc/sub.c:73 +#: libmisc/sub.c:67 #, c-format msgid "Can't change root directory to \"%s\"\n" -msgstr "Nie mog zmieni g堯wnego katalogu na \"%s\"\n" +msgstr "Nie mo髒na zmieni g籀wnego katalogu na \"%s\"\n" -#: libmisc/xmalloc.c:28 +#: libmisc/xmalloc.c:24 #, c-format msgid "malloc(%d) failed\n" -msgstr "malloc(%d) nie powiod這 si獦n" +msgstr "malloc(%d) nie powiodo si\n" -#: lib/dialchk.c:71 -msgid "Dialup Password: " -msgstr "Has這 dost瘼u modemowego: " - -#: lib/getdef.c:276 +#: lib/getdef.c:274 msgid "Could not allocate space for config info.\n" -msgstr "Nie mog przydzieli miejsca dla informacji o konfiguracji.\n" +msgstr "Nie mo髒na przydzieli miejsca dla informacji o konfiguracji.\n" -#. -#. * Item was never found. -#. -#: lib/getdef.c:330 +#: lib/getdef.c:328 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -"b陰d w konfiguracji - nieznana pozycja '%s' (powiadom administratora)\n" +"bd w konfiguracji - nieznana pozycja '%s' (powiadom administratora)\n" -#: lib/getdef.c:417 -#, c-format -msgid "error - lookup '%s' failed\n" -msgstr "b陰d - wyszukiwanie '%s' niepowiod這 si獦n" - -#: lib/getdef.c:425 -#, c-format -msgid "%s not found\n" -msgstr "%s nie znaleziony\n" - -#. -#. * get the password from her, and set the salt for -#. * the decryption from the group file. -#. -#: lib/pwauth.c:54 src/newgrp.c:348 +#: lib/pwauth.c:54 src/newgrp.c:343 msgid "Password: " -msgstr "Has這: " +msgstr "Haso: " #: lib/pwauth.c:56 #, c-format msgid "%s's Password: " -msgstr "Has這 u篡tkownika %s: " +msgstr "Haso u髒ytkownika %s: " -#: lib/pwauth.c:270 +#: lib/pwauth.c:247 msgid "(Echo on) " msgstr "(Echo on) " #: lib/strerror.c:20 #, c-format msgid "Unknown error %d" -msgstr "Nieznany b陰d %d" +msgstr "Nieznany bd %d" -#: src/chage.c:116 -#, c-format +#: src/chage.c:118 msgid "" -"Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" -"\t[-I inactive] [-E expire] [-d last_day] user\n" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -"U篡cie: %s [-l] [-m min_dni] [-M maks_dni] [-W ostrze瓢\n" -"\t[-I nieaktywne] [-E utrata_wa積o軼i] [-d ostatni_dzie鎞 u篡tkownik\n" +"U髒ycie: chage [-l] [-m min_dni] [-M maks_dni] [-W ostrze髒]\n" +" [-I nieaktywne] [-E utrata_wa髒noci]\n" +" [-d ostatni_dzie] u髒ytkownik\n" -#: src/chage.c:122 -#, c-format -msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" -msgstr "" -"U篡cie: %s [-l] [-m min_dni] [-M maks_dni] [-d ostatni_dzie鎞 u篡tkownik\n" - -#: src/chage.c:157 -#, fuzzy +#: src/chage.c:152 msgid "" "Enter the new value, or press ENTER for the default\n" "\n" msgstr "" -"Wpisz now warto嗆 lub wci郾ij ENTER by przyj帷 warto嗆 standardow崤n" +"Wpisz now warto lub wcinij ENTER by przyj warto domyln\n" "\n" -#: src/chage.c:160 +#: src/chage.c:155 msgid "Minimum Password Age" -msgstr "Minimalny wiek has豉" +msgstr "Minimalny wiek hasa" -#: src/chage.c:166 +#: src/chage.c:161 msgid "Maximum Password Age" -msgstr "Maksymalny wiek has豉" +msgstr "Maksymalny wiek hasa" -#: src/chage.c:174 +#: src/chage.c:169 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "Ostatnia zmiana has豉 (RRRR-MM-DD)" +msgstr "Ostatnia zmiana hasa (RRRR-MM-DD)" + +#: src/chage.c:177 +msgid "Password Expiration Warning" +msgstr "Ostrze髒enie o utracie wa髒noci hasa" #: src/chage.c:183 -msgid "Password Expiration Warning" -msgstr "Ostrze瞠nie o utracie wa積o軼i has豉" - -#: src/chage.c:189 msgid "Password Inactive" -msgstr "Has這 nieaktywne" +msgstr "Haso nieaktywne" -#: src/chage.c:197 +#: src/chage.c:191 msgid "Account Expiration Date (YYYY-MM-DD)" -msgstr "Data utraty wa積o軼i konta (RRRR-MM-DD)" +msgstr "Data utraty wa髒noci konta (RRRR-MM-DD)" -#. -#. * Start with the easy numbers - the number of days before the -#. * password can be changed, the number of days after which the -#. * password must be chaged, the number of days before the password -#. * expires that the user is told, and the number of days after the -#. * password expires that the account becomes unusable. -#. -#: src/chage.c:248 +#: src/chage.c:241 #, c-format msgid "Minimum:\t%ld\n" msgstr "Minimum:\t\t%ld\n" -#: src/chage.c:249 +#: src/chage.c:242 #, c-format msgid "Maximum:\t%ld\n" -msgstr "Maksimim:\t\t%ld\n" +msgstr "Maksimum:\t\t%ld\n" -#: src/chage.c:251 +#: src/chage.c:243 #, c-format msgid "Warning:\t%ld\n" -msgstr "Ostrze瞠nie:\t\t%ld\n" +msgstr "Ostrze髒enie:\t\t%ld\n" -#: src/chage.c:252 -#, fuzzy, c-format +#: src/chage.c:244 +#, c-format msgid "Inactive:\t%ld\n" -msgstr "Nieaktywne:\t%ld\n" +msgstr "Nieaktywne:\t\t%ld\n" -#. -#. * The "last change" date is either "Never" or the date the password -#. * was last modified. The date is the number of days since 1/1/1970. -#. -#: src/chage.c:260 +#: src/chage.c:251 msgid "Last Change:\t\t" msgstr "Ostatnia zmiana:\t" -#: src/chage.c:262 src/chage.c:276 src/chage.c:293 src/chage.c:306 +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 msgid "Never\n" msgstr "Nigdy\n" -#. -#. * The password expiration date is determined from the last change -#. * date plus the number of days the password is valid for. -#. -#: src/chage.c:273 +#: src/chage.c:264 msgid "Password Expires:\t" -msgstr "Has這 traci wa積o嗆:\t" +msgstr "Haso traci wa髒no:\t" -#. -#. * The account becomes inactive if the password is expired for more -#. * than "inactdays". The expiration date is calculated and the -#. * number of inactive days is added. The resulting date is when the -#. * active will be disabled. -#. -#: src/chage.c:290 +#: src/chage.c:280 msgid "Password Inactive:\t" -msgstr "Has這 nieaktywne:\t" +msgstr "Haso nieaktywne:\t" -#. -#. * The account will expire on the given date regardless of the -#. * password expiring or not. -#. -#: src/chage.c:304 +#: src/chage.c:294 msgid "Account Expires:\t" -msgstr "Has這 traci wa積o嗆:\t" +msgstr "Konto traci wa髒no:\t" -#: src/chage.c:468 +#: src/chage.c:445 #, c-format msgid "%s: do not include \"l\" with other flags\n" -msgstr "%s: nie 陰cz \"l\" z innymi flagami\n" +msgstr "%s: nie cz \"l\" z innymi flagami\n" -#: src/chage.c:481 src/chage.c:652 src/login.c:518 +#: src/chage.c:458 src/chage.c:588 src/login.c:503 #, c-format msgid "%s: permission denied\n" -msgstr "%s: odmowa dost瘼u\n" +msgstr "%s: odmowa dostpu\n" -#: src/chage.c:512 src/chpasswd.c:139 src/groupadd.c:529 src/groupdel.c:322 -#: src/groupmod.c:520 src/newusers.c:381 src/useradd.c:1754 src/userdel.c:717 -#: src/usermod.c:1732 -#, fuzzy, c-format -msgid "%s: PAM authentication failed\n" -msgstr "%s: b陰d podczas dodawania metody uwierzytelniania\n" - -#: src/chage.c:533 src/chpasswd.c:157 +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: nie mog zablokowa pliku z has豉mi\n" +msgid "%s: PAM authentication failed\n" +msgstr "%s: bd podczas uwierzytelniania przez PAM\n" -#: src/chage.c:544 src/chpasswd.c:162 +#: src/chage.c:510 src/chpasswd.c:159 #, c-format msgid "%s: can't open password file\n" -msgstr "%s: nie mog otworzy pliku z has豉mi\n" +msgstr "%s: nie mo髒na otworzy pliku z hasami\n" -#: src/chage.c:552 +#: src/chage.c:518 #, c-format msgid "%s: unknown user: %s\n" -msgstr "%s: nieznany u篡tkownik: %s\n" +msgstr "%s: nieznany u髒ytkownik: %s\n" -#: src/chage.c:571 -#, fuzzy, c-format +#: src/chage.c:536 +#, c-format msgid "%s: can't lock shadow password file" -msgstr "%s: nie mog zablokowa pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami" -#: src/chage.c:579 -#, fuzzy, c-format +#: src/chage.c:544 +#, c-format msgid "%s: can't open shadow password file" -msgstr "%s: nie mog otworzy pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami" -#: src/chage.c:674 +#: src/chage.c:605 #, c-format msgid "Changing the aging information for %s\n" -msgstr "Zmieniam informacj o u篡tkowniku %s\n" +msgstr "Zmieniam informacj o u髒ytkowniku %s\n" -#: src/chage.c:677 +#: src/chage.c:608 #, c-format msgid "%s: error changing fields\n" -msgstr "%s: b陰d podczas zmieniania p鏊\n" +msgstr "%s: bd podczas zmieniania p籀l\n" -#: src/chage.c:705 src/chage.c:771 src/pwunconv.c:174 +#: src/chage.c:632 src/pwunconv.c:138 #, c-format msgid "%s: can't update password file\n" -msgstr "%s: nie mog zaktualizowa pliku z has豉mi\n" +msgstr "%s: nie mo髒na zaktualizowa pliku z hasami\n" -#: src/chage.c:737 src/pwunconv.c:168 +#: src/chage.c:661 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "%s: nie mog zaktualizowa pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na zaktualizowa pliku z ukrytymi hasami\n" -#: src/chage.c:789 src/chage.c:805 src/chfn.c:570 src/chsh.c:382 -#: src/passwd.c:747 src/passwd.c:859 +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 msgid "Error updating the DBM password entry.\n" -msgstr "B陰d podczas aktualizacki bazy hase DBM.\n" +msgstr "Bd podczas aktualizacki bazy hase DBM.\n" -#: src/chage.c:823 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "%s: nie mog przepisa pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na przepisa pliku z ukrytymi hasami\n" -#: src/chage.c:838 +#: src/chage.c:707 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "%s: nie mog przepisa pliku z has豉mi\n" +msgstr "%s: nie mo髒na przepisa pliku z hasami\n" -#: src/chage.c:857 src/chpasswd.c:343 src/groupadd.c:590 src/groupdel.c:409 -#: src/groupmod.c:604 src/newusers.c:628 src/useradd.c:1869 src/userdel.c:849 -#: src/usermod.c:1811 -#, fuzzy, c-format +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 +#, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: nie mog usun帷 blokady z pliku\n" +msgstr "%s: PAM chauthtok nie powiodo si\n" -#: src/chfn.c:83 +#: src/chfn.c:84 #, c-format msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" "\t[-h home_ph] [-o other] [user]\n" msgstr "" -"U篡cie: %s [-f imi獥nazwisko] [-r nr_pokoju] [-w tel_praca]\n" -"\t[-h tel_dom] [-o inne] [u篡tkownik]\n" +"U髒ycie: %s [-f imi_nazwisko] [-r nr_pokoju] [-w tel_praca]\n" +"\t[-h tel_dom] [-o inne] [u髒ytkownik]\n" -#: src/chfn.c:88 +#: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -"U篡cie: %s [-f imi獥nazwisko] [-r nr_pokoju] [-w tel_praca] [-h tel_dom]\n" +"U髒ycie: %s [-f imi_nazwisko] [-r nr_pokoju] [-w tel_praca] [-h tel_dom]\n" -#: src/chfn.c:139 +#: src/chfn.c:140 msgid "Enter the new value, or press ENTER for the default\n" -msgstr "Wpisz now warto嗆 lub wci郾ij ENTER by przyj帷 warto嗆 domy郵n崤n" +msgstr "Wpisz now warto lub wcinij ENTER by przyj warto domyln\n" -#: src/chfn.c:142 +#: src/chfn.c:143 msgid "Full Name" -msgstr "Imi i nazwisko" +msgstr "Imi i nazwisko" -#: src/chfn.c:144 +#: src/chfn.c:145 #, c-format msgid "\tFull Name: %s\n" -msgstr "\tImi i nazwisko: %s\n" +msgstr "\tImi i nazwisko: %s\n" -#: src/chfn.c:147 +#: src/chfn.c:148 msgid "Room Number" msgstr "Numer pokoju" -#: src/chfn.c:149 +#: src/chfn.c:150 #, c-format msgid "\tRoom Number: %s\n" msgstr "\tNumer pokoju: %s\n" -#: src/chfn.c:152 +#: src/chfn.c:153 msgid "Work Phone" msgstr "Telefon do pracy" -#: src/chfn.c:154 +#: src/chfn.c:155 #, c-format msgid "\tWork Phone: %s\n" msgstr "\tTelefon do pracy: %s\n" -#: src/chfn.c:157 +#: src/chfn.c:158 msgid "Home Phone" msgstr "Telefon domowy" -#: src/chfn.c:159 +#: src/chfn.c:160 #, c-format msgid "\tHome Phone: %s\n" msgstr "\tTelefon domowy: %s\n" -#: src/chfn.c:162 +#: src/chfn.c:163 msgid "Other" msgstr "Inne" -#: src/chfn.c:271 src/chfn.c:281 src/chfn.c:291 src/chfn.c:301 src/chfn.c:311 -#: src/chfn.c:379 src/passwd.c:1115 +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 #, c-format msgid "%s: Permission denied.\n" -msgstr "%s: Brak praw dost瘼u.\n" +msgstr "%s: Brak praw dostpu.\n" -#: src/chfn.c:332 src/chsh.c:190 src/passwd.c:1165 +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 #, c-format msgid "%s: Unknown user %s\n" -msgstr "%s: Nieznany u篡tkownik %s\n" +msgstr "%s: Nieznany u髒ytkownik %s\n" -#: src/chfn.c:341 src/chsh.c:198 src/passwd.c:1096 +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 #, c-format msgid "%s: Cannot determine your user name.\n" -msgstr "%s: Nie mog ustali twojej nazwy u篡tkownika.\n" +msgstr "%s: Nie mo髒na ustali twojej nazwy u髒ytkownika.\n" -#: src/chfn.c:358 src/chsh.c:215 +#: src/chfn.c:359 src/chsh.c:210 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "%s: nie mog zmieni u篡tkownika `%s' na kliencie NIS.\n" +msgstr "%s: nie mo髒na zmieni u髒ytkownika `%s' na kliencie NIS.\n" -#: src/chfn.c:366 src/chsh.c:223 +#: src/chfn.c:367 src/chsh.c:218 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: `%s' jest nadrz璠nym serwerm NIS dla tego klienta.\n" +msgstr "%s: `%s' jest nadrzdnym serwerem NIS dla tego klienta.\n" -#: src/chfn.c:441 +#: src/chfn.c:442 #, c-format msgid "Changing the user information for %s\n" -msgstr "Zmieniam informacj o u篡tkowniku %s\n" +msgstr "Zmieniam informacj o u髒ytkowniku %s\n" -#: src/chfn.c:450 +#: src/chfn.c:451 #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s: nieprawid這wa nazwa: \"%s\"\n" +msgstr "%s: nieprawidowa nazwa: \"%s\"\n" -#: src/chfn.c:456 +#: src/chfn.c:457 #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "%s: nieprawid這wy numer pokoju: \"%s\"\n" +msgstr "%s: nieprawidowy numer pokoju: \"%s\"\n" -#: src/chfn.c:462 +#: src/chfn.c:463 #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "%s: nieprawid這wy numer telefonu do pracy: \"%s\"\n" +msgstr "%s: nieprawidowy numer telefonu do pracy: \"%s\"\n" -#: src/chfn.c:468 +#: src/chfn.c:469 #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s: nieprawid這wy numer telefonu domowego: \"%s\"\n" +msgstr "%s: nieprawidowy numer telefonu domowego: \"%s\"\n" -#: src/chfn.c:475 +#: src/chfn.c:476 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s: \"%s\" zawiera nieprawid這we znaki\n" +msgstr "%s: \"%s\" zawiera nieprawidowe znaki\n" -#: src/chfn.c:488 +#: src/chfn.c:489 #, c-format msgid "%s: fields too long\n" -msgstr "%s: pola zbyt d逝gie\n" +msgstr "%s: pola zbyt dugie\n" -#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277 +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 msgid "Cannot change ID to root.\n" -msgstr "Nie mog zmieni ID na root.\n" +msgstr "Nie mo髒na zmieni ID na root.\n" -#: src/chfn.c:519 src/chsh.c:331 src/passwd.c:656 src/passwd.c:811 +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 msgid "Cannot lock the password file; try again later.\n" -msgstr "Nie mog zablokowa pliku z has豉mi; spr鏏uj p騧niej.\n" +msgstr "Nie mo髒na zablokowa pliku z hasami; spr籀buj p籀驕niej.\n" -#: src/chfn.c:525 src/chsh.c:337 src/passwd.c:661 src/passwd.c:816 +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 msgid "Cannot open the password file.\n" -msgstr "Nie mog otworzy pliku z has豉mi.\n" +msgstr "Nie mo髒na otworzy pliku z hasami.\n" -#: src/chfn.c:542 src/chsh.c:352 src/passwd.c:667 src/usermod.c:1348 +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 #, c-format msgid "%s: %s not found in /etc/passwd\n" -msgstr "%s: %s nie znaleziony w /etc/passwd\n" +msgstr "%s: nie znaleziono %s w /etc/passwd\n" -#: src/chfn.c:561 src/chsh.c:373 src/passwd.c:740 src/passwd.c:852 +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 msgid "Error updating the password entry.\n" -msgstr "B陰d podczas aktualizacji wpisu do bazy hase.\n" +msgstr "Bd podczas aktualizacji wpisu do bazy hase.\n" -#: src/chfn.c:585 src/chsh.c:397 src/passwd.c:755 src/passwd.c:867 +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 msgid "Cannot commit password file changes.\n" -msgstr "Wprowadzenie zmian do pliku passwd jest niemo磧iwe.\n" +msgstr "Wprowadzenie zmian do pliku passwd jest niemo髒liwe.\n" -#: src/chfn.c:592 src/chsh.c:404 +#: src/chfn.c:593 src/chsh.c:399 msgid "Cannot unlock the password file.\n" -msgstr "Nie mog usun帷 blokady z pliku z has豉mi.\n" +msgstr "Nie mo髒na usun blokady z pliku z hasami.\n" -#: src/chpasswd.c:66 +#: src/chpasswd.c:67 #, c-format -msgid "usage: %s [-e]\n" -msgstr "u篡cie: %s [-e]\n" +msgid "Usage: %s [-e]\n" +msgstr "U髒ycie: %s [-e]\n" -#: src/chpasswd.c:171 src/pwconv.c:94 +#: src/chpasswd.c:154 +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: nie mo髒na zablokowa pliku z hasami\n" + +#: src/chpasswd.c:168 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" -msgstr "%s: nie mog zablokowa pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami\n" -#: src/chpasswd.c:177 src/gpasswd.c:596 src/pwconv.c:99 src/pwunconv.c:103 -#: src/pwunconv.c:108 +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s: nie mog otworzy pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami\n" -#: src/chpasswd.c:200 src/newusers.c:460 +#: src/chpasswd.c:197 src/newusers.c:441 #, c-format msgid "%s: line %d: line too long\n" -msgstr "%s: linia %d: linia zbyt d逝ga\n" +msgstr "%s: linia %d: linia zbyt duga\n" -#: src/chpasswd.c:220 +#: src/chpasswd.c:217 #, c-format msgid "%s: line %d: missing new password\n" -msgstr "%s: linia %d: brakuje nowego has豉\n" +msgstr "%s: linia %d: brakuje nowego hasa\n" -#: src/chpasswd.c:237 +#: src/chpasswd.c:234 #, c-format msgid "%s: line %d: unknown user %s\n" -msgstr "%s: linia %d: nieznany u篡tkownik %s\n" +msgstr "%s: linia %d: nieznany u髒ytkownik %s\n" -#: src/chpasswd.c:290 +#: src/chpasswd.c:280 #, c-format msgid "%s: line %d: cannot update password entry\n" -msgstr "%s: linia %d: nie mog zaktualizowa wpisu do bazy hase許n" +msgstr "%s: linia %d: nie mo髒na zaktualizowa wpisu do bazy hase\n" -#: src/chpasswd.c:307 src/newusers.c:588 +#: src/chpasswd.c:297 src/newusers.c:569 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: wykryto b陰d, zignorowano modyfikacje\n" +msgstr "%s: wykryto bd, zignorowano modyfikacje\n" -#: src/chpasswd.c:319 +#: src/chpasswd.c:309 #, c-format msgid "%s: error updating shadow file\n" -msgstr "%s: b陰d podczas aktualizacji pliku z ukrytymi has豉mi\n" +msgstr "%s: bd podczas aktualizacji pliku z ukrytymi hasami\n" -#: src/chpasswd.c:328 +#: src/chpasswd.c:318 #, c-format msgid "%s: error updating password file\n" -msgstr "%s: b陰d podczas aktualizacji pliku z has豉mi\n" +msgstr "%s: bd podczas aktualizacji pliku z hasami\n" -#: src/chsh.c:75 +#: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" -msgstr "U篡cie: %s [-s pow這ka] [nazwa]\n" - -#: src/chsh.c:89 -msgid "Enter the new value, or press return for the default\n" -msgstr "Wpisz now warto嗆 lub wci郾ij ENTER by przyj帷 warto嗆 domy郵n崤n" +msgstr "U髒ycie: %s [-s powoka] [nazwa]\n" #: src/chsh.c:90 -msgid "Login Shell" -msgstr "Pow這ka logowania" +msgid "Enter the new value, or press return for the default\n" +msgstr "Wpisz now warto lub wcinij ENTER by przyj warto domyln\n" -#: src/chsh.c:239 src/chsh.c:253 +#: src/chsh.c:91 +msgid "Login Shell" +msgstr "Powoka logowania" + +#: src/chsh.c:234 src/chsh.c:248 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "Nie mo瞠sz zmienia pow這ki dla %s.\n" +msgstr "Nie mo髒esz zmienia powoki dla %s.\n" -#: src/chsh.c:282 +#: src/chsh.c:277 #, c-format msgid "Changing the login shell for %s\n" -msgstr "Zmieniam pow這k logowania dla %s\n" +msgstr "Zmieniam powok logowania dla %s\n" -#: src/chsh.c:294 +#: src/chsh.c:289 #, c-format msgid "%s: Invalid entry: %s\n" -msgstr "%s: Nieprawid這wy wpis: %s\n" +msgstr "%s: Nieprawidowy wpis: %s\n" -#: src/chsh.c:301 +#: src/chsh.c:296 #, c-format msgid "%s is an invalid shell.\n" -msgstr "%s jest nieprawid這w pow這k.\n" - -#: src/dpasswd.c:52 -#, c-format -msgid "Usage: %s [-(a|d)] shell\n" -msgstr "U篡cie: %s [-(a|d)] pow這ka\n" - -#: src/dpasswd.c:115 -msgid "Shell password: " -msgstr "Has這 pow這ki: " - -#: src/dpasswd.c:121 -msgid "re-enter Shell password: " -msgstr "Wpisz ponownie has這 pow這ki: " - -#: src/dpasswd.c:129 -#, c-format -msgid "%s: Passwords do not match, try again.\n" -msgstr "%s: Has豉 nie pasuj, spr鏏uj ponownie.\n" - -#: src/dpasswd.c:149 -#, c-format -msgid "%s: can't create %s" -msgstr "%s: nie mog utworzy %s" - -#: src/dpasswd.c:155 -#, c-format -msgid "%s: can't open %s" -msgstr "%s: nie mog otworzy %s" - -#: src/dpasswd.c:183 -#, c-format -msgid "%s: Shell %s not found.\n" -msgstr "%s: Pow這ka %s nie znaleziona.\n" +msgstr "%s jest nieprawidow powok.\n" #: src/expiry.c:59 msgid "Usage: expiry {-f|-c}\n" -msgstr "U篡cie: expiry {-f|-c}\n" +msgstr "U髒ycie: expiry {-f|-c}\n" #: src/expiry.c:113 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" -msgstr "%s: OSTRZE浩NIE! Program musi posiada SUID root!\n" +msgstr "%s: OSTRZE驍ENIE! Program musi posiada SUID root!\n" #: src/expiry.c:124 #, c-format msgid "%s: unknown user\n" -msgstr "%s: nieznany u篡tkownik\n" +msgstr "%s: nieznany u髒ytkownik\n" #: src/faillog.c:77 #, c-format -msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" -msgstr "u篡cie: %s [-a|-u u篡tkownik] [-m maks] [-r] [-t dni] [-l bloksek]\n" +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +msgstr "U髒ycie: %s [-a|-u u髒ytkownik] [-m maks] [-r] [-t dni] [-l bloksek]\n" #: src/faillog.c:131 src/lastlog.c:96 #, c-format msgid "Unknown User: %s\n" -msgstr "Nieznany u篡tkownik: %s\n" +msgstr "Nieznany u髒ytkownik: %s\n" #: src/faillog.c:212 msgid "Username Failures Maximum Latest\n" -msgstr "U篡tkownik Niepowodzenia Maksymalnie Ostatnio\n" +msgstr "U髒ytkownik Bdy Maksimum Ostatnio\n" #: src/faillog.c:229 #, c-format @@ -712,57 +621,57 @@ msgstr " %s na %s" #: src/faillog.c:233 #, c-format msgid " [%lds left]" -msgstr " [%lds pozosta這]" +msgstr " [pozostao %lds]" #: src/faillog.c:237 #, c-format msgid " [%lds lock]" -msgstr " [%lds blokada]" +msgstr " [blokada %lds]" #: src/gpasswd.c:78 #, c-format -msgid "usage: %s [-r|-R] group\n" -msgstr "u篡cie: %s [-r|-R] grupa\n" +msgid "Usage: %s [-r|-R] group\n" +msgstr "U髒ycie: %s [-r|-R] grupa\n" #: src/gpasswd.c:79 #, c-format msgid " %s [-a user] group\n" -msgstr " %s [-a u篡tkownik] grupa\n" +msgstr " %s [-a u髒ytkownik] grupa\n" #: src/gpasswd.c:80 #, c-format msgid " %s [-d user] group\n" -msgstr " %s [-d u篡tkownik] grupa\n" +msgstr " %s [-d u髒ytkownik] grupa\n" #: src/gpasswd.c:83 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" -msgstr " %s [-A u篡tkownik,...] [-M u篡tkownik,...] grupa\n" +msgstr " %s [-A u髒ytkownik,...] [-M u髒ytkownik,...] grupa\n" #: src/gpasswd.c:85 #, c-format msgid " %s [-M user,...] group\n" -msgstr " %s [-M u篡tkownik,...] grupa\n" +msgstr " %s [-M u髒ytkownik,...] grupa\n" #: src/gpasswd.c:146 src/gpasswd.c:230 #, c-format msgid "%s: unknown user %s\n" -msgstr "%s: nieznany u篡tkownik %s\n" +msgstr "%s: nieznany u髒ytkownik %s\n" #: src/gpasswd.c:157 msgid "Permission denied.\n" -msgstr "Dost瘼 zabroniony.\n" +msgstr "Dostp zabroniony.\n" #: src/gpasswd.c:243 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s: plik z ukrytymi has豉mi grup wymagany dla -A\n" +msgstr "%s: plik z ukrytymi hasami grup wymagany dla -A\n" #: src/gpasswd.c:294 msgid "Who are you?\n" -msgstr "Kim jeste?\n" +msgstr "Kim jeste?\n" -#: src/gpasswd.c:313 src/newgrp.c:297 +#: src/gpasswd.c:313 src/newgrp.c:292 #, c-format msgid "unknown group: %s\n" msgstr "nieznana grupa: %s\n" @@ -770,253 +679,241 @@ msgstr "nieznana grupa: %s\n" #: src/gpasswd.c:422 #, c-format msgid "Adding user %s to group %s\n" -msgstr "Dodaj nowego u篡tkownika %s do grupy %s\n" +msgstr "Dodaj nowego u髒ytkownika %s do grupy %s\n" #: src/gpasswd.c:440 #, c-format msgid "Removing user %s from group %s\n" -msgstr "Usuwam u篡tkownika %s z grupy %s\n" +msgstr "Usuwam u髒ytkownika %s z grupy %s\n" #: src/gpasswd.c:454 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s: nieznany cz這nek %s\n" +msgstr "%s: nieznany czonek %s\n" #: src/gpasswd.c:501 #, c-format msgid "%s: Not a tty\n" msgstr "%s: To nie tty\n" -#. -#. * A new password is to be entered and it must be encrypted, etc. -#. * The password will be prompted for twice, and both entries must be -#. * identical. There is no need to validate the old password since -#. * the invoker is either the group owner, or root. -#. #: src/gpasswd.c:522 #, c-format msgid "Changing the password for group %s\n" -msgstr "Zmieniam has這 dla grupy %s\n" +msgstr "Zmieniam haso dla grupy %s\n" #: src/gpasswd.c:525 msgid "New Password: " -msgstr "Nowe has這: " +msgstr "Nowe haso: " -#: src/gpasswd.c:530 src/passwd.c:365 +#: src/gpasswd.c:530 src/passwd.c:281 msgid "Re-enter new password: " -msgstr "Wpisz has這 ponownie: " +msgstr "Wpisz haso ponownie: " #: src/gpasswd.c:542 msgid "They don't match; try again" -msgstr "Nie pasuj; spr鏏uj ponownie" +msgstr "Nie zgadzaj si; spr籀buj ponownie" #: src/gpasswd.c:546 #, c-format msgid "%s: Try again later\n" -msgstr "%s: Spr鏏uj ponownie p騧niej\n" +msgstr "%s: Spr籀buj ponownie p籀驕niej\n" #: src/gpasswd.c:578 #, c-format msgid "%s: can't get lock\n" -msgstr "%s: nie mog zablokowa潿n" +msgstr "%s: nie mo髒na zablokowa\n" #: src/gpasswd.c:584 #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s: nie mog zablokowa pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami\n" #: src/gpasswd.c:590 #, c-format msgid "%s: can't open file\n" -msgstr "%s: nie mog otworzy pliku\n" +msgstr "%s: nie mo髒na otworzy pliku\n" #: src/gpasswd.c:602 #, c-format msgid "%s: can't update entry\n" -msgstr "%s: nie mog zaktualizowa wpisu\n" +msgstr "%s: nie mo髒na zaktualizowa wpisu\n" #: src/gpasswd.c:608 #, c-format msgid "%s: can't update shadow entry\n" -msgstr "%s: nie mog zaktualizowa wpisu do pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na zaktualizowa wpisu do pliku z ukrytymi hasami\n" #: src/gpasswd.c:615 #, c-format msgid "%s: can't re-write file\n" -msgstr "%s: nie mog przepisa pliku\n" +msgstr "%s: nie mo髒na przepisa pliku\n" #: src/gpasswd.c:621 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s: nie mog przepisa pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na przepisa pliku z ukrytymi hasami\n" #: src/gpasswd.c:630 #, c-format msgid "%s: can't unlock file\n" -msgstr "%s: nie mog usun帷 blokady z pliku\n" +msgstr "%s: nie mo髒na usun blokady z pliku\n" #: src/gpasswd.c:635 #, c-format msgid "%s: can't update DBM files\n" -msgstr "%s: nie mog zaktualizwoa plik闚 DBM\n" +msgstr "%s: nie mo髒na zaktualizwoa plik籀w DBM\n" #: src/gpasswd.c:642 #, c-format msgid "%s: can't update DBM shadow files\n" -msgstr "%s: nie mog zaktualizowa pliku DBM z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na zaktualizowa pliku DBM z ukrytymi hasami\n" -#: src/groupadd.c:101 -msgid "usage: groupadd [-g gid [-o]] group\n" -msgstr "u篡cie: groupadd [-g gid [-o]] grupa\n" +#: src/groupadd.c:102 +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" +msgstr "U髒ycie: groupadd [-g gid [-o]] [-f] grupa\n" -#: src/groupadd.c:167 src/groupadd.c:192 src/groupmod.c:179 src/groupmod.c:228 -#: src/useradd.c:970 src/usermod.c:552 src/usermod.c:695 +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s: b陰d podczas dodawania nowej grupy\n" +msgstr "%s: bd podczas dodawania nowej grupy\n" -#: src/groupadd.c:178 src/groupadd.c:203 src/groupmod.c:197 src/useradd.c:981 -#: src/usermod.c:564 src/usermod.c:708 +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 #, c-format msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: nie mog doda nowego wpisu do bazy dbm grup\n" +msgstr "%s: nie mo髒na doda nowego wpisu do bazy dbm grup\n" -#: src/groupadd.c:255 src/useradd.c:1034 +#: src/groupadd.c:256 src/useradd.c:977 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: nazwa %s nie jest niepowtarzalny\n" -#: src/groupadd.c:270 +#: src/groupadd.c:271 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: uid %u nie jest niepowtarzalny\n" -#: src/groupadd.c:294 +#: src/groupadd.c:295 #, c-format msgid "%s: can't get unique gid\n" -msgstr "%s: nie mog uzyska niepowtarzalnego gid\n" +msgstr "%s: nie mo髒na uzyska niepowtarzalnego gid\n" -#. -#. * All invalid group names land here. -#. -#: src/groupadd.c:317 src/groupmod.c:341 +#: src/groupadd.c:318 src/groupmod.c:342 #, c-format msgid "%s: %s is a not a valid group name\n" -msgstr "%s: %s: nie jest prawid這w nazw grupy\n" +msgstr "%s: %s: nie jest prawidow nazw grupy\n" -#: src/groupadd.c:346 src/groupmod.c:366 +#: src/groupadd.c:347 src/groupmod.c:367 #, c-format msgid "%s: invalid group %s\n" -msgstr "%s: nieprawid這wa grupa %s\n" +msgstr "%s: nieprawidowa grupa %s\n" -#: src/groupadd.c:363 src/useradd.c:1313 +#: src/groupadd.c:364 src/useradd.c:1173 #, c-format msgid "%s: -O requires NAME=VALUE\n" -msgstr "%s: -O wymaga ZMIENNA=WARTO汎\n" +msgstr "%s: -O wymaga ZMIENNA=WARTO\n" -#: src/groupadd.c:407 src/groupdel.c:173 src/groupmod.c:401 src/useradd.c:1428 -#: src/userdel.c:312 src/usermod.c:576 +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 #, c-format msgid "%s: cannot rewrite group file\n" -msgstr "%s: nie mog przepisa pliku z grupami\n" +msgstr "%s: nie mo髒na przepisa pliku z grupami\n" -#: src/groupadd.c:415 src/groupdel.c:179 src/groupmod.c:409 src/useradd.c:1437 -#: src/userdel.c:319 src/usermod.c:722 +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 #, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s: nie mog przepisa pliku z ukrytymi grupami\n" +msgstr "%s: nie mo髒na przepisa pliku z ukrytymi hasami grup\n" -#: src/groupadd.c:433 src/groupdel.c:198 src/groupmod.c:427 src/userdel.c:403 +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s: nie mog zablokowa pliku z grupami\n" +msgstr "%s: nie mo髒na zablokowa pliku z grupami\n" -#: src/groupadd.c:438 src/groupdel.c:202 src/groupmod.c:432 +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 #, c-format msgid "%s: unable to open group file\n" -msgstr "%s: nie mog otworzy pliku z grupami\n" +msgstr "%s: nie mo髒na otworzy pliku z grupami\n" -#: src/groupadd.c:445 src/groupdel.c:207 src/groupmod.c:439 src/userdel.c:414 +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: nie mog zablokowa pliku z ukrytymi grupami\n" +msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami grup\n" -#: src/groupadd.c:451 src/groupdel.c:212 src/groupmod.c:445 +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: nie mog otworzy pliku z ukrytymi grupami\n" +msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami grup\n" -#: src/groupadd.c:562 +#: src/groupadd.c:563 #, c-format msgid "%s: group %s exists\n" msgstr "%s: grupa %s istnieje\n" -#: src/groupdel.c:92 -msgid "usage: groupdel group\n" -msgstr "u篡cie: groupdel grupa\n" +#: src/groupdel.c:88 +msgid "Usage: groupdel group\n" +msgstr "U髒ycie: groupdel grupa\n" -#: src/groupdel.c:110 src/groupmod.c:184 src/groupmod.c:233 +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 #, c-format msgid "%s: error removing group entry\n" -msgstr "%s: b陰d podczas usuwania grupy\n" +msgstr "%s: bd podczas usuwania grupy\n" -#: src/groupdel.c:122 src/groupmod.c:204 +#: src/groupdel.c:119 src/groupmod.c:205 #, c-format msgid "%s: error removing group dbm entry\n" -msgstr "%s: b陰d podczas usuwania wpisu dbm o grupie\n" +msgstr "%s: bd podczas usuwania wpisu dbm o grupie\n" -#: src/groupdel.c:137 +#: src/groupdel.c:135 #, c-format msgid "%s: error removing shadow group entry\n" -msgstr "%s: b陰d podczas usuwania wpisu o ukrytej grupie\n" +msgstr "%s: bd podczas usuwania wpisu z pliku z ukrytymi hasami grup\n" -#: src/groupdel.c:150 src/groupmod.c:254 +#: src/groupdel.c:149 src/groupmod.c:255 #, c-format msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: b陰d podczas usuwania wpisu dbm z pliku ukrytych grup\n" +msgstr "%s: bd podczas usuwania wpisu dbm z pliku ukrytymi hasami grup\n" -#. -#. * Can't remove the group. -#. -#: src/groupdel.c:254 +#: src/groupdel.c:255 #, c-format msgid "%s: cannot remove user's primary group.\n" -msgstr "%s: nie mog usun望 podstawowej grupy u篡tkownik闚.\n" +msgstr "%s: nie mo髒na usun podstawowej grupy u髒ytkownik籀w.\n" -#: src/groupdel.c:355 src/groupmod.c:550 +#: src/groupdel.c:359 src/groupmod.c:551 #, c-format msgid "%s: group %s does not exist\n" -msgstr "%s: grupa %s nie isnieje\n" +msgstr "%s: grupa %s nie istnieje\n" -#: src/groupdel.c:369 src/groupmod.c:566 +#: src/groupdel.c:373 src/groupmod.c:567 #, c-format msgid "%s: group %s is a NIS group\n" -msgstr "%s: grupa %s jest grup NIS\n" +msgstr "%s: grupa %s jest grup NIS\n" -#: src/groupdel.c:375 src/groupmod.c:571 src/userdel.c:776 src/usermod.c:1045 +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 #, c-format msgid "%s: %s is the NIS master\n" -msgstr "%s: %s jest g堯wnym serwerem NIS\n" +msgstr "%s: %s jest g籀wnym serwerem NIS\n" #: src/groupmems.c:95 msgid "Member already exists\n" -msgstr "" +msgstr "Nie znaleziono czonka do usunicia\n" #: src/groupmems.c:125 msgid "Member to remove could not be found\n" msgstr "" #: src/groupmems.c:158 -msgid "usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" -msgstr "u篡cie groupmems -a u篡tkownik | -d u篡tkownik | -D | -l [-g grupa]\n" +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgstr "U髒ycie groupmems -a u髒ytkownik | -d u髒ytkownik | -D | -l [-g grupa]\n" #: src/groupmems.c:201 msgid "Only root can add members to different groups\n" -msgstr "" +msgstr "Tylko root mo髒e dodawa czonk籀w do r籀髒nych grup\n" #: src/groupmems.c:206 msgid "Group access is required\n" -msgstr "" +msgstr "Wymagany dostp do grupy\n" #: src/groupmems.c:210 msgid "Not primary owner of current group\n" @@ -1024,54 +921,55 @@ msgstr "" #: src/groupmems.c:215 msgid "Unable to lock group file\n" -msgstr "Nie mo積a zablokowa pliku z grupami\n" +msgstr "Nie mo髒na zablokowa pliku z grupami\n" #: src/groupmems.c:220 msgid "Unable to open group file\n" -msgstr "Nie mo積a otworzy pliku z grupami\n" +msgstr "Nie mo髒na otworzy pliku z grupami\n" #: src/groupmems.c:240 msgid "Cannot close group file\n" -msgstr "Nie mo積a otworzy pliku z grupami\n" +msgstr "Nie mo髒na otworzy pliku z grupami\n" -#: src/groupmod.c:103 -msgid "usage: groupmod [-g gid [-o]] [-n name] group\n" -msgstr "u篡cie: groupmod [-g gid [-o]] [-n nazwa] grupa\n" +#: src/groupmod.c:104 +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "U髒ycie: groupmod [-g gid [-o]] [-n nazwa] grupa\n" -#: src/groupmod.c:161 -#, fuzzy, c-format +#: src/groupmod.c:162 +#, c-format msgid "%s: %s not found in /etc/group\n" -msgstr "%s: %s nie znaleziony w /etc/passwd\n" +msgstr "%s: nie znaleziono %s w /etc/group\n" -#: src/groupmod.c:247 +#: src/groupmod.c:248 #, c-format msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: nie mog doda nowego wpisu dbm do pliku z ukrytymi grupami\n" +msgstr "" +"%s: nie mo髒na doda nowego wpisu dbm do pliku z ukrytymi hasami grup\n" -#: src/groupmod.c:300 +#: src/groupmod.c:301 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u nie jest niepowtarzalnym gid\n" -#: src/groupmod.c:330 +#: src/groupmod.c:331 #, c-format msgid "%s: %s is not a unique name\n" -msgstr "%s: %s nie jest niepowtarzaln nazw崤n" +msgstr "%s: %s nie jest niepowtarzaln nazw\n" #: src/groups.c:59 #, c-format msgid "unknown user %s\n" -msgstr "nieznany u篡tkownik %s\n" +msgstr "nieznany u髒ytkownik %s\n" #: src/grpck.c:87 #, c-format msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" -msgstr "U篡cie: %s [-r] [-s] [grupa [gshadow]]\n" +msgstr "U髒ycie: %s [-r] [-s] [grupa [gshadow]]\n" #: src/grpck.c:90 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" -msgstr "U篡cie: %s [-r] [-s] [grupa]\n" +msgstr "U髒ycie: %s [-r] [-s] [grupa]\n" #: src/grpck.c:108 src/pwck.c:108 msgid "No" @@ -1080,101 +978,87 @@ msgstr "Nie" #: src/grpck.c:192 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" -msgstr "%s: -s i -r s niekompatybilne\n" +msgstr "%s: -s i -r s niekompatybilne\n" #: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s: nie mog zablokowa pliku %s\n" +msgstr "%s: nie mo髒na zablokowa pliku %s\n" #: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:202 src/pwck.c:242 #: src/pwck.c:251 #, c-format msgid "%s: cannot open file %s\n" -msgstr "%s: nie mog otworzy pliku %s\n" +msgstr "%s: nie mo髒na otworzy pliku %s\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:311 msgid "invalid group file entry\n" -msgstr "nieprawid這wy wpis do pliku grup\n" +msgstr "nieprawidowy wpis do pliku grup\n" #: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 #: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 #: src/pwck.c:543 #, c-format msgid "delete line `%s'? " -msgstr "usun帷 lini `%s'? " +msgstr "usun lini `%s'? " -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:374 msgid "duplicate group entry\n" -msgstr "duplikat wpisu grup\n" +msgstr "powt籀rzony wpis w pliku grup\n" #: src/grpck.c:391 #, c-format msgid "invalid group name `%s'\n" -msgstr "nieprawid這wa nazwa grupy `%s'\n" +msgstr "nieprawidowa nazwa grupy `%s'\n" #: src/grpck.c:418 #, c-format msgid "group %s: no user %s\n" -msgstr "grupa %s: nie ma u篡tkownika %s\n" +msgstr "grupa %s: nie ma u髒ytkownika %s\n" #: src/grpck.c:420 src/grpck.c:590 #, c-format msgid "delete member `%s'? " -msgstr "skasowa cz這nka `%s'? " +msgstr "skasowa czonka `%s'? " -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:457 msgid "invalid shadow group file entry\n" -msgstr "nieprawid這wy wpis do pliku z ukrytymi has豉mi\n" +msgstr "nieprawidowy wpis w pliku z ukrytymi hasami grup\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:520 msgid "duplicate shadow group entry\n" -msgstr "duplikuj帷y si wpis w pliku ukrytych grup\n" +msgstr "powt籀rzony wpis w pliku z ukrytymi hasami grup\n" #: src/grpck.c:537 msgid "no matching group file entry\n" -msgstr "brak pasuj帷ego wpisu w pliku grup\n" +msgstr "brak pasujcego wpisu w pliku grup\n" #: src/grpck.c:558 #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "ukryta grupa %s: brak u篡tkownika administracyjnego %s\n" +msgstr "" +"grupa %s: u髒ytkownik administracyjny %s z pliku ukrytych hase grup nie " +"istnieje\n" #: src/grpck.c:560 #, c-format msgid "delete administrative member `%s'? " -msgstr "usun望 cz這nka administracyjnego `%s'? " +msgstr "usun czonka administracyjnego `%s'? " #: src/grpck.c:588 #, c-format msgid "shadow group %s: no user %s\n" -msgstr "ukryta grupa %s: nie ma u篡tkownika %s\n" +msgstr "grupa %s: u髒ytkownik %s z pliku ukrytych hase grup nie istnieje\n" #: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 #, c-format msgid "%s: cannot update file %s\n" -msgstr "%s: nie mog zaktualizowa pliku %s\n" +msgstr "%s: nie mo髒na zaktualizowa pliku %s\n" #: src/grpck.c:647 src/pwck.c:612 #, c-format msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: pliki zosta造 zaktualizowane; uruchom mkpasswd\n" +msgstr "%s: pliki zostay zaktualizowane; uruchom mkpasswd\n" #: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 #, c-format @@ -1184,136 +1068,123 @@ msgstr "%s: bez zmian\n" #: src/grpck.c:651 src/pwck.c:616 #, c-format msgid "%s: the files have been updated\n" -msgstr "%s: pliku zost造 zaktualizowane\n" +msgstr "%s: pliku zosty zaktualizowane\n" #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" -msgstr "%s: nie mog zablokowa pliku z grupami\n" +msgstr "%s: nie mo髒na zablokowa pliku z grupami\n" #: src/grpconv.c:65 src/grpunconv.c:61 #, c-format msgid "%s: can't open group file\n" -msgstr "%s: nie mog otworzy pliku z grupami\n" +msgstr "%s: nie mo髒na otworzy pliku z grupami\n" #: src/grpconv.c:70 src/grpunconv.c:66 #, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: nie mog zablokowa pliku z przes這ni皻ymi grupami\n" +msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami grup\n" #: src/grpconv.c:76 src/grpunconv.c:72 #, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: nie mog otworzy pliku z przes這ni皻ymi grupami\n" +msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami grup\n" #: src/grpconv.c:94 #, c-format msgid "%s: can't remove shadow group %s\n" -msgstr "%s: nie mog usun望 ukrytej grupy %s\n" +msgstr "%s: nie mo髒na usun grupy %s z pliku ukrytych hase grup\n" -#: src/grpconv.c:138 src/pwconv.c:153 +#: src/grpconv.c:133 src/pwconv.c:154 #, c-format msgid "%s: can't update shadow entry for %s\n" -msgstr "%s: nie mog zaktualizowa wpisu ukrytej grupy dla %s\n" +msgstr "%s: nie mo髒na zaktualizowa wpisu ukrytej grupy dla %s\n" -#: src/grpconv.c:148 src/grpunconv.c:91 +#: src/grpconv.c:143 src/grpunconv.c:91 #, c-format msgid "%s: can't update entry for group %s\n" -msgstr "%s: nie mog zaktualizowa wpisu dla grupy %s\n" +msgstr "%s: nie mo髒na zaktualizowa wpisu dla grupy %s\n" -#: src/grpconv.c:155 src/grpunconv.c:99 +#: src/grpconv.c:150 src/grpunconv.c:99 #, c-format msgid "%s: can't update shadow group file\n" -msgstr "%s: nie mog zaktualizowa pliku z ukrytymi grupami\n" +msgstr "%s: nie mo髒na zaktualizowa pliku z ukrytymi hasami grup\n" -#: src/grpconv.c:160 src/grpunconv.c:105 +#: src/grpconv.c:155 src/grpunconv.c:105 #, c-format msgid "%s: can't update group file\n" -msgstr "%s: nie mog zaktualizowa pliku z grupami\n" - -#: src/grpconv.c:175 src/grpunconv.c:127 -#, c-format -msgid "%s: not configured for shadow group support.\n" -msgstr "%s: nie skonfigurowany dla wsparcia ukrytych grup.\n" +msgstr "%s: nie mo髒na zaktualizowa pliku z grupami\n" #: src/grpunconv.c:110 #, c-format msgid "%s: can't delete shadow group file\n" -msgstr "%s: nie mog skasowa pliku z ukrytymi grupami\n" +msgstr "%s: nie mo髒na skasowa pliku z ukrytymi hasami grup\n" #: src/id.c:53 -msgid "usage: id [-a]\n" -msgstr "u篡cie: id [-a]\n" +msgid "Usage: id [-a]\n" +msgstr "U髒ycie: id [-a]\n" #: src/id.c:55 -msgid "usage: id\n" -msgstr "u篡cie: id\n" +msgid "Usage: id\n" +msgstr "U髒ycie: id\n" -#. -#. * Start off the group message. It will be of the format -#. * -#. * groups=###(aaa),###(aaa),###(aaa) -#. * -#. * where "###" is a numerical value and "aaa" is the -#. * corresponding name for each respective numerical value. -#. #: src/id.c:169 msgid " groups=" msgstr " grupy=" #: src/lastlog.c:110 src/lastlog.c:116 #, c-format -msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n" -msgstr "" +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" +msgstr "U髒ycie: %s [{-u|--login} login] [{-t|--time} dni] [{-h|--help}]\n" #: src/lastlog.c:181 msgid "Username Port From Latest\n" -msgstr "U篡tkownik Port Z Ostatnio\n" +msgstr "U髒ytkownik Port Z Ostatnio\n" #: src/lastlog.c:183 msgid "Username Port Latest\n" -msgstr "U篡tkownik Port Ostatnio\n" +msgstr "U髒ytkownik Port Ostatnio\n" -#: src/lastlog.c:197 +#: src/lastlog.c:198 msgid "**Never logged in**" msgstr "**Nigdy nie zalogowany**" -#: src/login.c:185 +#: src/login.c:175 #, c-format -msgid "usage: %s [-p] [name]\n" -msgstr "u篡cie: %s [-p] [nazwa]\n" +msgid "Usage: %s [-p] [name]\n" +msgstr "U髒ycie: %s [-p] [nazwa]\n" -#: src/login.c:188 +#: src/login.c:178 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h host] [-f nazwa]\n" -#: src/login.c:190 +#: src/login.c:180 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r host\n" -#: src/login.c:274 +#: src/login.c:259 msgid "Invalid login time\n" -msgstr "Nieprawid這wy czas logowania\n" +msgstr "Nieprawidowy czas logowania\n" -#: src/login.c:329 +#: src/login.c:314 msgid "" "\n" "System closed for routine maintenance\n" msgstr "" "\n" -"System zamkni皻y do rutynowej konserwacji.\n" +"System zamknity do rutynowej konserwacji.\n" -#: src/login.c:340 +#: src/login.c:325 msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[Roz陰czenie pomini皻e -- zezwolenie na logowanie si root-a.]\n" +"[Rozczenie pominite -- zezwolenie na logowanie si root-a.]\n" -#: src/login.c:377 +#: src/login.c:362 #, c-format msgid "" "\n" @@ -1322,17 +1193,17 @@ msgstr "" "\n" "Limit czasu logowania przekroczony po %d sekundach.\n" -#: src/login.c:689 +#: src/login.c:648 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " na `%s.100s' z `%.200s'" -#: src/login.c:693 +#: src/login.c:652 #, c-format msgid " on `%.100s'" msgstr " na `%.100s'" -#: src/login.c:852 +#: src/login.c:811 #, c-format msgid "" "\n" @@ -1341,70 +1212,70 @@ msgstr "" "\n" "%s login: " -#: src/login.c:855 +#: src/login.c:814 msgid "login: " msgstr "login: " -#: src/login.c:1071 src/sulogin.c:233 +#: src/login.c:1013 src/sulogin.c:205 msgid "Login incorrect" -msgstr "Nieprawid這we logowanie" +msgstr "Nieprawidowe logowanie" -#: src/login.c:1265 +#: src/login.c:1193 msgid "Warning: login re-enabled after temporary lockout.\n" -msgstr "Ostrze瞠nie: logowanie ponownie odblokowanie po czasowej blokadzie.\n" +msgstr "Ostrze髒enie: logowanie ponownie odblokowanie po czasowej blokadzie.\n" -#: src/login.c:1278 +#: src/login.c:1207 #, c-format msgid "Last login: %s on %s" msgstr "Ostatnie logowanie: %s na %s" -#: src/login.c:1281 +#: src/login.c:1210 #, c-format msgid "Last login: %.19s on %s" msgstr "Ostatnie logowanie: %s na %s" -#: src/login.c:1287 +#: src/login.c:1216 #, c-format msgid " from %.*s" msgstr " z %.*s" -#: src/login.c:1364 +#: src/login.c:1293 msgid "Starting rad_login\n" -msgstr "Startuj rad_login\n" +msgstr "Startuj rad_login\n" #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" msgstr "" -"%s: nie ma bazy DBM na tym systemie - 瘸dna akcja nie zosta豉 podj皻a\n" +"%s: nie ma bazy DBM na tym systemie - 髒adna akcja nie zostaa podjta\n" #: src/mkpasswd.c:232 src/mkpasswd.c:237 #, c-format msgid "%s: cannot overwrite file %s\n" -msgstr "%s: nie mog nadpisa pliku %s\n" +msgstr "%s: nie mo髒na nadpisa pliku %s\n" #: src/mkpasswd.c:252 #, c-format msgid "%s: cannot open DBM files for %s\n" -msgstr "%s: nie mog otworzy plik闚 DBM dla %s\n" +msgstr "%s: nie mo髒na otworzy plik籀w DBM dla %s\n" #: src/mkpasswd.c:287 #, c-format msgid "%s: the beginning with " -msgstr "%s: rozpoczyna si od " +msgstr "%s: rozpoczyna si od " #: src/mkpasswd.c:288 msgid " is too long\n" -msgstr " jest za d逝gie\n" +msgstr " jest za dugie\n" #: src/mkpasswd.c:315 #, c-format msgid "%s: error parsing line \"%s\"\n" -msgstr "%s: b陰d podczas przetwarzania lini \"%s\"\n" +msgstr "%s: bd podczas przetwarzania lini \"%s\"\n" #: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338 msgid "adding record for name " -msgstr "dodaj rekord do nazwy " +msgstr "dodaj rekord do nazwy " #: src/mkpasswd.c:324 src/mkpasswd.c:329 src/mkpasswd.c:334 src/mkpasswd.c:339 #: src/mkpasswd.c:345 src/mkpasswd.c:351 src/mkpasswd.c:356 src/mkpasswd.c:361 @@ -1414,376 +1285,315 @@ msgstr "\n" #: src/mkpasswd.c:344 src/mkpasswd.c:350 src/mkpasswd.c:355 src/mkpasswd.c:360 #, c-format msgid "%s: error adding record for " -msgstr "%s: b陰d podczas dodawania rekordu dla " +msgstr "%s: bd podczas dodawania rekordu dla " #: src/mkpasswd.c:378 #, c-format msgid "added %d entries, longest was %d\n" -msgstr "dodano %d wpis闚, najd逝窺zy by %d\n" +msgstr "dodano %d wpis籀w, najdu髒szy by %d\n" #: src/mkpasswd.c:392 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" -msgstr "U篡cie: %s [-vf] [-p|g|sp|sg] plik\n" +msgstr "U髒ycie: %s [-vf] [-p|g|sp|sg] plik\n" #: src/mkpasswd.c:395 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" -msgstr "U篡cie: %s [-vf] [-p|g|sp] plik\n" +msgstr "U髒ycie: %s [-vf] [-p|g|sp] plik\n" #: src/mkpasswd.c:398 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" -msgstr "U篡cie: %s [-vf] [-p|g] plik\n" +msgstr "U髒ycie: %s [-vf] [-p|g] plik\n" #: src/newgrp.c:61 -msgid "usage: newgrp [-] [group]\n" -msgstr "u篡cie: newgrp [-] [grupa]\n" +msgid "Usage: newgrp [-] [group]\n" +msgstr "U髒ycie: newgrp [-] [grupa]\n" #: src/newgrp.c:63 -msgid "usage: sg group [[-c] command]\n" -msgstr "u篡cie: sg grupa [[-c] polecenie]\n" +msgid "Usage: sg group [[-c] command]\n" +msgstr "U髒ycie: sg grupa [[-c] polecenie]\n" -#: src/newgrp.c:136 +#: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" msgstr "nieznany uid: %u\n" -#: src/newgrp.c:219 +#: src/newgrp.c:214 #, c-format msgid "unknown gid: %lu\n" msgstr "nieznany gid: %lu\n" -#: src/newgrp.c:365 src/newgrp.c:374 +#: src/newgrp.c:360 src/newgrp.c:369 msgid "Sorry.\n" msgstr "Wybacz.\n" -#: src/newgrp.c:472 +#: src/newgrp.c:469 msgid "too many groups\n" msgstr "zbyt wiele grup\n" #: src/newusers.c:78 #, c-format msgid "Usage: %s [input]\n" -msgstr "U篡cie: %s [wej軼ie]\n" +msgstr "U髒ycie: %s [wejcie]\n" -#: src/newusers.c:407 +#: src/newusers.c:388 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s: nie mog zablokowa /etc/passwd.\n" +msgstr "%s: nie mo髒na zablokowa /etc/passwd.\n" -#: src/newusers.c:419 +#: src/newusers.c:400 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s: nie mog zablokowa plik闚, spr鏏uj p騧niej\n" +msgstr "%s: nie mo髒na zablokowa plik籀w, spr籀buj p籀驕niej\n" -#: src/newusers.c:435 +#: src/newusers.c:416 #, c-format msgid "%s: can't open files\n" -msgstr "%s: nie mog otworzy plik闚\n" +msgstr "%s: nie mo髒na otworzy plik籀w\n" + +#: src/newusers.c:461 +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: linia %d: nieprawidowa linia\n" #: src/newusers.c:480 #, c-format -msgid "%s: line %d: invalid line\n" -msgstr "%s: linia %d: nieprawid這wa linia\n" - -#: src/newusers.c:499 -#, c-format msgid "%s: line %d: can't create GID\n" -msgstr "%s: linia %d: nie mog utworzy GID\n" +msgstr "%s: linia %d: nie mo髒na utworzy GID\n" -#: src/newusers.c:515 +#: src/newusers.c:496 #, c-format msgid "%s: line %d: can't create UID\n" -msgstr "%s: linia %d: nie mog utworzy UID\n" +msgstr "%s: linia %d: nie mo髒na utworzy UID\n" -#: src/newusers.c:528 +#: src/newusers.c:509 #, c-format msgid "%s: line %d: cannot find user %s\n" -msgstr "%s: linia %d: nie mog znale嗆 u篡tkownika %s\n" +msgstr "%s: linia %d: nie mo髒na znale u髒ytkownika %s\n" -#: src/newusers.c:537 +#: src/newusers.c:518 #, c-format msgid "%s: line %d: can't update password\n" -msgstr "%s: linia %d: nie mog zaktualizowa pliku z has豉mi\n" +msgstr "%s: linia %d: nie mo髒na zaktualizowa pliku z hasami\n" -#: src/newusers.c:555 +#: src/newusers.c:536 #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "%s: linia %d: mkdir nie powiod這 si獦n" +msgstr "%s: linia %d: mkdir nie powiodo si\n" -#: src/newusers.c:561 +#: src/newusers.c:542 #, c-format msgid "%s: line %d: chown failed\n" -msgstr "%s: linia %d: chown nie powiod這 si獦n" +msgstr "%s: linia %d: chown nie powiodo si\n" -#: src/newusers.c:571 +#: src/newusers.c:552 #, c-format msgid "%s: line %d: can't update entry\n" -msgstr "%s: linia %d: nie mog zaktualizowa wpisu\n" +msgstr "%s: linia %d: nie mo髒na zaktualizowa wpisu\n" -#: src/newusers.c:603 +#: src/newusers.c:584 #, c-format msgid "%s: error updating files\n" -msgstr "%s: b陰d podczas aktualizowania plik闚\n" +msgstr "%s: bd podczas aktualizowania plik籀w\n" -#: src/passwd.c:174 +#: src/passwd.c:155 #, c-format -msgid "usage: %s [-f|-s] [name]\n" -msgstr "u篡cie: %s [-f|-s] [nazwa]\n" +msgid "Usage: %s [-f|-s] [name]\n" +msgstr "U髒ycie: %s [-f|-s] [nazwa]\n" -#: src/passwd.c:178 +#: src/passwd.c:159 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x maks] [-n min] [-w ostrz] [-i nieakty] nazwa\n" -#: src/passwd.c:180 +#: src/passwd.c:161 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nazwa\n" -#: src/passwd.c:283 -#, c-format -msgid "User %s has a TCFS key, his old password is required.\n" -msgstr "U篡tkownik %s posiada klucz TCFS, jego stare has這 jest wymagane.\n" - -#: src/passwd.c:286 -msgid "You can use -t option to force the change.\n" -msgstr "Nie mo瞠sz u篡wa opcji -t by wymusi zmian.\n" - -#: src/passwd.c:292 +#: src/passwd.c:216 msgid "Old password: " -msgstr "Stare has這: " +msgstr "Stare haso: " -#: src/passwd.c:301 +#: src/passwd.c:225 #, c-format msgid "Incorrect password for `%s'\n" -msgstr "Nieprawid這we has這 `%s'\n" +msgstr "Nieprawidowe haso `%s'\n" -#: src/passwd.c:314 -#, c-format -msgid "Warning: user %s has a TCFS key.\n" -msgstr "Ostrze瞠nie: u篡tkownik %s posiada klucz TCFS.\n" - -#: src/passwd.c:333 +#: src/passwd.c:249 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -"Wpisz nowe has這 (minimum %d, maksimum %d znak闚)\n" -"Prosz u篡j kombinacji wielkich i ma造ch znak闚 oraz cyfr.\n" +"Wpisz nowe haso (minimum %d, maksimum %d znak籀w)\n" +"Prosz u髒yj kombinacji wielkich i maych znak籀w oraz cyfr.\n" -#: src/passwd.c:339 +#: src/passwd.c:255 msgid "New password: " -msgstr "Nowe has這: " +msgstr "Nowe haso: " -#: src/passwd.c:350 +#: src/passwd.c:266 msgid "Try again.\n" -msgstr "Spr鏏uj ponownie.\n" +msgstr "Spr籀buj ponownie.\n" -#: src/passwd.c:361 +#: src/passwd.c:277 msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"Ostrze瞠nie: s豉be has這 (jednak wpisz je ponowie je郵i chcesz go u篡).\n" +"Ostrze髒enie: sabe haso (jednak wpisz je ponowie jeli chcesz go u髒y).\n" -#: src/passwd.c:371 +#: src/passwd.c:287 msgid "They don't match; try again.\n" -msgstr "Nie pasuj; spr鏏uj ponownie.\n" +msgstr "Nie pasuj; spr籀buj ponownie.\n" -#: src/passwd.c:451 src/passwd.c:469 +#: src/passwd.c:364 src/passwd.c:382 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "Has這 dla %s nie mo瞠 by zmienione.\n" +msgstr "Haso dla %s nie mo髒e by zmienione.\n" -#: src/passwd.c:494 +#: src/passwd.c:396 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "Wybacz, has這 dla %s nie mo瞠 by jeszcze zmienione.\n" +msgstr "Wybacz, haso dla %s nie mo髒e by jeszcze zmienione.\n" -#: src/passwd.c:614 +#: src/passwd.c:479 #, c-format msgid "%s: out of memory\n" -msgstr "%s: brak pami璚i\n" +msgstr "%s: brak pamici\n" -#: src/passwd.c:769 -msgid "Cannot lock the TCFS key database; try again later\n" -msgstr "Nie mog zablokowa bazy kluczy TCFS; spr鏏uj ponownie\n" - -#: src/passwd.c:777 -msgid "Cannot open the TCFS key database.\n" -msgstr "Nie mog otworzy bazy kluczy TCFS.\n" - -#: src/passwd.c:785 -msgid "Error updating the TCFS key database.\n" -msgstr "B陰d podczas aktualizacji bazy kluczy TCFS.\n" - -#: src/passwd.c:792 -msgid "Cannot commit TCFS changes.\n" -msgstr "Nie mog potwierdzi zmian TCFS.\n" - -#: src/passwd.c:975 +#: src/passwd.c:730 #, c-format msgid "%s: Cannot execute %s" -msgstr "%s: Nie mog wykona %s" +msgstr "%s: Nie mo髒na wykona %s" -#: src/passwd.c:1077 +#: src/passwd.c:815 #, c-format msgid "%s: repository %s not supported\n" -msgstr "%s: ropozytorium %s nie jest obs逝giwane\n" +msgstr "%s: ropozytorium %s nie jest obsugiwane\n" -#: src/passwd.c:1152 +#: src/passwd.c:890 #, c-format msgid "%s: Permission denied\n" -msgstr "%s: Dost瘼 zabroniony\n" +msgstr "%s: Dostp zabroniony\n" -#: src/passwd.c:1176 +#: src/passwd.c:914 #, c-format msgid "You may not change the password for %s.\n" -msgstr "Nie mo瞠sz zmienia has豉 dla %s.\n" +msgstr "Nie mo髒esz zmienia hasa dla %s.\n" -#: src/passwd.c:1242 +#: src/passwd.c:962 #, c-format msgid "Changing password for %s\n" -msgstr "Zmieniam has這 dla %s\n" +msgstr "Zmieniam haso dla %s\n" -#: src/passwd.c:1246 +#: src/passwd.c:966 #, c-format msgid "The password for %s is unchanged.\n" -msgstr "Has這 dla %s pozostaje niezmienione.\n" +msgstr "Haso dla %s pozostaje niezmienione.\n" -#: src/passwd.c:1297 +#: src/passwd.c:1016 msgid "Password changed.\n" -msgstr "Has這 zmienione.\n" +msgstr "Haso zmienione.\n" #: src/pwck.c:87 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" -msgstr "U篡cie: %s [-q] [-r] [-s] [has這 [shadow]]\n" +msgstr "U髒ycie: %s [-q] [-r] [-s] [passwd [shadow]]\n" #: src/pwck.c:90 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" -msgstr "U篡cie: %s [-q] [-r] [-s] [has這]\n" +msgstr "U髒ycie: %s [-q] [-r] [-s] [passwd]\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:295 msgid "invalid password file entry\n" -msgstr "nieprawid這wy wpis do pliku z has豉mi\n" +msgstr "nieprawidowy wpis do pliku z hasami\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:357 msgid "duplicate password entry\n" -msgstr "duplikuj帷y si wpis w pliku z has豉mi\n" +msgstr "powt籀rzony wpis w pliku z hasami\n" #: src/pwck.c:373 #, c-format msgid "invalid user name '%s'\n" -msgstr "nieprawid這wa nazwa u篡tkownika '%s'\n" +msgstr "nieprawidowa nazwa u髒ytkownika '%s'\n" -#. -#. * No primary group, just give a warning -#. #: src/pwck.c:388 #, c-format msgid "user %s: no group %u\n" -msgstr "u篡tkownik %s: brak grupy %u\n" +msgstr "u髒ytkownik %s: brak grupy %u\n" #: src/pwck.c:404 #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "u篡tkownik %s: katalog %s nie istnieje\n" +msgstr "u髒ytkownik %s: katalog %s nie istnieje\n" -#. -#. * Login shell doesn't exist, give a warning -#. #: src/pwck.c:420 #, c-format msgid "user %s: program %s does not exist\n" -msgstr "u篡tkownik %s: program %s nie istnieje\n" +msgstr "u髒ytkownik %s: program %s nie istnieje\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:456 msgid "invalid shadow password file entry\n" -msgstr "nieprawid這wy wpis w pliku z has豉mi\n" +msgstr "nieprawidowy wpis w pliku z hasami\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:518 msgid "duplicate shadow password entry\n" -msgstr "duplikuj帷y si wpis w pliku z ukrytymi has豉mi\n" +msgstr "powt籀rzony wpis w pliku z ukrytymi hasami\n" -#. -#. * Tell the user this entry has no matching -#. * /etc/passwd entry and ask them to delete it. -#. #: src/pwck.c:542 msgid "no matching password file entry\n" -msgstr "brak pasuj帷ego wpisu w pliku z has豉mi\n" +msgstr "brak pasujcego wpisu w pliku z hasami\n" #: src/pwck.c:560 #, c-format msgid "user %s: last password change in the future\n" -msgstr "u篡tkownik %s: ostatnia zmiana has豉 w przysz這軼i\n" +msgstr "u髒ytkownik %s: ostatnia zmiana hasa w przyszoci\n" -#: src/pwconv.c:84 src/pwunconv.c:93 +#: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s: nie mog zablokowa pliku z has豉mi\n" +msgstr "%s: nie mo髒na zablokowa pliku z hasami\n" -#: src/pwconv.c:89 src/pwunconv.c:98 +#: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s: nie mog otworzy pliku z has豉mi\n" +msgstr "%s: nie mo髒na otworzy pliku z hasami\n" -#: src/pwconv.c:117 +#: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "%s: nie mog usun望 wpisu z pliku z ukrytymi has豉mi dla %s\n" +msgstr "%s: nie mo髒na usun wpisu z pliku z ukrytymi hasami dla %s\n" -#: src/pwconv.c:163 +#: src/pwconv.c:164 #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "%s: nie mog zaktualizowa wpisu do pliku z has豉mi dla %s\n" +msgstr "%s: nie mo髒na zaktualizowa wpisu do pliku z hasami dla %s\n" -#: src/pwconv.c:170 +#: src/pwconv.c:171 #, c-format msgid "%s: can't update shadow file\n" -msgstr "%s: nie mog zaktualizowa pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na zaktualizowa pliku z ukrytymi hasami\n" -#: src/pwconv.c:175 +#: src/pwconv.c:176 #, c-format msgid "%s: can't update passwd file\n" -msgstr "%s: nie mog zaktualizowa pliku z has豉mi\n" +msgstr "%s: nie mo髒na zaktualizowa pliku z hasami\n" -#: src/pwunconv.c:50 -#, c-format -msgid "%s: Shadow passwords are not configured.\n" -msgstr "%s: Przes這ni皻e has豉 nie s skonfigurowane.\n" - -#: src/pwunconv.c:160 +#: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s: nie mog zaktualizowa wpisu dla u篡tkownika %s\n" +msgstr "%s: nie mo髒na zaktualizowa wpisu dla u髒ytkownika %s\n" -#: src/pwunconv.c:181 +#: src/pwunconv.c:145 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s: nie mog skasowa pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na skasowa pliku z ukrytymi hasami\n" #: src/su.c:133 msgid "Sorry." @@ -1792,12 +1602,12 @@ msgstr "Wybacz." #: src/su.c:216 #, c-format msgid "%s: must be run from a terminal\n" -msgstr "%s: musisz uruchamia z terminala\n" +msgstr "%s: musisz uruchamia z terminala\n" #: src/su.c:306 #, c-format msgid "%s: pam_start: error %d\n" -msgstr "%s: pam_start: b陰d %d\n" +msgstr "%s: pam_start: bd %d\n" #: src/su.c:336 #, c-format @@ -1807,12 +1617,11 @@ msgstr "Nieznany id: %s\n" #: src/su.c:373 src/su.c:390 #, c-format msgid "You are not authorized to su %s\n" -msgstr "Nie masz autoryzacji by u篡wa su %s\n" +msgstr "Nie masz autoryzacji by u髒ywa su %s\n" -#. require own password #: src/su.c:385 msgid "(Enter your own password.)" -msgstr "(Wpisz swoje w豉sne has這.)" +msgstr "(Wpisz swoje wasne haso.)" #: src/su.c:419 #, c-format @@ -1823,554 +1632,487 @@ msgstr "" "%s: %s\n" "(Zignorowano)\n" -#: src/su.c:626 +#: src/su.c:609 msgid "No shell\n" -msgstr "Brak pow這ki\n" +msgstr "Brak powoki\n" -#: src/suauth.c:100 +#: src/suauth.c:105 msgid "Access to su to that account DENIED.\n" -msgstr "Dost瘼 do polecenia su z tego konta ZABRONIONY.\n" +msgstr "Dostp do polecenia su z tego konta ZABRONIONY.\n" -#: src/suauth.c:107 +#: src/suauth.c:113 msgid "Password authentication bypassed.\n" -msgstr "Uwierzytelnianie na podstawie has豉 pomini皻e.\n" +msgstr "Uwierzytelnianie na podstawie hasa pominite.\n" -#: src/suauth.c:114 +#: src/suauth.c:122 msgid "Please enter your OWN password as authentication.\n" -msgstr "Prosz wpisz swoje WｘSNE has這 jako has這 uwierzytelniaj帷e.\n" +msgstr "Prosz wpisz swoje WASNE haso jako haso uwierzytelniajce.\n" -#. must be a password file! -#: src/sulogin.c:132 +#: src/sulogin.c:118 msgid "No password file\n" -msgstr "Brak pliku z has豉mi\n" +msgstr "Brak pliku z hasami\n" -#. -#. * Fail secure -#. -#: src/sulogin.c:174 +#: src/sulogin.c:160 msgid "No password entry for 'root'\n" -msgstr "Brak wpisu do bazy hase dla 'root'\n" +msgstr "Brak wpisu do bazy hase dla 'root'\n" -#: src/sulogin.c:190 +#: src/sulogin.c:176 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" "\n" -"Wpisz control-d by kontynuowa normalny start,\n" -"(lub podaj has這 root-a by przej嗆 do trybu utrzymania systemu):" +"Wpisz control-d by kontynuowa normalny start,\n" +"(lub podaj haso root-a by przej do trybu utrzymania systemu):" -#. make new environment active -#: src/sulogin.c:243 +#: src/sulogin.c:212 msgid "Entering System Maintenance Mode\n" -msgstr "Wchodz w tryb utrzymania systemu\n" +msgstr "Wchodz w tryb utrzymania systemu\n" -#: src/useradd.c:251 +#: src/useradd.c:234 #, c-format msgid "%s: rebuild the group database\n" -msgstr "%s: przebuduj baz grup\n" +msgstr "%s: przebuduj baz grup\n" -#: src/useradd.c:260 +#: src/useradd.c:243 #, c-format msgid "%s: rebuild the shadow group database\n" -msgstr "%s: przebuduj baz przes這ni皻ych hase許n" +msgstr "%s: przebuduj baz ukrytych hase grup\n" -#: src/useradd.c:295 src/useradd.c:309 src/usermod.c:981 src/usermod.c:995 +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 #, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "%s: nieprawid這wy argument numeryczny `%s'\n" +msgstr "%s: nieprawidowy argument numeryczny `%s'\n" -#: src/useradd.c:365 +#: src/useradd.c:349 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: nieznany gid %s\n" -#: src/useradd.c:373 src/useradd.c:676 src/useradd.c:1269 src/usermod.c:260 -#: src/usermod.c:1128 +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: nieznana grupa %s\n" -#: src/useradd.c:440 -#, fuzzy, c-format -msgid "group=%s,%u basedir=%s skel=%s\n" -msgstr "grupa=%s,%ld kat_baz=%s skel=%s\n" - -#: src/useradd.c:444 -#, c-format -msgid "shell=%s " -msgstr "pow這ka=%s " - -#: src/useradd.c:446 -#, c-format -msgid "inactive=%ld expire=%s" -msgstr "nieaktywne=%ld wyga郾i璚ie=%s" - -#: src/useradd.c:450 +#: src/useradd.c:419 #, c-format msgid "GROUP=%u\n" msgstr "GRUPA=%u\n" -#: src/useradd.c:451 +#: src/useradd.c:420 #, c-format msgid "HOME=%s\n" msgstr "KAT_DOM=%s\n" -#: src/useradd.c:453 +#: src/useradd.c:422 #, c-format msgid "INACTIVE=%ld\n" msgstr "NIEAKTYWNE=%ld\n" -#: src/useradd.c:454 +#: src/useradd.c:423 #, c-format msgid "EXPIRE=%s\n" -msgstr "WYGA吉I犴IE=%s\n" +msgstr "WYGANICIE=%s\n" -#: src/useradd.c:456 +#: src/useradd.c:425 #, c-format msgid "SHELL=%s\n" -msgstr "POWΜKA=%s\n" +msgstr "POWOKA=%s\n" -#: src/useradd.c:457 +#: src/useradd.c:426 #, c-format msgid "SKEL=%s\n" msgstr "SKEL=%s\n" -#: src/useradd.c:498 +#: src/useradd.c:462 #, c-format msgid "%s: cannot create new defaults file\n" -msgstr "%s: nie mo積a utworzy nowego pliku ze standardowymi ustawieniami\n" +msgstr "%s: nie mo髒na utworzy nowego pliku z ustawieniami domylnymi\n" -#: src/useradd.c:503 +#: src/useradd.c:467 #, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: nie mo積a utworzy nowego pliku ze standardowymi ustawieniami\n" +msgstr "%s: nie mo髒na otworzy nowego pliku z ustawieniami domylnymi\n" -#: src/useradd.c:596 src/useradd.c:608 +#: src/useradd.c:552 src/useradd.c:564 #, c-format msgid "%s: rename: %s" msgstr "%s: zmiana nazwy: %s" -#: src/useradd.c:697 src/usermod.c:281 +#: src/useradd.c:657 src/usermod.c:265 #, c-format msgid "%s: group `%s' is a NIS group.\n" -msgstr "%s: grupa `%s' jest grup NIS.\n" +msgstr "%s: grupa `%s' jest grup NIS.\n" -#: src/useradd.c:706 src/usermod.c:290 +#: src/useradd.c:666 src/usermod.c:274 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: podano zbyt wiele grup (maks %d).\n" -#: src/useradd.c:738 src/usermod.c:322 -#, c-format -msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" -msgstr "u篡cie: %s\t[-u uid [-o]] [-g grupa] [-G grupa,...] \n" +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "U髒ycie: useradd [-u uid [-o]] [-g grupa] [-G grupa,...] \n" -#: src/useradd.c:742 -msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" -msgstr "\t\t[-d kat_dom] [-s pow這ka] [-c komentarz] [-m [-k wz鏎]]\n" +#: src/useradd.c:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" +msgstr "" +" [-d kat_dom] [-s powoka] [-c komentarz] [-m [-k wz籀r]]\n" -#: src/useradd.c:745 src/usermod.c:329 -msgid "[-f inactive] [-e expire ] " -msgstr "[-f nieaktywne] [-e utrata_wa積o軼i ]" +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" +msgstr " [-f nieaktywne] [-e utrata_wa髒noci]\n" -#: src/useradd.c:748 -msgid "[-A program] " -msgstr "[-A program] " +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" +msgstr " useradd -D [-g grupa] [-b baza] [-s powoka]\n" -#: src/useradd.c:750 -msgid "[-p passwd] name\n" -msgstr "[-p has這] nazwa\n" - -#: src/useradd.c:753 -#, c-format -msgid " %s\t-D [-g group] [-b base] [-s shell]\n" -msgstr " %s\t-D [-g grupa] [-b baza] [-s pow這ka]\n" - -#: src/useradd.c:756 -msgid "\t\t[-f inactive] [-e expire ]\n" -msgstr "\t\t[-f nieaktywne] [-e utrata_wa積o軼i ]\n" - -#: src/useradd.c:850 src/usermod.c:480 +#: src/useradd.c:793 src/usermod.c:461 #, c-format msgid "%s: error locking group file\n" -msgstr "%s: b陰d podczas blokowania pliku z grupami\n" +msgstr "%s: bd podczas blokowania pliku z grupami\n" -#: src/useradd.c:855 src/usermod.c:486 +#: src/useradd.c:798 src/usermod.c:467 #, c-format msgid "%s: error opening group file\n" -msgstr "%s: b陰d podczas otwierania pliku z grupami\n" +msgstr "%s: bd podczas otwierania pliku z grupami\n" -#: src/useradd.c:862 src/usermod.c:597 +#: src/useradd.c:805 src/usermod.c:578 #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s: b陰d podczas blokowania pliku z ukrytymi has豉mi\n" +msgstr "%s: bd podczas blokowania pliku z ukrytymi hasami grup\n" -#: src/useradd.c:867 src/usermod.c:603 +#: src/useradd.c:810 src/usermod.c:584 #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s: b陰d podczas otwierania pliku z ukrytymi grupami\n" +msgstr "%s: bd podczas otwierania pliku z ukrytymi hasami grup\n" -#: src/useradd.c:1039 +#: src/useradd.c:982 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u nie jest niepowtarzalny\n" -#: src/useradd.c:1069 +#: src/useradd.c:1012 #, c-format msgid "%s: can't get unique uid\n" -msgstr "%s: nie mog uzyska niepowtarzalnego uid\n" +msgstr "%s: nie mo髒na uzyska niepowtarzalnego uid\n" -#: src/useradd.c:1174 src/useradd.c:1325 src/usermod.c:1075 src/usermod.c:1086 -#: src/usermod.c:1096 src/usermod.c:1143 src/usermod.c:1187 -#, c-format -msgid "%s: invalid field `%s'\n" -msgstr "%s: nieprawid這we pole `%s'\n" - -#: src/useradd.c:1189 +#: src/useradd.c:1049 #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s: nieprawid這wy katalog bazowy `%s'\n" +msgstr "%s: nieprawidowy katalog bazowy `%s'\n" -#: src/useradd.c:1199 +#: src/useradd.c:1059 #, c-format msgid "%s: invalid comment `%s'\n" -msgstr "%s: nieprawid這wy komentarz `%s'\n" +msgstr "%s: nieprawidowy komentarz `%s'\n" -#: src/useradd.c:1210 +#: src/useradd.c:1070 #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s: nieprawid這wy katalog domowy `%s'\n" +msgstr "%s: nieprawidowy katalog domowy `%s'\n" -#: src/useradd.c:1229 src/usermod.c:1110 +#: src/useradd.c:1089 src/usermod.c:858 #, c-format msgid "%s: invalid date `%s'\n" -msgstr "%s: nieprawid這wa data `%s'\n" +msgstr "%s: nieprawidowa data `%s'\n" -#: src/useradd.c:1242 +#: src/useradd.c:1102 #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "%s: ukryte has豉 wymagane dla -e\n" +msgstr "%s: ukryte hasa wymagane dla -e\n" -#: src/useradd.c:1258 +#: src/useradd.c:1118 #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "%s: ukryte has豉 wymagane dla -f\n" +msgstr "%s: ukryte hasa wymagane dla -f\n" -#: src/useradd.c:1336 +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: nieprawidowe pole `%s'\n" + +#: src/useradd.c:1196 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s: nieprawid這wa pow這ka `%s'\n" +msgstr "%s: nieprawidowa powoka `%s'\n" -#: src/useradd.c:1377 +#: src/useradd.c:1237 #, c-format msgid "%s: invalid user name '%s'\n" -msgstr "%s: nieprawid這wa nazwa u篡tkownika '%s'\n" +msgstr "%s: nieprawidowa nazwa u髒ytkownika '%s'\n" -#: src/useradd.c:1413 src/userdel.c:298 src/usermod.c:1255 +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 #, c-format msgid "%s: cannot rewrite password file\n" -msgstr "%s: nie mog przepisa pliku z has豉mi\n" +msgstr "%s: nie mo髒na przepisa pliku z hasami\n" -#: src/useradd.c:1420 src/userdel.c:303 src/usermod.c:1262 +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "%s: nie mog przepisa pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na przepisa pliku z ukrytymi hasami\n" -#: src/useradd.c:1461 src/userdel.c:367 src/usermod.c:1296 +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 #, c-format msgid "%s: unable to lock password file\n" -msgstr "%s: nie mog zablokowa pliku z has豉mi\n" +msgstr "%s: nie mo髒na zablokowa pliku z hasami\n" -#: src/useradd.c:1466 src/userdel.c:372 src/usermod.c:1301 +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 #, c-format msgid "%s: unable to open password file\n" -msgstr "%s: nie mog otworzy pliku z has豉mi\n" +msgstr "%s: nie mo髒na otworzy pliku z hasami\n" -#: src/useradd.c:1474 src/userdel.c:379 src/usermod.c:1308 +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "%s: nie mog zablokowa pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami\n" -#: src/useradd.c:1481 src/userdel.c:385 src/usermod.c:1314 +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "%s: nie mog otworzy pliku z ukrytymi has豉mi\n" +msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami\n" -#: src/useradd.c:1580 src/usermod.c:1405 -#, c-format -msgid "%s: error adding authentication method\n" -msgstr "%s: b陰d podczas dodawania metody uwierzytelniania\n" - -#: src/useradd.c:1604 +#: src/useradd.c:1435 #, c-format msgid "%s: error adding new password entry\n" -msgstr "%s: b陰d podczas dodawania nowego wpisu do pliku z has豉mi\n" +msgstr "%s: bd podczas dodawania nowego wpisu do pliku z hasami\n" -#: src/useradd.c:1618 +#: src/useradd.c:1449 #, c-format msgid "%s: error updating password dbm entry\n" -msgstr "%s: b陰d podczas aktualizacji wpisu dbm do pliku z has豉mi\n" +msgstr "%s: bd podczas aktualizacji wpisu dbm do pliku z hasami\n" -#: src/useradd.c:1634 src/usermod.c:1471 +#: src/useradd.c:1465 src/usermod.c:1151 #, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "%s: b陰d podczas dodawania nowego wpisu do pliku z ukrytymi has豉mi\n" +msgstr "%s: bd podczas dodawania nowego wpisu do pliku z ukrytymi hasami\n" -#: src/useradd.c:1650 src/usermod.c:1488 +#: src/useradd.c:1481 src/usermod.c:1168 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: b陰d podczas aktualizacji wpisu dbm do pliku z ukrytymi has豉mi\n" +msgstr "%s: bd podczas aktualizacji wpisu dbm do pliku z ukrytymi hasami\n" -#: src/useradd.c:1682 +#: src/useradd.c:1513 #, c-format msgid "%s: cannot create directory %s\n" -msgstr "%s: nie mog utworzy katalogu %s\n" +msgstr "%s: nie mo髒na utworzy katalogu %s\n" -#: src/useradd.c:1806 src/usermod.c:1233 +#: src/useradd.c:1634 src/usermod.c:981 #, c-format msgid "%s: user %s exists\n" -msgstr "%s: u篡tkownik %s istnieje\n" +msgstr "%s: u髒ytkownik %s istnieje\n" -#: src/useradd.c:1821 +#: src/useradd.c:1649 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" +"%s: grupa %s istnieje - aby doda tego u髒ytkownika do tej grupy, u髒yj -g.\n" -#: src/useradd.c:1854 +#: src/useradd.c:1687 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" -msgstr "" +msgstr "%s: uwaga: CREATE_HOME nie jest wspierane, u髒yj opcji -m.\n" -#: src/userdel.c:129 +#: src/userdel.c:124 #, c-format -msgid "usage: %s [-r] name\n" -msgstr "u篡cie: %s [-r] nazwa\n" +msgid "Usage: %s [-r] name\n" +msgstr "U髒ycie: %s [-r] nazwa\n" -#: src/userdel.c:181 src/userdel.c:267 +#: src/userdel.c:176 src/userdel.c:262 #, c-format msgid "%s: error updating group entry\n" -msgstr "%s: b陰d podczas aktualizacji wpisu grupy\n" +msgstr "%s: bd podczas aktualizacji wpisu grupy\n" -#: src/userdel.c:191 src/userdel.c:276 +#: src/userdel.c:186 src/userdel.c:271 #, c-format msgid "%s: cannot update dbm group entry\n" -msgstr "%s: nie mog zaktualizowa wpisu dbm do pliku z grupami\n" +msgstr "%s: nie mo髒na zaktualizowa wpisu dbm do pliku z grupami\n" -#: src/userdel.c:219 -#, fuzzy, c-format +#: src/userdel.c:214 +#, c-format msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: nie mog zaktualizowa wpisu dbm do pliku z grupami\n" +msgstr "%s: nie mo髒na usun wpisu dbm z pliku z grupami\n" -#: src/userdel.c:308 +#: src/userdel.c:379 #, c-format -msgid "%s: cannot rewrite TCFS key file\n" -msgstr "%s: nie mog przepisa pliku klucza TCFS\n" +msgid "%s: cannot open group file\n" +msgstr "%s: nie mo髒na otworzy pliku z grupami\n" -#: src/userdel.c:392 +#: src/userdel.c:390 #, c-format -msgid "%s: cannot lock TCFS key file\n" -msgstr "%s: nie mog zablokowa pliku klucza TCFS\n" - -#: src/userdel.c:397 -#, c-format -msgid "%s: cannot open TCFS key file\n" -msgstr "%s: nie mog otworzy pliku klucza TCFS\n" +msgid "%s: cannot open shadow group file\n" +msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami grup\n" #: src/userdel.c:408 #, c-format -msgid "%s: cannot open group file\n" -msgstr "%s: nie mog otworzy pliku z grupami\n" - -#: src/userdel.c:419 -#, c-format -msgid "%s: cannot open shadow group file\n" -msgstr "%s: nie mog otworzy pliku z przes這ni皻ymi grupami\n" - -#: src/userdel.c:451 src/userdel.c:468 -#, c-format -msgid "%s: error deleting authentication\n" -msgstr "%s: b陰d podczas usuwania informacji uwierzytelniaj帷ej\n" - -#: src/userdel.c:479 -#, c-format msgid "%s: error deleting password entry\n" -msgstr "%s: b陰d podczas usuwania wpisu do pliku z has豉mi\n" +msgstr "%s: bd podczas usuwania wpisu z pliku z hasami\n" -#: src/userdel.c:485 +#: src/userdel.c:412 #, c-format msgid "%s: error deleting shadow password entry\n" -msgstr "%s: b陰d podczas usuwania wpisu do pliku z ukrytymi has豉mi\n" +msgstr "%s: bd podczas usuwania wpisu z pliku z ukrytymi hasami\n" -#: src/userdel.c:496 -#, c-format -msgid "%s: error deleting TCFS entry\n" -msgstr "%s: b陰d podczas usuwania wpisu TCFS\n" - -#: src/userdel.c:510 +#: src/userdel.c:421 #, c-format msgid "%s: error deleting password dbm entry\n" -msgstr "%s: b陰d podczas usuwania wpisu dbm do pliku z has豉mi\n" +msgstr "%s: bd podczas usuwania wpisu dbm z pliku z hasami\n" -#: src/userdel.c:533 +#: src/userdel.c:440 #, c-format msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: b陰d podczas usuwania wpisy dbm z pliku z ukrytymi has豉mi\n" +msgstr "%s: bd podczas usuwania wpisu dbm z pliku z ukrytymi hasami\n" -#: src/userdel.c:569 +#: src/userdel.c:484 #, c-format msgid "%s: user %s is currently logged in\n" -msgstr "%s: u篡tkownik %s jest aktualnie zalogowany\n" +msgstr "%s: u髒ytkownik %s jest aktualnie zalogowany\n" -#: src/userdel.c:659 +#: src/userdel.c:594 #, c-format msgid "%s: warning: %s not owned by %s, not removing\n" -msgstr "%s: ostrze瞠nie: w豉軼icielem %s nie jest %s, nie usuwam\n" +msgstr "%s: ostrze髒enie: wacicielem %s nie jest %s, nie usuwam\n" -#: src/userdel.c:666 +#: src/userdel.c:600 #, c-format msgid "%s: warning: can't remove " -msgstr "%s: ostrze瞠nie: nie mog usun望 " +msgstr "%s: ostrze髒enie: nie mo髒na usun " -#: src/userdel.c:758 src/usermod.c:1023 +#: src/userdel.c:703 src/usermod.c:783 #, c-format msgid "%s: user %s does not exist\n" -msgstr "%s: u篡tkownik %s nie istnieje\n" +msgstr "%s: u髒ytkownik %s nie istnieje\n" -#: src/userdel.c:770 src/usermod.c:1039 +#: src/userdel.c:718 src/usermod.c:799 #, c-format msgid "%s: user %s is a NIS user\n" -msgstr "%s: u篡tkownik %s jest u篡tkownikiem NIS\n" +msgstr "%s: u髒ytkownik %s jest u髒ytkownikiem NIS\n" -#: src/userdel.c:799 +#: src/userdel.c:756 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s: w豉軼icielem %s nie jest %s, nie usuwam\n" +msgstr "%s: wacicielem %s nie jest %s, nie usuwam\n" -#: src/userdel.c:818 +#: src/userdel.c:779 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" -msgstr "%s: nie usuwam katalogu %s (would remove home of user %s)\n" +msgstr "" +"%s: nie usuwam katalogu %s (usuwanie katalogu domowego u髒ytkownika %s)\n" -#: src/userdel.c:830 +#: src/userdel.c:793 #, c-format msgid "%s: error removing directory %s\n" -msgstr "%s: b陰d podczas usuwania katalogu %s\n" +msgstr "%s: bd podczas usuwania katalogu %s\n" -#: src/usermod.c:326 +#: src/usermod.c:306 +#, 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" + +#: src/usermod.c:310 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" -msgstr "\t\t[-d kat_dom [-m]] [-s pow這ka] [-c komentarz] [-l nowa_nazwa]\n" +msgstr "\t\t[-d kat_dom [-m]] [-s powoka] [-c komentarz] [-l nowa_nazwa]\n" -#: src/usermod.c:332 -msgid "[-A {DEFAULT|program},... ] " -msgstr "[-A {DEFAULT|program},... ] " +#: src/usermod.c:313 +msgid "[-f inactive] [-e expire] " +msgstr "[-f nieaktywne] [-e utrata_wa髒noci] " -#: src/usermod.c:334 +#: src/usermod.c:315 msgid "[-p passwd] [-L|-U] name\n" -msgstr "[-p has這] [-L|-U] nazwa\n" +msgstr "[-p haso] [-L|-U] nazwa\n" -#: src/usermod.c:514 +#: src/usermod.c:495 #, c-format msgid "%s: out of memory in update_group\n" -msgstr "%s: zabrak這 pami璚i w pdate_group\n" +msgstr "%s: zabrako pamici w update_group\n" -#: src/usermod.c:641 +#: src/usermod.c:622 #, c-format msgid "%s: out of memory in update_gshadow\n" -msgstr "%s: zabrak這 pami璚i w update_gshadow\n" +msgstr "%s: zabrako pamici w update_gshadow\n" -#: src/usermod.c:1210 +#: src/usermod.c:958 #, c-format msgid "%s: no flags given\n" msgstr "%s: nie podano flag\n" -#: src/usermod.c:1217 +#: src/usermod.c:965 #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s: ukryte has豉 wymagane dla -e i -f\n" +msgstr "%s: ukryte hasa wymagane dla -e i -f\n" -#: src/usermod.c:1239 +#: src/usermod.c:987 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %lu nie jest niepowtarzalny\n" -#: src/usermod.c:1392 -#, c-format -msgid "%s: error deleting authentication method\n" -msgstr "%s: b陰d podczas usuwania metody uwierzytelniania\n" - -#: src/usermod.c:1418 -#, c-format -msgid "%s: error changing authentication method\n" -msgstr "%s: b陰d podczas zmiany metody uwierzytelniania\n" - -#: src/usermod.c:1436 +#: src/usermod.c:1116 #, c-format msgid "%s: error changing password entry\n" -msgstr "%s: b陰d podczas zmiany wpisu w pliku z has豉mi\n" +msgstr "%s: bd podczas zmiany wpisu w pliku z hasami\n" -#: src/usermod.c:1442 +#: src/usermod.c:1122 #, c-format msgid "%s: error removing password entry\n" -msgstr "%s: b陰d podczas usuwania wpisu z pliku z has豉mi\n" +msgstr "%s: bd podczas usuwania wpisu z pliku z hasami\n" -#: src/usermod.c:1451 +#: src/usermod.c:1131 #, c-format msgid "%s: error adding password dbm entry\n" -msgstr "%s: b陰d podczas dodawania wpisu dbm do pliku z has豉mi\n" +msgstr "%s: bd podczas dodawania wpisu dbm do pliku z hasami\n" -#: src/usermod.c:1459 +#: src/usermod.c:1139 #, c-format msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: b陰d podczas usuwania wpisu dbm z pliku z has豉mi\n" +msgstr "%s: bd podczas usuwania wpisu dbm z pliku z hasami\n" -#: src/usermod.c:1478 +#: src/usermod.c:1158 #, c-format msgid "%s: error removing shadow password entry\n" -msgstr "%s: b陰d podczas usuwania wpisu z pliku z ukrytymi has豉mi\n" +msgstr "%s: bd podczas usuwania wpisu z pliku z ukrytymi hasami\n" -#: src/usermod.c:1495 +#: src/usermod.c:1175 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: b陰d podczas usuwania wpisu dbm z pliku z ukrytymi has豉mi\n" +msgstr "%s: bd podczas usuwania wpisu dbm z pliku z ukrytymi hasami\n" -#: src/usermod.c:1524 +#: src/usermod.c:1204 #, c-format msgid "%s: directory %s exists\n" -msgstr "%s: katalog %s isnieje\n" +msgstr "%s: katalog %s istnieje\n" -#: src/usermod.c:1533 +#: src/usermod.c:1213 #, c-format msgid "%s: can't create %s\n" -msgstr "%s: nie mog utworzy %s\n" +msgstr "%s: nie mo髒na utworzy %s\n" -#: src/usermod.c:1539 +#: src/usermod.c:1219 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s: nie mog zmieni w豉軼iciela %s\n" +msgstr "%s: nie mo髒na zmieni waciciela %s\n" -#: src/usermod.c:1556 +#: src/usermod.c:1236 #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "%s: nie mog zmieni nazwy katalogu z %s na %s\n" +msgstr "%s: nie mo髒na zmieni nazwy katalogu z %s na %s\n" -#. better leave it alone -#: src/usermod.c:1653 +#: src/usermod.c:1333 #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "%s: ostrze瞠nie: w豉軼icielem %s nie jest %s\n" +msgstr "%s: ostrze髒enie: wacicielem %s nie jest %s\n" -#: src/usermod.c:1659 +#: src/usermod.c:1339 msgid "failed to change mailbox owner" -msgstr "nie powiod豉 si zmiana w豉軼iciela skrzynki pocztowej" +msgstr "zmiana waciciela skrzynki pocztowej nie powioda si" -#: src/usermod.c:1667 +#: src/usermod.c:1347 msgid "failed to rename mailbox" -msgstr "zmiana nazwy skrzynki pocztowej nie powiod豉 si" +msgstr "zmiana nazwy skrzynki pocztowej nie powioda si" -#: src/vipw.c:104 +#: src/vipw.c:105 #, c-format msgid "" "\n" @@ -2379,53 +2121,143 @@ msgstr "" "\n" "%s: %s jest niezmieniony\n" -#: src/vipw.c:132 +#: src/vipw.c:133 msgid "Couldn't lock file" -msgstr "Nie mo積a usun帷 blokady z pliku" +msgstr "Nie mo髒na zablokowa pliku" -#: src/vipw.c:141 +#: src/vipw.c:142 msgid "Couldn't make backup" -msgstr "Nie mo積a wykona kopii zapasowej" +msgstr "Nie mo髒na wykona kopii zapasowej" -#: src/vipw.c:206 +#: src/vipw.c:200 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" -msgstr "%s: nie mog odzyska %s: %s (twoje zmiany s w %s)\n" +msgstr "%s: nie mo髒na odzyska %s: %s (twoje zmiany s w %s)\n" -#: src/vipw.c:244 +#: src/vipw.c:238 msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" msgstr "" -"U篡cie:\n" +"U髒ycie:\n" "`vipw' edytuje /etc/passwd `vipw -s' edytuje /etc/shadow\n" "`vigr' edytuje /etc/group `vigr -s' edytuje /etc/gshadow\n" -#~ msgid "%s: gid %ld is not unique\n" -#~ msgstr "%s: gid %ld nie jest niepowtarzalny\n" +#~ msgid "CREATE_MAIL_SPOOL=%s\n" +#~ msgstr "CREATE_MAIL_SPOOL=%s\n" -#, fuzzy -#~ msgid "unknown gid: %u\n" -#~ msgstr "nieznany gid: %d\n" +#~ msgid "Can't create mail spool for user %s.\n" +#~ msgstr "Nie mo髒na za zao髒y spolla pocztowego dla uzytkownika %s.\n" -#~ msgid "%s: uid %d is not unique\n" -#~ msgstr "%s: uid %d nie jest niepowtarzalny\n" +#~ msgid "User %s has a TCFS key, his old password is required.\n" +#~ msgstr "U髒ytkownik %s posiada klucz TCFS, jego stare haso jest wymagane.\n" -#~ msgid "user %s: bad UID (%d)\n" -#~ msgstr "u篡tkownik %s: z造 UID (%d)\n" +#~ msgid "You can use -t option to force the change.\n" +#~ msgstr "Nie mo髒esz u髒ywa opcji -t by wymusi zmian.\n" -#~ msgid "%s: no aging information present\n" -#~ msgstr "%s: brak informacji\n" +#~ msgid "Warning: user %s has a TCFS key.\n" +#~ msgstr "Ostrze髒enie: u髒ytkownik %s posiada klucz TCFS.\n" -#~ msgid "group %s: bad GID (%d)\n" -#~ msgstr "grupa %s: z造 GID (%d)\n" +#~ msgid "Cannot lock the TCFS key database; try again later\n" +#~ msgstr "Nie mo髒na zablokowa bazy kluczy TCFS; spr籀buj ponownie\n" -#~ msgid "%s: permission denied (shell).\n" -#~ msgstr "%s: dost瘼 zabroniony (pow這ka).\n" +#~ msgid "Cannot open the TCFS key database.\n" +#~ msgstr "Nie mo髒na otworzy bazy kluczy TCFS.\n" -#~ msgid "Incorrect password for %s.\n" -#~ msgstr "Nieprawid這we has這 dla %s.\n" +#~ msgid "Error updating the TCFS key database.\n" +#~ msgstr "Bd podczas aktualizacji bazy kluczy TCFS.\n" -#~ msgid "group not found\n" -#~ msgstr "grupa nie znaleziona\n" +#~ msgid "Cannot commit TCFS changes.\n" +#~ msgstr "Nie mo髒na potwierdzi zmian TCFS.\n" + +#~ msgid "%s: cannot rewrite TCFS key file\n" +#~ msgstr "%s: nie mo髒na przepisa pliku klucza TCFS\n" + +#~ msgid "%s: cannot lock TCFS key file\n" +#~ msgstr "%s: nie mo髒na zablokowa pliku klucza TCFS\n" + +#~ msgid "%s: cannot open TCFS key file\n" +#~ msgstr "%s: nie mo髒na otworzy pliku klucza TCFS\n" + +#~ msgid "%s: error deleting TCFS entry\n" +#~ msgstr "%s: bd podczas usuwania wpisu TCFS\n" + +#~ msgid " [-f inactive] [-e expire]" +#~ msgstr " [-f nieaktywne] [-e utrata_wa髒noci]" + +#~ msgid "%s: error deleting authentication\n" +#~ msgstr "%s: bd podczas usuwania informacji uwierzytelniajcej\n" + +#~ msgid "[-A {DEFAULT|program},...] " +#~ msgstr "[-A {DEFAULT|program},...] " + +#~ msgid "%s: error deleting authentication method\n" +#~ msgstr "%s: bd podczas usuwania metody uwierzytelniania\n" + +#~ msgid "%s: error adding authentication method\n" +#~ msgstr "%s: bd podczas dodawania metody uwierzytelniania\n" + +#~ msgid "%s: error changing authentication method\n" +#~ msgstr "%s: bd podczas zmiany metody uwierzytelniania\n" + +#~ msgid "[-A program] " +#~ msgstr "[-A program] " + +#~ msgid "[-p passwd] name\n" +#~ msgstr "[-p haso] nazwa\n" + +#~ msgid "error - lookup '%s' failed\n" +#~ msgstr "bd - wyszukiwanie '%s' niepowiodo si\n" + +#~ msgid "%s not found\n" +#~ msgstr "%s nie znaleziony\n" + +#~ msgid "%s: not configured for shadow group support.\n" +#~ msgstr "%s: nie skonfigurowano wsparcia dla ukrytych hase grup.\n" + +#~ msgid "%s: Shadow passwords are not configured.\n" +#~ msgstr "%s: Przesonite hasa nie s skonfigurowane.\n" + +#~ msgid "Usage: %s [-l] user\n" +#~ msgstr "U髒ycie: %s [-l] u髒ytkownik\n" + +#~ msgid "Executing shell %s\n" +#~ msgstr "Uruchamiam powok %s\n" + +#~ msgid "Dialup Password: " +#~ msgstr "Haso dostpu modemowego: " + +#~ 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" + +#~ msgid "Usage: %s [-(a|d)] shell\n" +#~ msgstr "U髒ycie: %s [-(a|d)] powoka\n" + +#~ msgid "Shell password: " +#~ msgstr "Haso powoki: " + +#~ msgid "re-enter Shell password: " +#~ msgstr "Wpisz ponownie haso powoki: " + +#~ msgid "%s: Passwords do not match, try again.\n" +#~ msgstr "%s: Hasa si nie zgadzaj, spr籀buj ponownie.\n" + +#~ msgid "%s: can't create %s" +#~ msgstr "%s: nie mo髒na utworzy %s" + +#~ msgid "%s: can't open %s" +#~ msgstr "%s: nie mo髒na otworzy %s" + +#~ msgid "%s: Shell %s not found.\n" +#~ msgstr "%s: Powoka %s nie znaleziona.\n" + +#~ msgid "group=%s,%u basedir=%s skel=%s\n" +#~ msgstr "grupa=%s,%u kat_baz=%s skel=%s\n" + +#~ msgid "shell=%s " +#~ msgstr "powoka=%s " + +#~ msgid "inactive=%ld expire=%s" +#~ msgstr "nieaktywne=%ld wyganicie=%s" diff --git a/po/quot.sed b/po/quot.sed new file mode 100644 index 00000000..0122c463 --- /dev/null +++ b/po/quot.sed @@ -0,0 +1,6 @@ +s/"\([^"]*\)"/\1/g +s/`\([^`']*\)'/\1/g +s/ '\([^`']*\)' / \1 /g +s/ '\([^`']*\)'$/ \1/g +s/^'\([^`']*\)' /\1 /g +s//""/g diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin new file mode 100644 index 00000000..2436c49e --- /dev/null +++ b/po/remove-potcdate.sin @@ -0,0 +1,19 @@ +# Sed script that remove the POT-Creation-Date line in the header entry +# from a POT file. +# +# The distinction between the first and the following occurrences of the +# pattern is achieved by looking at the hold space. +/^"POT-Creation-Date: .*"$/{ +x +# Test if the hold space is empty. +s/P/P/ +ta +# Yes it was empty. First occurrence. Remove the line. +g +d +bb +:a +# The hold space was nonempty. Following occurrences. Do nothing. +x +:b +} diff --git a/po/ru.gmo b/po/ru.gmo new file mode 100644 index 00000000..d0ceef64 Binary files /dev/null and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po new file mode 100644 index 00000000..a9f03506 --- /dev/null +++ b/po/ru.po @@ -0,0 +1,2310 @@ +msgid "" +msgstr "" +"Project-Id-Version: shadow 3.0.3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" +"PO-Revision-Date: 2000-04-05 11:00:00+0200\n" +"Last-Translator: Sergey Kubushin \n" +"Language-Team: RU \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: libmisc/addgrps.c:56 +#, c-format +msgid "Warning: unknown group %s\n" +msgstr "迮迡郈迮迠迡迮郇邽迮: 郇迮邽郱赲迮郇訄 迣郈郈訄 %s\n" + +#: libmisc/addgrps.c:68 +msgid "Warning: too many groups\n" +msgstr "迮迡郈迮迠迡迮郇邽迮: 郅邽郕郋邾 邾郇郋迣郋 迣郈郈\n" + +#: libmisc/age.c:72 +msgid "Your password has expired." +msgstr "苤郋郕 迡迮邿赲邽 赲訄迮迣郋 郈訄郋郅 邽迮郕." + +#: libmisc/age.c:75 +msgid "Your password is inactive." +msgstr "訄 郈訄郋郅 郇迮訄郕邽赲迮郇." + +#: libmisc/age.c:78 +msgid "Your login has expired." +msgstr "苤郋郕 迡迮邿赲邽 赲訄迮迣郋 郅郋迣邽郇訄 邽迮郕." + +#: libmisc/age.c:90 +msgid " Contact the system administrator.\n" +msgstr " 苤赲迠邽迮 邽迮邾郇邾 訄迡邾邽郇邽訄郋郋邾.\n" + +#: libmisc/age.c:93 +msgid " Choose a new password.\n" +msgstr " 訇迮邽迮 郇郋赲邿 郈訄郋郅.\n" + +#: libmisc/age.c:168 +#, c-format +msgid "Your password will expire in %ld days.\n" +msgstr "苤郋郕 迡迮邿赲邽 赲訄迮迣郋 郈訄郋郅 邽迮迮 迮迮郱 %ld 迡郇迮邿.\n" + +#: libmisc/age.c:172 +msgid "Your password will expire tomorrow.\n" +msgstr "苤郋郕 迡迮邿赲邽 赲訄迮迣郋 郈訄郋郅 郱訄郕訄郇邽赲訄迮 郱訄赲訄.\n" + +#: libmisc/age.c:174 +msgid "Your password will expire today.\n" +msgstr "苤郋郕 迡迮邿赲邽 赲訄迮迣郋 郈訄郋郅 郱訄郕訄郇邽赲訄迮 迮迣郋迡郇.\n" + +#: libmisc/chowntty.c:106 +#, c-format +msgid "Unable to change tty %s" +msgstr "迮 邾郋迣 郈郋邾迮郇 tty %s" + +#: libmisc/env.c:155 +msgid "Environment overflow\n" +msgstr "迮迮郈郋郅郇迮郇邽迮 郋郕迠迮郇邽\n" + +#: libmisc/env.c:195 +#, c-format +msgid "You may not change $%s\n" +msgstr " 郇迮 邾郋迠迮迮 邽郱邾迮郇邽 $%s\n" + +#: libmisc/failure.c:230 +#, c-format +msgid "%d %s since last login. Last was %s on %s.\n" +msgstr "%d %s 郈郋郅迮迡郇迮迣郋 郅郋迣邽郇訄, 郕郋郋邿 訇郅 %s 郇訄 %s.\n" + +#: libmisc/failure.c:232 +msgid "failures" +msgstr "郇迮迡訄邽" + +#: libmisc/failure.c:232 +msgid "failure" +msgstr "郇迮迡訄訄" + +#: libmisc/limits.c:396 +msgid "Too many logins.\n" +msgstr "苤郅邽郕郋邾 邾郇郋迣郋 郅郋迣邽郇郋赲.\n" + +#: libmisc/login_desrpc.c:59 +#, c-format +msgid "Password does not decrypt secret key for %s.\n" +msgstr "Password 郇迮 迡迮邽迮 迮郕迮郇邿 郕郅 迡郅 %s.\n" + +#: libmisc/login_desrpc.c:66 +#, c-format +msgid "Could not set %s's secret key: is the keyserv daemon running?\n" +msgstr "迮 邾郋迣 訄郇郋赲邽 迮郕迮郇邿 郕郅 迡郅 %s: 郱訄郈迮郇 郅邽 迡迮邾郋郇 keyserv?\n" + +#: libmisc/mail.c:61 libmisc/mail.c:76 +msgid "You have new mail." +msgstr "郅 赲訄 迮 郇郋赲訄 郈郋訄." + +#: libmisc/mail.c:72 +msgid "No mail." +msgstr "郋 郇迮." + +#: libmisc/mail.c:74 +msgid "You have mail." +msgstr "郅 赲訄 迮 郈郋訄." + +#: libmisc/obscure.c:271 src/passwd.c:183 +#, c-format +msgid "Bad password: %s. " +msgstr "迮赲迮郇邿 郈訄郋郅: %s. " + +#: libmisc/pam_pass.c:38 +#, c-format +msgid "passwd: pam_start() failed, error %d\n" +msgstr "passwd: 郇迮迡訄訄 pam_start(), 郋邽訇郕訄 %d\n" + +#: libmisc/pam_pass.c:44 +#, c-format +msgid "passwd: %s\n" +msgstr "passwd: %s\n" + +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" +msgstr "" + +#: libmisc/setupenv.c:208 +#, c-format +msgid "Unable to cd to \"%s\"\n" +msgstr "迮 邾郋迣 郈迮迮邿邽 赲 \"%s\"\n" + +#: libmisc/setupenv.c:216 +msgid "No directory, logging in with HOME=/" +msgstr "迮 郕訄訄郅郋迣訄, 郅郋迣邽郇邽邾 HOME=/" + +#: libmisc/shell.c:119 +#, c-format +msgid "Cannot execute %s" +msgstr "迮 邾郋迣 邽郈郋郅郇邽 %s" + +#: libmisc/sub.c:55 +#, c-format +msgid "Invalid root directory \"%s\"\n" +msgstr "迮赲迮郇邿 郕郋郇迮赲郋邿 郕訄訄郅郋迣 \"%s\"\n" + +#: libmisc/sub.c:67 +#, c-format +msgid "Can't change root directory to \"%s\"\n" +msgstr "迮 邾郋迣 邽郱邾迮郇邽 郕郋郇迮赲郋邿 郕訄訄郅郋迣 郇訄 \"%s\"\n" + +#: libmisc/xmalloc.c:24 +#, c-format +msgid "malloc(%d) failed\n" +msgstr "郇迮迡訄訄 malloc(%d)\n" + +#: lib/getdef.c:274 +msgid "Could not allocate space for config info.\n" +msgstr "迮 邾迮訄 迡郅 邽郇郋邾訄邽邽 郋 郕郋郇邽迣訄邽邽.\n" + +#: lib/getdef.c:328 +#, c-format +msgid "configuration error - unknown item '%s' (notify administrator)\n" +msgstr "" +"郋邽訇郕訄 郕郋郇邽迣訄邽邽 - 郇迮邽郱赲迮郇訄 郱訄郈邽 '%s' (郋郋訇邽迮 訄迡邾邽郇邽訄郋)\n" + +#: lib/pwauth.c:54 src/newgrp.c:343 +msgid "Password: " +msgstr "訄郋郅: " + +#: lib/pwauth.c:56 +#, c-format +msgid "%s's Password: " +msgstr "訄郋郅 %s: " + +#: lib/pwauth.c:247 +msgid "(Echo on) " +msgstr "(衪郋 赲郕郅.) " + +#: lib/strerror.c:20 +#, c-format +msgid "Unknown error %d" +msgstr "迮邽郱赲迮郇訄 郋邽訇郕訄 %d" + +#: src/chage.c:118 +msgid "" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" +msgstr "" +"訄郈郕: chage [-l] [-m 邾邽郇_迡郇迮邿] [-M 邾訄郕_迡郇迮邿] [-W 郈迮迡郈.]\n" +" [-I 郇迮訄郕邽赲郇.] [-E 迡訄訄 郋郕郋郇訄郇邽] [-d 郈郋郅_迡迮郇] 郱迮\n" + +#: src/chage.c:152 +#, fuzzy +msgid "" +"Enter the new value, or press ENTER for the default\n" +"\n" +msgstr "" +"赲迮迡邽迮 郇郋赲郋迮 郱郇訄迮郇邽迮 邽郅邽 return 迡郅 郱郇訄迮郇邽 郈郋 邾郋郅訄郇邽\n" +"\n" + +#: src/chage.c:155 +msgid "Minimum Password Age" +msgstr "邽郇邽邾訄郅郇邿 \"赲郋郱訄\" 郈訄郋郅" + +#: src/chage.c:161 +msgid "Maximum Password Age" +msgstr "訄郕邽邾訄郅郇邿 \"赲郋郱訄\" 郈訄郋郅" + +#: src/chage.c:169 +msgid "Last Password Change (YYYY-MM-DD)" +msgstr "郋郅迮迡郇迮迮 邽郱邾迮郇迮郇邽迮 郈訄郋郅 (--)" + +#: src/chage.c:177 +msgid "Password Expiration Warning" +msgstr "迮迡郈迮迠迡迮郇邽 郋訇 郋郕郋郇訄郇邽邽 郋郕訄 迡迮邿赲邽 郈訄郋郅" + +#: src/chage.c:183 +msgid "Password Inactive" +msgstr "訄郋郅 郇迮訄郕邽赲迮郇" + +#: src/chage.c:191 +msgid "Account Expiration Date (YYYY-MM-DD)" +msgstr "訄訄 郋郕郋郇訄郇邽 郋郕訄 迡迮邿赲邽 訄郕郕訄郇訄 (--)" + +#: src/chage.c:241 +#, c-format +msgid "Minimum:\t%ld\n" +msgstr "邽郇邽邾邾:\t%ld\n" + +#: src/chage.c:242 +#, c-format +msgid "Maximum:\t%ld\n" +msgstr "訄郕邽邾邾:\t%ld\n" + +#: src/chage.c:243 +#, c-format +msgid "Warning:\t%ld\n" +msgstr "迮迡郈迮迠迡迮郇邽迮:\t%ld\n" + +#: src/chage.c:244 +#, c-format +msgid "Inactive:\t%ld\n" +msgstr "迮訄郕邽赲郇郋:\t%ld\n" + +#: src/chage.c:251 +msgid "Last Change:\t\t" +msgstr "郋郅迮迡郇迮迮 邽郱邾迮郇迮郇邽迮:\t\t" + +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 +msgid "Never\n" +msgstr "邽郕郋迣迡訄\n" + +#: src/chage.c:264 +msgid "Password Expires:\t" +msgstr "訄郋郅 邽迮郕訄迮:\t" + +#: src/chage.c:280 +msgid "Password Inactive:\t" +msgstr "訄郋郅 迡迮郱訄郕邽赲邽迮:\t" + +#: src/chage.c:294 +msgid "Account Expires:\t" +msgstr "郕郕訄郇 邽迮郕訄迮:\t" + +#: src/chage.c:445 +#, c-format +msgid "%s: do not include \"l\" with other flags\n" +msgstr "%s: 郇迮 赲郕郅訄邿迮 \"l\" 迡迣邽邾邽 郋郈邽邾邽\n" + +#: src/chage.c:458 src/chage.c:588 src/login.c:503 +#, c-format +msgid "%s: permission denied\n" +msgstr "%s: 迡郋郈 郱訄郈迮迮郇\n" + +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 +#, fuzzy, c-format +msgid "%s: PAM authentication failed\n" +msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 邾迮郋迡訄 訄迮郇邽郕訄邽邽\n" + +#: src/chage.c:510 src/chpasswd.c:159 +#, c-format +msgid "%s: can't open password file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 郈訄郋郅迮邿\n" + +#: src/chage.c:518 +#, c-format +msgid "%s: unknown user: %s\n" +msgstr "%s: 郇迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅: %s\n" + +#: src/chage.c:536 +#, fuzzy, c-format +msgid "%s: can't lock shadow password file" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 shadow-訄邿郅 郈訄郋郅迮邿\n" + +#: src/chage.c:544 +#, fuzzy, c-format +msgid "%s: can't open shadow password file" +msgstr "%s: 郇迮 邾郋迣 郋郕 shadow-訄邿郅 郈訄郋郅迮邿\n" + +#: src/chage.c:605 +#, c-format +msgid "Changing the aging information for %s\n" +msgstr "郱邾迮郇迮邾 郈訄訄邾迮 赲迮邾迮郇邽 迡迮邿赲邽 迡郅 %s\n" + +#: src/chage.c:608 +#, c-format +msgid "%s: error changing fields\n" +msgstr "%s: 郋邽訇郕訄 邽郱邾迮郇迮郇邽 郈郋郅迮邿\n" + +#: src/chage.c:632 src/pwunconv.c:138 +#, c-format +msgid "%s: can't update password file\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 郈訄郋郅迮邿\n" + +#: src/chage.c:661 src/pwunconv.c:132 +#, c-format +msgid "%s: can't update shadow password file\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-訄邿郅 郈訄郋郅迮邿\n" + +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 +msgid "Error updating the DBM password entry.\n" +msgstr "邽訇郕訄 郋訇郇郋赲郅迮郇邽 郱訄郈邽邽 赲 訇訄郱迮 迡訄郇郇 郈訄郋郅迮邿.\n" + +#: src/chage.c:693 +#, c-format +msgid "%s: can't rewrite shadow password file\n" +msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 shadow-訄邿郅 郈訄郋郅迮邿\n" + +#: src/chage.c:707 +#, c-format +msgid "%s: can't rewrite password file\n" +msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅 郈訄郋郅迮邿\n" + +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 +#, fuzzy, c-format +msgid "%s: PAM chauthtok failed\n" +msgstr "%s: 郇迮 邾郋迣 訄郱訇郅郋郕邽郋赲訄 訄邿郅\n" + +#: src/chfn.c:84 +#, fuzzy, c-format +msgid "" +"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" +"\t[-h home_ph] [-o other] [user]\n" +msgstr "" +"訄郈郕: %s [-f 郈郋郅郇郋迮_邽邾] [-r 郕郋邾郇訄訄] [-w 訄訇_迮郅]\n" +"\t[-h 迡郋邾_迮郅] [-o 郈郋迮迮] [郈郋郅郱郋赲訄迮郅]\n" + +#: src/chfn.c:89 +#, fuzzy, c-format +msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" +msgstr "訄郈郕: %s [-f 郈郋郅郇郋迮_邽邾] [-r 郕郋邾郇訄訄] [-w 訄訇_迮郅] [-h 迡郋邾_迮郅]\n" + +#: src/chfn.c:140 +#, fuzzy +msgid "Enter the new value, or press ENTER for the default\n" +msgstr "赲迮迡邽迮 郇郋赲郋迮 郱郇訄迮郇邽迮 邽郅邽 return 迡郅 郱郇訄迮郇邽 郈郋 邾郋郅訄郇邽\n" + +#: src/chfn.c:143 +msgid "Full Name" +msgstr "郋郅郇郋迮 邽邾" + +#: src/chfn.c:145 +#, c-format +msgid "\tFull Name: %s\n" +msgstr "\t郋郅郇郋迮 邽邾: %s\n" + +#: src/chfn.c:148 +msgid "Room Number" +msgstr "郋邾迮 郕郋邾郇訄" + +#: src/chfn.c:150 +#, c-format +msgid "\tRoom Number: %s\n" +msgstr "\t郋邾迮 郕郋邾郇訄: %s\n" + +#: src/chfn.c:153 +msgid "Work Phone" +msgstr "訄訇郋邽邿 迮郅迮郋郇" + +#: src/chfn.c:155 +#, c-format +msgid "\tWork Phone: %s\n" +msgstr "\t訄訇郋邽邿 迮郅迮郋郇: %s\n" + +#: src/chfn.c:158 +msgid "Home Phone" +msgstr "郋邾. 迮郅迮郋郇" + +#: src/chfn.c:160 +#, c-format +msgid "\tHome Phone: %s\n" +msgstr "\t郋邾. 迮郅迮郋郇: %s\n" + +#: src/chfn.c:163 +msgid "Other" +msgstr "郋迮迮" + +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: 郋郈 郱訄郈迮迮郇.\n" + +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 +#, c-format +msgid "%s: Unknown user %s\n" +msgstr "%s: 迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅 %s\n" + +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#, c-format +msgid "%s: Cannot determine your user name.\n" +msgstr "%s: 迮 邾郋迣 郋郈迮迡迮郅邽 赲訄迮迣郋 邽邾迮郇邽 郈郋郅郱郋赲訄迮郅.\n" + +#: src/chfn.c:359 src/chsh.c:210 +#, c-format +msgid "%s: cannot change user `%s' on NIS client.\n" +msgstr "%s: 郇迮 邾郋迣 邽郱邾迮郇邽 郈郋郅郱郋赲訄迮郅 `%s' 郇訄 郕郅邽迮郇迮 NIS.\n" + +#: src/chfn.c:367 src/chsh.c:218 +#, c-format +msgid "%s: `%s' is the NIS master for this client.\n" +msgstr "%s: `%s' - NIS-邾訄迮 迡郅 郋迣郋 郕郅邽迮郇訄.\n" + +#: src/chfn.c:442 +#, c-format +msgid "Changing the user information for %s\n" +msgstr "郱邾迮郇迮邾 邽郇郋邾訄邽 郋 郈郋郅郱郋赲訄迮郅迮 %s\n" + +#: src/chfn.c:451 +#, c-format +msgid "%s: invalid name: \"%s\"\n" +msgstr "%s: 郇迮赲迮郇郋迮 邽邾: \"%s\"\n" + +#: src/chfn.c:457 +#, c-format +msgid "%s: invalid room number: \"%s\"\n" +msgstr "%s: 郇迮赲迮郇邿 郇郋邾迮 郕郋邾郇訄: \"%s\"\n" + +#: src/chfn.c:463 +#, c-format +msgid "%s: invalid work phone: \"%s\"\n" +msgstr "%s: 郇迮赲迮郇邿 訄訇郋邽邿 迮郅迮郋郇: \"%s\"\n" + +#: src/chfn.c:469 +#, c-format +msgid "%s: invalid home phone: \"%s\"\n" +msgstr "%s: 郇迮赲迮郇邿 迡郋邾. 迮郅迮郋郇: \"%s\"\n" + +#: src/chfn.c:476 +#, c-format +msgid "%s: \"%s\" contains illegal characters\n" +msgstr "%s: \"%s\" 郋迡迮迠邽 郇迮迡郋郈邽邾迮 邽邾赲郋郅\n" + +#: src/chfn.c:489 +#, c-format +msgid "%s: fields too long\n" +msgstr "%s: 郅邽郕郋邾 迡郅邽郇郇迮 郈郋郅\n" + +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +msgid "Cannot change ID to root.\n" +msgstr "迮 邾郋迣 邽郱邾迮郇邽 ID root'訄.\n" + +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +msgid "Cannot lock the password file; try again later.\n" +msgstr "迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 郈訄郋郅迮邿; 郈郋郈郋訇邿迮 郈郋郱迠迮.\n" + +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +msgid "Cannot open the password file.\n" +msgstr "迮 邾郋迣 郋郕 訄邿郅 郈訄郋郅迮邿.\n" + +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#, c-format +msgid "%s: %s not found in /etc/passwd\n" +msgstr "%s: %s 郇迮 郇訄邿迡迮郇 赲 /etc/passwd\n" + +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +msgid "Error updating the password entry.\n" +msgstr "邽訇郕訄 郋訇郇郋赲郅迮郇邽 郱訄郈邽邽 郈訄郋郅.\n" + +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +msgid "Cannot commit password file changes.\n" +msgstr "迮 邾郋迣 郱訄郈邽訄 邽郱邾迮郇迮郇邽 訄邿郅訄 郈訄郋郅迮邿.\n" + +#: src/chfn.c:593 src/chsh.c:399 +msgid "Cannot unlock the password file.\n" +msgstr "迮 邾郋迣 訄郱訇郅郋郕邽郋赲訄 訄邿郅 郈訄郋郅迮邿.\n" + +#: src/chpasswd.c:67 +#, fuzzy, c-format +msgid "Usage: %s [-e]\n" +msgstr "郱訄郈郕: %s [-e]\n" + +#: src/chpasswd.c:154 +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 郈訄郋郅迮邿\n" + +#: src/chpasswd.c:168 src/pwconv.c:95 +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 shadow\n" + +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 +#, c-format +msgid "%s: can't open shadow file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 shadow\n" + +#: src/chpasswd.c:197 src/newusers.c:441 +#, c-format +msgid "%s: line %d: line too long\n" +msgstr "%s: 郋郕訄 %d: 郅邽郕郋邾 迡郅邽郇郇訄 郋郕訄\n" + +#: src/chpasswd.c:217 +#, c-format +msgid "%s: line %d: missing new password\n" +msgstr "%s: 郋郕訄 %d: 郇郋赲邿 郈訄郋郅 郋赲迮\n" + +#: src/chpasswd.c:234 +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: 郋郕訄 %d: 郇迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅 %s\n" + +#: src/chpasswd.c:280 +#, c-format +msgid "%s: line %d: cannot update password entry\n" +msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 郈訄郋郅\n" + +#: src/chpasswd.c:297 src/newusers.c:569 +#, c-format +msgid "%s: error detected, changes ignored\n" +msgstr "%s: 郋訇郇訄迠迮郇訄 郋邽訇郕訄, 邽郱邾迮郇迮郇邽 邽迣郇郋邽\n" + +#: src/chpasswd.c:309 +#, c-format +msgid "%s: error updating shadow file\n" +msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 訄邿郅訄 shadow\n" + +#: src/chpasswd.c:318 +#, c-format +msgid "%s: error updating password file\n" +msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 訄邿郅訄 郈訄郋郅迮邿\n" + +#: src/chsh.c:76 +#, fuzzy, c-format +msgid "Usage: %s [-s shell] [name]\n" +msgstr "訄郈郕: %s [-s 迮郅郅] [邽邾]\n" + +#: src/chsh.c:90 +msgid "Enter the new value, or press return for the default\n" +msgstr "赲迮迡邽迮 郇郋赲郋迮 郱郇訄迮郇邽迮 邽郅邽 return 迡郅 郱郇訄迮郇邽 郈郋 邾郋郅訄郇邽\n" + +#: src/chsh.c:91 +msgid "Login Shell" +msgstr "虼迮郅郅 郈邽 赲郋迡迮" + +#: src/chsh.c:234 src/chsh.c:248 +#, c-format +msgid "You may not change the shell for %s.\n" +msgstr " 郇迮 邾郋迠迮迮 邽郱邾迮郇邽 迮郅郅 迡郅 %s.\n" + +#: src/chsh.c:277 +#, c-format +msgid "Changing the login shell for %s\n" +msgstr "郱邾迮郇迮邾 迮郅郅 郈邽 赲郋迡迮 迡郅 %s\n" + +#: src/chsh.c:289 +#, c-format +msgid "%s: Invalid entry: %s\n" +msgstr "%s: 迮赲迮郇訄 郱訄郈邽: %s\n" + +#: src/chsh.c:296 +#, c-format +msgid "%s is an invalid shell.\n" +msgstr "%s - 郇迮赲迮郇邿 迮郅郅.\n" + +#: src/expiry.c:59 +#, fuzzy +msgid "Usage: expiry {-f|-c}\n" +msgstr "訄郈郕: expiry { -f | -c }\n" + +#: src/expiry.c:113 +#, c-format +msgid "%s: WARNING! Must be set-UID root!\n" +msgstr "%s: 苺! 郋郅迠郇郋 訇 set-UID root!\n" + +#: src/expiry.c:124 +#, c-format +msgid "%s: unknown user\n" +msgstr "%s: 郇迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅\n" + +#: src/faillog.c:77 +#, fuzzy, c-format +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +msgstr "郱訄郈郕: %s [-a|-u 郱迮] [-m 邾訄郕] [-r] [-t 迡郇迮邿] [-l lock(迮郕)]\n" + +#: src/faillog.c:131 src/lastlog.c:96 +#, c-format +msgid "Unknown User: %s\n" +msgstr "迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅: %s\n" + +#: src/faillog.c:212 +msgid "Username Failures Maximum Latest\n" +msgstr "邾 迮迡訄 訄郕邽邾邾 郋郅迮迡郇.\n" + +#: src/faillog.c:229 +#, c-format +msgid " %s on %s" +msgstr " %s 郇訄 %s" + +#: src/faillog.c:233 +#, c-format +msgid " [%lds left]" +msgstr " [%lds 郋.]" + +#: src/faillog.c:237 +#, c-format +msgid " [%lds lock]" +msgstr " [%lds lock]" + +#: src/gpasswd.c:78 +#, fuzzy, c-format +msgid "Usage: %s [-r|-R] group\n" +msgstr "郱訄郈郕: %s [-r|-R] 迣郈郈訄\n" + +#: src/gpasswd.c:79 +#, c-format +msgid " %s [-a user] group\n" +msgstr " %s [-a 郱迮] 迣郈郈訄\n" + +#: src/gpasswd.c:80 +#, c-format +msgid " %s [-d user] group\n" +msgstr " %s [-d 郱迮] 迣郈郈訄\n" + +#: src/gpasswd.c:83 +#, c-format +msgid " %s [-A user,...] [-M user,...] group\n" +msgstr " %s [-A 郱迮,...] [-M 郱迮,...] 迣郈郈訄\n" + +#: src/gpasswd.c:85 +#, c-format +msgid " %s [-M user,...] group\n" +msgstr " %s [-M 郱迮,...] 迣郈郈訄\n" + +#: src/gpasswd.c:146 src/gpasswd.c:230 +#, c-format +msgid "%s: unknown user %s\n" +msgstr "%s: 郇迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅 %s\n" + +#: src/gpasswd.c:157 +msgid "Permission denied.\n" +msgstr "郋郈 郱訄郈迮迮郇.\n" + +#: src/gpasswd.c:243 +#, c-format +msgid "%s: shadow group passwords required for -A\n" +msgstr "%s: 迡郅 -A 迮訇 shadow-郈訄郋郅邽 迣郈郈\n" + +#: src/gpasswd.c:294 +msgid "Who are you?\n" +msgstr "郋 赲?\n" + +#: src/gpasswd.c:313 src/newgrp.c:292 +#, c-format +msgid "unknown group: %s\n" +msgstr "郇迮邽郱赲迮郇訄 迣郈郈訄: %s\n" + +#: src/gpasswd.c:422 +#, c-format +msgid "Adding user %s to group %s\n" +msgstr "郋訇訄赲郅 郈郋郅郱郋赲訄迮郅 %s 赲 迣郈郈 %s\n" + +#: src/gpasswd.c:440 +#, c-format +msgid "Removing user %s from group %s\n" +msgstr "苺迡訄郅 郈郋郅郱郋赲訄迮郅 %s 邽郱 迣郈郈 %s\n" + +#: src/gpasswd.c:454 +#, c-format +msgid "%s: unknown member %s\n" +msgstr "%s: 郇迮邽郱赲迮郇邿 郅迮郇 %s\n" + +#: src/gpasswd.c:501 +#, c-format +msgid "%s: Not a tty\n" +msgstr "%s: 迮 tty\n" + +#: src/gpasswd.c:522 +#, c-format +msgid "Changing the password for group %s\n" +msgstr "郱邾迮郇迮邾 郈訄郋郅 迡郅 迣郈郈 %s\n" + +#: src/gpasswd.c:525 +msgid "New Password: " +msgstr "郋赲邿 郈訄郋郅: " + +#: src/gpasswd.c:530 src/passwd.c:281 +msgid "Re-enter new password: " +msgstr "迮 訄郱 郇郋赲邿 郈訄郋郅: " + +#: src/gpasswd.c:542 +msgid "They don't match; try again" +msgstr "郇邽 郇迮 郋赲郈訄迡訄; 郈郋郈郋訇邿迮 郇郋赲訄" + +#: src/gpasswd.c:546 +#, c-format +msgid "%s: Try again later\n" +msgstr "%s: 郋郈郋訇邿迮 郈郋郱迠迮\n" + +#: src/gpasswd.c:578 +#, c-format +msgid "%s: can't get lock\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄\n" + +#: src/gpasswd.c:584 +#, c-format +msgid "%s: can't get shadow lock\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 shadow\n" + +#: src/gpasswd.c:590 +#, c-format +msgid "%s: can't open file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅\n" + +#: src/gpasswd.c:602 +#, c-format +msgid "%s: can't update entry\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽\n" + +#: src/gpasswd.c:608 +#, c-format +msgid "%s: can't update shadow entry\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-郱訄郈邽\n" + +#: src/gpasswd.c:615 +#, c-format +msgid "%s: can't re-write file\n" +msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅\n" + +#: src/gpasswd.c:621 +#, c-format +msgid "%s: can't re-write shadow file\n" +msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅 shadow\n" + +#: src/gpasswd.c:630 +#, c-format +msgid "%s: can't unlock file\n" +msgstr "%s: 郇迮 邾郋迣 訄郱訇郅郋郕邽郋赲訄 訄邿郅\n" + +#: src/gpasswd.c:635 +#, c-format +msgid "%s: can't update DBM files\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 訇訄郱 迡訄郇郇\n" + +#: src/gpasswd.c:642 +#, c-format +msgid "%s: can't update DBM shadow files\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-訄邿郅 訇訄郱 迡訄郇郇\n" + +#: src/groupadd.c:102 +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" +msgstr "郱訄郈郕: groupadd [-g gid [-o]] [-f] 迣郈郈訄\n" + +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 +#, c-format +msgid "%s: error adding new group entry\n" +msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 郇郋赲郋邿 郱訄郈邽邽 迣郈郈\n" + +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 +#, c-format +msgid "%s: cannot add new dbm group entry\n" +msgstr "%s: 郇迮 邾郋迣 迡郋訇訄赲邽 郇郋赲 郱訄郈邽 迣郈郈 赲 訇訄郱 迡訄郇郇\n" + +#: src/groupadd.c:256 src/useradd.c:977 +#, c-format +msgid "%s: name %s is not unique\n" +msgstr "%s: 邽邾 %s 郇迮 郇邽郕訄郅郇郋\n" + +#: src/groupadd.c:271 +#, fuzzy, c-format +msgid "%s: gid %u is not unique\n" +msgstr "%s: gid %ld 郇迮 郇邽郕訄郅迮郇\n" + +#: src/groupadd.c:295 +#, c-format +msgid "%s: can't get unique gid\n" +msgstr "%s: 郇迮 邾郋迣 郈郋郅邽 郇邽郕訄郅郇邿 gid\n" + +#: src/groupadd.c:318 src/groupmod.c:342 +#, c-format +msgid "%s: %s is a not a valid group name\n" +msgstr "%s: %s 郇迮迡郋郈邽邾郋 郕訄郕 邽邾 迣郈郈\n" + +#: src/groupadd.c:347 src/groupmod.c:367 +#, c-format +msgid "%s: invalid group %s\n" +msgstr "%s: 郇迮赲迮郇訄 迣郈郈訄 %s\n" + +#: src/groupadd.c:364 src/useradd.c:1173 +#, c-format +msgid "%s: -O requires NAME=VALUE\n" +msgstr "%s: -O 迮訇迮 觓=虴\n" + +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 +#, c-format +msgid "%s: cannot rewrite group file\n" +msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅 迣郈郈\n" + +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 +#, c-format +msgid "%s: cannot rewrite shadow group file\n" +msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 shadow-訄邿郅 迣郈郈\n" + +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#, c-format +msgid "%s: unable to lock group file\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 迣郈郈\n" + +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#, c-format +msgid "%s: unable to open group file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 迣郈郈\n" + +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#, c-format +msgid "%s: unable to lock shadow group file\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 shadow-訄邿郅 迣郈郈\n" + +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#, c-format +msgid "%s: unable to open shadow group file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 shadow-訄邿郅 迣郈郈\n" + +#: src/groupadd.c:563 +#, c-format +msgid "%s: group %s exists\n" +msgstr "%s: 迣郈郈訄 %s 迠迮 迮赲迮\n" + +#: src/groupdel.c:88 +#, fuzzy +msgid "Usage: groupdel group\n" +msgstr "郱訄郈郕: groupdel 迣郈郈訄\n" + +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#, c-format +msgid "%s: error removing group entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 迣郈郈\n" + +#: src/groupdel.c:119 src/groupmod.c:205 +#, c-format +msgid "%s: error removing group dbm entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 迣郈郈 邽郱 訇訄郱 迡訄郇郇\n" + +#: src/groupdel.c:135 +#, c-format +msgid "%s: error removing shadow group entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 迣郈郈\n" + +#: src/groupdel.c:149 src/groupmod.c:255 +#, c-format +msgid "%s: error removing shadow group dbm entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 迣郈郈 邽郱 訇訄郱 迡訄郇郇\n" + +#: src/groupdel.c:255 +#, c-format +msgid "%s: cannot remove user's primary group.\n" +msgstr "%s: 郇迮 邾郋迣 迡訄郅邽 郈迮赲邽郇 迣郈郈 郈郋郅郱郋赲訄迮郅.\n" + +#: src/groupdel.c:359 src/groupmod.c:551 +#, c-format +msgid "%s: group %s does not exist\n" +msgstr "%s: 迣郈郈訄 %s 郇迮 迮赲迮\n" + +#: src/groupdel.c:373 src/groupmod.c:567 +#, c-format +msgid "%s: group %s is a NIS group\n" +msgstr "%s: 迣郈郈訄 %s - 迣郈郈訄 NIS\n" + +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 +#, c-format +msgid "%s: %s is the NIS master\n" +msgstr "%s: %s - NIS-邾訄迮\n" + +#: src/groupmems.c:95 +msgid "Member already exists\n" +msgstr "" + +#: src/groupmems.c:125 +msgid "Member to remove could not be found\n" +msgstr "" + +#: src/groupmems.c:158 +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgstr "" + +#: src/groupmems.c:201 +msgid "Only root can add members to different groups\n" +msgstr "" + +#: src/groupmems.c:206 +msgid "Group access is required\n" +msgstr "" + +#: src/groupmems.c:210 +msgid "Not primary owner of current group\n" +msgstr "" + +#: src/groupmems.c:215 +#, fuzzy +msgid "Unable to lock group file\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 迣郈郈\n" + +#: src/groupmems.c:220 +#, fuzzy +msgid "Unable to open group file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 迣郈郈\n" + +#: src/groupmems.c:240 +#, fuzzy +msgid "Cannot close group file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 迣郈郈\n" + +#: src/groupmod.c:104 +#, fuzzy +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "郱訄郈郕: groupmod [-g gid [-o]] [-n 邽邾] 迣郈郈訄\n" + +#: src/groupmod.c:162 +#, c-format +msgid "%s: %s not found in /etc/group\n" +msgstr "%s: %s 郇迮 郇訄邿迡迮郇 赲 /etc/group\n" + +#: src/groupmod.c:248 +#, c-format +msgid "%s: cannot add new dbm shadow group entry\n" +msgstr "%s: 郇迮 邾郋迣 迡郋訇訄赲邽 郇郋赲 shadow-郱訄郈邽 迣郈郈 赲 訇訄郱 迡訄郇郇\n" + +#: src/groupmod.c:301 +#, fuzzy, c-format +msgid "%s: %u is not a unique gid\n" +msgstr "%s: %ld - 郇迮 郇邽郕訄郅郇邿 gid\n" + +#: src/groupmod.c:331 +#, c-format +msgid "%s: %s is not a unique name\n" +msgstr "%s: %s - 郇迮 郇邽郕訄郅郇郋迮 邽邾\n" + +#: src/groups.c:59 +#, c-format +msgid "unknown user %s\n" +msgstr "郇迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅 %s\n" + +#: src/grpck.c:87 +#, fuzzy, c-format +msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" +msgstr "訄郈郕: %s [-r] [迣郈郈訄 [shadow-迣郈郈訄]]\n" + +#: src/grpck.c:90 +#, fuzzy, c-format +msgid "Usage: %s [-r] [-s] [group]\n" +msgstr "訄郈郕: %s [-r] [迣郈郈訄]\n" + +#: src/grpck.c:108 src/pwck.c:108 +msgid "No" +msgstr "迮" + +#: src/grpck.c:192 src/pwck.c:175 +#, c-format +msgid "%s: -s and -r are incompatibile\n" +msgstr "" + +#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#, c-format +msgid "%s: cannot lock file %s\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 %s\n" + +#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:202 src/pwck.c:242 +#: src/pwck.c:251 +#, c-format +msgid "%s: cannot open file %s\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 %s\n" + +#: src/grpck.c:311 +msgid "invalid group file entry\n" +msgstr "郇迮赲迮郇訄 郱訄郈邽 訄邿郅訄 迣郈郈\n" + +#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 +#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 +#: src/pwck.c:543 +#, c-format +msgid "delete line `%s'? " +msgstr "迡訄郅邽 郋郕 `%s'? " + +#: src/grpck.c:374 +msgid "duplicate group entry\n" +msgstr "迡訇郅邽訄 郱訄郈邽 迣郈郈\n" + +#: src/grpck.c:391 +#, c-format +msgid "invalid group name `%s'\n" +msgstr "郇迮赲迮郇郋迮 邽邾 迣郈郈 `%s'\n" + +#: src/grpck.c:418 +#, c-format +msgid "group %s: no user %s\n" +msgstr "迣郈郈訄 %s: 郇迮 郈郋郅郱郋赲訄迮郅 %s\n" + +#: src/grpck.c:420 src/grpck.c:590 +#, c-format +msgid "delete member `%s'? " +msgstr "迡訄郅邽 郅迮郇訄 `%s'? " + +#: src/grpck.c:457 +msgid "invalid shadow group file entry\n" +msgstr "郇迮赲迮郇訄 shadow-郱訄郈邽 赲 訄邿郅迮 迣郈郈\n" + +#: src/grpck.c:520 +msgid "duplicate shadow group entry\n" +msgstr "迡訇郅邽訄 shadow-郱訄郈邽 赲 訄邿郅迮 迣郈郈\n" + +#: src/grpck.c:537 +msgid "no matching group file entry\n" +msgstr "郋郋赲迮赲迮邿 郱訄郈邽邽 赲 訄邿郅迮 迣郈郈 郇迮\n" + +#: src/grpck.c:558 +#, c-format +msgid "shadow group %s: no administrative user %s\n" +msgstr "shadow-迣郈郈訄 %s: 郇迮 訄迡邾邽郇邽訄邽赲郇郋迣郋 郈郋郅郱郋赲訄迮郅 %s\n" + +#: src/grpck.c:560 +#, c-format +msgid "delete administrative member `%s'? " +msgstr "迡訄郅邽 訄迡邾邽郇邽訄邽赲郇郋迣郋 郅迮郇訄 `%s'? " + +#: src/grpck.c:588 +#, c-format +msgid "shadow group %s: no user %s\n" +msgstr "shadow-迣郈郈訄 %s: 郇迮 郈郋郅郱郋赲訄迮郅 %s\n" + +#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#, c-format +msgid "%s: cannot update file %s\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 %s\n" + +#: src/grpck.c:647 src/pwck.c:612 +#, c-format +msgid "%s: the files have been updated; run mkpasswd\n" +msgstr "%s: 訄邿郅 訇郅邽 郋訇郇郋赲郅迮郇; 郱訄郈邽迮 mkpasswd\n" + +#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: 邽郱邾迮郇迮郇邽邿 郇迮\n" + +#: src/grpck.c:651 src/pwck.c:616 +#, c-format +msgid "%s: the files have been updated\n" +msgstr "%s: 訄邿郅 訇郅邽 郋訇郇郋赲郅迮郇\n" + +#: src/grpconv.c:60 src/grpunconv.c:56 +#, c-format +msgid "%s: can't lock group file\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 迣郈郈\n" + +#: src/grpconv.c:65 src/grpunconv.c:61 +#, c-format +msgid "%s: can't open group file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 迣郈郈\n" + +#: src/grpconv.c:70 src/grpunconv.c:66 +#, c-format +msgid "%s: can't lock shadow group file\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 shadow-訄邿郅 迣郈郈\n" + +#: src/grpconv.c:76 src/grpunconv.c:72 +#, c-format +msgid "%s: can't open shadow group file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 shadow-訄邿郅 迣郈郈\n" + +#: src/grpconv.c:94 +#, c-format +msgid "%s: can't remove shadow group %s\n" +msgstr "%s: 郇迮 邾郋迣 迡訄郅邽 shadow-迣郈郈 %s\n" + +#: src/grpconv.c:133 src/pwconv.c:154 +#, c-format +msgid "%s: can't update shadow entry for %s\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-郱訄郈邽 迡郅 %s\n" + +#: src/grpconv.c:143 src/grpunconv.c:91 +#, c-format +msgid "%s: can't update entry for group %s\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 迡郅 迣郈郈 %s\n" + +#: src/grpconv.c:150 src/grpunconv.c:99 +#, c-format +msgid "%s: can't update shadow group file\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-訄邿郅 迣郈郈\n" + +#: src/grpconv.c:155 src/grpunconv.c:105 +#, c-format +msgid "%s: can't update group file\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 迣郈郈\n" + +#: src/grpunconv.c:110 +#, c-format +msgid "%s: can't delete shadow group file\n" +msgstr "%s: 郇迮 邾郋迣 迡訄郅邽 shadow-訄邿郅 迣郈郈\n" + +#: src/id.c:53 +#, fuzzy +msgid "Usage: id [-a]\n" +msgstr "郱訄郈郕: id [-a]\n" + +#: src/id.c:55 +#, fuzzy +msgid "Usage: id\n" +msgstr "郱訄郈郕: id\n" + +#: src/id.c:169 +msgid " groups=" +msgstr " 迣郈郈=" + +#: src/lastlog.c:110 src/lastlog.c:116 +#, c-format +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" +msgstr "" + +#: src/lastlog.c:181 +msgid "Username Port From Latest\n" +msgstr "邾 郋 郕迡訄 郋郅迮迡郇.\n" + +#: src/lastlog.c:183 +msgid "Username Port Latest\n" +msgstr "邾 郋 郋郅迮迡郇.\n" + +#: src/lastlog.c:198 +msgid "**Never logged in**" +msgstr "**邽郕郋迣迡訄 郇迮 郅郋迣邽郇邽郅***" + +#: src/login.c:175 +#, fuzzy, c-format +msgid "Usage: %s [-p] [name]\n" +msgstr "郱訄郈郕: %s [-p] [邽邾]\n" + +#: src/login.c:178 +#, c-format +msgid " %s [-p] [-h host] [-f name]\n" +msgstr " %s [-p] [-h 郋] [-f 邽邾]\n" + +#: src/login.c:180 +#, c-format +msgid " %s [-p] -r host\n" +msgstr " %s [-p] -r 郋\n" + +#: src/login.c:259 +msgid "Invalid login time\n" +msgstr "迮迡郋郈邽邾郋迮 赲迮邾 迡郅 郅郋迣邽郇訄\n" + +#: src/login.c:314 +msgid "" +"\n" +"System closed for routine maintenance\n" +msgstr "" +"\n" +"苤邽迮邾訄 郱訄郕訄 郇訄 郈郅訄郇郋赲郋迮 郋訇郅迠邽赲訄郇邽迮\n" + +#: src/login.c:325 +msgid "" +"\n" +"[Disconnect bypassed -- root login allowed.]\n" +msgstr "" +"\n" +"[訄郋迮迡邽郇迮郇邽迮 郈郋郈迮郇郋 -- root'郋赲邿 郅郋迣邽郇 訄郱迮迮郇.]\n" + +#: src/login.c:362 +#, c-format +msgid "" +"\n" +"Login timed out after %d seconds.\n" +msgstr "" +"\n" +"苠訄邿邾訄 郅郋迣邽郇訄 赲 迮迮郇邽迮 %d 迮郕郇迡.\n" + +#: src/login.c:648 +#, c-format +msgid " on `%.100s' from `%.200s'" +msgstr " 郇訄 `%.100s' `%.200s'" + +#: src/login.c:652 +#, c-format +msgid " on `%.100s'" +msgstr " 郇訄 `%.100s'" + +#: src/login.c:811 +#, c-format +msgid "" +"\n" +"%s login: " +msgstr "" +"\n" +"%s login: " + +#: src/login.c:814 +msgid "login: " +msgstr "login: " + +#: src/login.c:1013 src/sulogin.c:205 +msgid "Login incorrect" +msgstr "迮迡訄郇訄 郈郋郈郕訄" + +#: src/login.c:1193 +msgid "Warning: login re-enabled after temporary lockout.\n" +msgstr "迮迡郈迮迠迡迮郇邽迮: 郅郋迣邽郇 郇郋赲訄 郋郕 郈郋郅迮 赲迮邾迮郇郇郋迣郋 郱訄郕邽.\n" + +#: src/login.c:1207 +#, c-format +msgid "Last login: %s on %s" +msgstr "郋郅迮迡郇邽邿 郅郋迣邽郇: %s 郇訄 %s" + +#: src/login.c:1210 +#, c-format +msgid "Last login: %.19s on %s" +msgstr "郋郅迮迡郇邽邿 郅郋迣邽郇: %.19s 郇訄 %s" + +#: src/login.c:1216 +#, fuzzy, c-format +msgid " from %.*s" +msgstr " %.*s" + +#: src/login.c:1293 +msgid "Starting rad_login\n" +msgstr "訄郈郕訄 rad_login\n" + +#: src/mkpasswd.c:47 +#, c-format +msgid "%s: no DBM database on system - no action performed\n" +msgstr "%s: 赲 邽迮邾迮 郇迮 訇訄郱 迡訄郇郇 DBM, 郇邽郕訄郕邽 迡迮邿赲邽邿 郇迮 郈迮迡郈邽郇郋\n" + +#: src/mkpasswd.c:232 src/mkpasswd.c:237 +#, c-format +msgid "%s: cannot overwrite file %s\n" +msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅 %s\n" + +#: src/mkpasswd.c:252 +#, c-format +msgid "%s: cannot open DBM files for %s\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 訇訄郱 迡訄郇郇 迡郅 %s\n" + +#: src/mkpasswd.c:287 +#, c-format +msgid "%s: the beginning with " +msgstr "%s: 郇訄訄郅郋 " + +#: src/mkpasswd.c:288 +#, fuzzy +msgid " is too long\n" +msgstr "%s: 郅邽郕郋邾 迡郅邽郇郇迮 郈郋郅\n" + +#: src/mkpasswd.c:315 +#, c-format +msgid "%s: error parsing line \"%s\"\n" +msgstr "%s: 郋邽訇郕訄 訄郱訇郋訄 郋郕邽 \"%s\"\n" + +#: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338 +msgid "adding record for name " +msgstr "迡郋訇訄赲郅 郱訄郈邽 迡郅 邽邾迮郇邽 " + +#: src/mkpasswd.c:324 src/mkpasswd.c:329 src/mkpasswd.c:334 src/mkpasswd.c:339 +#: src/mkpasswd.c:345 src/mkpasswd.c:351 src/mkpasswd.c:356 src/mkpasswd.c:361 +msgid "\n" +msgstr "" + +#: src/mkpasswd.c:344 src/mkpasswd.c:350 src/mkpasswd.c:355 src/mkpasswd.c:360 +#, c-format +msgid "%s: error adding record for " +msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 郱訄郈邽邽 迡郅 " + +#: src/mkpasswd.c:378 +#, c-format +msgid "added %d entries, longest was %d\n" +msgstr "迡郋訇訄赲郅迮郇郋 %d 郱訄郈邽迮邿, 訄邾訄 迡郅邽郇郇訄 - %d\n" + +#: src/mkpasswd.c:392 +#, fuzzy, c-format +msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" +msgstr "訄郈郕: %s [-vf] [-p|g|sp|sg] 訄邿郅\n" + +#: src/mkpasswd.c:395 +#, fuzzy, c-format +msgid "Usage: %s [-vf] [-p|g|sp] file\n" +msgstr "訄郈郕: %s [-vf] [-p|g|sp] 訄邿郅\n" + +#: src/mkpasswd.c:398 +#, fuzzy, c-format +msgid "Usage: %s [-vf] [-p|g] file\n" +msgstr "訄郈郕: %s [-vf] [-p|g] 訄邿郅\n" + +#: src/newgrp.c:61 +#, fuzzy +msgid "Usage: newgrp [-] [group]\n" +msgstr "郱訄郈郕: newgrp [-] [迣郈郈訄]\n" + +#: src/newgrp.c:63 +#, fuzzy +msgid "Usage: sg group [[-c] command]\n" +msgstr "郱訄郈郕: sg 迣郈郈訄 [[-c] 郕郋邾訄郇迡訄]\n" + +#: src/newgrp.c:131 +#, fuzzy, c-format +msgid "unknown uid: %u\n" +msgstr "郇迮邽郱赲迮郇邿 uid: %d\n" + +#: src/newgrp.c:214 +#, fuzzy, c-format +msgid "unknown gid: %lu\n" +msgstr "郇迮邽郱赲迮郇邿 gid: %ld\n" + +#: src/newgrp.c:360 src/newgrp.c:369 +msgid "Sorry.\n" +msgstr "郱赲邽郇邽迮.\n" + +#: src/newgrp.c:469 +msgid "too many groups\n" +msgstr "郅邽郕郋邾 邾郇郋迣郋 迣郈郈\n" + +#: src/newusers.c:78 +#, fuzzy, c-format +msgid "Usage: %s [input]\n" +msgstr "訄郈郕: %s [赲赲郋迡]\n" + +#: src/newusers.c:388 +#, c-format +msgid "%s: can't lock /etc/passwd.\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 /etc/passwd.\n" + +#: src/newusers.c:400 +#, c-format +msgid "%s: can't lock files, try again later\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅; 郈郋郈郋訇邿迮 郈郋郱迠迮\n" + +#: src/newusers.c:416 +#, c-format +msgid "%s: can't open files\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅\n" + +#: src/newusers.c:461 +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: 郋郕訄 %d: 郇迮赲迮郇訄 郋郕訄\n" + +#: src/newusers.c:480 +#, c-format +msgid "%s: line %d: can't create GID\n" +msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郋郱迡訄 GID\n" + +#: src/newusers.c:496 +#, c-format +msgid "%s: line %d: can't create UID\n" +msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郋郱迡訄 UID\n" + +#: src/newusers.c:509 +#, c-format +msgid "%s: line %d: cannot find user %s\n" +msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郇訄邿邽 郈郋郅郱郋赲訄迮郅 %s\n" + +#: src/newusers.c:518 +#, c-format +msgid "%s: line %d: can't update password\n" +msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郋訇郇郋赲邽 郈訄郋郅\n" + +#: src/newusers.c:536 +#, c-format +msgid "%s: line %d: mkdir failed\n" +msgstr "%s: 郋郕訄 %d: 郇迮迡訄訄 mkdir\n" + +#: src/newusers.c:542 +#, c-format +msgid "%s: line %d: chown failed\n" +msgstr "%s: 郋郕訄 %d: 郇迮迡訄訄 chown\n" + +#: src/newusers.c:552 +#, c-format +msgid "%s: line %d: can't update entry\n" +msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽\n" + +#: src/newusers.c:584 +#, c-format +msgid "%s: error updating files\n" +msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 訄邿郅郋赲\n" + +#: src/passwd.c:155 +#, fuzzy, c-format +msgid "Usage: %s [-f|-s] [name]\n" +msgstr "郱訄郈郕: %s [-p] [邽邾]\n" + +#: src/passwd.c:159 +#, fuzzy, c-format +msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" +msgstr " %s [-x 邾訄郕] [-n 邾邽郇] [-w 郈迮迡郈] [-i 郇迮訄郕] 邽邾\n" + +#: src/passwd.c:161 +#, fuzzy, c-format +msgid " %s {-l|-u|-d|-S|-e} name\n" +msgstr " %s { -l | -u | -d | -S | -e } 邽邾\n" + +#: src/passwd.c:216 +msgid "Old password: " +msgstr "苤訄邿 郈訄郋郅: " + +#: src/passwd.c:225 +#, c-format +msgid "Incorrect password for `%s'\n" +msgstr "迮赲迮郇邿 郈訄郋郅 迡郅 `%s'\n" + +#: src/passwd.c:249 +#, c-format +msgid "" +"Enter the new password (minimum of %d, maximum of %d characters)\n" +"Please use a combination of upper and lower case letters and numbers.\n" +msgstr "" +"赲迮迡邽迮 郇郋赲邿 郈訄郋郅 (邾邽郇邽邾邾 %d, 邾訄郕邽邾邾 %d 邽邾赲郋郅郋赲)\n" +"郈郋郅郱邿迮 郕郋邾訇邽郇訄邽 訇郋郅邽 邽 邾訄郅迮郇郕邽 郅訄邽郇郕邽 訇郕赲 邽 邽.\n" + +#: src/passwd.c:255 +msgid "New password: " +msgstr "郋赲邿 郈訄郋郅: " + +#: src/passwd.c:266 +msgid "Try again.\n" +msgstr "郋郈郋訇邿迮 迮迮 訄郱.\n" + +#: src/passwd.c:277 +msgid "" +"\n" +"Warning: weak password (enter it again to use it anyway).\n" +msgstr "" +"\n" +"迮迡郈迮迠迡迮郇邽迮: 郅訄訇邿 郈訄郋郅 (赲赲迮迡邽迮 迮迣郋 迮迮 訄郱 迮郅邽 赲迮-訄郕邽 郋邽迮 " +"迮迣郋).\n" + +#: src/passwd.c:287 +msgid "They don't match; try again.\n" +msgstr "郇邽 郇迮 郋赲郈訄迡訄; 郈郋郈郋訇邿迮 迮迮 訄郱.\n" + +#: src/passwd.c:364 src/passwd.c:382 +#, c-format +msgid "The password for %s cannot be changed.\n" +msgstr "訄郋郅 迡郅 %s 邽郱邾迮郇邽 郇迮郅郱.\n" + +#: src/passwd.c:396 +#, c-format +msgid "Sorry, the password for %s cannot be changed yet.\n" +msgstr "郱赲邽郇邽迮, 郈訄郋郅 迡郅 %s 郈郋郕訄 邽郱邾迮郇邽 郇迮郅郱.\n" + +#: src/passwd.c:479 +#, c-format +msgid "%s: out of memory\n" +msgstr "%s: 郇迮赲訄郕訄 郈訄邾邽\n" + +#: src/passwd.c:730 +#, c-format +msgid "%s: Cannot execute %s" +msgstr "%s: 迮 邾郋迣 邽郈郋郅郇邽 %s" + +#: src/passwd.c:815 +#, c-format +msgid "%s: repository %s not supported\n" +msgstr "%s: 訄郇邽郅邽迮 %s 郇迮 郈郋迡迡迮迠邽赲訄迮\n" + +#: src/passwd.c:890 +#, c-format +msgid "%s: Permission denied\n" +msgstr "%s: 郋郈 郱訄郈迮迮郇\n" + +#: src/passwd.c:914 +#, c-format +msgid "You may not change the password for %s.\n" +msgstr " 郇迮 邾郋迠迮迮 邽郱邾迮郇邽 郈訄郋郅 迡郅 %s.\n" + +#: src/passwd.c:962 +#, c-format +msgid "Changing password for %s\n" +msgstr "郱邾迮郇迮邾 郈訄郋郅 迡郅 %s\n" + +#: src/passwd.c:966 +#, c-format +msgid "The password for %s is unchanged.\n" +msgstr "訄郋郅 迡郅 %s 邽郱邾迮郇迮郇.\n" + +#: src/passwd.c:1016 +msgid "Password changed.\n" +msgstr "訄郋郅 邽郱邾迮郇迮郇.\n" + +#: src/pwck.c:87 +#, fuzzy, c-format +msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" +msgstr "訄郈郕: %s [-qr] [passwd [shadow]]\n" + +#: src/pwck.c:90 +#, fuzzy, c-format +msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" +msgstr "訄郈郕: %s [-qr] [passwd]\n" + +#: src/pwck.c:295 +msgid "invalid password file entry\n" +msgstr "郇迮赲迮郇訄 郱訄郈邽 赲 訄邿郅迮 郈訄郋郅迮邿\n" + +#: src/pwck.c:357 +msgid "duplicate password entry\n" +msgstr "迡訇郅邽訄 郱訄郈邽 郈訄郋郅\n" + +#: src/pwck.c:373 +#, fuzzy, c-format +msgid "invalid user name '%s'\n" +msgstr "郇迮赲迮郇郋迮 邽邾 郈郋郅郱郋赲訄迮郅 `%s'\n" + +#: src/pwck.c:388 +#, fuzzy, c-format +msgid "user %s: no group %u\n" +msgstr "郈郋郅郱郋赲訄迮郅 %s: 郇迮 迣郈郈 %d\n" + +#: src/pwck.c:404 +#, c-format +msgid "user %s: directory %s does not exist\n" +msgstr "郈郋郅郱郋赲訄迮郅 %s: 郕訄訄郅郋迣 %s 郇迮 迮赲迮\n" + +#: src/pwck.c:420 +#, c-format +msgid "user %s: program %s does not exist\n" +msgstr "郈郋郅郱郋赲訄迮郅 %s: 郈郋迣訄邾邾訄 %s 郇迮 迮赲迮\n" + +#: src/pwck.c:456 +msgid "invalid shadow password file entry\n" +msgstr "郇迮赲迮郇訄 郱訄郈邽 赲 shadow-訄邿郅迮 郈訄郋郅迮邿\n" + +#: src/pwck.c:518 +msgid "duplicate shadow password entry\n" +msgstr "迡訇郅邽訄 郱訄郈邽 赲 shadow-訄邿郅迮 郈訄郋郅迮邿\n" + +#: src/pwck.c:542 +msgid "no matching password file entry\n" +msgstr "郋郋赲迮赲迮邿 郱訄郈邽邽 赲 訄邿郅迮 郈訄郋郅迮邿 郇迮\n" + +#: src/pwck.c:560 +#, c-format +msgid "user %s: last password change in the future\n" +msgstr "郈郋郅郱郋赲訄迮郅 %s: 郈郋郅迮迡郇迮迮 邽郱邾迮郇迮郇邽迮 郈訄郋郅 赲 訇迡迮邾\n" + +#: src/pwconv.c:85 src/pwunconv.c:79 +#, c-format +msgid "%s: can't lock passwd file\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 郈訄郋郅迮邿\n" + +#: src/pwconv.c:90 src/pwunconv.c:84 +#, c-format +msgid "%s: can't open passwd file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 郈訄郋郅迮邿\n" + +#: src/pwconv.c:118 +#, c-format +msgid "%s: can't remove shadow entry for %s\n" +msgstr "%s: 郇迮 邾郋迣 迡訄郅邽 shadow-郱訄郈邽 迡郅 %s\n" + +#: src/pwconv.c:164 +#, c-format +msgid "%s: can't update passwd entry for %s\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 郈訄郋郅 迡郅 %s\n" + +#: src/pwconv.c:171 +#, c-format +msgid "%s: can't update shadow file\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-訄邿郅\n" + +#: src/pwconv.c:176 +#, c-format +msgid "%s: can't update passwd file\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 郈訄郋郅迮邿\n" + +#: src/pwunconv.c:124 +#, c-format +msgid "%s: can't update entry for user %s\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 迡郅 郈郋郅郱郋赲訄迮郅 %s\n" + +#: src/pwunconv.c:145 +#, c-format +msgid "%s: can't delete shadow password file\n" +msgstr "%s: 郇迮 邾郋迣 迡訄郅邽 shadow-訄邿郅 郈訄郋郅迮邿\n" + +#: src/su.c:133 +msgid "Sorry." +msgstr "郱赲邽郇邽迮." + +#: src/su.c:216 +#, c-format +msgid "%s: must be run from a terminal\n" +msgstr "%s: 迡郋郅迠郇郋 訇 郱訄郈迮郇郋 迮邾邽郇訄郅訄\n" + +#: src/su.c:306 +#, c-format +msgid "%s: pam_start: error %d\n" +msgstr "%s: pam_start: 郋邽訇郕訄 %d\n" + +#: src/su.c:336 +#, c-format +msgid "Unknown id: %s\n" +msgstr "迮邽郱赲迮郇邿 id: %s\n" + +#: src/su.c:373 src/su.c:390 +#, c-format +msgid "You are not authorized to su %s\n" +msgstr "訄邾 郇迮 訄郱迮迮郇郋 迡迮郅訄 su %s\n" + +#: src/su.c:385 +msgid "(Enter your own password.)" +msgstr "(赲迮迡邽迮 赲訄 郋訇赲迮郇郇邿 郈訄郋郅.)" + +#: src/su.c:419 +#, c-format +msgid "" +"%s: %s\n" +"(Ignored)\n" +msgstr "" +"%s: %s\n" +"(迣郇郋邽郋赲訄郇郋)\n" + +#: src/su.c:609 +msgid "No shell\n" +msgstr "迮 迮郅郅訄\n" + +#: src/suauth.c:105 +msgid "Access to su to that account DENIED.\n" +msgstr "郋郈 郕 su 郋迣郋 訄郕郕訄郇訄 虳.\n" + +#: src/suauth.c:113 +msgid "Password authentication bypassed.\n" +msgstr "迮郇邽郕訄邽 郈郋 郈訄郋郅 郈郋郈迮郇訄.\n" + +#: src/suauth.c:122 +msgid "Please enter your OWN password as authentication.\n" +msgstr "赲迮迡邽迮 赲訄 苤苤苠衎 郈訄郋郅 迡郅 訄迮郇邽郕訄邽邽.\n" + +#: src/sulogin.c:118 +msgid "No password file\n" +msgstr "迮 訄邿郅訄 郈訄郋郅迮邿\n" + +#: src/sulogin.c:160 +msgid "No password entry for 'root'\n" +msgstr "迮 郱訄郈邽邽 郈訄郋郅 迡郅 'root'\n" + +#: src/sulogin.c:176 +msgid "" +"\n" +"Type control-d to proceed with normal startup,\n" +"(or give root password for system maintenance):" +msgstr "" +"\n" +"赲迮迡邽迮 control-d 迡郅 郈郋迡郋郅迠迮郇邽 郇郋邾訄郅郇郋邿 郱訄迣郱郕邽,\n" +"(邽郅邽 郈訄郋郅 root'訄 迡郅 郋訇郅迠邽赲訄郇邽 邽迮邾):" + +#: src/sulogin.c:212 +msgid "Entering System Maintenance Mode\n" +msgstr "郋迡 赲 迮迠邽邾 郋訇郅迠邽赲訄郇邽 邽迮邾\n" + +#: src/useradd.c:234 +#, c-format +msgid "%s: rebuild the group database\n" +msgstr "%s: 郈迮迮郋迮郇邽迮 訇訄郱 迡訄郇郇 迣郈郈\n" + +#: src/useradd.c:243 +#, c-format +msgid "%s: rebuild the shadow group database\n" +msgstr "%s: 郈迮迮郋迮郇邽迮 訇訄郱 迡訄郇郇 shadow-迣郈郈\n" + +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 +#, c-format +msgid "%s: invalid numeric argument `%s'\n" +msgstr "%s: 郇迮赲迮郇邿 邽郅郋赲郋邿 訄迣邾迮郇 `%s'\n" + +#: src/useradd.c:349 +#, c-format +msgid "%s: unknown gid %s\n" +msgstr "%s: 郇迮邽郱赲迮郇邿 gid %s\n" + +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 +#, c-format +msgid "%s: unknown group %s\n" +msgstr "%s: 郇迮邽郱赲迮郇訄 迣郈郈訄 %s\n" + +#: src/useradd.c:419 +#, fuzzy, c-format +msgid "GROUP=%u\n" +msgstr "GROUP=%ld\n" + +#: src/useradd.c:420 +#, c-format +msgid "HOME=%s\n" +msgstr "HOME=%s\n" + +#: src/useradd.c:422 +#, c-format +msgid "INACTIVE=%ld\n" +msgstr "INACTIVE=%ld\n" + +#: src/useradd.c:423 +#, c-format +msgid "EXPIRE=%s\n" +msgstr "EXPIRE=%s\n" + +#: src/useradd.c:425 +#, c-format +msgid "SHELL=%s\n" +msgstr "SHELL=%s\n" + +#: src/useradd.c:426 +#, c-format +msgid "SKEL=%s\n" +msgstr "SKEL=%s\n" + +#: src/useradd.c:462 +#, c-format +msgid "%s: cannot create new defaults file\n" +msgstr "%s: 郇迮 邾郋迣 郋郱迡訄 郇郋赲邿 訄邿郅 邾郋郅訄郇邽邿\n" + +#: src/useradd.c:467 +#, fuzzy, c-format +msgid "%s: cannot open new defaults file\n" +msgstr "%s: 郇迮 邾郋迣 郋郱迡訄 郇郋赲邿 訄邿郅 邾郋郅訄郇邽邿\n" + +#: src/useradd.c:552 src/useradd.c:564 +#, c-format +msgid "%s: rename: %s" +msgstr "%s: 郈迮迮邽邾迮郇郋赲訄郇邽迮: %s" + +#: src/useradd.c:657 src/usermod.c:265 +#, c-format +msgid "%s: group `%s' is a NIS group.\n" +msgstr "%s: 迣郈郈訄 `%s' - 迣郈郈訄 NIS.\n" + +#: src/useradd.c:666 src/usermod.c:274 +#, c-format +msgid "%s: too many groups specified (max %d).\n" +msgstr "%s: 郱訄迡訄郇郋 郅邽郕郋邾 邾郇郋迣郋 迣郈郈 (邾訄郕. %d).\n" + +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "郱訄郈郕: useradd [-u uid [-o]] [-g 迣郈郈訄] [-G 迣郈郈訄,...] \n" + +#: src/useradd.c:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" +msgstr " [-d 迡郋邾.] [-s 迮郅郅] [-c 郕郋邾邾迮郇.] [-m [-k 訄訇郅郋郇]]\n" + +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" +msgstr " [-f 郇迮訄郕邽赲郇.] [-e 邽迮郕訄迮]\n" + +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" +msgstr " useradd -D [-g 迣郈郈訄] [-b 訇訄郱訄] [-s 迮郅郅]\n" + +#: src/useradd.c:793 src/usermod.c:461 +#, c-format +msgid "%s: error locking group file\n" +msgstr "%s: 郋邽訇郕訄 訇郅郋郕邽郋赲郕邽 訄邿郅訄 迣郈郈\n" + +#: src/useradd.c:798 src/usermod.c:467 +#, c-format +msgid "%s: error opening group file\n" +msgstr "%s: 郋邽訇郕訄 郋郕邽 訄邿郅訄 迣郈郈\n" + +#: src/useradd.c:805 src/usermod.c:578 +#, c-format +msgid "%s: error locking shadow group file\n" +msgstr "%s: 郋邽訇郕訄 訇郅郋郕邽郋赲郕邽 shadow-訄邿郅訄 迣郈郈\n" + +#: src/useradd.c:810 src/usermod.c:584 +#, c-format +msgid "%s: error opening shadow group file\n" +msgstr "%s: 郋邽訇郕訄 郋郕邽 shadow-訄邿郅訄 迣郈郈\n" + +#: src/useradd.c:982 +#, fuzzy, c-format +msgid "%s: uid %u is not unique\n" +msgstr "%s: uid %d 郇迮 郇邽郕訄郅迮郇\n" + +#: src/useradd.c:1012 +#, c-format +msgid "%s: can't get unique uid\n" +msgstr "%s: 郇迮 邾郋迣 郈郋郅邽 郇邽郕訄郅郇邿 uid\n" + +#: src/useradd.c:1049 +#, c-format +msgid "%s: invalid base directory `%s'\n" +msgstr "%s: 郇迮赲迮郇邿 訇訄郱郋赲邿 郕訄訄郅郋迣 `%s'\n" + +#: src/useradd.c:1059 +#, c-format +msgid "%s: invalid comment `%s'\n" +msgstr "%s: 郇迮赲迮郇邿 郕郋邾邾迮郇訄邽邿 `%s'\n" + +#: src/useradd.c:1070 +#, c-format +msgid "%s: invalid home directory `%s'\n" +msgstr "%s: 郇迮赲迮郇邿 迡郋邾訄郇邽邿 郕訄訄郅郋迣 `%s'\n" + +#: src/useradd.c:1089 src/usermod.c:858 +#, c-format +msgid "%s: invalid date `%s'\n" +msgstr "%s: 郇迮赲迮郇訄 迡訄訄 `%s'\n" + +#: src/useradd.c:1102 +#, c-format +msgid "%s: shadow passwords required for -e\n" +msgstr "%s: 迡郅 -e 迮訇 shadow-郈訄郋郅邽\n" + +#: src/useradd.c:1118 +#, c-format +msgid "%s: shadow passwords required for -f\n" +msgstr "%s: 迡郅 -f 迮訇 shadow-郈訄郋郅邽\n" + +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: 郇迮赲迮郇郋迮 郈郋郅迮 `%s'\n" + +#: src/useradd.c:1196 +#, c-format +msgid "%s: invalid shell `%s'\n" +msgstr "%s: 郇迮赲迮郇邿 迮郅郅 `%s'\n" + +#: src/useradd.c:1237 +#, fuzzy, c-format +msgid "%s: invalid user name '%s'\n" +msgstr "%s: 郇迮赲迮郇郋迮 邽邾 郈郋郅郱郋赲訄迮郅 `%s'\n" + +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 +#, c-format +msgid "%s: cannot rewrite password file\n" +msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅 郈訄郋郅迮邿\n" + +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 +#, c-format +msgid "%s: cannot rewrite shadow password file\n" +msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 shadow-訄邿郅 郈訄郋郅迮邿\n" + +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 +#, c-format +msgid "%s: unable to lock password file\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 郈訄郋郅迮邿\n" + +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 +#, c-format +msgid "%s: unable to open password file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 郈訄郋郅迮邿\n" + +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 +#, c-format +msgid "%s: cannot lock shadow password file\n" +msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 shadow-訄邿郅 郈訄郋郅迮邿\n" + +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 +#, c-format +msgid "%s: cannot open shadow password file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 shadow-訄邿郅 郈訄郋郅迮邿\n" + +#: src/useradd.c:1435 +#, c-format +msgid "%s: error adding new password entry\n" +msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 郇郋赲郋邿 郱訄郈邽邽 郈訄郋郅\n" + +#: src/useradd.c:1449 +#, c-format +msgid "%s: error updating password dbm entry\n" +msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" + +#: src/useradd.c:1465 src/usermod.c:1151 +#, c-format +msgid "%s: error adding new shadow password entry\n" +msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 郇郋赲郋邿 shadow-郱訄郈邽邽 郈訄郋郅\n" + +#: src/useradd.c:1481 src/usermod.c:1168 +#, c-format +msgid "%s: error updating shadow passwd dbm entry\n" +msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 shadow-郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" + +#: src/useradd.c:1513 +#, c-format +msgid "%s: cannot create directory %s\n" +msgstr "%s: 郇迮 邾郋迣 郋郱迡訄 郕訄訄郅郋迣 %s\n" + +#: src/useradd.c:1634 src/usermod.c:981 +#, c-format +msgid "%s: user %s exists\n" +msgstr "%s: 郈郋郅郱郋赲訄迮郅 %s 迠迮 迮赲迮\n" + +#: src/useradd.c:1649 +#, c-format +msgid "" +"%s: group %s exists - if you want to add this user to that group, use -g.\n" +msgstr "" + +#: src/useradd.c:1687 +#, c-format +msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" +msgstr "%s: 郈迮迡郈迮迠迡迮郇邽迮: CREATE_HOME 郇迮 郈郋迡迡迮迠邽赲訄迮, 邽郈郋郅郱邿迮 -m.\n" + +#: src/userdel.c:124 +#, fuzzy, c-format +msgid "Usage: %s [-r] name\n" +msgstr "郱訄郈郕: %s [-r] 邽邾\n" + +#: src/userdel.c:176 src/userdel.c:262 +#, c-format +msgid "%s: error updating group entry\n" +msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 郱訄郈邽邽 迣郈郈\n" + +#: src/userdel.c:186 src/userdel.c:271 +#, c-format +msgid "%s: cannot update dbm group entry\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 訇訄郱 迡訄郇郇 迣郈郈\n" + +#: src/userdel.c:214 +#, fuzzy, c-format +msgid "%s: cannot remove dbm group entry\n" +msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 訇訄郱 迡訄郇郇 迣郈郈\n" + +#: src/userdel.c:379 +#, c-format +msgid "%s: cannot open group file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 迣郈郈\n" + +#: src/userdel.c:390 +#, c-format +msgid "%s: cannot open shadow group file\n" +msgstr "%s: 郇迮 邾郋迣 郋郕 shadow-訄邿郅 迣郈郈\n" + +#: src/userdel.c:408 +#, c-format +msgid "%s: error deleting password entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 郈訄郋郅\n" + +#: src/userdel.c:412 +#, c-format +msgid "%s: error deleting shadow password entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 郈訄郋郅\n" + +#: src/userdel.c:421 +#, c-format +msgid "%s: error deleting password dbm entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" + +#: src/userdel.c:440 +#, c-format +msgid "%s: error deleting shadow passwd dbm entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" + +#: src/userdel.c:484 +#, c-format +msgid "%s: user %s is currently logged in\n" +msgstr "%s: 郈郋郅郱郋赲訄迮郅 %s 赲 郇訄郋迮迮 赲迮邾 赲 邽迮邾迮\n" + +#: src/userdel.c:594 +#, c-format +msgid "%s: warning: %s not owned by %s, not removing\n" +msgstr "%s: 郈迮迡郈迮迠迡迮郇邽迮: %s 郇迮 郈邽郇訄迡郅迮迠邽 %s, 郇迮 迡訄郅\n" + +#: src/userdel.c:600 +#, c-format +msgid "%s: warning: can't remove " +msgstr "%s: 郈迮迡郈迮迠迡迮郇邽迮: 郇迮 邾郋迣 迡訄郅邽 " + +#: src/userdel.c:703 src/usermod.c:783 +#, c-format +msgid "%s: user %s does not exist\n" +msgstr "%s: 郈郋郅郱郋赲訄迮郅 %s 郇迮 迮赲迮\n" + +#: src/userdel.c:718 src/usermod.c:799 +#, c-format +msgid "%s: user %s is a NIS user\n" +msgstr "%s: 郈郋郅郱郋赲訄迮郅 %s - 郈郋郅郱郋赲訄迮郅 NIS\n" + +#: src/userdel.c:756 +#, c-format +msgid "%s: %s not owned by %s, not removing\n" +msgstr "%s: %s 郇迮 郈邽郇訄迡郅迮迠邽 %s, 郇迮 迡訄郅\n" + +#: src/userdel.c:779 +#, c-format +msgid "%s: not removing directory %s (would remove home of user %s)\n" +msgstr "%s: 郇迮 迡訄郅 郕訄訄郅郋迣 %s (郈迮迡郈郋郅訄迣訄郅郋 迡訄郅迮郇邽迮 郕訄訄郅郋迣訄 郱迮訄 %s)\n" + +#: src/userdel.c:793 +#, c-format +msgid "%s: error removing directory %s\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郕訄訄郅郋迣訄 %s\n" + +#: src/usermod.c:306 +#, fuzzy, c-format +msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "郱訄郈郕: %s\t[-u uid [-o]] [-g 迣郈郈訄] [-G 迣郈郈訄,...] \n" + +#: src/usermod.c:310 +msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" +msgstr "\t\t[-d 迡郋邾. [-m]] [-s 迮郅郅] [-c 郕郋邾邾迮郇.t] [-l 郇郋赲郋迮_邽邾]\n" + +#: src/usermod.c:313 +#, fuzzy +msgid "[-f inactive] [-e expire] " +msgstr "[-f 郇迮訄郕邽赲郇.] [-e 邽迮郕訄迮] " + +#: src/usermod.c:315 +msgid "[-p passwd] [-L|-U] name\n" +msgstr "[-p 郈訄郋郅] [-L|-U] 邽邾\n" + +#: src/usermod.c:495 +#, c-format +msgid "%s: out of memory in update_group\n" +msgstr "%s: 郇迮赲訄郕訄 郈訄邾邽 赲 update_group\n" + +#: src/usermod.c:622 +#, c-format +msgid "%s: out of memory in update_gshadow\n" +msgstr "%s: 郇迮赲訄郕訄 郈訄邾邽 赲 update_gshadow\n" + +#: src/usermod.c:958 +#, c-format +msgid "%s: no flags given\n" +msgstr "%s: 郋郈邽邽 郇迮 郱訄迡訄郇\n" + +#: src/usermod.c:965 +#, c-format +msgid "%s: shadow passwords required for -e and -f\n" +msgstr "%s: 迡郅 -e 邽 -f 迮訇 shadow-郈訄郋郅邽\n" + +#: src/usermod.c:987 +#, fuzzy, c-format +msgid "%s: uid %lu is not unique\n" +msgstr "%s: uid %ld 郇迮 郇邽郕訄郅迮郇\n" + +#: src/usermod.c:1116 +#, c-format +msgid "%s: error changing password entry\n" +msgstr "%s: 郋邽訇郕訄 邽郱邾迮郇迮郇邽 郱訄郈邽邽 郈訄郋郅\n" + +#: src/usermod.c:1122 +#, c-format +msgid "%s: error removing password entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 郈訄郋郅\n" + +#: src/usermod.c:1131 +#, c-format +msgid "%s: error adding password dbm entry\n" +msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 郱訄郈邽邽 郈訄郋郅\n" + +#: src/usermod.c:1139 +#, c-format +msgid "%s: error removing passwd dbm entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" + +#: src/usermod.c:1158 +#, c-format +msgid "%s: error removing shadow password entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 郈訄郋郅\n" + +#: src/usermod.c:1175 +#, c-format +msgid "%s: error removing shadow passwd dbm entry\n" +msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" + +#: src/usermod.c:1204 +#, c-format +msgid "%s: directory %s exists\n" +msgstr "%s: 郕訄訄郅郋迣 %s 迠迮 迮赲迮\n" + +#: src/usermod.c:1213 +#, c-format +msgid "%s: can't create %s\n" +msgstr "%s: 郇迮 邾郋迣 郋郱迡訄 %s\n" + +#: src/usermod.c:1219 +#, c-format +msgid "%s: can't chown %s\n" +msgstr "%s: 郇迮 邾郋迣 迡迮郅訄 chown %s\n" + +#: src/usermod.c:1236 +#, c-format +msgid "%s: cannot rename directory %s to %s\n" +msgstr "%s: 郇迮 邾郋迣 郈迮迮邽邾迮郇郋赲訄 郕訄訄郅郋迣 %s 赲 %s\n" + +#: src/usermod.c:1333 +#, c-format +msgid "%s: warning: %s not owned by %s\n" +msgstr "%s: 郈迮迡郈迮迠迡迮郇邽迮 %s 郇迮 郈邽郇訄迡郅迮迠邽 %s\n" + +#: src/usermod.c:1339 +msgid "failed to change mailbox owner" +msgstr "郇迮迡訄訄 邽郱邾迮郇迮郇邽 郈邽郇訄迡郅迮迠郇郋邽 郈郋郋赲郋迣郋 邽郕訄" + +#: src/usermod.c:1347 +msgid "failed to rename mailbox" +msgstr "郇迮迡訄訄 郈迮迮邽邾迮郇郋赲訄郇邽 郈郋郋赲郋迣郋 邽郕訄" + +#: src/vipw.c:105 +#, c-format +msgid "" +"\n" +"%s: %s is unchanged\n" +msgstr "" +"\n" +"%s: %s 邽郱邾迮郇迮郇郋\n" + +#: src/vipw.c:133 +msgid "Couldn't lock file" +msgstr "迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅" + +#: src/vipw.c:142 +msgid "Couldn't make backup" +msgstr "迮 邾郋迣 郋郱迡訄 迮郱迮赲郇 郕郋郈邽" + +#: src/vipw.c:200 +#, c-format +msgid "%s: can't restore %s: %s (your changes are in %s)\n" +msgstr "%s: 郇迮 邾郋迣 赲郋訄郇郋赲邽 %s: %s (赲訄邽 邽郱邾迮郇迮郇邽 赲 %s)\n" + +#: src/vipw.c:238 +msgid "" +"Usage:\n" +"`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" +"`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" +msgstr "" +"訄郈郕:\n" +"`vipw' 郈訄赲邽 /etc/passwd `vipw -s' 郈訄赲邽 /etc/shadow\n" +"`vigr' 郈訄赲邽 /etc/group `vigr -s' 郈訄赲邽 /etc/gshadow\n" + +#, fuzzy +#~ msgid "Can't create mail spool for user %s.\n" +#~ msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 迡郅 郈郋郅郱郋赲訄迮郅 %s\n" + +#~ msgid "User %s has a TCFS key, his old password is required.\n" +#~ msgstr "郋郅郱郋赲訄迮郅 %s 邽邾迮迮 郕郅 TCFS, 迮訇迮 迮迣郋 訄邿 郈訄郋郅.\n" + +#~ msgid "You can use -t option to force the change.\n" +#~ msgstr "郋迠郇郋 邽郈郋郅郱郋赲訄 郋郈邽 -t 迡郅 郈邽郇迡邽迮郅郇郋迣郋 邽郱邾迮郇迮郇邽.\n" + +#~ msgid "Warning: user %s has a TCFS key.\n" +#~ msgstr "迮迡郈迮迠迡迮郇邽迮: 郈郋郅郱郋赲訄迮郅 %s 邽邾迮迮 郕郅 TCFS.\n" + +#~ msgid "Cannot lock the TCFS key database; try again later\n" +#~ msgstr "迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訇訄郱 迡訄郇郇 郕郅迮邿 TCFS; 郈郋郈郋訇邿迮 郈郋郱迠迮\n" + +#~ msgid "Cannot open the TCFS key database.\n" +#~ msgstr "迮 邾郋迣 郋郕 訇訄郱 迡訄郇郇 郕郅迮邿 TCFS.\n" + +#~ msgid "Error updating the TCFS key database.\n" +#~ msgstr "邽訇郕訄 郋訇郇郋赲郅迮郇邽 訇訄郱 迡訄郇郇 郕郅迮邿 TCFS.\n" + +#~ msgid "Cannot commit TCFS changes.\n" +#~ msgstr "迮 邾郋迣 郱訄郈邽訄 邽郱邾迮郇迮郇邽 TCFS.\n" + +#~ msgid "%s: cannot rewrite TCFS key file\n" +#~ msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅 郕郅迮邿 TCFS\n" + +#~ msgid "%s: cannot lock TCFS key file\n" +#~ msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 郕郅迮邿 TCFS\n" + +#~ msgid "%s: cannot open TCFS key file\n" +#~ msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 郕郅迮邿 TCFS\n" + +#~ msgid "%s: error deleting TCFS entry\n" +#~ msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 TCFS\n" + +#~ msgid " [-f inactive] [-e expire]" +#~ msgstr " [-f 郇迮訄郕邽赲郇.] [-e 邽迮郕訄迮]" + +#~ msgid "%s: error deleting authentication\n" +#~ msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 訄迮郇邽郕訄邽邽\n" + +#, fuzzy +#~ msgid "[-A {DEFAULT|program},...] " +#~ msgstr "[-A {DEFAULT|郈郋迣訄邾邾訄},...] " + +#~ msgid "%s: error deleting authentication method\n" +#~ msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 邾迮郋迡訄 訄迮郇邽郕訄邽邽\n" + +#~ msgid "%s: error adding authentication method\n" +#~ msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 邾迮郋迡訄 訄迮郇邽郕訄邽邽\n" + +#~ msgid "%s: error changing authentication method\n" +#~ msgstr "%s: 郋邽訇郕訄 邽郱邾迮郇迮郇邽 邾迮郋迡訄 訄迮郇邽郕訄邽邽\n" + +#~ msgid "[-A program] " +#~ msgstr "[-A 郈郋迣訄邾邾訄] " + +#~ msgid "[-p passwd] name\n" +#~ msgstr "[-p 郈訄郋郅] 邽邾\n" + +#~ msgid "error - lookup '%s' failed\n" +#~ msgstr "郋邽訇郕訄 - 郈郋邽郕 '%s' 郇迮 迡訄郅\n" + +#~ msgid "%s not found\n" +#~ msgstr "%s 郇迮 郇訄邿迡迮郇郋\n" + +#~ msgid "%s: not configured for shadow group support.\n" +#~ msgstr "%s: 郇迮 郇訄郋迮郇郋 迡郅 郈郋迡迡迮迠郕邽 shadow-迣郈郈.\n" + +#~ msgid "%s: Shadow passwords are not configured.\n" +#~ msgstr "%s: Shadow-郈訄郋郅邽 郇迮 郇訄郋迮郇.\n" + +#, fuzzy +#~ msgid "Usage: %s [-l] user\n" +#~ msgstr "郱訄郈郕: %s [-e]\n" + +#~ msgid "Executing shell %s\n" +#~ msgstr "郈郋郅郇 迮郅郅 %s\n" + +#~ msgid "Dialup Password: " +#~ msgstr "Dialup-郈訄郋郅: " + +#, fuzzy +#~ msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" +#~ msgstr "訄郈郕: %s [-l] [-m 邾邽郇_迡郇迮邿] [-M 邾訄郕_迡郇迮邿] [-d 郈郋郅_迡迮郇] 郱迮\n" + +#, fuzzy +#~ msgid "Usage: %s [-(a|d)] shell\n" +#~ msgstr "訄郈郕: %s [-(a|d)] 迮郅郅\n" + +#~ msgid "Shell password: " +#~ msgstr "訄郋郅 迮郅郅訄: " + +#~ msgid "re-enter Shell password: " +#~ msgstr "迮迮 訄郱 郈訄郋郅 迮郅郅訄: " + +#~ msgid "%s: Passwords do not match, try again.\n" +#~ msgstr "%s: 訄郋郅邽 郇迮 郋赲郈訄迡訄, 郈郋郈郋訇邿迮 郇郋赲訄.\n" + +#~ msgid "%s: can't create %s" +#~ msgstr "%s: 郇迮 邾郋迣 郋郱迡訄 %s" + +#~ msgid "%s: can't open %s" +#~ msgstr "%s: 郇迮 邾郋迣 郋郕 %s" + +#~ msgid "%s: Shell %s not found.\n" +#~ msgstr "%s: 虼迮郅郅 %s 郇迮 郇訄邿迡迮郇.\n" + +#, fuzzy +#~ msgid "group=%s,%u basedir=%s skel=%s\n" +#~ msgstr "迣郈郈訄=%s,%ld 郕訄訄郅郋迣=%s 訄訇郅郋郇=%s\n" + +#~ msgid "shell=%s " +#~ msgstr "迮郅郅=%s " + +#~ msgid "inactive=%ld expire=%s" +#~ msgstr "郇迮訄郕邽赲郇邿=%ld 邽迮郕訄迮=%s" + +#~ msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +#~ msgstr "郱訄郈郕: %s\t[-u uid [-o]] [-g 迣郈郈訄] [-G 迣郈郈訄,...] \n" + +#~ msgid "%s: no aging information present\n" +#~ msgstr "%s: 邽郇郋邾訄邽 郋 赲迮邾迮郇邽 迡迮邿赲邽 郋赲迮\n" + +#~ msgid "group %s: bad GID (%d)\n" +#~ msgstr "迣郈郈訄 %s: 郇迮赲迮郇邿 GID (%d)\n" + +#~ msgid "uid=%d(%s)" +#~ msgstr "uid=%d(%s)" + +#~ msgid "uid=%d" +#~ msgstr "uid=%d" + +#~ msgid " gid=%d(%s)" +#~ msgstr " gid=%d(%s)" + +#~ msgid " gid=%d" +#~ msgstr " gid=%d" + +#~ msgid " euid=%d(%s)" +#~ msgstr " euid=%d(%s)" + +#~ msgid " euid=%d" +#~ msgstr " euid=%d" + +#~ msgid " egid=%d(%s)" +#~ msgstr " egid=%d(%s)" + +#~ msgid " egid=%d" +#~ msgstr " egid=%d" + +#~ msgid "unknown gid: %d\n" +#~ msgstr "郇迮邽郱赲迮郇邿 gid: %d\n" + +#~ msgid "usage: %s [-f | -s] [name]\n" +#~ msgstr "郱訄郈郕: %s [-f | -s] [邽邾]\n" + +#~ msgid "user %s: bad UID (%d)\n" +#~ msgstr "郈郋郅郱郋赲訄迮郅 %s: 郇迮赲迮郇邿 UID (%d)\n" + +#~ msgid "%s: permission denied (shell).\n" +#~ msgstr "%s: 迡郋郈 郱訄郈迮迮郇 (迮郅郅).\n" diff --git a/po/shadow.pot b/po/shadow.pot index 5b0ae118..0d255fa6 100644 --- a/po/shadow.pot +++ b/po/shadow.pot @@ -1,12 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-03-12 12:16+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,186 +16,159 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: libmisc/addgrps.c:60 +#: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "" -#: libmisc/addgrps.c:71 +#: libmisc/addgrps.c:68 msgid "Warning: too many groups\n" msgstr "" -#: libmisc/age.c:77 +#: libmisc/age.c:72 msgid "Your password has expired." msgstr "" -#: libmisc/age.c:80 +#: libmisc/age.c:75 msgid "Your password is inactive." msgstr "" -#: libmisc/age.c:83 +#: libmisc/age.c:78 msgid "Your login has expired." msgstr "" -#: libmisc/age.c:96 +#: libmisc/age.c:90 msgid " Contact the system administrator.\n" msgstr "" -#: libmisc/age.c:99 +#: libmisc/age.c:93 msgid " Choose a new password.\n" msgstr "" -#: libmisc/age.c:176 +#: libmisc/age.c:168 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "" -#: libmisc/age.c:178 +#: libmisc/age.c:172 msgid "Your password will expire tomorrow.\n" msgstr "" -#: libmisc/age.c:180 +#: libmisc/age.c:174 msgid "Your password will expire today.\n" msgstr "" -#: libmisc/chowntty.c:113 +#: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" msgstr "" -#: libmisc/env.c:160 +#: libmisc/env.c:155 msgid "Environment overflow\n" msgstr "" -#: libmisc/env.c:200 +#: libmisc/env.c:195 #, c-format msgid "You may not change $%s\n" msgstr "" -#: libmisc/failure.c:238 +#: libmisc/failure.c:230 #, c-format msgid "%d %s since last login. Last was %s on %s.\n" msgstr "" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failures" msgstr "" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failure" msgstr "" -#: libmisc/limits.c:397 +#: libmisc/limits.c:396 msgid "Too many logins.\n" msgstr "" -#: libmisc/login_desrpc.c:63 +#: libmisc/login_desrpc.c:59 #, c-format msgid "Password does not decrypt secret key for %s.\n" msgstr "" -#: libmisc/login_desrpc.c:69 +#: libmisc/login_desrpc.c:66 #, c-format msgid "Could not set %s's secret key: is the keyserv daemon running?\n" msgstr "" -#: libmisc/mail.c:62 libmisc/mail.c:77 +#: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "" -#: libmisc/mail.c:73 +#: libmisc/mail.c:72 msgid "No mail." msgstr "" -#: libmisc/mail.c:75 +#: libmisc/mail.c:74 msgid "You have mail." msgstr "" -#: libmisc/obscure.c:281 src/passwd.c:244 +#: libmisc/obscure.c:271 src/passwd.c:183 #, c-format msgid "Bad password: %s. " msgstr "" -#: libmisc/pam_pass.c:42 +#: libmisc/pam_pass.c:38 #, c-format msgid "passwd: pam_start() failed, error %d\n" msgstr "" -#: libmisc/pam_pass.c:49 +#: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" msgstr "" -#: libmisc/setupenv.c:211 +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" +msgstr "" + +#: libmisc/setupenv.c:208 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "" -#: libmisc/setupenv.c:219 +#: libmisc/setupenv.c:216 msgid "No directory, logging in with HOME=/" msgstr "" -#: libmisc/shell.c:78 -#, c-format -msgid "Executing shell %s\n" -msgstr "" - -#. -#. * Obviously something is really wrong - I can't figure out -#. * how to execute this stupid shell, so I might as well give -#. * up in disgust ... -#. -#: libmisc/shell.c:122 +#: libmisc/shell.c:119 #, c-format msgid "Cannot execute %s" msgstr "" -#: libmisc/sub.c:61 +#: libmisc/sub.c:55 #, c-format msgid "Invalid root directory \"%s\"\n" msgstr "" -#: libmisc/sub.c:73 +#: libmisc/sub.c:67 #, c-format msgid "Can't change root directory to \"%s\"\n" msgstr "" -#: libmisc/xmalloc.c:28 +#: libmisc/xmalloc.c:24 #, c-format msgid "malloc(%d) failed\n" msgstr "" -#: lib/dialchk.c:71 -msgid "Dialup Password: " -msgstr "" - -#: lib/getdef.c:276 +#: lib/getdef.c:274 msgid "Could not allocate space for config info.\n" msgstr "" -#. -#. * Item was never found. -#. -#: lib/getdef.c:330 +#: lib/getdef.c:328 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -#: lib/getdef.c:417 -#, c-format -msgid "error - lookup '%s' failed\n" -msgstr "" - -#: lib/getdef.c:425 -#, c-format -msgid "%s not found\n" -msgstr "" - -#. -#. * get the password from her, and set the salt for -#. * the decryption from the group file. -#. -#: lib/pwauth.c:54 src/newgrp.c:348 +#: lib/pwauth.c:54 src/newgrp.c:343 msgid "Password: " msgstr "" @@ -202,7 +177,7 @@ msgstr "" msgid "%s's Password: " msgstr "" -#: lib/pwauth.c:270 +#: lib/pwauth.c:247 msgid "(Echo on) " msgstr "" @@ -211,460 +186,396 @@ msgstr "" msgid "Unknown error %d" msgstr "" -#: src/chage.c:116 -#, c-format +#: src/chage.c:118 msgid "" -"Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" -"\t[-I inactive] [-E expire] [-d last_day] user\n" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -#: src/chage.c:122 -#, c-format -msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" -msgstr "" - -#: src/chage.c:157 +#: src/chage.c:152 msgid "" "Enter the new value, or press ENTER for the default\n" "\n" msgstr "" -#: src/chage.c:160 +#: src/chage.c:155 msgid "Minimum Password Age" msgstr "" -#: src/chage.c:166 +#: src/chage.c:161 msgid "Maximum Password Age" msgstr "" -#: src/chage.c:174 +#: src/chage.c:169 msgid "Last Password Change (YYYY-MM-DD)" msgstr "" -#: src/chage.c:183 +#: src/chage.c:177 msgid "Password Expiration Warning" msgstr "" -#: src/chage.c:189 +#: src/chage.c:183 msgid "Password Inactive" msgstr "" -#: src/chage.c:197 +#: src/chage.c:191 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "" -#. -#. * Start with the easy numbers - the number of days before the -#. * password can be changed, the number of days after which the -#. * password must be chaged, the number of days before the password -#. * expires that the user is told, and the number of days after the -#. * password expires that the account becomes unusable. -#. -#: src/chage.c:248 +#: src/chage.c:241 #, c-format msgid "Minimum:\t%ld\n" msgstr "" -#: src/chage.c:249 +#: src/chage.c:242 #, c-format msgid "Maximum:\t%ld\n" msgstr "" -#: src/chage.c:251 +#: src/chage.c:243 #, c-format msgid "Warning:\t%ld\n" msgstr "" -#: src/chage.c:252 +#: src/chage.c:244 #, c-format msgid "Inactive:\t%ld\n" msgstr "" -#. -#. * The "last change" date is either "Never" or the date the password -#. * was last modified. The date is the number of days since 1/1/1970. -#. -#: src/chage.c:260 +#: src/chage.c:251 msgid "Last Change:\t\t" msgstr "" -#: src/chage.c:262 src/chage.c:276 src/chage.c:293 src/chage.c:306 +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 msgid "Never\n" msgstr "" -#. -#. * The password expiration date is determined from the last change -#. * date plus the number of days the password is valid for. -#. -#: src/chage.c:273 +#: src/chage.c:264 msgid "Password Expires:\t" msgstr "" -#. -#. * The account becomes inactive if the password is expired for more -#. * than "inactdays". The expiration date is calculated and the -#. * number of inactive days is added. The resulting date is when the -#. * active will be disabled. -#. -#: src/chage.c:290 +#: src/chage.c:280 msgid "Password Inactive:\t" msgstr "" -#. -#. * The account will expire on the given date regardless of the -#. * password expiring or not. -#. -#: src/chage.c:304 +#: src/chage.c:294 msgid "Account Expires:\t" msgstr "" -#: src/chage.c:468 +#: src/chage.c:445 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "" -#: src/chage.c:481 src/chage.c:652 src/login.c:518 +#: src/chage.c:458 src/chage.c:588 src/login.c:503 #, c-format msgid "%s: permission denied\n" msgstr "" -#: src/chage.c:512 src/chpasswd.c:139 src/groupadd.c:529 src/groupdel.c:322 -#: src/groupmod.c:520 src/newusers.c:381 src/useradd.c:1754 src/userdel.c:717 -#: src/usermod.c:1732 +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 #, c-format msgid "%s: PAM authentication failed\n" msgstr "" -#: src/chage.c:533 src/chpasswd.c:157 -#, c-format -msgid "%s: can't lock password file\n" -msgstr "" - -#: src/chage.c:544 src/chpasswd.c:162 +#: src/chage.c:510 src/chpasswd.c:159 #, c-format msgid "%s: can't open password file\n" msgstr "" -#: src/chage.c:552 +#: src/chage.c:518 #, c-format msgid "%s: unknown user: %s\n" msgstr "" -#: src/chage.c:571 +#: src/chage.c:536 #, c-format msgid "%s: can't lock shadow password file" msgstr "" -#: src/chage.c:579 +#: src/chage.c:544 #, c-format msgid "%s: can't open shadow password file" msgstr "" -#: src/chage.c:674 +#: src/chage.c:605 #, c-format msgid "Changing the aging information for %s\n" msgstr "" -#: src/chage.c:677 +#: src/chage.c:608 #, c-format msgid "%s: error changing fields\n" msgstr "" -#: src/chage.c:705 src/chage.c:771 src/pwunconv.c:174 +#: src/chage.c:632 src/pwunconv.c:138 #, c-format msgid "%s: can't update password file\n" msgstr "" -#: src/chage.c:737 src/pwunconv.c:168 +#: src/chage.c:661 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "" -#: src/chage.c:789 src/chage.c:805 src/chfn.c:570 src/chsh.c:382 -#: src/passwd.c:747 src/passwd.c:859 +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 msgid "Error updating the DBM password entry.\n" msgstr "" -#: src/chage.c:823 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "" -#: src/chage.c:838 +#: src/chage.c:707 #, c-format msgid "%s: can't rewrite password file\n" msgstr "" -#: src/chage.c:857 src/chpasswd.c:343 src/groupadd.c:590 src/groupdel.c:409 -#: src/groupmod.c:604 src/newusers.c:628 src/useradd.c:1869 src/userdel.c:849 -#: src/usermod.c:1811 +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "" -#: src/chfn.c:83 +#: src/chfn.c:84 #, c-format msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" "\t[-h home_ph] [-o other] [user]\n" msgstr "" -#: src/chfn.c:88 +#: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -#: src/chfn.c:139 +#: src/chfn.c:140 msgid "Enter the new value, or press ENTER for the default\n" msgstr "" -#: src/chfn.c:142 +#: src/chfn.c:143 msgid "Full Name" msgstr "" -#: src/chfn.c:144 +#: src/chfn.c:145 #, c-format msgid "\tFull Name: %s\n" msgstr "" -#: src/chfn.c:147 +#: src/chfn.c:148 msgid "Room Number" msgstr "" -#: src/chfn.c:149 +#: src/chfn.c:150 #, c-format msgid "\tRoom Number: %s\n" msgstr "" -#: src/chfn.c:152 +#: src/chfn.c:153 msgid "Work Phone" msgstr "" -#: src/chfn.c:154 +#: src/chfn.c:155 #, c-format msgid "\tWork Phone: %s\n" msgstr "" -#: src/chfn.c:157 +#: src/chfn.c:158 msgid "Home Phone" msgstr "" -#: src/chfn.c:159 +#: src/chfn.c:160 #, c-format msgid "\tHome Phone: %s\n" msgstr "" -#: src/chfn.c:162 +#: src/chfn.c:163 msgid "Other" msgstr "" -#: src/chfn.c:271 src/chfn.c:281 src/chfn.c:291 src/chfn.c:301 src/chfn.c:311 -#: src/chfn.c:379 src/passwd.c:1115 +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 #, c-format msgid "%s: Permission denied.\n" msgstr "" -#: src/chfn.c:332 src/chsh.c:190 src/passwd.c:1165 +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 #, c-format msgid "%s: Unknown user %s\n" msgstr "" -#: src/chfn.c:341 src/chsh.c:198 src/passwd.c:1096 +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "" -#: src/chfn.c:358 src/chsh.c:215 +#: src/chfn.c:359 src/chsh.c:210 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "" -#: src/chfn.c:366 src/chsh.c:223 +#: src/chfn.c:367 src/chsh.c:218 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "" -#: src/chfn.c:441 +#: src/chfn.c:442 #, c-format msgid "Changing the user information for %s\n" msgstr "" -#: src/chfn.c:450 +#: src/chfn.c:451 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "" -#: src/chfn.c:456 +#: src/chfn.c:457 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "" -#: src/chfn.c:462 +#: src/chfn.c:463 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "" -#: src/chfn.c:468 +#: src/chfn.c:469 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "" -#: src/chfn.c:475 +#: src/chfn.c:476 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "" -#: src/chfn.c:488 +#: src/chfn.c:489 #, c-format msgid "%s: fields too long\n" msgstr "" -#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277 +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 msgid "Cannot change ID to root.\n" msgstr "" -#: src/chfn.c:519 src/chsh.c:331 src/passwd.c:656 src/passwd.c:811 +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 msgid "Cannot lock the password file; try again later.\n" msgstr "" -#: src/chfn.c:525 src/chsh.c:337 src/passwd.c:661 src/passwd.c:816 +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 msgid "Cannot open the password file.\n" msgstr "" -#: src/chfn.c:542 src/chsh.c:352 src/passwd.c:667 src/usermod.c:1348 +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "" -#: src/chfn.c:561 src/chsh.c:373 src/passwd.c:740 src/passwd.c:852 +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 msgid "Error updating the password entry.\n" msgstr "" -#: src/chfn.c:585 src/chsh.c:397 src/passwd.c:755 src/passwd.c:867 +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 msgid "Cannot commit password file changes.\n" msgstr "" -#: src/chfn.c:592 src/chsh.c:404 +#: src/chfn.c:593 src/chsh.c:399 msgid "Cannot unlock the password file.\n" msgstr "" -#: src/chpasswd.c:66 +#: src/chpasswd.c:67 #, c-format -msgid "usage: %s [-e]\n" +msgid "Usage: %s [-e]\n" msgstr "" -#: src/chpasswd.c:171 src/pwconv.c:94 +#: src/chpasswd.c:154 +#, c-format +msgid "%s: can't lock password file\n" +msgstr "" + +#: src/chpasswd.c:168 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "" -#: src/chpasswd.c:177 src/gpasswd.c:596 src/pwconv.c:99 src/pwunconv.c:103 -#: src/pwunconv.c:108 +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "" -#: src/chpasswd.c:200 src/newusers.c:460 +#: src/chpasswd.c:197 src/newusers.c:441 #, c-format msgid "%s: line %d: line too long\n" msgstr "" -#: src/chpasswd.c:220 +#: src/chpasswd.c:217 #, c-format msgid "%s: line %d: missing new password\n" msgstr "" -#: src/chpasswd.c:237 +#: src/chpasswd.c:234 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "" -#: src/chpasswd.c:290 +#: src/chpasswd.c:280 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "" -#: src/chpasswd.c:307 src/newusers.c:588 +#: src/chpasswd.c:297 src/newusers.c:569 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "" -#: src/chpasswd.c:319 +#: src/chpasswd.c:309 #, c-format msgid "%s: error updating shadow file\n" msgstr "" -#: src/chpasswd.c:328 +#: src/chpasswd.c:318 #, c-format msgid "%s: error updating password file\n" msgstr "" -#: src/chsh.c:75 +#: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "" -#: src/chsh.c:89 +#: src/chsh.c:90 msgid "Enter the new value, or press return for the default\n" msgstr "" -#: src/chsh.c:90 +#: src/chsh.c:91 msgid "Login Shell" msgstr "" -#: src/chsh.c:239 src/chsh.c:253 +#: src/chsh.c:234 src/chsh.c:248 #, c-format msgid "You may not change the shell for %s.\n" msgstr "" -#: src/chsh.c:282 +#: src/chsh.c:277 #, c-format msgid "Changing the login shell for %s\n" msgstr "" -#: src/chsh.c:294 +#: src/chsh.c:289 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "" -#: src/chsh.c:301 +#: src/chsh.c:296 #, c-format msgid "%s is an invalid shell.\n" msgstr "" -#: src/dpasswd.c:52 -#, c-format -msgid "Usage: %s [-(a|d)] shell\n" -msgstr "" - -#: src/dpasswd.c:115 -msgid "Shell password: " -msgstr "" - -#: src/dpasswd.c:121 -msgid "re-enter Shell password: " -msgstr "" - -#: src/dpasswd.c:129 -#, c-format -msgid "%s: Passwords do not match, try again.\n" -msgstr "" - -#: src/dpasswd.c:149 -#, c-format -msgid "%s: can't create %s" -msgstr "" - -#: src/dpasswd.c:155 -#, c-format -msgid "%s: can't open %s" -msgstr "" - -#: src/dpasswd.c:183 -#, c-format -msgid "%s: Shell %s not found.\n" -msgstr "" - #: src/expiry.c:59 msgid "Usage: expiry {-f|-c}\n" msgstr "" @@ -681,7 +592,7 @@ msgstr "" #: src/faillog.c:77 #, c-format -msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" msgstr "" #: src/faillog.c:131 src/lastlog.c:96 @@ -710,7 +621,7 @@ msgstr "" #: src/gpasswd.c:78 #, c-format -msgid "usage: %s [-r|-R] group\n" +msgid "Usage: %s [-r|-R] group\n" msgstr "" #: src/gpasswd.c:79 @@ -751,7 +662,7 @@ msgstr "" msgid "Who are you?\n" msgstr "" -#: src/gpasswd.c:313 src/newgrp.c:297 +#: src/gpasswd.c:313 src/newgrp.c:292 #, c-format msgid "unknown group: %s\n" msgstr "" @@ -776,12 +687,6 @@ msgstr "" msgid "%s: Not a tty\n" msgstr "" -#. -#. * A new password is to be entered and it must be encrypted, etc. -#. * The password will be prompted for twice, and both entries must be -#. * identical. There is no need to validate the old password since -#. * the invoker is either the group owner, or root. -#. #: src/gpasswd.c:522 #, c-format msgid "Changing the password for group %s\n" @@ -791,7 +696,7 @@ msgstr "" msgid "New Password: " msgstr "" -#: src/gpasswd.c:530 src/passwd.c:365 +#: src/gpasswd.c:530 src/passwd.c:281 msgid "Re-enter new password: " msgstr "" @@ -854,135 +759,129 @@ msgstr "" msgid "%s: can't update DBM shadow files\n" msgstr "" -#: src/groupadd.c:101 -msgid "usage: groupadd [-g gid [-o]] group\n" +#: src/groupadd.c:102 +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "" -#: src/groupadd.c:167 src/groupadd.c:192 src/groupmod.c:179 src/groupmod.c:228 -#: src/useradd.c:970 src/usermod.c:552 src/usermod.c:695 +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 #, c-format msgid "%s: error adding new group entry\n" msgstr "" -#: src/groupadd.c:178 src/groupadd.c:203 src/groupmod.c:197 src/useradd.c:981 -#: src/usermod.c:564 src/usermod.c:708 +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 #, c-format msgid "%s: cannot add new dbm group entry\n" msgstr "" -#: src/groupadd.c:255 src/useradd.c:1034 +#: src/groupadd.c:256 src/useradd.c:977 #, c-format msgid "%s: name %s is not unique\n" msgstr "" -#: src/groupadd.c:270 +#: src/groupadd.c:271 #, c-format msgid "%s: gid %u is not unique\n" msgstr "" -#: src/groupadd.c:294 +#: src/groupadd.c:295 #, c-format msgid "%s: can't get unique gid\n" msgstr "" -#. -#. * All invalid group names land here. -#. -#: src/groupadd.c:317 src/groupmod.c:341 +#: src/groupadd.c:318 src/groupmod.c:342 #, c-format msgid "%s: %s is a not a valid group name\n" msgstr "" -#: src/groupadd.c:346 src/groupmod.c:366 +#: src/groupadd.c:347 src/groupmod.c:367 #, c-format msgid "%s: invalid group %s\n" msgstr "" -#: src/groupadd.c:363 src/useradd.c:1313 +#: src/groupadd.c:364 src/useradd.c:1173 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "" -#: src/groupadd.c:407 src/groupdel.c:173 src/groupmod.c:401 src/useradd.c:1428 -#: src/userdel.c:312 src/usermod.c:576 +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "" -#: src/groupadd.c:415 src/groupdel.c:179 src/groupmod.c:409 src/useradd.c:1437 -#: src/userdel.c:319 src/usermod.c:722 +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "" -#: src/groupadd.c:433 src/groupdel.c:198 src/groupmod.c:427 src/userdel.c:403 +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 #, c-format msgid "%s: unable to lock group file\n" msgstr "" -#: src/groupadd.c:438 src/groupdel.c:202 src/groupmod.c:432 +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 #, c-format msgid "%s: unable to open group file\n" msgstr "" -#: src/groupadd.c:445 src/groupdel.c:207 src/groupmod.c:439 src/userdel.c:414 +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "" -#: src/groupadd.c:451 src/groupdel.c:212 src/groupmod.c:445 +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "" -#: src/groupadd.c:562 +#: src/groupadd.c:563 #, c-format msgid "%s: group %s exists\n" msgstr "" -#: src/groupdel.c:92 -msgid "usage: groupdel group\n" +#: src/groupdel.c:88 +msgid "Usage: groupdel group\n" msgstr "" -#: src/groupdel.c:110 src/groupmod.c:184 src/groupmod.c:233 +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 #, c-format msgid "%s: error removing group entry\n" msgstr "" -#: src/groupdel.c:122 src/groupmod.c:204 +#: src/groupdel.c:119 src/groupmod.c:205 #, c-format msgid "%s: error removing group dbm entry\n" msgstr "" -#: src/groupdel.c:137 +#: src/groupdel.c:135 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "" -#: src/groupdel.c:150 src/groupmod.c:254 +#: src/groupdel.c:149 src/groupmod.c:255 #, c-format msgid "%s: error removing shadow group dbm entry\n" msgstr "" -#. -#. * Can't remove the group. -#. -#: src/groupdel.c:254 +#: src/groupdel.c:255 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "" -#: src/groupdel.c:355 src/groupmod.c:550 +#: src/groupdel.c:359 src/groupmod.c:551 #, c-format msgid "%s: group %s does not exist\n" msgstr "" -#: src/groupdel.c:369 src/groupmod.c:566 +#: src/groupdel.c:373 src/groupmod.c:567 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "" -#: src/groupdel.c:375 src/groupmod.c:571 src/userdel.c:776 src/usermod.c:1045 +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 #, c-format msgid "%s: %s is the NIS master\n" msgstr "" @@ -996,7 +895,7 @@ msgid "Member to remove could not be found\n" msgstr "" #: src/groupmems.c:158 -msgid "usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" msgstr "" #: src/groupmems.c:201 @@ -1023,26 +922,26 @@ msgstr "" msgid "Cannot close group file\n" msgstr "" -#: src/groupmod.c:103 -msgid "usage: groupmod [-g gid [-o]] [-n name] group\n" +#: src/groupmod.c:104 +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "" -#: src/groupmod.c:161 +#: src/groupmod.c:162 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "" -#: src/groupmod.c:247 +#: src/groupmod.c:248 #, c-format msgid "%s: cannot add new dbm shadow group entry\n" msgstr "" -#: src/groupmod.c:300 +#: src/groupmod.c:301 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "" -#: src/groupmod.c:330 +#: src/groupmod.c:331 #, c-format msgid "%s: %s is not a unique name\n" msgstr "" @@ -1082,10 +981,6 @@ msgstr "" msgid "%s: cannot open file %s\n" msgstr "" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:311 msgid "invalid group file entry\n" msgstr "" @@ -1097,10 +992,6 @@ msgstr "" msgid "delete line `%s'? " msgstr "" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:374 msgid "duplicate group entry\n" msgstr "" @@ -1120,18 +1011,10 @@ msgstr "" msgid "delete member `%s'? " msgstr "" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:457 msgid "invalid shadow group file entry\n" msgstr "" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:520 msgid "duplicate shadow group entry\n" msgstr "" @@ -1200,59 +1083,46 @@ msgstr "" msgid "%s: can't remove shadow group %s\n" msgstr "" -#: src/grpconv.c:138 src/pwconv.c:153 +#: src/grpconv.c:133 src/pwconv.c:154 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "" -#: src/grpconv.c:148 src/grpunconv.c:91 +#: src/grpconv.c:143 src/grpunconv.c:91 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "" -#: src/grpconv.c:155 src/grpunconv.c:99 +#: src/grpconv.c:150 src/grpunconv.c:99 #, c-format msgid "%s: can't update shadow group file\n" msgstr "" -#: src/grpconv.c:160 src/grpunconv.c:105 +#: src/grpconv.c:155 src/grpunconv.c:105 #, c-format msgid "%s: can't update group file\n" msgstr "" -#: src/grpconv.c:175 src/grpunconv.c:127 -#, c-format -msgid "%s: not configured for shadow group support.\n" -msgstr "" - #: src/grpunconv.c:110 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "" #: src/id.c:53 -msgid "usage: id [-a]\n" +msgid "Usage: id [-a]\n" msgstr "" #: src/id.c:55 -msgid "usage: id\n" +msgid "Usage: id\n" msgstr "" -#. -#. * Start off the group message. It will be of the format -#. * -#. * groups=###(aaa),###(aaa),###(aaa) -#. * -#. * where "###" is a numerical value and "aaa" is the -#. * corresponding name for each respective numerical value. -#. #: src/id.c:169 msgid " groups=" msgstr "" #: src/lastlog.c:110 src/lastlog.c:116 #, c-format -msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n" +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" msgstr "" #: src/lastlog.c:181 @@ -1263,93 +1133,93 @@ msgstr "" msgid "Username Port Latest\n" msgstr "" -#: src/lastlog.c:197 +#: src/lastlog.c:198 msgid "**Never logged in**" msgstr "" -#: src/login.c:185 +#: src/login.c:175 #, c-format -msgid "usage: %s [-p] [name]\n" +msgid "Usage: %s [-p] [name]\n" msgstr "" -#: src/login.c:188 +#: src/login.c:178 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr "" -#: src/login.c:190 +#: src/login.c:180 #, c-format msgid " %s [-p] -r host\n" msgstr "" -#: src/login.c:274 +#: src/login.c:259 msgid "Invalid login time\n" msgstr "" -#: src/login.c:329 +#: src/login.c:314 msgid "" "\n" "System closed for routine maintenance\n" msgstr "" -#: src/login.c:340 +#: src/login.c:325 msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" -#: src/login.c:377 +#: src/login.c:362 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" -#: src/login.c:689 +#: src/login.c:648 #, c-format msgid " on `%.100s' from `%.200s'" msgstr "" -#: src/login.c:693 +#: src/login.c:652 #, c-format msgid " on `%.100s'" msgstr "" -#: src/login.c:852 +#: src/login.c:811 #, c-format msgid "" "\n" "%s login: " msgstr "" -#: src/login.c:855 +#: src/login.c:814 msgid "login: " msgstr "" -#: src/login.c:1071 src/sulogin.c:233 +#: src/login.c:1013 src/sulogin.c:205 msgid "Login incorrect" msgstr "" -#: src/login.c:1265 +#: src/login.c:1193 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" -#: src/login.c:1278 +#: src/login.c:1207 #, c-format msgid "Last login: %s on %s" msgstr "" -#: src/login.c:1281 +#: src/login.c:1210 #, c-format msgid "Last login: %.19s on %s" msgstr "" -#: src/login.c:1287 +#: src/login.c:1216 #, c-format msgid " from %.*s" msgstr "" -#: src/login.c:1364 +#: src/login.c:1293 msgid "Starting rad_login\n" msgstr "" @@ -1417,28 +1287,28 @@ msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "" #: src/newgrp.c:61 -msgid "usage: newgrp [-] [group]\n" +msgid "Usage: newgrp [-] [group]\n" msgstr "" #: src/newgrp.c:63 -msgid "usage: sg group [[-c] command]\n" +msgid "Usage: sg group [[-c] command]\n" msgstr "" -#: src/newgrp.c:136 +#: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" msgstr "" -#: src/newgrp.c:219 +#: src/newgrp.c:214 #, c-format msgid "unknown gid: %lu\n" msgstr "" -#: src/newgrp.c:365 src/newgrp.c:374 +#: src/newgrp.c:360 src/newgrp.c:369 msgid "Sorry.\n" msgstr "" -#: src/newgrp.c:472 +#: src/newgrp.c:469 msgid "too many groups\n" msgstr "" @@ -1447,191 +1317,161 @@ msgstr "" msgid "Usage: %s [input]\n" msgstr "" -#: src/newusers.c:407 +#: src/newusers.c:388 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "" -#: src/newusers.c:419 +#: src/newusers.c:400 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "" -#: src/newusers.c:435 +#: src/newusers.c:416 #, c-format msgid "%s: can't open files\n" msgstr "" -#: src/newusers.c:480 +#: src/newusers.c:461 #, c-format msgid "%s: line %d: invalid line\n" msgstr "" -#: src/newusers.c:499 +#: src/newusers.c:480 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "" -#: src/newusers.c:515 +#: src/newusers.c:496 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "" -#: src/newusers.c:528 +#: src/newusers.c:509 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "" -#: src/newusers.c:537 +#: src/newusers.c:518 #, c-format msgid "%s: line %d: can't update password\n" msgstr "" -#: src/newusers.c:555 +#: src/newusers.c:536 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "" -#: src/newusers.c:561 +#: src/newusers.c:542 #, c-format msgid "%s: line %d: chown failed\n" msgstr "" -#: src/newusers.c:571 +#: src/newusers.c:552 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "" -#: src/newusers.c:603 +#: src/newusers.c:584 #, c-format msgid "%s: error updating files\n" msgstr "" -#: src/passwd.c:174 +#: src/passwd.c:155 #, c-format -msgid "usage: %s [-f|-s] [name]\n" +msgid "Usage: %s [-f|-s] [name]\n" msgstr "" -#: src/passwd.c:178 +#: src/passwd.c:159 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr "" -#: src/passwd.c:180 +#: src/passwd.c:161 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr "" -#: src/passwd.c:283 -#, c-format -msgid "User %s has a TCFS key, his old password is required.\n" -msgstr "" - -#: src/passwd.c:286 -msgid "You can use -t option to force the change.\n" -msgstr "" - -#: src/passwd.c:292 +#: src/passwd.c:216 msgid "Old password: " msgstr "" -#: src/passwd.c:301 +#: src/passwd.c:225 #, c-format msgid "Incorrect password for `%s'\n" msgstr "" -#: src/passwd.c:314 -#, c-format -msgid "Warning: user %s has a TCFS key.\n" -msgstr "" - -#: src/passwd.c:333 +#: src/passwd.c:249 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -#: src/passwd.c:339 +#: src/passwd.c:255 msgid "New password: " msgstr "" -#: src/passwd.c:350 +#: src/passwd.c:266 msgid "Try again.\n" msgstr "" -#: src/passwd.c:361 +#: src/passwd.c:277 msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" -#: src/passwd.c:371 +#: src/passwd.c:287 msgid "They don't match; try again.\n" msgstr "" -#: src/passwd.c:451 src/passwd.c:469 +#: src/passwd.c:364 src/passwd.c:382 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "" -#: src/passwd.c:494 +#: src/passwd.c:396 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "" -#: src/passwd.c:614 +#: src/passwd.c:479 #, c-format msgid "%s: out of memory\n" msgstr "" -#: src/passwd.c:769 -msgid "Cannot lock the TCFS key database; try again later\n" -msgstr "" - -#: src/passwd.c:777 -msgid "Cannot open the TCFS key database.\n" -msgstr "" - -#: src/passwd.c:785 -msgid "Error updating the TCFS key database.\n" -msgstr "" - -#: src/passwd.c:792 -msgid "Cannot commit TCFS changes.\n" -msgstr "" - -#: src/passwd.c:975 +#: src/passwd.c:730 #, c-format msgid "%s: Cannot execute %s" msgstr "" -#: src/passwd.c:1077 +#: src/passwd.c:815 #, c-format msgid "%s: repository %s not supported\n" msgstr "" -#: src/passwd.c:1152 +#: src/passwd.c:890 #, c-format msgid "%s: Permission denied\n" msgstr "" -#: src/passwd.c:1176 +#: src/passwd.c:914 #, c-format msgid "You may not change the password for %s.\n" msgstr "" -#: src/passwd.c:1242 +#: src/passwd.c:962 #, c-format msgid "Changing password for %s\n" msgstr "" -#: src/passwd.c:1246 +#: src/passwd.c:966 #, c-format msgid "The password for %s is unchanged.\n" msgstr "" -#: src/passwd.c:1297 +#: src/passwd.c:1016 msgid "Password changed.\n" msgstr "" @@ -1645,18 +1485,10 @@ msgstr "" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:295 msgid "invalid password file entry\n" msgstr "" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:357 msgid "duplicate password entry\n" msgstr "" @@ -1666,9 +1498,6 @@ msgstr "" msgid "invalid user name '%s'\n" msgstr "" -#. -#. * No primary group, just give a warning -#. #: src/pwck.c:388 #, c-format msgid "user %s: no group %u\n" @@ -1679,34 +1508,19 @@ msgstr "" msgid "user %s: directory %s does not exist\n" msgstr "" -#. -#. * Login shell doesn't exist, give a warning -#. #: src/pwck.c:420 #, c-format msgid "user %s: program %s does not exist\n" msgstr "" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:456 msgid "invalid shadow password file entry\n" msgstr "" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:518 msgid "duplicate shadow password entry\n" msgstr "" -#. -#. * Tell the user this entry has no matching -#. * /etc/passwd entry and ask them to delete it. -#. #: src/pwck.c:542 msgid "no matching password file entry\n" msgstr "" @@ -1716,47 +1530,42 @@ msgstr "" msgid "user %s: last password change in the future\n" msgstr "" -#: src/pwconv.c:84 src/pwunconv.c:93 +#: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" msgstr "" -#: src/pwconv.c:89 src/pwunconv.c:98 +#: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" msgstr "" -#: src/pwconv.c:117 +#: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" msgstr "" -#: src/pwconv.c:163 +#: src/pwconv.c:164 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "" -#: src/pwconv.c:170 +#: src/pwconv.c:171 #, c-format msgid "%s: can't update shadow file\n" msgstr "" -#: src/pwconv.c:175 +#: src/pwconv.c:176 #, c-format msgid "%s: can't update passwd file\n" msgstr "" -#: src/pwunconv.c:50 -#, c-format -msgid "%s: Shadow passwords are not configured.\n" -msgstr "" - -#: src/pwunconv.c:160 +#: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" msgstr "" -#: src/pwunconv.c:181 +#: src/pwunconv.c:145 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "" @@ -1785,7 +1594,6 @@ msgstr "" msgid "You are not authorized to su %s\n" msgstr "" -#. require own password #: src/su.c:385 msgid "(Enter your own password.)" msgstr "" @@ -1797,571 +1605,501 @@ msgid "" "(Ignored)\n" msgstr "" -#: src/su.c:626 +#: src/su.c:609 msgid "No shell\n" msgstr "" -#: src/suauth.c:100 +#: src/suauth.c:105 msgid "Access to su to that account DENIED.\n" msgstr "" -#: src/suauth.c:107 +#: src/suauth.c:113 msgid "Password authentication bypassed.\n" msgstr "" -#: src/suauth.c:114 +#: src/suauth.c:122 msgid "Please enter your OWN password as authentication.\n" msgstr "" -#. must be a password file! -#: src/sulogin.c:132 +#: src/sulogin.c:118 msgid "No password file\n" msgstr "" -#. -#. * Fail secure -#. -#: src/sulogin.c:174 +#: src/sulogin.c:160 msgid "No password entry for 'root'\n" msgstr "" -#: src/sulogin.c:190 +#: src/sulogin.c:176 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" -#. make new environment active -#: src/sulogin.c:243 +#: src/sulogin.c:212 msgid "Entering System Maintenance Mode\n" msgstr "" -#: src/useradd.c:251 +#: src/useradd.c:234 #, c-format msgid "%s: rebuild the group database\n" msgstr "" -#: src/useradd.c:260 +#: src/useradd.c:243 #, c-format msgid "%s: rebuild the shadow group database\n" msgstr "" -#: src/useradd.c:295 src/useradd.c:309 src/usermod.c:981 src/usermod.c:995 +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "" -#: src/useradd.c:365 +#: src/useradd.c:349 #, c-format msgid "%s: unknown gid %s\n" msgstr "" -#: src/useradd.c:373 src/useradd.c:676 src/useradd.c:1269 src/usermod.c:260 -#: src/usermod.c:1128 +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 #, c-format msgid "%s: unknown group %s\n" msgstr "" -#: src/useradd.c:440 -#, c-format -msgid "group=%s,%u basedir=%s skel=%s\n" -msgstr "" - -#: src/useradd.c:444 -#, c-format -msgid "shell=%s " -msgstr "" - -#: src/useradd.c:446 -#, c-format -msgid "inactive=%ld expire=%s" -msgstr "" - -#: src/useradd.c:450 +#: src/useradd.c:419 #, c-format msgid "GROUP=%u\n" msgstr "" -#: src/useradd.c:451 +#: src/useradd.c:420 #, c-format msgid "HOME=%s\n" msgstr "" -#: src/useradd.c:453 +#: src/useradd.c:422 #, c-format msgid "INACTIVE=%ld\n" msgstr "" -#: src/useradd.c:454 +#: src/useradd.c:423 #, c-format msgid "EXPIRE=%s\n" msgstr "" -#: src/useradd.c:456 +#: src/useradd.c:425 #, c-format msgid "SHELL=%s\n" msgstr "" -#: src/useradd.c:457 +#: src/useradd.c:426 #, c-format msgid "SKEL=%s\n" msgstr "" -#: src/useradd.c:498 +#: src/useradd.c:462 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "" -#: src/useradd.c:503 +#: src/useradd.c:467 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "" -#: src/useradd.c:596 src/useradd.c:608 +#: src/useradd.c:552 src/useradd.c:564 #, c-format msgid "%s: rename: %s" msgstr "" -#: src/useradd.c:697 src/usermod.c:281 +#: src/useradd.c:657 src/usermod.c:265 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "" -#: src/useradd.c:706 src/usermod.c:290 +#: src/useradd.c:666 src/usermod.c:274 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "" -#: src/useradd.c:738 src/usermod.c:322 -#, c-format -msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "" -#: src/useradd.c:742 -msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" +#: src/useradd.c:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" -#: src/useradd.c:745 src/usermod.c:329 -msgid "[-f inactive] [-e expire ] " +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" msgstr "" -#: src/useradd.c:748 -msgid "[-A program] " +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr "" -#: src/useradd.c:750 -msgid "[-p passwd] name\n" -msgstr "" - -#: src/useradd.c:753 -#, c-format -msgid " %s\t-D [-g group] [-b base] [-s shell]\n" -msgstr "" - -#: src/useradd.c:756 -msgid "\t\t[-f inactive] [-e expire ]\n" -msgstr "" - -#: src/useradd.c:850 src/usermod.c:480 +#: src/useradd.c:793 src/usermod.c:461 #, c-format msgid "%s: error locking group file\n" msgstr "" -#: src/useradd.c:855 src/usermod.c:486 +#: src/useradd.c:798 src/usermod.c:467 #, c-format msgid "%s: error opening group file\n" msgstr "" -#: src/useradd.c:862 src/usermod.c:597 +#: src/useradd.c:805 src/usermod.c:578 #, c-format msgid "%s: error locking shadow group file\n" msgstr "" -#: src/useradd.c:867 src/usermod.c:603 +#: src/useradd.c:810 src/usermod.c:584 #, c-format msgid "%s: error opening shadow group file\n" msgstr "" -#: src/useradd.c:1039 +#: src/useradd.c:982 #, c-format msgid "%s: uid %u is not unique\n" msgstr "" -#: src/useradd.c:1069 +#: src/useradd.c:1012 #, c-format msgid "%s: can't get unique uid\n" msgstr "" -#: src/useradd.c:1174 src/useradd.c:1325 src/usermod.c:1075 src/usermod.c:1086 -#: src/usermod.c:1096 src/usermod.c:1143 src/usermod.c:1187 -#, c-format -msgid "%s: invalid field `%s'\n" -msgstr "" - -#: src/useradd.c:1189 +#: src/useradd.c:1049 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "" -#: src/useradd.c:1199 +#: src/useradd.c:1059 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "" -#: src/useradd.c:1210 +#: src/useradd.c:1070 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "" -#: src/useradd.c:1229 src/usermod.c:1110 +#: src/useradd.c:1089 src/usermod.c:858 #, c-format msgid "%s: invalid date `%s'\n" msgstr "" -#: src/useradd.c:1242 +#: src/useradd.c:1102 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "" -#: src/useradd.c:1258 +#: src/useradd.c:1118 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "" -#: src/useradd.c:1336 +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "" + +#: src/useradd.c:1196 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "" -#: src/useradd.c:1377 +#: src/useradd.c:1237 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "" -#: src/useradd.c:1413 src/userdel.c:298 src/usermod.c:1255 +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "" -#: src/useradd.c:1420 src/userdel.c:303 src/usermod.c:1262 +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "" -#: src/useradd.c:1461 src/userdel.c:367 src/usermod.c:1296 +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 #, c-format msgid "%s: unable to lock password file\n" msgstr "" -#: src/useradd.c:1466 src/userdel.c:372 src/usermod.c:1301 +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 #, c-format msgid "%s: unable to open password file\n" msgstr "" -#: src/useradd.c:1474 src/userdel.c:379 src/usermod.c:1308 +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "" -#: src/useradd.c:1481 src/userdel.c:385 src/usermod.c:1314 +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "" -#: src/useradd.c:1580 src/usermod.c:1405 -#, c-format -msgid "%s: error adding authentication method\n" -msgstr "" - -#: src/useradd.c:1604 +#: src/useradd.c:1435 #, c-format msgid "%s: error adding new password entry\n" msgstr "" -#: src/useradd.c:1618 +#: src/useradd.c:1449 #, c-format msgid "%s: error updating password dbm entry\n" msgstr "" -#: src/useradd.c:1634 src/usermod.c:1471 +#: src/useradd.c:1465 src/usermod.c:1151 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "" -#: src/useradd.c:1650 src/usermod.c:1488 +#: src/useradd.c:1481 src/usermod.c:1168 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" msgstr "" -#: src/useradd.c:1682 +#: src/useradd.c:1513 #, c-format msgid "%s: cannot create directory %s\n" msgstr "" -#: src/useradd.c:1806 src/usermod.c:1233 +#: src/useradd.c:1634 src/usermod.c:981 #, c-format msgid "%s: user %s exists\n" msgstr "" -#: src/useradd.c:1821 +#: src/useradd.c:1649 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1854 +#: src/useradd.c:1687 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -#: src/userdel.c:129 +#: src/userdel.c:124 #, c-format -msgid "usage: %s [-r] name\n" +msgid "Usage: %s [-r] name\n" msgstr "" -#: src/userdel.c:181 src/userdel.c:267 +#: src/userdel.c:176 src/userdel.c:262 #, c-format msgid "%s: error updating group entry\n" msgstr "" -#: src/userdel.c:191 src/userdel.c:276 +#: src/userdel.c:186 src/userdel.c:271 #, c-format msgid "%s: cannot update dbm group entry\n" msgstr "" -#: src/userdel.c:219 +#: src/userdel.c:214 #, c-format msgid "%s: cannot remove dbm group entry\n" msgstr "" -#: src/userdel.c:308 -#, c-format -msgid "%s: cannot rewrite TCFS key file\n" -msgstr "" - -#: src/userdel.c:392 -#, c-format -msgid "%s: cannot lock TCFS key file\n" -msgstr "" - -#: src/userdel.c:397 -#, c-format -msgid "%s: cannot open TCFS key file\n" -msgstr "" - -#: src/userdel.c:408 +#: src/userdel.c:379 #, c-format msgid "%s: cannot open group file\n" msgstr "" -#: src/userdel.c:419 +#: src/userdel.c:390 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "" -#: src/userdel.c:451 src/userdel.c:468 -#, c-format -msgid "%s: error deleting authentication\n" -msgstr "" - -#: src/userdel.c:479 +#: src/userdel.c:408 #, c-format msgid "%s: error deleting password entry\n" msgstr "" -#: src/userdel.c:485 +#: src/userdel.c:412 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "" -#: src/userdel.c:496 -#, c-format -msgid "%s: error deleting TCFS entry\n" -msgstr "" - -#: src/userdel.c:510 +#: src/userdel.c:421 #, c-format msgid "%s: error deleting password dbm entry\n" msgstr "" -#: src/userdel.c:533 +#: src/userdel.c:440 #, c-format msgid "%s: error deleting shadow passwd dbm entry\n" msgstr "" -#: src/userdel.c:569 +#: src/userdel.c:484 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "" -#: src/userdel.c:659 +#: src/userdel.c:594 #, c-format msgid "%s: warning: %s not owned by %s, not removing\n" msgstr "" -#: src/userdel.c:666 +#: src/userdel.c:600 #, c-format msgid "%s: warning: can't remove " msgstr "" -#: src/userdel.c:758 src/usermod.c:1023 +#: src/userdel.c:703 src/usermod.c:783 #, c-format msgid "%s: user %s does not exist\n" msgstr "" -#: src/userdel.c:770 src/usermod.c:1039 +#: src/userdel.c:718 src/usermod.c:799 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "" -#: src/userdel.c:799 +#: src/userdel.c:756 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "" -#: src/userdel.c:818 +#: src/userdel.c:779 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -#: src/userdel.c:830 +#: src/userdel.c:793 #, c-format msgid "%s: error removing directory %s\n" msgstr "" -#: src/usermod.c:326 +#: src/usermod.c:306 +#, c-format +msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "" + +#: src/usermod.c:310 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "" -#: src/usermod.c:332 -msgid "[-A {DEFAULT|program},... ] " +#: src/usermod.c:313 +msgid "[-f inactive] [-e expire] " msgstr "" -#: src/usermod.c:334 +#: src/usermod.c:315 msgid "[-p passwd] [-L|-U] name\n" msgstr "" -#: src/usermod.c:514 +#: src/usermod.c:495 #, c-format msgid "%s: out of memory in update_group\n" msgstr "" -#: src/usermod.c:641 +#: src/usermod.c:622 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "" -#: src/usermod.c:1210 +#: src/usermod.c:958 #, c-format msgid "%s: no flags given\n" msgstr "" -#: src/usermod.c:1217 +#: src/usermod.c:965 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "" -#: src/usermod.c:1239 +#: src/usermod.c:987 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "" -#: src/usermod.c:1392 -#, c-format -msgid "%s: error deleting authentication method\n" -msgstr "" - -#: src/usermod.c:1418 -#, c-format -msgid "%s: error changing authentication method\n" -msgstr "" - -#: src/usermod.c:1436 +#: src/usermod.c:1116 #, c-format msgid "%s: error changing password entry\n" msgstr "" -#: src/usermod.c:1442 +#: src/usermod.c:1122 #, c-format msgid "%s: error removing password entry\n" msgstr "" -#: src/usermod.c:1451 +#: src/usermod.c:1131 #, c-format msgid "%s: error adding password dbm entry\n" msgstr "" -#: src/usermod.c:1459 +#: src/usermod.c:1139 #, c-format msgid "%s: error removing passwd dbm entry\n" msgstr "" -#: src/usermod.c:1478 +#: src/usermod.c:1158 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" -#: src/usermod.c:1495 +#: src/usermod.c:1175 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" msgstr "" -#: src/usermod.c:1524 +#: src/usermod.c:1204 #, c-format msgid "%s: directory %s exists\n" msgstr "" -#: src/usermod.c:1533 +#: src/usermod.c:1213 #, c-format msgid "%s: can't create %s\n" msgstr "" -#: src/usermod.c:1539 +#: src/usermod.c:1219 #, c-format msgid "%s: can't chown %s\n" msgstr "" -#: src/usermod.c:1556 +#: src/usermod.c:1236 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "" -#. better leave it alone -#: src/usermod.c:1653 +#: src/usermod.c:1333 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "" -#: src/usermod.c:1659 +#: src/usermod.c:1339 msgid "failed to change mailbox owner" msgstr "" -#: src/usermod.c:1667 +#: src/usermod.c:1347 msgid "failed to rename mailbox" msgstr "" -#: src/vipw.c:104 +#: src/vipw.c:105 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" -#: src/vipw.c:132 +#: src/vipw.c:133 msgid "Couldn't lock file" msgstr "" -#: src/vipw.c:141 +#: src/vipw.c:142 msgid "Couldn't make backup" msgstr "" -#: src/vipw.c:206 +#: src/vipw.c:200 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "" -#: src/vipw.c:244 +#: src/vipw.c:238 msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" diff --git a/stamp-h.in b/po/stamp-po similarity index 100% rename from stamp-h.in rename to po/stamp-po diff --git a/po/sv.gmo b/po/sv.gmo index d7d02aff..8611fde1 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index a03e211d..8fda7cf6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,711 +1,619 @@ # Swedish messages for Shadow Copyright (C) 1999 Free Software Foundation, -# Inc. Kristoffer Br幩emyr , 1999. +# Inc. Kristoffer Br疇nemyr , 1999. # msgid "" msgstr "" "Project-Id-Version: shadow 19990709\n" -"POT-Creation-Date: 2002-03-12 12:16+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" "PO-Revision-Date: 1999-08-16 21:20+0100\n" -"Last-Translator: Kristoffer Br幩emyr \n" +"Last-Translator: Kristoffer Br疇nemyr \n" "Language-Team: sv \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libmisc/addgrps.c:60 +#: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" -msgstr "Varning: ok鄚d grupp %s\n" +msgstr "Varning: ok瓣nd grupp %s\n" -#: libmisc/addgrps.c:71 +#: libmisc/addgrps.c:68 msgid "Warning: too many groups\n" -msgstr "Varning: f顤 m幩ga grupper\n" +msgstr "Varning: f繹r m疇nga grupper\n" -#: libmisc/age.c:77 +#: libmisc/age.c:72 msgid "Your password has expired." -msgstr "Ditt l飉enord har upph顤t" +msgstr "Ditt l繹senord har upph繹rt" -#: libmisc/age.c:80 +#: libmisc/age.c:75 msgid "Your password is inactive." -msgstr "Ditt l飉enord 酺 inaktivt" +msgstr "Ditt l繹senord 瓣r inaktivt" -#: libmisc/age.c:83 +#: libmisc/age.c:78 msgid "Your login has expired." -msgstr "Din anv鄚dare har upph顤t." +msgstr "Din anv瓣ndare har upph繹rt." -#: libmisc/age.c:96 +#: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " Kontakta systemoperat顤en.\n" +msgstr " Kontakta systemoperat繹ren.\n" -#: libmisc/age.c:99 +#: libmisc/age.c:93 msgid " Choose a new password.\n" -msgstr " V鄟j ett nytt l飉enord.\n" +msgstr " V瓣lj ett nytt l繹senord.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:168 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "Ditt l飉enord upph顤 om %ld dagar.\n" +msgstr "Ditt l繹senord upph繹r om %ld dagar.\n" -#: libmisc/age.c:178 +#: libmisc/age.c:172 msgid "Your password will expire tomorrow.\n" -msgstr "Ditt l飉enord upph顤 imorgon.\n" +msgstr "Ditt l繹senord upph繹r imorgon.\n" -#: libmisc/age.c:180 +#: libmisc/age.c:174 msgid "Your password will expire today.\n" -msgstr "Ditt l飉enord upph顤 idag.\n" +msgstr "Ditt l繹senord upph繹r idag.\n" -#: libmisc/chowntty.c:113 +#: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" msgstr "Kunde inte byta tty %s" -#: libmisc/env.c:160 +#: libmisc/env.c:155 msgid "Environment overflow\n" -msgstr "Milj霵 饘erfl鐰ades\n" +msgstr "Milj繹n 繹verfl繹dades\n" -#: libmisc/env.c:200 +#: libmisc/env.c:195 #, c-format msgid "You may not change $%s\n" -msgstr "Du f緳 inte 鄚dra $%s\n" +msgstr "Du f疇r inte 瓣ndra $%s\n" -#: libmisc/failure.c:238 +#: libmisc/failure.c:230 #, c-format msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s sedan f顤ra inloggningen. Den sista var %s p %s.\n" +msgstr "%d %s sedan f繹rra inloggningen. Den sista var %s p疇 %s.\n" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failures" msgstr "felaktiga inloggningar" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failure" msgstr "felaktig inloggning" -#: libmisc/limits.c:397 +#: libmisc/limits.c:396 msgid "Too many logins.\n" -msgstr "F顤 m幩ga inloggningar.\n" +msgstr "F繹r m疇nga inloggningar.\n" -#: libmisc/login_desrpc.c:63 +#: libmisc/login_desrpc.c:59 #, c-format msgid "Password does not decrypt secret key for %s.\n" -msgstr "L飉enordet avkrypterar inte den hemliga nyckeln f顤 %s.\n" +msgstr "L繹senordet avkrypterar inte den hemliga nyckeln f繹r %s.\n" -#: libmisc/login_desrpc.c:69 +#: libmisc/login_desrpc.c:66 #, c-format msgid "Could not set %s's secret key: is the keyserv daemon running?\n" msgstr "" -"Kunde inte s酹ta den hemliga nyckeln f顤 %s: 酺 keyserv demonen ig幩g?\n" +"Kunde inte s瓣tta den hemliga nyckeln f繹r %s: 瓣r keyserv demonen ig疇ng?\n" -#: libmisc/mail.c:62 libmisc/mail.c:77 +#: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Du har ny post." -#: libmisc/mail.c:73 +#: libmisc/mail.c:72 msgid "No mail." msgstr "Ingen post." -#: libmisc/mail.c:75 +#: libmisc/mail.c:74 msgid "You have mail." msgstr "Du har post." -#: libmisc/obscure.c:281 src/passwd.c:244 +#: libmisc/obscure.c:271 src/passwd.c:183 #, c-format msgid "Bad password: %s. " -msgstr "Felaktigt l飉enord: %s. " +msgstr "Felaktigt l繹senord: %s. " -#: libmisc/pam_pass.c:42 +#: libmisc/pam_pass.c:38 #, c-format msgid "passwd: pam_start() failed, error %d\n" msgstr "passwd: pam_start() misslyckades, fel %d\n" -#: libmisc/pam_pass.c:49 +#: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/setupenv.c:211 +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" +msgstr "" + +#: libmisc/setupenv.c:208 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Kunde inte byta aktuell katalog till \"%s\"\n" -#: libmisc/setupenv.c:219 +#: libmisc/setupenv.c:216 msgid "No directory, logging in with HOME=/" msgstr "Ingen hemkatalog, loggar in med HOME=/" -#: libmisc/shell.c:78 -#, c-format -msgid "Executing shell %s\n" -msgstr "Startar skal %s\n" - -#. -#. * Obviously something is really wrong - I can't figure out -#. * how to execute this stupid shell, so I might as well give -#. * up in disgust ... -#. -#: libmisc/shell.c:122 +#: libmisc/shell.c:119 #, c-format msgid "Cannot execute %s" msgstr "Kan inte starta %s" -#: libmisc/sub.c:61 +#: libmisc/sub.c:55 #, c-format msgid "Invalid root directory \"%s\"\n" msgstr "Felaktig rotkatalog \"%s\"\n" -#: libmisc/sub.c:73 +#: libmisc/sub.c:67 #, c-format msgid "Can't change root directory to \"%s\"\n" msgstr "Kan inte byta rotkatalog till \"%s\"\n" -#: libmisc/xmalloc.c:28 +#: libmisc/xmalloc.c:24 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) misslyckades\n" -#: lib/dialchk.c:71 -msgid "Dialup Password: " -msgstr "Uppringningsl飉enord: " - -#: lib/getdef.c:276 +#: lib/getdef.c:274 msgid "Could not allocate space for config info.\n" -msgstr "Kunde inte allokera rum f顤 konfigureringsinformation.\n" +msgstr "Kunde inte allokera rum f繹r konfigureringsinformation.\n" -#. -#. * Item was never found. -#. -#: lib/getdef.c:330 +#: lib/getdef.c:328 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" -msgstr "konfigurerings fel - ok鄚t object \"%s\" (meddela systemoperat顤en)\n" +msgstr "konfigurerings fel - ok瓣nt object \"%s\" (meddela systemoperat繹ren)\n" -#: lib/getdef.c:417 -#, c-format -msgid "error - lookup '%s' failed\n" -msgstr "fel - kunde inte hitta \"%s\"\n" - -#: lib/getdef.c:425 -#, c-format -msgid "%s not found\n" -msgstr "%s hittades inte\n" - -#. -#. * get the password from her, and set the salt for -#. * the decryption from the group file. -#. -#: lib/pwauth.c:54 src/newgrp.c:348 +#: lib/pwauth.c:54 src/newgrp.c:343 msgid "Password: " -msgstr "L飉enord: " +msgstr "L繹senord: " #: lib/pwauth.c:56 #, c-format msgid "%s's Password: " -msgstr "L飉enord f顤 %s: " +msgstr "L繹senord f繹r %s: " -#: lib/pwauth.c:270 +#: lib/pwauth.c:247 msgid "(Echo on) " msgstr "" #: lib/strerror.c:20 #, c-format msgid "Unknown error %d" -msgstr "Ok鄚t fel %d" +msgstr "Ok瓣nt fel %d" -#: src/chage.c:116 -#, c-format +#: src/chage.c:118 msgid "" -"Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" -"\t[-I inactive] [-E expire] [-d last_day] user\n" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -"Anv鄚dning: %s [-l] [-m min_dagar] [-M max_dagar] [-W varna]\n" -"\t[-I inaktiv] [-E utg幩g] [-d senaste_dag] anv鄚dare\n" +"Anv瓣ndning: chage [-l] [-m min_dagar] [-M max_dagar] [-W varna]\n" +" [-I inaktiv] [-E utg疇ng] [-d senaste_dag] anv瓣ndare\n" -#: src/chage.c:122 -#, c-format -msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" -msgstr "" -"Anv鄚dning: %s [-l] [-m min_dagar] [-M max_dagar] [-d senaste_dag] " -"anv鄚dare\n" - -#: src/chage.c:157 +#: src/chage.c:152 #, fuzzy msgid "" "Enter the new value, or press ENTER for the default\n" "\n" -msgstr "Skriv in det nya v酺det, eller tryck ENTER f顤 standardv酺det\n" +msgstr "Skriv in det nya v瓣rdet, eller tryck ENTER f繹r standardv瓣rdet\n" -#: src/chage.c:160 +#: src/chage.c:155 msgid "Minimum Password Age" -msgstr "Minsta l飉enords嶚der" +msgstr "Minsta l繹senords疇lder" -#: src/chage.c:166 +#: src/chage.c:161 msgid "Maximum Password Age" -msgstr "H鐷sta l飉enords嶚der" +msgstr "H繹gsta l繹senords疇lder" -#: src/chage.c:174 +#: src/chage.c:169 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "Senaste l飉enords鄚dring (齬齬-MM-DD)" +msgstr "Senaste l繹senords瓣ndring (-MM-DD)" + +#: src/chage.c:177 +msgid "Password Expiration Warning" +msgstr "L繹senords upph繹rningsvarning" #: src/chage.c:183 -msgid "Password Expiration Warning" -msgstr "L飉enords upph顤ningsvarning" - -#: src/chage.c:189 msgid "Password Inactive" -msgstr "L飉enord inaktivt" +msgstr "L繹senord inaktivt" -#: src/chage.c:197 +#: src/chage.c:191 msgid "Account Expiration Date (YYYY-MM-DD)" -msgstr "Kontot upph顤 (齬齬-MM-DD)" +msgstr "Kontot upph繹r (-MM-DD)" -#. -#. * Start with the easy numbers - the number of days before the -#. * password can be changed, the number of days after which the -#. * password must be chaged, the number of days before the password -#. * expires that the user is told, and the number of days after the -#. * password expires that the account becomes unusable. -#. -#: src/chage.c:248 +#: src/chage.c:241 #, c-format msgid "Minimum:\t%ld\n" msgstr "Minst:\t%ld\n" -#: src/chage.c:249 +#: src/chage.c:242 #, c-format msgid "Maximum:\t%ld\n" -msgstr "H鐷st:\t%ld\n" +msgstr "H繹gst:\t%ld\n" -#: src/chage.c:251 +#: src/chage.c:243 #, c-format msgid "Warning:\t%ld\n" msgstr "Varning:\t%ld\n" -#: src/chage.c:252 +#: src/chage.c:244 #, c-format msgid "Inactive:\t%ld\n" msgstr "Inaktivt:\t%ld\n" -#. -#. * The "last change" date is either "Never" or the date the password -#. * was last modified. The date is the number of days since 1/1/1970. -#. -#: src/chage.c:260 +#: src/chage.c:251 msgid "Last Change:\t\t" -msgstr "Senaste 鄚dring:\t\t" +msgstr "Senaste 瓣ndring:\t\t" -#: src/chage.c:262 src/chage.c:276 src/chage.c:293 src/chage.c:306 +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 msgid "Never\n" msgstr "Aldrig\n" -#. -#. * The password expiration date is determined from the last change -#. * date plus the number of days the password is valid for. -#. -#: src/chage.c:273 +#: src/chage.c:264 msgid "Password Expires:\t" -msgstr "L飉enordet upph顤:\t" +msgstr "L繹senordet upph繹r:\t" -#. -#. * The account becomes inactive if the password is expired for more -#. * than "inactdays". The expiration date is calculated and the -#. * number of inactive days is added. The resulting date is when the -#. * active will be disabled. -#. -#: src/chage.c:290 +#: src/chage.c:280 msgid "Password Inactive:\t" -msgstr "L飉enord inaktiv:\t" +msgstr "L繹senord inaktiv:\t" -#. -#. * The account will expire on the given date regardless of the -#. * password expiring or not. -#. -#: src/chage.c:304 +#: src/chage.c:294 msgid "Account Expires:\t" -msgstr "L飉enordet upph顤:\t" +msgstr "L繹senordet upph繹r:\t" -#: src/chage.c:468 +#: src/chage.c:445 #, 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:481 src/chage.c:652 src/login.c:518 +#: src/chage.c:458 src/chage.c:588 src/login.c:503 #, c-format msgid "%s: permission denied\n" -msgstr "%s: till廞else nekas\n" +msgstr "%s: till疇telse nekas\n" -#: src/chage.c:512 src/chpasswd.c:139 src/groupadd.c:529 src/groupdel.c:322 -#: src/groupmod.c:520 src/newusers.c:381 src/useradd.c:1754 src/userdel.c:717 -#: src/usermod.c:1732 +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" -msgstr "%s: fel under till輍ning av metod f顤 鄢thetsbevisning\n" +msgstr "%s: fel under till瓣gning av metod f繹r 瓣kthetsbevisning\n" -#: src/chage.c:533 src/chpasswd.c:157 -#, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: kan inte l廛a l飉enordsfilen\n" - -#: src/chage.c:544 src/chpasswd.c:162 +#: src/chage.c:510 src/chpasswd.c:159 #, c-format msgid "%s: can't open password file\n" -msgstr "%s: kan inte 鞿pna l飉enordsfilen\n" +msgstr "%s: kan inte 繹ppna l繹senordsfilen\n" -#: src/chage.c:552 +#: src/chage.c:518 #, c-format msgid "%s: unknown user: %s\n" -msgstr "%s: ok鄚d anv鄚dare: %s\n" +msgstr "%s: ok瓣nd anv瓣ndare: %s\n" -#: src/chage.c:571 +#: src/chage.c:536 #, c-format msgid "%s: can't lock shadow password file" -msgstr "%s: kan inte l廛a skuggl飉enordsfilen" +msgstr "%s: kan inte l疇sa skuggl繹senordsfilen" -#: src/chage.c:579 +#: src/chage.c:544 #, c-format msgid "%s: can't open shadow password file" -msgstr "%s: kan inte 鞿pna skuggl飉enordsfilen" +msgstr "%s: kan inte 繹ppna skuggl繹senordsfilen" -#: src/chage.c:674 +#: src/chage.c:605 #, c-format msgid "Changing the aging information for %s\n" -msgstr "瓏drar 嶚dringsinformation f顤 %s\n" +msgstr "ndrar 疇ldringsinformation f繹r %s\n" -#: src/chage.c:677 +#: src/chage.c:608 #, c-format msgid "%s: error changing fields\n" -msgstr "%s: fel uppstod under byte av f鄟t\n" +msgstr "%s: fel uppstod under byte av f瓣lt\n" -#: src/chage.c:705 src/chage.c:771 src/pwunconv.c:174 +#: src/chage.c:632 src/pwunconv.c:138 #, c-format msgid "%s: can't update password file\n" -msgstr "%s: kan inte uppdatera l飉enordsfilen\n" +msgstr "%s: kan inte uppdatera l繹senordsfilen\n" -#: src/chage.c:737 src/pwunconv.c:168 +#: src/chage.c:661 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "%s: kan inte uppdatera skuggl飉enordsfilen\n" +msgstr "%s: kan inte uppdatera skuggl繹senordsfilen\n" -#: src/chage.c:789 src/chage.c:805 src/chfn.c:570 src/chsh.c:382 -#: src/passwd.c:747 src/passwd.c:859 +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 msgid "Error updating the DBM password entry.\n" -msgstr "Fel under uppdatering av DBM-l飉enordsnoteringen.\n" +msgstr "Fel under uppdatering av DBM-l繹senordsnoteringen.\n" -#: src/chage.c:823 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "%s: kan inte skriva om skuggl飉enordsfilen\n" +msgstr "%s: kan inte skriva om skuggl繹senordsfilen\n" -#: src/chage.c:838 +#: src/chage.c:707 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "%s: kan inte skriva om l飉enordsfilen\n" +msgstr "%s: kan inte skriva om l繹senordsfilen\n" -#: src/chage.c:857 src/chpasswd.c:343 src/groupadd.c:590 src/groupdel.c:409 -#: src/groupmod.c:604 src/newusers.c:628 src/useradd.c:1869 src/userdel.c:849 -#: src/usermod.c:1811 +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: kan inte l廛a upp filen\n" +msgstr "%s: kan inte l疇sa upp filen\n" -#: src/chfn.c:83 +#: src/chfn.c:84 #, c-format msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" "\t[-h home_ph] [-o other] [user]\n" msgstr "" "%s [-f hela_namnet] [-r rumsnummer] [-w arbetstele]\n" -"\t[-h hemtele] [-o 饘rigt] [anv鄚dare]\n" +"\t[-h hemtele] [-o 繹vrigt] [anv瓣ndare]\n" -#: src/chfn.c:88 +#: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -"Anv鄚dning: %s [-f hela_namnet] [-r rumsnummer] [-w arbetstele] [-h " +"Anv瓣ndning: %s [-f hela_namnet] [-r rumsnummer] [-w arbetstele] [-h " "hemtele]\n" -#: src/chfn.c:139 +#: src/chfn.c:140 msgid "Enter the new value, or press ENTER for the default\n" -msgstr "Skriv in det nya v酺det, eller tryck ENTER f顤 standardv酺det\n" +msgstr "Skriv in det nya v瓣rdet, eller tryck ENTER f繹r standardv瓣rdet\n" -#: src/chfn.c:142 +#: src/chfn.c:143 msgid "Full Name" msgstr "Hela namnet" -#: src/chfn.c:144 +#: src/chfn.c:145 #, c-format msgid "\tFull Name: %s\n" msgstr "\tHela namnet: %s\n" -#: src/chfn.c:147 +#: src/chfn.c:148 msgid "Room Number" msgstr "Rumsnummer" -#: src/chfn.c:149 +#: src/chfn.c:150 #, c-format msgid "\tRoom Number: %s\n" msgstr "\tRumsnummer: %s\n" -#: src/chfn.c:152 +#: src/chfn.c:153 msgid "Work Phone" msgstr "Arbetstelefonnummer" -#: src/chfn.c:154 +#: src/chfn.c:155 #, c-format msgid "\tWork Phone: %s\n" msgstr "\tArbetstelefonnummer: %s\n" -#: src/chfn.c:157 +#: src/chfn.c:158 msgid "Home Phone" msgstr "Hemtelefonnummer" -#: src/chfn.c:159 +#: src/chfn.c:160 #, c-format msgid "\tHome Phone: %s\n" msgstr "\tHemtelefonnummer: %s\n" -#: src/chfn.c:162 +#: src/chfn.c:163 msgid "Other" -msgstr "琌rigt" +msgstr "vrigt" -#: src/chfn.c:271 src/chfn.c:281 src/chfn.c:291 src/chfn.c:301 src/chfn.c:311 -#: src/chfn.c:379 src/passwd.c:1115 +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 #, c-format msgid "%s: Permission denied.\n" -msgstr "%s: Till廞else nekas.\n" +msgstr "%s: Till疇telse nekas.\n" -#: src/chfn.c:332 src/chsh.c:190 src/passwd.c:1165 +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 #, c-format msgid "%s: Unknown user %s\n" -msgstr "%s: Ok鄚d anv鄚dare %s\n" +msgstr "%s: Ok瓣nd anv瓣ndare %s\n" -#: src/chfn.c:341 src/chsh.c:198 src/passwd.c:1096 +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 #, c-format msgid "%s: Cannot determine your user name.\n" -msgstr "%s: Kan inte avg顤a ditt anv鄚darnamn.\n" +msgstr "%s: Kan inte avg繹ra ditt anv瓣ndarnamn.\n" -#: src/chfn.c:358 src/chsh.c:215 +#: src/chfn.c:359 src/chsh.c:210 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "%s: kan inte 鄚dra anv鄚dare \"%s\" p NIS-klienten.\n" +msgstr "%s: kan inte 瓣ndra anv瓣ndare \"%s\" p疇 NIS-klienten.\n" -#: src/chfn.c:366 src/chsh.c:223 +#: src/chfn.c:367 src/chsh.c:218 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: \"%s\" 酺 NIS-m酲tare f顤 denna klient.\n" +msgstr "%s: \"%s\" 瓣r NIS-m瓣stare f繹r denna klient.\n" -#: src/chfn.c:441 +#: src/chfn.c:442 #, c-format msgid "Changing the user information for %s\n" -msgstr "瓏drar anv鄚darinformation f顤 %s\n" +msgstr "ndrar anv瓣ndarinformation f繹r %s\n" -#: src/chfn.c:450 +#: src/chfn.c:451 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: felaktigt namn: \"%s\"\n" -#: src/chfn.c:456 +#: src/chfn.c:457 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: felaktigt rumsnummer: \"%s\"\n" -#: src/chfn.c:462 +#: src/chfn.c:463 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: felaktigt arbetstelefonnummer: \"%s\"\n" -#: src/chfn.c:468 +#: src/chfn.c:469 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: felaktigt hemtelefonnummer: \"%s\"\n" -#: src/chfn.c:475 +#: src/chfn.c:476 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s: \"%s\" inneh嶚ler otill廞na tecken\n" +msgstr "%s: \"%s\" inneh疇ller otill疇tna tecken\n" -#: src/chfn.c:488 +#: src/chfn.c:489 #, c-format msgid "%s: fields too long\n" -msgstr "%s: f顤 l幩ga f鄟t\n" +msgstr "%s: f繹r l疇nga f瓣lt\n" -#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277 +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 msgid "Cannot change ID to root.\n" -msgstr "Kan inte 鄚dra ID till root.\n" +msgstr "Kan inte 瓣ndra ID till root.\n" -#: src/chfn.c:519 src/chsh.c:331 src/passwd.c:656 src/passwd.c:811 +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 msgid "Cannot lock the password file; try again later.\n" -msgstr "Kan inte l廛a l飉enordsfilen; f顤s闥 igen senare.\n" +msgstr "Kan inte l疇sa l繹senordsfilen; f繹rs繹k igen senare.\n" -#: src/chfn.c:525 src/chsh.c:337 src/passwd.c:661 src/passwd.c:816 +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 msgid "Cannot open the password file.\n" -msgstr "Kan inte 鞿pna l飉enordsfilen.\n" +msgstr "Kan inte 繹ppna l繹senordsfilen.\n" -#: src/chfn.c:542 src/chsh.c:352 src/passwd.c:667 src/usermod.c:1348 +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s hittades inte i /etc/passwd\n" -#: src/chfn.c:561 src/chsh.c:373 src/passwd.c:740 src/passwd.c:852 +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 msgid "Error updating the password entry.\n" -msgstr "Fel under uppdatering av l飉enordsnoteringen.\n" +msgstr "Fel under uppdatering av l繹senordsnoteringen.\n" -#: src/chfn.c:585 src/chsh.c:397 src/passwd.c:755 src/passwd.c:867 +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 msgid "Cannot commit password file changes.\n" -msgstr "Kan inte genomf顤a 鄚dringar i l飉enordsfilen.\n" +msgstr "Kan inte genomf繹ra 瓣ndringar i l繹senordsfilen.\n" -#: src/chfn.c:592 src/chsh.c:404 +#: src/chfn.c:593 src/chsh.c:399 msgid "Cannot unlock the password file.\n" -msgstr "Kan inte l廛a upp l飉enordsfilen.\n" +msgstr "Kan inte l疇sa upp l繹senordsfilen.\n" -#: src/chpasswd.c:66 +#: src/chpasswd.c:67 #, c-format -msgid "usage: %s [-e]\n" -msgstr "Anv鄚dning: %s [-e]\n" +msgid "Usage: %s [-e]\n" +msgstr "Anv瓣ndning: %s [-e]\n" -#: src/chpasswd.c:171 src/pwconv.c:94 +#: src/chpasswd.c:154 +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: kan inte l疇sa l繹senordsfilen\n" + +#: src/chpasswd.c:168 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" -msgstr "%s: kan inte l廛a skuggfilen\n" +msgstr "%s: kan inte l疇sa skuggfilen\n" -#: src/chpasswd.c:177 src/gpasswd.c:596 src/pwconv.c:99 src/pwunconv.c:103 -#: src/pwunconv.c:108 +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s: kan inte 鞿pna skuggfilen\n" +msgstr "%s: kan inte 繹ppna skuggfilen\n" -#: src/chpasswd.c:200 src/newusers.c:460 +#: src/chpasswd.c:197 src/newusers.c:441 #, c-format msgid "%s: line %d: line too long\n" -msgstr "%s: rad %d: f顤 l幩g rad\n" +msgstr "%s: rad %d: f繹r l疇ng rad\n" -#: src/chpasswd.c:220 +#: src/chpasswd.c:217 #, c-format msgid "%s: line %d: missing new password\n" -msgstr "%s: rad %d: det nya l飉enordet saknas\n" +msgstr "%s: rad %d: det nya l繹senordet saknas\n" -#: src/chpasswd.c:237 +#: src/chpasswd.c:234 #, c-format msgid "%s: line %d: unknown user %s\n" -msgstr "%s: rad %d: ok鄚d anv鄚dare %s\n" +msgstr "%s: rad %d: ok瓣nd anv瓣ndare %s\n" -#: src/chpasswd.c:290 +#: src/chpasswd.c:280 #, c-format msgid "%s: line %d: cannot update password entry\n" -msgstr "%s: rad %d: kan inte uppdatera l飉enordsnoteringen\n" +msgstr "%s: rad %d: kan inte uppdatera l繹senordsnoteringen\n" -#: src/chpasswd.c:307 src/newusers.c:588 +#: src/chpasswd.c:297 src/newusers.c:569 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: fel uppt踄ktes, 鄚dringarna ignorerades\n" +msgstr "%s: fel uppt瓣cktes, 瓣ndringarna ignorerades\n" -#: src/chpasswd.c:319 +#: src/chpasswd.c:309 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: fel under uppdatering av skuggfilen\n" -#: src/chpasswd.c:328 +#: src/chpasswd.c:318 #, c-format msgid "%s: error updating password file\n" -msgstr "%s: fel under uppdatering av l飉enordsfilen\n" +msgstr "%s: fel under uppdatering av l繹senordsfilen\n" -#: src/chsh.c:75 +#: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" -msgstr "Anv鄚dning: %s [-s skal] [namn]\n" - -#: src/chsh.c:89 -msgid "Enter the new value, or press return for the default\n" -msgstr "Skriv in det nya v酺det, eller tryck p ENTER f顤 standardv酺det\n" +msgstr "Anv瓣ndning: %s [-s skal] [namn]\n" #: src/chsh.c:90 +msgid "Enter the new value, or press return for the default\n" +msgstr "Skriv in det nya v瓣rdet, eller tryck p疇 ENTER f繹r standardv瓣rdet\n" + +#: src/chsh.c:91 msgid "Login Shell" msgstr "Inloggningsskal" -#: src/chsh.c:239 src/chsh.c:253 +#: src/chsh.c:234 src/chsh.c:248 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "Du f緳 inte 鄚dra skal 廞 %s.\n" +msgstr "Du f疇r inte 瓣ndra skal 疇t %s.\n" -#: src/chsh.c:282 +#: src/chsh.c:277 #, c-format msgid "Changing the login shell for %s\n" -msgstr "瓏drar inloggningsskal 廞 %s\n" +msgstr "ndrar inloggningsskal 疇t %s\n" -#: src/chsh.c:294 +#: src/chsh.c:289 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Felaktig notering: %s\n" -#: src/chsh.c:301 +#: src/chsh.c:296 #, c-format msgid "%s is an invalid shell.\n" -msgstr "%s 酺 ett felaktigt skal.\n" - -#: src/dpasswd.c:52 -#, c-format -msgid "Usage: %s [-(a|d)] shell\n" -msgstr "Anv鄚dning: %s [-(a|d)] skal\n" - -#: src/dpasswd.c:115 -msgid "Shell password: " -msgstr "Skall飉enord: " - -#: src/dpasswd.c:121 -msgid "re-enter Shell password: " -msgstr "skriv in skall飉enordet igen: " - -#: src/dpasswd.c:129 -#, c-format -msgid "%s: Passwords do not match, try again.\n" -msgstr "%s: L飉enorden matchar inte varandra, f顤s闥 igen.\n" - -#: src/dpasswd.c:149 -#, c-format -msgid "%s: can't create %s" -msgstr "%s: kan inte skapa %s" - -#: src/dpasswd.c:155 -#, c-format -msgid "%s: can't open %s" -msgstr "%s: kan inte 鞿pna %s" - -#: src/dpasswd.c:183 -#, c-format -msgid "%s: Shell %s not found.\n" -msgstr "%s: Hittade inte skalet %s.\n" +msgstr "%s 瓣r ett felaktigt skal.\n" #: src/expiry.c:59 msgid "Usage: expiry {-f|-c}\n" -msgstr "Anv鄚dning: expiry {-f|-c}\n" +msgstr "Anv瓣ndning: expiry {-f|-c}\n" #: src/expiry.c:113 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" -msgstr "%s: VARNING! M廛te vara set-UID root!\n" +msgstr "%s: VARNING! M疇ste vara set-UID root!\n" #: src/expiry.c:124 #, c-format msgid "%s: unknown user\n" -msgstr "%s: ok鄚d anv鄚dare\n" +msgstr "%s: ok瓣nd anv瓣ndare\n" #: src/faillog.c:77 #, c-format -msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" msgstr "" -"Anv鄚dning: %s [-a|-u anv鄚dare] [-m h鐷st] [-r] [-t dagar] [-l l廛sek]\n" +"Anv瓣ndning: %s [-a|-u anv瓣ndare] [-m h繹gst] [-r] [-t dagar] [-l l疇ssek]\n" #: src/faillog.c:131 src/lastlog.c:96 #, c-format msgid "Unknown User: %s\n" -msgstr "Ok鄚d anv鄚dare: %s\n" +msgstr "Ok瓣nd anv瓣ndare: %s\n" #: src/faillog.c:212 msgid "Username Failures Maximum Latest\n" -msgstr "Anv鄚darnamn Felaktiga inloggningar H鐷sta Senaste\n" +msgstr "Anv瓣ndarnamn Felaktiga inloggningar H繹gsta Senaste\n" #: src/faillog.c:229 #, c-format msgid " %s on %s" -msgstr " %s p %s" +msgstr " %s p疇 %s" #: src/faillog.c:233 #, c-format @@ -715,118 +623,112 @@ msgstr " [%lds kvar]" #: src/faillog.c:237 #, c-format msgid " [%lds lock]" -msgstr " [%lds l廛ning]" +msgstr " [%lds l疇sning]" #: src/gpasswd.c:78 #, c-format -msgid "usage: %s [-r|-R] group\n" -msgstr "Anv鄚dning: %s [-r|-R] grupp\n" +msgid "Usage: %s [-r|-R] group\n" +msgstr "Anv瓣ndning: %s [-r|-R] grupp\n" #: src/gpasswd.c:79 #, c-format msgid " %s [-a user] group\n" -msgstr " %s [-a anv鄚dare] grupp\n" +msgstr " %s [-a anv瓣ndare] grupp\n" #: src/gpasswd.c:80 #, c-format msgid " %s [-d user] group\n" -msgstr " %s [-d anv鄚dare] grupp\n" +msgstr " %s [-d anv瓣ndare] grupp\n" #: src/gpasswd.c:83 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" -msgstr " %s [-A anv鄚dare,...] [-M anv鄚dare,...] grupp\n" +msgstr " %s [-A anv瓣ndare,...] [-M anv瓣ndare,...] grupp\n" #: src/gpasswd.c:85 #, c-format msgid " %s [-M user,...] group\n" -msgstr " %s [-M anv鄚dare,...] grupp\n" +msgstr " %s [-M anv瓣ndare,...] grupp\n" #: src/gpasswd.c:146 src/gpasswd.c:230 #, c-format msgid "%s: unknown user %s\n" -msgstr "%s: ok鄚d anv鄚dare %s\n" +msgstr "%s: ok瓣nd anv瓣ndare %s\n" #: src/gpasswd.c:157 msgid "Permission denied.\n" -msgstr "Till廞else nekas.\n" +msgstr "Till疇telse nekas.\n" #: src/gpasswd.c:243 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s: skuggruppl飉enord kr銥s f顤 -A\n" +msgstr "%s: skuggruppl繹senord kr瓣vs f繹r -A\n" #: src/gpasswd.c:294 msgid "Who are you?\n" -msgstr "Vem 酺 du?\n" +msgstr "Vem 瓣r du?\n" -#: src/gpasswd.c:313 src/newgrp.c:297 +#: src/gpasswd.c:313 src/newgrp.c:292 #, c-format msgid "unknown group: %s\n" -msgstr "ok鄚d grupp: %s\n" +msgstr "ok瓣nd grupp: %s\n" #: src/gpasswd.c:422 #, c-format msgid "Adding user %s to group %s\n" -msgstr "L輍ger till anv鄚dare %s till grupp %s\n" +msgstr "L瓣gger till anv瓣ndare %s till grupp %s\n" #: src/gpasswd.c:440 #, c-format msgid "Removing user %s from group %s\n" -msgstr "Tar bort anv鄚dare %s fr幩 grupp %s\n" +msgstr "Tar bort anv瓣ndare %s fr疇n grupp %s\n" #: src/gpasswd.c:454 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s: ok鄚d medlem %s\n" +msgstr "%s: ok瓣nd medlem %s\n" #: src/gpasswd.c:501 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Inte en tty\n" -#. -#. * A new password is to be entered and it must be encrypted, etc. -#. * The password will be prompted for twice, and both entries must be -#. * identical. There is no need to validate the old password since -#. * the invoker is either the group owner, or root. -#. #: src/gpasswd.c:522 #, c-format msgid "Changing the password for group %s\n" -msgstr "瓏drar l飉enordet f顤 grupp %s\n" +msgstr "ndrar l繹senordet f繹r grupp %s\n" #: src/gpasswd.c:525 msgid "New Password: " -msgstr "Nytt l飉enord: " +msgstr "Nytt l繹senord: " -#: src/gpasswd.c:530 src/passwd.c:365 +#: src/gpasswd.c:530 src/passwd.c:281 msgid "Re-enter new password: " -msgstr "Skriv in det nya l飉enordet igen: " +msgstr "Skriv in det nya l繹senordet igen: " #: src/gpasswd.c:542 msgid "They don't match; try again" -msgstr "De matchar inte; f顤s闥 igen" +msgstr "De matchar inte; f繹rs繹k igen" #: src/gpasswd.c:546 #, c-format msgid "%s: Try again later\n" -msgstr "%s: F顤s闥 igen senare\n" +msgstr "%s: F繹rs繹k igen senare\n" #: src/gpasswd.c:578 #, c-format msgid "%s: can't get lock\n" -msgstr "%s: kan inte l廛a\n" +msgstr "%s: kan inte l疇sa\n" #: src/gpasswd.c:584 #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s: kan inte l廛a skuggfilen\n" +msgstr "%s: kan inte l疇sa skuggfilen\n" #: src/gpasswd.c:590 #, c-format msgid "%s: can't open file\n" -msgstr "%s: kan inte 鞿pna filen\n" +msgstr "%s: kan inte 繹ppna filen\n" #: src/gpasswd.c:602 #, c-format @@ -851,7 +753,7 @@ msgstr "%s: kan inte skriva om skuggfilen\n" #: src/gpasswd.c:630 #, c-format msgid "%s: can't unlock file\n" -msgstr "%s: kan inte l廛a upp filen\n" +msgstr "%s: kan inte l疇sa upp filen\n" #: src/gpasswd.c:635 #, c-format @@ -863,138 +765,132 @@ msgstr "%s: kan inte uppdatera DBM-filer\n" msgid "%s: can't update DBM shadow files\n" msgstr "%s: kan inte uppdatera DBM-skuggfiler\n" -#: src/groupadd.c:101 -msgid "usage: groupadd [-g gid [-o]] group\n" -msgstr "Anv鄚dning: groupadd [-g gid [-o]] grupp\n" +#: src/groupadd.c:102 +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" +msgstr "Anv瓣ndning: groupadd [-g gid [-o]] [-f] grupp\n" -#: src/groupadd.c:167 src/groupadd.c:192 src/groupmod.c:179 src/groupmod.c:228 -#: src/useradd.c:970 src/usermod.c:552 src/usermod.c:695 +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s: gick inte att l輍ga till en ny gruppnotering\n" +msgstr "%s: gick inte att l瓣gga till en ny gruppnotering\n" -#: src/groupadd.c:178 src/groupadd.c:203 src/groupmod.c:197 src/useradd.c:981 -#: src/usermod.c:564 src/usermod.c:708 +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 #, c-format msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: kan inte l輍ga till en ny dbm-gruppnotering\n" +msgstr "%s: kan inte l瓣gga till en ny dbm-gruppnotering\n" -#: src/groupadd.c:255 src/useradd.c:1034 +#: src/groupadd.c:256 src/useradd.c:977 #, c-format msgid "%s: name %s is not unique\n" -msgstr "%s: namnet %s 酺 inte unikt\n" +msgstr "%s: namnet %s 瓣r inte unikt\n" -#: src/groupadd.c:270 +#: src/groupadd.c:271 #, c-format msgid "%s: gid %u is not unique\n" -msgstr "%s: gid %u 酺 inte unikt\n" +msgstr "%s: gid %u 瓣r inte unikt\n" -#: src/groupadd.c:294 +#: src/groupadd.c:295 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: kan inte hitta ett unikt gid\n" -#. -#. * All invalid group names land here. -#. -#: src/groupadd.c:317 src/groupmod.c:341 +#: src/groupadd.c:318 src/groupmod.c:342 #, c-format msgid "%s: %s is a not a valid group name\n" -msgstr "%s: %s 酺 inte ett giltigt gruppnamn\n" +msgstr "%s: %s 瓣r inte ett giltigt gruppnamn\n" -#: src/groupadd.c:346 src/groupmod.c:366 +#: src/groupadd.c:347 src/groupmod.c:367 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: ogiltig grupp %s\n" -#: src/groupadd.c:363 src/useradd.c:1313 +#: src/groupadd.c:364 src/useradd.c:1173 #, c-format msgid "%s: -O requires NAME=VALUE\n" -msgstr "%s: -O kr銥er NAME=V麗DE\n" +msgstr "%s: -O kr瓣ver NAME=VRDE\n" -#: src/groupadd.c:407 src/groupdel.c:173 src/groupmod.c:401 src/useradd.c:1428 -#: src/userdel.c:312 src/usermod.c:576 +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: kan inte skriva om gruppfilen\n" -#: src/groupadd.c:415 src/groupdel.c:179 src/groupmod.c:409 src/useradd.c:1437 -#: src/userdel.c:319 src/usermod.c:722 +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: kan inte skriva om skuggruppfilen\n" -#: src/groupadd.c:433 src/groupdel.c:198 src/groupmod.c:427 src/userdel.c:403 +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s: kan inte l廛a gruppfilen\n" +msgstr "%s: kan inte l疇sa gruppfilen\n" -#: src/groupadd.c:438 src/groupdel.c:202 src/groupmod.c:432 +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 #, c-format msgid "%s: unable to open group file\n" -msgstr "%s: kan inte 鞿pna gruppfilen\n" +msgstr "%s: kan inte 繹ppna gruppfilen\n" -#: src/groupadd.c:445 src/groupdel.c:207 src/groupmod.c:439 src/userdel.c:414 +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: kan inte l廛a skuggruppfilen\n" +msgstr "%s: kan inte l疇sa skuggruppfilen\n" -#: src/groupadd.c:451 src/groupdel.c:212 src/groupmod.c:445 +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: kan inte 鞿pna skuggruppfilen\n" +msgstr "%s: kan inte 繹ppna skuggruppfilen\n" -#: src/groupadd.c:562 +#: src/groupadd.c:563 #, c-format msgid "%s: group %s exists\n" msgstr "%s: grupp %s existerar\n" -#: src/groupdel.c:92 -msgid "usage: groupdel group\n" -msgstr "Anv鄚dning: groupdel grupp\n" +#: src/groupdel.c:88 +msgid "Usage: groupdel group\n" +msgstr "Anv瓣ndning: groupdel grupp\n" -#: src/groupdel.c:110 src/groupmod.c:184 src/groupmod.c:233 +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: fel under borttagning av gruppnotering\n" -#: src/groupdel.c:122 src/groupmod.c:204 +#: src/groupdel.c:119 src/groupmod.c:205 #, c-format msgid "%s: error removing group dbm entry\n" msgstr "%s: fel under borttagning av dbm-gruppnotering\n" -#: src/groupdel.c:137 +#: src/groupdel.c:135 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: fel under borttagning av skuggruppnotering\n" -#: src/groupdel.c:150 src/groupmod.c:254 +#: src/groupdel.c:149 src/groupmod.c:255 #, c-format msgid "%s: error removing shadow group dbm entry\n" msgstr "%s: fel under borttagning av dbm-skuggruppnotering\n" -#. -#. * Can't remove the group. -#. -#: src/groupdel.c:254 +#: src/groupdel.c:255 #, c-format msgid "%s: cannot remove user's primary group.\n" -msgstr "%s: kan inte ta bort anv鄚darens prim酺a grupp.\n" +msgstr "%s: kan inte ta bort anv瓣ndarens prim瓣ra grupp.\n" -#: src/groupdel.c:355 src/groupmod.c:550 +#: src/groupdel.c:359 src/groupmod.c:551 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: grupp %s existerar inte\n" -#: src/groupdel.c:369 src/groupmod.c:566 +#: src/groupdel.c:373 src/groupmod.c:567 #, c-format msgid "%s: group %s is a NIS group\n" -msgstr "%s: grupp %s 酺 en NIS-grupp\n" +msgstr "%s: grupp %s 瓣r en NIS-grupp\n" -#: src/groupdel.c:375 src/groupmod.c:571 src/userdel.c:776 src/usermod.c:1045 +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 #, c-format msgid "%s: %s is the NIS master\n" -msgstr "%s: %s 酺 NIS-m酲teren\n" +msgstr "%s: %s 瓣r NIS-m瓣steren\n" #: src/groupmems.c:95 msgid "Member already exists\n" @@ -1005,7 +901,7 @@ msgid "Member to remove could not be found\n" msgstr "" #: src/groupmems.c:158 -msgid "usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" msgstr "" #: src/groupmems.c:201 @@ -1022,54 +918,54 @@ msgstr "" #: src/groupmems.c:215 msgid "Unable to lock group file\n" -msgstr "Kan inte l廛a gruppfilen\n" +msgstr "Kan inte l疇sa gruppfilen\n" #: src/groupmems.c:220 msgid "Unable to open group file\n" -msgstr "Kan inte 鞿pna gruppfilen\n" +msgstr "Kan inte 繹ppna gruppfilen\n" #: src/groupmems.c:240 msgid "Cannot close group file\n" -msgstr "Kan inte 鞿pna gruppfilen\n" +msgstr "Kan inte 繹ppna gruppfilen\n" -#: src/groupmod.c:103 -msgid "usage: groupmod [-g gid [-o]] [-n name] group\n" -msgstr "Anv鄚dning: groupmod [-g gid [-o]] [-n namn] grupp\n" +#: src/groupmod.c:104 +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "Anv瓣ndning: groupmod [-g gid [-o]] [-n namn] grupp\n" -#: src/groupmod.c:161 +#: src/groupmod.c:162 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s hittades inte i /etc/group\n" -#: src/groupmod.c:247 +#: src/groupmod.c:248 #, c-format msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: kunde inte l輍ga till en ny dbm-skuggruppnotering\n" +msgstr "%s: kunde inte l瓣gga till en ny dbm-skuggruppnotering\n" -#: src/groupmod.c:300 +#: src/groupmod.c:301 #, c-format msgid "%s: %u is not a unique gid\n" -msgstr "%s: %u 酺 inte ett unikt gid\n" +msgstr "%s: %u 瓣r inte ett unikt gid\n" -#: src/groupmod.c:330 +#: src/groupmod.c:331 #, c-format msgid "%s: %s is not a unique name\n" -msgstr "%s: %s 酺 inte ett unikt namn\n" +msgstr "%s: %s 瓣r inte ett unikt namn\n" #: src/groups.c:59 #, c-format msgid "unknown user %s\n" -msgstr "ok鄚d anv鄚dare %s\n" +msgstr "ok瓣nd anv瓣ndare %s\n" #: src/grpck.c:87 #, c-format msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" -msgstr "Anv鄚dning: %s [-s] [-r] [grupp [gshadow]]\n" +msgstr "Anv瓣ndning: %s [-s] [-r] [grupp [gshadow]]\n" #: src/grpck.c:90 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" -msgstr "Anv鄚dning: %s [-s] [-r] [grupp]\n" +msgstr "Anv瓣ndning: %s [-s] [-r] [grupp]\n" #: src/grpck.c:108 src/pwck.c:108 msgid "No" @@ -1083,18 +979,14 @@ msgstr "" #: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s: kan inte l廛a filen %s\n" +msgstr "%s: kan inte l疇sa filen %s\n" #: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:202 src/pwck.c:242 #: src/pwck.c:251 #, c-format msgid "%s: cannot open file %s\n" -msgstr "%s: kan inte 鞿pna filen %s\n" +msgstr "%s: kan inte 繹ppna filen %s\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:311 msgid "invalid group file entry\n" msgstr "felaktig gruppfilsnotering\n" @@ -1106,10 +998,6 @@ msgstr "felaktig gruppfilsnotering\n" msgid "delete line `%s'? " msgstr "ta bort rad \"%s\"? " -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:374 msgid "duplicate group entry\n" msgstr "dubblett av gruppnotering\n" @@ -1122,25 +1010,17 @@ msgstr "ogiltigt gruppnamn \"%s\"\n" #: src/grpck.c:418 #, c-format msgid "group %s: no user %s\n" -msgstr "grupp %s: anv鄚daren %s finns inte\n" +msgstr "grupp %s: anv瓣ndaren %s finns inte\n" #: src/grpck.c:420 src/grpck.c:590 #, c-format msgid "delete member `%s'? " msgstr "ta bort medlem \"%s\"? " -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:457 msgid "invalid shadow group file entry\n" msgstr "felaktig skuggruppfilsnotering\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:520 msgid "duplicate shadow group entry\n" msgstr "dubblett av skuggruppfilsnotering\n" @@ -1152,7 +1032,7 @@ msgstr "inga matchande gruppfilsnoteringar\n" #: src/grpck.c:558 #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "skuggrupp %s: finns ingen administrativ anv鄚dare %s\n" +msgstr "skuggrupp %s: finns ingen administrativ anv瓣ndare %s\n" #: src/grpck.c:560 #, c-format @@ -1162,7 +1042,7 @@ msgstr "ta bort administrativa medlemmen \"%s\"? " #: src/grpck.c:588 #, c-format msgid "shadow group %s: no user %s\n" -msgstr "skuggrupp %s: finns ingen anv鄚dare %s\n" +msgstr "skuggrupp %s: finns ingen anv瓣ndare %s\n" #: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 #, c-format @@ -1172,227 +1052,214 @@ msgstr "%s: kan inte uppdatera filen %s\n" #: src/grpck.c:647 src/pwck.c:612 #, c-format msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: filerna 酺 uppdaterade; k顤 mkpasswd\n" +msgstr "%s: filerna 瓣r uppdaterade; k繹r mkpasswd\n" #: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 #, c-format msgid "%s: no changes\n" -msgstr "%s: inga 鄚dringar\n" +msgstr "%s: inga 瓣ndringar\n" #: src/grpck.c:651 src/pwck.c:616 #, c-format msgid "%s: the files have been updated\n" -msgstr "%s: filerna 酺 uppdaterade\n" +msgstr "%s: filerna 瓣r uppdaterade\n" #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" -msgstr "%s: kan inte l廛a gruppfilen\n" +msgstr "%s: kan inte l疇sa gruppfilen\n" #: src/grpconv.c:65 src/grpunconv.c:61 #, c-format msgid "%s: can't open group file\n" -msgstr "%s: kan inte 鞿pna gruppfilen\n" +msgstr "%s: kan inte 繹ppna gruppfilen\n" #: src/grpconv.c:70 src/grpunconv.c:66 #, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: kan inte l廛a skuggruppfilen\n" +msgstr "%s: kan inte l疇sa skuggruppfilen\n" #: src/grpconv.c:76 src/grpunconv.c:72 #, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: kan inte 鞿pna skuggruppfilen\n" +msgstr "%s: kan inte 繹ppna skuggruppfilen\n" #: src/grpconv.c:94 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: kan inte ta bort skuggruppen %s\n" -#: src/grpconv.c:138 src/pwconv.c:153 +#: src/grpconv.c:133 src/pwconv.c:154 #, c-format msgid "%s: can't update shadow entry for %s\n" -msgstr "%s: kan inte uppdatera skuggnoteringen f顤 %s\n" +msgstr "%s: kan inte uppdatera skuggnoteringen f繹r %s\n" -#: src/grpconv.c:148 src/grpunconv.c:91 +#: src/grpconv.c:143 src/grpunconv.c:91 #, c-format msgid "%s: can't update entry for group %s\n" -msgstr "%s: kan inte uppdatera noteringen f顤 gruppen %s\n" +msgstr "%s: kan inte uppdatera noteringen f繹r gruppen %s\n" -#: src/grpconv.c:155 src/grpunconv.c:99 +#: src/grpconv.c:150 src/grpunconv.c:99 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: kan inte uppdatera skuggruppfilen\n" -#: src/grpconv.c:160 src/grpunconv.c:105 +#: src/grpconv.c:155 src/grpunconv.c:105 #, c-format msgid "%s: can't update group file\n" msgstr "%s: kan inte uppdatera gruppfilen\n" -#: src/grpconv.c:175 src/grpunconv.c:127 -#, c-format -msgid "%s: not configured for shadow group support.\n" -msgstr "%s: inte konfigurerad med st鐰 f顤 skuggrupper.\n" - #: src/grpunconv.c:110 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: kan inte ta bort skuggruppfilen\n" #: src/id.c:53 -msgid "usage: id [-a]\n" -msgstr "Anv鄚dning: id [-a]\n" +msgid "Usage: id [-a]\n" +msgstr "Anv瓣ndning: id [-a]\n" #: src/id.c:55 -msgid "usage: id\n" -msgstr "Anv鄚dning: id\n" +msgid "Usage: id\n" +msgstr "Anv瓣ndning: id\n" -#. -#. * Start off the group message. It will be of the format -#. * -#. * groups=###(aaa),###(aaa),###(aaa) -#. * -#. * where "###" is a numerical value and "aaa" is the -#. * corresponding name for each respective numerical value. -#. #: src/id.c:169 msgid " groups=" msgstr " grupper=" #: src/lastlog.c:110 src/lastlog.c:116 #, c-format -msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n" +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" msgstr "" #: src/lastlog.c:181 msgid "Username Port From Latest\n" -msgstr "Anv鄚darnamn Port Fr幩 Senaste\n" +msgstr "Anv瓣ndarnamn Port Fr疇n Senaste\n" #: src/lastlog.c:183 msgid "Username Port Latest\n" -msgstr "Anv鄚darnamn Port Senaste\n" +msgstr "Anv瓣ndarnamn Port Senaste\n" -#: src/lastlog.c:197 +#: src/lastlog.c:198 msgid "**Never logged in**" msgstr "**Aldrig inloggad**" -#: src/login.c:185 +#: src/login.c:175 #, c-format -msgid "usage: %s [-p] [name]\n" -msgstr "Anv鄚dning: %s [-p] [namn]\n" +msgid "Usage: %s [-p] [name]\n" +msgstr "Anv瓣ndning: %s [-p] [namn]\n" -#: src/login.c:188 +#: src/login.c:178 #, c-format msgid " %s [-p] [-h host] [-f name]\n" -msgstr " %s [-p] [-h v酺d] [-f namn]\n" +msgstr " %s [-p] [-h v瓣rd] [-f namn]\n" -#: src/login.c:190 +#: src/login.c:180 #, c-format msgid " %s [-p] -r host\n" -msgstr " %s [-p] -r v酺d\n" +msgstr " %s [-p] -r v瓣rd\n" -#: src/login.c:274 +#: src/login.c:259 msgid "Invalid login time\n" msgstr "Felaktig inloggningstid\n" -#: src/login.c:329 +#: src/login.c:314 msgid "" "\n" "System closed for routine maintenance\n" msgstr "" "\n" -"Systemet 酺 st鄚gt f顤 rutinunderh嶚l\n" +"Systemet 瓣r st瓣ngt f繹r rutinunderh疇ll\n" -#: src/login.c:340 +#: src/login.c:325 msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[Nerkoppling kringgicks -- root inloggning till廞en.]\n" +"[Nerkoppling kringgicks -- root inloggning till疇ten.]\n" -#: src/login.c:377 +#: src/login.c:362 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" "\n" -"Inloggningen avbr飆s efter %d sekunders inaktivitet.\n" +"Inloggningen avbr繹ts efter %d sekunders inaktivitet.\n" -#: src/login.c:689 +#: src/login.c:648 #, c-format msgid " on `%.100s' from `%.200s'" -msgstr " p \"%.100s\" fr幩 \"%.200s\"" +msgstr " p疇 \"%.100s\" fr疇n \"%.200s\"" -#: src/login.c:693 +#: src/login.c:652 #, c-format msgid " on `%.100s'" -msgstr " p \"%.100s\"" +msgstr " p疇 \"%.100s\"" -#: src/login.c:852 +#: src/login.c:811 #, c-format msgid "" "\n" "%s login: " msgstr "" "\n" -"%s anv鄚dare: " +"%s anv瓣ndare: " -#: src/login.c:855 +#: src/login.c:814 msgid "login: " -msgstr "anv鄚dare: " +msgstr "anv瓣ndare: " -#: src/login.c:1071 src/sulogin.c:233 +#: src/login.c:1013 src/sulogin.c:205 msgid "Login incorrect" msgstr "Felaktig inloggning" -#: src/login.c:1265 +#: src/login.c:1193 msgid "Warning: login re-enabled after temporary lockout.\n" -msgstr "Varning: inloggning p nytt aktiv efter den tempor酺a utel廛ningen.\n" +msgstr "Varning: inloggning p疇 nytt aktiv efter den tempor瓣ra utel疇sningen.\n" -#: src/login.c:1278 +#: src/login.c:1207 #, c-format msgid "Last login: %s on %s" -msgstr "Senaste inloggning: %s p %s" +msgstr "Senaste inloggning: %s p疇 %s" -#: src/login.c:1281 +#: src/login.c:1210 #, c-format msgid "Last login: %.19s on %s" -msgstr "Senaste inloggning: %.19s p %s" +msgstr "Senaste inloggning: %.19s p疇 %s" -#: src/login.c:1287 +#: src/login.c:1216 #, c-format msgid " from %.*s" -msgstr " fr幩 %.*s" +msgstr " fr疇n %.*s" -#: src/login.c:1364 +#: src/login.c:1293 msgid "Starting rad_login\n" msgstr "Startar rad_login\n" #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" -msgstr "%s: ingen DBM-databas p systemet - ingen 廞g酺d genomf顤des\n" +msgstr "%s: ingen DBM-databas p疇 systemet - ingen 疇tg瓣rd genomf繹rdes\n" #: src/mkpasswd.c:232 src/mkpasswd.c:237 #, c-format msgid "%s: cannot overwrite file %s\n" -msgstr "%s: kan inte skriva 饘er filen %s\n" +msgstr "%s: kan inte skriva 繹ver filen %s\n" #: src/mkpasswd.c:252 #, c-format msgid "%s: cannot open DBM files for %s\n" -msgstr "%s: kan inte 鞿pna DBM-filer f顤 %s\n" +msgstr "%s: kan inte 繹ppna DBM-filer f繹r %s\n" #: src/mkpasswd.c:287 #, c-format msgid "%s: the beginning with " -msgstr "%s: b顤jan med " +msgstr "%s: b繹rjan med " #: src/mkpasswd.c:288 msgid " is too long\n" -msgstr " f顤 l幩ga f鄟t\n" +msgstr " f繹r l疇nga f瓣lt\n" #: src/mkpasswd.c:315 #, c-format @@ -1401,7 +1268,7 @@ msgstr "%s: fel under analysering av rad \"%s\"\n" #: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338 msgid "adding record for name " -msgstr "l輍ger till notering f顤 namn " +msgstr "l瓣gger till notering f繹r namn " #: src/mkpasswd.c:324 src/mkpasswd.c:329 src/mkpasswd.c:334 src/mkpasswd.c:339 #: src/mkpasswd.c:345 src/mkpasswd.c:351 src/mkpasswd.c:356 src/mkpasswd.c:361 @@ -1411,385 +1278,324 @@ msgstr "" #: src/mkpasswd.c:344 src/mkpasswd.c:350 src/mkpasswd.c:355 src/mkpasswd.c:360 #, c-format msgid "%s: error adding record for " -msgstr "%s: fel under till輍g av notering f顤 " +msgstr "%s: fel under till瓣gg av notering f繹r " #: src/mkpasswd.c:378 #, c-format msgid "added %d entries, longest was %d\n" -msgstr "lade till %d noteringar, den l鄚gsta var %d\n" +msgstr "lade till %d noteringar, den l瓣ngsta var %d\n" #: src/mkpasswd.c:392 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" -msgstr "Anv鄚dning: %s [-vf] [-p|g|sp|sg] fil\n" +msgstr "Anv瓣ndning: %s [-vf] [-p|g|sp|sg] fil\n" #: src/mkpasswd.c:395 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" -msgstr "Anv鄚dning: %s [-vf] [-p|g|sp] fil\n" +msgstr "Anv瓣ndning: %s [-vf] [-p|g|sp] fil\n" #: src/mkpasswd.c:398 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" -msgstr "Anv鄚dning: %s [-vf] [-p|g] fil\n" +msgstr "Anv瓣ndning: %s [-vf] [-p|g] fil\n" #: src/newgrp.c:61 -msgid "usage: newgrp [-] [group]\n" -msgstr "Anv鄚dning: newgrp [-] [grupp]\n" +msgid "Usage: newgrp [-] [group]\n" +msgstr "Anv瓣ndning: newgrp [-] [grupp]\n" #: src/newgrp.c:63 -msgid "usage: sg group [[-c] command]\n" -msgstr "Anv鄚dning: sg grupp [[-c] kommando]\n" +msgid "Usage: sg group [[-c] command]\n" +msgstr "Anv瓣ndning: sg grupp [[-c] kommando]\n" -#: src/newgrp.c:136 +#: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" -msgstr "ok鄚t uid: %u\n" +msgstr "ok瓣nt uid: %u\n" -#: src/newgrp.c:219 +#: src/newgrp.c:214 #, c-format msgid "unknown gid: %lu\n" -msgstr "ok鄚t gid: %lu\n" +msgstr "ok瓣nt gid: %lu\n" -#: src/newgrp.c:365 src/newgrp.c:374 +#: src/newgrp.c:360 src/newgrp.c:369 msgid "Sorry.\n" -msgstr "Tyv酺r.\n" +msgstr "Tyv瓣rr.\n" -#: src/newgrp.c:472 +#: src/newgrp.c:469 msgid "too many groups\n" -msgstr "f顤 m幩ga grupper\n" +msgstr "f繹r m疇nga grupper\n" #: src/newusers.c:78 #, c-format msgid "Usage: %s [input]\n" -msgstr "Anv鄚dning: %s [indata]\n" +msgstr "Anv瓣ndning: %s [indata]\n" -#: src/newusers.c:407 +#: src/newusers.c:388 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s: kan inte l廛a /etc/passwd.\n" +msgstr "%s: kan inte l疇sa /etc/passwd.\n" -#: src/newusers.c:419 +#: src/newusers.c:400 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s: kan inte l廛a filerna, f顤s闥 igen senare\n" +msgstr "%s: kan inte l疇sa filerna, f繹rs繹k igen senare\n" -#: src/newusers.c:435 +#: src/newusers.c:416 #, c-format msgid "%s: can't open files\n" -msgstr "%s: kan inte 鞿pna filerna\n" +msgstr "%s: kan inte 繹ppna filerna\n" -#: src/newusers.c:480 +#: src/newusers.c:461 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: rad %d: ogiltig rad\n" -#: src/newusers.c:499 +#: src/newusers.c:480 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: rad %d: kan inte skapa GID\n" -#: src/newusers.c:515 +#: src/newusers.c:496 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: rad %d: kan inte skapa UID\n" -#: src/newusers.c:528 +#: src/newusers.c:509 #, c-format msgid "%s: line %d: cannot find user %s\n" -msgstr "%s: rad %d: kan inte hitta anv鄚daren %s\n" +msgstr "%s: rad %d: kan inte hitta anv瓣ndaren %s\n" -#: src/newusers.c:537 +#: src/newusers.c:518 #, c-format msgid "%s: line %d: can't update password\n" -msgstr "%s: rad %d: kan inte uppdatera l飉enordet\n" +msgstr "%s: rad %d: kan inte uppdatera l繹senordet\n" -#: src/newusers.c:555 +#: src/newusers.c:536 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: rad %d: mkdir misslyckades\n" -#: src/newusers.c:561 +#: src/newusers.c:542 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: rad %d: chown misslyckades\n" -#: src/newusers.c:571 +#: src/newusers.c:552 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: rad %d: kan inte uppdatera notering\n" -#: src/newusers.c:603 +#: src/newusers.c:584 #, c-format msgid "%s: error updating files\n" msgstr "%s: kunde inte uppdatera filerna\n" -#: src/passwd.c:174 +#: src/passwd.c:155 #, c-format -msgid "usage: %s [-f|-s] [name]\n" -msgstr "Anv鄚dning: %s [-f|-s] [namn]\n" +msgid "Usage: %s [-f|-s] [name]\n" +msgstr "Anv瓣ndning: %s [-f|-s] [namn]\n" -#: src/passwd.c:178 +#: src/passwd.c:159 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" -msgstr " %s [-x h鐷st] [-n minst] [-w varna] [-i inaktiv] namn\n" +msgstr " %s [-x h繹gst] [-n minst] [-w varna] [-i inaktiv] namn\n" -#: src/passwd.c:180 +#: src/passwd.c:161 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} namn\n" -#: src/passwd.c:283 -#, c-format -msgid "User %s has a TCFS key, his old password is required.\n" -msgstr "Anv鄚dare %s har en TCFS-nyckel, hans f顤ra l飉enord kr銥s.\n" - -#: src/passwd.c:286 -msgid "You can use -t option to force the change.\n" -msgstr "Du kan anv鄚da flaggan -t f顤 att p廞vinga 鄚dringen.\n" - -#: src/passwd.c:292 +#: src/passwd.c:216 msgid "Old password: " -msgstr "F顤ra l飉enordet: " +msgstr "F繹rra l繹senordet: " -#: src/passwd.c:301 +#: src/passwd.c:225 #, c-format msgid "Incorrect password for `%s'\n" -msgstr "Felaktigt l飉enord f顤 \"%s\"\n" +msgstr "Felaktigt l繹senord f繹r \"%s\"\n" -#: src/passwd.c:314 -#, c-format -msgid "Warning: user %s has a TCFS key.\n" -msgstr "Varning: anv鄚dare %s har en TCFS-nyckel.\n" - -#: src/passwd.c:333 +#: src/passwd.c:249 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -"Skriv in det nya l飉enordet (minst %d, h鐷st %d tecken)\n" -"Var god anv鄚d en kombination av versaler, gemener och siffror.\n" +"Skriv in det nya l繹senordet (minst %d, h繹gst %d tecken)\n" +"Var god anv瓣nd en kombination av versaler, gemener och siffror.\n" -#: src/passwd.c:339 +#: src/passwd.c:255 msgid "New password: " -msgstr "Nytt l飉enord: " +msgstr "Nytt l繹senord: " -#: src/passwd.c:350 +#: src/passwd.c:266 msgid "Try again.\n" -msgstr "F顤s闥 igen.\n" +msgstr "F繹rs繹k igen.\n" -#: src/passwd.c:361 +#: src/passwd.c:277 msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"Varning: svagt l飉enord (skriv in det igen f顤 att anv鄚da det 鄚d).\n" +"Varning: svagt l繹senord (skriv in det igen f繹r att anv瓣nda det 瓣nd疇).\n" -#: src/passwd.c:371 +#: src/passwd.c:287 msgid "They don't match; try again.\n" -msgstr "De matchar inte; f顤s闥 igen.\n" +msgstr "De matchar inte; f繹rs繹k igen.\n" -#: src/passwd.c:451 src/passwd.c:469 +#: src/passwd.c:364 src/passwd.c:382 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "L飉enordet f顤 %s kan inte bytas.\n" +msgstr "L繹senordet f繹r %s kan inte bytas.\n" -#: src/passwd.c:494 +#: src/passwd.c:396 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "Tyv酺r, l飉enordet f顤 %s kan inte 鄚dras 鄚.\n" +msgstr "Tyv瓣rr, l繹senordet f繹r %s kan inte 瓣ndras 瓣n.\n" -#: src/passwd.c:614 +#: src/passwd.c:479 #, c-format msgid "%s: out of memory\n" -msgstr "%s: slut p minne\n" +msgstr "%s: slut p疇 minne\n" -#: src/passwd.c:769 -msgid "Cannot lock the TCFS key database; try again later\n" -msgstr "Kan inte l廛a TCFS-nyckeldatabasen; f顤s闥 igen senare\n" - -#: src/passwd.c:777 -msgid "Cannot open the TCFS key database.\n" -msgstr "Kan inte 鞿pna TCFS-nyckeldatabasen.\n" - -#: src/passwd.c:785 -msgid "Error updating the TCFS key database.\n" -msgstr "Fel under uppdatering av TCFS-nyckeldatabasen.\n" - -#: src/passwd.c:792 -msgid "Cannot commit TCFS changes.\n" -msgstr "Kan inte utf顤a TCFS 鄚dringar.\n" - -#: src/passwd.c:975 +#: src/passwd.c:730 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Kan inte starta %s" -#: src/passwd.c:1077 +#: src/passwd.c:815 #, c-format msgid "%s: repository %s not supported\n" -msgstr "%s: f顤varingsplatsen %s st鐰s ej\n" +msgstr "%s: f繹rvaringsplatsen %s st繹ds ej\n" -#: src/passwd.c:1152 +#: src/passwd.c:890 #, c-format msgid "%s: Permission denied\n" -msgstr "%s: Till廞else nekas\n" +msgstr "%s: Till疇telse nekas\n" -#: src/passwd.c:1176 +#: src/passwd.c:914 #, c-format msgid "You may not change the password for %s.\n" -msgstr "Du f緳 inte 鄚dra l飉enordet f顤 %s.\n" +msgstr "Du f疇r inte 瓣ndra l繹senordet f繹r %s.\n" -#: src/passwd.c:1242 +#: src/passwd.c:962 #, c-format msgid "Changing password for %s\n" -msgstr "瓏drar l飉enord f顤 %s\n" +msgstr "ndrar l繹senord f繹r %s\n" -#: src/passwd.c:1246 +#: src/passwd.c:966 #, c-format msgid "The password for %s is unchanged.\n" -msgstr "L飉enordet f顤 %s 酺 of顤鄚drat.\n" +msgstr "L繹senordet f繹r %s 瓣r of繹r瓣ndrat.\n" -#: src/passwd.c:1297 +#: src/passwd.c:1016 msgid "Password changed.\n" -msgstr "L飉enordet 鄚drat.\n" +msgstr "L繹senordet 瓣ndrat.\n" #: src/pwck.c:87 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" -msgstr "Anv鄚dning: %s [-q] [-r] [-s] [passwd [shadow]]\n" +msgstr "Anv瓣ndning: %s [-q] [-r] [-s] [passwd [shadow]]\n" #: src/pwck.c:90 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" -msgstr "Anv鄚dning: %s [-q] [-r] [-s] [passwd]\n" +msgstr "Anv瓣ndning: %s [-q] [-r] [-s] [passwd]\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:295 msgid "invalid password file entry\n" -msgstr "felaktig notering i l飉enordsfilen\n" +msgstr "felaktig notering i l繹senordsfilen\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:357 msgid "duplicate password entry\n" -msgstr "dubblett av l飉enords notering\n" +msgstr "dubblett av l繹senords notering\n" #: src/pwck.c:373 #, c-format msgid "invalid user name '%s'\n" -msgstr "ogiltigt anv鄚darnamn '%s'\n" +msgstr "ogiltigt anv瓣ndarnamn '%s'\n" -#. -#. * No primary group, just give a warning -#. #: src/pwck.c:388 #, c-format msgid "user %s: no group %u\n" -msgstr "anv鄚dare %s: ingen grupp %u\n" +msgstr "anv瓣ndare %s: ingen grupp %u\n" #: src/pwck.c:404 #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "anv鄚dare %s: katalogen %s finns inte\n" +msgstr "anv瓣ndare %s: katalogen %s finns inte\n" -#. -#. * Login shell doesn't exist, give a warning -#. #: src/pwck.c:420 #, c-format msgid "user %s: program %s does not exist\n" -msgstr "anv鄚dare %s: programmet %s finns inte\n" +msgstr "anv瓣ndare %s: programmet %s finns inte\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:456 msgid "invalid shadow password file entry\n" -msgstr "felaktig notering i skuggl飉enordsfilen\n" +msgstr "felaktig notering i skuggl繹senordsfilen\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:518 msgid "duplicate shadow password entry\n" -msgstr "dubblett av notering i skuggl飉enordsfilen\n" +msgstr "dubblett av notering i skuggl繹senordsfilen\n" -#. -#. * Tell the user this entry has no matching -#. * /etc/passwd entry and ask them to delete it. -#. #: src/pwck.c:542 msgid "no matching password file entry\n" -msgstr "ingen matchande notering i l飉enordsfilen\n" +msgstr "ingen matchande notering i l繹senordsfilen\n" #: src/pwck.c:560 #, c-format msgid "user %s: last password change in the future\n" -msgstr "anv鄚dare %s: senaste l飉enords鄚dring i framtiden\n" +msgstr "anv瓣ndare %s: senaste l繹senords瓣ndring i framtiden\n" -#: src/pwconv.c:84 src/pwunconv.c:93 +#: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s: kan inte l廛a l飉enordsfilen\n" +msgstr "%s: kan inte l疇sa l繹senordsfilen\n" -#: src/pwconv.c:89 src/pwunconv.c:98 +#: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s: kan inte 鞿pna l飉enordsfilen\n" +msgstr "%s: kan inte 繹ppna l繹senordsfilen\n" -#: src/pwconv.c:117 +#: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "%s: kan inte ta bort notering i skuggl飉enordsfilen f顤 %s\n" +msgstr "%s: kan inte ta bort notering i skuggl繹senordsfilen f繹r %s\n" -#: src/pwconv.c:163 +#: src/pwconv.c:164 #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "%s: kan inte uppdatera noteringen i l飉enordsfilen f顤 %s\n" +msgstr "%s: kan inte uppdatera noteringen i l繹senordsfilen f繹r %s\n" -#: src/pwconv.c:170 +#: src/pwconv.c:171 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: kan inte uppdatera skuggfilen\n" -#: src/pwconv.c:175 +#: src/pwconv.c:176 #, c-format msgid "%s: can't update passwd file\n" -msgstr "%s: kan inte uppdatera l飉enordsfilen\n" +msgstr "%s: kan inte uppdatera l繹senordsfilen\n" -#: src/pwunconv.c:50 -#, c-format -msgid "%s: Shadow passwords are not configured.\n" -msgstr "%s: Shadowl飉enord 酺 inte konfigurerade.\n" - -#: src/pwunconv.c:160 +#: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s: kan inte uppdatera noteringen f顤 anv鄚daren %s\n" +msgstr "%s: kan inte uppdatera noteringen f繹r anv瓣ndaren %s\n" -#: src/pwunconv.c:181 +#: src/pwunconv.c:145 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s: kan inte ta bort skuggl飉enordsfilen\n" +msgstr "%s: kan inte ta bort skuggl繹senordsfilen\n" #: src/su.c:133 msgid "Sorry." -msgstr "Tyv酺r." +msgstr "Tyv瓣rr." #: src/su.c:216 #, c-format msgid "%s: must be run from a terminal\n" -msgstr "%s: m廛te k顤as fr幩 en terminal\n" +msgstr "%s: m疇ste k繹ras fr疇n en terminal\n" #: src/su.c:306 #, c-format @@ -1799,17 +1605,16 @@ msgstr "%s: pam_start: fel %d\n" #: src/su.c:336 #, c-format msgid "Unknown id: %s\n" -msgstr "Ok鄚t id: %s\n" +msgstr "Ok瓣nt id: %s\n" #: src/su.c:373 src/su.c:390 #, c-format msgid "You are not authorized to su %s\n" -msgstr "Du har inte till廞else att k顤a su till %s\n" +msgstr "Du har inte till疇telse att k繹ra su till %s\n" -#. require own password #: src/su.c:385 msgid "(Enter your own password.)" -msgstr "(Skriv in ditt eget l飉enord.)" +msgstr "(Skriv in ditt eget l繹senord.)" #: src/su.c:419 #, c-format @@ -1820,606 +1625,649 @@ msgstr "" "%s: %s\n" "(Ignorerad)\n" -#: src/su.c:626 +#: src/su.c:609 msgid "No shell\n" msgstr "Inget skal\n" -#: src/suauth.c:100 +#: src/suauth.c:105 msgid "Access to su to that account DENIED.\n" -msgstr "Du har inte beh顤ighet att k顤a su till det kontot.\n" +msgstr "Du har inte beh繹righet att k繹ra su till det kontot.\n" -#: src/suauth.c:107 +#: src/suauth.c:113 msgid "Password authentication bypassed.\n" -msgstr "Hoppade 饘er l飉enordskontroll.\n" +msgstr "Hoppade 繹ver l繹senordskontroll.\n" -#: src/suauth.c:114 +#: src/suauth.c:122 msgid "Please enter your OWN password as authentication.\n" -msgstr "Var god skriv in ditt EGET l飉enord som 鄢thetsbevis.\n" +msgstr "Var god skriv in ditt EGET l繹senord som 瓣kthetsbevis.\n" -#. must be a password file! -#: src/sulogin.c:132 +#: src/sulogin.c:118 msgid "No password file\n" -msgstr "Ingen l飉enordsfil\n" +msgstr "Ingen l繹senordsfil\n" -#. -#. * Fail secure -#. -#: src/sulogin.c:174 +#: src/sulogin.c:160 msgid "No password entry for 'root'\n" -msgstr "Ingen l飉enordsnotering f顤 \"root\"\n" +msgstr "Ingen l繹senordsnotering f繹r \"root\"\n" -#: src/sulogin.c:190 +#: src/sulogin.c:176 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" "\n" -"Skriv control-d f顤 att forts酹ta med den normala uppstarten,\n" -"(eller skriv in l飉enordet f顤 root f顤 systemunderh嶚l):" +"Skriv control-d f繹r att forts瓣tta med den normala uppstarten,\n" +"(eller skriv in l繹senordet f繹r root f繹r systemunderh疇ll):" -#. make new environment active -#: src/sulogin.c:243 +#: src/sulogin.c:212 msgid "Entering System Maintenance Mode\n" -msgstr "G緳 in i systemunderh嶚lsl輍e\n" +msgstr "G疇r in i systemunderh疇llsl瓣ge\n" -#: src/useradd.c:251 +#: src/useradd.c:234 #, c-format msgid "%s: rebuild the group database\n" msgstr "%s: bygg om gruppdatabasen\n" -#: src/useradd.c:260 +#: src/useradd.c:243 #, c-format msgid "%s: rebuild the shadow group database\n" msgstr "%s: bygg om skuggruppdatabasen\n" -#: src/useradd.c:295 src/useradd.c:309 src/usermod.c:981 src/usermod.c:995 +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: ogiltigt numeriskt argument \"%s\"\n" -#: src/useradd.c:365 +#: src/useradd.c:349 #, c-format msgid "%s: unknown gid %s\n" -msgstr "%s: ok鄚t gid %s\n" +msgstr "%s: ok瓣nt gid %s\n" -#: src/useradd.c:373 src/useradd.c:676 src/useradd.c:1269 src/usermod.c:260 -#: src/usermod.c:1128 +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 #, c-format msgid "%s: unknown group %s\n" -msgstr "%s: ok鄚d grupp %s\n" +msgstr "%s: ok瓣nd grupp %s\n" -#: src/useradd.c:440 -#, c-format -msgid "group=%s,%u basedir=%s skel=%s\n" -msgstr "grupp=%s,%u baskatalog=%s skel=%s\n" - -#: src/useradd.c:444 -#, c-format -msgid "shell=%s " -msgstr "skal=%s " - -#: src/useradd.c:446 -#, c-format -msgid "inactive=%ld expire=%s" -msgstr "inaktiv=%ld upph顤=%s" - -#: src/useradd.c:450 +#: src/useradd.c:419 #, c-format msgid "GROUP=%u\n" msgstr "GRUPP=%u\n" -#: src/useradd.c:451 +#: src/useradd.c:420 #, c-format msgid "HOME=%s\n" msgstr "HEM=%s\n" -#: src/useradd.c:453 +#: src/useradd.c:422 #, c-format msgid "INACTIVE=%ld\n" msgstr "INAKTIV=%ld\n" -#: src/useradd.c:454 +#: src/useradd.c:423 #, c-format msgid "EXPIRE=%s\n" -msgstr "UPPH烼=%s\n" +msgstr "UPPHR=%s\n" -#: src/useradd.c:456 +#: src/useradd.c:425 #, c-format msgid "SHELL=%s\n" msgstr "SKAL=%s\n" -#: src/useradd.c:457 +#: src/useradd.c:426 #, c-format msgid "SKEL=%s\n" msgstr "SKEL=%s\n" -#: src/useradd.c:498 +#: src/useradd.c:462 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: kan inte skapa en ny standardfil\n" -#: src/useradd.c:503 -#, fuzzy, c-format +#: src/useradd.c:467 +#, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: kan inte skapa en ny standardfil\n" -#: src/useradd.c:596 src/useradd.c:608 +#: src/useradd.c:552 src/useradd.c:564 #, c-format msgid "%s: rename: %s" msgstr "%s: rename: %s" -#: src/useradd.c:697 src/usermod.c:281 +#: src/useradd.c:657 src/usermod.c:265 #, c-format msgid "%s: group `%s' is a NIS group.\n" -msgstr "%s: grupp \"%s\" 酺 en NIS-grupp.\n" +msgstr "%s: grupp \"%s\" 瓣r en NIS-grupp.\n" -#: src/useradd.c:706 src/usermod.c:290 +#: src/useradd.c:666 src/usermod.c:274 #, c-format msgid "%s: too many groups specified (max %d).\n" -msgstr "%s: f顤 m幩ga grupper speciferade (max %d).\n" +msgstr "%s: f繹r m疇nga grupper speciferade (max %d).\n" -#: src/useradd.c:738 src/usermod.c:322 -#, c-format -msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" -msgstr "Anv鄚dning: %s [-u uid [-o]] [-g grupp] [-G grupp,...] \n" +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "Anv瓣ndning: useradd [-u uid [-o]] [-g grupp] [-G grupp,...] \n" -#: src/useradd.c:742 -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:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" +msgstr " [-d hem] [-s skal] [-c kommentar] [-m [-k mall]]\n" -#: src/useradd.c:745 src/usermod.c:329 -#, fuzzy -msgid "[-f inactive] [-e expire ] " -msgstr " [-f inaktiv] [-e upph顤] " +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" +msgstr " [-f inaktiv] [-e upph繹r]\n" -#: src/useradd.c:748 -msgid "[-A program] " -msgstr "[-A program] " +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" +msgstr " useradd -D [-g grupp] [-b bas] [-s skal]\n" -#: src/useradd.c:750 -msgid "[-p passwd] name\n" -msgstr "[-p passwd] namn\n" - -#: src/useradd.c:753 -#, c-format -msgid " %s\t-D [-g group] [-b base] [-s shell]\n" -msgstr " %s -D [-g grupp] [-b bas] [-s skal]\n" - -#: src/useradd.c:756 -#, fuzzy -msgid "\t\t[-f inactive] [-e expire ]\n" -msgstr "\t\t [-f inaktiv] [-e utg幩g]\n" - -#: src/useradd.c:850 src/usermod.c:480 +#: src/useradd.c:793 src/usermod.c:461 #, c-format msgid "%s: error locking group file\n" -msgstr "%s: fel under l廛ning av gruppfilen\n" +msgstr "%s: fel under l疇sning av gruppfilen\n" -#: src/useradd.c:855 src/usermod.c:486 +#: src/useradd.c:798 src/usermod.c:467 #, c-format msgid "%s: error opening group file\n" -msgstr "%s: fel under 鞿pning av gruppfilen\n" +msgstr "%s: fel under 繹ppning av gruppfilen\n" -#: src/useradd.c:862 src/usermod.c:597 +#: src/useradd.c:805 src/usermod.c:578 #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s: fel under l廛ning av skuggruppfilen\n" +msgstr "%s: fel under l疇sning av skuggruppfilen\n" -#: src/useradd.c:867 src/usermod.c:603 +#: src/useradd.c:810 src/usermod.c:584 #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s: fel under 鞿pning av skuggruppfilen\n" +msgstr "%s: fel under 繹ppning av skuggruppfilen\n" -#: src/useradd.c:1039 +#: src/useradd.c:982 #, c-format msgid "%s: uid %u is not unique\n" -msgstr "%s: uid %u 酺 inte unikt\n" +msgstr "%s: uid %u 瓣r inte unikt\n" -#: src/useradd.c:1069 +#: src/useradd.c:1012 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: kan inte hitta ett unikt uid\n" -#: src/useradd.c:1174 src/useradd.c:1325 src/usermod.c:1075 src/usermod.c:1086 -#: src/usermod.c:1096 src/usermod.c:1143 src/usermod.c:1187 -#, c-format -msgid "%s: invalid field `%s'\n" -msgstr "%s: felaktigt f鄟t \"%s\"\n" - -#: src/useradd.c:1189 +#: src/useradd.c:1049 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: felaktig baskatalog \"%s\"\n" -#: src/useradd.c:1199 +#: src/useradd.c:1059 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: felaktig kommentar \"%s\"\n" -#: src/useradd.c:1210 +#: src/useradd.c:1070 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: felaktig hemkatalog \"%s\"\n" -#: src/useradd.c:1229 src/usermod.c:1110 +#: src/useradd.c:1089 src/usermod.c:858 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: felaktigt datum \"%s\"\n" -#: src/useradd.c:1242 +#: src/useradd.c:1102 #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "%s: skuggl飉enord kr銥s f顤 -e\n" +msgstr "%s: skuggl繹senord kr瓣vs f繹r -e\n" -#: src/useradd.c:1258 +#: src/useradd.c:1118 #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "%s: skuggl飉enord kr銥s f顤 -f\n" +msgstr "%s: skuggl繹senord kr瓣vs f繹r -f\n" -#: src/useradd.c:1336 +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: felaktigt f瓣lt \"%s\"\n" + +#: src/useradd.c:1196 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: felaktigt skal \"%s\"\n" -#: src/useradd.c:1377 +#: src/useradd.c:1237 #, c-format msgid "%s: invalid user name '%s'\n" -msgstr "%s: felaktigt anv鄚dar namn '%s'\n" +msgstr "%s: felaktigt anv瓣ndar namn '%s'\n" -#: src/useradd.c:1413 src/userdel.c:298 src/usermod.c:1255 +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 #, c-format msgid "%s: cannot rewrite password file\n" -msgstr "%s: kan inte skriva om l飉enordsfilen\n" +msgstr "%s: kan inte skriva om l繹senordsfilen\n" -#: src/useradd.c:1420 src/userdel.c:303 src/usermod.c:1262 +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "%s: kan inte skriva om skuggl飉enordsfilen\n" +msgstr "%s: kan inte skriva om skuggl繹senordsfilen\n" -#: src/useradd.c:1461 src/userdel.c:367 src/usermod.c:1296 +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 #, c-format msgid "%s: unable to lock password file\n" -msgstr "%s: kan inte l廛a l飉enordsfilen\n" +msgstr "%s: kan inte l疇sa l繹senordsfilen\n" -#: src/useradd.c:1466 src/userdel.c:372 src/usermod.c:1301 +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 #, c-format msgid "%s: unable to open password file\n" -msgstr "%s: kan inte 鞿pna l飉enordsfilen\n" +msgstr "%s: kan inte 繹ppna l繹senordsfilen\n" -#: src/useradd.c:1474 src/userdel.c:379 src/usermod.c:1308 +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "%s: kan inte l廛a skuggl飉enordsfilen\n" +msgstr "%s: kan inte l疇sa skuggl繹senordsfilen\n" -#: src/useradd.c:1481 src/userdel.c:385 src/usermod.c:1314 +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "%s: kan inte 鞿pna skuggl飉enordsfilen\n" +msgstr "%s: kan inte 繹ppna skuggl繹senordsfilen\n" -#: src/useradd.c:1580 src/usermod.c:1405 -#, c-format -msgid "%s: error adding authentication method\n" -msgstr "%s: fel under till輍ning av metod f顤 鄢thetsbevisning\n" - -#: src/useradd.c:1604 +#: src/useradd.c:1435 #, c-format msgid "%s: error adding new password entry\n" -msgstr "%s: fel under till輍gning av ny l飉enordsnotering\n" +msgstr "%s: fel under till瓣ggning av ny l繹senordsnotering\n" -#: src/useradd.c:1618 +#: src/useradd.c:1449 #, c-format msgid "%s: error updating password dbm entry\n" -msgstr "%s: fel under uppdatering av dbm-l飉enordsnotering\n" +msgstr "%s: fel under uppdatering av dbm-l繹senordsnotering\n" -#: src/useradd.c:1634 src/usermod.c:1471 +#: src/useradd.c:1465 src/usermod.c:1151 #, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "%s: fel under till輍gning av ny skuggl飉enordsnotering\n" +msgstr "%s: fel under till瓣ggning av ny skuggl繹senordsnotering\n" -#: src/useradd.c:1650 src/usermod.c:1488 +#: src/useradd.c:1481 src/usermod.c:1168 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: fel under uppdatering av dbm-skuggl飉enordsnotering\n" +msgstr "%s: fel under uppdatering av dbm-skuggl繹senordsnotering\n" -#: src/useradd.c:1682 +#: src/useradd.c:1513 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: kan inte skapa katalog %s\n" -#: src/useradd.c:1806 src/usermod.c:1233 +#: src/useradd.c:1634 src/usermod.c:981 #, c-format msgid "%s: user %s exists\n" -msgstr "%s: anv鄚dare %s existerar\n" +msgstr "%s: anv瓣ndare %s existerar\n" -#: src/useradd.c:1821 +#: src/useradd.c:1649 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1854 +#: src/useradd.c:1687 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" -msgstr "%s: varning: CREATE_HOME st鐰s inte, anv鄚d -m ist鄟let.\n" +msgstr "%s: varning: CREATE_HOME st繹ds inte, anv瓣nd -m ist瓣llet.\n" -#: src/userdel.c:129 +#: src/userdel.c:124 #, c-format -msgid "usage: %s [-r] name\n" -msgstr "Anv鄚dning: %s [-r] namn\n" +msgid "Usage: %s [-r] name\n" +msgstr "Anv瓣ndning: %s [-r] namn\n" -#: src/userdel.c:181 src/userdel.c:267 +#: src/userdel.c:176 src/userdel.c:262 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: fel under uppdatering av gruppnotering\n" -#: src/userdel.c:191 src/userdel.c:276 +#: src/userdel.c:186 src/userdel.c:271 #, c-format msgid "%s: cannot update dbm group entry\n" msgstr "%s: kan inte uppdatera dbm-gruppnotering\n" -#: src/userdel.c:219 -#, fuzzy, c-format +#: src/userdel.c:214 +#, c-format msgid "%s: cannot remove dbm group entry\n" msgstr "%s: kan inte uppdatera dbm-gruppnotering\n" -#: src/userdel.c:308 +#: src/userdel.c:379 #, c-format -msgid "%s: cannot rewrite TCFS key file\n" -msgstr "%s: kan inte skriva om TCFS-nyckelfilen\n" +msgid "%s: cannot open group file\n" +msgstr "%s: kan inte 繹ppna gruppfilen\n" -#: src/userdel.c:392 +#: src/userdel.c:390 #, c-format -msgid "%s: cannot lock TCFS key file\n" -msgstr "%s: kan inte l廛a TCFS-nyckelfilen\n" - -#: src/userdel.c:397 -#, c-format -msgid "%s: cannot open TCFS key file\n" -msgstr "%s: kan inte 鞿pna TCFS-nyckelfilen\n" +msgid "%s: cannot open shadow group file\n" +msgstr "%s: kan inte 繹ppna skuggruppfilen\n" #: src/userdel.c:408 #, c-format -msgid "%s: cannot open group file\n" -msgstr "%s: kan inte 鞿pna gruppfilen\n" - -#: src/userdel.c:419 -#, c-format -msgid "%s: cannot open shadow group file\n" -msgstr "%s: kan inte 鞿pna skuggruppfilen\n" - -#: src/userdel.c:451 src/userdel.c:468 -#, c-format -msgid "%s: error deleting authentication\n" -msgstr "%s: fel under borttagning av metod f顤 鄢thetsbevisning\n" - -#: src/userdel.c:479 -#, c-format msgid "%s: error deleting password entry\n" -msgstr "%s: fel under borttagning av l飉enordsnotering\n" +msgstr "%s: fel under borttagning av l繹senordsnotering\n" -#: src/userdel.c:485 +#: src/userdel.c:412 #, c-format msgid "%s: error deleting shadow password entry\n" -msgstr "%s: fel under borttagning av skuggl飉enordsnotering\n" +msgstr "%s: fel under borttagning av skuggl繹senordsnotering\n" -#: src/userdel.c:496 -#, c-format -msgid "%s: error deleting TCFS entry\n" -msgstr "%s: fel under borttagning av TCFS-notering\n" - -#: src/userdel.c:510 +#: src/userdel.c:421 #, c-format msgid "%s: error deleting password dbm entry\n" -msgstr "%s: fel under borttagning av dbm-l飉enordsnotering\n" +msgstr "%s: fel under borttagning av dbm-l繹senordsnotering\n" -#: src/userdel.c:533 +#: src/userdel.c:440 #, c-format msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: fel under borttagning av dbm-skuggl飉enordsnotering\n" +msgstr "%s: fel under borttagning av dbm-skuggl繹senordsnotering\n" -#: src/userdel.c:569 +#: src/userdel.c:484 #, c-format msgid "%s: user %s is currently logged in\n" -msgstr "%s: anv鄚dare %s 酺 inloggad\n" +msgstr "%s: anv瓣ndare %s 瓣r inloggad\n" -#: src/userdel.c:659 +#: src/userdel.c:594 #, c-format msgid "%s: warning: %s not owned by %s, not removing\n" -msgstr "%s: varning: %s 輍s inte av %s, tar inte bort\n" +msgstr "%s: varning: %s 瓣gs inte av %s, tar inte bort\n" -#: src/userdel.c:666 +#: src/userdel.c:600 #, c-format msgid "%s: warning: can't remove " msgstr "%s: varning: kan inte ta bort " -#: src/userdel.c:758 src/usermod.c:1023 +#: src/userdel.c:703 src/usermod.c:783 #, c-format msgid "%s: user %s does not exist\n" -msgstr "%s: anv鄚dare %s finns inte\n" +msgstr "%s: anv瓣ndare %s finns inte\n" -#: src/userdel.c:770 src/usermod.c:1039 +#: src/userdel.c:718 src/usermod.c:799 #, c-format msgid "%s: user %s is a NIS user\n" -msgstr "%s: anv鄚dare %s 酺 en NIS-anv鄚dare\n" +msgstr "%s: anv瓣ndare %s 瓣r en NIS-anv瓣ndare\n" -#: src/userdel.c:799 +#: src/userdel.c:756 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s: %s 輍s inte av %s, tar inte bort\n" +msgstr "%s: %s 瓣gs inte av %s, tar inte bort\n" -#: src/userdel.c:818 +#: src/userdel.c:779 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" -msgstr "%s: tar inte bort katalogen %s (skulle ta bort hemkatalogen f顤 %s)\n" +msgstr "%s: tar inte bort katalogen %s (skulle ta bort hemkatalogen f繹r %s)\n" -#: src/userdel.c:830 +#: src/userdel.c:793 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: fel under borttagning av katalogen %s\n" -#: src/usermod.c:326 +#: src/usermod.c:306 +#, 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" + +#: src/usermod.c:310 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:332 +#: src/usermod.c:313 #, fuzzy -msgid "[-A {DEFAULT|program},... ] " -msgstr "[-A {DEFAULT|program},...] " +msgid "[-f inactive] [-e expire] " +msgstr " [-f inaktiv] [-e upph繹r] " -#: src/usermod.c:334 +#: src/usermod.c:315 msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p passwd] [-L|-U] namn\n" -#: src/usermod.c:514 +#: src/usermod.c:495 #, c-format msgid "%s: out of memory in update_group\n" -msgstr "%s: slut p minne i update_group\n" +msgstr "%s: slut p疇 minne i update_group\n" -#: src/usermod.c:641 +#: src/usermod.c:622 #, c-format msgid "%s: out of memory in update_gshadow\n" -msgstr "%s: slut p minne i update_gshadow\n" +msgstr "%s: slut p疇 minne i update_gshadow\n" -#: src/usermod.c:1210 +#: src/usermod.c:958 #, c-format msgid "%s: no flags given\n" msgstr "%s: inga flaggor givna\n" -#: src/usermod.c:1217 +#: src/usermod.c:965 #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s: skuggl飉enord kr銥s f顤 -e och -f\n" +msgstr "%s: skuggl繹senord kr瓣vs f繹r -e och -f\n" -#: src/usermod.c:1239 +#: src/usermod.c:987 #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s: uid %lu 酺 inte unikt\n" +msgstr "%s: uid %lu 瓣r inte unikt\n" -#: src/usermod.c:1392 -#, c-format -msgid "%s: error deleting authentication method\n" -msgstr "%s: fel under borttagning av metod f顤 鄢thetsbevisning\n" - -#: src/usermod.c:1418 -#, c-format -msgid "%s: error changing authentication method\n" -msgstr "%s: fel under 鄚dring av metod f顤 鄢thetsbevisning\n" - -#: src/usermod.c:1436 +#: src/usermod.c:1116 #, c-format msgid "%s: error changing password entry\n" -msgstr "%s: fel under 鄚dring av l飉enordsnotering\n" +msgstr "%s: fel under 瓣ndring av l繹senordsnotering\n" -#: src/usermod.c:1442 +#: src/usermod.c:1122 #, c-format msgid "%s: error removing password entry\n" -msgstr "%s: fel under borttagning av l飉enordsnotering\n" +msgstr "%s: fel under borttagning av l繹senordsnotering\n" -#: src/usermod.c:1451 +#: src/usermod.c:1131 #, c-format msgid "%s: error adding password dbm entry\n" -msgstr "%s: fel under till輍gning av dbm-l飉enordsnotering\n" +msgstr "%s: fel under till瓣ggning av dbm-l繹senordsnotering\n" -#: src/usermod.c:1459 +#: src/usermod.c:1139 #, c-format msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: fel under borttagning av dbm-l飉enordsnotering\n" +msgstr "%s: fel under borttagning av dbm-l繹senordsnotering\n" -#: src/usermod.c:1478 +#: src/usermod.c:1158 #, c-format msgid "%s: error removing shadow password entry\n" -msgstr "%s: fel under borttagning av skuggl飉enordsnotering\n" +msgstr "%s: fel under borttagning av skuggl繹senordsnotering\n" -#: src/usermod.c:1495 +#: src/usermod.c:1175 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: fel under borttagning av dbm-skuggl飉enordsnotering\n" +msgstr "%s: fel under borttagning av dbm-skuggl繹senordsnotering\n" -#: src/usermod.c:1524 +#: src/usermod.c:1204 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: katalogen %s existerar\n" -#: src/usermod.c:1533 +#: src/usermod.c:1213 #, c-format msgid "%s: can't create %s\n" msgstr "%s: kan inte skapa %s\n" -#: src/usermod.c:1539 +#: src/usermod.c:1219 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s: kan inte byta 輍are p %s\n" +msgstr "%s: kan inte byta 瓣gare p疇 %s\n" -#: src/usermod.c:1556 +#: src/usermod.c:1236 #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "%s: kan inte byta namn p katalogen %s till %s\n" +msgstr "%s: kan inte byta namn p疇 katalogen %s till %s\n" -#. better leave it alone -#: src/usermod.c:1653 +#: src/usermod.c:1333 #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "%s: varning: %s 輍s inte av %s\n" +msgstr "%s: varning: %s 瓣gs inte av %s\n" -#: src/usermod.c:1659 +#: src/usermod.c:1339 msgid "failed to change mailbox owner" -msgstr "kunde inte byta 輍are av brevl嶟an" +msgstr "kunde inte byta 瓣gare av brevl疇dan" -#: src/usermod.c:1667 +#: src/usermod.c:1347 msgid "failed to rename mailbox" -msgstr "kunde inte byta namn p brevl嶟an" +msgstr "kunde inte byta namn p疇 brevl疇dan" -#: src/vipw.c:104 +#: src/vipw.c:105 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" "\n" -"%s: %s 酺 of顤鄚drad\n" +"%s: %s 瓣r of繹r瓣ndrad\n" -#: src/vipw.c:132 +#: src/vipw.c:133 msgid "Couldn't lock file" -msgstr "Kunde inte l廛a filen" +msgstr "Kunde inte l疇sa filen" -#: src/vipw.c:141 +#: src/vipw.c:142 msgid "Couldn't make backup" -msgstr "Kunde inte g顤a en backup" +msgstr "Kunde inte g繹ra en backup" -#: src/vipw.c:206 +#: src/vipw.c:200 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" -msgstr "%s: kan inte 廞erst鄟la %s: %s (dina 鄚dringar 酺 i %s)\n" +msgstr "%s: kan inte 疇terst瓣lla %s: %s (dina 瓣ndringar 瓣r i %s)\n" -#: src/vipw.c:244 +#: src/vipw.c:238 msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" msgstr "" -"Anv鄚dning:\n" +"Anv瓣ndning:\n" "\"vipw\" editerar /etc/passwd \"vipw -w\" editerar /etc/shadow\n" "\"vipg\" editerar /etc/group \"vipg -w\" editerar /etc/gshadow\n" -#~ msgid "%s: gid %ld is not unique\n" -#~ msgstr "%s: gid %ld 酺 inte unikt\n" +#, fuzzy +#~ msgid "Can't create mail spool for user %s.\n" +#~ msgstr "%s: kan inte uppdatera noteringen f繹r anv瓣ndaren %s\n" + +#~ msgid "User %s has a TCFS key, his old password is required.\n" +#~ msgstr "Anv瓣ndare %s har en TCFS-nyckel, hans f繹rra l繹senord kr瓣vs.\n" + +#~ msgid "You can use -t option to force the change.\n" +#~ msgstr "Du kan anv瓣nda flaggan -t f繹r att p疇tvinga 瓣ndringen.\n" + +#~ msgid "Warning: user %s has a TCFS key.\n" +#~ msgstr "Varning: anv瓣ndare %s har en TCFS-nyckel.\n" + +#~ msgid "Cannot lock the TCFS key database; try again later\n" +#~ msgstr "Kan inte l疇sa TCFS-nyckeldatabasen; f繹rs繹k igen senare\n" + +#~ msgid "Cannot open the TCFS key database.\n" +#~ msgstr "Kan inte 繹ppna TCFS-nyckeldatabasen.\n" + +#~ msgid "Error updating the TCFS key database.\n" +#~ msgstr "Fel under uppdatering av TCFS-nyckeldatabasen.\n" + +#~ msgid "Cannot commit TCFS changes.\n" +#~ msgstr "Kan inte utf繹ra TCFS 瓣ndringar.\n" + +#~ msgid "%s: cannot rewrite TCFS key file\n" +#~ msgstr "%s: kan inte skriva om TCFS-nyckelfilen\n" + +#~ msgid "%s: cannot lock TCFS key file\n" +#~ msgstr "%s: kan inte l疇sa TCFS-nyckelfilen\n" + +#~ msgid "%s: cannot open TCFS key file\n" +#~ msgstr "%s: kan inte 繹ppna TCFS-nyckelfilen\n" + +#~ msgid "%s: error deleting TCFS entry\n" +#~ msgstr "%s: fel under borttagning av TCFS-notering\n" + +#~ msgid "%s: error deleting authentication\n" +#~ msgstr "%s: fel under borttagning av metod f繹r 瓣kthetsbevisning\n" #, fuzzy +#~ msgid "[-A {DEFAULT|program},...] " +#~ msgstr "[-A {DEFAULT|program},...] " + +#~ msgid "%s: error deleting authentication method\n" +#~ msgstr "%s: fel under borttagning av metod f繹r 瓣kthetsbevisning\n" + +#~ msgid "%s: error adding authentication method\n" +#~ msgstr "%s: fel under till瓣gning av metod f繹r 瓣kthetsbevisning\n" + +#~ msgid "%s: error changing authentication method\n" +#~ msgstr "%s: fel under 瓣ndring av metod f繹r 瓣kthetsbevisning\n" + +#~ msgid "[-A program] " +#~ msgstr "[-A program] " + +#~ msgid "[-p passwd] name\n" +#~ msgstr "[-p passwd] namn\n" + +#~ msgid "error - lookup '%s' failed\n" +#~ msgstr "fel - kunde inte hitta \"%s\"\n" + +#~ msgid "%s not found\n" +#~ msgstr "%s hittades inte\n" + +#~ msgid "%s: not configured for shadow group support.\n" +#~ msgstr "%s: inte konfigurerad med st繹d f繹r skuggrupper.\n" + +#~ msgid "%s: Shadow passwords are not configured.\n" +#~ msgstr "%s: Shadowl繹senord 瓣r inte konfigurerade.\n" + +#, fuzzy +#~ msgid "Usage: %s [-l] user\n" +#~ msgstr "Anv瓣ndning: %s [-e]\n" + +#~ msgid "Executing shell %s\n" +#~ msgstr "Startar skal %s\n" + +#~ msgid "Dialup Password: " +#~ msgstr "Uppringningsl繹senord: " + +#~ 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" + +#~ msgid "Usage: %s [-(a|d)] shell\n" +#~ msgstr "Anv瓣ndning: %s [-(a|d)] skal\n" + +#~ msgid "Shell password: " +#~ msgstr "Skall繹senord: " + +#~ msgid "re-enter Shell password: " +#~ msgstr "skriv in skall繹senordet igen: " + +#~ msgid "%s: Passwords do not match, try again.\n" +#~ msgstr "%s: L繹senorden matchar inte varandra, f繹rs繹k igen.\n" + +#~ msgid "%s: can't create %s" +#~ msgstr "%s: kan inte skapa %s" + +#~ msgid "%s: can't open %s" +#~ msgstr "%s: kan inte 繹ppna %s" + +#~ msgid "%s: Shell %s not found.\n" +#~ msgstr "%s: Hittade inte skalet %s.\n" + +#~ msgid "group=%s,%u basedir=%s skel=%s\n" +#~ msgstr "grupp=%s,%u baskatalog=%s skel=%s\n" + +#~ msgid "shell=%s " +#~ msgstr "skal=%s " + +#~ msgid "inactive=%ld expire=%s" +#~ msgstr "inaktiv=%ld upph繹r=%s" + +#~ msgid "%s: gid %ld is not unique\n" +#~ msgstr "%s: gid %ld 瓣r inte unikt\n" + #~ msgid "unknown gid: %u\n" -#~ msgstr "ok鄚t gid: %d\n" +#~ msgstr "ok瓣nt gid: %d\n" #~ msgid "%s: uid %d is not unique\n" -#~ msgstr "%s: uid %d 酺 inte unikt\n" +#~ msgstr "%s: uid %d 瓣r inte unikt\n" #~ msgid "user %s: bad UID (%d)\n" -#~ msgstr "anv鄚dare %s: felaktigt UID (%d)\n" +#~ msgstr "anv瓣ndare %s: felaktigt UID (%d)\n" #~ msgid "%s: no aging information present\n" -#~ msgstr "%s: ingen 嶚dringsinformation finns tillg鄚glig\n" +#~ msgstr "%s: ingen 疇ldringsinformation finns tillg瓣nglig\n" #~ msgid "group %s: bad GID (%d)\n" #~ msgstr "grupp %s: felaktigt GID (%d)\n" #~ msgid "%s: permission denied (shell).\n" -#~ msgstr "%s: till廞else nekas (skal).\n" +#~ msgstr "%s: till疇telse nekas (skal).\n" diff --git a/po/uk.gmo b/po/uk.gmo index abb3a627..f556a7f8 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index d15469f2..b5138f60 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,1001 +4,899 @@ msgid "" msgstr "" "Project-Id-Version: shadow-20001016\n" -"POT-Creation-Date: 2002-03-12 12:16+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-01-14 07:41+0100\n" "PO-Revision-Date: 2001-08-04 19:45+0200\n" "Last-Translator: Roman Festchook \n" "Language-Team: Roman Festchook \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=koi8-u\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libmisc/addgrps.c:60 +#: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" -msgstr "輾埧疻秸恄: 恓蛈鰍芩 й桸 %s\n" +msgstr "訄迮迮迠迮郇郇: 郇迮赲迡郋邾訄 迣郈訄 %s\n" -#: libmisc/addgrps.c:71 +#: libmisc/addgrps.c:68 msgid "Warning: too many groups\n" -msgstr "輾埧疻秸恄: 睋恔齟 臏Щ婘 й桸\n" +msgstr "訄迮迮迠迮郇郇: 郱訄郇訄迡郋 訇訄迣訄郋 迣郈\n" -#: libmisc/age.c:77 +#: libmisc/age.c:72 msgid "Your password has expired." -msgstr "鷙 釓眐杻 倷珃婞癹曬." +msgstr "訄 郈訄郋郅 郈郋郋迮郇郋." -#: libmisc/age.c:80 +#: libmisc/age.c:75 msgid "Your password is inactive." -msgstr "鷙 釓眐杻 恓賸埩谻奼." +msgstr "訄 郈訄郋郅 郇迮訄郕邽赲郇邽邾." -#: libmisc/age.c:83 +#: libmisc/age.c:78 msgid "Your login has expired." -msgstr "鷙 昑レ 倷珃婞癹曬." +msgstr "訄 郅郋迣郇 郈郋郋迮郇郋." -#: libmisc/age.c:96 +#: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " '豽皉婥衭 蚕衲攪恌 謐穻峖衲畛婘眐.\n" +msgstr " '赲迠 郱 邽迮邾郇邽邾 訄迡邾郇訄郋郋邾.\n" -#: libmisc/age.c:99 +#: libmisc/age.c:93 msgid " Choose a new password.\n" -msgstr " 鼵藍狾婥 恘訰 釓眐杻.\n" +msgstr " 邽訇迮 郇郋赲邽邿 郈訄郋郅.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:168 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "鷙 釓眐杻 謬霰 倷珃婘眐畷恘 睋 %ld 鰓肉.\n" +msgstr "訄 郈訄郋郅 訇迡迮 郈郋郋郋迮郇郋 郱訄 %ld 迡郇赲.\n" -#: libmisc/age.c:178 +#: libmisc/age.c:172 msgid "Your password will expire tomorrow.\n" -msgstr "鷙 釓眐杻 謬霰 倷珃婞癹曬 睋赻畛.\n" +msgstr "訄 郈訄郋郅 訇迡迮 郈郋郋迮郇郋 郱訄赲訄.\n" -#: libmisc/age.c:180 +#: libmisc/age.c:174 msgid "Your password will expire today.\n" -msgstr "鷙 釓眐杻 謬霰 倷珃婞癹曬 衯珌狦峖.\n" +msgstr "訄 郈訄郋郅 訇迡迮 郈郋郋迮郇郋 郋迣郋迡郇.\n" -#: libmisc/chowntty.c:113 +#: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" -msgstr "醚 迍笝 硰缶尕 tty %s" +msgstr "迮 邾郋迠 郱邾郇邽邽 tty %s" -#: libmisc/env.c:160 +#: libmisc/env.c:155 msgid "Environment overflow\n" -msgstr "蟔疻俵谻曬恮 珆癹曬恮\n" +msgstr "迮迮郈郋赲郇迮郇郇 郋郋迮郇郇\n" -#: libmisc/env.c:200 +#: libmisc/env.c:195 #, c-format msgid "You may not change $%s\n" -msgstr "鼵 恓 迍秸埧 硰缶尕 $%s\n" +msgstr "邽 郇迮 邾郋迠迮迮 郱邾郇邽邽 $%s\n" -#: libmisc/failure.c:238 +#: libmisc/failure.c:230 #, c-format msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s 瓾袀 珃埡恄媋 觕狦. 擽埡恄百 觕汛: %s %s.\n" +msgstr "%d %s 郱 訄 郋訄郇郇迣郋 赲郋迡. 訄郇郇邿 赲迡: %s 郱 %s.\n" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failures" -msgstr "俵虭昋" +msgstr "郈郋邾邽郅郕邽" -#: libmisc/failure.c:239 +#: libmisc/failure.c:232 msgid "failure" -msgstr "俵虭昋" +msgstr "郈郋邾邽郅郕訄" -#: libmisc/limits.c:397 +#: libmisc/limits.c:396 msgid "Too many logins.\n" -msgstr "蹉謐婘 臏Щ婘 蚥茼.\n" +msgstr "訄郇訄迡郋 訇訄迣訄郋 迮邿.\n" -#: libmisc/login_desrpc.c:63 +#: libmisc/login_desrpc.c:59 #, c-format msgid "Password does not decrypt secret key for %s.\n" -msgstr "蟥眐杻 恓 霰袶の掑 埡友恌 佮濯 騷 %s.\n" +msgstr "訄郋郅 郇迮 迡迮邽 訄邾郇邽邿 郕郅 迡郅 %s.\n" -#: libmisc/login_desrpc.c:69 +#: libmisc/login_desrpc.c:66 #, c-format msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "醚 迍笝 赽埡恘訰埩 埡友恘ж 佮濯 騷 %s: 瘃 睋俷暙恘 蚥眢籤 佮濯肉?\n" +msgstr "迮 邾郋迠 赲訄郇郋赲邽邽 訄邾郇郋迣郋 郕郅訄 迡郅 %s: 邽 郱訄郈迮郇郋 迮赲迮 郕郅赲?\n" -#: libmisc/mail.c:62 libmisc/mail.c:77 +#: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." -msgstr "鼵 芩夭 恘赹 俵痽." +msgstr "邽 邾訄迮 郇郋赲 郈郋." -#: libmisc/mail.c:73 +#: libmisc/mail.c:72 msgid "No mail." -msgstr "蟴痽 恓 芩." +msgstr "郋邽 郇迮 邾訄." -#: libmisc/mail.c:75 +#: libmisc/mail.c:74 msgid "You have mail." -msgstr "鼵 芩夭 俵痽." +msgstr "邽 邾訄迮 郈郋." -#: libmisc/obscure.c:281 src/passwd.c:244 +#: libmisc/obscure.c:271 src/passwd.c:183 #, c-format msgid "Bad password: %s. " -msgstr "蟴Щ恌 釓眐杻: %s. " +msgstr "郋迣訄郇邽邿 郈訄郋郅: %s. " -#: libmisc/pam_pass.c:42 +#: libmisc/pam_pass.c:38 #, c-format msgid "passwd: pam_start() failed, error %d\n" -msgstr "passwd: pam_start() 恓 訰冾恔恘, 俵虭昋 %d\n" +msgstr "passwd: pam_start() 郇迮 赲邽郕郋郇訄郇郋, 郈郋邾邽郅郕訄 %d\n" -#: libmisc/pam_pass.c:49 +#: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/setupenv.c:211 +#: libmisc/pam_pass.c:50 +msgid "passwd: password updated successfully\n" +msgstr "" + +#: libmisc/setupenv.c:208 #, c-format msgid "Unable to cd to \"%s\"\n" -msgstr "醚 迍笝 陓疻彸 鰍 埧侂 \"%s\"\n" +msgstr "迮 邾郋迠 郈迮迮邿邽 迡郋 迮郕邽 \"%s\"\n" -#: libmisc/setupenv.c:219 +#: libmisc/setupenv.c:216 msgid "No directory, logging in with HOME=/" -msgstr "醚芩 埧侂, 蛈騰疶袬友 蚥衶池 HOME=/" +msgstr "迮邾訄 迮郕邽, 赲迡郕邽赲訄邾郋 迮 郱 HOME=/" -#: libmisc/shell.c:78 -#, c-format -msgid "Executing shell %s\n" -msgstr "鼵冾挍 shell %s\n" - -#. -#. * Obviously something is really wrong - I can't figure out -#. * how to execute this stupid shell, so I might as well give -#. * up in disgust ... -#. -#: libmisc/shell.c:122 +#: libmisc/shell.c:119 #, c-format msgid "Cannot execute %s" -msgstr "醚 迍笝 訰冾恔埩 %s" +msgstr "迮 邾郋迠 赲邽郕郋郇訄邽 %s" -#: libmisc/sub.c:61 +#: libmisc/sub.c:55 #, c-format msgid "Invalid root directory \"%s\"\n" -msgstr "醚蛈眛 冾疻恓袬 埧佹 \"%s\"\n" +msgstr "迮赲郇訄 郕郋迮郇迮赲訄 迮郕訄 \"%s\"\n" -#: libmisc/sub.c:73 +#: libmisc/sub.c:67 #, c-format msgid "Can't change root directory to \"%s\"\n" -msgstr "醚 迍笝 硰缶尕 冾疻恓赹 埧劼 恔 \"%s\"\n" +msgstr "迮 邾郋迠 郱邾郇邽邽 郕郋迮郇迮赲 迮郕 郇訄 \"%s\"\n" -#: libmisc/xmalloc.c:28 +#: libmisc/xmalloc.c:24 #, c-format msgid "malloc(%d) failed\n" -msgstr "malloc(%d) 恓 訰冾恔恘\n" +msgstr "malloc(%d) 郇迮 赲邽郕郋郇訄郇郋\n" -#: lib/dialchk.c:71 -msgid "Dialup Password: " -msgstr "蟥眐杻 恔 迍霰迓 虷騰抸畷恄: " - -#: lib/getdef.c:276 +#: lib/getdef.c:274 msgid "Could not allocate space for config info.\n" -msgstr "醚 迍笝 訰藻旻埩 疻袀眑 騷 冾恇灰梑謄百恌 鐘恄圮.\n" +msgstr "迮 邾郋迠 赲邽迡郅邽邽 迮邽 迡郅 郕郋郇迣訄邿郇邽 迡訄郇郇邽.\n" -#. -#. * Item was never found. -#. -#: lib/getdef.c:330 +#: lib/getdef.c:328 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -"俵虭昋 冾恇灰梑謄戍 - 恓蛈鰍芩 俵硭疆 '%s' (俵蛈鰍邴 謐穻峖衲畛婘畛)\n" +"郈郋邾邽郅郕訄 郕郋郇迣訄 - 郇迮赲迡郋邾訄 郈郋郱邽 '%s' (郈郋赲迡郋邾迮 訄迡邾郇訄郋訄)\n" -#: lib/getdef.c:417 -#, c-format -msgid "error - lookup '%s' failed\n" -msgstr "俵虭昋 - 俵觛 '%s' 恓 訰冾恔恘\n" - -#: lib/getdef.c:425 -#, c-format -msgid "%s not found\n" -msgstr "%s 恓 硩購霰恘\n" - -#. -#. * get the password from her, and set the salt for -#. * the decryption from the group file. -#. -#: lib/pwauth.c:54 src/newgrp.c:348 +#: lib/pwauth.c:54 src/newgrp.c:343 msgid "Password: " -msgstr "蟥眐杻: " +msgstr "訄郋郅: " #: lib/pwauth.c:56 #, c-format msgid "%s's Password: " -msgstr "蟥眐杻 冾疶衲欳醣 %s: " +msgstr "訄郋郅 郕郋邽赲訄訄 %s: " -#: lib/pwauth.c:270 +#: lib/pwauth.c:247 msgid "(Echo on) " msgstr "" #: lib/strerror.c:20 #, c-format msgid "Unknown error %d" -msgstr "醚蛈鰍芩 俵虭昋 %d" +msgstr "迮赲迡郋邾訄 郈郋邾邽郅郕訄 %d" -#: src/chage.c:116 -#, c-format +#: src/chage.c:118 msgid "" -"Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" -"\t[-I inactive] [-E expire] [-d last_day] user\n" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -"鼵冾疶衲瓬梛埧: %s [-l] [-m 穻壴鰓肉] [-M 芩剆_鰓肉] [-W 睋衲籤纖曬恮]\n" -"\t[-I 恓賸埩谻而婥] [-E 倷珃婞癹曬恘] [-d 珃埡恄百_霰挎] 冾疶衲欳醣\n" +"邽郕郋邽郋赲邿迮: chage [-l] [-m 邾郇_迡郇赲] [-M 邾訄郕_迡郇赲] [-W 郱訄迮迮迠迮郇郇]\n" +" [-I 郇迮訄郕邽赲郇] [-E 郈郋郋迮郇郇郋]\n" +" [-d 郋訄郇郇邿_迡迮郇] 郕郋邽赲訄\n" -#: src/chage.c:122 -#, c-format -msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" -msgstr "" -"鼵冾疶衲瓬梛埧: %s [-l] [-m 穻壴鰓肉] [-M 芩剆_鰓肉] [-d 珃埡恄百_霰挎] " -"冾疶衲欳醣\n" - -#: src/chage.c:157 +#: src/chage.c:152 msgid "" "Enter the new value, or press ENTER for the default\n" "\n" msgstr "" -"蠯鼴耒 恘覂 硩醣曬恮, 謝 恔笴耒 ENTER 騷 硩醣曬恮 俵 睋迍軜欳蹉怹\n" +"赲迮迡 郇郋赲迮 郱郇訄迮郇郇, 訄訇郋 郇訄迠邾 ENTER 迡郅 郱郇訄迮郇郇 郈郋 郱訄邾郋赲赲訄郇郇\n" "\n" -#: src/chage.c:160 +#: src/chage.c:155 msgid "Minimum Password Age" -msgstr "磽峖芩杻恌 蛈 釓眐曶" +msgstr "郇邾訄郅郇邽邿 赲郕 郈訄郋郅" -#: src/chage.c:166 +#: src/chage.c:161 msgid "Maximum Password Age" -msgstr "篴剆糸賻媓圴 蛈 釓眐曶" +msgstr "訄郕邾訄郅郇邽邿 赲郕 郈訄郋郅" -#: src/chage.c:174 +#: src/chage.c:169 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "擽埡恄 硰缶 釓眐曶 (覈覈-臇-鳵)" +msgstr "訄郇郇 郱邾郇訄 郈訄郋郅 (--)" + +#: src/chage.c:177 +msgid "Password Expiration Warning" +msgstr "訄迮迮迠迮郇郇 郈郋 郈郋郋迮郇郇 郈訄郋郅" #: src/chage.c:183 -msgid "Password Expiration Warning" -msgstr "輾埧疻秸恄 倷 倷珃婞癹曬恮 釓眐曶" - -#: src/chage.c:189 msgid "Password Inactive" -msgstr "蟥眐杻 恓賸埩谻圴" +msgstr "訄郋郅 郇迮訄郕邽赲郇邽邿" -#: src/chage.c:197 +#: src/chage.c:191 msgid "Account Expiration Date (YYYY-MM-DD)" -msgstr "靾埡 倷珃婞癹曬恮 畛梉劼 (覈覈-臇-鳵)" +msgstr "訄訄 郈郋郋迮郇郇 訄郇郕 (--)" -#. -#. * Start with the easy numbers - the number of days before the -#. * password can be changed, the number of days after which the -#. * password must be chaged, the number of days before the password -#. * expires that the user is told, and the number of days after the -#. * password expires that the account becomes unusable. -#. -#: src/chage.c:248 +#: src/chage.c:241 #, c-format msgid "Minimum:\t%ld\n" -msgstr "磽峖邯:\t%ld\n" +msgstr "郇邾邾:\t%ld\n" -#: src/chage.c:249 +#: src/chage.c:242 #, c-format msgid "Maximum:\t%ld\n" -msgstr "篴剆糸梠:\t%ld\n" +msgstr "訄郕邾邾:\t%ld\n" -#: src/chage.c:251 +#: src/chage.c:243 #, c-format msgid "Warning:\t%ld\n" -msgstr "輾埧疻秸恄:\t%ld\n" +msgstr "訄迮迮迠迮郇郇:\t%ld\n" -#: src/chage.c:252 +#: src/chage.c:244 #, c-format msgid "Inactive:\t%ld\n" -msgstr "醚賸埩谻圴:\t%ld\n" +msgstr "迮訄郕邽赲郇邽邿:\t%ld\n" -#. -#. * The "last change" date is either "Never" or the date the password -#. * was last modified. The date is the number of days since 1/1/1970. -#. -#: src/chage.c:260 +#: src/chage.c:251 msgid "Last Change:\t\t" -msgstr "擽埡恄 硰缶:\t\t" +msgstr "訄郇郇 郱邾郇訄:\t\t" -#: src/chage.c:262 src/chage.c:276 src/chage.c:293 src/chage.c:306 +#: src/chage.c:253 src/chage.c:267 src/chage.c:283 src/chage.c:296 msgid "Never\n" -msgstr "謢冾旻\n" +msgstr "郕郋郅邽\n" -#. -#. * The password expiration date is determined from the last change -#. * date plus the number of days the password is valid for. -#. -#: src/chage.c:273 +#: src/chage.c:264 msgid "Password Expires:\t" -msgstr "蟥眐杻 倷珃婞癹曬恘:\t" +msgstr "訄郋郅 郈郋郋迮郇郇郋:\t" -#. -#. * The account becomes inactive if the password is expired for more -#. * than "inactdays". The expiration date is calculated and the -#. * number of inactive days is added. The resulting date is when the -#. * active will be disabled. -#. -#: src/chage.c:290 +#: src/chage.c:280 msgid "Password Inactive:\t" -msgstr "蟥眐杻 恓賸埩谻圴:\t" +msgstr "訄郋郅 郇迮訄郕邽赲郇邽邿:\t" -#. -#. * The account will expire on the given date regardless of the -#. * password expiring or not. -#. -#: src/chage.c:304 +#: src/chage.c:294 msgid "Account Expires:\t" -msgstr "臗梉玹 倷珃婞癹曬:\t" +msgstr "訄郇郋郕 郈郋郋迮郇郋:\t" -#: src/chage.c:468 +#: src/chage.c:445 #, c-format msgid "%s: do not include \"l\" with other flags\n" -msgstr "%s: 恓 訰冾疶衲瓬梛埧 \"l\" 缶萓虭 と豳趨尐n" +msgstr "%s: 郇迮 赲邽郕郋邽郋赲邿迮 \"l\" 郱 郇邾邽 郅訄迣訄邾邽\n" -#: src/chage.c:481 src/chage.c:652 src/login.c:518 +#: src/chage.c:458 src/chage.c:588 src/login.c:503 #, c-format msgid "%s: permission denied\n" -msgstr "%s: 鰍衲桸 蛈騵瓬旼恘\n" +msgstr "%s: 迡郋郈 赲迡邾郋赲郅迮郇郋\n" -#: src/chage.c:512 src/chpasswd.c:139 src/groupadd.c:529 src/groupdel.c:322 -#: src/groupmod.c:520 src/newusers.c:381 src/useradd.c:1754 src/userdel.c:717 -#: src/usermod.c:1732 -#, fuzzy, c-format -msgid "%s: PAM authentication failed\n" -msgstr "%s: PAM 轅埧拏囡竹謄老 恓 倷珅袽縷n" - -#: src/chage.c:533 src/chpasswd.c:157 +#: src/chage.c:489 src/chpasswd.c:136 src/groupadd.c:530 src/groupdel.c:325 +#: src/groupmod.c:521 src/newusers.c:362 src/useradd.c:1582 src/userdel.c:657 +#: src/usermod.c:1413 #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: 恓 迍笝 睋蟯玹欳轂 そ帎 釓眐旼佢n" +msgid "%s: PAM authentication failed\n" +msgstr "%s: PAM 訄迮郇邽郕訄 郇迮 郈郋邿郅訄\n" -#: src/chage.c:544 src/chpasswd.c:162 +#: src/chage.c:510 src/chpasswd.c:159 #, c-format msgid "%s: can't open password file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:552 +#: src/chage.c:518 #, c-format msgid "%s: unknown user: %s\n" -msgstr "%s: 恓蛈鰍虭 冾疶衲欳醣: %s\n" +msgstr "%s: 郇迮赲迡郋邾邽邿 郕郋邽赲訄: %s\n" -#: src/chage.c:571 +#: src/chage.c:536 #, fuzzy, c-format msgid "%s: can't lock shadow password file" -msgstr "%s: 恓 迍笝 睋蟯玹欳轂 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/chage.c:579 +#: src/chage.c:544 #, fuzzy, c-format msgid "%s: can't open shadow password file" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/chage.c:674 +#: src/chage.c:605 #, c-format msgid "Changing the aging information for %s\n" -msgstr "穻怹 蛈冾赹 缶に眝謄池 騷 %s\n" +msgstr "邾郇 赲郕郋赲 郇郋邾訄 迡郅 %s\n" -#: src/chage.c:677 +#: src/chage.c:608 #, c-format msgid "%s: error changing fields\n" -msgstr "%s: 俵虭昋 睋穻恌 俵曶\n" +msgstr "%s: 郈郋邾邽郅郕訄 郱訄邾郇邽 郈郋郅\n" -#: src/chage.c:705 src/chage.c:771 src/pwunconv.c:174 +#: src/chage.c:632 src/pwunconv.c:138 #, c-format msgid "%s: can't update password file\n" -msgstr "%s: 恓 迍笝 玴瓬尕 そ帎 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:737 src/pwunconv.c:168 +#: src/chage.c:661 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "%s: 恓 迍笝 玴瓬尕 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/chage.c:789 src/chage.c:805 src/chfn.c:570 src/chsh.c:382 -#: src/passwd.c:747 src/passwd.c:859 +#: src/chage.c:676 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 +#: src/passwd.c:615 msgid "Error updating the DBM password entry.\n" -msgstr "蟴虭昋 玴瓬旼恄 睋倅袀 釓眐曶 DBM.\n" +msgstr "郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 郱訄郈邽 郈訄郋郅 DBM.\n" -#: src/chage.c:823 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "%s: 恓 迍笝 陓疻倅蚆埩 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/chage.c:838 +#: src/chage.c:707 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "%s: 恓 迍笝 陓疻倅蚆埩 そ帎 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:857 src/chpasswd.c:343 src/groupadd.c:590 src/groupdel.c:409 -#: src/groupmod.c:604 src/newusers.c:628 src/useradd.c:1869 src/userdel.c:849 -#: src/usermod.c:1811 +#: src/chage.c:727 src/chpasswd.c:336 src/groupadd.c:592 src/groupdel.c:413 +#: src/groupmod.c:606 src/newusers.c:609 src/useradd.c:1705 src/userdel.c:814 +#: src/usermod.c:1494 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: 恓 迍笝 畛睌昑劼袬埩 そ帎\n" +msgstr "%s: 郇迮 邾郋迠 訄郱訇郅郋郕赲訄邽 訄邿郅\n" -#: src/chfn.c:83 +#: src/chfn.c:84 #, c-format msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" "\t[-h home_ph] [-o other] [user]\n" msgstr "" -"鼵冾疶衲瓬梛啎: %s [-f 俵谻鰭糸'娭 [-r 恘芶浨辿迓轂巿 [-w 眐蟠犌佤埧旼に垚\n" -"\t[-h 鰍芩褁百_埧旼に垚 [-o 缶袹] [冾疶衲欳醣]\n" +"邽郕郋邽郋赲邿: %s [-f 郈郋赲郇迮_邾'] [-r 郇郋邾迮_郕邾郇訄邽] [-w 郋訇郋邿_迮郅迮郋郇]\n" +"\t[-h 迡郋邾訄郇邿_迮郅迮郋郇] [-o 郇迮] [郕郋邽赲訄]\n" -#: src/chfn.c:88 +#: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -"鼵冾疶衲瓬梛埧: %s [-f 俵谻鰭糸'娭 [-r 恘芶浨辿迓轂巿\n" -"\t[-w 眐蟠犌佤埧旼に垚 [-h 鰍芩褁百_埧旼に垚\n" +"邽郕郋邽郋赲邿迮: %s [-f 郈郋赲郇迮_邾'] [-r 郇郋邾迮_郕邾郇訄邽]\n" +"\t[-w 郋訇郋邿_迮郅迮郋郇] [-h 迡郋邾訄郇邿_迮郅迮郋郇]\n" -#: src/chfn.c:139 +#: src/chfn.c:140 msgid "Enter the new value, or press ENTER for the default\n" msgstr "" -"蠯鼴耒 恘覂 硩醣曬恮, 謝 恔笴耒 ENTER, 騷 硩醣曬恮 俵 睋迍軜欳蹉怹\n" +"赲迮迡 郇郋赲迮 郱郇訄迮郇郇, 訄訇郋 郇訄迠邾 ENTER, 迡郅 郱郇訄迮郇郇 郈郋 郱訄邾郋赲赲訄郇郇\n" -#: src/chfn.c:142 +#: src/chfn.c:143 msgid "Full Name" -msgstr "蟴谻 糸'" +msgstr "郋赲郇迮 邾'" -#: src/chfn.c:144 +#: src/chfn.c:145 #, c-format msgid "\tFull Name: %s\n" -msgstr "\t蟴谻 糸': %s\n" +msgstr "\t郋赲郇迮 邾': %s\n" -#: src/chfn.c:147 +#: src/chfn.c:148 msgid "Room Number" -msgstr "鎯芶 辿迓轂" +msgstr "郋邾迮 郕邾郇訄邽" -#: src/chfn.c:149 +#: src/chfn.c:150 #, c-format msgid "\tRoom Number: %s\n" -msgstr "\t鎯芶 辿迓轂: %s\n" +msgstr "\t郋邾迮 郕邾郇訄邽: %s\n" -#: src/chfn.c:152 +#: src/chfn.c:153 msgid "Work Phone" -msgstr "藲蟠犌 埧旼に" +msgstr "郋訇郋邿 迮郅迮郋郇" -#: src/chfn.c:154 +#: src/chfn.c:155 #, c-format msgid "\tWork Phone: %s\n" -msgstr "\t藲蟠犌 埧旼に: %s\n" +msgstr "\t郋訇郋邿 迮郅迮郋郇: %s\n" -#: src/chfn.c:157 +#: src/chfn.c:158 msgid "Home Phone" -msgstr "餀芩褁百 埧旼に" +msgstr "郋邾訄郇邿 迮郅迮郋郇" -#: src/chfn.c:159 +#: src/chfn.c:160 #, c-format msgid "\tHome Phone: %s\n" -msgstr "\t餀芩褁百 埧旼に: %s\n" +msgstr "\t郋邾訄郇邿 迮郅迮郋郇: %s\n" -#: src/chfn.c:162 +#: src/chfn.c:163 msgid "Other" -msgstr "僇袹" +msgstr "郇迮" -#: src/chfn.c:271 src/chfn.c:281 src/chfn.c:291 src/chfn.c:301 src/chfn.c:311 -#: src/chfn.c:379 src/passwd.c:1115 +#: src/chfn.c:272 src/chfn.c:282 src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 +#: src/chfn.c:380 src/passwd.c:853 #, c-format msgid "%s: Permission denied.\n" -msgstr "%s: 鰍衲桸 蛈騵瓬旼恘.\n" +msgstr "%s: 苺 迡郋郈 赲迡邾郋赲郅迮郇郋.\n" -#: src/chfn.c:332 src/chsh.c:190 src/passwd.c:1165 +#: src/chfn.c:333 src/chsh.c:185 src/passwd.c:903 #, c-format msgid "%s: Unknown user %s\n" -msgstr "%s: 醚蛈鰍虭 冾疶衲欳醣 %s\n" +msgstr "%s: 迮赲迡郋邾邽邿 郕郋邽赲訄 %s\n" -#: src/chfn.c:341 src/chsh.c:198 src/passwd.c:1096 +#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 #, c-format msgid "%s: Cannot determine your user name.\n" -msgstr "%s: 醚 迍笝 訰硩醣尕 袬袹 糸' 冾疶衲欳醣.\n" +msgstr "%s: 迮 邾郋迠 赲邽郱郇訄邽邽 赲訄迮 邾' 郕郋邽赲訄訄.\n" -#: src/chfn.c:358 src/chsh.c:215 +#: src/chfn.c:359 src/chsh.c:210 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "%s: 恓 迍笝 硰缶尕 冾疶衲欳醣 `%s' 佮忖拏 NIS.\n" +msgstr "%s: 郇迮 邾郋迠 郱邾郇邽邽 郕郋邽赲訄訄 `%s' 郕郅郇 NIS.\n" -#: src/chfn.c:366 src/chsh.c:223 +#: src/chfn.c:367 src/chsh.c:218 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: `%s' NIS 蚥眢籤 騷 贈珌 佮忖拏.\n" +msgstr "%s: `%s' NIS 迮赲迮 迡郅 郋迣郋 郕郅郇訄.\n" -#: src/chfn.c:441 +#: src/chfn.c:442 #, c-format msgid "Changing the user information for %s\n" -msgstr "穻恔 缶に眝謄戍 倷 冾疶衲欳醣 %s\n" +msgstr "邾郇訄 郇郋邾訄 郈郋 郕郋邽赲訄訄 %s\n" -#: src/chfn.c:450 +#: src/chfn.c:451 #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s: 恓蛈眛 糸': \"%s\"\n" +msgstr "%s: 郇迮赲郇迮 邾': \"%s\"\n" -#: src/chfn.c:456 +#: src/chfn.c:457 #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "%s: 恓蛈眛圴 恘芶 辿迓轂: \"%s\"\n" +msgstr "%s: 郇迮赲郇邽邿 郇郋邾迮 郕邾郇訄邽: \"%s\"\n" -#: src/chfn.c:462 +#: src/chfn.c:463 #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "%s: 恓蛈眛圴 眐蟠瘃 埧旼に: \"%s\"\n" +msgstr "%s: 郇迮赲郇邽邿 郋訇郋邽邿 迮郅迮郋郇: \"%s\"\n" -#: src/chfn.c:468 +#: src/chfn.c:469 #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s: 恓蛈眛圴 鰍芩褁百 埧旼に: \"%s\"\n" +msgstr "%s: 郇迮赲郇邽邿 迡郋邾訄郇邿 迮郅迮郋郇: \"%s\"\n" -#: src/chfn.c:475 +#: src/chfn.c:476 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s: \"%s\" 訬抸瓾 睋蟠眐恓峖 蚕邰玶尐n" +msgstr "%s: \"%s\" 赲郕郅訄 郱訄訇郋郋郇迮郇 邽邾赲郋郅邽\n" -#: src/chfn.c:488 +#: src/chfn.c:489 #, c-format msgid "%s: fields too long\n" -msgstr "%s: 俵曶 睋恔齟 鰍觙吒n" +msgstr "%s: 郈郋郅 郱訄郇訄迡郋 迡郋赲迣\n" -#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277 +#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 msgid "Cannot change ID to root.\n" -msgstr "醚 迍笝 硰缶尕 ID 恔 root.\n" +msgstr "迮 邾郋迠 郱邾郇邽邽 ID 郇訄 root.\n" -#: src/chfn.c:519 src/chsh.c:331 src/passwd.c:656 src/passwd.c:811 +#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 msgid "Cannot lock the password file; try again later.\n" -msgstr "醚 迍笝 蟯玹欳轂 そ帎 釓眐旼; 衄眐謬彸 虷硩自.\n" +msgstr "迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈訄郋郅迮邿; 郈郋訇邿迮 郈郱郇迮.\n" -#: src/chfn.c:525 src/chsh.c:337 src/passwd.c:661 src/passwd.c:816 +#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 msgid "Cannot open the password file.\n" -msgstr "醚 迍笝 蛈騰疶埩 そ帎 釓眐旼.\n" +msgstr "迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈訄郋郅迮邿.\n" -#: src/chfn.c:542 src/chsh.c:352 src/passwd.c:667 src/usermod.c:1348 +#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 #, c-format msgid "%s: %s not found in /etc/passwd\n" -msgstr "%s: %s 恓 硩購霰恘 /etc/passwd\n" +msgstr "%s: %s 郇迮 郱郇訄邿迡迮郇郋 /etc/passwd\n" -#: src/chfn.c:561 src/chsh.c:373 src/passwd.c:740 src/passwd.c:852 +#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 msgid "Error updating the password entry.\n" -msgstr "醚 迍笝 玴瓬尕 睋倅 そ帎 釓眐旼.\n" +msgstr "迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 訄邿郅 郈訄郋郅迮邿.\n" -#: src/chfn.c:585 src/chsh.c:397 src/passwd.c:755 src/passwd.c:867 +#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 msgid "Cannot commit password file changes.\n" -msgstr "醚 迍笝 睋倅蚆埩 硰缶 鰍 そ帎 釓眐旼.\n" +msgstr "迮 邾郋迠 郱訄郈邽訄邽 郱邾郇邽 迡郋 訄邿郅 郈訄郋郅迮邿.\n" -#: src/chfn.c:592 src/chsh.c:404 +#: src/chfn.c:593 src/chsh.c:399 msgid "Cannot unlock the password file.\n" -msgstr "醚 迍笝 畛睌昑劼袬埩 そ帎 釓眐旼.\n" +msgstr "迮 邾郋迠 訄郱訇郅郋郕赲訄邽 訄邿郅 郈訄郋郅迮邿.\n" -#: src/chpasswd.c:66 +#: src/chpasswd.c:67 +#, fuzzy, c-format +msgid "Usage: %s [-e]\n" +msgstr "赲邽郕郋邽郋赲邿迮: %s [-e]\n" + +#: src/chpasswd.c:154 #, c-format -msgid "usage: %s [-e]\n" -msgstr "訰冾疶衲瓬梛埧: %s [-e]\n" +msgid "%s: can't lock password file\n" +msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/chpasswd.c:171 src/pwconv.c:94 +#: src/chpasswd.c:168 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" -msgstr "%s: 恓 迍笝 睋蟯玹欳轂 そ帎 倷圮瓬蹉奼 釓眐曶虭\n" +msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 郱 郈邽郋赲訄郇邽邾邽 郈訄郋郅邾邽\n" -#: src/chpasswd.c:177 src/gpasswd.c:596 src/pwconv.c:99 src/pwunconv.c:103 -#: src/pwunconv.c:108 +#: src/chpasswd.c:174 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 倷圮瓬蹉奼 釓眐曶虭\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郱 郈邽郋赲訄郇邽邾邽 郈訄郋郅邾邽\n" -#: src/chpasswd.c:200 src/newusers.c:460 +#: src/chpasswd.c:197 src/newusers.c:441 #, c-format msgid "%s: line %d: line too long\n" -msgstr "%s: 眒鰍 %d: 眒鰍 睋恔齟 鰍觙圴\n" +msgstr "%s: 迡郋郕 %d: 迡郋郕 郱訄郇訄迡郋 迡郋赲迣邽邿\n" -#: src/chpasswd.c:220 +#: src/chpasswd.c:217 #, c-format msgid "%s: line %d: missing new password\n" -msgstr "%s: 眒鰍 %d: 觴賸掑 恘豜ж 釓眐曶\n" +msgstr "%s: 迡郋郕 %d: 訇訄郕 郇郋赲郋迣郋 郈訄郋郅\n" -#: src/chpasswd.c:237 +#: src/chpasswd.c:234 #, c-format msgid "%s: line %d: unknown user %s\n" -msgstr "%s: 眒鰍 %d: 恓蛈鰍虭 冾疶衲欳醣 %s\n" +msgstr "%s: 迡郋郕 %d: 郇迮赲迡郋邾邽邿 郕郋邽赲訄 %s\n" -#: src/chpasswd.c:290 +#: src/chpasswd.c:280 #, c-format msgid "%s: line %d: cannot update password entry\n" -msgstr "%s: 眒鰍 %d: 恓 迍笝 玴瓬尕 睋倅 臏琣 釓眐旼佢n" +msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 訇訄郱 郈訄郋郅迮邿\n" -#: src/chpasswd.c:307 src/newusers.c:588 +#: src/chpasswd.c:297 src/newusers.c:569 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: 訰朒旼恘 俵虭昋, 硰缶 灰恘眙殮寔娖n" +msgstr "%s: 赲邽赲郅迮郇郋 郈郋邾邽郅郕, 郱邾郇邽 迣郇郋\n" -#: src/chpasswd.c:319 +#: src/chpasswd.c:309 #, c-format msgid "%s: error updating shadow file\n" -msgstr "%s: 俵虭昋 玴瓬旼恄 そ帎 倷圮瓬蹉奼 釓眐曶虭\n" +msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 訄邿郅 郱 郈邽郋赲訄郇邽邾邽 郈訄郋郅邾邽\n" -#: src/chpasswd.c:328 +#: src/chpasswd.c:318 #, c-format msgid "%s: error updating password file\n" -msgstr "%s: 俵虭昋 玴瓬旼恄 そ帎 釓眐曶虭\n" +msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 訄邿郅 郱 郈訄郋郅邾邽\n" -#: src/chsh.c:75 +#: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" -msgstr "鼵冾疶衲瓬梛埧: %s [-s shell] [糸'娭\n" - -#: src/chsh.c:89 -msgid "Enter the new value, or press return for the default\n" -msgstr "" -"蠯鼴耒 恘覂 硩醣曬恮, 謝 恔笴耒 ENTER, 騷 硩醣曬恮 俵 睋迍軜欳蹉怹\n" +msgstr "邽郕郋邽郋赲邿迮: %s [-s shell] [邾']\n" #: src/chsh.c:90 +msgid "Enter the new value, or press return for the default\n" +msgstr "" +"赲迮迡 郇郋赲迮 郱郇訄迮郇郇, 訄訇郋 郇訄迠邾 ENTER, 迡郅 郱郇訄迮郇郇 郈郋 郱訄邾郋赲赲訄郇郇\n" + +#: src/chsh.c:91 msgid "Login Shell" msgstr "Login Shell" -#: src/chsh.c:239 src/chsh.c:253 +#: src/chsh.c:234 src/chsh.c:248 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "醚 迍笥 硰缶尕 shell 騷 %s.\n" +msgstr "迮 邾郋迠郇訄 郱邾郇邽邽 shell 迡郅 %s.\n" -#: src/chsh.c:282 +#: src/chsh.c:277 #, c-format msgid "Changing the login shell for %s\n" -msgstr "穻怹 shell 騷 %s\n" +msgstr "邾郇 shell 迡郅 %s\n" -#: src/chsh.c:294 +#: src/chsh.c:289 #, c-format msgid "%s: Invalid entry: %s\n" -msgstr "%s: 醚蛈眛圴 睋倅: %s\n" +msgstr "%s: 迮赲郇邽邿 郱訄郈邽: %s\n" -#: src/chsh.c:301 +#: src/chsh.c:296 #, c-format msgid "%s is an invalid shell.\n" -msgstr "%s 恓蛈眛圴 shell.\n" - -#: src/dpasswd.c:52 -#, c-format -msgid "Usage: %s [-(a|d)] shell\n" -msgstr "鼵冾疶衲瓬梛埧: %s [-(a|d)] shell\n" - -#: src/dpasswd.c:115 -msgid "Shell password: " -msgstr "Shell 釓眐杻: " - -#: src/dpasswd.c:121 -msgid "re-enter Shell password: " -msgstr "蟴赻玾耒 釓眐杻 騷 shell: " - -#: src/dpasswd.c:129 -#, c-format -msgid "%s: Passwords do not match, try again.\n" -msgstr "%s: 蟥眐杻 恓 衄肉釓鐘, 衄眐謬彸 硩瓬.\n" - -#: src/dpasswd.c:149 -#, c-format -msgid "%s: can't create %s" -msgstr "%s: 恓 迍笝 衲豜疶埩 %s" - -#: src/dpasswd.c:155 -#, c-format -msgid "%s: can't open %s" -msgstr "%s: 恓 迍笝 蛈騰疶埩 %s" - -#: src/dpasswd.c:183 -#, c-format -msgid "%s: Shell %s not found.\n" -msgstr "%s: Shell %s 恓 硩購霰恘.\n" +msgstr "%s 郇迮赲郇邽邿 shell.\n" #: src/expiry.c:59 msgid "Usage: expiry {-f|-c}\n" -msgstr "鼵冾疶衲瓬梛埧: expiry {-f|-c}\n" +msgstr "邽郕郋邽郋赲邿迮: expiry {-f|-c}\n" #: src/expiry.c:113 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" -msgstr "%s: 摷醲蠈欈闇! 襓珌畛芩 俵訰恔 謬埩 SUID root!\n" +msgstr "%s: 苤苠觓! 郋迣訄邾訄 郈郋赲邽郇訄 訇邽 SUID root!\n" #: src/expiry.c:124 #, c-format msgid "%s: unknown user\n" -msgstr "%s: 恓蛈鰍虭 冾疶衲欳醣\n" +msgstr "%s: 郇迮赲迡郋邾邽邿 郕郋邽赲訄\n" #: src/faillog.c:77 -#, c-format -msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" +#, fuzzy, c-format +msgid "Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n" msgstr "" -"訰冾疶衲瓬梛埧: %s [-a|-u 冾疶衲欳醣] [-m 芩剆] [-r] [-t 鰓肉] [-l 昑灺蚥沎\n" +"赲邽郕郋邽郋赲邿迮: %s [-a|-u 郕郋邽赲訄] [-m 邾訄郕] [-r] [-t 迡郇赲] [-l 郅郋郕_迮郕]\n" #: src/faillog.c:131 src/lastlog.c:96 #, c-format msgid "Unknown User: %s\n" -msgstr "醚蛈鰍虭 冾疶衲欳醣: %s\n" +msgstr "迮赲迡郋邾邽邿 郕郋邽赲訄: %s\n" #: src/faillog.c:212 #, fuzzy msgid "Username Failures Maximum Latest\n" -msgstr "輴疶衲欳醣 蟴虭昑 篴剆糸梠 擽埡恄娖n" +msgstr "郋邽赲訄 郋邾邽郅郋郕 訄郕邾邾 訄郇郇\n" #: src/faillog.c:229 #, c-format msgid " %s on %s" -msgstr " %s 恔 %s" +msgstr " %s 郇訄 %s" #: src/faillog.c:233 #, c-format msgid " [%lds left]" -msgstr " [%lds 睋旻袶昑衯]" +msgstr " [%lds 郱訄郅邽邽郅郋]" #: src/faillog.c:237 #, c-format msgid " [%lds lock]" -msgstr " [%lds 蟯玹瓬蹉柛" +msgstr " [%lds 訇郅郋郕郋赲訄郇郋]" #: src/gpasswd.c:78 -#, c-format -msgid "usage: %s [-r|-R] group\n" -msgstr "訰冾疶衲瓬梛埧: %s [-r|-R] й桸縷n" +#, fuzzy, c-format +msgid "Usage: %s [-r|-R] group\n" +msgstr "赲邽郕郋邽郋赲邿迮: %s [-r|-R] 迣郈訄\n" #: src/gpasswd.c:79 #, c-format msgid " %s [-a user] group\n" -msgstr " %s [-a 冾疶衲欳醣] й桸縷n" +msgstr " %s [-a 郕郋邽赲訄] 迣郈訄\n" #: src/gpasswd.c:80 #, c-format msgid " %s [-d user] group\n" -msgstr " %s [-d 冾疶衲欳醣] й桸縷n" +msgstr " %s [-d 郕郋邽赲訄] 迣郈訄\n" #: src/gpasswd.c:83 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" -msgstr " %s [-A 冾疶衲欳醣,...] [-M 冾疶衲欳醣,...] й桸縷n" +msgstr " %s [-A 郕郋邽赲訄,...] [-M 郕郋邽赲訄,...] 迣郈訄\n" #: src/gpasswd.c:85 #, c-format msgid " %s [-M user,...] group\n" -msgstr " %s [-M 冾疶衲欳醣,...] й桸縷n" +msgstr " %s [-M 郕郋邽赲訄,...] 迣郈訄\n" #: src/gpasswd.c:146 src/gpasswd.c:230 #, c-format msgid "%s: unknown user %s\n" -msgstr "%s: 恓蛈鰍虭 冾疶衲欳醣 %s\n" +msgstr "%s: 郇迮赲迡郋邾邽邿 郕郋邽赲訄 %s\n" #: src/gpasswd.c:157 msgid "Permission denied.\n" -msgstr "餀衲桸 睋蟠眐恓恘.\n" +msgstr "郋郈 郱訄訇郋郋郇迮郇郋.\n" #: src/gpasswd.c:243 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s: 倷圮瓬蹉 釓眐怞 й桸 俵婞汕峖 騷 -A\n" +msgstr "%s: 郈邽郋赲訄郇 郈訄郋郅 迣郈 郈郋訇郇 迡郅 -A\n" #: src/gpasswd.c:294 msgid "Who are you?\n" -msgstr "鼵 婘?\n" +msgstr "邽 郋?\n" -#: src/gpasswd.c:313 src/newgrp.c:297 +#: src/gpasswd.c:313 src/newgrp.c:292 #, c-format msgid "unknown group: %s\n" -msgstr "恓蛈鰍芩 й桸: %s\n" +msgstr "郇迮赲迡郋邾訄 迣郈訄: %s\n" #: src/gpasswd.c:422 #, c-format msgid "Adding user %s to group %s\n" -msgstr "餀鐘恘 恘豜ж 冾疶衲欳醣 %s 鰍 й桸 %s\n" +msgstr "郋迡訄郇郋 郇郋赲郋迣郋 郕郋邽赲訄訄 %s 迡郋 迣郈邽 %s\n" #: src/gpasswd.c:440 #, c-format msgid "Removing user %s from group %s\n" -msgstr "鼵鐘旼恘 冾疶衲欳醣 %s й桸 %s\n" +msgstr "邽迡訄郅迮郇郋 郕郋邽赲訄訄 %s 郱 迣郈邽 %s\n" #: src/gpasswd.c:454 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s: 恓蛈鰍虭 痼曬 %s\n" +msgstr "%s: 郇迮赲迡郋邾邽邿 郅迮郇 %s\n" #: src/gpasswd.c:501 #, c-format msgid "%s: Not a tty\n" -msgstr "%s: 醚 tty\n" +msgstr "%s: 迮 tty\n" -#. -#. * A new password is to be entered and it must be encrypted, etc. -#. * The password will be prompted for twice, and both entries must be -#. * identical. There is no need to validate the old password since -#. * the invoker is either the group owner, or root. -#. #: src/gpasswd.c:522 #, c-format msgid "Changing the password for group %s\n" -msgstr "穻恔 釓眐曶 騷 й桸 %s\n" +msgstr "邾郇訄 郈訄郋郅 迡郅 迣郈邽 %s\n" #: src/gpasswd.c:525 msgid "New Password: " -msgstr "鎯訰 釓眐杻: " +msgstr "郋赲邽邿 郈訄郋郅: " -#: src/gpasswd.c:530 src/passwd.c:365 +#: src/gpasswd.c:530 src/passwd.c:281 msgid "Re-enter new password: " -msgstr "蟴赻玾耒 恘訰 釓眐杻: " +msgstr "郋赲郋 郇郋赲邽邿 郈訄郋郅: " #: src/gpasswd.c:542 msgid "They don't match; try again" -msgstr "恓 衄肉釓鐘; 衄眐謬彸 硩瓬" +msgstr "郇迮 郈赲郈訄迡訄; 郈郋訇邿迮 郱郇郋赲" #: src/gpasswd.c:546 #, c-format msgid "%s: Try again later\n" -msgstr "%s: 鯗眐謬彸 硩瓬 虷硩自髏n" +msgstr "%s: 苤郈郋訇邿迮 郱郇郋赲 郈郱郇迮\n" #: src/gpasswd.c:578 #, c-format msgid "%s: can't get lock\n" -msgstr "%s: 恓 迍笝 睋蟯玹欳轂尐n" +msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽\n" #: src/gpasswd.c:584 #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s: 恓 迍笝 睋蟯玹欳轂 臏祰 倷圮瓬蹉圴 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訇訄郱 郈邽郋赲訄郇邽邿 郈訄郋郅迮邿\n" #: src/gpasswd.c:590 #, c-format msgid "%s: can't open file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅\n" #: src/gpasswd.c:602 #, c-format msgid "%s: can't update entry\n" -msgstr "%s: 恓 迍笝 玴瓬尕 睋倅罡n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽\n" #: src/gpasswd.c:608 #, c-format msgid "%s: can't update shadow entry\n" -msgstr "%s: 恓 迍笝 玴瓬尕 睋倅 臏琣 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 訇訄郱 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" #: src/gpasswd.c:615 #, c-format msgid "%s: can't re-write file\n" -msgstr "%s: 恓 迍笝 陓疻倅蚆埩 そ帎\n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅\n" #: src/gpasswd.c:621 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s: 恓 迍笝 陓疻倅蚆埩 そ帎 倷圮瓬蹉圴 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈邽郋赲訄郇邽邿 郈訄郋郅迮邿\n" #: src/gpasswd.c:630 #, c-format msgid "%s: can't unlock file\n" -msgstr "%s: 恓 迍笝 畛睌昑劼袬埩 そ帎\n" +msgstr "%s: 郇迮 邾郋迠 訄郱訇郅郋郕赲訄邽 訄邿郅\n" #: src/gpasswd.c:635 #, c-format msgid "%s: can't update DBM files\n" -msgstr "%s: 恓 迍笝 玴瓬尕 DBM そ帎\n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 DBM 訄邿郅\n" #: src/gpasswd.c:642 #, c-format msgid "%s: can't update DBM shadow files\n" -msgstr "%s: 恓 迍笝 玴瓬尕 DBM そ帎 倷圮瓬蹉奼 釓眐曶虭\n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 DBM 訄邿郅 郱 郈邽郋赲訄郇邽邾邽 郈訄郋郅邾邽\n" -#: src/groupadd.c:101 -msgid "usage: groupadd [-g gid [-o]] group\n" -msgstr "訰冾疶衲瓬梛埧: groupadd [-g gid [-o]] й桸縷n" +#: src/groupadd.c:102 +msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" +msgstr "赲邽郕郋邽郋赲邿迮: groupadd [-g gid [-o]] [-f] 迣郈訄\n" -#: src/groupadd.c:167 src/groupadd.c:192 src/groupmod.c:179 src/groupmod.c:228 -#: src/useradd.c:970 src/usermod.c:552 src/usermod.c:695 +#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 +#: src/useradd.c:913 src/usermod.c:533 src/usermod.c:676 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s: 俵虭昋 鰍鐘恄 恘豜ж 睋倅袀 そ帎 й桸\n" +msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郇郋赲郋迣郋 郱訄郈邽 訄邿郅 迣郈\n" -#: src/groupadd.c:178 src/groupadd.c:203 src/groupmod.c:197 src/useradd.c:981 -#: src/usermod.c:564 src/usermod.c:708 +#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:924 +#: src/usermod.c:545 src/usermod.c:689 #, c-format msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: 俵虭昋 鰍鐘恄 恘豜ж 睋倅袀 そ帎 й桸 dbm\n" +msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郇郋赲郋迣郋 郱訄郈邽 訄邿郅 迣郈 dbm\n" -#: src/groupadd.c:255 src/useradd.c:1034 +#: src/groupadd.c:256 src/useradd.c:977 #, c-format msgid "%s: name %s is not unique\n" -msgstr "%s: 糸' %s 恓 梉竹賻媓奼\n" +msgstr "%s: 邾' %s 郇迮 郇郕訄郅郇邽邾\n" -#: src/groupadd.c:270 +#: src/groupadd.c:271 #, c-format msgid "%s: gid %u is not unique\n" -msgstr "%s: uid %u 恓 梉竹賻媓奼\n" +msgstr "%s: uid %u 郇迮 郇郕訄郅郇邽邾\n" -#: src/groupadd.c:294 +#: src/groupadd.c:295 #, c-format msgid "%s: can't get unique gid\n" -msgstr "%s: 恓 迍笝 珆疶芩埩 梉竹賻媓圴 gid\n" +msgstr "%s: 郇迮 邾郋迠 郋邽邾訄邽 郇郕訄郅郇邽邿 gid\n" -#. -#. * All invalid group names land here. -#. -#: src/groupadd.c:317 src/groupmod.c:341 +#: src/groupadd.c:318 src/groupmod.c:342 #, c-format msgid "%s: %s is a not a valid group name\n" -msgstr "%s: %s: 婘 恓 蛈眛 糸' й桸尐n" +msgstr "%s: %s: 郋 郇迮 赲郇迮 邾' 迣郈邽\n" -#: src/groupadd.c:346 src/groupmod.c:366 +#: src/groupadd.c:347 src/groupmod.c:367 #, c-format msgid "%s: invalid group %s\n" -msgstr "%s: 恓蛈眛 й桸 %s\n" +msgstr "%s: 郇迮赲郇訄 迣郈訄 %s\n" -#: src/groupadd.c:363 src/useradd.c:1313 +#: src/groupadd.c:364 src/useradd.c:1173 #, c-format msgid "%s: -O requires NAME=VALUE\n" -msgstr "%s: -O 訰芩Щ 穚闇=鍕槴闃\n" +msgstr "%s: -O 赲邽邾訄迣訄 =虴觓\n" -#: src/groupadd.c:407 src/groupdel.c:173 src/groupmod.c:401 src/useradd.c:1428 -#: src/userdel.c:312 src/usermod.c:576 +#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1288 +#: src/userdel.c:302 src/usermod.c:557 #, c-format msgid "%s: cannot rewrite group file\n" -msgstr "%s: 恓 迍笝 陓疻倅蚆埩 そ帎 й桸\n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 迣郈\n" -#: src/groupadd.c:415 src/groupdel.c:179 src/groupmod.c:409 src/useradd.c:1437 -#: src/userdel.c:319 src/usermod.c:722 +#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1297 +#: src/userdel.c:309 src/usermod.c:703 #, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s: 恓 迍笝 陓疻倅蚆埩 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/groupadd.c:433 src/groupdel.c:198 src/groupmod.c:427 src/userdel.c:403 +#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s: 恓 迍笝 睋蟯玹欳轂 そ帎 й桸\n" +msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 迣郈\n" -#: src/groupadd.c:438 src/groupdel.c:202 src/groupmod.c:432 +#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 #, c-format msgid "%s: unable to open group file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 й桸\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 迣郈\n" -#: src/groupadd.c:445 src/groupdel.c:207 src/groupmod.c:439 src/userdel.c:414 +#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: 恓 迍笝 蟯玹欳轂 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/groupadd.c:451 src/groupdel.c:212 src/groupmod.c:445 +#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/groupadd.c:562 +#: src/groupadd.c:563 #, c-format msgid "%s: group %s exists\n" -msgstr "%s: й桸 %s 而挍么n" +msgstr "%s: 迣郈訄 %s 郇\n" -#: src/groupdel.c:92 -msgid "usage: groupdel group\n" -msgstr "訰冾疶衲瓬梛埧: groupdel й桸縷n" +#: src/groupdel.c:88 +#, fuzzy +msgid "Usage: groupdel group\n" +msgstr "赲邽郕郋邽郋赲邿迮: groupdel 迣郈訄\n" -#: src/groupdel.c:110 src/groupmod.c:184 src/groupmod.c:233 +#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 #, c-format msgid "%s: error removing group entry\n" -msgstr "%s: 俵虭昋 蛈鐘旼恄 睋倅袀 臏硭 й桸\n" +msgstr "%s: 郈郋邾邽郅郕訄 赲迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 迣郈\n" -#: src/groupdel.c:122 src/groupmod.c:204 +#: src/groupdel.c:119 src/groupmod.c:205 #, c-format msgid "%s: error removing group dbm entry\n" -msgstr "%s: 俵虭昋 蛈鐘旼恄 睋倅袀 臏硭 й桸 dbm\n" +msgstr "%s: 郈郋邾邽郅郕訄 赲迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 迣郈 dbm\n" -#: src/groupdel.c:137 +#: src/groupdel.c:135 #, c-format msgid "%s: error removing shadow group entry\n" -msgstr "%s: 俵虭昋 蛈鐘旼恄 睋倅袀 臏硭 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郈郋邾邽郅郕訄 赲迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈邽郋赲訄郇邽 迣郈\n" -#: src/groupdel.c:150 src/groupmod.c:254 +#: src/groupdel.c:149 src/groupmod.c:255 #, c-format msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: 俵虭昋 蛈鐘旼恄 睋倅袀 臏硭 倷圮瓬蹉圮 й桸 dbm\n" +msgstr "%s: 郈郋邾邽郅郕訄 赲迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈邽郋赲訄郇邽 迣郈 dbm\n" -#. -#. * Can't remove the group. -#. -#: src/groupdel.c:254 +#: src/groupdel.c:255 #, c-format msgid "%s: cannot remove user's primary group.\n" -msgstr "%s: 恓 迍笝 訰鐘旻埩 ж昑谻 й桸 冾疶衲欳醣.\n" +msgstr "%s: 郇迮 邾郋迠 赲邽迡訄郅邽邽 迣郋郅郋赲郇 迣郈 郕郋邽赲訄訄.\n" -#: src/groupdel.c:355 src/groupmod.c:550 +#: src/groupdel.c:359 src/groupmod.c:551 #, c-format msgid "%s: group %s does not exist\n" -msgstr "%s: й桸 %s 恓 而挍么n" +msgstr "%s: 迣郈訄 %s 郇迮 郇\n" -#: src/groupdel.c:369 src/groupmod.c:566 +#: src/groupdel.c:373 src/groupmod.c:567 #, c-format msgid "%s: group %s is a NIS group\n" -msgstr "%s: й桸 %s й桸狨 NIS\n" +msgstr "%s: 迣郈訄 %s 迣郈郋 NIS\n" -#: src/groupdel.c:375 src/groupmod.c:571 src/userdel.c:776 src/usermod.c:1045 +#: src/groupdel.c:378 src/groupmod.c:572 src/userdel.c:724 src/usermod.c:805 #, c-format msgid "%s: %s is the NIS master\n" -msgstr "%s: %s 蚥眢籤 NIS\n" +msgstr "%s: %s 迮赲迮 NIS\n" #: src/groupmems.c:95 msgid "Member already exists\n" @@ -1009,7 +907,7 @@ msgid "Member to remove could not be found\n" msgstr "" #: src/groupmems.c:158 -msgid "usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" +msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n" msgstr "" #: src/groupmems.c:201 @@ -1027,59 +925,60 @@ msgstr "" #: src/groupmems.c:215 #, fuzzy msgid "Unable to lock group file\n" -msgstr "恓 迍笝 睋蟯玹欳轂 そ帎 й桸\n" +msgstr "郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 迣郈\n" #: src/groupmems.c:220 #, fuzzy msgid "Unable to open group file\n" -msgstr "恓 迍笝 蛈騰疶埩 そ帎 й桸\n" +msgstr "郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 迣郈\n" #: src/groupmems.c:240 msgid "Cannot close group file\n" -msgstr "恓 迍笝 蛈騰疶埩 そ帎 й桸\n" +msgstr "郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 迣郈\n" -#: src/groupmod.c:103 -msgid "usage: groupmod [-g gid [-o]] [-n name] group\n" -msgstr "訰冾疶衲瓬梛埧: groupmod [-g gid [-o]] [-n 糸'娭 й桸縷n" +#: src/groupmod.c:104 +#, fuzzy +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "赲邽郕郋邽郋赲邿迮: groupmod [-g gid [-o]] [-n 邾'] 迣郈訄\n" -#: src/groupmod.c:161 +#: src/groupmod.c:162 #, c-format msgid "%s: %s not found in /etc/group\n" -msgstr "%s: %s 恓 硩購霰恘 /etc/passwd\n" +msgstr "%s: %s 郇迮 郱郇訄邿迡迮郇郋 /etc/passwd\n" -#: src/groupmod.c:247 +#: src/groupmod.c:248 #, c-format msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: 恓 迍笝 鰍鐘埩 睋倅 臏祰 倷圮瓬蹉圮 й桸 dbm\n" +msgstr "%s: 郇迮 邾郋迠 迡郋迡訄邽 郱訄郈邽 訇訄郱 郈邽郋赲訄郇邽 迣郈 dbm\n" -#: src/groupmod.c:300 +#: src/groupmod.c:301 #, c-format msgid "%s: %u is not a unique gid\n" -msgstr "%s: %u 恓 梉竹賻媓圴 gid\n" +msgstr "%s: %u 郇迮 郇郕訄郅郇邽邿 gid\n" -#: src/groupmod.c:330 +#: src/groupmod.c:331 #, c-format msgid "%s: %s is not a unique name\n" -msgstr "%s: %s 恓 梉竹賻媓 糸'娖n" +msgstr "%s: %s 郇迮 郇郕訄郅郇迮 邾'\n" #: src/groups.c:59 #, c-format msgid "unknown user %s\n" -msgstr "恓蛈鰍虭 冾疶衲欳醣 %s\n" +msgstr "郇迮赲迡郋邾邽邿 郕郋邽赲訄 %s\n" #: src/grpck.c:87 #, c-format msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" -msgstr "鼵冾疶衲瓬梛埧: %s [-r] [-s] [й桸 [gshadow]]\n" +msgstr "邽郕郋邽郋赲邿迮: %s [-r] [-s] [迣郈訄 [gshadow]]\n" #: src/grpck.c:90 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" -msgstr "鼵冾疶衲瓬梛埧: %s [-r] [-s] [й桸縲\n" +msgstr "邽郕郋邽郋赲邿迮: %s [-r] [-s] [迣郈訄]\n" #: src/grpck.c:108 src/pwck.c:108 msgid "No" -msgstr "謢" +msgstr "" #: src/grpck.c:192 src/pwck.c:175 #, c-format @@ -1089,254 +988,227 @@ msgstr "" #: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s: 恓 迍笝 睋蟯玹欳轂 そ帎 %s\n" +msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 %s\n" #: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:202 src/pwck.c:242 #: src/pwck.c:251 #, c-format msgid "%s: cannot open file %s\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 %s\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 %s\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:311 msgid "invalid group file entry\n" -msgstr "恓蛈眛圴 睋倅 そ帎 й桸\n" +msgstr "郇迮赲郇邽邿 郱訄郈邽 訄邿郅 迣郈\n" #: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 #: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 #: src/pwck.c:543 #, c-format msgid "delete line `%s'? " -msgstr "訰鐘旻埩 睋倅 `%s'? " +msgstr "赲邽迡訄郅邽邽 郱訄郈邽 `%s'? " -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:374 msgid "duplicate group entry\n" -msgstr "俵赻玾擬瘃衭 睋倅蚕 臏琣 й桸\n" +msgstr "郈郋赲郋邽 郱訄郈邽邽 訇訄郱 迣郈\n" #: src/grpck.c:391 #, c-format msgid "invalid group name `%s'\n" -msgstr "恓蛈眛 糸' й桸 `%s'\n" +msgstr "郇迮赲郇迮 邾' 迣郈邽 `%s'\n" #: src/grpck.c:418 #, c-format msgid "group %s: no user %s\n" -msgstr "й桸 %s: 恓 芩 冾疶衲欳醣肉 %s\n" +msgstr "迣郈訄 %s: 郇迮 邾訄 郕郋邽赲訄赲 %s\n" #: src/grpck.c:420 src/grpck.c:590 #, c-format msgid "delete member `%s'? " -msgstr "訰鐘旻埩 痼曬 `%s'? " +msgstr "赲邽迡訄郅邽邽 郅迮郇訄 `%s'? " -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/grpck.c:457 msgid "invalid shadow group file entry\n" -msgstr "恓蛈眛圴 睋倅 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "郇迮赲郇邽邿 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/grpck.c:520 msgid "duplicate shadow group entry\n" -msgstr "俵赻玾擬瘃弝 睋倅 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "郈郋赲郋邽邿 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" #: src/grpck.c:537 msgid "no matching group file entry\n" -msgstr "蛈鼯梊峖 蛈鹹瓬汛恌 睋倅 そ帎 й桸\n" +msgstr "赲迡郇邿 赲迡郈郋赲迡郇邽邿 郱訄郈邽 訄邿郅 迣郈\n" #: src/grpck.c:558 #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "倷圮瓬蹉 й桸 %s: 恓 芩 謐穻峖衲畛婘畛 %s\n" +msgstr "郈邽郋赲訄郇訄 迣郈訄 %s: 郇迮 邾訄 訄迡邾郇訄郋訄 %s\n" #: src/grpck.c:560 #, c-format msgid "delete administrative member `%s'? " -msgstr "訰鐘旻埩 謐穻峖衲畛婘畛 `%s'? " +msgstr "赲邽迡訄郅邽邽 訄迡邾郇訄郋訄 `%s'? " #: src/grpck.c:588 #, c-format msgid "shadow group %s: no user %s\n" -msgstr "倷圮瓬蹉 й桸 %s: 恓 芩 冾疶衲欳醣肉 %s\n" +msgstr "郈邽郋赲訄郇訄 迣郈訄 %s: 郇迮 邾訄 郕郋邽赲訄赲 %s\n" #: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 #, c-format msgid "%s: cannot update file %s\n" -msgstr "%s: 恓 迍笝 玴瓬尕 そ帎 %s\n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 %s\n" #: src/grpck.c:647 src/pwck.c:612 #, c-format msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: そ帎 謬昑 玴瓬旼恘; 訰冾恔彸 mkpasswd\n" +msgstr "%s: 訄邿郅邽 訇郅郋 郋郇郋赲郅迮郇郋; 赲邽郕郋郇訄邿迮 mkpasswd\n" #: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 #, c-format msgid "%s: no changes\n" -msgstr "%s: 藍 硰缶\n" +msgstr "%s: 訇迮郱 郱邾郇\n" #: src/grpck.c:651 src/pwck.c:616 #, c-format msgid "%s: the files have been updated\n" -msgstr "%s: そ帎 謬昑 玴瓬旼恘\n" +msgstr "%s: 訄邿郅邽 訇郅郋 郋郇郋赲郅迮郇郋\n" #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" -msgstr "%s: 恓 迍笝 蟯玹欳轂 そ帎 й桸\n" +msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 迣郈\n" #: src/grpconv.c:65 src/grpunconv.c:61 #, c-format msgid "%s: can't open group file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 й桸\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 迣郈\n" #: src/grpconv.c:70 src/grpunconv.c:66 #, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: 恓 迍笝 蟯玹欳轂 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" #: src/grpconv.c:76 src/grpunconv.c:72 #, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" #: src/grpconv.c:94 #, c-format msgid "%s: can't remove shadow group %s\n" -msgstr "%s: 恓 迍笝 訰鐘旻埩 倷圮瓬蹉 й桸 %s\n" +msgstr "%s: 郇迮 邾郋迠 赲邽迡訄郅邽邽 郈邽郋赲訄郇 迣郈 %s\n" -#: src/grpconv.c:138 src/pwconv.c:153 +#: src/grpconv.c:133 src/pwconv.c:154 #, c-format msgid "%s: can't update shadow entry for %s\n" -msgstr "%s: 恓 迍笝 玴瓬尕 倷圮瓬蹉圴 睋倅 騷 %s\n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郈邽郋赲訄郇邽邿 郱訄郈邽 迡郅 %s\n" -#: src/grpconv.c:148 src/grpunconv.c:91 +#: src/grpconv.c:143 src/grpunconv.c:91 #, c-format msgid "%s: can't update entry for group %s\n" -msgstr "%s: 恓 迍笝 玴瓬尕 睋倅 騷 й桸 %s\n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 迡郅 迣郈邽 %s\n" -#: src/grpconv.c:155 src/grpunconv.c:99 +#: src/grpconv.c:150 src/grpunconv.c:99 #, c-format msgid "%s: can't update shadow group file\n" -msgstr "%s: 恓 迍笝 玴瓬尕 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/grpconv.c:160 src/grpunconv.c:105 +#: src/grpconv.c:155 src/grpunconv.c:105 #, c-format msgid "%s: can't update group file\n" -msgstr "%s: 恓 迍笝 玴瓬尕 そ帎 й桸\n" - -#: src/grpconv.c:175 src/grpunconv.c:127 -#, c-format -msgid "%s: not configured for shadow group support.\n" -msgstr "%s: 恓 硪玴あм眐袬恘 騷 虷齟疶豖 倷圮瓬蹉圮 й桸.\n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 迣郈\n" #: src/grpunconv.c:110 #, c-format msgid "%s: can't delete shadow group file\n" -msgstr "%s: 恓 迍笝 訰鐘旻埩 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郇迮 邾郋迠 赲邽迡訄郅邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" #: src/id.c:53 -msgid "usage: id [-a]\n" -msgstr "訰冾疶衲瓬梛埧: id [-a]\n" +#, fuzzy +msgid "Usage: id [-a]\n" +msgstr "赲邽郕郋邽郋赲邿迮: id [-a]\n" #: src/id.c:55 -msgid "usage: id\n" -msgstr "訰冾疶衲瓬梛埧: id\n" +#, fuzzy +msgid "Usage: id\n" +msgstr "赲邽郕郋邽郋赲邿迮: id\n" -#. -#. * Start off the group message. It will be of the format -#. * -#. * groups=###(aaa),###(aaa),###(aaa) -#. * -#. * where "###" is a numerical value and "aaa" is the -#. * corresponding name for each respective numerical value. -#. #: src/id.c:169 msgid " groups=" -msgstr " й桸=" +msgstr " 迣郈邽=" #: src/lastlog.c:110 src/lastlog.c:116 #, c-format -msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n" +msgid "Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n" msgstr "" #: src/lastlog.c:181 msgid "Username Port From Latest\n" -msgstr "輴疶衲欳醣 輴扃玶 蛈騰 擽埡恄百 觕汛\n" +msgstr "郋邽赲訄 郋郇郋郅 赲迡郕邽 訄郇郇邿 赲迡\n" #: src/lastlog.c:183 msgid "Username Port Latest\n" -msgstr "輴疶衲欳醣 蟴眕 擽埡恄百 觕汛\n" +msgstr "郋邽赲訄 郋 訄郇郇邿 赲迡\n" -#: src/lastlog.c:197 +#: src/lastlog.c:198 msgid "**Never logged in**" -msgstr "**謢冾旻 恓 觕狦屺**" +msgstr "**郕郋郅邽 郇迮 赲郋迡邽赲**" -#: src/login.c:185 -#, c-format -msgid "usage: %s [-p] [name]\n" -msgstr "訰冾疶衲瓬梛埧: %s [-p] [糸'娭\n" +#: src/login.c:175 +#, fuzzy, c-format +msgid "Usage: %s [-p] [name]\n" +msgstr "赲邽郕郋邽郋赲邿迮: %s [-p] [邾']\n" -#: src/login.c:188 +#: src/login.c:178 #, c-format msgid " %s [-p] [-h host] [-f name]\n" -msgstr " %s [-p] [-h 珃偟 [-f 糸'娭\n" +msgstr " %s [-p] [-h 郋] [-f 邾']\n" -#: src/login.c:190 +#: src/login.c:180 #, c-format msgid " %s [-p] -r host\n" -msgstr " %s [-p] -r 珃偅n" +msgstr " %s [-p] -r 郋\n" -#: src/login.c:274 +#: src/login.c:259 msgid "Invalid login time\n" -msgstr "醚蛈眛圴 瓾 騷 觕狦惝n" +msgstr "迮赲郇邽邿 訄 迡郅 赲郋迡\n" -#: src/login.c:329 +#: src/login.c:314 msgid "" "\n" "System closed for routine maintenance\n" msgstr "" "\n" -"鯠衲攪 睋刳尕 騷 倷玅米賸埩侂.\n" +"苤邽迮邾 郱訄郕邽郋 迡郅 郈郋郅訄郕邽郕邽.\n" -#: src/login.c:340 +#: src/login.c:325 msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[襓珅袽 蛈騰抸畷恄 -- 鰍稊玶曬 旻袹 觕汛 root-a.]\n" +"[郋邿郅郋 赲迡郕郅迮郇郇 -- 迡郋郱赲郋郅迮郇郋 郅邽迮 赲迡 root-a.]\n" -#: src/login.c:377 +#: src/login.c:362 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" "\n" -"輾 昑レ挍 訰畷眓蹉 睋 %d 蚥劼恅.\n" +"虴訄 郅郋迣郇 赲邽迮郈訄郇郋 郱訄 %d 迮郕郇迡.\n" -#: src/login.c:689 +#: src/login.c:648 #, c-format msgid " on `%.100s' from `%.200s'" -msgstr " 恔 `%s.100s' `%.200s'" +msgstr " 郇訄 `%s.100s' 郱 `%.200s'" -#: src/login.c:693 +#: src/login.c:652 #, c-format msgid " on `%.100s'" -msgstr " 恔 `%.100s'" +msgstr " 郇訄 `%.100s'" -#: src/login.c:852 +#: src/login.c:811 #, c-format msgid "" "\n" @@ -1345,69 +1217,69 @@ msgstr "" "\n" "%s login: " -#: src/login.c:855 +#: src/login.c:814 msgid "login: " msgstr "login: " -#: src/login.c:1071 src/sulogin.c:233 +#: src/login.c:1013 src/sulogin.c:205 msgid "Login incorrect" -msgstr "醚蛈眛圴 昑レ" +msgstr "迮赲郇邽邿 郅郋迣郇" -#: src/login.c:1265 +#: src/login.c:1193 msgid "Warning: login re-enabled after temporary lockout.\n" -msgstr "輾埧疻秸恄: login 俵恘訞曬 虷蚝 埩俅輾瓬珌 蟯玹欳蹉恮.\n" +msgstr "訄迮迮迠迮郇郇: login 郈郋郇郋赲郅迮郇郋 郈郅 邽邾訄郋赲郋迣郋 訇郅郋郕赲訄郇郇.\n" -#: src/login.c:1278 +#: src/login.c:1207 #, c-format msgid "Last login: %s on %s" -msgstr "擽埡恄百 觕汛 蚕衲攪: %s 恔 %s" +msgstr "訄郇郇邿 赲迡 赲 邽迮邾: %s 郇訄 %s" -#: src/login.c:1281 +#: src/login.c:1210 #, c-format msgid "Last login: %.19s on %s" -msgstr "擽埡恄百 觕汛 蚕衲攪: %s 恔 %s" +msgstr "訄郇郇邿 赲迡 赲 邽迮邾: %s 郇訄 %s" -#: src/login.c:1287 +#: src/login.c:1216 #, c-format msgid " from %.*s" -msgstr " %.*s" +msgstr " 郱 %.*s" -#: src/login.c:1364 +#: src/login.c:1293 msgid "Starting rad_login\n" -msgstr "鯥轄婭友 rad_login\n" +msgstr "苤訄邾郋 rad_login\n" #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" -msgstr "%s: 恓 芩 DBM 臏硭 鐘恄圮 蚕衲攪 - 峖捀圮 藻 恓 訰冾恔恘\n" +msgstr "%s: 郇迮 邾訄 DBM 訇訄郱邽 迡訄郇郇邽 邽迮邾 - 郇郕邽 迡邿 郇迮 赲邽郕郋郇訄郇郋\n" #: src/mkpasswd.c:232 src/mkpasswd.c:237 #, c-format msgid "%s: cannot overwrite file %s\n" -msgstr "%s: 恓 迍笝 陓疻睋倅蚆埩 そ帎 %s\n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮郱訄郈邽訄邽 訄邿郅 %s\n" #: src/mkpasswd.c:252 #, c-format msgid "%s: cannot open DBM files for %s\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 DBM 騷 %s\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅邽 DBM 迡郅 %s\n" #: src/mkpasswd.c:287 #, c-format msgid "%s: the beginning with " -msgstr "%s: 眐硞癹妅薑迍 " +msgstr "%s: 郋郱郈郋邽郇訄邾郋 郱 " #: src/mkpasswd.c:288 msgid " is too long\n" -msgstr " 俵曶 睋恔齟 鰍觙吒n" +msgstr " 郈郋郅 郱訄郇訄迡郋 迡郋赲迣\n" #: src/mkpasswd.c:315 #, c-format msgid "%s: error parsing line \"%s\"\n" -msgstr "%s: 俵虭昋 狟眐薦 眒騰 \"%s\"\n" +msgstr "%s: 郈郋邾邽郅郕訄 郋訇郋訇郕邽 迡郕 \"%s\"\n" #: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338 msgid "adding record for name " -msgstr "鰍鐘恘 睋倅 騷 糸曬 " +msgstr "迡郋迡訄郇郋 郱訄郈邽 迡郅 邾迮郇 " #: src/mkpasswd.c:324 src/mkpasswd.c:329 src/mkpasswd.c:334 src/mkpasswd.c:339 #: src/mkpasswd.c:345 src/mkpasswd.c:351 src/mkpasswd.c:356 src/mkpasswd.c:361 @@ -1417,406 +1289,346 @@ msgstr "" #: src/mkpasswd.c:344 src/mkpasswd.c:350 src/mkpasswd.c:355 src/mkpasswd.c:360 #, c-format msgid "%s: error adding record for " -msgstr "%s: 俵虭昋 鰍鐘恄 睋倅袀 " +msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郱訄郈邽 " #: src/mkpasswd.c:378 #, c-format msgid "added %d entries, longest was %d\n" -msgstr "鰍鐘恘 %d 睋倅茼, 鰍趼妅狨 %d\n" +msgstr "迡郋迡訄郇郋 %d 郱訄郈邽赲, 迡郋赲迠邽郇郋 %d\n" #: src/mkpasswd.c:392 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" -msgstr "鼵冾疶衲瓬梛埧: %s [-vf] [-p|g|sp|sg] そ帎\n" +msgstr "邽郕郋邽郋赲邿迮: %s [-vf] [-p|g|sp|sg] 訄邿郅\n" #: src/mkpasswd.c:395 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" -msgstr "鼵冾疶衲瓬梛埧: %s [-vf] [-p|g|sp] そ帎\n" +msgstr "邽郕郋邽郋赲邿迮: %s [-vf] [-p|g|sp] 訄邿郅\n" #: src/mkpasswd.c:398 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" -msgstr "鼵冾疶衲瓬梛埧: %s [-vf] [-p|g] そ帎\n" +msgstr "邽郕郋邽郋赲邿迮: %s [-vf] [-p|g] 訄邿郅\n" #: src/newgrp.c:61 -msgid "usage: newgrp [-] [group]\n" -msgstr "訰冾疶衲瓬梛埧: newgrp [-] [й桸縲\n" +#, fuzzy +msgid "Usage: newgrp [-] [group]\n" +msgstr "赲邽郕郋邽郋赲邿迮: newgrp [-] [迣郈訄]\n" #: src/newgrp.c:63 -msgid "usage: sg group [[-c] command]\n" -msgstr "訰冾疶衲瓬梛埧: sg й桸 [[-c] 冾芩恅縲\n" +#, fuzzy +msgid "Usage: sg group [[-c] command]\n" +msgstr "赲邽郕郋邽郋赲邿迮: sg 迣郈訄 [[-c] 郕郋邾訄郇迡訄]\n" -#: src/newgrp.c:136 +#: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" -msgstr "恓蛈鰍虭 uid: %u\n" +msgstr "郇迮赲迡郋邾邽邿 uid: %u\n" -#: src/newgrp.c:219 +#: src/newgrp.c:214 #, c-format msgid "unknown gid: %lu\n" -msgstr "恓蛈鰍虭 gid: %lu\n" +msgstr "郇迮赲迡郋邾邽邿 gid: %lu\n" -#: src/newgrp.c:365 src/newgrp.c:374 +#: src/newgrp.c:360 src/newgrp.c:369 msgid "Sorry.\n" -msgstr "鼵臏痽.\n" +msgstr "邽訇訄迮.\n" -#: src/newgrp.c:472 +#: src/newgrp.c:469 msgid "too many groups\n" -msgstr "睋恔齟 臏Щ婘 й桸\n" +msgstr "郱訄郇訄迡郋 訇訄迣訄郋 迣郈\n" #: src/newusers.c:78 #, c-format msgid "Usage: %s [input]\n" -msgstr "鼵冾疶衲瓬梛埧: %s [input]\n" +msgstr "邽郕郋邽郋赲邿迮: %s [input]\n" -#: src/newusers.c:407 +#: src/newusers.c:388 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s: 恓 迍笝 蟯玹欳轂 /etc/passwd.\n" +msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 /etc/passwd.\n" -#: src/newusers.c:419 +#: src/newusers.c:400 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s: 恓 迍笝 蟯玹欳轂 そ帎, 衄眐謬彸 虷硩自髏n" +msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅邽, 郈郋訇邿迮 郈郱郇迮\n" -#: src/newusers.c:435 +#: src/newusers.c:416 #, c-format msgid "%s: can't open files\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅\n" + +#: src/newusers.c:461 +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: 迡郋郕 %d: 郇迮赲郇邽邿 迡郋郕\n" #: src/newusers.c:480 #, c-format -msgid "%s: line %d: invalid line\n" -msgstr "%s: 眒鰍 %d: 恓蛈眛圴 眒鰍汻n" - -#: src/newusers.c:499 -#, c-format msgid "%s: line %d: can't create GID\n" -msgstr "%s: 眒鰍 %d: 恓 迍笝 衲豜疶埩 GID\n" +msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 赲郋邽邽 GID\n" -#: src/newusers.c:515 +#: src/newusers.c:496 #, c-format msgid "%s: line %d: can't create UID\n" -msgstr "%s: 眒鰍 %d: 恓 迍笝 衲豜疶埩 UID\n" +msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 赲郋邽邽 UID\n" -#: src/newusers.c:528 +#: src/newusers.c:509 #, c-format msgid "%s: line %d: cannot find user %s\n" -msgstr "%s: 眒鰍 %d: 恓 迍笝 硩購埩 冾疶衲欳醣 %s\n" +msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 郱郇訄邿邽 郕郋邽赲訄訄 %s\n" -#: src/newusers.c:537 +#: src/newusers.c:518 #, c-format msgid "%s: line %d: can't update password\n" -msgstr "%s: 眒鰍 %d: 恓 迍笝 玴瓬尕 釓眐杻\n" +msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 郋郇郋赲邽邽 郈訄郋郅\n" -#: src/newusers.c:555 +#: src/newusers.c:536 #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "%s: 眒鰍 %d: mkdir 恓 訰冾恔赽娖n" +msgstr "%s: 迡郋郕 %d: mkdir 郇迮 赲邽郕郋郇訄赲\n" -#: src/newusers.c:561 +#: src/newusers.c:542 #, c-format msgid "%s: line %d: chown failed\n" -msgstr "%s: 眒鰍 %d: chown 恓 訰冾恔赽娖n" +msgstr "%s: 迡郋郕 %d: chown 郇迮 赲邽郕郋郇訄赲\n" -#: src/newusers.c:571 +#: src/newusers.c:552 #, c-format msgid "%s: line %d: can't update entry\n" -msgstr "%s: 眒鰍 %d: 恓 迍笝 玴瓬尕 睋倅罡n" +msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽\n" -#: src/newusers.c:603 +#: src/newusers.c:584 #, c-format msgid "%s: error updating files\n" -msgstr "%s: 俵虭昋 玴瓬旼恄 そ帎惝n" +msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 訄邿郅\n" -#: src/passwd.c:174 -#, c-format -msgid "usage: %s [-f|-s] [name]\n" -msgstr "訰冾疶衲瓬梛埧: %s [-f|-s] [糸'娭\n" +#: src/passwd.c:155 +#, fuzzy, c-format +msgid "Usage: %s [-f|-s] [name]\n" +msgstr "赲邽郕郋邽郋赲邿迮: %s [-f|-s] [邾']\n" -#: src/passwd.c:178 +#: src/passwd.c:159 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" -msgstr " %s [-x 芩剆] [-n 虭垚 [-w 睋衲籤纖曬恮] [-i 恓賸埩谻圴] 糸'娖n" +msgstr " %s [-x 邾訄郕] [-n 邾邽郇] [-w 郱訄迮迮迠迮郇郇] [-i 郇迮訄郕邽赲郇邽邿] 邾'\n" -#: src/passwd.c:180 +#: src/passwd.c:161 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" -msgstr " %s {-l|-u|-d|-S|-e} 糸'娖n" +msgstr " %s {-l|-u|-d|-S|-e} 邾'\n" -#: src/passwd.c:283 -#, c-format -msgid "User %s has a TCFS key, his old password is required.\n" -msgstr "輴疶衲欳醣 %s 芩 TCFS 佮濯, 俵婞汕曬 庌ж 衲轄圴 釓眐杻.\n" - -#: src/passwd.c:286 -msgid "You can use -t option to force the change.\n" -msgstr "鼵 芩夭 硰珌 訰冾疶衲瓬欳轂 佮濯 -t 騷 倷孖冾疻恄 硰缶.\n" - -#: src/passwd.c:292 +#: src/passwd.c:216 msgid "Old password: " -msgstr "鯥轄圴 釓眐杻: " +msgstr "苤訄邽邿 郈訄郋郅: " -#: src/passwd.c:301 +#: src/passwd.c:225 #, c-format msgid "Incorrect password for `%s'\n" -msgstr "醚蛈眛圴 釓眐杻 騷 `%s'\n" +msgstr "迮赲郇邽邿 郈訄郋郅 迡郅 `%s'\n" -#: src/passwd.c:314 -#, c-format -msgid "Warning: user %s has a TCFS key.\n" -msgstr "輾埧疻秸恄: 冾疶衲欳醣 %s 芩 TCFS 佮濯.\n" - -#: src/passwd.c:333 +#: src/passwd.c:249 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -"蠯鼴耒 恘訰 釓眐杻 (蛈 %d 鰍 %d 硩賸肉)\n" -"穻觛彸 覂旻辿 埡 芩怞 怞埧疶 埡 蟹の.\n" +"赲迮迡 郇郋赲邽邿 郈訄郋郅 (赲迡 %d 迡郋 %d 郱郇訄郕赲)\n" +"邾邿迮 赲迮郅邽郕 訄 邾訄郅 郅迮邽 訄 邽邽.\n" -#: src/passwd.c:339 +#: src/passwd.c:255 msgid "New password: " -msgstr "鎯訰 釓眐杻: " +msgstr "郋赲邽邿 郈訄郋郅: " -#: src/passwd.c:350 +#: src/passwd.c:266 msgid "Try again.\n" -msgstr "鯗眐謬 暙.\n" +msgstr "苤郈郋訇邿 迮.\n" -#: src/passwd.c:361 +#: src/passwd.c:277 msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"輾埧疻秸恄: 蟴Щ恌 釓眐杻 (跂鼴耒 庌ж 硩瓬, 捀椿 赽 狦恘 臏祫夭 庌ж " -"訰冾疶衲瓬欳轂).\n" +"訄迮迮迠迮郇郇: 郋迣訄郇邽邿 郈訄郋郅 (赲赲迮迡 邿郋迣郋 郱郇郋赲, 郕郋 赲迮 郋迡郇郋 訇訄迠訄迮 邿郋迣郋 " +"赲邽郕郋邽郋赲赲訄邽).\n" -#: src/passwd.c:371 +#: src/passwd.c:287 msgid "They don't match; try again.\n" -msgstr "醚 衄肉釓鐘; 衄眐謬彸 硩瓬.\n" +msgstr "迮 郈赲郈訄迡訄; 郈郋訇邿迮 郱郇郋赲.\n" -#: src/passwd.c:451 src/passwd.c:469 +#: src/passwd.c:364 src/passwd.c:382 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "蟥眐杻 騷 %s 恓 迍秸 謬埩 硰缶曬圴.\n" +msgstr "訄郋郅 迡郅 %s 郇迮 邾郋迠迮 訇邽 郱邾郇迮郇邽邿.\n" -#: src/passwd.c:494 +#: src/passwd.c:396 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "鼵臏痽, 釓眐杻 騷 %s 恉 迍秸 謬埩 硰缶曬 睋畛.\n" +msgstr "邽訇訄迮, 郈訄郋郅 迡郅 %s 郇迣迮 邾郋迠迮 訇邽 郱邾郇迮郇郋 郱訄訄郱.\n" -#: src/passwd.c:614 +#: src/passwd.c:479 #, c-format msgid "%s: out of memory\n" -msgstr "%s: 觴賸 釓'晟吒n" +msgstr "%s: 訇訄郕 郈訄邾'\n" -#: src/passwd.c:769 -msgid "Cannot lock the TCFS key database; try again later\n" -msgstr "醚 迍笝 蟯玹欳轂 臏祰 佮濯戀 TCFS; 衄眐謬彸 虷硩自髏n" - -#: src/passwd.c:777 -msgid "Cannot open the TCFS key database.\n" -msgstr "醚 迍笝 蛈騰疶埩 臏祰 佮濯戀 TCFS.\n" - -#: src/passwd.c:785 -msgid "Error updating the TCFS key database.\n" -msgstr "醚 迍笝 玴瓬尕 臏祰 佮濯戀 TCFS.\n" - -#: src/passwd.c:792 -msgid "Cannot commit TCFS changes.\n" -msgstr "醚 迍笝 谻籣埩 硰缶 臏祰 佮濯戀 TCFS.\n" - -#: src/passwd.c:975 +#: src/passwd.c:730 #, c-format msgid "%s: Cannot execute %s" -msgstr "%s: 醚 迍笝 訰冾恔埩 %s" +msgstr "%s: 迮 邾郋迠 赲邽郕郋郇訄邽 %s" -#: src/passwd.c:1077 +#: src/passwd.c:815 #, c-format msgid "%s: repository %s not supported\n" -msgstr "%s: 疻俵硭婘狾 %s 恓 虷齟疶邯夭寔娖n" +msgstr "%s: 迮郈郋郱邽郋邿 %s 郇迮 郈迡邽邾\n" -#: src/passwd.c:1152 +#: src/passwd.c:890 #, c-format msgid "%s: Permission denied\n" -msgstr "%s: 餀衲桸 睋蟠眐恓恘\n" +msgstr "%s: 郋郈 郱訄訇郋郋郇迮郇郋\n" -#: src/passwd.c:1176 +#: src/passwd.c:914 #, c-format msgid "You may not change the password for %s.\n" -msgstr "鼵 恓 迍秸埧 硰缶尕 釓眐杻 騷 %s.\n" +msgstr "邽 郇迮 邾郋迠迮迮 郱邾郇邽邽 郈訄郋郅 迡郅 %s.\n" -#: src/passwd.c:1242 +#: src/passwd.c:962 #, c-format msgid "Changing password for %s\n" -msgstr "穻恔 釓眐曶 騷 %s\n" +msgstr "邾郇訄 郈訄郋郅 迡郅 %s\n" -#: src/passwd.c:1246 +#: src/passwd.c:966 #, c-format msgid "The password for %s is unchanged.\n" -msgstr "蟥眐杻 騷 %s 恓 硰缶曬.\n" +msgstr "訄郋郅 迡郅 %s 郇迮 郱邾郇迮郇郋.\n" -#: src/passwd.c:1297 +#: src/passwd.c:1016 msgid "Password changed.\n" -msgstr "蟥眐杻 硰缶曬.\n" +msgstr "訄郋郅 郱邾郇迮郇郋.\n" #: src/pwck.c:87 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" -msgstr "鼵冾疶衲瓬梛埧: %s [-q] [-r] [-s] [釓眐杻 [shadow]]\n" +msgstr "邽郕郋邽郋赲邿迮: %s [-q] [-r] [-s] [郈訄郋郅 [shadow]]\n" #: src/pwck.c:90 #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" -msgstr "鼵冾疶衲瓬梛埧: %s [-q] [-r] [-s] [釓眐杻]\n" +msgstr "邽郕郋邽郋赲邿迮: %s [-q] [-r] [-s] [郈訄郋郅]\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:295 msgid "invalid password file entry\n" -msgstr "恓蛈眛圴 睋倅 そ帎 釓眐旼佢n" +msgstr "郇迮赲郇邽邿 郱訄郈邽 訄邿郅 郈訄郋郅迮邿\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:357 msgid "duplicate password entry\n" -msgstr "齣蟯擬瘃 睋倅 そ帎 釓眐旼佢n" +msgstr "迡訇郅邽邿 郱訄郈邽 訄邿郅 郈訄郋郅迮邿\n" #: src/pwck.c:373 #, c-format msgid "invalid user name '%s'\n" -msgstr "恓蛈眛 糸' 冾疶衲欳醣 '%s'\n" +msgstr "郇迮赲郇迮 邾' 郕郋邽赲訄訄 '%s'\n" -#. -#. * No primary group, just give a warning -#. #: src/pwck.c:388 #, c-format msgid "user %s: no group %u\n" -msgstr "冾疶衲欳醣 %s: 恓 芩 й桸 %u\n" +msgstr "郕郋邽赲訄 %s: 郇迮 邾訄 迣郈邽 %u\n" #: src/pwck.c:404 #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "冾疶衲欳醣 %s: 埧佹 %s 恓 而挍么n" +msgstr "郕郋邽赲訄 %s: 迮郕訄 %s 郇迮 郇\n" -#. -#. * Login shell doesn't exist, give a warning -#. #: src/pwck.c:420 #, c-format msgid "user %s: program %s does not exist\n" -msgstr "冾疶衲欳醣 %s: 倷珌畛芩 %s 恓 而挍么n" +msgstr "郕郋邽赲訄 %s: 郈郋迣訄邾訄 %s 郇迮 郇\n" -#. -#. * Tell the user this entire line is bogus and ask -#. * them to delete it. -#. #: src/pwck.c:456 msgid "invalid shadow password file entry\n" -msgstr "恓蛈眛圴 睋倅 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "郇迮赲郇邽邿 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#. -#. * Tell the user this entry is a duplicate of -#. * another and ask them to delete it. -#. #: src/pwck.c:518 msgid "duplicate shadow password entry\n" -msgstr "齣蟯擬瘃 睋倅 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "迡訇郅邽邿 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#. -#. * Tell the user this entry has no matching -#. * /etc/passwd entry and ask them to delete it. -#. #: src/pwck.c:542 msgid "no matching password file entry\n" -msgstr "蛈鼯梊峖 蛈鹹瓬汛恌 睋倅 そ帎 釓眐旼佢n" +msgstr "赲迡郇邿 赲迡郈郋赲迡郇邽邿 郱訄郈邽 訄邿郅 郈訄郋郅迮邿\n" #: src/pwck.c:560 #, c-format msgid "user %s: last password change in the future\n" -msgstr "冾疶衲欳醣 %s: 珃埡恄 硰缶 釓眐曶 芩岈梊挎玵惝n" +msgstr "郕郋邽赲訄 %s: 郋訄郇郇 郱邾郇訄 郈訄郋郅 邾訄邿訇郇郋邾\n" -#: src/pwconv.c:84 src/pwunconv.c:93 +#: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s: 恓 迍笝 蟯玹欳轂 そ帎 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/pwconv.c:89 src/pwunconv.c:98 +#: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/pwconv.c:117 +#: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "%s: 恓 迍笝 蛈鐘旻埩 睋倅 そ帎 倷圮瓬蹉圮 釓眐旼 騷 %s\n" +msgstr "%s: 郇迮 邾郋迠 赲迡訄郅邽邽 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿 迡郅 %s\n" -#: src/pwconv.c:163 +#: src/pwconv.c:164 #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "%s: 恓 迍笝 玴瓬尕 睋倅 そ帎 釓眐旼 騷 %s\n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 訄邿郅 郈訄郋郅迮邿 迡郅 %s\n" -#: src/pwconv.c:170 +#: src/pwconv.c:171 #, c-format msgid "%s: can't update shadow file\n" -msgstr "%s: 恓 迍笝 玴瓬尕 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/pwconv.c:175 +#: src/pwconv.c:176 #, c-format msgid "%s: can't update passwd file\n" -msgstr "%s: 恓 迍笝 玴瓬尕 そ帎 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/pwunconv.c:50 -#, c-format -msgid "%s: Shadow passwords are not configured.\n" -msgstr "%s: 襓圮瓬蹉 釓眐怞 恓 硪玴あм眐袬恘.\n" - -#: src/pwunconv.c:160 +#: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s: 恓 迍笝 玴瓬尕 睋倅 騷 冾疶衲欳醣 %s\n" +msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 迡郅 郕郋邽赲訄訄 %s\n" -#: src/pwunconv.c:181 +#: src/pwunconv.c:145 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s: 恓 迍笝 訰鐘旻埩 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 赲邽迡訄郅邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" #: src/su.c:133 msgid "Sorry." -msgstr "鼵臏痽." +msgstr "邽訇訄迮." #: src/su.c:216 #, c-format msgid "%s: must be run from a terminal\n" -msgstr "%s: 俵訰恘 謬埩 睋俷暙恘 埧眝缶賻惝n" +msgstr "%s: 郈郋赲邽郇郋 訇邽 郱訄郈迮郇郋 郱 迮邾郇訄郅\n" #: src/su.c:306 #, c-format msgid "%s: pam_start: error %d\n" -msgstr "%s: pam_start: 俵虭昋 %d\n" +msgstr "%s: pam_start: 郈郋邾邽郅郕訄 %d\n" #: src/su.c:336 #, c-format msgid "Unknown id: %s\n" -msgstr "醚蛈鰍虭 id: %s\n" +msgstr "迮赲迡郋邾邽邿 id: %s\n" #: src/su.c:373 src/su.c:390 #, c-format msgid "You are not authorized to su %s\n" -msgstr "鼵 恓 避婘疶硨袬峖 騷 su %s\n" +msgstr "邽 郇迮 訄赲郋邽郱郋赲訄郇 迡郅 su %s\n" -#. require own password #: src/su.c:385 msgid "(Enter your own password.)" -msgstr "(蠯鼴耒 袬 釓眐杻.)" +msgstr "(赲迮迡 赲訄 郈訄郋郅.)" #: src/su.c:419 #, c-format @@ -1825,615 +1637,669 @@ msgid "" "(Ignored)\n" msgstr "" "%s: %s\n" -"(傳恘眙)\n" +"(迣郇郋)\n" -#: src/su.c:626 +#: src/su.c:609 msgid "No shell\n" -msgstr "醚芩 shell\n" +msgstr "迮邾訄 shell\n" -#: src/suauth.c:100 +#: src/suauth.c:105 msgid "Access to su to that account DENIED.\n" -msgstr "餀衲桸 贈珌 冾疶衲欳醣 鰍 su 摵濿瀁槴.\n" +msgstr "郋郈 郋迣郋 郕郋邽赲訄訄 迡郋 su .\n" -#: src/suauth.c:107 +#: src/suauth.c:113 msgid "Password authentication bypassed.\n" -msgstr "慖埧拏囡竹謄池 倷珅霰恘.\n" +msgstr "迮郇邽郕訄 郈郋邿迡迮郇郋.\n" -#: src/suauth.c:114 +#: src/suauth.c:122 msgid "Please enter your OWN password as authentication.\n" -msgstr "甀儸攽蚎 跂鼴耒 袬 訞輾恌 釓眐杻 騷 轅埧拏囡竹謄戍.\n" +msgstr "迡郅訄郕訄 赲赲迮迡 赲訄 赲郅訄郇邽邿 郈訄郋郅 迡郅 訄迮郇邽郕訄.\n" -#. must be a password file! -#: src/sulogin.c:132 +#: src/sulogin.c:118 msgid "No password file\n" -msgstr "醚芩 そ帎 釓眐旼佢n" +msgstr "迮邾訄 訄邿郅訄 郈訄郋郅迮邿\n" -#. -#. * Fail secure -#. -#: src/sulogin.c:174 +#: src/sulogin.c:160 msgid "No password entry for 'root'\n" -msgstr "瑲賸掑 睋倅袀 臏琣 釓眐旼 騷 'root'\n" +msgstr "訄郕 郱訄郈邽 訇訄郱 郈訄郋郅迮邿 迡郅 'root'\n" -#: src/sulogin.c:190 +#: src/sulogin.c:176 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" "\n" -"轀埩蚔耒 control-d 騷 訰冾恔恄 稊弚購恘ж 睋袬拏輿曬恮,\n" -"(謝 跂鼴耒 釓眐杻 謐穻峖衲畛婘畛 騷 蛈鰓瓬旼恄 蚕衲攪):" +"訄邽郇 control-d 迡郅 赲邽郕郋郇訄郇郇 郱赲邽訄邿郇郋迣郋 郱訄赲訄郇訄迠迮郇郇,\n" +"(訄訇郋 赲赲迮迡 郈訄郋郅 訄迡邾郇訄郋訄 迡郅 赲迡郇郋赲郅迮郇郇 邽迮邾邽):" -#. make new environment active -#: src/sulogin.c:243 +#: src/sulogin.c:212 msgid "Entering System Maintenance Mode\n" -msgstr "黰狦奼 疻窔 蛈鰓瓬旼恄 蚕衲攪尐n" +msgstr "郋迡邽邾郋 迮迠邽邾 赲迡郇郋赲郅迮郇郇 邽迮邾邽\n" -#: src/useradd.c:251 +#: src/useradd.c:234 #, c-format msgid "%s: rebuild the group database\n" -msgstr "%s: 陓疻衲眐擬 臏祰 й桸\n" +msgstr "%s: 郈迮迮郋 訇訄郱 迣郈\n" -#: src/useradd.c:260 +#: src/useradd.c:243 #, c-format msgid "%s: rebuild the shadow group database\n" -msgstr "%s: 陓疻衲眐擬 臏祰 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郈迮迮郋 訇訄郱 郈邽郋赲訄郇邽 迣郈\n" -#: src/useradd.c:295 src/useradd.c:309 src/usermod.c:981 src/usermod.c:995 +#: src/useradd.c:278 src/useradd.c:292 src/usermod.c:741 src/usermod.c:755 #, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "%s: 恓蛈眛圴 瘃蚝瓬圴 轄м芶拏 `%s'\n" +msgstr "%s: 郇迮赲郇邽邿 邽郅郋赲邽邿 訄迣邾迮郇 `%s'\n" -#: src/useradd.c:365 +#: src/useradd.c:349 #, c-format msgid "%s: unknown gid %s\n" -msgstr "%s: 恓蛈鰍虭 gid %s\n" +msgstr "%s: 郇迮赲迡郋邾邽邿 gid %s\n" -#: src/useradd.c:373 src/useradd.c:676 src/useradd.c:1269 src/usermod.c:260 -#: src/usermod.c:1128 +#: src/useradd.c:357 src/useradd.c:636 src/useradd.c:1129 src/usermod.c:244 +#: src/usermod.c:876 #, c-format msgid "%s: unknown group %s\n" -msgstr "%s: 恓蛈鰍芩 й桸 %s\n" +msgstr "%s: 郇迮赲迡郋邾訄 迣郈訄 %s\n" -#: src/useradd.c:440 -#, c-format -msgid "group=%s,%u basedir=%s skel=%s\n" -msgstr "й桸=%s,%u ж昑谻縫埧佹=%s skel=%s\n" - -#: src/useradd.c:444 -#, c-format -msgid "shell=%s " -msgstr "shell=%s " - -#: src/useradd.c:446 -#, c-format -msgid "inactive=%ld expire=%s" -msgstr "恓賸埩谻圴=%ld 倷珃婘眐畷恌=%s" - -#: src/useradd.c:450 +#: src/useradd.c:419 #, c-format msgid "GROUP=%u\n" -msgstr "趛臝=%u\n" +msgstr "苺=%u\n" -#: src/useradd.c:451 +#: src/useradd.c:420 #, c-format msgid "HOME=%s\n" -msgstr "儌罅闃_醲錆=%s\n" +msgstr "虼觓_苠=%s\n" -#: src/useradd.c:453 +#: src/useradd.c:422 #, c-format msgid "INACTIVE=%ld\n" -msgstr "鍷摠鏻纕濋=%ld\n" +msgstr "苠=%ld\n" -#: src/useradd.c:454 +#: src/useradd.c:423 #, c-format msgid "EXPIRE=%s\n" -msgstr "貗瀀鐍獶槴濋=%s\n" +msgstr "苤苠虴=%s\n" -#: src/useradd.c:456 +#: src/useradd.c:425 #, c-format msgid "SHELL=%s\n" msgstr "SHELL=%s\n" -#: src/useradd.c:457 +#: src/useradd.c:426 #, c-format msgid "SKEL=%s\n" msgstr "SKEL=%s\n" -#: src/useradd.c:498 +#: src/useradd.c:462 #, c-format msgid "%s: cannot create new defaults file\n" -msgstr "%s: 恓 迍笝 衲豜疶埩 恘訰 そ帎 臣 硩醣曬恮虭 俵 睋迍軜纔蹉怹\n" +msgstr "%s: 郇迮 邾郋迠 赲郋邽邽 郇郋赲邽邿 訄邿郅 郱 郱郇訄迮郇郇邾邽 郈郋 郱訄邾郋赲迮赲訄郇郇\n" -#: src/useradd.c:503 +#: src/useradd.c:467 #, fuzzy, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: 恓 迍笝 衲豜疶埩 恘訰 そ帎 臣 硩醣曬恮虭 俵 睋迍軜纔蹉怹\n" +msgstr "%s: 郇迮 邾郋迠 赲郋邽邽 郇郋赲邽邿 訄邿郅 郱 郱郇訄迮郇郇邾邽 郈郋 郱訄邾郋赲迮赲訄郇郇\n" -#: src/useradd.c:596 src/useradd.c:608 +#: src/useradd.c:552 src/useradd.c:564 #, c-format msgid "%s: rename: %s" -msgstr "%s: 陓疻庋曬欳蹉恮: %s" +msgstr "%s: 郈迮迮邿邾迮郇赲訄郇郇: %s" -#: src/useradd.c:697 src/usermod.c:281 +#: src/useradd.c:657 src/usermod.c:265 #, c-format msgid "%s: group `%s' is a NIS group.\n" -msgstr "%s: й桸 `%s' й桸狨 NIS.\n" +msgstr "%s: 迣郈訄 `%s' 迣郈郋 NIS.\n" -#: src/useradd.c:706 src/usermod.c:290 +#: src/useradd.c:666 src/usermod.c:274 #, c-format msgid "%s: too many groups specified (max %d).\n" -msgstr "%s: 睋恔齟 臏Щ婘 й桸 訬邁蹉恘 (芩剆 %d).\n" +msgstr "%s: 郱訄郇訄迡郋 訇訄迣訄郋 迣郈 赲郕訄郱訄郇郇郋 (邾訄郕 %d).\n" -#: src/useradd.c:738 src/usermod.c:322 -#, c-format -msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" -msgstr "訰冾疶衲瓬梛埧: %s\t[-u uid [-o]] [-g й桸縲 [-G й桸,...] \n" +#: src/useradd.c:698 +msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "赲邽郕郋邽郋赲邿迮: useradd [-u uid [-o]] [-g 迣郈訄] [-G 迣郈訄,...] \n" -#: src/useradd.c:742 -msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n" -msgstr "\t\t[-d 鰍芩褁娕埧佹] [-s shell] [-c 冾芶拏轄] [-m [-k 衖蟯玴]]\n" +#: src/useradd.c:701 +msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" +msgstr "" +" [-d 迡郋邾訄郇_迮郕訄] [-s shell] [-c 郕郋邾迮郇訄]\n" +" [-m [-k 訄訇郅郋郇]]\n" -#: src/useradd.c:745 src/usermod.c:329 -msgid "[-f inactive] [-e expire ] " -msgstr "[-f 恓賸埩谻圴] [-e 倷珃婞癹曬圴] " +#: src/useradd.c:703 src/useradd.c:708 +msgid " [-f inactive] [-e expire]\n" +msgstr " [-f 郇迮訄郕邽赲郇邽邿] [-e 郈郋郋迮郇邽邿]\n" -#: src/useradd.c:748 -msgid "[-A program] " -msgstr "[-A 倷珌畛芩] " +#: src/useradd.c:706 +msgid " useradd -D [-g group] [-b base] [-s shell]\n" +msgstr " useradd -D [-g 迣郈訄] [-b 訇訄郱郋赲訄_迮郕訄] [-s shell]\n" -#: src/useradd.c:750 -msgid "[-p passwd] name\n" -msgstr "[-p 釓眐杻] 糸'娖n" - -#: src/useradd.c:753 -#, c-format -msgid " %s\t-D [-g group] [-b base] [-s shell]\n" -msgstr " %s\t-D [-g й桸縲 [-b 臏硨袬_埧佹] [-s shell]\n" - -#: src/useradd.c:756 -msgid "\t\t[-f inactive] [-e expire ]\n" -msgstr "\t\t[-f 恓賸埩谻圴] [-e 倷珃婞癹曬圴]\n" - -#: src/useradd.c:850 src/usermod.c:480 +#: src/useradd.c:793 src/usermod.c:461 #, c-format msgid "%s: error locking group file\n" -msgstr "%s: 恓 迍笝 睋蟯玹欳轂 そ帎 й桸\n" +msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 迣郈\n" -#: src/useradd.c:855 src/usermod.c:486 +#: src/useradd.c:798 src/usermod.c:467 #, c-format msgid "%s: error opening group file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 й桸\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 迣郈\n" -#: src/useradd.c:862 src/usermod.c:597 +#: src/useradd.c:805 src/usermod.c:578 #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s: 恓 迍笝 睋蟯玹欳轂 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/useradd.c:867 src/usermod.c:603 +#: src/useradd.c:810 src/usermod.c:584 #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 倷圮瓬蹉圮 й桸\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/useradd.c:1039 +#: src/useradd.c:982 #, c-format msgid "%s: uid %u is not unique\n" -msgstr "%s: uid %u 恓 梉竹賻媓奼\n" +msgstr "%s: uid %u 郇迮 郇郕訄郅郇邽邾\n" -#: src/useradd.c:1069 +#: src/useradd.c:1012 #, c-format msgid "%s: can't get unique uid\n" -msgstr "%s: 恓 迍笝 珆疶芩埩 梉竹賻媓百 uid\n" +msgstr "%s: 郇迮 邾郋迠 郋邽邾訄邽 郇郕訄郅郇邿 uid\n" -#: src/useradd.c:1174 src/useradd.c:1325 src/usermod.c:1075 src/usermod.c:1086 -#: src/usermod.c:1096 src/usermod.c:1143 src/usermod.c:1187 -#, c-format -msgid "%s: invalid field `%s'\n" -msgstr "%s: 恓蛈眛 俵旼 `%s'\n" - -#: src/useradd.c:1189 +#: src/useradd.c:1049 #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s: 恓蛈眛 臏硨袬 埧佹 `%s'\n" +msgstr "%s: 郇迮赲郇訄 訇訄郱郋赲訄 迮郕訄 `%s'\n" -#: src/useradd.c:1199 +#: src/useradd.c:1059 #, c-format msgid "%s: invalid comment `%s'\n" -msgstr "%s: 恓蛈眛圴 冾芶拏轄 `%s'\n" +msgstr "%s: 郇迮赲郇邽邿 郕郋邾迮郇訄 `%s'\n" -#: src/useradd.c:1210 +#: src/useradd.c:1070 #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s: 恓蛈眛 鰍芩褁 埧佹 `%s'\n" +msgstr "%s: 郇迮赲郇訄 迡郋邾訄郇 迮郕訄 `%s'\n" -#: src/useradd.c:1229 src/usermod.c:1110 +#: src/useradd.c:1089 src/usermod.c:858 #, c-format msgid "%s: invalid date `%s'\n" -msgstr "%s: 恓蛈眛 鐘埡 `%s'\n" +msgstr "%s: 郇迮赲郇訄 迡訄訄 `%s'\n" -#: src/useradd.c:1242 +#: src/useradd.c:1102 #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "%s: 倷圮瓬蹉 釓眐怞 俵婞汕峖 騷 -e\n" +msgstr "%s: 郈邽郋赲訄郇 郈訄郋郅 郈郋訇郇 迡郅 -e\n" -#: src/useradd.c:1258 +#: src/useradd.c:1118 #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "%s: 倷圮瓬蹉 釓眐怞 俵婞汕峖 騷 -f\n" +msgstr "%s: 郈邽郋赲訄郇 郈訄郋郅 郈郋訇郇 迡郅 -f\n" -#: src/useradd.c:1336 +#: src/useradd.c:1185 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 +#: src/usermod.c:935 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: 郇迮赲郇迮 郈郋郅迮 `%s'\n" + +#: src/useradd.c:1196 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s: 恓蛈眛圴 shell `%s'\n" +msgstr "%s: 郇迮赲郇邽邿 shell `%s'\n" -#: src/useradd.c:1377 +#: src/useradd.c:1237 #, c-format msgid "%s: invalid user name '%s'\n" -msgstr "%s: 恓蛈眛 糸' 冾疶衲欳醣 '%s'\n" +msgstr "%s: 郇迮赲郇迮 邾' 郕郋邽赲訄訄 '%s'\n" -#: src/useradd.c:1413 src/userdel.c:298 src/usermod.c:1255 +#: src/useradd.c:1273 src/userdel.c:293 src/usermod.c:1003 #, c-format msgid "%s: cannot rewrite password file\n" -msgstr "%s: 恓 迍笝 陓疻倅蚆埩 そ帎 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1420 src/userdel.c:303 src/usermod.c:1262 +#: src/useradd.c:1280 src/userdel.c:298 src/usermod.c:1010 #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "%s: 恓 迍笝 陓疻倅蚆埩 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/useradd.c:1461 src/userdel.c:367 src/usermod.c:1296 +#: src/useradd.c:1321 src/userdel.c:350 src/usermod.c:1044 #, c-format msgid "%s: unable to lock password file\n" -msgstr "%s: 恓 迍笝 蟯玹欳轂 そ帎 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1466 src/userdel.c:372 src/usermod.c:1301 +#: src/useradd.c:1326 src/userdel.c:355 src/usermod.c:1049 #, c-format msgid "%s: unable to open password file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1474 src/userdel.c:379 src/usermod.c:1308 +#: src/useradd.c:1334 src/userdel.c:362 src/usermod.c:1056 #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "%s: 恓 迍笝 蟯玹欳轂 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/useradd.c:1481 src/userdel.c:385 src/usermod.c:1314 +#: src/useradd.c:1341 src/userdel.c:368 src/usermod.c:1062 #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/useradd.c:1580 src/usermod.c:1405 -#, c-format -msgid "%s: error adding authentication method\n" -msgstr "%s: 俵虭昋 鰍鐘恄 芶婘齣 轅埧拏囡竹謄戍\n" - -#: src/useradd.c:1604 +#: src/useradd.c:1435 #, c-format msgid "%s: error adding new password entry\n" -msgstr "%s: 俵虭昋 鰍鐘恄 恘豜ж 睋倅袀 臏祰 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郇郋赲郋迣郋 郱訄郈邽 訇訄郱 郈訄郋郅迮邿\n" -#: src/useradd.c:1618 +#: src/useradd.c:1449 #, c-format msgid "%s: error updating password dbm entry\n" -msgstr "%s: 俵虭昋 玴瓬旼恄 睋倅袀 臏琣 釓眐旼 dbm\n" +msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 郱訄郈邽 訇訄郱 郈訄郋郅迮邿 dbm\n" -#: src/useradd.c:1634 src/usermod.c:1471 +#: src/useradd.c:1465 src/usermod.c:1151 #, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "%s: 俵虭昋 鰍鐘恄 恘豜ж 睋倅袀 臏祰 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郇郋赲郋迣郋 郱訄郈邽 訇訄郱 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/useradd.c:1650 src/usermod.c:1488 +#: src/useradd.c:1481 src/usermod.c:1168 #, c-format msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: 俵虭昋 玴瓬旼恄 睋倅袀 臏琣 倷圮瓬蹉圮 釓眐旼 dbm\n" +msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 郱訄郈邽 訇訄郱 郈邽郋赲訄郇邽 郈訄郋郅迮邿 dbm\n" -#: src/useradd.c:1682 +#: src/useradd.c:1513 #, c-format msgid "%s: cannot create directory %s\n" -msgstr "%s: 恓 迍笝 衲豜疶埩 埧劼 %s\n" +msgstr "%s: 郇迮 邾郋迠 赲郋邽邽 迮郕 %s\n" -#: src/useradd.c:1806 src/usermod.c:1233 +#: src/useradd.c:1634 src/usermod.c:981 #, c-format msgid "%s: user %s exists\n" -msgstr "%s: 冾疶衲欳醣 %s 而挍么n" +msgstr "%s: 郕郋邽赲訄 %s 郇\n" -#: src/useradd.c:1821 +#: src/useradd.c:1649 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -"%s: й桸 %s 而挍 - 捀椿 訰 臏祫夭 鰍鐘埩 冾疶衲欳醣 鰍 疆之 й桸, " -"訰冾疶衲瓬梛埧 -g.\n" +"%s: 迣郈訄 %s 郇 - 郕郋 赲邽 訇訄迠訄迮 迡郋迡訄邽 郕郋邽赲訄訄 迡郋 迣郈邽, " +"赲邽郕郋邽郋赲邿迮 -g.\n" -#: src/useradd.c:1854 +#: src/useradd.c:1687 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" -msgstr "%s: 睋衲籤纖曬恮: CREATE_HOME 恓 虷齟疶邯夭寔, 冾疶衲梛埧衯 -m.\n" +msgstr "%s: 郱訄迮迮迠迮郇郇: CREATE_HOME 郇迮 郈迡邽邾, 郕郋邽邿迮 -m.\n" -#: src/userdel.c:129 -#, c-format -msgid "usage: %s [-r] name\n" -msgstr "訰冾疶衲瓬梛埧: %s [-r] 糸'娖n" +#: src/userdel.c:124 +#, fuzzy, c-format +msgid "Usage: %s [-r] name\n" +msgstr "赲邽郕郋邽郋赲邿迮: %s [-r] 邾'\n" -#: src/userdel.c:181 src/userdel.c:267 +#: src/userdel.c:176 src/userdel.c:262 #, c-format msgid "%s: error updating group entry\n" -msgstr "%s: 俵虭昋 玴瓬旼恄 睋倅袀 臏琣 й桸\n" +msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 郱訄郈邽 訇訄郱 迣郈\n" -#: src/userdel.c:191 src/userdel.c:276 +#: src/userdel.c:186 src/userdel.c:271 #, c-format msgid "%s: cannot update dbm group entry\n" -msgstr "%s: 俵虭昋 玴瓬旼恄 睋倅袀 臏琣 й桸 dbm\n" +msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 郱訄郈邽 訇訄郱 迣郈 dbm\n" -#: src/userdel.c:219 +#: src/userdel.c:214 #, fuzzy, c-format msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 睋倅袀 臏琣 й桸 dbm\n" +msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 訇訄郱 迣郈 dbm\n" -#: src/userdel.c:308 +#: src/userdel.c:379 #, c-format -msgid "%s: cannot rewrite TCFS key file\n" -msgstr "%s: 恓 迍笝 陓疻倅蚆埩 そ帎 佮濯戀 TCFS\n" +msgid "%s: cannot open group file\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 迣郈\n" -#: src/userdel.c:392 +#: src/userdel.c:390 #, c-format -msgid "%s: cannot lock TCFS key file\n" -msgstr "%s: 恓 迍笝 蟯玹欳轂 そ帎 佮濯戀 TCFS\n" - -#: src/userdel.c:397 -#, c-format -msgid "%s: cannot open TCFS key file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 佮濯戀 TCFS\n" +msgid "%s: cannot open shadow group file\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" #: src/userdel.c:408 #, c-format -msgid "%s: cannot open group file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 й桸\n" - -#: src/userdel.c:419 -#, c-format -msgid "%s: cannot open shadow group file\n" -msgstr "%s: 恓 迍笝 蛈騰疶埩 そ帎 倷圮瓬蹉圮 й桸\n" - -#: src/userdel.c:451 src/userdel.c:468 -#, c-format -msgid "%s: error deleting authentication\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 芶婘齣 轅埧拏囡竹謄戍\n" - -#: src/userdel.c:479 -#, c-format msgid "%s: error deleting password entry\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 睋倅袀 臏硭 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈訄郋郅迮邿\n" -#: src/userdel.c:485 +#: src/userdel.c:412 #, c-format msgid "%s: error deleting shadow password entry\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 睋倅袀 臏硭 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/userdel.c:496 -#, c-format -msgid "%s: error deleting TCFS entry\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 睋倅袀 臏硭 TCFS\n" - -#: src/userdel.c:510 +#: src/userdel.c:421 #, c-format msgid "%s: error deleting password dbm entry\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 睋倅袀 dbm 臏硭 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 dbm 郱 訇訄郱邽 郈訄郋郅迮邿\n" -#: src/userdel.c:533 +#: src/userdel.c:440 #, c-format msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 睋倅袀 dbm 臏硭 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 dbm 郱 訇訄郱邽 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/userdel.c:569 +#: src/userdel.c:484 #, c-format msgid "%s: user %s is currently logged in\n" -msgstr "%s: 冾疶衲欳醣 %s 恔 鐘恄圴 迍芶拏 蚕衲攪吒n" +msgstr "%s: 郕郋邽赲訄 %s 郇訄 迡訄郇郇邽邿 邾郋邾迮郇 邽迮邾\n" -#: src/userdel.c:659 +#: src/userdel.c:594 #, c-format msgid "%s: warning: %s not owned by %s, not removing\n" -msgstr "%s: 睋衲籤纖曬恮: %s 恓 恔旼窔婥 %s, 恓 訰鐘旼恘\n" +msgstr "%s: 郱訄迮迮迠迮郇郇: %s 郇迮 郇訄郅迮迠邽 %s, 郇迮 赲邽迡訄郅迮郇郋\n" -#: src/userdel.c:666 +#: src/userdel.c:600 #, c-format msgid "%s: warning: can't remove " -msgstr "%s: 睋衲籤纖曬恮: 恓 迍笝 訰鐘旻埩 " +msgstr "%s: 郱訄迮迮迠迮郇郇: 郇迮 邾郋迠 赲邽迡訄郅邽邽 " -#: src/userdel.c:758 src/usermod.c:1023 +#: src/userdel.c:703 src/usermod.c:783 #, c-format msgid "%s: user %s does not exist\n" -msgstr "%s: 冾疶娸婭袬 %s 恓 而挍么n" +msgstr "%s: 郕郋邽赲訄 %s 郇迮 郇\n" -#: src/userdel.c:770 src/usermod.c:1039 +#: src/userdel.c:718 src/usermod.c:799 #, c-format msgid "%s: user %s is a NIS user\n" -msgstr "%s: 冾疶衲欳醣 %s 冾疶衲欳醣 NIS\n" +msgstr "%s: 郕郋邽赲訄 %s 郕郋邽赲訄 NIS\n" -#: src/userdel.c:799 +#: src/userdel.c:756 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s: %s 恓 恔旼窔婥 %s, 恓 訰鐘旼恘\n" +msgstr "%s: %s 郇迮 郇訄郅迮迠邽 %s, 郇迮 赲邽迡訄郅迮郇郋\n" -#: src/userdel.c:818 +#: src/userdel.c:779 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" -msgstr "%s: 恓 訰鐘旼恘 埧劼 %s (迍笥 訰鐘旻埩 鰍芩褁 埧劼 冾疶衲欳醣 %s)\n" +msgstr "%s: 郇迮 赲邽迡訄郅迮郇郋 迮郕 %s (邾郋迠郇訄 赲邽迡訄郅邽邽 迡郋邾訄郇 迮郕 郕郋邽赲訄訄 %s)\n" -#: src/userdel.c:830 +#: src/userdel.c:793 #, c-format msgid "%s: error removing directory %s\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 埧侂 %s\n" +msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 迮郕邽 %s\n" -#: src/usermod.c:326 +#: src/usermod.c:306 +#, fuzzy, c-format +msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "赲邽郕郋邽郋赲邿迮: %s\t[-u uid [-o]] [-g 迣郈訄] [-G 迣郈訄,...] \n" + +#: src/usermod.c:310 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" -msgstr "\t\t[-d 鰍芩褁娕埧佹 [-m]] [-s shell] [-c 冾芶拏轄] [-l 恘覂_糸'娭\n" +msgstr "\t\t[-d 迡郋邾訄郇_迮郕訄 [-m]] [-s shell] [-c 郕郋邾迮郇訄] [-l 郇郋赲迮_邾']\n" -#: src/usermod.c:332 +#: src/usermod.c:313 #, fuzzy -msgid "[-A {DEFAULT|program},... ] " -msgstr "[-A {DEFAULT|program},...] " +msgid "[-f inactive] [-e expire] " +msgstr "[-f 郇迮訄郕邽赲郇邽邿] [-e 郈郋郋迮郇邽邿] " -#: src/usermod.c:334 +#: src/usermod.c:315 msgid "[-p passwd] [-L|-U] name\n" -msgstr "[-p 釓眐杻] [-L|-U] 糸'娖n" +msgstr "[-p 郈訄郋郅] [-L|-U] 邾'\n" -#: src/usermod.c:514 +#: src/usermod.c:495 #, c-format msgid "%s: out of memory in update_group\n" -msgstr "%s: 觴賸掑 釓迕啈 pdate_group\n" +msgstr "%s: 訇訄郕 郈訄邾 pdate_group\n" -#: src/usermod.c:641 +#: src/usermod.c:622 #, c-format msgid "%s: out of memory in update_gshadow\n" -msgstr "%s: 觴賸掑 釓迕啈 update_gshadow\n" +msgstr "%s: 訇訄郕 郈訄邾 update_gshadow\n" -#: src/usermod.c:1210 +#: src/usermod.c:958 #, c-format msgid "%s: no flags given\n" -msgstr "%s: 恓 俵鐘恘 と豳肉\n" +msgstr "%s: 郇迮 郈郋迡訄郇郋 郅訄迣赲\n" -#: src/usermod.c:1217 +#: src/usermod.c:965 #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s: 倷圮瓬蹉 釓眐怞 俵婞汕峖 騷 -e -f\n" +msgstr "%s: 郈邽郋赲訄郇 郈訄郋郅 郈郋訇郇 迡郅 -e -f\n" -#: src/usermod.c:1239 +#: src/usermod.c:987 #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s: uid %lu 恓 梉竹賻媓奼\n" +msgstr "%s: uid %lu 郇迮 郇郕訄郅郇邽邾\n" -#: src/usermod.c:1392 -#, c-format -msgid "%s: error deleting authentication method\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 芶婘齣 轅埧拏囡竹謄戍\n" - -#: src/usermod.c:1418 -#, c-format -msgid "%s: error changing authentication method\n" -msgstr "%s: 俵虭昋 睋穻恌 芶婘齣 轅埧拏囡竹謄戍\n" - -#: src/usermod.c:1436 +#: src/usermod.c:1116 #, c-format msgid "%s: error changing password entry\n" -msgstr "%s: 俵虭昋 硰缶 睋倅袀 臏琣 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 郱邾郇邽 郱訄郈邽 赲 訇訄郱 郈訄郋郅迮邿\n" -#: src/usermod.c:1442 +#: src/usermod.c:1122 #, c-format msgid "%s: error removing password entry\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 睋倅袀 臏硭 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈訄郋郅迮邿\n" -#: src/usermod.c:1451 +#: src/usermod.c:1131 #, c-format msgid "%s: error adding password dbm entry\n" -msgstr "%s: 俵虭昋 鰍鐘恄 睋倅袀 dbm 臏祰 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郱訄郈邽 dbm 訇訄郱 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/usermod.c:1459 +#: src/usermod.c:1139 #, c-format msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 睋倅袀 dbm 臏硭 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 dbm 郱 訇訄郱邽 郈訄郋郅迮邿\n" -#: src/usermod.c:1478 +#: src/usermod.c:1158 #, c-format msgid "%s: error removing shadow password entry\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 睋倅袀 臏硭 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/usermod.c:1495 +#: src/usermod.c:1175 #, c-format msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: 俵虭昋 訰鐘旼恄 睋倅袀 dbm 臏硭 倷圮瓬蹉圮 釓眐旼佢n" +msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 dbm 郱 訇訄郱邽 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/usermod.c:1524 +#: src/usermod.c:1204 #, c-format msgid "%s: directory %s exists\n" -msgstr "%s: 埧佹 %s 而挍么n" +msgstr "%s: 迮郕訄 %s 郇\n" -#: src/usermod.c:1533 +#: src/usermod.c:1213 #, c-format msgid "%s: can't create %s\n" -msgstr "%s: 恓 迍笝 衲豜疶埩 %s\n" +msgstr "%s: 郇迮 邾郋迠 赲郋邽邽 %s\n" -#: src/usermod.c:1539 +#: src/usermod.c:1219 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s: 恓 迍笝 硰缶尕 豜昑鐘眒 %s\n" +msgstr "%s: 郇迮 邾郋迠 郱邾郇邽邽 赲郋郅郋迡訄 %s\n" -#: src/usermod.c:1556 +#: src/usermod.c:1236 #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "%s: 恓 迍笝 陓疻庋曬欳轂 埧劼 %s 恔 %s\n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮邿邾迮郇赲訄邽 迮郕 郱 %s 郇訄 %s\n" -#. better leave it alone -#: src/usermod.c:1653 +#: src/usermod.c:1333 #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "%s: 睋衲籤纖曬恮: %s 恓 恔旼窔婥 %s\n" +msgstr "%s: 郱訄迮迮迠迮郇郇: %s 郇迮 郇訄郅迮迠邽 %s\n" -#: src/usermod.c:1659 +#: src/usermod.c:1339 msgid "failed to change mailbox owner" -msgstr "恓 迍笝 硰缶尕 豜昑鐘眒 俵觚瓬洇 蚎疶挎侂" +msgstr "郇迮 邾郋迠 郱邾郇邽邽 赲郋郅郋迡訄 郈郋郋赲郋 郕邽郇郕邽" -#: src/usermod.c:1667 +#: src/usermod.c:1347 msgid "failed to rename mailbox" -msgstr "恓 迍笝 陓疻庋曬欳轂 俵觚瓬 蚎疶挎劼" +msgstr "郇迮 邾郋迠 郈迮迮邿邾迮郇赲訄邽 郈郋郋赲 郕邽郇郕" -#: src/vipw.c:104 +#: src/vipw.c:105 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" "\n" -"%s: %s 恓硰缶曬圴\n" +"%s: %s 郇迮郱邾郇迮郇邽邿\n" -#: src/vipw.c:132 +#: src/vipw.c:133 #, fuzzy msgid "Couldn't lock file" -msgstr "醚 迍笝 蟯玹欳轂 そ帎\n" +msgstr "迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅\n" -#: src/vipw.c:141 +#: src/vipw.c:142 msgid "Couldn't make backup" -msgstr "醚 迍笝 祴狟尕 疻硠眢挍 冾虷" +msgstr "迮 邾郋迠 郱郋訇邽邽 迮郱迮赲郇 郕郋郈" -#: src/vipw.c:206 +#: src/vipw.c:200 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" -msgstr "%s: 恓 迍笝 蛈鰓瓬尕 %s: %s (袬萓 硰缶 %s)\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郇郋赲邽邽 %s: %s (赲訄 郱邾郇邽 %s)\n" -#: src/vipw.c:244 +#: src/vipw.c:238 msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" msgstr "" -"鼵冾疶衲瓬梛埧:\n" -"`vipw' 疻鐘м /etc/passwd `vipw -s' 疻鐘м /etc/shadow\n" -"`vigr' 疻鐘м /etc/group `vigr -s' 疻鐘м /etc/gshadow\n" +"邽郕郋邽郋赲邿迮:\n" +"`vipw' 迮迡訄迣 /etc/passwd `vipw -s' 迮迡訄迣 /etc/shadow\n" +"`vigr' 迮迡訄迣 /etc/group `vigr -s' 迮迡訄迣 /etc/gshadow\n" + +#, fuzzy +#~ msgid "Can't create mail spool for user %s.\n" +#~ msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 迡郅 郕郋邽赲訄訄 %s\n" + +#~ msgid "User %s has a TCFS key, his old password is required.\n" +#~ msgstr "郋邽赲訄 %s 邾訄 TCFS 郕郅, 郈郋訇迮郇 邿郋迣郋 訄邽邿 郈訄郋郅.\n" + +#~ msgid "You can use -t option to force the change.\n" +#~ msgstr "邽 邾訄迮 郱邾郋迣 赲邽郕郋邽郋赲赲訄邽 郕郅 -t 迡郅 郈邽郕郋迮郇郇 郱邾郇.\n" + +#~ msgid "Warning: user %s has a TCFS key.\n" +#~ msgstr "訄迮迮迠迮郇郇: 郕郋邽赲訄 %s 邾訄 TCFS 郕郅.\n" + +#~ msgid "Cannot lock the TCFS key database; try again later\n" +#~ msgstr "迮 邾郋迠 訇郅郋郕赲訄邽 訇訄郱 郕郅迮邿 TCFS; 郈郋訇邿迮 郈郱郇迮\n" + +#~ msgid "Cannot open the TCFS key database.\n" +#~ msgstr "迮 邾郋迠 赲迡郕邽邽 訇訄郱 郕郅迮邿 TCFS.\n" + +#~ msgid "Error updating the TCFS key database.\n" +#~ msgstr "迮 邾郋迠 郋郇郋赲邽邽 訇訄郱 郕郅迮邿 TCFS.\n" + +#~ msgid "Cannot commit TCFS changes.\n" +#~ msgstr "迮 邾郋迠 赲郇迮邽 郱邾郇邽 訇訄郱 郕郅迮邿 TCFS.\n" + +#~ msgid "%s: cannot rewrite TCFS key file\n" +#~ msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郕郅迮邿 TCFS\n" + +#~ msgid "%s: cannot lock TCFS key file\n" +#~ msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郕郅迮邿 TCFS\n" + +#~ msgid "%s: cannot open TCFS key file\n" +#~ msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郕郅迮邿 TCFS\n" + +#~ msgid "%s: error deleting TCFS entry\n" +#~ msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 TCFS\n" + +#~ msgid " [-f inactive] [-e expire]" +#~ msgstr " [-f 郇迮訄郕邽赲郇邽邿] [-e 郈郋郋迮郇邽邿]" + +#~ msgid "%s: error deleting authentication\n" +#~ msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 邾迮郋迡 訄迮郇邽郕訄\n" + +#, fuzzy +#~ msgid "[-A {DEFAULT|program},...] " +#~ msgstr "[-A {DEFAULT|program},...] " + +#~ msgid "%s: error deleting authentication method\n" +#~ msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 邾迮郋迡 訄迮郇邽郕訄\n" + +#~ msgid "%s: error adding authentication method\n" +#~ msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 邾迮郋迡 訄迮郇邽郕訄\n" + +#~ msgid "%s: error changing authentication method\n" +#~ msgstr "%s: 郈郋邾邽郅郕訄 郱訄邾郇邽 邾迮郋迡 訄迮郇邽郕訄\n" + +#~ msgid "[-A program] " +#~ msgstr "[-A 郈郋迣訄邾訄] " + +#~ msgid "[-p passwd] name\n" +#~ msgstr "[-p 郈訄郋郅] 邾'\n" + +#~ msgid "error - lookup '%s' failed\n" +#~ msgstr "郈郋邾邽郅郕訄 - 郈郋郕 '%s' 郇迮 赲邽郕郋郇訄郇郋\n" + +#~ msgid "%s not found\n" +#~ msgstr "%s 郇迮 郱郇訄邿迡迮郇郋\n" + +#~ msgid "%s: not configured for shadow group support.\n" +#~ msgstr "%s: 郇迮 郱郕郋郇迣郋赲訄郇郋 迡郅 郈迡邽邾郕邽 郈邽郋赲訄郇邽 迣郈.\n" + +#~ msgid "%s: Shadow passwords are not configured.\n" +#~ msgstr "%s: 邽郋赲訄郇 郈訄郋郅 郇迮 郱郕郋郇迣郋赲訄郇郋.\n" + +#, fuzzy +#~ msgid "Usage: %s [-l] user\n" +#~ msgstr "赲邽郕郋邽郋赲邿迮: %s [-e]\n" + +#~ msgid "Executing shell %s\n" +#~ msgstr "邽郕郋郇 shell %s\n" + +#~ msgid "Dialup Password: " +#~ msgstr "訄郋郅 郇訄 邾郋迡迮邾郇迮 郈迡郕郅迮郇郇: " + +#~ msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n" +#~ msgstr "" +#~ "邽郕郋邽郋赲邿迮: %s [-l] [-m 邾郇_迡郇赲] [-M 邾訄郕_迡郇赲] [-d 郋訄郇郇邿_迡迮郇] " +#~ "郕郋邽赲訄\n" + +#~ msgid "Usage: %s [-(a|d)] shell\n" +#~ msgstr "邽郕郋邽郋赲邿迮: %s [-(a|d)] shell\n" + +#~ msgid "Shell password: " +#~ msgstr "Shell 郈訄郋郅: " + +#~ msgid "re-enter Shell password: " +#~ msgstr "郋赲郋 郈訄郋郅 迡郅 shell: " + +#~ msgid "%s: Passwords do not match, try again.\n" +#~ msgstr "%s: 訄郋郅 郇迮 郈赲郈訄迡訄, 郈郋訇邿迮 郱郇郋赲.\n" + +#~ msgid "%s: can't create %s" +#~ msgstr "%s: 郇迮 邾郋迠 赲郋邽邽 %s" + +#~ msgid "%s: can't open %s" +#~ msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 %s" + +#~ msgid "%s: Shell %s not found.\n" +#~ msgstr "%s: Shell %s 郇迮 郱郇訄邿迡迮郇郋.\n" + +#~ msgid "group=%s,%u basedir=%s skel=%s\n" +#~ msgstr "迣郈訄=%s,%u 迣郋郅郋赲郇訄_迮郕訄=%s skel=%s\n" + +#~ msgid "shell=%s " +#~ msgstr "shell=%s " + +#~ msgid "inactive=%ld expire=%s" +#~ msgstr "郇迮訄郕邽赲郇邽邿=%ld 郈郋郋郋迮郇邽邿=%s" + +#~ msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +#~ msgstr "赲邽郕郋邽郋赲邿迮: %s\t[-u uid [-o]] [-g 迣郈訄] [-G 迣郈訄,...] \n" #~ msgid "%s: gid %ld is not unique\n" -#~ msgstr "%s: gid %ld 恓 梉竹賻媓奼\n" +#~ msgstr "%s: gid %ld 郇迮 郇郕訄郅郇邽邾\n" #, fuzzy #~ msgid "unknown gid: %u\n" -#~ msgstr "恓蛈鰍虭 gid: %d\n" +#~ msgstr "郇迮赲迡郋邾邽邿 gid: %d\n" #~ msgid "%s: uid %d is not unique\n" -#~ msgstr "%s: uid %d 恓 梉竹賻媓奼\n" +#~ msgstr "%s: uid %d 郇迮 郇郕訄郅郇邽邾\n" #~ msgid "user %s: bad UID (%d)\n" -#~ msgstr "冾疶衲欳醣 %s: 俵Щ恌 UID (%d)\n" +#~ msgstr "郕郋邽赲訄 %s: 郈郋迣訄郇邽邿 UID (%d)\n" #~ msgid "%s: no aging information present\n" -#~ msgstr "%s: 恓芩 缶に眝謄戍 倷 蛈汻n" +#~ msgstr "%s: 郇迮邾訄 郇郋邾訄 郈郋 赲郕\n" #~ msgid "group %s: bad GID (%d)\n" -#~ msgstr "й桸 %s: 芩 恓蛈眛圴 GID (%d)\n" +#~ msgstr "迣郈訄 %s: 邾訄 郇迮赲郇邽邿 GID (%d)\n" #~ msgid "%s: permission denied (shell).\n" -#~ msgstr "%s: 鰍衲桸 睋蟠眐恓恘 (shell).\n" +#~ msgstr "%s: 迡郋郈 郱訄訇郋郋郇迮郇郋 (shell).\n" #~ msgid "Incorrect password for %s.\n" -#~ msgstr "醚蛈眛圴 釓眐杻 騷 %s.\n" +#~ msgstr "迮赲郇邽邿 郈訄郋郅 迡郅 %s.\n" #~ msgid "group not found\n" -#~ msgstr "й桸 恓 硩購霰恔\n" +#~ msgstr "迣郈訄 郇迮 郱郇訄邿迡迮郇訄\n" diff --git a/src/.indent.pro b/src/.indent.pro new file mode 100644 index 00000000..149066b8 --- /dev/null +++ b/src/.indent.pro @@ -0,0 +1,4 @@ +-kr +-i8 +-bad +-pcs diff --git a/src/Makefile.am b/src/Makefile.am index eb3c3b00..25b9dc60 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,12 +1,12 @@ -EXTRA_DOST = .indent.pro +EXTRA_DIST = .indent.pro ubindir = ${prefix}/bin usbindir = ${prefix}/sbin DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" -INCLUDES = -I${top_srcdir} \ +INCLUDES = \ -I${top_srcdir}/lib \ -I$(top_srcdir)/libmisc @@ -23,9 +23,24 @@ INCLUDES = -I${top_srcdir} \ bin_PROGRAMS = groups login su ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd -usbin_PROGRAMS = chpasswd dpasswd groupadd groupdel groupmod \ - logoutd mkpasswd newusers useradd userdel usermod grpck \ - pwck vipw grpconv grpunconv pwconv pwunconv +usbin_PROGRAMS = \ + chpasswd \ + groupadd \ + groupdel \ + groupmod \ + grpck \ + grpconv \ + grpunconv \ + logoutd \ + mkpasswd \ + newusers \ + pwck \ + pwconv \ + pwunconv \ + useradd \ + userdel \ + usermod \ + vipw noinst_PROGRAMS = id sulogin @@ -55,7 +70,7 @@ usermod_LDADD = $(LDADD) $(LIBPAM) install-exec-hook: ln -sf newgrp $(DESTDIR)$(bindir)/sg - ln -sf vigr $(DESTDIR)$(bindir)/vipw + ln -sf vipw $(DESTDIR)$(bindir)/vigr for i in $(suidbins); do \ chmod 4755 $(DESTDIR)$(bindir)/$$i; \ done diff --git a/src/Makefile.in b/src/Makefile.in index 9155f375..b2837d0c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,108 +14,151 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ + +DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GENCAT = @GENCAT@ -GLIBC21 = @GLIBC21@ -GMOFILES = @GMOFILES@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBMD = @LIBMD@ +LIBOBJS = @LIBOBJS@ LIBPAM = @LIBPAM@ +LIBS = @LIBS@ LIBSKEY = @LIBSKEY@ -LIBTCFS = @LIBTCFS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -OBJDUMP = @OBJDUMP@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ -EXTRA_DOST = .indent.pro +EXTRA_DIST = .indent.pro ubindir = ${prefix}/bin usbindir = ${prefix}/sbin -DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" - -INCLUDES = -I${top_srcdir} \ +INCLUDES = \ -I${top_srcdir}/lib \ -I$(top_srcdir)/libmisc @@ -132,9 +176,24 @@ INCLUDES = -I${top_srcdir} \ # $prefix/bin and $prefix/sbin, no install-data hacks...) bin_PROGRAMS = groups login su ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd -usbin_PROGRAMS = chpasswd dpasswd groupadd groupdel groupmod \ - logoutd mkpasswd newusers useradd userdel usermod grpck \ - pwck vipw grpconv grpunconv pwconv pwunconv +usbin_PROGRAMS = \ + chpasswd \ + groupadd \ + groupdel \ + groupmod \ + grpck \ + grpconv \ + grpunconv \ + logoutd \ + mkpasswd \ + newusers \ + pwck \ + pwconv \ + pwunconv \ + useradd \ + userdel \ + usermod \ + vipw noinst_PROGRAMS = id sulogin @@ -164,6 +223,7 @@ useradd_LDADD = $(LDADD) $(LIBPAM) userdel_LDADD = $(LDADD) $(LIBPAM) usermod_LDADD = $(LDADD) $(LIBPAM) subdir = src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -172,12 +232,12 @@ noinst_PROGRAMS = id$(EXEEXT) sulogin$(EXEEXT) ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \ chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \ newgrp$(EXEEXT) passwd$(EXEEXT) -usbin_PROGRAMS = chpasswd$(EXEEXT) dpasswd$(EXEEXT) groupadd$(EXEEXT) \ - groupdel$(EXEEXT) groupmod$(EXEEXT) logoutd$(EXEEXT) \ - mkpasswd$(EXEEXT) newusers$(EXEEXT) useradd$(EXEEXT) \ - userdel$(EXEEXT) usermod$(EXEEXT) grpck$(EXEEXT) pwck$(EXEEXT) \ - vipw$(EXEEXT) grpconv$(EXEEXT) grpunconv$(EXEEXT) \ - pwconv$(EXEEXT) pwunconv$(EXEEXT) +usbin_PROGRAMS = chpasswd$(EXEEXT) groupadd$(EXEEXT) groupdel$(EXEEXT) \ + groupmod$(EXEEXT) grpck$(EXEEXT) grpconv$(EXEEXT) \ + grpunconv$(EXEEXT) logoutd$(EXEEXT) mkpasswd$(EXEEXT) \ + newusers$(EXEEXT) pwck$(EXEEXT) pwconv$(EXEEXT) \ + pwunconv$(EXEEXT) useradd$(EXEEXT) userdel$(EXEEXT) \ + usermod$(EXEEXT) vipw$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(ubin_PROGRAMS) \ $(usbin_PROGRAMS) @@ -201,12 +261,6 @@ chsh_OBJECTS = chsh.$(OBJEXT) chsh_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \ $(top_builddir)/lib/libshadow.la chsh_LDFLAGS = -dpasswd_SOURCES = dpasswd.c -dpasswd_OBJECTS = dpasswd.$(OBJEXT) -dpasswd_LDADD = $(LDADD) -dpasswd_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \ - $(top_builddir)/lib/libshadow.la -dpasswd_LDFLAGS = expiry_SOURCES = expiry.c expiry_OBJECTS = expiry.$(OBJEXT) expiry_LDADD = $(LDADD) @@ -359,28 +413,26 @@ vipw_LDADD = $(LDADD) vipw_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \ $(top_builddir)/lib/libshadow.la vipw_LDFLAGS = + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/chage.Po $(DEPDIR)/chfn.Po \ -@AMDEP_TRUE@ $(DEPDIR)/chpasswd.Po $(DEPDIR)/chsh.Po \ -@AMDEP_TRUE@ $(DEPDIR)/dpasswd.Po $(DEPDIR)/expiry.Po \ -@AMDEP_TRUE@ $(DEPDIR)/faillog.Po $(DEPDIR)/gpasswd.Po \ -@AMDEP_TRUE@ $(DEPDIR)/groupadd.Po $(DEPDIR)/groupdel.Po \ -@AMDEP_TRUE@ $(DEPDIR)/groupmod.Po $(DEPDIR)/groups.Po \ -@AMDEP_TRUE@ $(DEPDIR)/grpck.Po $(DEPDIR)/grpconv.Po \ -@AMDEP_TRUE@ $(DEPDIR)/grpunconv.Po $(DEPDIR)/id.Po \ -@AMDEP_TRUE@ $(DEPDIR)/lastlog.Po $(DEPDIR)/login.Po \ -@AMDEP_TRUE@ $(DEPDIR)/logoutd.Po $(DEPDIR)/mkpasswd.Po \ -@AMDEP_TRUE@ $(DEPDIR)/newgrp.Po $(DEPDIR)/newusers.Po \ -@AMDEP_TRUE@ $(DEPDIR)/passwd.Po $(DEPDIR)/pwck.Po \ -@AMDEP_TRUE@ $(DEPDIR)/pwconv.Po $(DEPDIR)/pwunconv.Po \ -@AMDEP_TRUE@ $(DEPDIR)/su.Po $(DEPDIR)/suauth.Po \ -@AMDEP_TRUE@ $(DEPDIR)/sulogin.Po $(DEPDIR)/useradd.Po \ -@AMDEP_TRUE@ $(DEPDIR)/userdel.Po $(DEPDIR)/usermod.Po \ -@AMDEP_TRUE@ $(DEPDIR)/vipw.Po +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/chage.Po ./$(DEPDIR)/chfn.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/chpasswd.Po ./$(DEPDIR)/chsh.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/expiry.Po ./$(DEPDIR)/faillog.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gpasswd.Po ./$(DEPDIR)/groupadd.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/groupdel.Po ./$(DEPDIR)/groupmod.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/groups.Po ./$(DEPDIR)/grpck.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/grpconv.Po ./$(DEPDIR)/grpunconv.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/id.Po ./$(DEPDIR)/lastlog.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/login.Po ./$(DEPDIR)/logoutd.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/mkpasswd.Po ./$(DEPDIR)/newgrp.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/newusers.Po ./$(DEPDIR)/passwd.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/pwck.Po ./$(DEPDIR)/pwconv.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/pwunconv.Po ./$(DEPDIR)/su.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/suauth.Po ./$(DEPDIR)/sulogin.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/useradd.Po ./$(DEPDIR)/userdel.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/usermod.Po ./$(DEPDIR)/vipw.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -388,36 +440,25 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -CFLAGS = @CFLAGS@ -DIST_SOURCES = chage.c chfn.c chpasswd.c chsh.c dpasswd.c expiry.c \ - faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c \ - grpck.c grpconv.c grpunconv.c id.c lastlog.c login.c logoutd.c \ +DIST_SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c faillog.c \ + gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c \ + grpconv.c grpunconv.c id.c lastlog.c login.c logoutd.c \ mkpasswd.c newgrp.c newusers.c passwd.c pwck.c pwconv.c \ pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c \ usermod.c vipw.c -DIST_COMMON = Makefile.am Makefile.in -SOURCES = chage.c chfn.c chpasswd.c chsh.c dpasswd.c expiry.c faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c grpconv.c grpunconv.c id.c lastlog.c login.c logoutd.c mkpasswd.c newgrp.c newusers.c passwd.c pwck.c pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c usermod.c vipw.c +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c grpconv.c grpunconv.c id.c lastlog.c login.c logoutd.c mkpasswd.c newgrp.c newusers.c passwd.c pwck.c pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c usermod.c vipw.c all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@ -426,25 +467,34 @@ install-binPROGRAMS: $(bin_PROGRAMS) if test -f $$p \ || test -f $$p1 \ ; then \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +ubinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-ubinPROGRAMS: $(ubin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(ubindir) @@ -453,22 +503,27 @@ install-ubinPROGRAMS: $(ubin_PROGRAMS) if test -f $$p \ || test -f $$p1 \ ; then \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(ubindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(ubindir)/$$f; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ubinPROGRAMS_INSTALL) $$p $(DESTDIR)$(ubindir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ubinPROGRAMS_INSTALL) $$p $(DESTDIR)$(ubindir)/$$f || exit 1; \ else :; fi; \ done uninstall-ubinPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(ubin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(ubindir)/$$f"; \ rm -f $(DESTDIR)$(ubindir)/$$f; \ done clean-ubinPROGRAMS: - -test -z "$(ubin_PROGRAMS)" || rm -f $(ubin_PROGRAMS) + @list='$(ubin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +usbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-usbinPROGRAMS: $(usbin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(usbindir) @@ -477,22 +532,26 @@ install-usbinPROGRAMS: $(usbin_PROGRAMS) if test -f $$p \ || test -f $$p1 \ ; then \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(usbindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(usbindir)/$$f; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(usbindir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(usbindir)/$$f || exit 1; \ else :; fi; \ done uninstall-usbinPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(usbin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(usbindir)/$$f"; \ rm -f $(DESTDIR)$(usbindir)/$$f; \ done clean-usbinPROGRAMS: - -test -z "$(usbin_PROGRAMS)" || rm -f $(usbin_PROGRAMS) + @list='$(usbin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done chage$(EXEEXT): $(chage_OBJECTS) $(chage_DEPENDENCIES) @rm -f chage$(EXEEXT) $(LINK) $(chage_LDFLAGS) $(chage_OBJECTS) $(chage_LDADD) $(LIBS) @@ -505,9 +564,6 @@ chpasswd$(EXEEXT): $(chpasswd_OBJECTS) $(chpasswd_DEPENDENCIES) chsh$(EXEEXT): $(chsh_OBJECTS) $(chsh_DEPENDENCIES) @rm -f chsh$(EXEEXT) $(LINK) $(chsh_LDFLAGS) $(chsh_OBJECTS) $(chsh_LDADD) $(LIBS) -dpasswd$(EXEEXT): $(dpasswd_OBJECTS) $(dpasswd_DEPENDENCIES) - @rm -f dpasswd$(EXEEXT) - $(LINK) $(dpasswd_LDFLAGS) $(dpasswd_OBJECTS) $(dpasswd_LDADD) $(LIBS) expiry$(EXEEXT): $(expiry_OBJECTS) $(expiry_DEPENDENCIES) @rm -f expiry$(EXEEXT) $(LINK) $(expiry_LDFLAGS) $(expiry_OBJECTS) $(expiry_LDADD) $(LIBS) @@ -596,110 +652,161 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chage.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chfn.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chpasswd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chsh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dpasswd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/expiry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/faillog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gpasswd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groupadd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groupdel.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groupmod.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groups.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/grpck.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/grpconv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/grpunconv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/id.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lastlog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/login.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/logoutd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkpasswd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/newgrp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/newusers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/passwd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwck.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwconv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwunconv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/su.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/suauth.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sulogin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/useradd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/userdel.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/usermod.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vipw.Po@am__quote@ - -distclean-depend: - -rm -rf $(DEPDIR) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chage.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chfn.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chpasswd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chsh.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expiry.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/faillog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpasswd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupadd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupdel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupmod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groups.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grpck.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grpconv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grpunconv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lastlog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logoutd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkpasswd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newgrp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newusers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/passwd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwck.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwconv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwunconv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suauth.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sulogin.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/useradd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/userdel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usermod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vipw.Po@am__quote@ .c.o: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .c.lo: -@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -CCDEPMODE = @CCDEPMODE@ +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + +CTAGS = ctags +CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -712,7 +819,6 @@ all-am: Makefile $(PROGRAMS) installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(ubindir) $(DESTDIR)$(usbindir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -724,6 +830,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -731,7 +838,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -743,9 +850,10 @@ clean-am: clean-binPROGRAMS clean-generic clean-libtool \ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am @@ -770,7 +878,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -778,28 +887,36 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ uninstall-ubinPROGRAMS uninstall-usbinPROGRAMS -.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-libtool clean-noinstPROGRAMS \ - clean-ubinPROGRAMS clean-usbinPROGRAMS distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-binPROGRAMS install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-ubinPROGRAMS \ + clean-ubinPROGRAMS clean-usbinPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am info info-am install \ + install-am install-binPROGRAMS install-data install-data-am \ + install-exec install-exec-am install-info install-info-am \ + install-man install-strip install-ubinPROGRAMS \ install-usbinPROGRAMS installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am uninstall-ubinPROGRAMS \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ + pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-info-am uninstall-ubinPROGRAMS \ uninstall-usbinPROGRAMS install-exec-hook: ln -sf newgrp $(DESTDIR)$(bindir)/sg - ln -sf vigr $(DESTDIR)$(bindir)/vipw + ln -sf vipw $(DESTDIR)$(bindir)/vigr for i in $(suidbins); do \ chmod 4755 $(DESTDIR)$(bindir)/$$i; \ done diff --git a/src/chage.c b/src/chage.c index bea066c9..4ab4bcbe 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.27 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: chage.c,v 1.32 2003/06/19 17:57:15 kloczek Exp $") #include #include #include @@ -39,6 +39,7 @@ RCSID (PKG_VER "$Id: chage.c,v 1.27 2002/01/05 15:41:43 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" +#ifdef SHADOWPWD #ifdef USE_PAM #include #include @@ -49,17 +50,23 @@ RCSID (PKG_VER "$Id: chage.c,v 1.27 2002/01/05 15:41:43 kloczek Exp $") */ static char *Prog; +static int + dflg = 0, /* set last password change date */ + Eflg = 0, /* set account expiration date */ + Iflg = 0, /* set password inactive after expiration */ + lflg = 0, /* show account aging information */ + mflg = 0, /* set minimum number of days before password change */ + Mflg = 0, /* set maximim number of days before password change */ + Wflg = 0; /* set expiration warning days */ + static int locks; static long mindays; static long maxdays; static long lastday; - -#ifdef SHADOWPWD static long warndays; static long inactdays; static long expdays; -#endif /* * External identifiers @@ -70,17 +77,12 @@ extern char *l64a (); #include "pwio.h" -#ifdef SHADOWPWD #include "shadowio.h" -#endif #ifdef NDBM extern int pw_dbm_mode; - -#ifdef SHADOWPWD extern int sp_dbm_mode; #endif -#endif #define EPOCH "1969-12-31" @@ -111,17 +113,10 @@ int isnum (const char *s) static void usage (void) { -#ifdef SHADOWPWD - fprintf (stderr, - _("Usage: %s [-l] [-m min_days] [-M max_days] [-W warn]\n" - "\t[-I inactive] [-E expire] [-d last_day] user\n"), - Prog); -#else fprintf (stderr, _ - ("Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n"), - Prog); -#endif + ("Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" + " [-I inactive] [-E expire] [-d last_day] user\n")); exit (1); } @@ -178,7 +173,6 @@ static int new_fields (void) else if ((lastday = strtoday (buf)) == -1) return 0; -#ifdef SHADOWPWD snprintf (buf, sizeof buf, "%ld", warndays); change_field (buf, sizeof buf, _("Password Expiration Warning")); if (((warndays = strtol (buf, &cp, 10)) == 0 && *cp) @@ -200,7 +194,6 @@ static int new_fields (void) expdays = -1; else if ((expdays = strtoday (buf)) == -1) return 0; -#endif /* SHADOWPWD */ return 1; } @@ -247,10 +240,8 @@ static void list_fields (void) printf (_("Minimum:\t%ld\n"), mindays); printf (_("Maximum:\t%ld\n"), maxdays); -#ifdef SHADOWPWD printf (_("Warning:\t%ld\n"), warndays); printf (_("Inactive:\t%ld\n"), inactdays); -#endif /* * The "last change" date is either "Never" or the date the password @@ -279,7 +270,6 @@ static void list_fields (void) print_date (expires); } -#ifdef SHADOWPWD /* * The account becomes inactive if the password is expired for more * than "inactdays". The expiration date is calculated and the @@ -308,7 +298,6 @@ static void list_fields (void) expires = expdays * SCALE; print_date (expires); } -#endif } #ifdef USE_PAM @@ -318,6 +307,24 @@ static struct pam_conv conv = { }; #endif /* USE_PAM */ +/* + * cleanup - unlock any locked password files + */ + +static void cleanup (int state) +{ + switch (state) { + case 2: + if (locks) + spw_unlock (); + case 1: + if (locks) + pw_unlock (); + case 0: + break; + } +} + /* * chage - change a user's password aging information * @@ -325,40 +332,25 @@ static struct pam_conv conv = { * * The valid options are * - * -m minimum number of days before password change (*) - * -M maximim number of days before password change (*) - * -d last password change date (*) - * -l password aging information - * -W expiration warning days (*) - * -I password inactive after expiration (*) - * -E account expiration date (*) + * -m set minimum number of days before password change (*) + * -M set maximim number of days before password change (*) + * -d set last password change date (*) + * -l show account aging information + * -W set expiration warning days (*) + * -I set password inactive after expiration (*) + * -E set account expiration date (*) * * (*) requires root permission to execute. * * All of the time fields are entered in the internal format which is * either seconds or days. - * - * The options -W, -I and -E all depend on the SHADOWPWD macro being - * defined. */ int main (int argc, char **argv) { int flag; - int lflg = 0; - int mflg = 0; - int Mflg = 0; - int dflg = 0; - -#ifdef SHADOWPWD - int Wflg = 0; - int Iflg = 0; - int Eflg = 0; const struct spwd *sp; struct spwd spwd; -#else - char new_age[5]; -#endif uid_t ruid; int amroot, pwrw; const struct passwd *pw; @@ -388,9 +380,7 @@ int main (int argc, char **argv) OPENLOG ("chage"); #ifdef NDBM -#ifdef SHADOWPWD sp_dbm_mode = O_RDWR; -#endif pw_dbm_mode = O_RDWR; #endif @@ -402,13 +392,7 @@ int main (int argc, char **argv) * weeks. */ -#ifdef SHADOWPWD -#define FLAGS "lm:M:W:I:E:d:" -#else -#define FLAGS "lm:M:d:" -#endif - while ((flag = getopt (argc, argv, FLAGS)) != EOF) { -#undef FLAGS + while ((flag = getopt (argc, argv, "lm:M:W:I:E:d:")) != EOF) { switch (flag) { case 'l': lflg++; @@ -428,7 +412,6 @@ int main (int argc, char **argv) else lastday = strtol (optarg, 0, 10); break; -#ifdef SHADOWPWD case 'W': Wflg++; warndays = strtol (optarg, 0, 10); @@ -444,7 +427,6 @@ int main (int argc, char **argv) else expdays = strtol (optarg, 0, 10); break; -#endif default: usage (); } @@ -458,12 +440,7 @@ int main (int argc, char **argv) if (argc != optind + 1) usage (); -#ifdef SHADOWPWD - if (lflg && (mflg || Mflg || dflg || Wflg || Iflg || Eflg)) -#else - if (lflg && (mflg || Mflg || dflg)) -#endif - { + if (lflg && (mflg || Mflg || dflg || Wflg || Iflg || Eflg)) { fprintf (stderr, _("%s: do not include \"l\" with other flags\n"), Prog); @@ -528,18 +505,7 @@ int main (int argc, char **argv) * file entries into memory. Then we get a pointer to the password * file entry for the requested user. */ -#ifndef SHADOWPWD - if (locks && !pw_lock ()) { - fprintf (stderr, _("%s: can't lock password file\n"), - Prog); - SYSLOG ((LOG_ERR, "failed locking %s", PASSWD_FILE)); - closelog (); - exit (1); - } - pwrw = locks; -#else pwrw = 0; -#endif if (!pw_open (pwrw ? O_RDWR : O_RDONLY)) { fprintf (stderr, _("%s: can't open password file\n"), Prog); @@ -559,7 +525,6 @@ int main (int argc, char **argv) pwent = *pw; STRFCPY (name, pwent.pw_name); -#ifdef SHADOWPWD /* * For shadow password files we have to lock the file and read in * the entries as was done for the password file. The user entries @@ -612,35 +577,6 @@ int main (int argc, char **argv) if (!Eflg) expdays = spwd.sp_expire; } -#ifdef ATT_AGE - else -#endif /* ATT_AGE */ -#endif /* SHADOWPWD */ -#ifdef ATT_AGE - { - if (pwent.pw_age && strlen (pwent.pw_age) >= 2) { - if (!Mflg) - maxdays = - c64i (pwent.pw_age[0]) * (WEEK / - SCALE); - if (!mflg) - mindays = - c64i (pwent.pw_age[1]) * (WEEK / - SCALE); - if (!dflg && strlen (pwent.pw_age) == 4) - lastday = - a64l (pwent.pw_age + - 2) * (WEEK / SCALE); - } else { - mindays = 0; - maxdays = 10000L * (DAY / SCALE); - lastday = -1; - } -#ifdef SHADOWPWD - warndays = inactdays = expdays = -1; -#endif /* SHADOWPWD */ - } -#endif /* ATT_AGE */ /* * Print out the expiration fields if the user has requested the @@ -665,12 +601,7 @@ int main (int argc, char **argv) * user interactively change them. */ -#ifdef SHADOWPWD - if (!mflg && !Mflg && !dflg && !Wflg && !Iflg && !Eflg) -#else - if (!mflg && !Mflg && !dflg) -#endif - { + if (!mflg && !Mflg && !dflg && !Wflg && !Iflg && !Eflg) { printf (_("Changing the aging information for %s\n"), name); if (!new_fields ()) { @@ -681,7 +612,6 @@ int main (int argc, char **argv) exit (1); } } -#ifdef SHADOWPWD /* * There was no shadow entry. The new entry will have the encrypted * password transferred from the normal password file along with the @@ -697,9 +627,6 @@ int main (int argc, char **argv) spwd.sp_flag = -1; pwent.pw_passwd = SHADOW_PASSWD_STRING; /* XXX warning: const */ -#ifdef ATT_AGE - pwent.pw_age = ""; -#endif if (!pw_update (&pwent)) { fprintf (stderr, _("%s: can't update password file\n"), @@ -715,9 +642,6 @@ int main (int argc, char **argv) endpwent (); #endif } -#endif /* SHADOWPWD */ - -#ifdef SHADOWPWD /* * Copy the fields back to the shadow file entry and write the @@ -741,44 +665,7 @@ int main (int argc, char **argv) closelog (); exit (1); } -#else /* !SHADOWPWD */ - - /* - * fill in the new_age string with the new values - */ - - if (maxdays > (63 * 7) && mindays == 0) { - new_age[0] = '\0'; - } else { - if (maxdays > (63 * 7)) - maxdays = 63 * 7; - - if (mindays > (63 * 7)) - mindays = 63 * 7; - - new_age[0] = i64c (maxdays / 7); - new_age[1] = i64c ((mindays + 6) / 7); - - if (lastday == 0) - new_age[2] = '\0'; - else - strcpy (new_age + 2, l64a (lastday / 7)); - - } - pwent.pw_age = new_age; - - if (!pw_update (&pwent)) { - fprintf (stderr, _("%s: can't update password file\n"), - Prog); - cleanup (2); - SYSLOG ((LOG_ERR, "failed updating %s", PASSWD_FILE)); - closelog (); - exit (1); - } -#endif /* SHADOWPWD */ - #ifdef NDBM -#ifdef SHADOWPWD /* * See if the shadow DBM file exists and try to update it. @@ -794,25 +681,8 @@ int main (int argc, char **argv) } endspent (); -#else /* !SHADOWPWD */ - - /* - * See if the password DBM file exists and try to update it. - */ - - if (pw_dbm_present () && !pw_dbm_update (&pwent)) { - fprintf (stderr, - _("Error updating the DBM password entry.\n")); - cleanup (2); - SYSLOG ((LOG_ERR, "error updating DBM passwd entry")); - closelog (); - exit (1); - } - endpwent (); -#endif /* SHADOWPWD */ #endif /* NDBM */ -#ifdef SHADOWPWD /* * Now close the shadow password file, which will cause all of the * entries to be re-written. @@ -827,7 +697,6 @@ int main (int argc, char **argv) closelog (); exit (1); } -#endif /* SHADOWPWD */ /* * Close the password file. If any entries were modified, the file @@ -844,6 +713,7 @@ int main (int argc, char **argv) } cleanup (2); SYSLOG ((LOG_INFO, "changed password expiry for %s", name)); + #ifdef USE_PAM if (!lflg) { if (retval == PAM_SUCCESS) { @@ -862,30 +732,22 @@ int main (int argc, char **argv) if (retval == PAM_SUCCESS) pam_end (pamh, PAM_SUCCESS); + #endif /* USE_PAM */ closelog (); + + exit (0); - /*NOTREACHED*/} - -/* - * cleanup - unlock any locked password files - */ - -static void cleanup (int state) -{ - switch (state) { - case 2: -#ifdef SHADOWPWD - if (locks) - spw_unlock (); -#endif - case 1: -#ifndef SHADOWPWD - if (locks) - pw_unlock (); -#endif - case 0: - break; - } + /* NOTREACHED */ } + +#else /* !SHADOWPWD */ +int main (int argc, char **argv) +{ + fprintf (stderr, + "%s: not configured for shadow password support.\n", + argv[0]); + exit (1); +} +#endif /* !SHADOWPWD */ diff --git a/src/chfn.c b/src/chfn.c index ae57e09d..44ff5eb8 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.20 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: chfn.c,v 1.22 2003/06/19 18:11:01 kloczek Exp $") #include #include #include @@ -41,6 +41,7 @@ RCSID (PKG_VER "$Id: chfn.c,v 1.20 2002/01/05 15:41:43 kloczek Exp $") #include "pwio.h" #include "getdef.h" #include "pwauth.h" +#include "nscd.h" #ifdef HAVE_SHADOW_H #include #endif @@ -595,6 +596,9 @@ int main (int argc, char **argv) exit (1); } SYSLOG ((LOG_INFO, "changed user `%s' information", user)); + + nscd_flush_cache ("passwd"); + closelog (); exit (0); } diff --git a/src/chpasswd.c b/src/chpasswd.c index 0f9400b0..e9a618c3 100644 --- a/src/chpasswd.c +++ b/src/chpasswd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: chpasswd.c,v 1.14 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: chpasswd.c,v 1.18 2003/06/19 18:11:01 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" @@ -40,6 +40,7 @@ RCSID (PKG_VER "$Id: chpasswd.c,v 1.14 2002/01/05 15:41:43 kloczek Exp $") #ifdef SHADOWPWD #include "shadowio.h" #endif +#include "nscd.h" #ifdef USE_PAM #include #include @@ -63,7 +64,7 @@ static void usage (void); static void usage (void) { - fprintf (stderr, _("usage: %s [-e]\n"), Prog); + fprintf (stderr, _("Usage: %s [-e]\n"), Prog); exit (1); } @@ -87,10 +88,6 @@ int main (int argc, char **argv) #endif const struct passwd *pw; struct passwd newpw; - -#ifdef ATT_AGE - char newage[5]; -#endif int errors = 0; int line = 0; long now = time ((long *) 0) / (24L * 3600L); @@ -262,13 +259,6 @@ int main (int argc, char **argv) { newpw = *pw; newpw.pw_passwd = cp; -#ifdef ATT_AGE - if (newpw.pw_age[0]) { - strcpy (newage, newpw.pw_age); - strcpy (newage + 2, l64a (now / 7)); - newpw.pw_age = newage; - } -#endif } /* @@ -329,6 +319,9 @@ int main (int argc, char **argv) Prog); exit (1); } + + nscd_flush_cache ("passwd"); + pw_unlock (); #ifdef USE_PAM diff --git a/src/chsh.c b/src/chsh.c index 54636095..640b7087 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.20 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: chsh.c,v 1.23 2003/06/19 18:11:01 kloczek Exp $") #include #include #include @@ -41,6 +41,7 @@ RCSID (PKG_VER "$Id: chsh.c,v 1.20 2002/01/05 15:41:43 kloczek Exp $") #include "pwio.h" #include "getdef.h" #include "pwauth.h" +#include "nscd.h" #ifdef HAVE_SHADOW_H #include #endif @@ -99,18 +100,12 @@ static void new_fields (void) static int restricted_shell (const char *sh) { -#if 0 - char *cp = Basename ((char *) sh); - - return *cp == 'r' || *cp == 'R'; -#else /* * Shells not listed in /etc/shells are considered to be restricted. * Changed this to avoid confusion with "rc" (the plan9 shell - not * restricted despite the name starting with 'r'). --marekm */ return !check_shell (sh); -#endif } @@ -256,10 +251,10 @@ int main (int argc, char **argv) } /* - * Non-privileged users are optionally authenticated (must enter - * the password of the user whose information is being changed) - * before any changes can be made. Idea from util-linux - * chfn/chsh. --marekm + * Non-privileged users are optionally authenticated (must enter + * the password of the user whose information is being changed) + * before any changes can be made. Idea from util-linux + * chfn/chsh. --marekm */ if (!amroot && getdef_bool ("CHFN_AUTH")) @@ -406,6 +401,9 @@ int main (int argc, char **argv) } SYSLOG ((LOG_INFO, "changed user `%s' shell to `%s'", user, loginsh)); + + nscd_flush_cache ("passwd"); + closelog (); exit (0); } diff --git a/src/dpasswd.c b/src/dpasswd.c deleted file mode 100644 index 4e65dbeb..00000000 --- a/src/dpasswd.c +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Copyright 1990 - 1993, Julianne Frances Haugh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Julianne F. Haugh nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#include "rcsid.h" -RCSID (PKG_VER "$Id: dpasswd.c,v 1.15 2002/01/05 15:41:43 kloczek Exp $") -#include -#include -#include -#include -#include -#include "prototypes.h" -#include "defines.h" -#include "dialup.h" -#define DTMP "/etc/d_passwd.tmp" -static int aflg = 0; -static int dflg = 0; -static char *Prog; - -/* local function prototypes */ -static void usage (void); - -static void usage (void) -{ - fprintf (stderr, _("Usage: %s [-(a|d)] shell\n"), Prog); - exit (1); -} - -int main (int argc, char **argv) -{ - struct dialup *dial; - struct dialup dent; - struct stat sb; - FILE *fp; - char *sh = 0; - char *cp; - char pass[BUFSIZ]; - int fd; - int found = 0; - int opt; - - Prog = Basename (argv[0]); - - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - - OPENLOG (Prog); - - while ((opt = getopt (argc, argv, "a:d:")) != EOF) { - switch (opt) { - case 'a': - aflg++; - sh = optarg; - break; - case 'd': - dflg++; - sh = optarg; - break; - default: - usage (); - } - } - if (!aflg && !dflg) - aflg++; - - if (!sh) { - if (optind >= argc) - usage (); - else - sh = argv[optind]; - } - if (aflg + dflg != 1) - usage (); - - /* - * Add a new shell to the password file, or update an existing - * entry. Begin by getting an encrypted password for this shell. - */ - - if (aflg) { - int tries = 3; - - dent.du_shell = sh; - dent.du_passwd = ""; /* XXX warning: const */ - - again: - if (!(cp = getpass (_("Shell password: ")))) - exit (1); - - STRFCPY (pass, cp); - strzero (cp); - - if (!(cp = getpass (_("re-enter Shell password: ")))) - exit (1); - - if (strcmp (pass, cp)) { - strzero (pass); - strzero (cp); - fprintf (stderr, - _ - ("%s: Passwords do not match, try again.\n"), - Prog); - - if (--tries) - goto again; - - exit (1); - } - strzero (cp); - dent.du_passwd = pw_encrypt (pass, crypt_make_salt ()); - strzero (pass); - } - - /* - * Create the temporary file for the updated dialup password - * information to be placed into. Turn it into a (FILE *) for use by - * putduent(). - */ - - if ((fd = open (DTMP, O_CREAT | O_EXCL | O_RDWR, 0600)) < 0) { - snprintf (pass, sizeof pass, _("%s: can't create %s"), - Prog, DTMP); - perror (pass); - exit (1); - } - if (!(fp = fdopen (fd, "r+"))) { - snprintf (pass, sizeof pass, _("%s: can't open %s"), Prog, - DTMP); - perror (pass); - unlink (DTMP); - exit (1); - } - - /* - * Scan the dialup password file for the named entry, copying out - * other entries along the way. Copying stops when a match is found - * or the file runs out. - */ - - while ((dial = getduent ())) { - if (strcmp (dial->du_shell, sh) == 0) { - found = 1; - break; - } - if (putduent (dial, fp)) - goto failure; - } - - /* - * To delete the entry, just don't copy it. To update the entry, - * output the modified version - works with new entries as well. - */ - - if (dflg && !found) { - fprintf (stderr, _("%s: Shell %s not found.\n"), Prog, sh); - goto failure; - } - if (aflg) - if (putduent (&dent, fp)) - goto failure; - - /* - * Now copy out the remaining entries. Flush and close the new file - * before doing anything nasty to the existing file. - */ - - - while ((dial = getduent ())) - if (putduent (dial, fp)) - goto failure; - - if (fflush (fp)) - goto failure; - - fclose (fp); - - /* - * If the original file did not exist, we must create a new file - * with owner "root" and mode 400. Otherwise we copy the modes from - * the existing file to the new file. - * - * After this is done the new file will replace the old file. - */ - - pwd_init (); - - if (!stat (DIALPWD, &sb)) { - chown (DTMP, sb.st_uid, sb.st_gid); - chmod (DTMP, sb.st_mode); - unlink (DIALPWD); - } else { - chown (DTMP, 0, 0); - chmod (DTMP, 0400); - } - if (!link (DTMP, DIALPWD)) - unlink (DTMP); - - if (aflg && !found) - SYSLOG ((LOG_INFO, "added password for %s", sh)); - else if (aflg && found) - SYSLOG ((LOG_INFO, "changed password for %s", sh)); - else if (dflg) - SYSLOG ((LOG_INFO, "removed password for %s", sh)); - - closelog (); - sync (); - exit (0); - - failure: - unlink (DTMP); - closelog (); - exit (1); -} diff --git a/src/faillog.c b/src/faillog.c index fb5987a9..1ad34717 100644 --- a/src/faillog.c +++ b/src/faillog.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: faillog.c,v 1.11 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: faillog.c,v 1.12 2003/04/25 22:32:36 kloczek Exp $") #include #include #include @@ -74,7 +74,7 @@ static void usage (void) { fprintf (stderr, _ - ("usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n"), + ("Usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n"), Prog); exit (1); } diff --git a/src/gpasswd.c b/src/gpasswd.c index ee862c74..c1268291 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.19 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: gpasswd.c,v 1.21 2003/06/19 18:11:01 kloczek Exp $") #include #include #include @@ -75,7 +75,7 @@ static int check_list (const char *); static void usage (void) { - fprintf (stderr, _("usage: %s [-r|-R] group\n"), Prog); + fprintf (stderr, _("Usage: %s [-r|-R] group\n"), Prog); fprintf (stderr, _(" %s [-a user] group\n"), Prog); fprintf (stderr, _(" %s [-d user] group\n"), Prog); #ifdef SHADOWGRP @@ -649,4 +649,5 @@ int main (int argc, char **argv) #endif #endif exit (0); - /*NOTREACHED*/} + /* NOT REACHED */ +} diff --git a/src/groupadd.c b/src/groupadd.c index 6719fd3d..11f88e91 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.22 2002/01/06 14:09:07 kloczek Exp $") +RCSID (PKG_VER "$Id: groupadd.c,v 1.27 2004/01/05 01:08:56 kloczek Exp $") #include #include #include @@ -41,6 +41,7 @@ RCSID (PKG_VER "$Id: groupadd.c,v 1.22 2002/01/06 14:09:07 kloczek Exp $") #include "chkname.h" #include "getdef.h" #include "groupio.h" +#include "nscd.h" #ifdef SHADOWGRP #include "sgroupio.h" #ifdef USE_PAM @@ -59,7 +60,7 @@ static int is_shadow_grp; #define E_USAGE 2 /* invalid command syntax */ #define E_BAD_ARG 3 /* invalid argument to option */ #define E_GID_IN_USE 4 /* gid not unique (when -o not used) */ -#define E_NAME_IN_USE 9 /* group name nut unique */ +#define E_NAME_IN_USE 9 /* group name not unique */ #define E_GRP_UPDATE 10 /* can't update group file */ static char *group_name; @@ -98,7 +99,7 @@ static void fail_exit (int); static void usage (void) { - fprintf (stderr, _("usage: groupadd [-g gid [-o]] group\n")); + fprintf (stderr, _("Usage: groupadd [-g gid [-o]] [-f] group\n")); exit (E_USAGE); } @@ -208,7 +209,7 @@ static void grp_update (void) #endif /* NDBM */ #endif /* SHADOWGRP */ SYSLOG ((LOG_INFO, "new group: name=%s, gid=%u", - group_name, (unsigned int)group_id)); + group_name, (unsigned int) group_id)); } /* @@ -575,6 +576,7 @@ int main (int argc, char **argv) find_new_gid (); grp_update (); + nscd_flush_cache ("group"); close_files (); @@ -595,4 +597,5 @@ int main (int argc, char **argv) pam_end (pamh, PAM_SUCCESS); #endif /* USE_PAM */ exit (E_SUCCESS); - /*NOTREACHED*/} + /* NOT REACHED */ +} diff --git a/src/groupdel.c b/src/groupdel.c index 1a928215..6dc32ce5 100644 --- a/src/groupdel.c +++ b/src/groupdel.c @@ -30,31 +30,28 @@ #include #include "rcsid.h" -RCSID(PKG_VER "$Id: groupdel.c,v 1.14 2000/10/09 19:02:20 kloczek Exp $") - +RCSID (PKG_VER "$Id: groupdel.c,v 1.17 2003/06/19 18:11:01 kloczek Exp $") #include #include #include #include #include #include - #ifdef USE_PAM #include #include #include -#endif /* USE_PAM */ - +#endif /* USE_PAM */ +#include "nscd.h" #include "prototypes.h" #include "defines.h" - -static char *group_name; -static char *Prog; -static int errors; +static char *group_name; +static char *Prog; +static int errors; #ifdef NDBM -extern int gr_dbm_mode; -extern int sg_dbm_mode; +extern int gr_dbm_mode; +extern int sg_dbm_mode; #endif #include "groupio.h" @@ -76,21 +73,20 @@ static int is_shadow_grp; #define E_GRP_UPDATE 10 /* can't update group file */ /* local function prototypes */ -static void usage(void); -static void grp_update(void); -static void close_files(void); -static void open_files(void); -static void group_busy(gid_t); +static void usage (void); +static void grp_update (void); +static void close_files (void); +static void open_files (void); +static void group_busy (gid_t); /* * usage - display usage message and exit */ -static void -usage(void) +static void usage (void) { - fprintf(stderr, _("usage: groupdel group\n")); - exit(E_USAGE); + fprintf (stderr, _("Usage: groupdel group\n")); + exit (E_USAGE); } /* @@ -99,15 +95,15 @@ usage(void) * grp_update() writes the new records to the group files. */ -static void -grp_update(void) +static void grp_update (void) { #ifdef NDBM - struct group *ogrp; + struct group *ogrp; #endif - if (!gr_remove(group_name)) { - fprintf(stderr, _("%s: error removing group entry\n"), Prog); + if (!gr_remove (group_name)) { + fprintf (stderr, _("%s: error removing group entry\n"), + Prog); errors++; } #ifdef NDBM @@ -116,16 +112,17 @@ grp_update(void) * Update the DBM group file */ - if (gr_dbm_present()) { + if (gr_dbm_present ()) { if ((ogrp = getgrnam (group_name)) && - ! gr_dbm_remove (ogrp)) { - fprintf(stderr, _("%s: error removing group dbm entry\n"), - Prog); + !gr_dbm_remove (ogrp)) { + fprintf (stderr, + _("%s: error removing group dbm entry\n"), + Prog); errors++; } } endgrent (); -#endif /* NDBM */ +#endif /* NDBM */ #ifdef SHADOWGRP @@ -133,9 +130,10 @@ grp_update(void) * Delete the shadow group entries as well. */ - if (is_shadow_grp && ! sgr_remove (group_name)) { - fprintf(stderr, _("%s: error removing shadow group entry\n"), - Prog); + if (is_shadow_grp && !sgr_remove (group_name)) { + fprintf (stderr, + _("%s: error removing shadow group entry\n"), + Prog); errors++; } #ifdef NDBM @@ -144,18 +142,19 @@ grp_update(void) * Update the DBM shadow group file */ - if (is_shadow_grp && sg_dbm_present()) { - if (! sg_dbm_remove (group_name)) { - fprintf(stderr, - _("%s: error removing shadow group dbm entry\n"), - Prog); + if (is_shadow_grp && sg_dbm_present ()) { + if (!sg_dbm_remove (group_name)) { + fprintf (stderr, + _ + ("%s: error removing shadow group dbm entry\n"), + Prog); errors++; } } endsgent (); -#endif /* NDBM */ -#endif /* SHADOWGRP */ - SYSLOG((LOG_INFO, "remove group `%s'\n", group_name)); +#endif /* NDBM */ +#endif /* SHADOWGRP */ + SYSLOG ((LOG_INFO, "remove group `%s'\n", group_name)); return; } @@ -166,23 +165,24 @@ grp_update(void) * new group. This causes any modified entries to be written out. */ -static void -close_files(void) +static void close_files (void) { - if (!gr_close()) { - fprintf(stderr, _("%s: cannot rewrite group file\n"), Prog); + if (!gr_close ()) { + fprintf (stderr, _("%s: cannot rewrite group file\n"), + Prog); errors++; } - gr_unlock(); + gr_unlock (); #ifdef SHADOWGRP - if (is_shadow_grp && !sgr_close()) { - fprintf(stderr, _("%s: cannot rewrite shadow group file\n"), - Prog); + if (is_shadow_grp && !sgr_close ()) { + fprintf (stderr, + _("%s: cannot rewrite shadow group file\n"), + Prog); errors++; } if (is_shadow_grp) - sgr_unlock(); -#endif /* SHADOWGRP */ + sgr_unlock (); +#endif /* SHADOWGRP */ } /* @@ -191,29 +191,32 @@ close_files(void) * open_files() opens the two group files. */ -static void -open_files(void) +static void open_files (void) { - if (!gr_lock()) { - fprintf(stderr, _("%s: unable to lock group file\n"), Prog); - exit(E_GRP_UPDATE); + if (!gr_lock ()) { + fprintf (stderr, _("%s: unable to lock group file\n"), + Prog); + exit (E_GRP_UPDATE); } - if (!gr_open(O_RDWR)) { - fprintf(stderr, _("%s: unable to open group file\n"), Prog); - exit(E_GRP_UPDATE); + if (!gr_open (O_RDWR)) { + fprintf (stderr, _("%s: unable to open group file\n"), + Prog); + exit (E_GRP_UPDATE); } #ifdef SHADOWGRP - if (is_shadow_grp && !sgr_lock()) { - fprintf(stderr, _("%s: unable to lock shadow group file\n"), - Prog); - exit(E_GRP_UPDATE); + if (is_shadow_grp && !sgr_lock ()) { + fprintf (stderr, + _("%s: unable to lock shadow group file\n"), + Prog); + exit (E_GRP_UPDATE); } - if (is_shadow_grp && !sgr_open(O_RDWR)) { - fprintf(stderr, _("%s: unable to open shadow group file\n"), - Prog); - exit(E_GRP_UPDATE); + if (is_shadow_grp && !sgr_open (O_RDWR)) { + fprintf (stderr, + _("%s: unable to open shadow group file\n"), + Prog); + exit (E_GRP_UPDATE); } -#endif /* SHADOWGRP */ +#endif /* SHADOWGRP */ } /* @@ -224,10 +227,9 @@ open_files(void) * the group. */ -static void -group_busy(gid_t gid) +static void group_busy (gid_t gid) { - struct passwd *pwd; + struct passwd *pwd; /* * Nice slow linear search. @@ -235,8 +237,7 @@ group_busy(gid_t gid) setpwent (); - while ((pwd = getpwent ()) && pwd->pw_gid != gid) - ; + while ((pwd = getpwent ()) && pwd->pw_gid != gid); endpwent (); @@ -251,16 +252,17 @@ group_busy(gid_t gid) * Can't remove the group. */ - fprintf(stderr, _("%s: cannot remove user's primary group.\n"), Prog); - exit(E_GROUP_BUSY); + fprintf (stderr, _("%s: cannot remove user's primary group.\n"), + Prog); + exit (E_GROUP_BUSY); } #ifdef USE_PAM static struct pam_conv conv = { - misc_conv, - NULL + misc_conv, + NULL }; -#endif /* USE_PAM */ +#endif /* USE_PAM */ /* * main - groupdel command @@ -272,10 +274,10 @@ static struct pam_conv conv = { * The named group will be deleted. */ -int -main(int argc, char **argv) +int main (int argc, char **argv) { struct group *grp; + #ifdef USE_PAM pam_handle_t *pamh = NULL; struct passwd *pampw; @@ -286,53 +288,55 @@ main(int argc, char **argv) * Get my name so that I can use it to report errors. */ - Prog = Basename(argv[0]); + Prog = Basename (argv[0]); - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); #ifdef USE_PAM retval = PAM_SUCCESS; - pampw = getpwuid(getuid()); + pampw = getpwuid (getuid ()); if (pampw == NULL) { retval = PAM_USER_UNKNOWN; } if (retval == PAM_SUCCESS) { - retval = pam_start("shadow", pampw->pw_name, &conv, &pamh); + retval = + pam_start ("shadow", pampw->pw_name, &conv, &pamh); } if (retval == PAM_SUCCESS) { - retval = pam_authenticate(pamh, 0); + retval = pam_authenticate (pamh, 0); if (retval != PAM_SUCCESS) { - pam_end(pamh, retval); + pam_end (pamh, retval); } } if (retval == PAM_SUCCESS) { - retval = pam_acct_mgmt(pamh, 0); + retval = pam_acct_mgmt (pamh, 0); if (retval != PAM_SUCCESS) { - pam_end(pamh, retval); + pam_end (pamh, retval); } } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); + fprintf (stderr, _("%s: PAM authentication failed\n"), + Prog); exit (1); } -#endif /* USE_PAM */ +#endif /* USE_PAM */ if (argc != 2) usage (); group_name = argv[1]; - OPENLOG(Prog); + OPENLOG (Prog); #ifdef SHADOWGRP - is_shadow_grp = sgr_file_present(); + is_shadow_grp = sgr_file_present (); #endif /* @@ -344,17 +348,17 @@ main(int argc, char **argv) gr_dbm_mode = O_RDWR; #ifdef SHADOWGRP sg_dbm_mode = O_RDWR; -#endif /* SHADOWGRP */ -#endif /* NDBM */ +#endif /* SHADOWGRP */ +#endif /* NDBM */ /* * Start with a quick check to see if the group exists. */ - if (! (grp = getgrnam(group_name))) { - fprintf(stderr, _("%s: group %s does not exist\n"), - Prog, group_name); - exit(E_NOTFOUND); + if (!(grp = getgrnam (group_name))) { + fprintf (stderr, _("%s: group %s does not exist\n"), + Prog, group_name); + exit (E_NOTFOUND); } #ifdef USE_NIS @@ -363,19 +367,18 @@ main(int argc, char **argv) */ if (__isgrNIS ()) { - char *nis_domain; - char *nis_master; + char *nis_domain; + char *nis_master; - fprintf(stderr, _("%s: group %s is a NIS group\n"), - Prog, group_name); + fprintf (stderr, _("%s: group %s is a NIS group\n"), + Prog, group_name); - if (! yp_get_default_domain (&nis_domain) && - ! yp_master (nis_domain, "group.byname", - &nis_master)) { + if (!yp_get_default_domain (&nis_domain) && + !yp_master (nis_domain, "group.byname", &nis_master)) { fprintf (stderr, _("%s: %s is the NIS master\n"), - Prog, nis_master); + Prog, nis_master); } - exit(E_NOTFOUND); + exit (E_NOTFOUND); } #endif @@ -394,14 +397,15 @@ main(int argc, char **argv) open_files (); grp_update (); + nscd_flush_cache ("group"); close_files (); #ifdef USE_PAM if (retval == PAM_SUCCESS) { - retval = pam_chauthtok(pamh, 0); + retval = pam_chauthtok (pamh, 0); if (retval != PAM_SUCCESS) { - pam_end(pamh, retval); + pam_end (pamh, retval); } } @@ -411,8 +415,8 @@ main(int argc, char **argv) } if (retval == PAM_SUCCESS) - pam_end(pamh, PAM_SUCCESS); -#endif /* USE_PAM */ - exit(errors == 0 ? E_SUCCESS : E_GRP_UPDATE); - /*NOTREACHED*/ + pam_end (pamh, PAM_SUCCESS); +#endif /* USE_PAM */ + exit (errors == 0 ? E_SUCCESS : E_GRP_UPDATE); + /* NOT REACHED */ } diff --git a/src/groupmod.c b/src/groupmod.c index 0c071da2..29b8b524 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.19 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: groupmod.c,v 1.22 2003/06/19 18:11:01 kloczek Exp $") #include #include #include @@ -45,6 +45,7 @@ RCSID (PKG_VER "$Id: groupmod.c,v 1.19 2002/01/05 15:41:43 kloczek Exp $") #include "chkname.h" #include "defines.h" #include "groupio.h" +#include "nscd.h" #ifdef SHADOWGRP #include "sgroupio.h" static int is_shadow_grp; @@ -100,7 +101,7 @@ static void open_files (void); static void usage (void) { fprintf (stderr, - _("usage: groupmod [-g gid [-o]] [-n name] group\n")); + _("Usage: groupmod [-g gid [-o]] [-n name] group\n")); exit (E_USAGE); } @@ -589,6 +590,7 @@ int main (int argc, char **argv) open_files (); grp_update (); + nscd_flush_cache ("group"); close_files (); @@ -609,4 +611,5 @@ int main (int argc, char **argv) pam_end (pamh, PAM_SUCCESS); #endif /* USE_PAM */ exit (E_SUCCESS); - /*NOTREACHED*/} + /* NOT REACHED */ +} diff --git a/src/grpconv.c b/src/grpconv.c index 300b354c..56be7fe8 100644 --- a/src/grpconv.c +++ b/src/grpconv.c @@ -27,7 +27,7 @@ #include "sgroupio.h" #include "rcsid.h" -RCSID (PKG_VER "$Id: grpconv.c,v 1.12 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: grpconv.c,v 1.15 2003/06/19 18:11:01 kloczek Exp $") static int group_locked = 0; static int gshadow_locked = 0; @@ -105,11 +105,6 @@ int main (int argc, char **argv) while ((gr = gr_next ())) { sg = sgr_locate (gr->gr_name); if (sg) { -#if 0 /* because of sg_mem, but see below */ - if (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) == - 0) - continue; -#endif /* update existing shadow group entry */ sgent = *sg; if (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) != @@ -167,12 +162,8 @@ int main (int argc, char **argv) #else /* !SHADOWGRP */ int main (int argc, char **argv) { - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - fprintf (stderr, - _("%s: not configured for shadow group support.\n"), + "%s: not configured for shadow group support.\n", argv[0]); exit (1); } diff --git a/src/grpunconv.c b/src/grpunconv.c index 4a1e7a11..54b7184b 100644 --- a/src/grpunconv.c +++ b/src/grpunconv.c @@ -11,7 +11,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: grpunconv.c,v 1.11 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: grpunconv.c,v 1.13 2003/06/19 18:11:01 kloczek Exp $") #include #include #include @@ -119,12 +119,8 @@ int main (int argc, char **argv) #else /* !SHADOWGRP */ int main (int argc, char **argv) { - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - fprintf (stderr, - _("%s: not configured for shadow group support.\n"), + "%s: not configured for shadow group support.\n", argv[0]); exit (1); } diff --git a/src/id.c b/src/id.c index 11eeb772..a6f4fd16 100644 --- a/src/id.c +++ b/src/id.c @@ -38,7 +38,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: id.c,v 1.11 2002/01/31 09:23:57 kloczek Exp $") +RCSID (PKG_VER "$Id: id.c,v 1.13 2003/06/19 18:11:01 kloczek Exp $") #include #include #include @@ -50,9 +50,9 @@ static void usage (void); static void usage (void) { #ifdef HAVE_GETGROUPS - fprintf (stderr, _("usage: id [-a]\n")); + fprintf (stderr, _("Usage: id [-a]\n")); #else - fprintf (stderr, _("usage: id\n")); + fprintf (stderr, _("Usage: id\n")); #endif exit (1); } @@ -187,4 +187,5 @@ static void usage (void) putchar ('\n'); exit (0); - /*NOTREACHED*/} + /* NOT REACHED */ +} diff --git a/src/lastlog.c b/src/lastlog.c index 63409a96..5f8eb8e3 100644 --- a/src/lastlog.c +++ b/src/lastlog.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: lastlog.c,v 1.11 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: lastlog.c,v 1.13 2003/12/17 12:52:25 kloczek Exp $") #include #include #include @@ -107,13 +107,13 @@ int main (int argc, char **argv) case 'h': fprintf (stdout, _ - ("Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n"), + ("Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n"), argv[0]); exit (0); default: fprintf (stdout, _ - ("Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n"), + ("Usage: %s [{-u|--login} login] [{-t|--time} days] [{-h|--help}]\n"), argv[0]); exit (1); } @@ -167,7 +167,7 @@ static void print_one (const struct passwd *pw) static int once; char *cp; struct tm *tm; - + time_t ll_time; #ifdef HAVE_STRFTIME char ptime[80]; #endif @@ -184,7 +184,8 @@ static void print_one (const struct passwd *pw) #endif once++; } - tm = localtime (&lastlog.ll_time); + ll_time = lastlog.ll_time; + tm = localtime (&ll_time); #ifdef HAVE_STRFTIME strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", tm); cp = ptime; diff --git a/src/login.c b/src/login.c index d610852e..4a0f1a57 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.26 2002/03/08 04:30:28 kloczek Exp $") +RCSID (PKG_VER "$Id: login.c,v 1.35 2003/12/17 12:52:25 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include @@ -38,11 +38,6 @@ RCSID (PKG_VER "$Id: login.c,v 1.26 2002/03/08 04:30:28 kloczek Exp $") #include #include #include -#if HAVE_UTMPX_H -#include -#else -#include -#endif #include #if HAVE_LASTLOG_H #include @@ -53,11 +48,6 @@ RCSID (PKG_VER "$Id: login.c,v 1.26 2002/03/08 04:30:28 kloczek Exp $") #include "failure.h" #include "pwauth.h" #include "getdef.h" -#include "dialchk.h" -#ifdef SVR4_SI86_EUA -#include -#include -#endif #ifdef RADIUS /* * Support for RADIUS authentication based on a hacked util-linux login @@ -182,7 +172,7 @@ static RETSIGTYPE alarm_handler (int); static void usage (void) { - fprintf (stderr, _("usage: %s [-p] [name]\n"), Prog); + fprintf (stderr, _("Usage: %s [-p] [name]\n"), Prog); if (!amroot) exit (1); fprintf (stderr, _(" %s [-p] [-h host] [-f name]\n"), Prog); @@ -232,15 +222,10 @@ static void setup_tty (void) termio.c_iflag &= ~IXANY; termio.c_oflag |= (XTABS | OPOST | ONLCR); #endif -#if 0 - termio.c_cc[VERASE] = getdef_num ("ERASECHAR", '\b'); - termio.c_cc[VKILL] = getdef_num ("KILLCHAR", '\025'); -#else /* leave these values unchanged if not specified in login.defs */ termio.c_cc[VERASE] = getdef_num ("ERASECHAR", termio.c_cc[VERASE]); termio.c_cc[VKILL] = getdef_num ("KILLCHAR", termio.c_cc[VKILL]); -#endif /* * ttymon invocation prefers this, but these settings won't come into @@ -636,36 +621,10 @@ int main (int argc, char **argv) if (rflg || fflg) usage (); -#ifdef SVR4 - /* - * The "-h" option can't be used with a command-line username, - * because telnetd invokes us as: login -h host TERM=... - */ - - if (!hflg) -#endif - { - STRFCPY (username, argv[optind]); - strzero (argv[optind]); - ++optind; - } + STRFCPY (username, argv[optind]); + strzero (argv[optind]); + ++optind; } -#ifdef SVR4 - /* - * check whether ttymon has done the prompt for us already - */ - - { - char *ttymon_prompt; - - if ((ttymon_prompt = getenv ("TTYPROMPT")) != NULL - && (*ttymon_prompt != 0)) { - /* read name, without prompt */ - login_prompt ((char *) 0, username, - sizeof username); - } - } -#endif /* SVR4 */ if (optind < argc) /* now set command line variables */ set_env (argc - optind, &argv[optind]); @@ -911,19 +870,6 @@ int main (int argc, char **argv) if (preauth_flag) goto auth_ok; - /* - * No password prompt if logging in from listed ttys (local - * console). Passwords don't help much if you have physical - * access to the hardware anyway... Suggested by Pavel - * Machek . - * NOTE: password still required for root logins! - */ - if (pwd && (pwent.pw_uid != 0) - && is_listed ("NO_PASSWORD_CONSOLE", tty, 0)) { - temp_pw[0] = '\0'; - pwent.pw_passwd = temp_pw; - } - if (pw_auth (pwent.pw_passwd, username, reason, (char *) 0) == 0) @@ -974,18 +920,6 @@ int main (int argc, char **argv) } #endif - if (getdef_bool ("DIALUPS_CHECK_ENAB")) { - alarm (30); - - if (!dialcheck (tty, pwent.pw_shell[0] ? - pwent.pw_shell : "/bin/sh")) { - SYSLOG ((LOG_WARN, - "invalid dialup password for `%s' on `%s'", - username, tty)); - failed = 1; - } - } - if (!failed && pwent.pw_name && pwent.pw_uid == 0 && !is_console) { SYSLOG ((LOG_CRIT, "ILLEGAL ROOT LOGIN %s", @@ -1020,10 +954,18 @@ int main (int argc, char **argv) #if HAVE_UTMPX_H failent = utxent; - gettimeofday (&(failent.ut_tv), NULL); + if (sizeof (failent.ut_tv) == sizeof (struct timeval)) + gettimeofday ((struct timeval *) &failent.ut_tv, NULL); + else + { + struct timeval tv; + gettimeofday (&tv, NULL); + failent.ut_tv.tv_sec = tv.tv_sec; + failent.ut_tv.tv_usec = tv.tv_usec; + } #else failent = utent; - time (&failent.ut_time); + failent.ut_time = time (NULL); #endif if (pwd) { failent_user = pwent.pw_name; @@ -1124,10 +1066,6 @@ int main (int argc, char **argv) hostname); #endif -#ifdef SVR4_SI86_EUA - sysi86 (SI86LIMUSER, EUA_ADD_USER); /* how do we test for fail? */ -#endif - #ifndef USE_PAM /* PAM handles this as well */ /* * Have to do this while we still have root privileges, otherwise we @@ -1144,16 +1082,6 @@ int main (int argc, char **argv) pwent = *pwd; } } -#else -#ifdef ATT_AGE - if (pwent.pw_age && pwent.pw_age[0]) { - if (expire (&pwent)) { - pwd = getpwnam (username); - if (pwd) - pwent = *pwd; - } - } -#endif /* ATT_AGE */ #endif /* SHADOWPWD */ #ifdef RADIUS @@ -1271,18 +1199,19 @@ int main (int argc, char **argv) } if (getdef_bool ("LASTLOG_ENAB") && lastlog.ll_time != 0) { + time_t ll_time = lastlog.ll_time; #ifdef HAVE_STRFTIME strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", - localtime (&lastlog.ll_time)); + localtime (&ll_time)); printf (_("Last login: %s on %s"), ptime, lastlog.ll_line); #else printf (_("Last login: %.19s on %s"), - ctime (&lastlog.ll_time), + ctime (&ll_time), lastlog.ll_line); #endif -#ifdef HAVE_LL_HOST /* SVR4 || __linux__ || SUN4 */ +#ifdef HAVE_LL_HOST /* __linux__ || SUN4 */ if (lastlog.ll_host[0]) printf (_(" from %.*s"), (int) sizeof lastlog. @@ -1370,5 +1299,6 @@ int main (int argc, char **argv) shell (tmp, pwent.pw_shell); /* fake shell */ } shell (pwent.pw_shell, (char *) 0); /* exec the shell finally. */ - /*NOTREACHED*/ return 0; + /* NOT REACHED */ + return 0; } diff --git a/src/logoutd.c b/src/logoutd.c index 3ea761c4..f5e5a1eb 100644 --- a/src/logoutd.c +++ b/src/logoutd.c @@ -30,21 +30,14 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: logoutd.c,v 1.18 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: logoutd.c,v 1.23 2003/06/19 18:11:01 kloczek Exp $") #include #include #include #include -#include #include #include "prototypes.h" #include "defines.h" -#ifdef SVR4 -#include -#endif -#ifdef SVR4 -#define signal sigset -#endif static char *Prog; #ifndef DEFAULT_HUP_MESG @@ -55,14 +48,20 @@ static char *Prog; #define HUP_MESG_FILE "/etc/logoutd.mesg" #endif -/* local function prototypes */ +#if HAVE_UTMPX_H +static int check_login (const struct utmpx *); +#else static int check_login (const struct utmp *); - +#endif /* - * check_login - check if user (struct utmp) allowed to stay logged in + * check_login - check if user (struct utmpx/utmp) allowed to stay logged in */ +#if HAVE_UTMPX_H +static int check_login (const struct utmpx *ut) +#else static int check_login (const struct utmp *ut) +#endif { char user[sizeof (ut->ut_user) + 1]; time_t now; @@ -80,17 +79,6 @@ static int check_login (const struct utmp *ut) */ if (!isttytime (user, ut->ut_line, now)) return 0; -#if 0 - /* - * Check for how long they are allowed to stay logged in. - * XXX - not implemented yet. Need to add a new field to - * /etc/porttime (login time limit in minutes, or no limit, - * based on username, tty, and time of login). - */ - if (now - ut->ut_time > - get_time_limit (user, ut->ut_line, ut->ut_time)) - return 0; -#endif return 1; } @@ -139,7 +127,7 @@ static void send_mesg_to_tty (int tty_fd) * * logoutd is started at system boot time and enforces the login * time and port restrictions specified in /etc/porttime. The - * utmp file is periodically scanned and offending users are logged + * utmpx/utmp file is periodically scanned and offending users are logged * off from the system. */ @@ -148,7 +136,12 @@ int main (int argc, char **argv) int i; int status; pid_t pid; + +#if HAVE_UTMPX_H + struct utmpx *ut; +#else struct utmp *ut; +#endif char user[sizeof (ut->ut_user) + 1]; /* terminating NUL */ char tty_name[sizeof (ut->ut_line) + 6]; /* /dev/ + NUL */ int tty_fd; @@ -194,26 +187,34 @@ int main (int argc, char **argv) OPENLOG (Prog); /* - * Scan the UTMP file once per minute looking for users that + * Scan the utmpx/utmp file once per minute looking for users that * are not supposed to still be logged in. */ while (1) { /* - * Attempt to re-open the utmp file. The file is only + * Attempt to re-open the utmpx/utmp file. The file is only * open while it is being used. */ +#if HAVE_UTMPX_H + setutxent (); +#else setutent (); +#endif /* - * Read all of the entries in the utmp file. The entries + * Read all of the entries in the utmpx/utmp file. The entries * for login sessions will be checked to see if the user * is permitted to be signed on at this time. */ +#if HAVE_UTMPX_H + while ((ut = getutxent ())) { +#else while ((ut = getutent ())) { +#endif #ifdef USER_PROCESS if (ut->ut_type != USER_PROCESS) continue; @@ -289,7 +290,11 @@ int main (int argc, char **argv) exit (0); } +#if HAVE_UTMPX_H + endutxent (); +#else endutent (); +#endif #ifndef DEBUG sleep (60); @@ -300,5 +305,6 @@ int main (int argc, char **argv) while (wait (&status) != -1); } - return 1; /* not reached */ + return 1; + /* NOT REACHED */ } diff --git a/src/newgrp.c b/src/newgrp.c index 6057f85d..8d63ac9d 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.21 2002/01/06 15:00:07 kloczek Exp $") +RCSID (PKG_VER "$Id: newgrp.c,v 1.26 2003/07/29 06:16:04 kloczek Exp $") #include #include #include @@ -58,9 +58,9 @@ static void usage (void); static void usage (void) { if (is_newgrp) - fprintf (stderr, _("usage: newgrp [-] [group]\n")); + fprintf (stderr, _("Usage: newgrp [-] [group]\n")); else - fprintf (stderr, _("usage: sg group [[-c] command]\n")); + fprintf (stderr, _("Usage: sg group [[-c] command]\n")); } /* @@ -89,11 +89,6 @@ int main (int argc, char **argv) struct sgrp *sgrp; #endif -#if ENABLE_NLS - /* XXX - remove when gettext is safe to use in setuid programs */ - sanitize_env (); -#endif - setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); @@ -152,10 +147,10 @@ int main (int argc, char **argv) * the login group ID of the current user. * * The valid syntax are - * newgrp [ - ] [ groupid ] - * newgrp [ -l ] [ groupid ] - * sg [ - ] - * sg [ - ] groupid [ command ] + * newgrp [-] [groupid] + * newgrp [-l] [groupid] + * sg [-] + * sg [-] groupid [[-c command] */ if (argc > 0 @@ -398,6 +393,7 @@ int main (int argc, char **argv) SYSLOG ((LOG_INFO, "user `%s' (login `%s' on %s) switched to group `%s'", name, loginname, tty, group)); +#ifdef USE_PAM if (getdef_bool ("CLOSE_SESSIONS")) { /* * We want to fork and exec the new shell in the child, leaving the @@ -450,6 +446,7 @@ int main (int argc, char **argv) signal (SIGTTIN, SIG_DFL); signal (SIGTTOU, SIG_DFL); } +#endif /* USE_PAM */ } #endif /* USE_SYSLOG */ @@ -574,20 +571,14 @@ int main (int argc, char **argv) addenv (*envp++, NULL); } - /* - * Sanitize_env() removes $HOME from the environment (maybe it - * shouldn't - please tell me if you are sure that $HOME can't cause - * security problems) - add it from user's passwd entry. - */ - addenv ("HOME", pwd->pw_dir); - /* * Exec the login shell and go away. We are trying to get back to * the previous environment which should be the user's login shell. */ shell (prog, initflag ? (char *) 0 : cp); - /*NOTREACHED*/ failure: + /* NOTREACHED */ +failure: /* * The previous code, when run as newgrp, re-exec'ed the shell in diff --git a/src/newusers.c b/src/newusers.c index b9d2fd82..eb8629de 100644 --- a/src/newusers.c +++ b/src/newusers.c @@ -36,7 +36,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: newusers.c,v 1.15 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: newusers.c,v 1.18 2003/12/17 01:33:29 kloczek Exp $") #include #include #include "prototypes.h" @@ -219,15 +219,6 @@ add_user (const char *name, const char *uid, uid_t * nuid, gid_t gid) pwent.pw_name = xstrdup (name); pwent.pw_passwd = "x"; /* XXX warning: const */ -#ifdef ATT_AGE - pwent.pw_age = ""; -#endif -#ifdef ATT_COMMENT - pwent.pw_comment = ""; -#endif -#ifdef BSD_QUOTA - pwent.pw_quota = 0; -#endif pwent.pw_uid = i; pwent.pw_gid = gid; pwent.pw_gecos = ""; /* XXX warning: const */ @@ -241,16 +232,6 @@ add_user (const char *name, const char *uid, uid_t * nuid, gid_t gid) static void update_passwd (struct passwd *pwd, const char *passwd) { pwd->pw_passwd = pw_encrypt (passwd, crypt_make_salt ()); -#ifdef ATT_AGE - if (strlen (pwd->pw_age) == 4) { - static char newage[5]; - extern char *l64a (); - - strcpy (newage, pwd->pw_age); - strcpy (newage + 2, l64a (time ((time_t *) 0) / WEEK)); - pwd->pw_age = newage; - } -#endif } /* @@ -634,4 +615,5 @@ int main (int argc, char **argv) #endif /* USE_PAM */ exit (0); - /*NOTREACHED*/} + /* NOT REACHED */ +} diff --git a/src/passwd.c b/src/passwd.c index b9d24c0f..3d981ad7 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.24 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: passwd.c,v 1.30 2003/12/17 09:43:30 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include @@ -50,14 +50,11 @@ RCSID (PKG_VER "$Id: passwd.c,v 1.24 2002/01/05 15:41:43 kloczek Exp $") #endif #include #include "pwauth.h" -#ifdef HAVE_TCFS -#include -#include "tcfsio.h" -#endif #ifdef SHADOWPWD #include "shadowio.h" #endif #include "pwio.h" +#include "nscd.h" #include "getdef.h" /* * exit status values @@ -113,19 +110,10 @@ static char crypt_passwd[128]; /* The "old-style" password, if present */ static int do_update_pwd = 0; #endif -#ifdef HAVE_TCFS -static struct tcfspwd *tcfspword; -static int tcfs_force = 0; -#endif - /* * External identifiers */ -#ifdef ATT_AGE -extern char *l64a (); -#endif - #ifdef NDBM extern int sp_dbm_mode; extern int pw_dbm_mode; @@ -135,10 +123,6 @@ extern int pw_dbm_mode; static void usage (int); #ifndef USE_PAM -#ifdef AUTH_METHODS -static char *get_password (const char *); -static int uses_default_method (const char *); -#endif /* AUTH_METHODS */ static int reuse (const char *, const struct passwd *); static int new_password (const struct passwd *); @@ -160,9 +144,6 @@ static void update_noshadow (void); #ifdef SHADOWPWD static void update_shadow (void); #endif -#ifdef HAVE_TCFS -static void update_tcfs (void); -#endif static long getnumber (const char *); /* @@ -171,7 +152,7 @@ static long getnumber (const char *); static void usage (int status) { - fprintf (stderr, _("usage: %s [-f|-s] [name]\n"), Prog); + fprintf (stderr, _("Usage: %s [-f|-s] [name]\n"), Prog); if (amroot) { fprintf (stderr, _ @@ -184,48 +165,6 @@ static void usage (int status) } #ifndef USE_PAM -#ifdef AUTH_METHODS -/* - * get_password - locate encrypted password in authentication list - */ - -static char *get_password (const char *list) -{ - char *cp, *end; - static char buf[257]; - - STRFCPY (buf, list); - for (cp = buf; cp; cp = end) { - if ((end = strchr (cp, ';'))) - *end++ = 0; - - if (cp[0] == '@') - continue; - - return cp; - } - return (char *) 0; -} - -/* - * uses_default_method - determine if "old-style" password present - * - * uses_default_method determines if a "old-style" password is present - * in the authentication string, and if one is present it extracts it. - */ - -static int uses_default_method (const char *methods) -{ - char *cp; - - if ((cp = get_password (methods))) { - STRFCPY (crypt_passwd, cp); - return 1; - } - return 0; -} -#endif /* AUTH_METHODS */ - static int reuse (const char *pass, const struct passwd *pw) { #ifdef HAVE_LIBCRACK_HIST @@ -273,22 +212,7 @@ static int reuse (const char *pass, const struct passwd *pw) * password. */ -#ifdef HAVE_TCFS - tcfs_force = tcfs_force && amroot; - - if ((tcfs_locate (name) && !tcfs_force) - || (!amroot && crypt_passwd[0])) { - if (amroot) { - printf (_ - ("User %s has a TCFS key, his old password is required.\n"), - name); - printf (_ - ("You can use -t option to force the change.\n")); - } -#else if (!amroot && crypt_passwd[0]) { -#endif - if (!(clear = getpass (_("Old password: ")))) return -1; @@ -303,17 +227,9 @@ static int reuse (const char *pass, const struct passwd *pw) return -1; } STRFCPY (orig, clear); -#ifdef HAVE_TCFS - STRFCPY (tcfspword->tcfsorig, clear); -#endif strzero (clear); strzero (cipher); } else { -#ifdef HAVE_TCFS - if (tcfs_locate (name)) - printf (_("Warning: user %s has a TCFS key.\n"), - name); -#endif orig[0] = '\0'; } @@ -380,9 +296,6 @@ Please use a combination of upper and lower case letters and numbers.\n"), getde memzero (pass, sizeof pass); return -1; } -#ifdef HAVE_TCFS - STRFCPY (tcfspword->tcfspass, pass); -#endif /* * Encrypt the password, then wipe the cleartext password. @@ -473,20 +386,9 @@ static void check_password (const struct passwd *pw) closelog (); exit (E_NOPERM); } -#ifdef ATT_AGE - /* - * Can always be changed if there is no age info - */ - if (!pw->pw_age[0]) - return; - - last = a64l (pw->pw_age + 2) * WEEK; - ok = last + c64i (pw->pw_age[1]) * WEEK; -#else /* !ATT_AGE */ last = 0; ok = 0; -#endif /* !ATT_AGE */ #endif /* !SHADOWPWD */ if (now < ok) { fprintf (stderr, @@ -506,30 +408,6 @@ static void check_password (const struct passwd *pw) */ static char *insert_crypt_passwd (const char *string, const char *passwd) { -#ifdef AUTH_METHODS - if (string && *string) { - char *cp, *result; - - result = xmalloc (strlen (string) + strlen (passwd) + 1); - cp = result; - while (*string) { - if (string[0] == ';') { - *cp++ = *string++; - } else if (string[0] == '@') { - while (*string && *string != ';') - *cp++ = *string++; - } else { - while (*passwd) - *cp++ = *passwd++; - - while (*string && *string != ';') - string++; - } - } - *cp = '\0'; - return result; - } -#endif return xstrdup (passwd); } #endif /* !USE_PAM */ @@ -582,17 +460,7 @@ static void print_status (const struct passwd *pw) } else #endif { -#ifdef ATT_AGE - printf ("%s %s %s %d %d\n", - pw->pw_name, - pw_status (pw->pw_passwd), - date_to_str (strlen (pw->pw_age) > 2 ? - a64l (pw->pw_age + 2) * WEEK : 0L), - pw->pw_age[0] ? c64i (pw->pw_age[1]) * 7 : 0, - pw->pw_age[0] ? c64i (pw->pw_age[0]) * 7 : 10000); -#else printf ("%s %s\n", pw->pw_name, pw_status (pw->pw_passwd)); -#endif } } @@ -602,9 +470,6 @@ static void fail_exit (int status) pw_unlock (); #ifdef SHADOWPWD spw_unlock (); -#endif -#ifdef HAVE_TCFS - tcfs_unlock (); #endif exit (status); } @@ -644,12 +509,6 @@ static void update_noshadow (void) const struct passwd *pw; struct passwd *npw; -#ifdef ATT_AGE - char age[5]; - long week = time ((time_t *) 0) / WEEK; - char *cp; -#endif - if (!pw_lock ()) { fprintf (stderr, _ @@ -672,69 +531,6 @@ static void update_noshadow (void) if (!npw) oom (); npw->pw_passwd = update_crypt_pw (npw->pw_passwd); -#ifdef ATT_AGE - memzero (age, sizeof (age)); - STRFCPY (age, npw->pw_age); - - /* - * Just changing the password - update the last change date if there - * is one, otherwise the age just disappears. - */ - if (do_update_age) { - if (strlen (age) > 2) { - cp = l64a (week); - age[2] = cp[0]; - age[3] = cp[1]; - } else { - age[0] = '\0'; - } - } - - if (xflg) { - if (age_max > 0) - age[0] = i64c ((age_max + 6) / 7); - else - age[0] = '.'; - - if (age[1] == '\0') - age[1] = '.'; - } - if (nflg) { - if (age[0] == '\0') - age[0] = 'z'; - - if (age_min > 0) - age[1] = i64c ((age_min + 6) / 7); - else - age[1] = '.'; - } - /* - * The last change date is added by -n or -x if it's not already - * there. - */ - if ((nflg || xflg) && strlen (age) <= 2) { - cp = l64a (week); - age[2] = cp[0]; - age[3] = cp[1]; - } - - /* - * Force password change - if last change date is present, it will - * be set to (today - max - 1 week). Otherwise, just set min = max - * = 0 (will disappear when password is changed). - */ - if (eflg) { - if (strlen (age) > 2) { - cp = l64a (week - c64i (age[0]) - 1); - age[2] = cp[0]; - age[3] = cp[1]; - } else { - strcpy (age, ".."); - } - } - - npw->pw_age = age; -#endif if (!pw_update (npw)) { fprintf (stderr, _("Error updating the password entry.\n")); @@ -759,46 +555,6 @@ static void update_noshadow (void) pw_unlock (); } -#ifdef HAVE_TCFS -static void update_tcfs (void) -{ - if (!tcfs_force) { - if (!tcfs_lock ()) { - fprintf (stderr, - _ - ("Cannot lock the TCFS key database; try again later\n")); - SYSLOG ((LOG_WARN, - "can't lock TCFS key database")); - exit (E_PWDBUSY); - } - if (!tcfs_open (O_RDWR)) { - fprintf (stderr, - _ - ("Cannot open the TCFS key database.\n")); - SYSLOG ((LOG_WARN, - "can't open TCFS key database")); - fail_exit (E_MISSING); - } - if (!tcfs_update (name, tcfspword)) { - fprintf (stderr, - _ - ("Error updating the TCFS key database.\n")); - SYSLOG ((LOG_ERR, - "error updating TCFS key database")); - fail_exit (E_FAILURE); - } - if (!tcfs_close ()) { - fprintf (stderr, - _("Cannot commit TCFS changes.\n")); - SYSLOG ((LOG_ERR, - "can't rewrite TCFS key database")); - fail_exit (E_FAILURE); - } - tcfs_unlock (); - } -} -#endif /* HAVE_TCFS */ - #ifdef SHADOWPWD static void update_shadow (void) { @@ -904,7 +660,6 @@ static long getnumber (const char *str) * -f execute chfn command to interpret flags * -s execute chsh command to interpret flags * -k change password only if expired - * -t force 'passwd' to change the password regardless of TCFS * * (*) requires root permission to execute. * @@ -990,31 +745,14 @@ int main (int argc, char **argv) */ #ifdef SHADOWPWD - #define FLAGS "adlqr:uSekn:x:i:w:" -#ifdef HAVE_TCFS -#undef FLAGS -#define FLAGS "adlqr:uSekn:x:i:w:t" -#endif - #else - -#define FLAGS "adlqr:uS" -#ifdef HAVE_TCFS -#undef FLAGS -#define FLAGS "adlqr:uSt" -#endif - +# define FLAGS "adlqr:uS" #endif while ((flag = getopt (argc, argv, FLAGS)) != EOF) { #undef FLAGS switch (flag) { -#ifdef HAVE_TCFS - case 't': - tcfs_force = 1; - break; -#endif #ifdef SHADOWPWD case 'x': age_max = getnumber (optarg); @@ -1204,21 +942,7 @@ int main (int argc, char **argv) */ if (!anyflag) { -#ifdef AUTH_METHODS - if (strchr (cp, '@')) { - if (pw_auth (cp, name, PW_CHANGE, (char *) 0)) { - SYSLOG ((LOG_INFO, - "password for `%s' changed by `%s'", - name)); - closelog (); - exit (E_NOPERM); - } else if (!uses_default_method (cp)) { - do_update_age = 1; - goto done; - } - } else -#endif - STRFCPY (crypt_passwd, cp); + STRFCPY (crypt_passwd, cp); /* * See if the user is permitted to change the password. @@ -1231,10 +955,6 @@ int main (int argc, char **argv) check_password (pw); #endif -#ifdef HAVE_TCFS - tcfspword = - (struct tcfspwd *) calloc (1, sizeof (struct tcfspwd)); -#endif /* * Let the user know whose password is being changed. */ @@ -1251,9 +971,6 @@ int main (int argc, char **argv) do_update_pwd = 1; do_update_age = 1; } -#ifdef AUTH_METHODS - done: -#endif #endif /* !USE_PAM */ /* * Before going any further, raise the ulimit to prevent colliding @@ -1286,14 +1003,17 @@ int main (int argc, char **argv) #endif update_noshadow (); -#ifdef HAVE_TCFS - if (tcfs_locate (name) && tcfs_file_present ()) - update_tcfs (); + nscd_flush_cache ("passwd"); + nscd_flush_cache ("group"); +#ifdef SHADOWPWD + nscd_flush_cache ("shadow"); #endif + SYSLOG ((LOG_INFO, "password for `%s' changed by `%s'", name, myname)); closelog (); if (!qflg) printf (_("Password changed.\n")); exit (E_SUCCESS); - /*NOTREACHED*/} + /* NOT REACHED */ +} diff --git a/src/pwconv.c b/src/pwconv.c index a7e6d468..89ad42cb 100644 --- a/src/pwconv.c +++ b/src/pwconv.c @@ -29,7 +29,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: pwconv.c,v 1.12 2002/01/05 15:41:44 kloczek Exp $") +RCSID (PKG_VER "$Id: pwconv.c,v 1.15 2003/06/19 18:11:01 kloczek Exp $") #include #include #include @@ -43,12 +43,13 @@ RCSID (PKG_VER "$Id: pwconv.c,v 1.12 2002/01/05 15:41:44 kloczek Exp $") #include "pwio.h" #include "shadowio.h" #include "getdef.h" +#ifdef SHADOWPWD /* * exit status values */ #define E_SUCCESS 0 /* success */ #define E_NOPERM 1 /* permission denied */ -#define E_USAGE 2 /* bad command syntax */ +#define E_USAGE 2 /* invalid command syntax */ #define E_FAILURE 3 /* unexpected failure, nothing done */ #define E_MISSING 4 /* unexpected failure, passwd file missing */ #define E_PWDBUSY 5 /* passwd file(s) busy */ @@ -181,3 +182,13 @@ int main (int argc, char **argv) pw_unlock (); exit (E_SUCCESS); } + +#else /* !SHADOWPWD */ +int main (int argc, char **argv) +{ + fprintf (stderr, + "%s: not configured for shadow password support.\n", + argv[0]); + exit (1); +} +#endif /* !SHADOWPWD */ diff --git a/src/pwunconv.c b/src/pwunconv.c index 2e408afa..1af354cb 100644 --- a/src/pwunconv.c +++ b/src/pwunconv.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: pwunconv.c,v 1.11 2002/01/05 15:41:44 kloczek Exp $") +RCSID (PKG_VER "$Id: pwunconv.c,v 1.15 2003/06/19 18:11:01 kloczek Exp $") #include "defines.h" #include #include @@ -40,19 +40,8 @@ RCSID (PKG_VER "$Id: pwunconv.c,v 1.11 2002/01/05 15:41:44 kloczek Exp $") #include "prototypes.h" #include "pwio.h" #include "shadowio.h" -#ifndef SHADOWPWD -int main (int argc, char **argv) -{ - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - - fprintf (stderr, _("%s: Shadow passwords are not configured.\n"), - argv[0]); - exit (1); -} - -#else /*{ */ +#include "nscd.h" +#ifdef SHADOWPWD char *l64a (); static int shadow_locked = 0, passwd_locked = 0; @@ -76,9 +65,6 @@ int main (int argc, char **argv) struct passwd pwent; const struct spwd *spwd; -#ifdef ATT_AGE - char newage[5]; -#endif char *Prog = argv[0]; setlocale (LC_ALL, ""); @@ -133,28 +119,6 @@ int main (int argc, char **argv) * to weeks and so on. */ -#ifdef ATT_AGE - if (spwd->sp_max > (63 * WEEK / SCALE) - && spwd->sp_max < 10000) - spwd->sp_max = (63 * WEEK / SCALE); /* 10000 is infinity */ - - if (spwd->sp_min >= 0 && spwd->sp_min <= 63 * 7 && - spwd->sp_max >= 0 && spwd->sp_max <= 63 * 7) { - if (spwd->sp_lstchg == -1) - spwd->sp_lstchg = 0; - - spwd->sp_max /= WEEK / SCALE; /* turn it into weeks */ - spwd->sp_min /= WEEK / SCALE; - spwd->sp_lstchg /= WEEK / SCALE; - - strncpy (newage, - l64a (spwd->sp_lstchg * (64L * 64L) + - spwd->sp_min * (64L) + - spwd->sp_max), 5); - pwent.pw_age = newage; - } else - pwent.pw_age = ""; -#endif /* ATT_AGE */ if (!pw_update (&pwent)) { fprintf (stderr, _("%s: can't update entry for user %s\n"), @@ -185,6 +149,21 @@ int main (int argc, char **argv) spw_unlock (); pw_unlock (); + + nscd_flush_cache ("passwd"); +#ifdef SHADOWPWD + nscd_flush_cache ("shadow"); +#endif + return 0; } -#endif + +#else /* !SHADOWPWD */ +int main (int argc, char **argv) +{ + fprintf (stderr, + "%s: not configured for shadow password support.\n", + argv[0]); + exit (1); +} +#endif /* !SHADOWPWD */ diff --git a/src/su.c b/src/su.c index 8ad90e2d..1e10d605 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.22 2002/03/08 04:30:28 kloczek Exp $") +RCSID (PKG_VER "$Id: su.c,v 1.26 2003/06/19 18:11:01 kloczek Exp $") #include #include #ifdef USE_PAM @@ -464,14 +464,6 @@ int main (int argc, char **argv) "Expired account %s", name)); su_failure (tty); } -#else -#if defined(ATT_AGE) - if (pwent.pw_age[0] && isexpired (&pwent)) { - SYSLOG ((pwent.pw_uid ? LOG_WARN : LOG_CRIT, - "Expired account %s", name)); - su_failure (tty); - } -#endif /* ATT_AGE */ #endif } @@ -494,9 +486,7 @@ int main (int argc, char **argv) signal (SIGINT, SIG_DFL); cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH"); -#if 0 - addenv (cp ? cp : "PATH=/bin:/usr/bin", NULL); -#else + /* XXX very similar code duplicated in libmisc/setupenv.c */ if (!cp) { addenv ("PATH=/bin:/usr/bin", NULL); @@ -505,7 +495,6 @@ int main (int argc, char **argv) } else { addenv ("PATH", cp); } -#endif environ = newenvp; /* make new environment active */ @@ -597,12 +586,6 @@ int main (int argc, char **argv) if (fakelogin) { char *arg0; -#if 0 /* XXX - GNU su doesn't do this. --marekm */ - if (!hushed (&pwent)) { - motd (); - mailcheck (); - } -#endif cp = getdef_str ("SU_NAME"); if (!cp) cp = Basename (pwent.pw_shell); @@ -630,5 +613,6 @@ int main (int argc, char **argv) } shell (pwent.pw_shell, cp); - /*NOTREACHED*/ exit (1); + /* NOT REACHED */ + exit (1); } diff --git a/src/suauth.c b/src/suauth.c index a41aca39..56aecd73 100644 --- a/src/suauth.c +++ b/src/suauth.c @@ -25,26 +25,25 @@ struct passwd pwent; * strings output to the user or the syslog. -- chris */ -static int applies(const char *, char *); +static int applies (const char *, char *); -int check_su_auth(const char *, const char *); -int isgrp(const char *, const char *); +int check_su_auth (const char *, const char *); +int isgrp (const char *, const char *); static int lines = 0; -int -check_su_auth(const char *actual_id, const char *wanted_id) +int check_su_auth (const char *actual_id, const char *wanted_id) { - int posn, endline; - const char field[] = ":"; - FILE *authfile_fd; - char temp[1024]; - char *to_users; - char *from_users; - char *action; + int posn, endline; + const char field[] = ":"; + FILE *authfile_fd; + char temp[1024]; + char *to_users; + char *from_users; + char *action; - if (!(authfile_fd = fopen(SUAUTHFILE, "r"))) { + if (!(authfile_fd = fopen (SUAUTHFILE, "r"))) { /* * If the file doesn't exist - default to the standard su * behaviour (no access control). If open fails for some @@ -53,23 +52,25 @@ check_su_auth(const char *actual_id, const char *wanted_id) */ if (errno == ENOENT) return NOACTION; - SYSLOG((LOG_ERR, "could not open/read config file '%s': %m\n", - SUAUTHFILE)); + SYSLOG ((LOG_ERR, + "could not open/read config file '%s': %m\n", + SUAUTHFILE)); return DENY; } - while (fgets(temp, sizeof(temp), authfile_fd) != NULL) { + while (fgets (temp, sizeof (temp), authfile_fd) != NULL) { lines++; - if (temp[endline = strlen(temp) - 1] != '\n') { - SYSLOG((LOG_ERR, - "%s, line %d: line too long or missing newline", - SUAUTHFILE, lines)); + if (temp[endline = strlen (temp) - 1] != '\n') { + SYSLOG ((LOG_ERR, + "%s, line %d: line too long or missing newline", + SUAUTHFILE, lines)); continue; } - while (endline > 0 && (temp[endline-1] == ' ' - || temp[endline-1] == '\t' || temp[endline-1] == '\n')) + while (endline > 0 && (temp[endline - 1] == ' ' + || temp[endline - 1] == '\t' + || temp[endline - 1] == '\n')) endline--; temp[endline] = '\0'; @@ -77,108 +78,117 @@ check_su_auth(const char *actual_id, const char *wanted_id) while (temp[posn] == ' ' || temp[posn] == '\t') posn++; - if (temp[posn] == '\n' || temp[posn] == '#' || temp[posn] == '\0') { + if (temp[posn] == '\n' || temp[posn] == '#' + || temp[posn] == '\0') { continue; } - if (!(to_users = strtok(temp + posn, field)) - || !(from_users = strtok((char *)NULL, field)) - || !(action = strtok((char *)NULL, field)) - || strtok((char *)NULL, field)) { - SYSLOG((LOG_ERR, "%s, line %d. Bad number of fields.\n", - SUAUTHFILE, lines)); + if (!(to_users = strtok (temp + posn, field)) + || !(from_users = strtok ((char *) NULL, field)) + || !(action = strtok ((char *) NULL, field)) + || strtok ((char *) NULL, field)) { + SYSLOG ((LOG_ERR, + "%s, line %d. Bad number of fields.\n", + SUAUTHFILE, lines)); continue; } - if (!applies(wanted_id, to_users)) + if (!applies (wanted_id, to_users)) continue; - if (!applies(actual_id, from_users)) + if (!applies (actual_id, from_users)) continue; - if (!strcmp(action, "DENY")) { - SYSLOG((pwent.pw_uid ? LOG_NOTICE : LOG_WARN, - "DENIED su from `%s' to `%s' (%s)\n", - actual_id, wanted_id, SUAUTHFILE)); - fprintf(stderr, _("Access to su to that account DENIED.\n")); - fclose(authfile_fd); + if (!strcmp (action, "DENY")) { + SYSLOG ((pwent.pw_uid ? LOG_NOTICE : LOG_WARN, + "DENIED su from `%s' to `%s' (%s)\n", + actual_id, wanted_id, SUAUTHFILE)); + fprintf (stderr, + _ + ("Access to su to that account DENIED.\n")); + fclose (authfile_fd); return DENY; - } else if (!strcmp(action, "NOPASS")) { - SYSLOG((pwent.pw_uid ? LOG_INFO : LOG_NOTICE, - "NO password asked for su from `%s' to `%s' (%s)\n", - actual_id, wanted_id, SUAUTHFILE)); - fprintf(stderr, _("Password authentication bypassed.\n")); - fclose(authfile_fd); + } else if (!strcmp (action, "NOPASS")) { + SYSLOG ((pwent.pw_uid ? LOG_INFO : LOG_NOTICE, + "NO password asked for su from `%s' to `%s' (%s)\n", + actual_id, wanted_id, SUAUTHFILE)); + fprintf (stderr, + _("Password authentication bypassed.\n")); + fclose (authfile_fd); return NOPWORD; - } else if (!strcmp(action, "OWNPASS")) { - SYSLOG((pwent.pw_uid ? LOG_INFO : LOG_NOTICE, - "su from `%s' to `%s': asking for user's own password (%s)\n", - actual_id, wanted_id, SUAUTHFILE)); - fprintf(stderr, _("Please enter your OWN password as authentication.\n")); - fclose(authfile_fd); + } else if (!strcmp (action, "OWNPASS")) { + SYSLOG ((pwent.pw_uid ? LOG_INFO : LOG_NOTICE, + "su from `%s' to `%s': asking for user's own password (%s)\n", + actual_id, wanted_id, SUAUTHFILE)); + fprintf (stderr, + _ + ("Please enter your OWN password as authentication.\n")); + fclose (authfile_fd); return OWNPWORD; } else { - SYSLOG((LOG_ERR, "%s, line %d: unrecognised action!\n", - SUAUTHFILE, lines)); + SYSLOG ((LOG_ERR, + "%s, line %d: unrecognised action!\n", + SUAUTHFILE, lines)); } } - fclose(authfile_fd); + fclose (authfile_fd); return NOACTION; } -static int -applies(const char *single, char *list) +static int applies (const char *single, char *list) { - const char split[] = ", "; - char *tok; + const char split[] = ", "; + char *tok; int state = 0; - for (tok = strtok(list, split); tok != NULL; tok = strtok(NULL, split)) { + for (tok = strtok (list, split); tok != NULL; + tok = strtok (NULL, split)) { - if (!strcmp(tok, "ALL")) { + if (!strcmp (tok, "ALL")) { if (state != 0) { - SYSLOG((LOG_ERR, - "%s, line %d: ALL in bad place\n", - SUAUTHFILE, lines)); + SYSLOG ((LOG_ERR, + "%s, line %d: ALL in bad place\n", + SUAUTHFILE, lines)); return 0; } state = 1; - } else if (!strcmp(tok, "EXCEPT")) { + } else if (!strcmp (tok, "EXCEPT")) { if (state != 1) { - SYSLOG((LOG_ERR, - "%s, line %d: EXCEPT in bas place\n", - SUAUTHFILE, lines)); + SYSLOG ((LOG_ERR, + "%s, line %d: EXCEPT in bas place\n", + SUAUTHFILE, lines)); return 0; } state = 2; - } else if (!strcmp(tok, "GROUP")) { + } else if (!strcmp (tok, "GROUP")) { if ((state != 0) && (state != 2)) { - SYSLOG((LOG_ERR, - "%s, line %d: GROUP in bad place\n", - SUAUTHFILE, lines)); + SYSLOG ((LOG_ERR, + "%s, line %d: GROUP in bad place\n", + SUAUTHFILE, lines)); return 0; } state = (state == 0) ? 3 : 4; } else { switch (state) { - case 0: /* No control words yet */ - if (!strcmp(tok, single)) - return 1; - break; - case 1: /* An all */ - SYSLOG((LOG_ERR, "%s, line %d: expect another token after ALL\n", - SUAUTHFILE, lines)); + case 0: /* No control words yet */ + if (!strcmp (tok, single)) + return 1; + break; + case 1: /* An all */ + SYSLOG ((LOG_ERR, + "%s, line %d: expect another token after ALL\n", + SUAUTHFILE, lines)); + return 0; + case 2: /* All except */ + if (!strcmp (tok, single)) return 0; - case 2: /* All except */ - if (!strcmp(tok, single)) - return 0; - break; - case 3: /* Group */ - if (isgrp(single, tok)) - return 1; - break; - case 4: /* All except group */ - if (isgrp(single, tok)) - return 0; - /* FALL THRU */ + break; + case 3: /* Group */ + if (isgrp (single, tok)) + return 1; + break; + case 4: /* All except group */ + if (isgrp (single, tok)) + return 0; + /* FALL THRU */ } } } @@ -187,16 +197,15 @@ applies(const char *single, char *list) return 0; } -int -isgrp(const char *name, const char *group) +int isgrp (const char *name, const char *group) { - struct group *grp; + struct group *grp; - grp = getgrnam(group); + grp = getgrnam (group); if (!grp || !grp->gr_mem) return 0; - return is_on_list(grp->gr_mem, name); + return is_on_list (grp->gr_mem, name); } -#endif /* SU_ACCESS */ +#endif /* SU_ACCESS */ diff --git a/src/sulogin.c b/src/sulogin.c index 07d0130a..b011d7bf 100644 --- a/src/sulogin.c +++ b/src/sulogin.c @@ -30,15 +30,10 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: sulogin.c,v 1.13 2002/01/05 15:41:44 kloczek Exp $") +RCSID (PKG_VER "$Id: sulogin.c,v 1.17 2003/05/12 04:39:17 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include "getdef.h" -#if HAVE_UTMPX_H -#include -#else -#include -#endif #include #include #include @@ -49,15 +44,6 @@ static char pass[BUFSIZ]; static struct passwd pwent; -#if 0 -#if HAVE_UTMPX_H -static struct utmpx utent; -#else -static struct utmp utent; -#endif -#endif - - extern char **newenvp; extern size_t newenvc; @@ -209,20 +195,6 @@ static RETSIGTYPE catch (int sig) STRFCPY (pass, cp); strzero (cp); } -#ifdef AUTH_METHODS - if (pwent.pw_name && pwent.pw_passwd[0] == '@') { - if (pw_auth - (pwent.pw_passwd + 1, name, PW_LOGIN, - (char *) 0)) { -#ifdef USE_SYSLOG - syslog (LOG_WARN, - "Incorrect root authentication"); -#endif - continue; - } - goto auth_done; - } -#endif if (valid (pass, &pwent)) /* check encrypted passwords ... */ break; /* ... encrypted passwords matched */ @@ -232,9 +204,6 @@ static RETSIGTYPE catch (int sig) sleep (2); puts (_("Login incorrect")); } -#ifdef AUTH_METHODS - auth_done: -#endif strzero (pass); alarm (0); signal (SIGALRM, SIG_DFL); @@ -245,26 +214,6 @@ static RETSIGTYPE catch (int sig) syslog (LOG_INFO, "System Maintenance Mode\n"); #endif -#if 0 /* do we need all this? we are logging in as root anyway... --marekm */ - /* - * Normally there would be a utmp entry for login to mung on to get - * the tty name, date, etc. from. We don't need all that stuff - * because we won't update the utmp or wtmp files. BUT!, we do need - * the tty name so we can set the permissions and ownership. - */ - - if ((cp = ttyname (0))) { /* found entry in /dev/ */ - if (strncmp (cp, "/dev/", 5) == 0) - cp += 5; - - strncpy (utent.ut_line, cp, sizeof utent.ut_line); - } - if (getenv ("IFS")) /* don't export user IFS ... */ - addenv ("IFS= \t\n", NULL); /* ... instead, set a safe IFS */ - - setup (&pwent, 0); /* set UID, GID, HOME, etc ... */ -#endif - #ifdef USE_SYSLOG closelog (); #endif diff --git a/src/useradd.c b/src/useradd.c index 17a607e8..7d6e6390 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.32 2002/01/10 13:01:28 kloczek Exp $") +RCSID (PKG_VER "$Id: useradd.c,v 1.46.2.2 2004/01/14 06:41:06 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include "chkname.h" @@ -55,6 +55,7 @@ RCSID (PKG_VER "$Id: useradd.c,v 1.32 2002/01/10 13:01:28 kloczek Exp $") #include "lastlog_.h" #endif #include "faillog.h" +#include "nscd.h" #ifndef SKEL_DIR #define SKEL_DIR "/etc/skel" #endif @@ -108,26 +109,20 @@ static int do_grp_update = 0; /* group files need to be updated */ static char *Prog; static int - bflg = 0, /* new default root of home directory */ - cflg = 0, /* comment (GECOS) field for new account */ - dflg = 0, /* home directory for new account */ - Dflg = 0, /* set/show new user default values */ - eflg = 0, /* days since 1970-01-01 when account is locked */ - fflg = 0, /* days until account with expired password is locked */ - gflg = 0, /* primary group ID for new account */ - Gflg = 0, /* secondary group set for new account */ - kflg = 0, /* specify a directory to fill new user directory */ - mflg = 0, /* create user's home directory if it doesn't exist */ - nflg = 0, /* create a group having the same name as the user */ - oflg = 0, /* permit non-unique user ID to be specified with -u */ - sflg = 0, /* shell program for new account */ - uflg = 0; /* specify user ID for new account */ - -#ifdef AUTH_METHODS -static int Aflg = 0; /* specify authentication method for user */ -static char user_auth[1024]; -static char *auth_arg; -#endif + bflg = 0, /* new default root of home directory */ + cflg = 0, /* comment (GECOS) field for new account */ + dflg = 0, /* home directory for new account */ + Dflg = 0, /* set/show new user default values */ + eflg = 0, /* days since 1970-01-01 when account is locked */ + fflg = 0, /* days until account with expired password is locked */ + gflg = 0, /* primary group ID for new account */ + Gflg = 0, /* secondary group set for new account */ + kflg = 0, /* specify a directory to fill new user directory */ + mflg = 0, /* create user's home directory if it doesn't exist */ + nflg = 0, /* create a group having the same name as the user */ + oflg = 0, /* permit non-unique user ID to be specified with -u */ + sflg = 0, /* shell program for new account */ + uflg = 0; /* specify user ID for new account */ extern char *optarg; extern int optind; @@ -138,6 +133,7 @@ extern int pw_dbm_mode; #ifdef SHADOWPWD extern int sp_dbm_mode; #endif + extern int gr_dbm_mode; #ifdef SHADOWGRP @@ -178,7 +174,7 @@ static int sg_dbm_added; */ #define E_SUCCESS 0 /* success */ #define E_PW_UPDATE 1 /* can't update password file */ -#define E_USAGE 2 /* bad command syntax */ +#define E_USAGE 2 /* invalid command syntax */ #define E_BAD_ARG 3 /* invalid argument to option */ #define E_UID_IN_USE 4 /* uid already in use (and no -o) */ #define E_NOTFOUND 6 /* specified group doesn't exist */ @@ -186,21 +182,12 @@ static int sg_dbm_added; #define E_GRP_UPDATE 10 /* can't update group file */ #define E_HOMEDIR 12 /* can't create home directory */ -#ifdef SVR4 -#define DGROUP "defgroup=" -#define HOME "defparent=" -#define SHELL "defshell=" -#define INACT "definact=" -#define EXPIRE "defexpire=" -#define SKEL "defskel=" -#else -#define DGROUP "GROUP=" -#define HOME "HOME=" -#define SHELL "SHELL=" -#define INACT "INACTIVE=" -#define EXPIRE "EXPIRE=" -#define SKEL "SKEL=" -#endif +#define DGROUP "GROUP=" +#define HOME "HOME=" +#define SHELL "SHELL=" +#define INACT "INACTIVE=" +#define EXPIRE "EXPIRE=" +#define SKEL "SKEL=" /* local function prototypes */ static void fail_exit (int); @@ -221,10 +208,6 @@ static void new_spent (struct spwd *); static void grp_update (void); static void find_new_uid (void); -#ifdef AUTH_METHODS -static void convert_auth (char *, const char *); -static int valid_auth (const char *); -#endif static void process_flags (int argc, char **argv); static void close_files (void); static void open_files (void); @@ -354,7 +337,8 @@ static void get_defaults (void) */ if (MATCH (buf, DGROUP)) { - unsigned int val = (unsigned int) strtoul (cp, &ep, 10); + unsigned int val = + (unsigned int) strtoul (cp, &ep, 10); if (*cp != '\0' && *ep == '\0') { /* valid number */ def_group = val; @@ -378,7 +362,6 @@ static void get_defaults (void) /* * Default HOME filesystem */ - else if (MATCH (buf, HOME)) { def_home = xstrdup (cp); } @@ -386,15 +369,14 @@ static void get_defaults (void) /* * Default Login Shell command */ - else if (MATCH (buf, SHELL)) { def_shell = xstrdup (cp); } #ifdef SHADOWPWD + /* * Default Password Inactive value */ - else if (MATCH (buf, INACT)) { long val = strtol (cp, &ep, 10); @@ -407,7 +389,6 @@ static void get_defaults (void) /* * Default account expiration date */ - else if (MATCH (buf, EXPIRE)) { def_expire = xstrdup (cp); } @@ -416,7 +397,6 @@ static void get_defaults (void) /* * Default Skeleton information */ - else if (MATCH (buf, SKEL)) { if (*cp == '\0') cp = SKEL_DIR; /* XXX warning: const */ @@ -436,17 +416,6 @@ static void get_defaults (void) static void show_defaults (void) { -#ifdef SVR4 - printf (_("group=%s,%u basedir=%s skel=%s\n"), - def_gname, (unsigned int) def_group, def_home, - def_template); - - printf (_("shell=%s "), def_shell); -#ifdef SHADOWPWD - printf (_("inactive=%ld expire=%s"), def_inactive, def_expire); -#endif - printf ("\n"); -#else /* !SVR4 */ printf (_("GROUP=%u\n"), (unsigned int) def_group); printf (_("HOME=%s\n"), def_home); #ifdef SHADOWPWD @@ -455,7 +424,6 @@ static void show_defaults (void) #endif printf (_("SHELL=%s\n"), def_shell); printf (_("SKEL=%s\n"), def_template); -#endif /* !SVR4 */ } /* @@ -481,10 +449,6 @@ static int set_defaults (void) int out_shell = 0; int out_skel = 0; -#ifdef SVR4 - int out_gname = 0; -#endif - /* * Create a temporary file to copy the new output to. */ @@ -524,14 +488,7 @@ static int set_defaults (void) fprintf (ofp, DGROUP "%u\n", (unsigned int) def_group); out_group++; - } -#ifdef SVR4 - else if (!out_gname && MATCH (buf, "defgname=")) { - fprintf (ofp, "defgname=%s\n", def_gname); - out_gname++; - } -#endif - else if (!out_home && MATCH (buf, HOME)) { + } else if (!out_home && MATCH (buf, HOME)) { fprintf (ofp, HOME "%s\n", def_home); out_home++; #ifdef SHADOWPWD @@ -541,9 +498,8 @@ static int set_defaults (void) } else if (!out_expire && MATCH (buf, EXPIRE)) { fprintf (ofp, EXPIRE "%s\n", def_expire); out_expire++; - } #endif - else if (!out_shell && MATCH (buf, SHELL)) { + } else if (!out_shell && MATCH (buf, SHELL)) { fprintf (ofp, SHELL "%s\n", def_shell); out_shell++; } else if (!out_skel && MATCH (buf, SKEL)) { @@ -612,12 +568,16 @@ static int set_defaults (void) } #ifdef SHADOWPWD SYSLOG ((LOG_INFO, - "defaults: group=%u, home=%s, inactive=%ld, expire=%s", - (unsigned int) def_group, def_home, def_inactive, - def_expire)); + "useradd defaults: GROUP=%u, HOME=%s, SHELL=%s, INACTIVE=%ld, " + "EXPIRE=%s, SKEL=%s", + (unsigned int) def_group, def_home, def_shell, + def_inactive, def_expire, def_template)); #else - SYSLOG ((LOG_INFO, "defaults: group=%u, home=%s", - (unsigned int) def_group, def_home)); + SYSLOG ((LOG_INFO, + "useradd defaults: GROUP=%u, HOME=%s, SHELL=%s, " + "SKEL=%s", + (unsigned int) def_group, def_home, def_shell, + def_template)); #endif return 0; } @@ -735,25 +695,17 @@ static void usage (void) { fprintf (stderr, _ - ("usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"), - Prog); + ("Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n")); fprintf (stderr, _ - ("\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n")); - fprintf (stderr, "\t\t"); + (" [-d home] [-s shell] [-c comment] [-m [-k template]]\n")); #ifdef SHADOWPWD - fprintf (stderr, _("[-f inactive] [-e expire ] ")); + fprintf (stderr, _(" [-f inactive] [-e expire]\n")); #endif -#ifdef AUTH_METHODS - fprintf (stderr, _("[-A program] ")); -#endif - fprintf (stderr, _("[-p passwd] name\n")); - fprintf (stderr, - _(" %s\t-D [-g group] [-b base] [-s shell]\n"), - Prog); + _(" useradd -D [-g group] [-b base] [-s shell]\n")); #ifdef SHADOWPWD - fprintf (stderr, _("\t\t[-f inactive] [-e expire ]\n")); + fprintf (stderr, _(" [-f inactive] [-e expire]\n")); #endif exit (E_USAGE); @@ -777,18 +729,9 @@ static void new_pwent (struct passwd *pwent) #endif pwent->pw_passwd = (char *) user_pass; -#ifdef ATT_AGE - pwent->pw_age = (char *) ""; -#endif pwent->pw_uid = user_id; pwent->pw_gid = user_gid; pwent->pw_gecos = (char *) user_comment; -#ifdef ATT_COMMENT - pwent->pw_comment = (char *) ""; -#endif -#ifdef BSD_QUOTA - pwent->pw_quota = 0; -#endif pwent->pw_dir = (char *) user_home; pwent->pw_shell = (char *) user_shell; } @@ -1073,77 +1016,6 @@ static void find_new_uid (void) } } -#ifdef AUTH_METHODS -/* - * convert_auth - convert the argument list to a authentication list - */ - -static void convert_auth (char *auths, const char *list) -{ - char *cp, *end; - char buf[257]; - - /* - * Copy each method. DEFAULT is replaced by an encrypted string - * if one can be found in the current authentication list. - */ - - strcpy (buf, list); - auths[0] = '\0'; - for (cp = buf; cp; cp = end) { - if (auths[0]) - strcat (auths, ";"); - - if ((end = strchr (cp, ','))) - *end++ = '\0'; - - if (strcmp (cp, "DEFAULT") == 0) { - strcat (auths, user_pass); - } else { - strcat (auths, "@"); - strcat (auths, cp); - } - } -} - -/* - * valid_auth - check authentication list for validity - */ - -static int valid_auth (const char *methods) -{ - char *cp, *end; - char buf[257]; - int default_cnt = 0; - - /* - * Cursory checks, length and illegal characters - */ - - if ((int) strlen (methods) > 256) - return 0; - - if (!VALID (methods)) - return 0; - - /* - * Pick each method apart and check it. - */ - - strcpy (buf, methods); - for (cp = buf; cp; cp = end) { - if ((end = strchr (cp, ','))) - *end++ = '\0'; - - if (strcmp (cp, "DEFAULT") == 0) { - if (default_cnt++ > 0) - return 0; - } - } - return 1; -} -#endif /* AUTH_METHODS */ - /* * process_flags - perform command line argument setting * @@ -1167,18 +1039,6 @@ static void process_flags (int argc, char **argv) while ((arg = getopt (argc, argv, FLAGS)) != EOF) { #undef FLAGS switch (arg) { -#ifdef AUTH_METHODS - case 'A': - if (!valid_auth (optarg)) { - fprintf (stderr, - _("%s: invalid field `%s'\n"), - Prog, optarg); - exit (E_BAD_ARG); - } - auth_arg = optarg; - Aflg++; - break; -#endif case 'b': if (!Dflg) usage (); @@ -1534,13 +1394,6 @@ static void usr_update (void) if (!oflg) find_new_uid (); -#ifdef AUTH_METHODS - if (Aflg) { - convert_auth (user_auth, auth_arg); - user_pass = user_auth; - } -#endif - /* * Fill in the password structure with any new fields, making * copies of strings. @@ -1556,32 +1409,10 @@ static void usr_update (void) * happens so we know what we were trying to accomplish. */ -#ifdef AUTH_METHODS - SYSLOG ((LOG_INFO, - "new user: name=%s, uid=%u, gid=%u, home=%s, shell=%s, auth=%s", - user_name, (unsigned int) user_id, (unsigned int) user_gid, - user_home, user_shell, Aflg ? auth_arg : "DEFAULT")); -#else SYSLOG ((LOG_INFO, "new user: name=%s, uid=%u, gid=%u, home=%s, shell=%s", - user_name, (unsigned int) user_id, (unsigned int) user_gid, - user_home, user_shell)); -#endif - -#ifdef AUTH_METHODS - /* - * Attempt to add the new user to any authentication programs - * which have been requested. Since this is more likely to fail - * than the update of the password file, we do this first. - */ - - if (Aflg && pw_auth (user_auth, pwent.pw_name, PW_ADD, (char *) 0)) { - fprintf (stderr, - _("%s: error adding authentication method\n"), - Prog); - fail_exit (E_PW_UPDATE); /* XXX */ - } -#endif /* AUTH_METHODS */ + user_name, (unsigned int) user_id, + (unsigned int) user_gid, user_home, user_shell)); /* * Initialize faillog and lastlog entries for this UID in case @@ -1684,11 +1515,7 @@ static void create_home (void) fail_exit (E_HOMEDIR); } chown (user_home, user_id, user_gid); -#if 1 - chmod (user_home, 0777 & ~getdef_num ("UMASK", 077)); -#else - chmod (user_home, 0755); -#endif + chmod (user_home, 0777 & ~getdef_num ("UMASK", 022)); home_added++; } } @@ -1717,6 +1544,7 @@ int main (int argc, char **argv) sys_ngroups = sysconf (_SC_NGROUPS_MAX); user_groups = malloc ((1 + sys_ngroups) * sizeof (char *)); + user_groups[0] = (char *) 0; Prog = Basename (argv[0]); setlocale (LC_ALL, ""); @@ -1825,8 +1653,13 @@ int main (int argc, char **argv) } /* - * Do the hard stuff - open the files, create the user entries, - * create the home directory, then close and update the files. + * Do the hard stuff: + * - open the files, + * - create the user entries, + * - create the home directory, + * - create user mail spoll, + * - flush nscd caches for passwd and group services, + * - then close and update the files. */ open_files (); @@ -1855,6 +1688,9 @@ int main (int argc, char **argv) Prog); } + nscd_flush_cache ("passwd"); + nscd_flush_cache ("group"); + close_files (); #ifdef USE_PAM @@ -1875,4 +1711,5 @@ int main (int argc, char **argv) #endif /* USE_PAM */ exit (E_SUCCESS); - /*NOTREACHED*/} + /* NOT REACHED */ +} diff --git a/src/userdel.c b/src/userdel.c index 78691174..56c2b8a0 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.21 2002/01/05 15:41:44 kloczek Exp $") +RCSID (PKG_VER "$Id: userdel.c,v 1.29 2003/12/17 09:43:30 kloczek Exp $") #include #include #include @@ -38,7 +38,6 @@ RCSID (PKG_VER "$Id: userdel.c,v 1.21 2002/01/05 15:41:44 kloczek Exp $") #include #include #include -#include #ifdef USE_PAM #include #include @@ -48,12 +47,13 @@ RCSID (PKG_VER "$Id: userdel.c,v 1.21 2002/01/05 15:41:44 kloczek Exp $") #include "defines.h" #include "getdef.h" #include "pwauth.h" +#include "nscd.h" /* * exit status values */ #define E_SUCCESS 0 #define E_PW_UPDATE 1 /* can't update password file */ -#define E_USAGE 2 /* bad command syntax */ +#define E_USAGE 2 /* invalid command syntax */ #define E_NOTFOUND 6 /* specified user doesn't exist */ #define E_USER_BUSY 8 /* user currently logged in */ #define E_GRP_UPDATE 10 /* can't update group file */ @@ -85,11 +85,6 @@ extern int sg_dbm_mode; #include "shadowio.h" #endif -#ifdef HAVE_TCFS -#include -#include "tcfsio.h" -#endif - #ifdef SHADOWGRP #include "sgroupio.h" #endif @@ -126,7 +121,7 @@ static void remove_mailbox (void); static void usage (void) { - fprintf (stderr, _("usage: %s [-r] name\n"), Prog); + fprintf (stderr, _("Usage: %s [-r] name\n"), Prog); exit (E_USAGE); } @@ -302,11 +297,6 @@ static void close_files (void) fprintf (stderr, _("%s: cannot rewrite shadow password file\n"), Prog); -#endif -#ifdef HAVE_TCFS - if (!tcfs_close ()) - fprintf (stderr, _("%s: cannot rewrite TCFS key file\n"), - Prog); #endif if (!gr_close ()) fprintf (stderr, _("%s: cannot rewrite group file\n"), @@ -325,9 +315,6 @@ static void close_files (void) #ifdef SHADOWPWD if (is_shadow_pwd) (void) spw_unlock (); -#endif -#ifdef HAVE_TCFS - (void) tcfs_unlock (); #endif (void) pw_unlock (); } @@ -348,10 +335,6 @@ static void fail_exit (int code) if (is_shadow_grp) sgr_unlock (); #endif -#ifdef HAVE_TCFS - (void) tcfs_unlock (); -#endif - exit (code); } @@ -386,18 +369,6 @@ static void open_files (void) Prog); fail_exit (E_PW_UPDATE); } -#endif -#ifdef HAVE_TCFS - if (!tcfs_lock ()) { - fprintf (stderr, _("%s: cannot lock TCFS key file\n"), - Prog); - fail_exit (E_PW_UPDATE); - } - if (!tcfs_open (O_RDWR)) { - fprintf (stderr, _("%s: cannot open TCFS key file\n"), - Prog); - fail_exit (E_PW_UPDATE); - } #endif if (!gr_lock ()) { fprintf (stderr, _("%s: unable to lock group file\n"), @@ -432,111 +403,46 @@ static void open_files (void) static void update_user (void) { -#if defined(AUTH_METHODS) || defined(NDBM) - struct passwd *pwd; -#endif -#ifdef AUTH_METHODS + if (!pw_remove (user_name)) + fprintf (stderr, + _("%s: error deleting password entry\n"), Prog); #ifdef SHADOWPWD - struct spwd *spwd; - - if (is_shadow_pwd && (spwd = spw_locate (user_name)) && - spwd->sp_pwdp[0] == '@') { - if (pw_auth - (spwd->sp_pwdp + 1, user_name, PW_DELETE, - (char *) 0)) { - SYSLOG ((LOG_ERR, - "failed deleting auth `%s' for user `%s'\n", - spwd->sp_pwdp + 1, user_name)); - fprintf (stderr, - _("%s: error deleting authentication\n"), - Prog); - } else { - SYSLOG ((LOG_INFO, - "delete auth `%s' for user `%s'\n", - spwd->sp_pwdp + 1, user_name)); - } - } -#endif /* SHADOWPWD */ - if ((pwd = pw_locate (user_name)) && pwd->pw_passwd[0] == '@') { - if (pw_auth - (pwd->pw_passwd + 1, user_name, PW_DELETE, - (char *) 0)) { - SYSLOG ((LOG_ERR, - "failed deleting auth `%s' for user `%s'\n", - pwd->pw_passwd + 1, user_name)); - fprintf (stderr, - _("%s: error deleting authentication\n"), - Prog); - } else { - SYSLOG ((LOG_INFO, - "delete auth `%s' for user `%s'\n", - pwd->pw_passwd + 1, user_name);} - } -#endif /* AUTH_METHODS */ - if (!pw_remove (user_name)) - fprintf (stderr, - _ - ("%s: error deleting password entry\n"), - Prog); -#ifdef SHADOWPWD - if (is_shadow_pwd && !spw_remove (user_name)) - fprintf (stderr, - _ - ("%s: error deleting shadow password entry\n"), - Prog); + if (is_shadow_pwd && !spw_remove (user_name)) + fprintf (stderr, + _("%s: error deleting shadow password entry\n"), + Prog); #endif -#ifdef HAVE_TCFS - if (tcfs_locate (user_name)) { - if (!tcfs_remove (user_name)) { - SYSLOG ((LOG_ERR, - "failed deleting TCFS entry for user `%s'\n", - user_name)); - fprintf (stderr, - _ - ("%s: error deleting TCFS entry\n"), - Prog);} - else { - SYSLOG ((LOG_INFO, - "delete TCFS entry for user `%s'\n", - user_name));} - } -#endif /* HAVE_TCFS */ #ifdef NDBM - if (pw_dbm_present ()) { - if ((pwd = getpwnam (user_name)) - && !pw_dbm_remove (pwd)) + if (pw_dbm_present ()) { + if ((pwd = getpwnam (user_name)) + && !pw_dbm_remove (pwd)) fprintf (stderr, _ ("%s: error deleting password dbm entry\n"), Prog); - /* - * If the user's UID is a - * duplicate the duplicated - * entry needs to be updated - * so that a UID match can - * be found in the DBM - * files. - */ - for (pw_rewind (), pwd = pw_next (); pwd; - pwd = pw_next ()) { - if (pwd->pw_uid == user_id) { - pw_dbm_update (pwd); break;} - } - } - } + /* + * If the user's UID is a duplicate the duplicated + * entry needs to be updated so that a UID match can + * be found in the DBM files. + */ + for (pw_rewind (), pwd = pw_next (); pwd; pwd = pw_next ()) { + if (pwd->pw_uid == user_id) + pw_dbm_update (pwd); + break; + } + } +} +} #ifdef SHADOWPWD - if (is_shadow_pwd && sp_dbm_present () - && !sp_dbm_remove (user_name)) - fprintf (stderr, - _ - ("%s: error deleting shadow passwd dbm entry\n"), - Prog); +if (is_shadow_pwd && sp_dbm_present () + && !sp_dbm_remove (user_name)) + fprintf (stderr, _("%s: error deleting shadow passwd dbm entry\n"), Prog); #endif - endpwent (); +endpwent (); #endif /* NDBM */ - SYSLOG ((LOG_INFO, "delete user `%s'\n", - user_name));} +SYSLOG ((LOG_INFO, "delete user `%s'\n", user_name)); +} /* * user_busy - see if user is logged in. @@ -546,29 +452,40 @@ static void update_user (void) * as well (at least when changing username or uid). --marekm */ - static void user_busy (const char *name, uid_t uid) { - struct utmp *utent; +static void user_busy (const char *name, uid_t uid) +{ - /* - * We see if the user is logged in by looking for the user name - * in the utmp file. - */ - setutent (); while ((utent = getutent ())) { +/* + * We see if the user is logged in by looking for the user name + * in the utmp file. + */ +#if HAVE_UTMPX_H + struct utmpx *utent; + + setutxent (); + while ((utent = getutxent ())) { +#else + struct utmp *utent; + + setutent (); + while ((utent = getutent ())) { +#endif #ifdef USER_PROCESS - if (utent->ut_type != USER_PROCESS) + if (utent->ut_type != USER_PROCESS) continue; #else - if (utent->ut_user[0] == '\0') + if (utent->ut_user[0] == '\0') continue; #endif - if (strncmp - (utent->ut_user, name, sizeof utent->ut_user)) + if (strncmp (utent->ut_user, name, sizeof utent->ut_user)) continue; - fprintf (stderr, - _ - ("%s: user %s is currently logged in\n"), - Prog, name); exit (E_USER_BUSY);} - } + fprintf (stderr, + _ + ("%s: user %s is currently logged in\n"), + Prog, name); + exit (E_USER_BUSY); + } +} /* * user_cancel - cancel cron and at jobs @@ -608,249 +525,298 @@ exit 0 ========== */ - static void user_cancel (const char *user) { - char *cmd; - int pid, wpid; - int status; - if (!(cmd = getdef_str ("USERDEL_CMD"))) - return; pid = fork (); if (pid == 0) { - execl (cmd, cmd, user, (char *) 0); - if (errno == ENOENT) { - perror (cmd); _exit (127);} - else { - perror (cmd); _exit (126);} - } - else - if (pid == -1) { - perror ("fork"); return;} +static void user_cancel (const char *user) +{ + char *cmd; + int pid, wpid; + int status; - do { - wpid = wait (&status);} while (wpid != pid - && wpid != -1);} + if (!(cmd = getdef_str ("USERDEL_CMD"))) + return; + pid = fork (); + if (pid == 0) { + execl (cmd, cmd, user, (char *) 0); + if (errno == ENOENT) { + perror (cmd); + _exit (127); + } else { + perror (cmd); + _exit (126); + } + } else if (pid == -1) { + perror ("fork"); + return; + } + do { + wpid = wait (&status); + } while (wpid != pid && wpid != -1); +} #ifdef EXTRA_CHECK_HOME_DIR - static int - path_prefix (const char *s1, const char *s2) { - return (strncmp (s2, s1, strlen (s1)) == 0);} +static int path_prefix (const char *s1, const char *s2) +{ + return (strncmp (s2, s1, strlen (s1)) == 0); +} #endif - static int is_owner (uid_t uid, const char *path) { - struct stat st; if (stat (path, &st)) - return -1; return (st.st_uid == uid);} +static int is_owner (uid_t uid, const char *path) +{ + struct stat st; + + if (stat (path, &st)) + return -1; + return (st.st_uid == uid); +} #ifndef NO_REMOVE_MAILBOX - static void remove_mailbox (void) { - const char *maildir; - char mailfile[1024]; - int i; maildir = getdef_str ("MAIL_DIR"); +static void remove_mailbox (void) +{ + const char *maildir; + char mailfile[1024]; + int i; + + maildir = getdef_str ("MAIL_DIR"); #ifdef MAIL_SPOOL_DIR - if (!maildir && !getdef_str ("MAIL_FILE")) - maildir = MAIL_SPOOL_DIR; + if (!maildir && !getdef_str ("MAIL_FILE")) + maildir = MAIL_SPOOL_DIR; #endif - if (!maildir) - return; - snprintf (mailfile, sizeof mailfile, - "%s/%s", maildir, user_name); if (fflg) { - unlink (mailfile); /* always remove, ignore errors */ - return;} - i = is_owner (user_id, mailfile); if (i == 0) { - fprintf (stderr, - _ - ("%s: warning: %s not owned by %s, not removing\n"), - Prog, mailfile, user_name); return;} - else - if (i == -1) - return; /* mailbox doesn't exist */ - if (unlink (mailfile)) { - fprintf (stderr, - _("%s: warning: can't remove "), - Prog); perror (mailfile);} - } + if (!maildir) + return; + snprintf (mailfile, sizeof mailfile, "%s/%s", maildir, user_name); + if (fflg) { + unlink (mailfile); /* always remove, ignore errors */ + return; + } + i = is_owner (user_id, mailfile); + if (i == 0) { + fprintf (stderr, + _ + ("%s: warning: %s not owned by %s, not removing\n"), + Prog, mailfile, user_name); + return; + } else if (i == -1) + return; /* mailbox doesn't exist */ + if (unlink (mailfile)) { + fprintf (stderr, _("%s: warning: can't remove "), Prog); + perror (mailfile); + } +} #endif #ifdef USE_PAM - static struct pam_conv conv = { - misc_conv, NULL}; +static struct pam_conv conv = { + misc_conv, NULL +}; #endif /* USE_PAM */ /* * main - userdel command */ - int main (int argc, char **argv) { - struct passwd *pwd; int arg; int errors = 0; +int main (int argc, char **argv) +{ + struct passwd *pwd; + int arg; + int errors = 0; #ifdef USE_PAM - pam_handle_t * pamh = NULL; - struct passwd *pampw; int retval; + pam_handle_t *pamh = NULL; + struct passwd *pampw; + int retval; #endif - /* - * Get my name so that I can use it to report errors. - */ - Prog = Basename (argv[0]); - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); + /* + * Get my name so that I can use it to report errors. + */ + Prog = Basename (argv[0]); + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); #ifdef USE_PAM - retval = PAM_SUCCESS; - pampw = getpwuid (getuid ()); if (pampw == NULL) { - retval = PAM_USER_UNKNOWN;} + retval = PAM_SUCCESS; + pampw = getpwuid (getuid ()); + if (pampw == NULL) { + retval = PAM_USER_UNKNOWN; + } - if (retval == PAM_SUCCESS) { - retval = - pam_start ("shadow", pampw->pw_name, &conv, - &pamh);} + if (retval == PAM_SUCCESS) + retval = pam_start ("shadow", pampw->pw_name, &conv, + &pamh); - if (retval == PAM_SUCCESS) { - retval = pam_authenticate (pamh, 0); - if (retval != PAM_SUCCESS) { - pam_end (pamh, retval);} - } + if (retval == PAM_SUCCESS) { + retval = pam_authenticate (pamh, 0); + if (retval != PAM_SUCCESS) + pam_end (pamh, retval); + } - if (retval == PAM_SUCCESS) { - retval = pam_acct_mgmt (pamh, 0); - if (retval != PAM_SUCCESS) { - pam_end (pamh, retval);} - } + if (retval == PAM_SUCCESS) { + retval = pam_acct_mgmt (pamh, 0); + if (retval != PAM_SUCCESS) + pam_end (pamh, retval); + } - if (retval != PAM_SUCCESS) { - fprintf (stderr, - _ - ("%s: PAM authentication failed\n"), - Prog); exit (1);} + if (retval != PAM_SUCCESS) { + fprintf (stderr, + _("%s: PAM authentication failed\n"), Prog); + exit (1); + } #endif /* USE_PAM */ - OPENLOG (Prog); + OPENLOG (Prog); #ifdef SHADOWPWD - is_shadow_pwd = spw_file_present (); + is_shadow_pwd = spw_file_present (); #endif #ifdef SHADOWGRP - is_shadow_grp = sgr_file_present (); + is_shadow_grp = sgr_file_present (); #endif - /* - * The open routines for the DBM files don't use read-write - * as the mode, so we have to clue them in. - */ + /* + * The open routines for the DBM files don't use read-write as the + * mode, so we have to clue them in. + */ #ifdef NDBM - pw_dbm_mode = O_RDWR; + pw_dbm_mode = O_RDWR; #ifdef SHADOWPWD - sp_dbm_mode = O_RDWR; + sp_dbm_mode = O_RDWR; #endif - gr_dbm_mode = O_RDWR; + gr_dbm_mode = O_RDWR; #ifdef SHADOWGRP - sg_dbm_mode = O_RDWR; + sg_dbm_mode = O_RDWR; #endif #endif - while ((arg = getopt (argc, argv, "fr")) != EOF) { - switch (arg) { -case 'f': /* force remove even if not owned by user */ -fflg++; break; case 'r': /* remove home dir and mailbox */ -rflg++; break; default: - usage ();} - } - - if (optind + 1 != argc) + while ((arg = getopt (argc, argv, "fr")) != EOF) { + switch (arg) { + case 'f': /* force remove even if not owned by user */ + fflg++; + break; + case 'r': /* remove home dir and mailbox */ + rflg++; + break; + default: usage (); - /* - * Start with a quick check to see if the user exists. - */ - user_name = argv[argc - 1]; - if (!(pwd = getpwnam (user_name))) { - fprintf (stderr, - _("%s: user %s does not exist\n"), - Prog, user_name); exit (E_NOTFOUND);} + } + } + + if (optind + 1 != argc) + usage (); + /* + * Start with a quick check to see if the user exists. + */ + user_name = argv[argc - 1]; + if (!(pwd = getpwnam (user_name))) { + fprintf (stderr, _("%s: user %s does not exist\n"), + Prog, user_name); + exit (E_NOTFOUND); + } #ifdef USE_NIS - /* - * Now make sure it isn't an NIS user. - */ + /* + * Now make sure it isn't an NIS user. + */ - if (__ispwNIS ()) { - char *nis_domain; - char *nis_master; - fprintf (stderr, - _("%s: user %s is a NIS user\n"), - Prog, user_name); - if (!yp_get_default_domain (&nis_domain) - && !yp_master (nis_domain, - "passwd.byname", &nis_master)) { + if (__ispwNIS ()) { + char *nis_domain; + char *nis_master; + + fprintf (stderr, + _("%s: user %s is a NIS user\n"), + Prog, user_name); + if (!yp_get_default_domain (&nis_domain) + && !yp_master (nis_domain, + "passwd.byname", &nis_master)) { fprintf (stderr, _("%s: %s is the NIS master\n"), - Prog, nis_master);} - exit (E_NOTFOUND);} + Prog, nis_master); + } + exit (E_NOTFOUND); + } #endif - user_id = pwd->pw_uid; - user_home = xstrdup (pwd->pw_dir); - /* - * Check to make certain the user isn't logged in. - */ - user_busy (user_name, user_id); - /* - * Do the hard stuff - open the files, create the user entries, - * create the home directory, then close and update the files. - */ - open_files (); update_user (); update_groups (); + user_id = pwd->pw_uid; + user_home = xstrdup (pwd->pw_dir); + /* + * Check to make certain the user isn't logged in. + */ + user_busy (user_name, user_id); + /* + * Do the hard stuff - open the files, create the user entries, + * create the home directory, then close and update the files. + */ + open_files (); + update_user (); + update_groups (); + + nscd_flush_cache ("passwd"); + nscd_flush_cache ("group"); +#ifdef SHADOWPWD + nscd_flush_cache ("shadow"); +#endif + #ifndef NO_REMOVE_MAILBOX - if (rflg) - remove_mailbox (); + if (rflg) + remove_mailbox (); #endif - if (rflg && !fflg - && !is_owner (user_id, user_home)) { - fprintf (stderr, - _ - ("%s: %s not owned by %s, not removing\n"), - Prog, user_home, user_name); - rflg = 0; errors++;} + if (rflg && !fflg && !is_owner (user_id, user_home)) { + fprintf (stderr, + _("%s: %s not owned by %s, not removing\n"), + Prog, user_home, user_name); + rflg = 0; + errors++; + } /* This may be slow, the above should be good enough. */ #ifdef EXTRA_CHECK_HOME_DIR - if (rflg && !fflg) { - /* - * For safety, refuse to remove the home directory - * if it would result in removing some other user's - * home directory. Still not perfect so be careful, - * but should prevent accidents if someone has /home - * or / as home directory... --marekm - */ - setpwent (); while ((pwd = getpwent ())) { + if (rflg && !fflg) { + /* + * For safety, refuse to remove the home directory if it + * would result in removing some other user's home + * directory. Still not perfect so be careful, but should + * prevent accidents if someone has /home or / as home + * directory... --marekm + */ + setpwent (); + while ((pwd = getpwent ())) { if (strcmp (pwd->pw_name, user_name) == 0) - continue; if (path_prefix (user_home, pwd->pw_dir)) { - fprintf (stderr, - _ - ("%s: not removing directory %s (would remove home of user %s)\n"), - Prog, user_home, pwd->pw_name); - rflg = 0; errors++; break;} - } + continue; + if (path_prefix (user_home, pwd->pw_dir)) { + fprintf (stderr, + _ + ("%s: not removing directory %s (would remove home of user %s)\n"), + Prog, user_home, pwd->pw_name); + rflg = 0; + errors++; + break; } + } + } #endif - if (rflg) { - if (remove_tree (user_home) - || rmdir (user_home)) { + if (rflg) { + if (remove_tree (user_home) + || rmdir (user_home)) { fprintf (stderr, - _ - ("%s: error removing directory %s\n"), - Prog, user_home); errors++;} - } + _("%s: error removing directory %s\n"), + Prog, user_home); + errors++; + } + } - /* - * Cancel any crontabs or at jobs. Have to do this before we - * remove the entry from /etc/passwd. - */ + /* + * Cancel any crontabs or at jobs. Have to do this before we remove + * the entry from /etc/passwd. + */ - user_cancel (user_name); close_files (); + user_cancel (user_name); + close_files (); #ifdef USE_PAM - if (retval == PAM_SUCCESS) { - retval = pam_chauthtok (pamh, 0); - if (retval != PAM_SUCCESS) { - pam_end (pamh, retval);} - } + if (retval == PAM_SUCCESS) { + retval = pam_chauthtok (pamh, 0); + if (retval != PAM_SUCCESS) + pam_end (pamh, retval); + } - if (retval != PAM_SUCCESS) { - fprintf (stderr, - _("%s: PAM chauthtok failed\n"), - Prog); exit (1);} + if (retval != PAM_SUCCESS) + fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog); + exit (1); - if (retval == PAM_SUCCESS) - pam_end (pamh, PAM_SUCCESS); + if (retval == PAM_SUCCESS) + pam_end (pamh, PAM_SUCCESS); #endif /* USE_PAM */ - exit (errors ? E_HOMEDIR : E_SUCCESS); - /*NOTREACHED*/} + exit (errors ? E_HOMEDIR : E_SUCCESS); + /* NOT REACHED */ +} diff --git a/src/usermod.c b/src/usermod.c index f8fa363d..9b95cc31 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.25 2002/01/05 15:41:44 kloczek Exp $") +RCSID (PKG_VER "$Id: usermod.c,v 1.31 2003/06/30 13:17:51 kloczek Exp $") #include #include #include @@ -55,6 +55,7 @@ RCSID (PKG_VER "$Id: usermod.c,v 1.25 2002/01/05 15:41:44 kloczek Exp $") #include "lastlog_.h" #endif #include "pwauth.h" +#include "nscd.h" #include "getdef.h" /* * exit status values @@ -66,12 +67,12 @@ RCSID (PKG_VER "$Id: usermod.c,v 1.25 2002/01/05 15:41:44 kloczek Exp $") #define E_USAGE 2 /* invalid command syntax */ #define E_BAD_ARG 3 /* invalid argument to option */ #define E_UID_IN_USE 4 /* uid already in use (and no -o) */ -/* #define E_BAD_PWFILE 5 *//* passwd file contains errors */ + /* #define E_BAD_PWFILE 5 *//* passwd file contains errors */ #define E_NOTFOUND 6 /* specified user/group doesn't exist */ #define E_USER_BUSY 8 /* user to modify is logged in */ #define E_NAME_IN_USE 9 /* username already in use */ #define E_GRP_UPDATE 10 /* can't update group file */ -/* #define E_NOSPACE 11 *//* insufficient space to move home dir */ + /* #define E_NOSPACE 11 *//* insufficient space to move home dir */ #define E_HOMEDIR 12 /* unable to complete home dir move */ #define VALID(s) (strcspn (s, ":\n") == strlen (s)) static char *user_name; @@ -95,14 +96,6 @@ static char **user_groups; /* NULL-terminated list */ static char *Prog; -#ifdef AUTH_METHODS -static char *auth_arg; -static char user_auth[BUFSIZ]; -static int Aflg = 0; /* specify user defined authentication method */ -#else -#define Aflg 0 -#endif - static int uflg = 0, /* specify new user ID */ oflg = 0, /* permit non-unique user ID to be specified with -u */ @@ -169,15 +162,6 @@ static int update_gshadow (void); #endif static int grp_update (void); -#ifdef AUTH_METHODS -static char *get_password (const char *); -static void split_auths (char *, char **); -static void update_auths (const char *, const char *, char *); -static void add_auths (const char *, const char *, char *); -static void delete_auths (const char *, const char *, char *); -static void convert_auth (char *, const char *, const char *); -static int valid_auth (const char *); -#endif static long get_number (const char *); static uid_t get_id (const char *); static void process_flags (int, char **); @@ -319,17 +303,14 @@ static void usage (void) { fprintf (stderr, _ - ("usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"), + ("Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"), Prog); fprintf (stderr, _ ("\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n")); fprintf (stderr, "\t\t"); #ifdef SHADOWPWD - fprintf (stderr, _("[-f inactive] [-e expire ] ")); -#endif -#ifdef AUTH_METHODS - fprintf (stderr, _("[-A {DEFAULT|program},... ] ")); + fprintf (stderr, _("[-f inactive] [-e expire] ")); #endif fprintf (stderr, _("[-p passwd] [-L|-U] name\n")); exit (E_USAGE); @@ -748,227 +729,6 @@ static int grp_update (void) return ret; } -#ifdef AUTH_METHODS -/* - * get_password - locate encrypted password in authentication list - */ - -static char *get_password (const char *list) -{ - char *cp, *end; - static char buf[257]; - - strcpy (buf, list); - for (cp = buf; cp; cp = end) { - if ((end = strchr (cp, ';'))) - *end++ = 0; - - if (cp[0] == '@') - continue; - - return cp; - } - return (char *) 0; -} - -/* - * split_auths - break up comma list into (char *) array - */ - -static void split_auths (char *list, char **array) -{ - char *cp, *end; - int i = 0; - - for (cp = list; cp; cp = end) { - if ((end = strchr (cp, ';'))) - *end++ = '\0'; - - array[i++] = cp; - } - array[i] = 0; -} - -/* - * update_auths - find list of methods to update - */ - -static void update_auths (const char *old, const char *new, char *update) -{ - char oldbuf[257], newbuf[257]; - char *oldv[32], *newv[32], *updatev[32]; - int i, j, k; - - strcpy (oldbuf, old); - split_auths (oldbuf, oldv); - - strcpy (newbuf, new); - split_auths (newbuf, newv); - - for (i = j = k = 0; oldv[i]; i++) { - for (j = 0; newv[j]; j++) - if (strcmp (oldv[i], newv[j]) != 0) - break; - - if (newv[j] != (char *) 0) - updatev[k++] = oldv[i]; - } - updatev[k] = 0; - - update[0] = '\0'; - for (i = 0; updatev[i]; i++) { - if (i) - strcat (update, ";"); - - strcat (update, updatev[i]); - } -} - -/* - * add_auths - find list of methods to add - */ - -static void add_auths (const char *old, const char *new, char *add) -{ - char oldbuf[257], newbuf[257]; - char *oldv[32], *newv[32], *addv[32]; - int i, j, k; - - strcpy (oldbuf, old); - split_auths (oldbuf, oldv); - - strcpy (newbuf, new); - split_auths (newbuf, newv); - - for (i = j = k = 0; newv[i]; i++) { - for (j = 0; oldv[j]; j++) - if (strcmp (oldv[i], newv[j]) == 0) - break; - - if (oldv[j] == (char *) 0) - addv[k++] = newv[i]; - } - addv[k] = 0; - - add[0] = '\0'; - for (i = 0; addv[i]; i++) { - if (i) - strcat (add, ";"); - - strcat (add, addv[i]); - } -} - -/* - * delete_auths - find list of methods to delete - */ - -static void delete_auths (const char *old, const char *new, char *remove) -{ - char oldbuf[257], newbuf[257]; - char *oldv[32], *newv[32], *removev[32]; - int i, j, k; - - strcpy (oldbuf, old); - split_auths (oldbuf, oldv); - - strcpy (newbuf, new); - split_auths (newbuf, newv); - - for (i = j = k = 0; oldv[i]; i++) { - for (j = 0; newv[j]; j++) - if (strcmp (oldv[i], newv[j]) == 0) - break; - - if (newv[j] == (char *) 0) - removev[k++] = oldv[i]; - } - removev[k] = 0; - - remove[0] = '\0'; - for (i = 0; removev[i]; i++) { - if (i) - strcat (remove, ";"); - - strcat (remove, removev[i]); - } -} - -/* - * convert_auth - convert the argument list to a authentication list - */ - -static void -convert_auth (char *auths, const char *oldauths, const char *list) -{ - char *cp, *end; - char *old; - char buf[257]; - - /* - * Copy each method. DEFAULT is replaced by an encrypted string if - * one can be found in the current authentication list. - */ - - strcpy (buf, list); - auths[0] = '\0'; - for (cp = buf; cp; cp = end) { - if (auths[0]) - strcat (auths, ";"); - - if ((end = strchr (cp, ','))) - *end++ = '\0'; - - if (strcmp (cp, "DEFAULT") == 0) { - if ((old = get_password (oldauths))) - strcat (auths, old); - else - strcat (auths, "!"); - } else { - strcat (auths, "@"); - strcat (auths, cp); - } - } -} - -/* - * valid_auth - check authentication list for validity - */ - -static int valid_auth (const char *methods) -{ - char *cp, *end; - char buf[257]; - int default_cnt = 0; - - /* - * Cursory checks, length and illegal characters - */ - - if ((int) strlen (methods) > 256) - return 0; - - if (!VALID (methods)) - return 0; - - /* - * Pick each method apart and check it. - */ - - strcpy (buf, methods); - for (cp = buf; cp; cp = end) { - if ((end = strchr (cp, ','))) - *end++ = '\0'; - - if (strcmp (cp, "DEFAULT") == 0) { - if (default_cnt++ > 0) - return 0; - } - } - return 1; -} -#endif - static long get_number (const char *cp) { long val; @@ -1068,18 +828,6 @@ static void process_flags (int argc, char **argv) while ((arg = getopt (argc, argv, FLAGS)) != EOF) { #undef FLAGS switch (arg) { -#ifdef AUTH_METHODS - case 'A': - if (!valid_auth (optarg)) { - fprintf (stderr, - _("%s: invalid field `%s'\n"), - Prog, optarg); - exit (E_BAD_ARG); - } - auth_arg = optarg; - Aflg++; - break; -#endif case 'c': if (!VALID (optarg)) { fprintf (stderr, @@ -1334,10 +1082,6 @@ static void usr_update (void) struct spwd spent; const struct spwd *spwd = NULL; #endif -#ifdef AUTH_METHODS - char old_auth[BUFSIZ]; - char auth_buf[BUFSIZ]; -#endif /* * Locate the entry in /etc/passwd, which MUST exist. @@ -1365,71 +1109,7 @@ static void usr_update (void) } #endif -#ifdef AUTH_METHODS - -#ifdef SHADOWPWD - strcpy (old_auth, spwd ? spent.sp_pwdp : pwent.pw_passwd); -#else - strcpy (old_auth, pwent.pw_passwd); -#endif - - if (Aflg) - convert_auth (user_auth, old_auth, auth_arg); - - /* - * XXX - this code needs some checking, changing the user name with - * "usermod -l new old" clears the password for this user :-(. For - * now, just don't define AUTH_METHODS and all will be well. Most - * programs don't support "administrator defined authentication - * methods" and PAM (when done) will be better anyway :-). --marekm - */ - if (lflg || (Aflg && strcmp (old_auth, user_auth) != 0)) { - delete_auths (old_auth, user_auth, auth_buf); - if (auth_buf[0] && pw_auth (auth_buf, user_name, - PW_DELETE, (char *) 0)) { - fprintf (stderr, - _ - ("%s: error deleting authentication method\n"), - Prog); - SYSLOG ((LOG_ERR, "error deleting auth for `%s'", - user_name)); - fail_exit (E_PW_UPDATE); - } - add_auths (old_auth, user_auth, auth_buf); - if (auth_buf[0] == '@' && pw_auth (auth_buf, - lflg ? user_newname : - user_name, PW_ADD, - (char *) 0)) { - fprintf (stderr, - _ - ("%s: error adding authentication method\n"), - Prog); - SYSLOG ((LOG_ERR, "error adding auth for `%s'", - lflg ? user_newname : user_name)); - fail_exit (E_PW_UPDATE); - } - update_auths (old_auth, user_auth, auth_buf); - if (lflg && auth_buf[0] == '@' && pw_auth (auth_buf, - user_newname, - PW_CHANGE, - user_name)) { - fprintf (stderr, - _ - ("%s: error changing authentication method\n"), - Prog); - SYSLOG ((LOG_ERR, "error changing auth for `%s'", - lflg ? user_newname : user_name)); - fail_exit (E_PW_UPDATE); - } -#ifdef SHADOWPWD - if (spwd) - spent.sp_pwdp = user_auth; - else -#endif - pwent.pw_passwd = user_auth; - } -#endif /* AUTH_METHODS */ - if (lflg || uflg || gflg || cflg || dflg || sflg || Aflg || pflg + if (lflg || uflg || gflg || cflg || dflg || sflg || pflg || Lflg || Uflg) { if (!pw_update (&pwent)) { fprintf (stderr, @@ -1464,7 +1144,7 @@ static void usr_update (void) #endif } #ifdef SHADOWPWD - if (spwd && (lflg || eflg || fflg || Aflg || pflg || Lflg || Uflg)) { + if (spwd && (lflg || eflg || fflg || pflg || Lflg || Uflg)) { if (!spw_update (&spent)) { fprintf (stderr, _ @@ -1692,6 +1372,7 @@ int main (int argc, char **argv) sys_ngroups = sysconf (_SC_NGROUPS_MAX); user_groups = malloc ((1 + sys_ngroups) * sizeof (char *)); + user_groups[0] = (char *) 0; /* * Get my name so that I can use it to report errors. */ @@ -1769,6 +1450,8 @@ int main (int argc, char **argv) open_files (); usr_update (); + nscd_flush_cache ("passwd"); + nscd_flush_cache ("group"); close_files (); @@ -1817,4 +1500,5 @@ int main (int argc, char **argv) #endif /* USE_PAM */ exit (E_SUCCESS); - /*NOTREACHED*/} + /* NOT REACHED */ +} diff --git a/src/vipw.c b/src/vipw.c index cf2f8f19..fdd06d71 100644 --- a/src/vipw.c +++ b/src/vipw.c @@ -23,7 +23,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: vipw.c,v 1.3 2002/01/05 15:41:44 kloczek Exp $") +RCSID (PKG_VER "$Id: vipw.c,v 1.6 2003/06/19 18:11:01 kloczek Exp $") #include "defines.h" #include #include @@ -38,6 +38,7 @@ RCSID (PKG_VER "$Id: vipw.c,v 1.3 2002/01/05 15:41:44 kloczek Exp $") #include "shadowio.h" #include "groupio.h" #include "sgroupio.h" +#include "nscd.h" static const char *progname, *filename, *fileeditname; static int filelocked = 0, createedit = 0; static int (*unlock) (void); @@ -150,12 +151,6 @@ vipwedit (const char *file, int (*file_lock) (void), if ((pid = fork ()) == -1) vipwexit ("fork", 1, 1); else if (!pid) { -#if 0 - execlp (editor, editor, fileedit, (char *) 0); - fprintf (stderr, "%s: %s: %s\n", progname, editor, - strerror (errno)); - exit (1); -#else /* use the system() call to invoke the editor so that it accepts command line args in the EDITOR and VISUAL environment vars */ char *buf; @@ -171,7 +166,6 @@ vipwedit (const char *file, int (*file_lock) (void), exit (1); } else exit (0); -#endif } for (;;) { @@ -265,5 +259,10 @@ int main (int argc, char **argv) vipwedit (GROUP_FILE, gr_lock, gr_unlock); } + nscd_flush_cache ("passwd"); + nscd_flush_cache ("group"); +#ifdef SHADOWPWD + nscd_flush_cache ("shadow"); +#endif return 0; }