diff -u -r --new-file yp-tools-2.1/ChangeLog yp-tools-2.2/ChangeLog --- yp-tools-2.1/ChangeLog Thu May 28 21:40:34 1998 +++ yp-tools-2.2/ChangeLog Sun Nov 15 12:48:07 1998 @@ -1,4 +1,24 @@ +1998-11-11 Thorsten Kukuk + + * release version 2.2 + + * src/ypwhich.c: Fix inclusion of local header files. + * src/domainname.c: Likewise. + * src/ypmatch.c: Likewise. + * src/ypcat.c: Likewise. + * src/yppasswd.c: Likewise. + * src/yppoll.c: Likewise. + * src/ypset.c: Likewise. + + * src/Makefile.am (INCLUDES): Remove -I$(top_srcdir)/lib, or + we will use the wrong headers on some systems. + + * configure.in (WARNFLAGS): Add much more option to find much more + problems. + 1998-05-28 Thorsten Kukuk + + * release version 2.1 * src/ypmatch.c (main): Return 1 if entry not found. Reported by Klaus Steinberger . diff -u -r --new-file yp-tools-2.1/NEWS yp-tools-2.2/NEWS --- yp-tools-2.1/NEWS Sat Aug 8 15:50:50 1998 +++ yp-tools-2.2/NEWS Wed Nov 11 20:33:15 1998 @@ -5,33 +5,27 @@ Please send bug reports, questions and suggestions to . +Version 2.2 +* Fix inclusion of local header files +* Fix compiler warnings Version 2.1 - * Minor bug fix release - Version 2.0 - * domainname uses getdomainname, ypdomainname yp_get_default_domain * Add domainname, nisdomainname, ypdomainname and manual pages * Rewrite remaining tools * Include our own yp header files for compiling on old Linux libcs * Rewrite most of the tools to fix a lot of problems and bugs - Version 1.4.1 - * Bug fix release - Version 1.4 - * A lot of bug fixes * Add ypchfn, ypchsh and manual pages - Version 1.3 - * Add german locale * Use automake diff -u -r --new-file yp-tools-2.1/README yp-tools-2.2/README --- yp-tools-2.1/README Sat Aug 8 15:53:56 1998 +++ yp-tools-2.2/README Wed Nov 11 20:33:58 1998 @@ -1,5 +1,5 @@ -This is version 2.1 of a collection of NIS client tools. +This is version 2.2 of a collection of NIS client tools. See the file COPYING for copying restrictions. @@ -19,10 +19,10 @@ or from the main ftp server: -ftp://ftp.kernel.org/pub/linux/utils/net/NIS/beta/yp-tools-2.1.tar.gz +ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-2.2.tar.gz -You should use ypbind 3.3 with the ypbind-3.3-glibc3.diff patch -from ftp.kernel.org or ypbind-mt 1.3 or greater. +You should use ypbind 3.3 with the ypbind-3.3-glibc4.diff patch +from ftp.kernel.org or ypbind-mt 1.4 or greater. Don't forget to edit /etc/nsswitch.conf, or install the version from the etc directory for NIS. diff -u -r --new-file yp-tools-2.1/THANKS yp-tools-2.2/THANKS --- yp-tools-2.1/THANKS Thu May 28 18:23:36 1998 +++ yp-tools-2.2/THANKS Wed Nov 11 20:13:20 1998 @@ -4,6 +4,7 @@ Arnim Frithjof Brestrich brest@rumms.uni-mannheim.de Richard Gooch Richard.Gooch@atnf.csiro.au +Loic Prylli Loic.Prylli@ens-lyon.fr Klaus Steinberger Klaus.Steinberger@Physik.Uni-Muenchen.DE Raymond Wu rwu@ml.com diff -u -r --new-file yp-tools-2.1/configure yp-tools-2.2/configure --- yp-tools-2.1/configure Sat Aug 8 15:54:08 1998 +++ yp-tools-2.2/configure Wed Nov 11 21:03:39 1998 @@ -696,7 +696,7 @@ PACKAGE=yp-tools -VERSION=2.1 +VERSION=2.2 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff -u -r --new-file yp-tools-2.1/configure.in yp-tools-2.2/configure.in --- yp-tools-2.1/configure.in Sat Aug 8 15:49:54 1998 +++ yp-tools-2.2/configure.in Wed Nov 11 20:58:14 1998 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/ypcat.c) -AM_INIT_AUTOMAKE(yp-tools, 2.1) +AM_INIT_AUTOMAKE(yp-tools, 2.2) AM_CONFIG_HEADER(config.h) AC_PREFIX_DEFAULT(/usr) @@ -40,6 +40,7 @@ AC_PROG_CC dnl If we're using gcc, we want warning flags test -n "$GCC" && WARNFLAGS="-Wall" +dnl test -n "$GCC" && WARNFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wshadow -Wstrict-prototypes -Wundef" AC_SUBST(WARNFLAGS) AC_ISC_POSIX AC_PROG_INSTALL diff -u -r --new-file yp-tools-2.1/lib/getopt.h yp-tools-2.2/lib/getopt.h --- yp-tools-2.1/lib/getopt.h Fri Apr 3 18:04:07 1998 +++ yp-tools-2.2/lib/getopt.h Wed Nov 11 19:26:45 1998 @@ -101,7 +101,7 @@ #define optional_argument 2 #if defined (__STDC__) && __STDC__ -#ifdef __GNU_LIBRARY__ +#if defined (__GNU_LIBRARY__) || defined (__GLIBC__) /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ diff -u -r --new-file yp-tools-2.1/po/ChangeLog yp-tools-2.2/po/ChangeLog --- yp-tools-2.1/po/ChangeLog Fri Apr 24 13:28:23 1998 +++ yp-tools-2.2/po/ChangeLog Fri Nov 6 19:50:13 1998 @@ -1,3 +1,7 @@ +1998-11-06 Thorsten Kukuk + + * de.po: Fix typo. + 1998-04-24 Thorsten Kukuk * Makefile.in.in: Use $(DESTDIR) Binary files yp-tools-2.1/po/de.gmo and yp-tools-2.2/po/de.gmo differ diff -u -r --new-file yp-tools-2.1/po/de.po yp-tools-2.2/po/de.po --- yp-tools-2.1/po/de.po Sat Aug 8 15:58:28 1998 +++ yp-tools-2.2/po/de.po Sun Nov 15 12:48:19 1998 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: yp-tools 2.0\n" -"POT-Creation-Date: 1998-08-08 15:48+0200\n" -"PO-Revision-Date: 1998-05-19 18:02+02:00\n" +"POT-Creation-Date: 1998-11-11 20:26+0100\n" +"PO-Revision-Date: 1998-11-06 19:50+01:00\n" "Last-Translator: Thorsten Kukuk \n" "Language-Team: No Language-Team in the moment\n" "MIME-Version: 1.0\n" @@ -52,8 +52,8 @@ msgstr "Unbekannter ypbind Fehler" # , c-format -#: src/domainname.c:42 src/ypcat.c:41 src/ypmatch.c:41 src/yppasswd.c:59 -#: src/yppoll.c:44 src/ypset.c:44 src/ypwhich.c:45 +#: src/domainname.c:46 src/ypcat.c:44 src/ypmatch.c:45 src/yppasswd.c:62 +#: src/yppoll.c:48 src/ypset.c:49 src/ypwhich.c:49 #, c-format msgid "" "Copyright (C) %s Thorsten Kukuk.\n" @@ -66,60 +66,60 @@ "Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n" "VERWENDBARKEIT FÜR EINEN ANGEGEBENEN ZWECK.\n" -#: src/domainname.c:53 +#: src/domainname.c:57 #, c-format msgid "Usage: %s [domain]\n" msgstr "Aufruf: %s [Domain]\n" -#: src/domainname.c:60 +#: src/domainname.c:64 msgid "" "domainname - set or display name of current domain\n" "\n" msgstr "domainname - Setze oder zeige den Namen der aktuellen Domain\n" -#: src/domainname.c:62 src/domainname.c:75 src/ypcat.c:69 src/ypmatch.c:68 -#: src/yppasswd.c:94 src/yppasswd.c:105 src/yppasswd.c:117 src/yppoll.c:69 -#: src/ypset.c:67 src/ypwhich.c:74 +#: src/domainname.c:66 src/domainname.c:79 src/ypcat.c:72 src/ypmatch.c:72 +#: src/yppasswd.c:97 src/yppasswd.c:108 src/yppasswd.c:120 src/yppoll.c:73 +#: src/ypset.c:72 src/ypwhich.c:78 msgid " -?, --help Give this help list\n" msgstr " -?, --help Gib diese Hilfe aus\n" -#: src/domainname.c:63 src/domainname.c:76 src/ypcat.c:70 src/ypmatch.c:69 -#: src/yppasswd.c:95 src/yppasswd.c:106 src/yppasswd.c:118 src/yppoll.c:70 -#: src/ypset.c:68 src/ypwhich.c:75 +#: src/domainname.c:67 src/domainname.c:80 src/ypcat.c:73 src/ypmatch.c:73 +#: src/yppasswd.c:98 src/yppasswd.c:109 src/yppasswd.c:121 src/yppoll.c:74 +#: src/ypset.c:73 src/ypwhich.c:79 msgid " --usage Give a short usage message\n" msgstr " --usage Gib eine kurze Aufruf Hilfe aus\n" -#: src/domainname.c:64 src/domainname.c:77 src/ypcat.c:71 src/ypmatch.c:70 -#: src/yppasswd.c:96 src/yppasswd.c:107 src/yppasswd.c:119 src/yppoll.c:71 -#: src/ypset.c:69 src/ypwhich.c:76 +#: src/domainname.c:68 src/domainname.c:81 src/ypcat.c:74 src/ypmatch.c:74 +#: src/yppasswd.c:99 src/yppasswd.c:110 src/yppasswd.c:122 src/yppoll.c:75 +#: src/ypset.c:74 src/ypwhich.c:80 msgid " --version Print program version\n" msgstr " --version Gib Programm Version Information aus\n" -#: src/domainname.c:72 +#: src/domainname.c:76 #, c-format msgid "" "%s - set or display name of current NIS domain\n" "\n" msgstr "%s - Setze oder zeige den Namen der aktuellen NIS Domain\n" -#: src/domainname.c:85 src/ypcat.c:80 src/ypmatch.c:80 src/yppasswd.c:133 -#: src/yppoll.c:81 src/ypset.c:79 src/ypwhich.c:86 +#: src/domainname.c:89 src/ypcat.c:83 src/ypmatch.c:84 src/yppasswd.c:136 +#: src/yppoll.c:85 src/ypset.c:84 src/ypwhich.c:90 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" "Versuche \\\"%s --help\\\" oder \\\"%s --usage\\\" für mehr Informationen.\n" # , c-format -#: src/ypcat.c:46 +#: src/ypcat.c:49 #, c-format msgid "Written by %s.\n" msgstr "Implementiert von %s.\n" -#: src/ypcat.c:52 +#: src/ypcat.c:55 msgid "Usage: ypcat [-kt] [-d domain] mapname | -x\n" msgstr "Aufruf: ypcat [-kt] [-d Domain] mapname | -x\n" -#: src/ypcat.c:60 +#: src/ypcat.c:63 msgid "" "ypcat - print values of all keys in a NIS database\n" "\n" @@ -127,45 +127,45 @@ "ypcat - Gib Daten von allen Schlüssel einer NIS map aus\n" "\n" -#: src/ypcat.c:62 src/ypmatch.c:62 src/yppoll.c:67 src/ypset.c:64 -#: src/ypwhich.c:66 +#: src/ypcat.c:65 src/ypmatch.c:66 src/yppoll.c:71 src/ypset.c:69 +#: src/ypwhich.c:70 msgid " -d domain Use 'domain' instead of the default domain\n" msgstr " -d domain Benutze \\\"domain\\\" anstelle der default Domain\n" -#: src/ypcat.c:64 src/ypmatch.c:64 +#: src/ypcat.c:67 src/ypmatch.c:68 msgid " -k Display map keys\n" msgstr " -k Gib Schlüssel mit aus\n" -#: src/ypcat.c:66 src/ypmatch.c:65 src/ypwhich.c:70 +#: src/ypcat.c:69 src/ypmatch.c:69 src/ypwhich.c:74 msgid " -t Inhibits map nickname translation\n" msgstr " -t Verbietet die Übersetzung von Nicknames\n" -#: src/ypcat.c:67 src/ypmatch.c:66 src/ypwhich.c:72 +#: src/ypcat.c:70 src/ypmatch.c:70 src/ypwhich.c:76 msgid " -x Display the map nickname translation table\n" msgstr " -x Gibt die Nickname Übersetzungstabelle aus\n" # , c-format -#: src/ypcat.c:198 src/ypmatch.c:168 src/yppasswd.c:506 src/yppoll.c:157 -#: src/ypset.c:214 src/ypwhich.c:254 +#: src/ypcat.c:201 src/ypmatch.c:172 src/yppasswd.c:509 src/yppoll.c:161 +#: src/ypset.c:219 src/ypwhich.c:258 #, c-format msgid "%s: can't get local yp domain: %s\n" msgstr "%s: Kann die lokale NIS Domain nicht bestimmen: %s\n" -#: src/ypcat.c:218 src/ypmatch.c:200 src/ypwhich.c:282 +#: src/ypcat.c:221 src/ypmatch.c:204 src/ypwhich.c:286 msgid "No running ypbind\n" msgstr "ypbind ist nicht am laufen\n" # , c-format -#: src/ypcat.c:221 +#: src/ypcat.c:224 #, c-format msgid "No such map %s. Reason: %s\n" msgstr "Map %s nicht gefunden. Grund: %s\n" -#: src/ypmatch.c:52 +#: src/ypmatch.c:56 msgid "Usage: ypmatch [-d domain] [-kt] key ... mapname | -x\n" msgstr "Aufruf: ypmatch [-d Domain] [-kt] Schlüßel ... Mapname\n" -#: src/ypmatch.c:60 +#: src/ypmatch.c:64 msgid "" "ypmatch - print the values of one or more keys from a NIS map\n" "\n" @@ -174,26 +174,26 @@ "\n" # , c-format -#: src/ypmatch.c:203 +#: src/ypmatch.c:207 #, c-format msgid "Can't match key %s in map %s. Reason: %s\n" msgstr "Schlüßel %s in Map %s nicht gefunden. Grund: %s\n" # , c-format -#: src/yppasswd.c:70 +#: src/yppasswd.c:73 msgid "Usage: yppasswd [-f] [-l] [-p] [User]\n" msgstr "Aufruf: yppasswd [-f] [-l] [-p] [User]\n" -#: src/yppasswd.c:76 +#: src/yppasswd.c:79 msgid "Usage: ypchsh [User]\n" msgstr "Aufruf: ypchsh [Benutzer]\n" # , c-format -#: src/yppasswd.c:82 +#: src/yppasswd.c:85 msgid "Usage: ypchfn [User]\n" msgstr "Aufruf: ypchfn [User]\n" -#: src/yppasswd.c:89 +#: src/yppasswd.c:92 msgid "" "yppasswd - change your password in the NIS database\n" "\n" @@ -201,19 +201,19 @@ "yppasswd - Ändert das Passwort in der NIS Datenbank\n" "\n" -#: src/yppasswd.c:91 +#: src/yppasswd.c:94 msgid " -f Change GECOS field information\n" msgstr " -f Ändere GECOS Informationen\n" -#: src/yppasswd.c:92 +#: src/yppasswd.c:95 msgid " -l Change the login shell\n" msgstr " -l Ändere die Login Shell\n" -#: src/yppasswd.c:93 +#: src/yppasswd.c:96 msgid " -p Change the password\n" msgstr " -p Ändere das Passwort\n" -#: src/yppasswd.c:103 +#: src/yppasswd.c:106 msgid "" "ypchsh - change the shell in the NIS database\n" "\n" @@ -221,138 +221,138 @@ "ypchsh - Ändert die Login Shell in der NIS Datanbank\n" "\n" -#: src/yppasswd.c:114 +#: src/yppasswd.c:117 msgid "" "ypchfn - change the GECOS information in the NIS database\n" "\n" msgstr "ypchfn - Ändere die GECOS Informationen in der NIS Datenbank\n" # , c-format -#: src/yppasswd.c:145 +#: src/yppasswd.c:148 #, c-format msgid "%s: can't find the master ypserver: %s\n" msgstr "%s: Kann den Master YP Server nicht bestimmen: %s\n" # , c-format -#: src/yppasswd.c:152 +#: src/yppasswd.c:155 #, c-format msgid "%s: yppasswdd not running on NIS master host\n" msgstr "%s: Der yppasswd Dämon läuft nicht auf dem NIS Master Server.\n" # , c-format -#: src/yppasswd.c:158 +#: src/yppasswd.c:161 #, c-format msgid "%s: yppasswd daemon running on illegal port.\n" msgstr "%s: Der yppasswd Dämon läuft auf einem illegalen Port.\n" -#: src/yppasswd.c:175 +#: src/yppasswd.c:178 msgid "No more" msgstr "Nicht mehr" -#: src/yppasswd.c:178 +#: src/yppasswd.c:181 msgid "True" msgstr "Wahr" -#: src/yppasswd.c:181 +#: src/yppasswd.c:184 msgid "False" msgstr "Falsch" -#: src/yppasswd.c:184 +#: src/yppasswd.c:187 msgid "No such map" msgstr "Keine solche Map" -#: src/yppasswd.c:187 +#: src/yppasswd.c:190 msgid "No such domain" msgstr "Keine solche Domain" -#: src/yppasswd.c:190 +#: src/yppasswd.c:193 msgid "Bad operation" msgstr "Fehlgeschlagene Operation" -#: src/yppasswd.c:193 +#: src/yppasswd.c:196 msgid "Database bad" msgstr "Datenbank ist nicht in Ordnung" -#: src/yppasswd.c:196 +#: src/yppasswd.c:199 msgid "Bad arguments" msgstr "Falsche Argumente" -#: src/yppasswd.c:199 +#: src/yppasswd.c:202 msgid "Version Mismatch" msgstr "Versionsnummern stimmen nicht überein" -#: src/yppasswd.c:202 +#: src/yppasswd.c:205 msgid "Unknown error" msgstr "Unbekannter Fehler" # , c-format -#: src/yppasswd.c:318 +#: src/yppasswd.c:321 #, c-format msgid "%s: no colons allowed in GECOS field... sorry.\n" msgstr "%s: Im GECOS Feld sind keine Kommas erlaubt.\n" -#: src/yppasswd.c:354 +#: src/yppasswd.c:357 msgid "The password must have at least 6 characters.\n" msgstr "Das Passwort muß mindestens 6 Zeichen lang sein.\n" -#: src/yppasswd.c:368 +#: src/yppasswd.c:371 msgid "" "The password must have both upper and lowercase letters, or non-letters.\n" msgstr "" "Das Passwort muß sowoehl Groß- als auch Kleinbuschstaben haben, oder\n" "Sonderzeichen.\n" -#: src/yppasswd.c:377 +#: src/yppasswd.c:380 msgid "You cannot reuse the old password.\n" msgstr "Sie können das alte Passwort nicht wiederbenutzen.\n" -#: src/yppasswd.c:399 +#: src/yppasswd.c:402 msgid "Please don't use something like your username as password.\n" msgstr "Bitten benutzen Sie etwas anderes als Ihren Usernamen als Passwort.\n" # , c-format -#: src/yppasswd.c:519 +#: src/yppasswd.c:522 #, c-format msgid "%s: unknown user (uid=%d).\n" msgstr "%s: unbekannter Benutzer (uid=%d).\n" # , c-format -#: src/yppasswd.c:528 +#: src/yppasswd.c:531 #, c-format msgid "%s: Only root may change account information for others\n" msgstr "%s: Nur root darf Account Informationen für andere ändern\n" # , c-format -#: src/yppasswd.c:545 +#: src/yppasswd.c:548 #, c-format msgid "Changing NIS account information for %s on %s.\n" msgstr "Ändere NIS Account Informationen für %s auf %s.\n" -#: src/yppasswd.c:555 +#: src/yppasswd.c:558 msgid "Please enter root password:" msgstr "Geben Sie bitte das root Password ein:" # , c-format -#: src/yppasswd.c:557 +#: src/yppasswd.c:560 #, c-format msgid "Please enter %spassword:" msgstr "Geben Sie bitte Ihr %sPasswort ein:" -#: src/yppasswd.c:558 +#: src/yppasswd.c:561 msgid "old " msgstr "altes " -#: src/yppasswd.c:566 +#: src/yppasswd.c:569 msgid "Sorry.\n" msgstr "Falsches Password.\n" # , c-format -#: src/yppasswd.c:584 +#: src/yppasswd.c:587 #, c-format msgid "Changing NIS password for %s on %s.\n" msgstr "Ändere NIS Passwort für %s auf %s\n" -#: src/yppasswd.c:592 +#: src/yppasswd.c:595 msgid "" "Too many tries. Aborted.\n" "Password unchanged.\n" @@ -360,29 +360,29 @@ "Zu viele Versuche.\n" "Passwort wurde nicht geändert.\n" -#: src/yppasswd.c:597 +#: src/yppasswd.c:600 msgid "Please enter new password:" msgstr "Geben Sie bitte ein neues Passwort ein:" -#: src/yppasswd.c:600 +#: src/yppasswd.c:603 msgid "Password unchanged.\n" msgstr "Passwort wurde nicht geändert.\n" -#: src/yppasswd.c:610 +#: src/yppasswd.c:613 #, c-format msgid "Not a valid password: %s.\n" msgstr "Kein gültiges Passwort: %s.\n" -#: src/yppasswd.c:618 +#: src/yppasswd.c:621 msgid "Please retype new password:" msgstr "Bitte geben sie das neue Passwort erneut ein:" -#: src/yppasswd.c:623 +#: src/yppasswd.c:626 msgid "Mismatch - password unchanged.\n" msgstr "Verschieden - Passwort wurde nicht geändert.\n" # , c-format -#: src/yppasswd.c:640 +#: src/yppasswd.c:643 #, c-format msgid "" "\n" @@ -395,24 +395,24 @@ "Zum akzeptieren, einfach return drücken. Zum löschen, tippen\n" "Sie \"none\" ein.\n" -#: src/yppasswd.c:647 +#: src/yppasswd.c:650 msgid "Name" msgstr "Name" -#: src/yppasswd.c:651 +#: src/yppasswd.c:654 msgid "Location" msgstr "Büro" -#: src/yppasswd.c:655 +#: src/yppasswd.c:658 msgid "Office Phone" msgstr "Dienst. Telefon" -#: src/yppasswd.c:659 +#: src/yppasswd.c:662 msgid "Home Phone" msgstr "Privat. Telefon" # , c-format -#: src/yppasswd.c:673 +#: src/yppasswd.c:676 #, c-format msgid "" "\n" @@ -425,17 +425,17 @@ "Um den default Wert zu akzeptieren, drücken Sie einfach . Um die\n" "default Shell des Systems zu benutzen, tippen Sie das Wort \"none\".\n" -#: src/yppasswd.c:678 +#: src/yppasswd.c:681 msgid "Login shell" msgstr "Login Shell" # , c-format -#: src/yppasswd.c:700 +#: src/yppasswd.c:703 msgid "Error while changing the NIS password." -msgstr "Fehler während des änderns vom NIS Passwort." +msgstr "Fehler während des Änderns vom NIS Passwort." # , c-format -#: src/yppasswd.c:702 +#: src/yppasswd.c:705 #, c-format msgid "" "\n" @@ -447,7 +447,7 @@ "\n" # , c-format -#: src/yppasswd.c:706 +#: src/yppasswd.c:709 #, c-format msgid "" "\n" @@ -459,12 +459,12 @@ "\n" # , c-format -#: src/yppasswd.c:715 +#: src/yppasswd.c:718 msgid "Error while changing the GECOS information." msgstr "Fehler während des änders der GECOS Informationen." # , c-format -#: src/yppasswd.c:717 +#: src/yppasswd.c:720 #, c-format msgid "" "\n" @@ -476,7 +476,7 @@ "\n" # , c-format -#: src/yppasswd.c:721 +#: src/yppasswd.c:724 #, c-format msgid "" "\n" @@ -488,12 +488,12 @@ "\n" # , c-format -#: src/yppasswd.c:730 +#: src/yppasswd.c:733 msgid "Error while changing the login shell." msgstr "Fehler während des änderns der Login Shell." # , c-format -#: src/yppasswd.c:732 +#: src/yppasswd.c:735 #, c-format msgid "" "\n" @@ -505,7 +505,7 @@ "\n" # , c-format -#: src/yppasswd.c:736 +#: src/yppasswd.c:739 #, c-format msgid "" "\n" @@ -517,12 +517,12 @@ "\n" # , c-format -#: src/yppasswd.c:744 +#: src/yppasswd.c:747 msgid "Error while changing the NIS account information." msgstr "Fehler während des änderns der NIS Account Informationen." # , c-format -#: src/yppasswd.c:747 +#: src/yppasswd.c:750 #, c-format msgid "" "\n" @@ -534,7 +534,7 @@ "\n" # , c-format -#: src/yppasswd.c:751 +#: src/yppasswd.c:754 #, c-format msgid "" "\n" @@ -545,136 +545,136 @@ "Die NIS Account Informationen wurden geändert auf %s.\n" "\n" -#: src/yppoll.c:55 +#: src/yppoll.c:59 msgid "Usage: yppoll [-h host] [-d domain] mapname\n" msgstr "Aufruf: yppoll [-h Rechner] [-d Domainname] Mapname\n" -#: src/yppoll.c:63 +#: src/yppoll.c:67 msgid "" "yppoll - return version and master server of a NIS map\n" "\n" msgstr "yppoll - Gib Version und Master Server einer NIS Map aus\n" -#: src/yppoll.c:66 +#: src/yppoll.c:70 msgid " -h host Ask ypserv process at 'host'\n" msgstr " -h Rechner Frag ypserv Prozeß auf \\\"Rechner\\\"\n" -#: src/yppoll.c:176 src/yppoll.c:186 src/yppoll.c:196 +#: src/yppoll.c:180 src/yppoll.c:190 src/yppoll.c:200 msgid "Couldn't get NIS server" msgstr "Kann keinen NIS server finden" -#: src/yppoll.c:177 +#: src/yppoll.c:181 msgid " - ypbind not running ?\n" msgstr " - ypbind läuft nicht ?\n" # , c-format -#: src/yppoll.c:227 +#: src/yppoll.c:231 #, c-format msgid "Unknown host: %s\n" msgstr "Unbekannter Rechner: %s\n" -#: src/yppoll.c:230 +#: src/yppoll.c:234 msgid "Host name lookup failure\n" msgstr "Fehler beim Suchen des Rechner Namens\n" # , c-format -#: src/yppoll.c:233 +#: src/yppoll.c:237 #, c-format msgid "No address associated with name: %s\n" msgstr "Zu dem Namen wurde keine Adresse gefunden: %s\n" -#: src/yppoll.c:237 +#: src/yppoll.c:241 msgid "Unknown server error\n" msgstr "Unbekannter Server Fehler\n" -#: src/yppoll.c:240 +#: src/yppoll.c:244 msgid "gethostbyname: Unknown error\n" msgstr "gethostbyname: Unbekanter Fehler\n" # , c-format -#: src/yppoll.c:258 src/yppoll.c:267 +#: src/yppoll.c:262 src/yppoll.c:271 #, c-format msgid "Can't create connection to %s.\n" msgstr "Kann keine Verbindung zu %s aufbauen.\n" -#: src/yppoll.c:269 src/ypset.c:139 +#: src/yppoll.c:273 src/ypset.c:144 msgid "Reason" msgstr "Grund" # , c-format -#: src/yppoll.c:275 +#: src/yppoll.c:279 #, c-format msgid "Domain %s is not supported by %s.\n" msgstr "Domain \\\"%s\\\" wird von »%s« nicht unterstützt.\n" -#: src/yppoll.c:304 +#: src/yppoll.c:308 msgid "Can't get any map parameter information.\n" msgstr "Kann keine Map Informationen bekommen.\n" # , c-format -#: src/yppoll.c:306 +#: src/yppoll.c:310 #, c-format msgid "Domain %s is supported.\n" msgstr "Domain \\\"%s\\\" wird unterstützt.\n" # , c-format -#: src/yppoll.c:310 +#: src/yppoll.c:314 #, c-format msgid "Can't get order number for map %s.\n" msgstr "Kann Zeitstempel für Map %s nicht bekommen.\n" # , c-format -#: src/yppoll.c:311 src/yppoll.c:325 +#: src/yppoll.c:315 src/yppoll.c:329 #, c-format msgid "\tReason: %s\n" msgstr " Grund: %s\n" # , c-format -#: src/yppoll.c:318 +#: src/yppoll.c:322 #, c-format msgid "Map %s has order number %d. [%s]\n" msgstr "Der Zeitstempel der Map »%s« ist %d. [%s]\n" # , c-format -#: src/yppoll.c:324 +#: src/yppoll.c:328 #, c-format msgid "Can't get master for map %s.\n" msgstr "Kann Master Server der Map %s nicht bekommen.\n" # , c-format -#: src/yppoll.c:328 +#: src/yppoll.c:332 #, c-format msgid "The master server is %s.\n" msgstr "Der Master Server ist »%s«.\n" -#: src/ypset.c:55 +#: src/ypset.c:60 msgid "Usage: ypset [-d domain] [-h hostname] server\n" msgstr "Aufruf: ypset [-d Domain] [-h Rechner] Server\n" -#: src/ypset.c:62 +#: src/ypset.c:67 msgid "" "ypset - bind ypbind to a particular NIS server\n" "\n" msgstr "ypset - Binde ypbind an einen bestimmten NIS Server\n" -#: src/ypset.c:66 +#: src/ypset.c:71 msgid " -h hostname Set ypbind's binding on ´hostname´\n" msgstr " -h Rechner Setze ypbind's binding auf \\\"Rechner\\\"\n" # , c-format -#: src/ypset.c:99 +#: src/ypset.c:104 #, c-format msgid "%s not running ypserv.\n" msgstr "Auf »%s« läuft kein ypserv.\n" # , c-format -#: src/ypset.c:110 +#: src/ypset.c:115 #, c-format msgid "can't find address for %s\n" msgstr "Kann Addresse für »%s« nicht finden\n" # , c-format -#: src/ypset.c:125 src/ypwhich.c:134 +#: src/ypset.c:130 src/ypwhich.c:138 #, c-format msgid "can't yp_bind: Reason: %s\n" msgstr "" @@ -682,22 +682,22 @@ "Grund: %s\n" # , c-format -#: src/ypset.c:137 +#: src/ypset.c:142 #, c-format msgid "Cannot ypset for domain %s on host %s.\n" msgstr "Kann die Domain %s auf dem Rechner »%s« nicht setzen.\n" # , c-format -#: src/ypset.c:231 +#: src/ypset.c:236 #, c-format msgid "ypset: host %s unknown\n" msgstr "ypset: Rechner »%s« unbekannt\n" -#: src/ypwhich.c:56 +#: src/ypwhich.c:60 msgid "Usage: ypwhich [-d domain] [[-t] -m [mname]|[-Vn] hostname] | -x\n" msgstr "Aufruf: ypwhich [-d domain] [[-t] -m [Mapname]|[-Vn] Rechner] | -x\n" -#: src/ypwhich.c:64 +#: src/ypwhich.c:68 msgid "" "ypwhich - return name of NIS server or map master\n" "\n" @@ -705,35 +705,35 @@ "ypwhich - gibt Namen des NIS Server oder des Masters für eine Map aus\n" "\n" -#: src/ypwhich.c:68 +#: src/ypwhich.c:72 msgid " -m mname Find the master NIS server for the map 'mname'\n" msgstr "" " -m mname Finden den NIS Master Server für die Map \\\"mname\\\"\n" -#: src/ypwhich.c:71 +#: src/ypwhich.c:75 msgid " -V n Version of ypbind, V2 is default\n" msgstr " -V n Version des ypbinds Protokoll, V2 ist default\n" # , c-format -#: src/ypwhich.c:286 +#: src/ypwhich.c:290 #, c-format msgid "Can't find master for map \"%s\". Reason: %s\n" msgstr "Kann Master Server der Map \\\"%s\\\" nicht finden. Grund: %s\n" # , c-format -#: src/ypwhich.c:310 +#: src/ypwhich.c:314 #, c-format msgid "Can't find master for map %s. Reason: %s\n" msgstr "" "Kann Master Server der Map %s nicht finden.\n" "Grund: %s\n" -#: src/ypwhich.c:320 +#: src/ypwhich.c:324 msgid "No running ypbind.\n" msgstr "ypbind ist nicht am laufen.\n" # , c-format -#: src/ypwhich.c:324 +#: src/ypwhich.c:328 #, c-format msgid "Can't get map list for domain %s. Reason: %s\n" msgstr "" @@ -741,7 +741,7 @@ "Grund: %s\n" # , c-format -#: src/ypwhich.c:344 +#: src/ypwhich.c:348 #, c-format msgid "ypwhich: host %s unknown\n" msgstr "ypwhich: Rechner %s ist unbekannt\n" diff -u -r --new-file yp-tools-2.1/po/yp-tools.pot yp-tools-2.2/po/yp-tools.pot --- yp-tools-2.1/po/yp-tools.pot Sat Aug 8 15:48:15 1998 +++ yp-tools-2.2/po/yp-tools.pot Wed Nov 11 20:26:28 1998 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1998-08-08 15:48+0200\n" +"POT-Creation-Date: 1998-11-11 20:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,8 +49,8 @@ msgid "Unknown ypbind error" msgstr "" -#: src/domainname.c:42 src/ypcat.c:41 src/ypmatch.c:41 src/yppasswd.c:59 -#: src/yppoll.c:44 src/ypset.c:44 src/ypwhich.c:45 +#: src/domainname.c:46 src/ypcat.c:44 src/ypmatch.c:45 src/yppasswd.c:62 +#: src/yppoll.c:48 src/ypset.c:49 src/ypwhich.c:49 #, c-format msgid "" "Copyright (C) %s Thorsten Kukuk.\n" @@ -58,294 +58,294 @@ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/domainname.c:53 +#: src/domainname.c:57 #, c-format msgid "Usage: %s [domain]\n" msgstr "" -#: src/domainname.c:60 +#: src/domainname.c:64 msgid "" "domainname - set or display name of current domain\n" "\n" msgstr "" -#: src/domainname.c:62 src/domainname.c:75 src/ypcat.c:69 src/ypmatch.c:68 -#: src/yppasswd.c:94 src/yppasswd.c:105 src/yppasswd.c:117 src/yppoll.c:69 -#: src/ypset.c:67 src/ypwhich.c:74 +#: src/domainname.c:66 src/domainname.c:79 src/ypcat.c:72 src/ypmatch.c:72 +#: src/yppasswd.c:97 src/yppasswd.c:108 src/yppasswd.c:120 src/yppoll.c:73 +#: src/ypset.c:72 src/ypwhich.c:78 msgid " -?, --help Give this help list\n" msgstr "" -#: src/domainname.c:63 src/domainname.c:76 src/ypcat.c:70 src/ypmatch.c:69 -#: src/yppasswd.c:95 src/yppasswd.c:106 src/yppasswd.c:118 src/yppoll.c:70 -#: src/ypset.c:68 src/ypwhich.c:75 +#: src/domainname.c:67 src/domainname.c:80 src/ypcat.c:73 src/ypmatch.c:73 +#: src/yppasswd.c:98 src/yppasswd.c:109 src/yppasswd.c:121 src/yppoll.c:74 +#: src/ypset.c:73 src/ypwhich.c:79 msgid " --usage Give a short usage message\n" msgstr "" -#: src/domainname.c:64 src/domainname.c:77 src/ypcat.c:71 src/ypmatch.c:70 -#: src/yppasswd.c:96 src/yppasswd.c:107 src/yppasswd.c:119 src/yppoll.c:71 -#: src/ypset.c:69 src/ypwhich.c:76 +#: src/domainname.c:68 src/domainname.c:81 src/ypcat.c:74 src/ypmatch.c:74 +#: src/yppasswd.c:99 src/yppasswd.c:110 src/yppasswd.c:122 src/yppoll.c:75 +#: src/ypset.c:74 src/ypwhich.c:80 msgid " --version Print program version\n" msgstr "" -#: src/domainname.c:72 +#: src/domainname.c:76 #, c-format msgid "" "%s - set or display name of current NIS domain\n" "\n" msgstr "" -#: src/domainname.c:85 src/ypcat.c:80 src/ypmatch.c:80 src/yppasswd.c:133 -#: src/yppoll.c:81 src/ypset.c:79 src/ypwhich.c:86 +#: src/domainname.c:89 src/ypcat.c:83 src/ypmatch.c:84 src/yppasswd.c:136 +#: src/yppoll.c:85 src/ypset.c:84 src/ypwhich.c:90 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" -#: src/ypcat.c:46 +#: src/ypcat.c:49 #, c-format msgid "Written by %s.\n" msgstr "" -#: src/ypcat.c:52 +#: src/ypcat.c:55 msgid "Usage: ypcat [-kt] [-d domain] mapname | -x\n" msgstr "" -#: src/ypcat.c:60 +#: src/ypcat.c:63 msgid "" "ypcat - print values of all keys in a NIS database\n" "\n" msgstr "" -#: src/ypcat.c:62 src/ypmatch.c:62 src/yppoll.c:67 src/ypset.c:64 -#: src/ypwhich.c:66 +#: src/ypcat.c:65 src/ypmatch.c:66 src/yppoll.c:71 src/ypset.c:69 +#: src/ypwhich.c:70 msgid " -d domain Use 'domain' instead of the default domain\n" msgstr "" -#: src/ypcat.c:64 src/ypmatch.c:64 +#: src/ypcat.c:67 src/ypmatch.c:68 msgid " -k Display map keys\n" msgstr "" -#: src/ypcat.c:66 src/ypmatch.c:65 src/ypwhich.c:70 +#: src/ypcat.c:69 src/ypmatch.c:69 src/ypwhich.c:74 msgid " -t Inhibits map nickname translation\n" msgstr "" -#: src/ypcat.c:67 src/ypmatch.c:66 src/ypwhich.c:72 +#: src/ypcat.c:70 src/ypmatch.c:70 src/ypwhich.c:76 msgid " -x Display the map nickname translation table\n" msgstr "" -#: src/ypcat.c:198 src/ypmatch.c:168 src/yppasswd.c:506 src/yppoll.c:157 -#: src/ypset.c:214 src/ypwhich.c:254 +#: src/ypcat.c:201 src/ypmatch.c:172 src/yppasswd.c:509 src/yppoll.c:161 +#: src/ypset.c:219 src/ypwhich.c:258 #, c-format msgid "%s: can't get local yp domain: %s\n" msgstr "" -#: src/ypcat.c:218 src/ypmatch.c:200 src/ypwhich.c:282 +#: src/ypcat.c:221 src/ypmatch.c:204 src/ypwhich.c:286 msgid "No running ypbind\n" msgstr "" -#: src/ypcat.c:221 +#: src/ypcat.c:224 #, c-format msgid "No such map %s. Reason: %s\n" msgstr "" -#: src/ypmatch.c:52 +#: src/ypmatch.c:56 msgid "Usage: ypmatch [-d domain] [-kt] key ... mapname | -x\n" msgstr "" -#: src/ypmatch.c:60 +#: src/ypmatch.c:64 msgid "" "ypmatch - print the values of one or more keys from a NIS map\n" "\n" msgstr "" -#: src/ypmatch.c:203 +#: src/ypmatch.c:207 #, c-format msgid "Can't match key %s in map %s. Reason: %s\n" msgstr "" -#: src/yppasswd.c:70 +#: src/yppasswd.c:73 msgid "Usage: yppasswd [-f] [-l] [-p] [User]\n" msgstr "" -#: src/yppasswd.c:76 +#: src/yppasswd.c:79 msgid "Usage: ypchsh [User]\n" msgstr "" -#: src/yppasswd.c:82 +#: src/yppasswd.c:85 msgid "Usage: ypchfn [User]\n" msgstr "" -#: src/yppasswd.c:89 +#: src/yppasswd.c:92 msgid "" "yppasswd - change your password in the NIS database\n" "\n" msgstr "" -#: src/yppasswd.c:91 +#: src/yppasswd.c:94 msgid " -f Change GECOS field information\n" msgstr "" -#: src/yppasswd.c:92 +#: src/yppasswd.c:95 msgid " -l Change the login shell\n" msgstr "" -#: src/yppasswd.c:93 +#: src/yppasswd.c:96 msgid " -p Change the password\n" msgstr "" -#: src/yppasswd.c:103 +#: src/yppasswd.c:106 msgid "" "ypchsh - change the shell in the NIS database\n" "\n" msgstr "" -#: src/yppasswd.c:114 +#: src/yppasswd.c:117 msgid "" "ypchfn - change the GECOS information in the NIS database\n" "\n" msgstr "" -#: src/yppasswd.c:145 +#: src/yppasswd.c:148 #, c-format msgid "%s: can't find the master ypserver: %s\n" msgstr "" -#: src/yppasswd.c:152 +#: src/yppasswd.c:155 #, c-format msgid "%s: yppasswdd not running on NIS master host\n" msgstr "" -#: src/yppasswd.c:158 +#: src/yppasswd.c:161 #, c-format msgid "%s: yppasswd daemon running on illegal port.\n" msgstr "" -#: src/yppasswd.c:175 +#: src/yppasswd.c:178 msgid "No more" msgstr "" -#: src/yppasswd.c:178 +#: src/yppasswd.c:181 msgid "True" msgstr "" -#: src/yppasswd.c:181 +#: src/yppasswd.c:184 msgid "False" msgstr "" -#: src/yppasswd.c:184 +#: src/yppasswd.c:187 msgid "No such map" msgstr "" -#: src/yppasswd.c:187 +#: src/yppasswd.c:190 msgid "No such domain" msgstr "" -#: src/yppasswd.c:190 +#: src/yppasswd.c:193 msgid "Bad operation" msgstr "" -#: src/yppasswd.c:193 +#: src/yppasswd.c:196 msgid "Database bad" msgstr "" -#: src/yppasswd.c:196 +#: src/yppasswd.c:199 msgid "Bad arguments" msgstr "" -#: src/yppasswd.c:199 +#: src/yppasswd.c:202 msgid "Version Mismatch" msgstr "" -#: src/yppasswd.c:202 +#: src/yppasswd.c:205 msgid "Unknown error" msgstr "" -#: src/yppasswd.c:318 +#: src/yppasswd.c:321 #, c-format msgid "%s: no colons allowed in GECOS field... sorry.\n" msgstr "" -#: src/yppasswd.c:354 +#: src/yppasswd.c:357 msgid "The password must have at least 6 characters.\n" msgstr "" -#: src/yppasswd.c:368 +#: src/yppasswd.c:371 msgid "" "The password must have both upper and lowercase letters, or non-letters.\n" msgstr "" -#: src/yppasswd.c:377 +#: src/yppasswd.c:380 msgid "You cannot reuse the old password.\n" msgstr "" -#: src/yppasswd.c:399 +#: src/yppasswd.c:402 msgid "Please don't use something like your username as password.\n" msgstr "" -#: src/yppasswd.c:519 +#: src/yppasswd.c:522 #, c-format msgid "%s: unknown user (uid=%d).\n" msgstr "" -#: src/yppasswd.c:528 +#: src/yppasswd.c:531 #, c-format msgid "%s: Only root may change account information for others\n" msgstr "" -#: src/yppasswd.c:545 +#: src/yppasswd.c:548 #, c-format msgid "Changing NIS account information for %s on %s.\n" msgstr "" -#: src/yppasswd.c:555 +#: src/yppasswd.c:558 msgid "Please enter root password:" msgstr "" -#: src/yppasswd.c:557 +#: src/yppasswd.c:560 #, c-format msgid "Please enter %spassword:" msgstr "" -#: src/yppasswd.c:558 +#: src/yppasswd.c:561 msgid "old " msgstr "" -#: src/yppasswd.c:566 +#: src/yppasswd.c:569 msgid "Sorry.\n" msgstr "" -#: src/yppasswd.c:584 +#: src/yppasswd.c:587 #, c-format msgid "Changing NIS password for %s on %s.\n" msgstr "" -#: src/yppasswd.c:592 +#: src/yppasswd.c:595 msgid "" "Too many tries. Aborted.\n" "Password unchanged.\n" msgstr "" -#: src/yppasswd.c:597 +#: src/yppasswd.c:600 msgid "Please enter new password:" msgstr "" -#: src/yppasswd.c:600 +#: src/yppasswd.c:603 msgid "Password unchanged.\n" msgstr "" -#: src/yppasswd.c:610 +#: src/yppasswd.c:613 #, c-format msgid "Not a valid password: %s.\n" msgstr "" -#: src/yppasswd.c:618 +#: src/yppasswd.c:621 msgid "Please retype new password:" msgstr "" -#: src/yppasswd.c:623 +#: src/yppasswd.c:626 msgid "Mismatch - password unchanged.\n" msgstr "" -#: src/yppasswd.c:640 +#: src/yppasswd.c:643 #, c-format msgid "" "\n" @@ -354,23 +354,23 @@ "field, type the word \"none\".\n" msgstr "" -#: src/yppasswd.c:647 +#: src/yppasswd.c:650 msgid "Name" msgstr "" -#: src/yppasswd.c:651 +#: src/yppasswd.c:654 msgid "Location" msgstr "" -#: src/yppasswd.c:655 +#: src/yppasswd.c:658 msgid "Office Phone" msgstr "" -#: src/yppasswd.c:659 +#: src/yppasswd.c:662 msgid "Home Phone" msgstr "" -#: src/yppasswd.c:673 +#: src/yppasswd.c:676 #, c-format msgid "" "\n" @@ -379,15 +379,15 @@ "system's default shell, type the word \"none\".\n" msgstr "" -#: src/yppasswd.c:678 +#: src/yppasswd.c:681 msgid "Login shell" msgstr "" -#: src/yppasswd.c:700 +#: src/yppasswd.c:703 msgid "Error while changing the NIS password." msgstr "" -#: src/yppasswd.c:702 +#: src/yppasswd.c:705 #, c-format msgid "" "\n" @@ -395,7 +395,7 @@ "\n" msgstr "" -#: src/yppasswd.c:706 +#: src/yppasswd.c:709 #, c-format msgid "" "\n" @@ -403,11 +403,11 @@ "\n" msgstr "" -#: src/yppasswd.c:715 +#: src/yppasswd.c:718 msgid "Error while changing the GECOS information." msgstr "" -#: src/yppasswd.c:717 +#: src/yppasswd.c:720 #, c-format msgid "" "\n" @@ -415,7 +415,7 @@ "\n" msgstr "" -#: src/yppasswd.c:721 +#: src/yppasswd.c:724 #, c-format msgid "" "\n" @@ -423,11 +423,11 @@ "\n" msgstr "" -#: src/yppasswd.c:730 +#: src/yppasswd.c:733 msgid "Error while changing the login shell." msgstr "" -#: src/yppasswd.c:732 +#: src/yppasswd.c:735 #, c-format msgid "" "\n" @@ -435,7 +435,7 @@ "\n" msgstr "" -#: src/yppasswd.c:736 +#: src/yppasswd.c:739 #, c-format msgid "" "\n" @@ -443,11 +443,11 @@ "\n" msgstr "" -#: src/yppasswd.c:744 +#: src/yppasswd.c:747 msgid "Error while changing the NIS account information." msgstr "" -#: src/yppasswd.c:747 +#: src/yppasswd.c:750 #, c-format msgid "" "\n" @@ -455,7 +455,7 @@ "\n" msgstr "" -#: src/yppasswd.c:751 +#: src/yppasswd.c:754 #, c-format msgid "" "\n" @@ -463,175 +463,175 @@ "\n" msgstr "" -#: src/yppoll.c:55 +#: src/yppoll.c:59 msgid "Usage: yppoll [-h host] [-d domain] mapname\n" msgstr "" -#: src/yppoll.c:63 +#: src/yppoll.c:67 msgid "" "yppoll - return version and master server of a NIS map\n" "\n" msgstr "" -#: src/yppoll.c:66 +#: src/yppoll.c:70 msgid " -h host Ask ypserv process at 'host'\n" msgstr "" -#: src/yppoll.c:176 src/yppoll.c:186 src/yppoll.c:196 +#: src/yppoll.c:180 src/yppoll.c:190 src/yppoll.c:200 msgid "Couldn't get NIS server" msgstr "" -#: src/yppoll.c:177 +#: src/yppoll.c:181 msgid " - ypbind not running ?\n" msgstr "" -#: src/yppoll.c:227 +#: src/yppoll.c:231 #, c-format msgid "Unknown host: %s\n" msgstr "" -#: src/yppoll.c:230 +#: src/yppoll.c:234 msgid "Host name lookup failure\n" msgstr "" -#: src/yppoll.c:233 +#: src/yppoll.c:237 #, c-format msgid "No address associated with name: %s\n" msgstr "" -#: src/yppoll.c:237 +#: src/yppoll.c:241 msgid "Unknown server error\n" msgstr "" -#: src/yppoll.c:240 +#: src/yppoll.c:244 msgid "gethostbyname: Unknown error\n" msgstr "" -#: src/yppoll.c:258 src/yppoll.c:267 +#: src/yppoll.c:262 src/yppoll.c:271 #, c-format msgid "Can't create connection to %s.\n" msgstr "" -#: src/yppoll.c:269 src/ypset.c:139 +#: src/yppoll.c:273 src/ypset.c:144 msgid "Reason" msgstr "" -#: src/yppoll.c:275 +#: src/yppoll.c:279 #, c-format msgid "Domain %s is not supported by %s.\n" msgstr "" -#: src/yppoll.c:304 +#: src/yppoll.c:308 msgid "Can't get any map parameter information.\n" msgstr "" -#: src/yppoll.c:306 +#: src/yppoll.c:310 #, c-format msgid "Domain %s is supported.\n" msgstr "" -#: src/yppoll.c:310 +#: src/yppoll.c:314 #, c-format msgid "Can't get order number for map %s.\n" msgstr "" -#: src/yppoll.c:311 src/yppoll.c:325 +#: src/yppoll.c:315 src/yppoll.c:329 #, c-format msgid "\tReason: %s\n" msgstr "" -#: src/yppoll.c:318 +#: src/yppoll.c:322 #, c-format msgid "Map %s has order number %d. [%s]\n" msgstr "" -#: src/yppoll.c:324 +#: src/yppoll.c:328 #, c-format msgid "Can't get master for map %s.\n" msgstr "" -#: src/yppoll.c:328 +#: src/yppoll.c:332 #, c-format msgid "The master server is %s.\n" msgstr "" -#: src/ypset.c:55 +#: src/ypset.c:60 msgid "Usage: ypset [-d domain] [-h hostname] server\n" msgstr "" -#: src/ypset.c:62 +#: src/ypset.c:67 msgid "" "ypset - bind ypbind to a particular NIS server\n" "\n" msgstr "" -#: src/ypset.c:66 +#: src/ypset.c:71 msgid " -h hostname Set ypbind's binding on ´hostname´\n" msgstr "" -#: src/ypset.c:99 +#: src/ypset.c:104 #, c-format msgid "%s not running ypserv.\n" msgstr "" -#: src/ypset.c:110 +#: src/ypset.c:115 #, c-format msgid "can't find address for %s\n" msgstr "" -#: src/ypset.c:125 src/ypwhich.c:134 +#: src/ypset.c:130 src/ypwhich.c:138 #, c-format msgid "can't yp_bind: Reason: %s\n" msgstr "" -#: src/ypset.c:137 +#: src/ypset.c:142 #, c-format msgid "Cannot ypset for domain %s on host %s.\n" msgstr "" -#: src/ypset.c:231 +#: src/ypset.c:236 #, c-format msgid "ypset: host %s unknown\n" msgstr "" -#: src/ypwhich.c:56 +#: src/ypwhich.c:60 msgid "Usage: ypwhich [-d domain] [[-t] -m [mname]|[-Vn] hostname] | -x\n" msgstr "" -#: src/ypwhich.c:64 +#: src/ypwhich.c:68 msgid "" "ypwhich - return name of NIS server or map master\n" "\n" msgstr "" -#: src/ypwhich.c:68 +#: src/ypwhich.c:72 msgid " -m mname Find the master NIS server for the map 'mname'\n" msgstr "" -#: src/ypwhich.c:71 +#: src/ypwhich.c:75 msgid " -V n Version of ypbind, V2 is default\n" msgstr "" -#: src/ypwhich.c:286 +#: src/ypwhich.c:290 #, c-format msgid "Can't find master for map \"%s\". Reason: %s\n" msgstr "" -#: src/ypwhich.c:310 +#: src/ypwhich.c:314 #, c-format msgid "Can't find master for map %s. Reason: %s\n" msgstr "" -#: src/ypwhich.c:320 +#: src/ypwhich.c:324 msgid "No running ypbind.\n" msgstr "" -#: src/ypwhich.c:324 +#: src/ypwhich.c:328 #, c-format msgid "Can't get map list for domain %s. Reason: %s\n" msgstr "" -#: src/ypwhich.c:344 +#: src/ypwhich.c:348 #, c-format msgid "ypwhich: host %s unknown\n" msgstr "" diff -u -r --new-file yp-tools-2.1/src/Makefile.am yp-tools-2.2/src/Makefile.am --- yp-tools-2.1/src/Makefile.am Tue May 19 18:30:33 1998 +++ yp-tools-2.2/src/Makefile.am Wed Nov 11 19:29:28 1998 @@ -12,8 +12,7 @@ LDADD = @INTLLIBS@ ../lib/libyptools.a localedir = $(datadir)/locale -INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I../intl\ - -DLOCALEDIR=\"$(localedir)\" +INCLUDES = -I$(srcdir) -I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" CLEANFILES = *~ domainname diff -u -r --new-file yp-tools-2.1/src/Makefile.in yp-tools-2.2/src/Makefile.in --- yp-tools-2.1/src/Makefile.in Sat Aug 8 15:58:27 1998 +++ yp-tools-2.2/src/Makefile.in Sun Nov 15 12:48:18 1998 @@ -103,8 +103,7 @@ LDADD = @INTLLIBS@ ../lib/libyptools.a localedir = $(datadir)/locale -INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I../intl\ - -DLOCALEDIR=\"$(localedir)\" +INCLUDES = -I$(srcdir) -I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" CLEANFILES = *~ domainname @@ -343,18 +342,14 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done -domainname.o: domainname.c ../config.h ../lib/getopt.h -ypcat.o: ypcat.c ../config.h ../lib/getopt.h ../lib/yp-tools.h \ - ../lib/nicknames.h -ypmatch.o: ypmatch.c ../config.h ../lib/getopt.h ../lib/yp-tools.h \ - ../lib/nicknames.h -yppasswd.o: yppasswd.c ../config.h ../lib/getopt.h yppasswd.h \ - ../lib/nicknames.h +domainname.o: domainname.c ../config.h +ypcat.o: ypcat.c ../config.h ../lib/yp-tools.h ../lib/nicknames.h +ypmatch.o: ypmatch.c ../config.h ../lib/yp-tools.h ../lib/nicknames.h +yppasswd.o: yppasswd.c ../config.h yppasswd.h yppasswd_xdr.o: yppasswd_xdr.c yppasswd.h -yppoll.o: yppoll.c ../config.h ../lib/getopt.h ../lib/yp-tools.h -ypset.o: ypset.c ../config.h ../lib/getopt.h ../lib/yp-tools.h -ypwhich.o: ypwhich.c ../config.h ../lib/getopt.h ../lib/yp-tools.h \ - ../lib/nicknames.h +yppoll.o: yppoll.c ../config.h ../lib/yp-tools.h +ypset.o: ypset.c ../config.h ../lib/yp-tools.h +ypwhich.o: ypwhich.c ../config.h ../lib/yp-tools.h ../lib/nicknames.h info: dvi: diff -u -r --new-file yp-tools-2.1/src/domainname.c yp-tools-2.2/src/domainname.c --- yp-tools-2.1/src/domainname.c Thu May 28 18:23:36 1998 +++ yp-tools-2.2/src/domainname.c Wed Nov 11 19:37:30 1998 @@ -24,7 +24,11 @@ #include #include #include +#ifdef HAVE_GETOPT_H #include +#else +#include "lib/getopt.h" +#endif #include #include #include diff -u -r --new-file yp-tools-2.1/src/ypcat.c yp-tools-2.2/src/ypcat.c --- yp-tools-2.1/src/ypcat.c Sun May 10 18:40:16 1998 +++ yp-tools-2.2/src/ypcat.c Wed Nov 11 20:17:47 1998 @@ -21,17 +21,20 @@ #include "config.h" #endif +#ifdef HAVE_GETOPT_H #include +#else +#include "lib/getopt.h" +#endif #include #include -#include "yp-tools.h" +#include "lib/yp-tools.h" +#include "lib/nicknames.h" #ifndef _ #define _(String) gettext (String) #endif -#include "nicknames.h" - /* Name and version of program. */ /* Print the version information. */ static void @@ -83,7 +86,7 @@ static int kflag = 0; -int +static int print_data (int status, char *inkey, int inkeylen, char *inval, int invallen, char *indata) { diff -u -r --new-file yp-tools-2.1/src/ypmatch.c yp-tools-2.2/src/ypmatch.c --- yp-tools-2.1/src/ypmatch.c Thu May 28 21:37:14 1998 +++ yp-tools-2.2/src/ypmatch.c Wed Nov 11 20:15:36 1998 @@ -21,16 +21,20 @@ #include "config.h" #endif +#ifdef HAVE_GETOPT_H #include +#else +#include "lib/getopt.h" +#endif #include #include -#include "yp-tools.h" +#include +#include "lib/yp-tools.h" +#include "lib/nicknames.h" #ifndef _ #define _(String) gettext (String) #endif - -#include "nicknames.h" /* Name and version of program. */ /* Print the version information. */ diff -u -r --new-file yp-tools-2.1/src/yppasswd.c yp-tools-2.2/src/yppasswd.c --- yp-tools-2.1/src/yppasswd.c Sun May 10 21:32:32 1998 +++ yp-tools-2.2/src/yppasswd.c Wed Nov 11 20:21:11 1998 @@ -26,7 +26,11 @@ #include #endif #include +#ifdef HAVE_GETOPT_H #include +#else +#include "lib/getopt.h" +#endif #include #include #include @@ -36,7 +40,6 @@ #include #include "yppasswd.h" -#include "nicknames.h" #ifndef _ #define _(String) gettext (String) @@ -134,7 +137,7 @@ program, program); } -char * +static char * getnismaster (char *domainname, const char *progname) { char *master; @@ -343,7 +346,7 @@ * this function is unused. */ -int /* return values: 0 = not ok, 1 = ok */ +static int /* return values: 0 = not ok, 1 = ok */ verifypassword (struct passwd *pwd, char *pwdstr, uid_t uid) { char *p, *q; @@ -410,7 +413,7 @@ { char *s, *progname, *domainname = NULL, *user = NULL, *master = NULL; int f_flag = 0, l_flag = 0, p_flag = 0, error, status; - struct yppasswd yppasswd; + struct yppasswd yppwd; struct passwd *pwd; CLIENT *clnt; uid_t uid; @@ -532,15 +535,15 @@ } /* Initialize password information */ - memset (&yppasswd, '\0', sizeof (yppasswd)); - yppasswd.newpw.pw_passwd = pwd->pw_passwd; - yppasswd.newpw.pw_name = pwd->pw_name; - yppasswd.newpw.pw_uid = pwd->pw_uid; - yppasswd.newpw.pw_gid = pwd->pw_gid; - yppasswd.newpw.pw_gecos = pwd->pw_gecos; - yppasswd.newpw.pw_dir = pwd->pw_dir; - yppasswd.newpw.pw_shell = pwd->pw_shell; - yppasswd.oldpass = (char *)""; + memset (&yppwd, '\0', sizeof (yppwd)); + yppwd.newpw.pw_passwd = pwd->pw_passwd; + yppwd.newpw.pw_name = pwd->pw_name; + yppwd.newpw.pw_uid = pwd->pw_uid; + yppwd.newpw.pw_gid = pwd->pw_gid; + yppwd.newpw.pw_gecos = pwd->pw_gecos; + yppwd.newpw.pw_dir = pwd->pw_dir; + yppwd.newpw.pw_shell = pwd->pw_shell; + yppwd.oldpass = (char *)""; fprintf (stdout, _("Changing NIS account information for %s on %s.\n"), pwd->pw_name, master); @@ -566,7 +569,7 @@ fprintf (stderr, _("Sorry.\n")); return 1; } - yppasswd.oldpass = strdup (s); + yppwd.oldpass = strdup (s); } if (p_flag) @@ -629,7 +632,7 @@ salt[0] = bin_to_ascii (tm & 0x3f); salt[1] = bin_to_ascii ((tm >> 6) & 0x3f); - yppasswd.newpw.pw_passwd = strdup (crypt (buf, salt)); + yppwd.newpw.pw_passwd = strdup (crypt (buf, salt)); } if (f_flag) @@ -663,7 +666,7 @@ while (*--sp == ',') *sp = '\0'; - yppasswd.newpw.pw_gecos = strdup (new_gecos); + yppwd.newpw.pw_gecos = strdup (new_gecos); } if (l_flag) @@ -679,14 +682,14 @@ new_shell, sizeof (new_shell))) return 1; - yppasswd.newpw.pw_shell = strdup (new_shell); + yppwd.newpw.pw_shell = strdup (new_shell); } clnt = clnt_create (master, YPPASSWDPROG, YPPASSWDVERS, "udp"); clnt->cl_auth = authunix_create_default (); memset ((char *) &status, '\0', sizeof (status)); error = clnt_call (clnt, YPPASSWDPROC_UPDATE, - (xdrproc_t) xdr_yppasswd, (char *) &yppasswd, + (xdrproc_t) xdr_yppasswd, (char *) &yppwd, (xdrproc_t) xdr_int, (char *) &status, TIMEOUT); switch (p_flag + (f_flag << 1) + (l_flag << 2)) diff -u -r --new-file yp-tools-2.1/src/yppasswd_xdr.c yp-tools-2.2/src/yppasswd_xdr.c --- yp-tools-2.1/src/yppasswd_xdr.c Sat May 9 14:26:21 1998 +++ yp-tools-2.2/src/yppasswd_xdr.c Wed Nov 11 20:21:42 1998 @@ -18,7 +18,7 @@ #include "yppasswd.h" -bool_t +static bool_t xdr_passwd (XDR *xdrs, xpasswd *objp) { if (!xdr_string (xdrs, &objp->pw_name, ~0)) diff -u -r --new-file yp-tools-2.1/src/yppoll.c yp-tools-2.2/src/yppoll.c --- yp-tools-2.1/src/yppoll.c Sun May 10 18:40:56 1998 +++ yp-tools-2.2/src/yppoll.c Wed Nov 11 20:22:48 1998 @@ -24,12 +24,16 @@ #include #include #include +#ifdef HAVE_GETOPT_H #include +#else +#include "lib/getopt.h" +#endif #include #include #include #include -#include "yp-tools.h" +#include "lib/yp-tools.h" #ifndef _ #define _(String) gettext (String) diff -u -r --new-file yp-tools-2.1/src/ypset.c yp-tools-2.2/src/ypset.c --- yp-tools-2.1/src/ypset.c Sun May 10 18:53:53 1998 +++ yp-tools-2.2/src/ypset.c Wed Nov 11 20:24:55 1998 @@ -23,13 +23,18 @@ #include #include +#ifdef HAVE_GETOPT_H #include +#else +#include "lib/getopt.h" +#endif #include #include +#include #include #include #include -#include "yp-tools.h" +#include "lib/yp-tools.h" #ifndef _ #define _(String) gettext (String) @@ -81,8 +86,8 @@ } /* bind to a special host and search the ypserv data */ -int -bind_tohost (struct sockaddr_in *sin, char *domainname, char *server, +static int +bind_tohost (struct sockaddr_in *sock_in, char *domainname, char *server, char *host) { struct ypbind_setdom ypsd; @@ -119,7 +124,7 @@ ypsd.ypsetdom_vers = YPVERS; sock = RPC_ANYSOCK; - client = clntudp_create (sin, YPBINDPROG, YPBINDVERS, tv, &sock); + client = clntudp_create (sock_in, YPBINDPROG, YPBINDVERS, tv, &sock); if (client == NULL) { fprintf (stderr, _("can't yp_bind: Reason: %s\n"), @@ -202,7 +207,7 @@ } else { - struct sockaddr_in sin; + struct sockaddr_in sock_in; char *server = argv[0]; if (domainname == NULL) @@ -217,12 +222,12 @@ } } - memset (&sin, '\0', sizeof (sin)); - sin.sin_family = AF_INET; + memset (&sock_in, '\0', sizeof (sock_in)); + sock_in.sin_family = AF_INET; if (hostname != NULL) { - if (inet_aton (hostname, &sin.sin_addr) == 0) + if (inet_aton (hostname, &sock_in.sin_addr) == 0) { struct hostent *hent = gethostbyname (hostname); @@ -231,15 +236,15 @@ fprintf (stderr, _("ypset: host %s unknown\n"), hostname); return 1; } - memcpy (&sin.sin_addr, hent->h_addr_list[0], - sizeof (sin.sin_addr)); + memcpy (&sock_in.sin_addr, hent->h_addr_list[0], + sizeof (sock_in.sin_addr)); } } else { - sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK); + sock_in.sin_addr.s_addr = htonl (INADDR_LOOPBACK); } - if (bind_tohost (&sin, domainname, server, hostname)) + if (bind_tohost (&sock_in, domainname, server, hostname)) return 1; } diff -u -r --new-file yp-tools-2.1/src/ypwhich.c yp-tools-2.2/src/ypwhich.c --- yp-tools-2.1/src/ypwhich.c Tue May 19 17:06:29 1998 +++ yp-tools-2.2/src/ypwhich.c Wed Nov 11 19:36:36 1998 @@ -21,21 +21,25 @@ #include "config.h" #endif +#ifdef HAVE_GETOPT_H #include +#else +#include "lib/getopt.h" +#endif #include #include #include #include #include #include -#include "yp-tools.h" +#include "lib/yp-tools.h" +#include "lib/nicknames.h" + #ifndef _ #define _(String) gettext (String) #endif -#include "nicknames.h" - /* Name and version of program. */ /* Print the version information. */ static void @@ -89,8 +93,8 @@ /* bind to a special host and print the name ypbind running on this host is bound to */ -int -print_bindhost (char *domain, struct sockaddr_in *sin, int vers) +static int +print_bindhost (char *domain, struct sockaddr_in *socka_in, int vers) { struct hostent *host = NULL; struct ypbind_resp yp_r; @@ -102,7 +106,7 @@ sock = RPC_ANYSOCK; tv.tv_sec = 5; tv.tv_usec = 0; - client = clntudp_create (sin, YPBINDPROG, vers, tv, &sock); + client = clntudp_create (socka_in, YPBINDPROG, vers, tv, &sock); if (client == NULL) { fprintf (stderr, "ypwhich: %s\n", yperr_string (YPERR_YPBIND)); @@ -329,14 +333,14 @@ } else { - struct sockaddr_in sin; + struct sockaddr_in sock_in; struct hostent *host; - memset (&sin, 0, sizeof sin); - sin.sin_family = AF_INET; + memset (&sock_in, 0, sizeof sock_in); + sock_in.sin_family = AF_INET; if (hflag) { - if (inet_aton (hostname, &sin.sin_addr) == 0) + if (inet_aton (hostname, &sock_in.sin_addr) == 0) { host = gethostbyname (hostname); if (!host) @@ -345,16 +349,17 @@ hostname); return 1; } - memcpy (&sin.sin_addr, host->h_addr_list[0], sizeof sin.sin_addr); + memcpy (&sock_in.sin_addr, host->h_addr_list[0], + sizeof (sock_in.sin_addr)); } - if (print_bindhost (domainname, &sin, ypbind_version)) + if (print_bindhost (domainname, &sock_in, ypbind_version)) return 1; } else { - sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK); + sock_in.sin_addr.s_addr = htonl (INADDR_LOOPBACK); - if (print_bindhost (domainname, &sin, ypbind_version)) + if (print_bindhost (domainname, &sock_in, ypbind_version)) return 1; } } diff -u -r --new-file yp-tools-2.1/yp-tools.spec yp-tools-2.2/yp-tools.spec --- yp-tools-2.1/yp-tools.spec Sat Aug 8 15:51:21 1998 +++ yp-tools-2.2/yp-tools.spec Wed Nov 11 21:03:34 1998 @@ -1,6 +1,6 @@ Summary: NIS (YP) clients Name: yp-tools -Version: 2.1 +Version: 2.2 Release: 1 Copyright: GPL Group: Networking/Utilities @@ -19,38 +19,6 @@ in the net. You can find both for linux on http://www-vt.uni-paderborn.de/~kukuk/linux/nis.html. Please read the NIS-HOWTO, too. - - - -%changelog -* Sat Aug 08 1998 Thorsten Kukuk -- Update to 2.1 release - -* Tue May 19 1998 Thorsten Kukuk -- Update to 2.0 release - -* Thu May 11 1998 Thorsten Kukuk -- Update to new beta release -- Remove turkish locale -- Remove old Documentation - -* Sun Apr 26 1998 Thorsten Kukuk -- Update description text - -* Fri Apr 24 1998 Thorsten Kukuk -- Update to latest beta version - -* Sun Mar 8 1998 Thorsten Kukuk -- Update to yp-tools 1.4.2 -- added turkish locale - -* Fri Feb 6 1998 Thorsten Kukuk -- Bugfix release -- update to yp-tools 1.4.1 - -%changelog -* Sun Dec 21 1997 Thorsten Kukuk -- Add ypchsh, ypchfn and manpages %prep %setup