From cee8624145957f0b6cdeef00c73d4855f0f602d1 Mon Sep 17 00:00:00 2001 From: wbaumann Date: Sun, 18 Oct 2009 09:40:28 +0000 Subject: [PATCH] add command line option 'username' --- ChangeLog | 5 + NEWS | 15 +++ TODO | 7 +- configure.ac | 2 +- etc/secrets | 4 +- man/de/mount.davfs.8.po | 241 +++++++++++++++++++++++----------------- man/mount.davfs.8 | 15 ++- man/mount.davfs.8.pot | 233 +++++++++++++++++++++----------------- po/cs.po | 184 +++++++++++++++--------------- po/davfs2.pot | 190 ++++++++++++++++--------------- po/de.po | 184 +++++++++++++++--------------- src/mount_davfs.c | 38 ++++++- src/mount_davfs.h | 1 + 13 files changed, 631 insertions(+), 488 deletions(-) diff --git a/ChangeLog b/ChangeLog index 794aecd..e89606b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ ChangeLog for davfs2 -------------------- +2009-10-18 Werner Baumann (werner.baumann@onlinehome.de) + * mount_davfs.c: + Add experimental support for command line option + 'username' for use with pam_mount. + 2009-10-17 Werner Baumann (werner.baumann@onlinehome.de) * mount_davfs.c, parse_secrets: Check for tty before calling dav_user_input_hidden. diff --git a/NEWS b/NEWS index 30aa5b0..d8e0f1a 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,21 @@ # permitted in any medium without royalty. +What is new in davfs2 1.4.2 +=========================== + +Mainly bug fixes (see ChangeLog). + +Support for Neon 0.29. + +Support for NTLM authentication (with Neon 0.29 only). + +Experimental support for commandline option "username" for use +with pam_mount. I am not sure wether this is really usefull because +I think that for typical use cases of pam_mount davfs2 is not +well suited. Please report your experience with this option. + + What is new in davfs2 1.4.1 =========================== diff --git a/TODO b/TODO index 5383c81..f137171 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -davfs2 TODO 2009-06-13 +davfs2 TODO 2009-10-18 ---------------------- - write a GNU-style manual @@ -24,10 +24,9 @@ davfs2 TODO 2009-06-13 - restructure file name extraction and href construction -- add reference to sytax rules in 'man davfs2.conf' in config - file templates - - add option to not ask any questions at all - how to deal with Microsft ASP backends? Translate: F +- revisit precedence rules for options (e.g. username) + diff --git a/configure.ac b/configure.ac index 23c4a33..861ab35 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_PREREQ(2.59) -AC_INIT(davfs2, 1.4.1, http://savannah.nongnu.org/projects/davfs2) +AC_INIT(davfs2, 1.4.2, http://savannah.nongnu.org/projects/davfs2) AC_CONFIG_SRCDIR([src/cache.c]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE diff --git a/etc/secrets b/etc/secrets index 7b1813c..9beda87 100644 --- a/etc/secrets +++ b/etc/secrets @@ -1,4 +1,4 @@ -# davfs2 secrets file 2009-04-12 +# davfs2 secrets file 2009-10-18 # version 4 # ------------------------------- @@ -20,7 +20,7 @@ # Each line consists of two or three items separated by spaces or tabs. # If an item contains one of the characters space, tab, #, \ or ", this # character must be escaped by a preceding \. Alternatively, the item -# may be enclosed in double quotes. +# may be enclosed in double quotes. (see also the davfs2.conf (5) man page) # Proxy Line diff --git a/man/de/mount.davfs.8.po b/man/de/mount.davfs.8.po index 8d2c730..714962f 100644 --- a/man/de/mount.davfs.8.po +++ b/man/de/mount.davfs.8.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: davfs2 1.4.0\n" -"POT-Creation-Date: 2009-04-29 20:18+0300\n" +"POT-Creation-Date: 2009-10-18 10:37+0300\n" "PO-Revision-Date: 2009-04-29 20:26+0200\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -14,12 +14,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -# type: TH -#: davfs2.conf.5:1 mount.davfs.8:1 umount.davfs.8:1 -#, no-wrap -msgid "2009-04-13" -msgstr "2009-04-13" - # type: TH #: davfs2.conf.5:1 mount.davfs.8:1 umount.davfs.8:1 #, no-wrap @@ -39,24 +33,24 @@ msgid "DESCRIPTION" msgstr "BESCHREIBUNG" # type: SH -#: davfs2.conf.5:501 mount.davfs.8:518 umount.davfs.8:79 +#: davfs2.conf.5:513 mount.davfs.8:531 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "AUTOREN" # type: SH -#: davfs2.conf.5:507 mount.davfs.8:535 umount.davfs.8:84 +#: davfs2.conf.5:519 mount.davfs.8:548 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "DAVFS2 HOME" # type: TH -#: davfs2.conf.5:510 mount.davfs.8:538 umount.davfs.8:87 +#: davfs2.conf.5:522 mount.davfs.8:551 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "@PACKAGE_BUGREPORT@" # type: SH -#: davfs2.conf.5:512 mount.davfs.8:540 umount.davfs.8:89 +#: davfs2.conf.5:524 mount.davfs.8:553 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" @@ -67,6 +61,12 @@ msgstr "SIEHE AUCH" msgid "@PROGRAM_NAME@" msgstr "@PROGRAM_NAME@" +# type: TH +#: mount.davfs.8:1 +#, no-wrap +msgid "2009-10-18" +msgstr "2009-10-18" + # type: Plain text #: mount.davfs.8:6 msgid "@PROGRAM_NAME@ - Mount a WebDAV resource in a directory" @@ -521,14 +521,49 @@ msgstr "" msgid "Default: ID of the mounting user." msgstr "Voreinstellung: Kennung des Benutzers." +# type: TP +#: mount.davfs.8:187 +#, no-wrap +msgid "BI" +msgstr "BI" + +# type: Plain text +#: mount.davfs.8:194 +msgid "" +"Use this name to authenticate with the WebDAV server. This option is " +"intended for use with pam_mount only. When this option is set the " +"credentials in the secrets files will be ignored. Do not use it in I. " +"The username will be visible for everyone in the output of I." +msgstr "" +"Dieser Name wird zur Anmeldung beim WebDAV-Server benutzt. Die Option ist " +"nur für den Gebrauch mit pam_mount gedacht. Wenn sie gesetzt ist, werden die " +"Anmaldedaten in der secrets-Datei ignoriert. Benutze die Option nicht in der " +"I. Der Benutzername ist in der Ausgabe von I für jedermann " +"sichtbar." + +# type: Plain text +#: mount.davfs.8:196 +msgid "Default: no username." +msgstr "Voreingestellt: kein username" + +# type: Plain text +#: mount.davfs.8:199 +msgid "" +"B This option is experimental and might be removed. If you " +"think it useful and successfully use it please send a short report." +msgstr "" +"B Diese Option ist experimentell und wird möglicherweise " +"wieder entfernt. Falls du sie erfolgreich verwendest und behalten möchtest, " +"sende bitte einen kurzen Bericht." + # type: SH -#: mount.davfs.8:188 +#: mount.davfs.8:201 #, no-wrap msgid "SECURITY POLICY" msgstr "SICHERHEITSREGELN" # type: Plain text -#: mount.davfs.8:193 +#: mount.davfs.8:206 msgid "" "B<@PROGRAM_NAME@> needs root privileges for mounting. But running a daemon, " "that is connected to the internet, with root privileges is a security risk. " @@ -541,7 +576,7 @@ msgstr "" "Hinterdrund wechselt." # type: Plain text -#: mount.davfs.8:198 +#: mount.davfs.8:211 msgid "" "When invoked by root B<@PROGRAM_NAME@> will run as user B<@USER@> and group " "B<@GROUP@>. This may be changed in I<@SYS_CONF_DIR@/@CONFIGFILE@>." @@ -551,7 +586,7 @@ msgstr "" "geändert werden." # type: Plain text -#: mount.davfs.8:202 +#: mount.davfs.8:215 msgid "" "When invoked by an ordinary user it will run with the id of this user and " "with group B<@GROUP@>." @@ -560,7 +595,7 @@ msgstr "" "Benutzerkennung und Gruppe B<@GROUP@>." # type: Plain text -#: mount.davfs.8:208 +#: mount.davfs.8:221 msgid "" "As the file system may be mounted over an insecure internet connection, this " "increases the risk that malicious content may be included in the file " @@ -572,7 +607,7 @@ msgstr "" "B(8)." # type: Plain text -#: mount.davfs.8:213 +#: mount.davfs.8:226 msgid "" "Options B and B will always be set; even root can not change " "this." @@ -581,7 +616,7 @@ msgstr "" "nicht ändern." # type: Plain text -#: mount.davfs.8:217 +#: mount.davfs.8:230 msgid "" "For ordinary users to be able to mount, they must be member of group " "B<@GROUP@> and there must be an entry in I." @@ -591,7 +626,7 @@ msgstr "" "erlaubt werden." # type: Plain text -#: mount.davfs.8:221 +#: mount.davfs.8:234 msgid "" "When mounted by an ordinary user, the mount point must not lie within the " "home directory of another user." @@ -600,7 +635,7 @@ msgstr "" "nicht innerhalb des Home-Verzeichnisses eines anderen Benutzers liegen." # type: Plain text -#: mount.davfs.8:226 +#: mount.davfs.8:239 msgid "" "If in I option B and/or B are given, an ordinary user can " "only mount, if her uid is the one given in option B and he belongs to " @@ -611,7 +646,7 @@ msgstr "" "Benutzerkennung ist und wenn er zur angegebenen Gruppe gehört." # type: Plain text -#: mount.davfs.8:234 +#: mount.davfs.8:247 msgid "" "B If root allows an ordinary user to mount a file system (using " "I) this includes the permission to read the associated B " @@ -628,13 +663,13 @@ msgstr "" "tun, wenn man diese Informationen dem Benutzer auch direkt geben würde." # type: SH -#: mount.davfs.8:235 +#: mount.davfs.8:248 #, no-wrap msgid "URLS AND MOUNT POINTS WITH SPACES" msgstr "URLS UND EINHÄNGEPUNKTE MIT LEERZEICHEN" # type: Plain text -#: mount.davfs.8:240 +#: mount.davfs.8:253 msgid "" "Special characters like spaces in pathnames are a mess. They are interpreted " "differently by different programs and protocols, and there are different " @@ -645,7 +680,7 @@ msgstr "" "unterschiedlich und haben unterschiedliche Escape-Regeln." # type: Plain text -#: mount.davfs.8:246 +#: mount.davfs.8:259 msgid "" "In I spaces must be replaced by a three digit octal escape sequence. " "Write I instead of I and the I<@SECRETSFILE@> files please see the escape " "and quotation rules described in the B<@CONFIGFILE@>(5) man page." @@ -668,18 +703,18 @@ msgstr "" "B<@CONFIGFILE@>(5)-Handbuch beschrieben." # type: Plain text -#: mount.davfs.8:253 +#: mount.davfs.8:266 msgid "On I you must obey the escaping rules of the shell." msgstr "Auf der Kommandozeile müssen die Regeln der Shell beachtet werden." # type: SH -#: mount.davfs.8:255 +#: mount.davfs.8:268 #, no-wrap msgid "CACHING" msgstr "CACHE" # type: Plain text -#: mount.davfs.8:260 +#: mount.davfs.8:273 msgid "" "B<@PROGRAM_NAME@> tries to reduce HTTP-trafic by caching and reusing data. " "Information about directories and files are held in memory, while downloaded " @@ -690,7 +725,7 @@ msgstr "" "gehalten und heruntergeladene Dateien werden auf der Festplatte gespeichert." # type: Plain text -#: mount.davfs.8:268 +#: mount.davfs.8:281 msgid "" "B<@PROGRAM_NAME@> will consider cached information about directories and " "file attributes valid for a configurable time and look up this information " @@ -707,7 +742,7 @@ msgstr "" "es deshalb etwas dauern, bis dies im lokalen Dateisystem sichtbar wird." # type: Plain text -#: mount.davfs.8:274 +#: mount.davfs.8:287 msgid "" "This will not affect the content of files and directory listings. Whenever a " "file is opened, the server is looked up for a newer version of the file. " @@ -720,13 +755,13 @@ msgstr "" "finden sich Hinweise, wie dies angepasst werden kann." # type: SH -#: mount.davfs.8:276 +#: mount.davfs.8:289 #, no-wrap msgid "LOCKS, LOST UPDATE PROBLEM AND BACKUP FILES" msgstr "SPERREN, VERLORENGEGANGENE ÄNDERUNGEN UND BACKUP-DATEIEN" # type: Plain text -#: mount.davfs.8:281 +#: mount.davfs.8:294 msgid "" "WebDAV introduced locks and B<@PROGRAM_NAME@> uses them by default. This " "will in most cases prevent two people from changing the same file in " @@ -737,7 +772,7 @@ msgstr "" "die selbe Datei ändern. Aber nicht immer:" # type: Plain text -#: mount.davfs.8:286 +#: mount.davfs.8:299 msgid "" "You might have disabled locks in I<@SYS_CONF_DIR@/@CONFIGFILE@> or I<~/." "@PACKAGE@/@CONFIGFILE@>." @@ -746,14 +781,14 @@ msgstr "" "die Sperren deaktiviert sein." # type: Plain text -#: mount.davfs.8:289 +#: mount.davfs.8:302 msgid "The server might not support locks (they are not mandatory)." msgstr "" "Möglicherweise unterstützt der Server keine Sperren (sie sind in WevDAV " "nicht zwingend vorgeschrieben)." # type: Plain text -#: mount.davfs.8:293 +#: mount.davfs.8:306 msgid "" "A bad connection might prevent B<@PROGRAM_NAME@> from refreshing the lock in " "time." @@ -762,7 +797,7 @@ msgstr "" "einer Sperre verhindert werden." # type: Plain text -#: mount.davfs.8:297 +#: mount.davfs.8:310 msgid "" "Another WebDAV-client might use your lock (that is not too difficult and " "might even happen without intention)." @@ -771,7 +806,7 @@ msgstr "" "schwierig und könnte auch aus Versehen geschehen)." # type: Plain text -#: mount.davfs.8:305 +#: mount.davfs.8:318 msgid "" "B<@PROGRAM_NAME@> will therefore check if the file has been changed on the " "the server before it uploads a new version. If it finds it impossible to " @@ -786,7 +821,7 @@ msgstr "" "zu überprüfen und entscheiden, was mit diesen Dateien zu tun ist." # type: Plain text -#: mount.davfs.8:313 +#: mount.davfs.8:326 msgid "" "Sometimes locks held by some client on the server will not be released. " "Maybe the client crashes or the network connection fails. When " @@ -806,7 +841,7 @@ msgstr "" "vorgegebenen Zeit erneuert werden." # type: Plain text -#: mount.davfs.8:320 +#: mount.davfs.8:333 msgid "" "WebDAV allows to lock files that don't exist (to protect the name when a " "client intends to create a new file). This locks will be displayed as files " @@ -824,13 +859,13 @@ msgstr "" "webdav.org/cadaver/>E können solche Sperren entfernt werden." # type: SH -#: mount.davfs.8:322 +#: mount.davfs.8:335 #, no-wrap msgid "FILE OWNER AND PERMISSIONS" msgstr "EIGENTÜMER UND DATEIRECHTE" # type: Plain text -#: mount.davfs.8:328 +#: mount.davfs.8:341 msgid "" "B<@PACKAGE@> implements Unix permissions for access control. But changing " "owner and permissions of a file is only B. It is intended as a means " @@ -843,7 +878,7 @@ msgstr "" "Benutzer auf sein Dateisystem zugreifen dürfen." # type: Plain text -#: mount.davfs.8:333 +#: mount.davfs.8:346 msgid "" "The server does not know about this. From the servers point of view there is " "just one user (identified by the credentials) connected. Another WebDAV-" @@ -855,7 +890,7 @@ msgstr "" "lokalen Änderungen an Eigentümer und Dateirechten nichts mit." # type: Plain text -#: mount.davfs.8:339 +#: mount.davfs.8:352 msgid "" "There is one exeption: The B on files is stored as a property " "on the sever. You may think of this property as an information about the " @@ -869,7 +904,7 @@ msgstr "" "lokalen Rechte festgelegt." # type: Plain text -#: mount.davfs.8:345 +#: mount.davfs.8:358 msgid "" "When the file system is unmounted, attributes of cached files (including " "owner and permissions) are stored in cache, as well as the attributs of the " @@ -882,30 +917,30 @@ msgstr "" "enthalten, die im Cache sind." # type: SH -#: mount.davfs.8:347 umount.davfs.8:67 +#: mount.davfs.8:360 umount.davfs.8:67 #, no-wrap msgid "FILES" msgstr "DATEIEN" # type: TP -#: mount.davfs.8:349 +#: mount.davfs.8:362 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CONFIGFILE@>" msgstr "I<@SYS_CONF_DIR@/@CONFIGFILE@>" # type: Plain text -#: mount.davfs.8:352 +#: mount.davfs.8:365 msgid "System wide configuration file." msgstr "Systemweite Konfigurationsdatei." # type: TP -#: mount.davfs.8:353 +#: mount.davfs.8:366 #, no-wrap msgid "I<~/.@PACKAGE@/@CONFIGFILE@>" msgstr "I<~/.@PACKAGE@/@CONFIGFILE@>" # type: Plain text -#: mount.davfs.8:358 +#: mount.davfs.8:371 msgid "" "Configuration file in the users home directory.The user configuration takes " "precedence over the system wide configuration. If it does not exist, " @@ -916,13 +951,13 @@ msgstr "" "B<@PROGRAM_NAME@> eine Vorlage an." # type: TP -#: mount.davfs.8:359 +#: mount.davfs.8:372 #, no-wrap msgid "I<@SYS_CONF_DIR@/@SECRETSFILE@>" msgstr "I<@SYS_CONF_DIR@/@SECRETSFILE@>" # type: Plain text -#: mount.davfs.8:364 +#: mount.davfs.8:377 msgid "" "Holds the credentials for WebDAV servers and the proxy, as well as " "decryption passwords for client certificates. The file must be read-writable " @@ -933,13 +968,13 @@ msgstr "" "Schreib- und Leserechte für root haben." # type: TP -#: mount.davfs.8:365 +#: mount.davfs.8:378 #, no-wrap msgid "I<~/.@PACKAGE@/@SECRETSFILE@>" msgstr "I<~/.@PACKAGE@/@SECRETSFILE@>" # type: Plain text -#: mount.davfs.8:375 +#: mount.davfs.8:388 msgid "" "Holds credentials for WebDAV servers and proxy, as well as decryption " "passwords for client certificates. The file must be read-writable by the " @@ -959,13 +994,13 @@ msgstr "" "Vorlage an." # type: TP -#: mount.davfs.8:376 +#: mount.davfs.8:389 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@>" msgstr "I<@SYS_CONF_DIR@/@CERTS_DIR@>" # type: Plain text -#: mount.davfs.8:383 +#: mount.davfs.8:396 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -981,18 +1016,18 @@ msgstr "" "konfiguriert werden. Die Zertifikate müssen im PEM-Format vorliegen." # type: Plain text -#: mount.davfs.8:385 mount.davfs.8:394 +#: mount.davfs.8:398 mount.davfs.8:407 msgid "Be sure to verify the certificate." msgstr "Vergiss nicht, das Zertifikat selbst zu prüfen." # type: TP -#: mount.davfs.8:386 +#: mount.davfs.8:399 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@>" msgstr "I<~/.@PACKAGE@/@CERTS_DIR@>" # type: Plain text -#: mount.davfs.8:392 +#: mount.davfs.8:405 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -1007,13 +1042,13 @@ msgstr "" "Format vorliegen." # type: TP -#: mount.davfs.8:395 +#: mount.davfs.8:408 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" # type: Plain text -#: mount.davfs.8:401 +#: mount.davfs.8:414 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<@SYS_CONF_DIR@/@CONFIGFILE@> or " @@ -1026,13 +1061,13 @@ msgstr "" "und Ausführungsrecht für root haben." # type: TP -#: mount.davfs.8:402 +#: mount.davfs.8:415 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" # type: Plain text -#: mount.davfs.8:407 +#: mount.davfs.8:420 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<~/.@PACKAGE@/@CONFIGFILE@> to " @@ -1044,13 +1079,13 @@ msgstr "" "haben." # type: TP -#: mount.davfs.8:408 umount.davfs.8:69 +#: mount.davfs.8:421 umount.davfs.8:69 #, no-wrap msgid "I<@SYS_RUN@>" msgstr "I<@SYS_RUN@>" # type: Plain text -#: mount.davfs.8:414 +#: mount.davfs.8:427 msgid "" "PID-files of running mount.davfs processes are stored there. This directory " "must belong to group B<@USER@> with write permissions for the group and the " @@ -1063,13 +1098,13 @@ msgstr "" "vom Einhängepunkt abgeleitet." # type: TP -#: mount.davfs.8:415 +#: mount.davfs.8:428 #, no-wrap msgid "I<@SYS_CACHE_DIR@>" msgstr "I<@SYS_CACHE_DIR@>" # type: Plain text -#: mount.davfs.8:422 +#: mount.davfs.8:435 msgid "" "System wide directory for cached files. Used when the file system is mounted " "by root. It must belong do group B<@USER@> and read, write and execute bits " @@ -1084,13 +1119,13 @@ msgstr "" "URL, dem Einhängepunkt und dem Benutzernamen gebildet." # type: TP -#: mount.davfs.8:423 +#: mount.davfs.8:436 #, no-wrap msgid "I<~/.@PACKAGE@/cache>" msgstr "I<~/.@PACKAGE@/cache>" # type: Plain text -#: mount.davfs.8:427 +#: mount.davfs.8:440 msgid "" "Cache directory in the mounting users home directory. For every mounted " "WebDAV resource a subdirectory is created." @@ -1099,7 +1134,7 @@ msgstr "" "wird ein Unterverzeichnis angelegt." # type: Plain text -#: mount.davfs.8:431 +#: mount.davfs.8:444 msgid "" "B<@PROGRAM_NAME@> will try to create missing directories, but it will B " "touch I<@SYS_CONF_DIR@>." @@ -1108,19 +1143,19 @@ msgstr "" "lässt die Pfoten von I<@SYS_CONF_DIR@>." # type: SH -#: mount.davfs.8:432 +#: mount.davfs.8:445 #, no-wrap msgid "ENVIRONMENT" msgstr "UMGEBUNGSVARIABLEN" # type: TP -#: mount.davfs.8:434 +#: mount.davfs.8:447 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:439 +#: mount.davfs.8:452 msgid "" "If no proxy is defined in the configuration file the value is taken from " "this environment variables. The proxy may be given with or without scheme " @@ -1131,23 +1166,23 @@ msgstr "" "angegeben werden." # type: Plain text -#: mount.davfs.8:441 +#: mount.davfs.8:454 msgid "http_proxy=[http://]foo.bar[:3218]" msgstr "http_proxy=[http://]foo.bar[:3218]" # type: Plain text -#: mount.davfs.8:443 mount.davfs.8:451 +#: mount.davfs.8:456 mount.davfs.8:464 msgid "Only used when the mounting user is root." msgstr "Wird nur benutzt, wenn der Benutzer root das Dateisystem einhängt." # type: TP -#: mount.davfs.8:444 +#: mount.davfs.8:457 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:449 +#: mount.davfs.8:462 msgid "" "A comma separated list of domain names that shall be accessed directly. " "B<*> matches any domain name. A domain name starting with B<.> (period) " @@ -1158,36 +1193,36 @@ msgstr "" "der mit einem Punkt B<.> beginnt, umfasst auch alle Subdomains." # type: Plain text -#: mount.davfs.8:453 +#: mount.davfs.8:466 msgid "Not applied when the proxy is defined in I<@SYS_CONF_DIR@>." msgstr "" "Wird nicht benutzt, wenn der Proxy in I<@SYS_CONF_DIR@> festgelegt wird." # type: SH -#: mount.davfs.8:455 +#: mount.davfs.8:468 #, no-wrap msgid "EXAMPLES" msgstr "BEISPIELE" # type: Plain text -#: mount.davfs.8:458 +#: mount.davfs.8:471 msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:461 +#: mount.davfs.8:474 msgid "To allow an ordinary user to mount there must be an entry in I" msgstr "" "Damit ein normaler Benutzer ein Dateisystem einhängen kann, ist ein Eintrag " "in I nötig." # type: Plain text -#: mount.davfs.8:463 +#: mount.davfs.8:476 msgid "http://webdav.org/dav /media/dav davfs noauto,user 0 0" msgstr "http://webdav.org/dav /media/dav davfs noauto,user 0 0" # type: Plain text -#: mount.davfs.8:468 +#: mount.davfs.8:481 msgid "" "If a proxy must be used this should be configured in I<@SYS_CONF_DIR@/" "@CONFIGFILE@>" @@ -1196,54 +1231,54 @@ msgstr "" "@CONFIGFILE@> konfiguriert werden." # type: Plain text -#: mount.davfs.8:470 +#: mount.davfs.8:483 msgid "proxy proxy.mycompany.com:8080" msgstr "proxy proxy.mycompany.com:8080" # type: Plain text -#: mount.davfs.8:474 +#: mount.davfs.8:487 msgid "Credentials are stored in I" msgstr "" "Die vertraulichen Zugangsdaten für den Server werden in I gespeichert." # type: Plain text -#: mount.davfs.8:476 +#: mount.davfs.8:489 msgid "proxy.mycompany.com filomena \"my secret\"" msgstr "proxy.mycompany.com filomena \"my secret\"" # type: Plain text -#: mount.davfs.8:478 +#: mount.davfs.8:491 msgid "/media/dav webdav-username password" msgstr "/media/dav webdav-username password" # type: Plain text -#: mount.davfs.8:482 +#: mount.davfs.8:495 msgid "Now the WebDAV resource may be mounted by user filomena invoking" msgstr "Jetzt kann Benutzerin filomena das Dateisystem einhängen durch " # type: Plain text -#: mount.davfs.8:484 +#: mount.davfs.8:497 msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:488 +#: mount.davfs.8:501 msgid "and unmounted by user filomena invoking" msgstr "und dieselbe Benutzerin filomena kann es aushängen durch" # type: Plain text -#: mount.davfs.8:490 +#: mount.davfs.8:503 msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:494 +#: mount.davfs.8:507 msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:500 +#: mount.davfs.8:513 msgid "" "Mounts the resource I at mount point I, encrypting all traffic with SSL. Credentials for I" @@ -1266,38 +1301,38 @@ msgstr "" "webdav /mount/site>" # type: Plain text -#: mount.davfs.8:506 +#: mount.davfs.8:519 msgid "Mounts the resource I at I." msgstr "" "Die WebDAV-Resource I wird auf I eingehängt." # type: Plain text -#: mount.davfs.8:508 +#: mount.davfs.8:521 msgid "" "B" msgstr "" "B" # type: SH -#: mount.davfs.8:511 umount.davfs.8:74 +#: mount.davfs.8:524 umount.davfs.8:74 #, no-wrap msgid "BUGS" msgstr "FEHLER" # type: Plain text -#: mount.davfs.8:514 +#: mount.davfs.8:527 msgid "B<@PACKAGE@> does not support links." msgstr "B<@PACKAGE@> unterstützt keine Links." # type: Plain text -#: mount.davfs.8:516 +#: mount.davfs.8:529 msgid "A B<@PACKAGE@> file system cannot be moved with I." msgstr "" "Ein B<@PACKAGE@>-Dateisystem kann nicht mit I verschoben " "werden." # type: Plain text -#: mount.davfs.8:522 +#: mount.davfs.8:535 msgid "" "This man page was written by Luciano Bello Eluciano@linux.org.arE " "for Debian, for version 0.2.3 of davfs2." @@ -1306,7 +1341,7 @@ msgstr "" "die Version 0.2.3 von @PACKAGE@ in Debian geschrieben." # type: Plain text -#: mount.davfs.8:526 +#: mount.davfs.8:539 msgid "" "It has been updated for this version by Werner Baumann Ewerner." "baumann@onlinhome.deE." @@ -1315,12 +1350,12 @@ msgstr "" "baumann@onlinehome.deE angepasst." # type: Plain text -#: mount.davfs.8:529 +#: mount.davfs.8:542 msgid "@PACKAGE@ is developed by Sung Kim Ehunkim@gmail.comE." msgstr "@PACKAGE@ wurde von Sung Kim Ehunkim@gmail.comE entwickelt." # type: Plain text -#: mount.davfs.8:533 +#: mount.davfs.8:546 msgid "" "Version 1.0.0 (and later) of @PACKAGE@ is a complete rewrite by Werner " "Baumann." @@ -1329,7 +1364,7 @@ msgstr "" "von Werner Baumann." # type: Plain text -#: mount.davfs.8:546 +#: mount.davfs.8:559 msgid "" "B(8), B<@CONFIGFILE@>(5), B(8), B(8), " "B(5)" diff --git a/man/mount.davfs.8 b/man/mount.davfs.8 index df5f5f7..a250230 100644 --- a/man/mount.davfs.8 +++ b/man/mount.davfs.8 @@ -1,4 +1,4 @@ -.TH @PROGRAM_NAME@ 8 "2009\-04\-13" @PACKAGE_STRING@ +.TH @PROGRAM_NAME@ 8 "2009\-10\-18" @PACKAGE_STRING@ .SH NAME @@ -184,6 +184,19 @@ Only when mounted by root, this may be different from the mounting user. Default: ID of the mounting user. .RE +.TP +.B username=\fIWebDAV_user\fP +Use this name to authenticate with the WebDAV server. This option +is intended for use with pam_mount only. When this option is set the +credentials in the secrets files will be ignored. Do not use it in +\fIfstab\fP. The username will be visible for everyone in the output of +\fIps\fP. +.br +Default: no username. +.br +\fBExperimental:\fR This option is experimental and might be removed. If you +think it useful and successfully use it please send a short report. + .SH SECURITY POLICY diff --git a/man/mount.davfs.8.pot b/man/mount.davfs.8.pot index b8f4b36..accc8f9 100644 --- a/man/mount.davfs.8.pot +++ b/man/mount.davfs.8.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-04-29 20:18+0300\n" +"POT-Creation-Date: 2009-10-18 10:37+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,12 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING" -# type: TH -#: davfs2.conf.5:1 mount.davfs.8:1 umount.davfs.8:1 -#, no-wrap -msgid "2009-04-13" -msgstr "" - # type: TH #: davfs2.conf.5:1 mount.davfs.8:1 umount.davfs.8:1 #, no-wrap @@ -40,24 +34,24 @@ msgid "DESCRIPTION" msgstr "" # type: SH -#: davfs2.conf.5:501 mount.davfs.8:518 umount.davfs.8:79 +#: davfs2.conf.5:513 mount.davfs.8:531 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "" # type: SH -#: davfs2.conf.5:507 mount.davfs.8:535 umount.davfs.8:84 +#: davfs2.conf.5:519 mount.davfs.8:548 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "" # type: Plain text -#: davfs2.conf.5:510 mount.davfs.8:538 umount.davfs.8:87 +#: davfs2.conf.5:522 mount.davfs.8:551 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "" # type: SH -#: davfs2.conf.5:512 mount.davfs.8:540 umount.davfs.8:89 +#: davfs2.conf.5:524 mount.davfs.8:553 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -68,6 +62,12 @@ msgstr "" msgid "@PROGRAM_NAME@" msgstr "" +# type: TH +#: mount.davfs.8:1 +#, no-wrap +msgid "2009-10-18" +msgstr "" + # type: Plain text #: mount.davfs.8:6 msgid "@PROGRAM_NAME@ - Mount a WebDAV resource in a directory" @@ -452,14 +452,41 @@ msgstr "" msgid "Default: ID of the mounting user." msgstr "" +# type: TP +#: mount.davfs.8:187 +#, no-wrap +msgid "BI" +msgstr "" + +# type: Plain text +#: mount.davfs.8:194 +msgid "" +"Use this name to authenticate with the WebDAV server. This option is " +"intended for use with pam_mount only. When this option is set the " +"credentials in the secrets files will be ignored. Do not use it in I. " +"The username will be visible for everyone in the output of I." +msgstr "" + +# type: Plain text +#: mount.davfs.8:196 +msgid "Default: no username." +msgstr "" + +# type: Plain text +#: mount.davfs.8:199 +msgid "" +"B This option is experimental and might be removed. If you " +"think it useful and successfully use it please send a short report." +msgstr "" + # type: SH -#: mount.davfs.8:188 +#: mount.davfs.8:201 #, no-wrap msgid "SECURITY POLICY" msgstr "" # type: Plain text -#: mount.davfs.8:193 +#: mount.davfs.8:206 msgid "" "B<@PROGRAM_NAME@> needs root privileges for mounting. But running a daemon, " "that is connected to the internet, with root privileges is a security risk. " @@ -467,21 +494,21 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:198 +#: mount.davfs.8:211 msgid "" "When invoked by root B<@PROGRAM_NAME@> will run as user B<@USER@> and group " "B<@GROUP@>. This may be changed in I<@SYS_CONF_DIR@/@CONFIGFILE@>." msgstr "" # type: Plain text -#: mount.davfs.8:202 +#: mount.davfs.8:215 msgid "" "When invoked by an ordinary user it will run with the id of this user and " "with group B<@GROUP@>." msgstr "" # type: Plain text -#: mount.davfs.8:208 +#: mount.davfs.8:221 msgid "" "As the file system may be mounted over an insecure internet connection, this " "increases the risk that malicious content may be included in the file " @@ -489,28 +516,28 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:213 +#: mount.davfs.8:226 msgid "" "Options B and B will always be set; even root can not change " "this." msgstr "" # type: Plain text -#: mount.davfs.8:217 +#: mount.davfs.8:230 msgid "" "For ordinary users to be able to mount, they must be member of group " "B<@GROUP@> and there must be an entry in I." msgstr "" # type: Plain text -#: mount.davfs.8:221 +#: mount.davfs.8:234 msgid "" "When mounted by an ordinary user, the mount point must not lie within the " "home directory of another user." msgstr "" # type: Plain text -#: mount.davfs.8:226 +#: mount.davfs.8:239 msgid "" "If in I option B and/or B are given, an ordinary user can " "only mount, if her uid is the one given in option B and he belongs to " @@ -518,7 +545,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:234 +#: mount.davfs.8:247 msgid "" "B If root allows an ordinary user to mount a file system (using " "I) this includes the permission to read the associated B " @@ -529,13 +556,13 @@ msgid "" msgstr "" # type: SH -#: mount.davfs.8:235 +#: mount.davfs.8:248 #, no-wrap msgid "URLS AND MOUNT POINTS WITH SPACES" msgstr "" # type: Plain text -#: mount.davfs.8:240 +#: mount.davfs.8:253 msgid "" "Special characters like spaces in pathnames are a mess. They are interpreted " "differently by different programs and protocols, and there are different " @@ -543,7 +570,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:246 +#: mount.davfs.8:259 msgid "" "In I spaces must be replaced by a three digit octal escape sequence. " "Write I instead of I and the I<@SECRETSFILE@> files please see the escape " "and quotation rules described in the B<@CONFIGFILE@>(5) man page." msgstr "" # type: Plain text -#: mount.davfs.8:253 +#: mount.davfs.8:266 msgid "On I you must obey the escaping rules of the shell." msgstr "" # type: SH -#: mount.davfs.8:255 +#: mount.davfs.8:268 #, no-wrap msgid "CACHING" msgstr "" # type: Plain text -#: mount.davfs.8:260 +#: mount.davfs.8:273 msgid "" "B<@PROGRAM_NAME@> tries to reduce HTTP-trafic by caching and reusing data. " "Information about directories and files are held in memory, while downloaded " @@ -578,7 +605,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:268 +#: mount.davfs.8:281 msgid "" "B<@PROGRAM_NAME@> will consider cached information about directories and " "file attributes valid for a configurable time and look up this information " @@ -589,7 +616,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:274 +#: mount.davfs.8:287 msgid "" "This will not affect the content of files and directory listings. Whenever a " "file is opened, the server is looked up for a newer version of the file. " @@ -598,13 +625,13 @@ msgid "" msgstr "" # type: SH -#: mount.davfs.8:276 +#: mount.davfs.8:289 #, no-wrap msgid "LOCKS, LOST UPDATE PROBLEM AND BACKUP FILES" msgstr "" # type: Plain text -#: mount.davfs.8:281 +#: mount.davfs.8:294 msgid "" "WebDAV introduced locks and B<@PROGRAM_NAME@> uses them by default. This " "will in most cases prevent two people from changing the same file in " @@ -612,33 +639,33 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:286 +#: mount.davfs.8:299 msgid "" "You might have disabled locks in I<@SYS_CONF_DIR@/@CONFIGFILE@> or I<~/." "@PACKAGE@/@CONFIGFILE@>." msgstr "" # type: Plain text -#: mount.davfs.8:289 +#: mount.davfs.8:302 msgid "The server might not support locks (they are not mandatory)." msgstr "" # type: Plain text -#: mount.davfs.8:293 +#: mount.davfs.8:306 msgid "" "A bad connection might prevent B<@PROGRAM_NAME@> from refreshing the lock in " "time." msgstr "" # type: Plain text -#: mount.davfs.8:297 +#: mount.davfs.8:310 msgid "" "Another WebDAV-client might use your lock (that is not too difficult and " "might even happen without intention)." msgstr "" # type: Plain text -#: mount.davfs.8:305 +#: mount.davfs.8:318 msgid "" "B<@PROGRAM_NAME@> will therefore check if the file has been changed on the " "the server before it uploads a new version. If it finds it impossible to " @@ -648,7 +675,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:313 +#: mount.davfs.8:326 msgid "" "Sometimes locks held by some client on the server will not be released. " "Maybe the client crashes or the network connection fails. When " @@ -660,7 +687,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:320 +#: mount.davfs.8:333 msgid "" "WebDAV allows to lock files that don't exist (to protect the name when a " "client intends to create a new file). This locks will be displayed as files " @@ -671,13 +698,13 @@ msgid "" msgstr "" # type: SH -#: mount.davfs.8:322 +#: mount.davfs.8:335 #, no-wrap msgid "FILE OWNER AND PERMISSIONS" msgstr "" # type: Plain text -#: mount.davfs.8:328 +#: mount.davfs.8:341 msgid "" "B<@PACKAGE@> implements Unix permissions for access control. But changing " "owner and permissions of a file is only B. It is intended as a means " @@ -686,7 +713,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:333 +#: mount.davfs.8:346 msgid "" "The server does not know about this. From the servers point of view there is " "just one user (identified by the credentials) connected. Another WebDAV-" @@ -694,7 +721,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:339 +#: mount.davfs.8:352 msgid "" "There is one exeption: The B on files is stored as a property " "on the sever. You may think of this property as an information about the " @@ -703,7 +730,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:345 +#: mount.davfs.8:358 msgid "" "When the file system is unmounted, attributes of cached files (including " "owner and permissions) are stored in cache, as well as the attributs of the " @@ -712,30 +739,30 @@ msgid "" msgstr "" # type: SH -#: mount.davfs.8:347 umount.davfs.8:67 +#: mount.davfs.8:360 umount.davfs.8:67 #, no-wrap msgid "FILES" msgstr "" # type: TP -#: mount.davfs.8:349 +#: mount.davfs.8:362 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CONFIGFILE@>" msgstr "" # type: Plain text -#: mount.davfs.8:352 +#: mount.davfs.8:365 msgid "System wide configuration file." msgstr "" # type: TP -#: mount.davfs.8:353 +#: mount.davfs.8:366 #, no-wrap msgid "I<~/.@PACKAGE@/@CONFIGFILE@>" msgstr "" # type: Plain text -#: mount.davfs.8:358 +#: mount.davfs.8:371 msgid "" "Configuration file in the users home directory.The user configuration takes " "precedence over the system wide configuration. If it does not exist, " @@ -743,13 +770,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:359 +#: mount.davfs.8:372 #, no-wrap msgid "I<@SYS_CONF_DIR@/@SECRETSFILE@>" msgstr "" # type: Plain text -#: mount.davfs.8:364 +#: mount.davfs.8:377 msgid "" "Holds the credentials for WebDAV servers and the proxy, as well as " "decryption passwords for client certificates. The file must be read-writable " @@ -757,13 +784,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:365 +#: mount.davfs.8:378 #, no-wrap msgid "I<~/.@PACKAGE@/@SECRETSFILE@>" msgstr "" # type: Plain text -#: mount.davfs.8:375 +#: mount.davfs.8:388 msgid "" "Holds credentials for WebDAV servers and proxy, as well as decryption " "passwords for client certificates. The file must be read-writable by the " @@ -775,13 +802,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:376 +#: mount.davfs.8:389 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@>" msgstr "" # type: Plain text -#: mount.davfs.8:383 +#: mount.davfs.8:396 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -791,18 +818,18 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:385 mount.davfs.8:394 +#: mount.davfs.8:398 mount.davfs.8:407 msgid "Be sure to verify the certificate." msgstr "" # type: TP -#: mount.davfs.8:386 +#: mount.davfs.8:399 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@>" msgstr "" # type: Plain text -#: mount.davfs.8:392 +#: mount.davfs.8:405 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -811,13 +838,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:395 +#: mount.davfs.8:408 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "" # type: Plain text -#: mount.davfs.8:401 +#: mount.davfs.8:414 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<@SYS_CONF_DIR@/@CONFIGFILE@> or " @@ -826,13 +853,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:402 +#: mount.davfs.8:415 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "" # type: Plain text -#: mount.davfs.8:407 +#: mount.davfs.8:420 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<~/.@PACKAGE@/@CONFIGFILE@> to " @@ -840,13 +867,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:408 umount.davfs.8:69 +#: mount.davfs.8:421 umount.davfs.8:69 #, no-wrap msgid "I<@SYS_RUN@>" msgstr "" # type: Plain text -#: mount.davfs.8:414 +#: mount.davfs.8:427 msgid "" "PID-files of running mount.davfs processes are stored there. This directory " "must belong to group B<@USER@> with write permissions for the group and the " @@ -855,13 +882,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:415 +#: mount.davfs.8:428 #, no-wrap msgid "I<@SYS_CACHE_DIR@>" msgstr "" # type: Plain text -#: mount.davfs.8:422 +#: mount.davfs.8:435 msgid "" "System wide directory for cached files. Used when the file system is mounted " "by root. It must belong do group B<@USER@> and read, write and execute bits " @@ -871,39 +898,39 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:423 +#: mount.davfs.8:436 #, no-wrap msgid "I<~/.@PACKAGE@/cache>" msgstr "" # type: Plain text -#: mount.davfs.8:427 +#: mount.davfs.8:440 msgid "" "Cache directory in the mounting users home directory. For every mounted " "WebDAV resource a subdirectory is created." msgstr "" # type: Plain text -#: mount.davfs.8:431 +#: mount.davfs.8:444 msgid "" "B<@PROGRAM_NAME@> will try to create missing directories, but it will B " "touch I<@SYS_CONF_DIR@>." msgstr "" # type: SH -#: mount.davfs.8:432 +#: mount.davfs.8:445 #, no-wrap msgid "ENVIRONMENT" msgstr "" # type: TP -#: mount.davfs.8:434 +#: mount.davfs.8:447 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:439 +#: mount.davfs.8:452 msgid "" "If no proxy is defined in the configuration file the value is taken from " "this environment variables. The proxy may be given with or without scheme " @@ -911,23 +938,23 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:441 +#: mount.davfs.8:454 msgid "http_proxy=[http://]foo.bar[:3218]" msgstr "" # type: Plain text -#: mount.davfs.8:443 mount.davfs.8:451 +#: mount.davfs.8:456 mount.davfs.8:464 msgid "Only used when the mounting user is root." msgstr "" # type: TP -#: mount.davfs.8:444 +#: mount.davfs.8:457 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:449 +#: mount.davfs.8:462 msgid "" "A comma separated list of domain names that shall be accessed directly. " "B<*> matches any domain name. A domain name starting with B<.> (period) " @@ -935,85 +962,85 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:453 +#: mount.davfs.8:466 msgid "Not applied when the proxy is defined in I<@SYS_CONF_DIR@>." msgstr "" # type: SH -#: mount.davfs.8:455 +#: mount.davfs.8:468 #, no-wrap msgid "EXAMPLES" msgstr "" # type: Plain text -#: mount.davfs.8:458 +#: mount.davfs.8:471 msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:461 +#: mount.davfs.8:474 msgid "To allow an ordinary user to mount there must be an entry in I" msgstr "" # type: Plain text -#: mount.davfs.8:463 +#: mount.davfs.8:476 msgid "http://webdav.org/dav /media/dav davfs noauto,user 0 0" msgstr "" # type: Plain text -#: mount.davfs.8:468 +#: mount.davfs.8:481 msgid "" "If a proxy must be used this should be configured in I<@SYS_CONF_DIR@/" "@CONFIGFILE@>" msgstr "" # type: Plain text -#: mount.davfs.8:470 +#: mount.davfs.8:483 msgid "proxy proxy.mycompany.com:8080" msgstr "" # type: Plain text -#: mount.davfs.8:474 +#: mount.davfs.8:487 msgid "Credentials are stored in I" msgstr "" # type: Plain text -#: mount.davfs.8:476 +#: mount.davfs.8:489 msgid "proxy.mycompany.com filomena \"my secret\"" msgstr "" # type: Plain text -#: mount.davfs.8:478 +#: mount.davfs.8:491 msgid "/media/dav webdav-username password" msgstr "" # type: Plain text -#: mount.davfs.8:482 +#: mount.davfs.8:495 msgid "Now the WebDAV resource may be mounted by user filomena invoking" msgstr "" # type: Plain text -#: mount.davfs.8:484 +#: mount.davfs.8:497 msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:488 +#: mount.davfs.8:501 msgid "and unmounted by user filomena invoking" msgstr "" # type: Plain text -#: mount.davfs.8:490 +#: mount.davfs.8:503 msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:494 +#: mount.davfs.8:507 msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:500 +#: mount.davfs.8:513 msgid "" "Mounts the resource I at mount point I, encrypting all traffic with SSL. Credentials for I" msgstr "" # type: Plain text -#: mount.davfs.8:506 +#: mount.davfs.8:519 msgid "Mounts the resource I at I." msgstr "" # type: Plain text -#: mount.davfs.8:508 +#: mount.davfs.8:521 msgid "" "B" msgstr "" # type: SH -#: mount.davfs.8:511 umount.davfs.8:74 +#: mount.davfs.8:524 umount.davfs.8:74 #, no-wrap msgid "BUGS" msgstr "" # type: Plain text -#: mount.davfs.8:514 +#: mount.davfs.8:527 msgid "B<@PACKAGE@> does not support links." msgstr "" # type: Plain text -#: mount.davfs.8:516 +#: mount.davfs.8:529 msgid "A B<@PACKAGE@> file system cannot be moved with I." msgstr "" # type: Plain text -#: mount.davfs.8:522 +#: mount.davfs.8:535 msgid "" "This man page was written by Luciano Bello Eluciano@linux.org.arE " "for Debian, for version 0.2.3 of davfs2." msgstr "" # type: Plain text -#: mount.davfs.8:526 +#: mount.davfs.8:539 msgid "" "It has been updated for this version by Werner Baumann Ewerner." "baumann@onlinhome.deE." msgstr "" # type: Plain text -#: mount.davfs.8:529 +#: mount.davfs.8:542 msgid "@PACKAGE@ is developed by Sung Kim Ehunkim@gmail.comE." msgstr "" # type: Plain text -#: mount.davfs.8:533 +#: mount.davfs.8:546 msgid "" "Version 1.0.0 (and later) of @PACKAGE@ is a complete rewrite by Werner " "Baumann." msgstr "" # type: Plain text -#: mount.davfs.8:546 +#: mount.davfs.8:559 msgid "" "B(8), B<@CONFIGFILE@>(5), B(8), B(8), " "B(5)" diff --git a/po/cs.po b/po/cs.po index fcfc820..412453b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-10-10 18:44+0200\n" +"POT-Creation-Date: 2009-10-18 10:59+0200\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -72,9 +72,9 @@ msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" #: src/cache.c:2771 src/mount_davfs.c:594 src/mount_davfs.c:596 -#: src/mount_davfs.c:773 src/mount_davfs.c:775 src/mount_davfs.c:781 -#: src/mount_davfs.c:821 src/mount_davfs.c:823 src/mount_davfs.c:840 -#: src/mount_davfs.c:842 src/mount_davfs.c:1685 src/mount_davfs.c:1687 +#: src/mount_davfs.c:782 src/mount_davfs.c:784 src/mount_davfs.c:790 +#: src/mount_davfs.c:830 src/mount_davfs.c:832 src/mount_davfs.c:849 +#: src/mount_davfs.c:851 src/mount_davfs.c:1722 src/mount_davfs.c:1724 msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" @@ -200,7 +200,7 @@ msgid "unmounting failed" msgstr "odpojení selhalo" #: src/mount_davfs.c:434 src/mount_davfs.c:497 src/mount_davfs.c:580 -#: src/mount_davfs.c:845 +#: src/mount_davfs.c:854 #, c-format msgid "group %s does not exist" msgstr "skupina %s neexistuje" @@ -235,7 +235,7 @@ msgstr "nemohu změnit oprávnění (mode) adresáře %s" msgid "can't change group of directory %s" msgstr "nemohu změnit skupinu adresáře %s" -#: src/mount_davfs.c:613 src/mount_davfs.c:826 +#: src/mount_davfs.c:613 src/mount_davfs.c:835 msgid "can't read group data base" msgstr "nemohu přečíst údaje o skupinách" @@ -275,76 +275,81 @@ msgstr "v %s je jiné URL" msgid "different file system type in %s" msgstr "v %s je jiný souborový systém" -#: src/mount_davfs.c:702 +#: src/mount_davfs.c:704 #, c-format msgid "different config file in %s" msgstr "v %s je jiný konfigurační soubor" -#: src/mount_davfs.c:705 +#: src/mount_davfs.c:710 +#, fuzzy, c-format +msgid "different username in %s" +msgstr "v %s je odlišný dir_mode" + +#: src/mount_davfs.c:714 #, fuzzy, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "volba 'user' není v %s nastavena" -#: src/mount_davfs.c:708 +#: src/mount_davfs.c:717 #, fuzzy, c-format msgid "different option `user' in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:719 #, fuzzy, c-format msgid "different option `users' in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:713 +#: src/mount_davfs.c:722 #, c-format msgid "different mount options in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:716 +#: src/mount_davfs.c:725 #, c-format msgid "different uid in %s" msgstr "v %s je odlišné uid" -#: src/mount_davfs.c:718 +#: src/mount_davfs.c:727 #, c-format msgid "different gid in %s" msgstr "v %s je odlišné gid" -#: src/mount_davfs.c:720 +#: src/mount_davfs.c:729 #, c-format msgid "different dir_mode in %s" msgstr "v %s je odlišný dir_mode" -#: src/mount_davfs.c:722 +#: src/mount_davfs.c:731 #, c-format msgid "different file_mode in %s" msgstr "v %s je odlišný file_mode" -#: src/mount_davfs.c:750 +#: src/mount_davfs.c:759 #, c-format msgid "can't evaluate path of mount point %s" msgstr "nemohu vyhodnotit cestu k přípojnému bodu %s" -#: src/mount_davfs.c:755 +#: src/mount_davfs.c:764 #, c-format msgid "can't get home directory for uid %i" msgstr "nemohu zjistit domovský adresář pro uid %i" -#: src/mount_davfs.c:757 +#: src/mount_davfs.c:766 msgid "A relative mount point must lie within your home directory" msgstr "Relativní přípojný bod musí ležet ve vašem domovském adresáři" -#: src/mount_davfs.c:765 +#: src/mount_davfs.c:774 #, c-format msgid "invalid mount point %s" msgstr "neplatný přípojný bod %s" -#: src/mount_davfs.c:768 +#: src/mount_davfs.c:777 #, c-format msgid "mount point %s does not exist" msgstr "přípojný bod %s neexistuje" -#: src/mount_davfs.c:786 +#: src/mount_davfs.c:795 #, c-format msgid "" "%s is the home directory of user %s.\n" @@ -353,34 +358,34 @@ msgstr "" "%s je domovský adresář uživatele %s.\n" "Do domovského adresáře jiného uživatele nemůžete nic připojovat" -#: src/mount_davfs.c:814 +#: src/mount_davfs.c:823 msgid "you can't set file owner different from your uid" msgstr "nemůžete nastavit jiného vlastníka souboru než je vaše uid" -#: src/mount_davfs.c:832 +#: src/mount_davfs.c:841 msgid "you must be member of the group of the file system" msgstr "musíte být členem skupiny souborového systému" -#: src/mount_davfs.c:852 +#: src/mount_davfs.c:861 #, c-format msgid "user %s must be member of group %s" msgstr "uživatel %s musí být členem skupiny %s" -#: src/mount_davfs.c:875 +#: src/mount_davfs.c:884 #, c-format msgid "can't mount %s on %s" msgstr "není možno připojit %s do %s" -#: src/mount_davfs.c:877 +#: src/mount_davfs.c:886 #, c-format msgid "kernel does not know file system %s" msgstr "kernel nezná souborový systém %s" -#: src/mount_davfs.c:879 +#: src/mount_davfs.c:888 msgid "mount point is busy" msgstr "přípojný bod je zaneprázdněn" -#: src/mount_davfs.c:941 src/umount_davfs.c:88 +#: src/mount_davfs.c:950 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -391,50 +396,50 @@ msgstr "" "Program je poskytován BEZ JAKÉKOLIV záruky, včetně záruky PRODEJNOSTI či " "VHODNOSTI K URČITÉMU ÚČELU.\n" -#: src/mount_davfs.c:957 src/umount_davfs.c:113 +#: src/mount_davfs.c:966 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "neznámá chyba při zpracování argumentů" -#: src/mount_davfs.c:966 src/umount_davfs.c:119 +#: src/mount_davfs.c:975 src/umount_davfs.c:119 msgid "missing argument" msgstr "chybějící argument" -#: src/mount_davfs.c:979 src/umount_davfs.c:121 +#: src/mount_davfs.c:988 src/umount_davfs.c:121 msgid "too many arguments" msgstr "příliš mnoho argumentů" -#: src/mount_davfs.c:985 +#: src/mount_davfs.c:994 msgid "no mountpoint specified" msgstr "nebyl zadán žádný přípojný bod" -#: src/mount_davfs.c:990 +#: src/mount_davfs.c:999 msgid "no WebDAV-server specified" msgstr "nebyl zadán žádný WebDAV server" -#: src/mount_davfs.c:993 +#: src/mount_davfs.c:1002 msgid "invalid URL" msgstr "neplatné URL" -#: src/mount_davfs.c:1012 +#: src/mount_davfs.c:1021 msgid "can't determine home directory" msgstr "nelze určit domovský adresář" -#: src/mount_davfs.c:1090 src/webdav.c:407 +#: src/mount_davfs.c:1099 src/webdav.c:415 #, c-format msgid "can't read client certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:1095 +#: src/mount_davfs.c:1104 #, c-format msgid "client certificate file %s has wrong owner" msgstr "klientský certifikát %s má chybného vlastníka" -#: src/mount_davfs.c:1101 +#: src/mount_davfs.c:1110 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "soubor s klientským certifikátem %s má chybná oprávnění" -#: src/mount_davfs.c:1144 +#: src/mount_davfs.c:1162 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -444,11 +449,11 @@ msgstr "" "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1146 src/mount_davfs.c:1162 +#: src/mount_davfs.c:1164 src/mount_davfs.c:1184 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1150 +#: src/mount_davfs.c:1168 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -457,11 +462,12 @@ msgstr "" "Zadejte prosím heslo pro autentizaci uživatele %s na proxy\n" "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n" -#: src/mount_davfs.c:1152 src/mount_davfs.c:1168 src/webdav.c:414 +#: src/mount_davfs.c:1171 src/mount_davfs.c:1173 src/mount_davfs.c:1191 +#: src/mount_davfs.c:1193 src/webdav.c:422 msgid "Password: " msgstr "Heslo: " -#: src/mount_davfs.c:1160 +#: src/mount_davfs.c:1182 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -471,7 +477,7 @@ msgstr "" "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1166 +#: src/mount_davfs.c:1188 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -480,12 +486,12 @@ msgstr "" "Zadejte prosím heslo uživatele %s pro autentizaci na serveru\n" "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n" -#: src/mount_davfs.c:1215 +#: src/mount_davfs.c:1243 #, c-format msgid "pid %i, got signal %i" msgstr "pid %i dostal signál %i" -#: src/mount_davfs.c:1247 +#: src/mount_davfs.c:1275 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -493,62 +499,62 @@ msgstr "" "Varování: nelze přečíst údaje o uživatelích. Přesto připojuji, v mtab ale " "nebude žádný záznam." -#: src/mount_davfs.c:1264 +#: src/mount_davfs.c:1292 msgid "" "Warning: can't write entry into mtab, but will mount the file system anyway" msgstr "" "Varování: nelze zapsat položku do mtab, přesto souborový systém připojím" -#: src/mount_davfs.c:1290 +#: src/mount_davfs.c:1318 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "volba %s má neplatný argument; musí to být číslo v desítkové soustavě" -#: src/mount_davfs.c:1293 +#: src/mount_davfs.c:1321 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "volba %s má neplatný argument; musí to být číslo v osmičkové soustavě" -#: src/mount_davfs.c:1296 +#: src/mount_davfs.c:1324 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "volba %s má neplatný argument; musí to být číslo" -#: src/mount_davfs.c:1556 +#: src/mount_davfs.c:1588 #, c-format msgid "option %s requires argument" msgstr "volba %s vyžaduje argument" -#: src/mount_davfs.c:1647 +#: src/mount_davfs.c:1684 #, c-format msgid "Unknown option %s.\n" msgstr "Neznámá volba %s.\n" -#: src/mount_davfs.c:2102 src/mount_davfs.c:2325 src/mount_davfs.c:2337 +#: src/mount_davfs.c:2140 src/mount_davfs.c:2363 src/mount_davfs.c:2375 #, fuzzy, c-format msgid "opening %s failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:2123 src/mount_davfs.c:2163 src/mount_davfs.c:2252 -#: src/mount_davfs.c:2353 src/mount_davfs.c:2421 +#: src/mount_davfs.c:2161 src/mount_davfs.c:2201 src/mount_davfs.c:2290 +#: src/mount_davfs.c:2391 src/mount_davfs.c:2459 msgid "malformed line" msgstr "špatně zapsaný řádek" -#: src/mount_davfs.c:2233 src/mount_davfs.c:2246 +#: src/mount_davfs.c:2271 src/mount_davfs.c:2284 msgid "unknown option" msgstr "neznámá volba" -#: src/mount_davfs.c:2329 +#: src/mount_davfs.c:2367 #, c-format msgid "file %s has wrong owner" msgstr "soubor %s má chybného vlastníka" -#: src/mount_davfs.c:2332 +#: src/mount_davfs.c:2370 #, c-format msgid "file %s has wrong permissions" msgstr "soubor %s má chybná oprávnění" -#: src/mount_davfs.c:2559 +#: src/mount_davfs.c:2597 #, c-format msgid "" "Usage:\n" @@ -561,7 +567,7 @@ msgstr "" " %s -h,--help : vytiskne tuto zprávu\n" "\n" -#: src/mount_davfs.c:2563 +#: src/mount_davfs.c:2601 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -570,7 +576,7 @@ msgstr "" "Pro připojení zdroje WebDAV nevolejte přímo %s, ale\n" "použijte místo toho `mount'.\n" -#: src/mount_davfs.c:2565 +#: src/mount_davfs.c:2603 #, c-format msgid "" " mount : or\n" @@ -581,7 +587,7 @@ msgstr "" " mount : připojí zdroj WebDAV tak, jak je zadáno\n" " v /etc/fstab.\n" -#: src/mount_davfs.c:2568 +#: src/mount_davfs.c:2606 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -598,7 +604,7 @@ msgstr "" " označuje seznam voleb oddělených čárkou.\n" "\n" -#: src/mount_davfs.c:2573 +#: src/mount_davfs.c:2611 #, c-format msgid "" "Recognised options:\n" @@ -617,7 +623,7 @@ msgstr "" " file_mode= : výchozí mode souboru (v osmičkové soustavě)\n" " dir_mode= : výchozí mode adresáře (v osmičkové soustavě)\n" -#: src/mount_davfs.c:2579 +#: src/mount_davfs.c:2617 #, c-format msgid "" " ro : mount read-only\n" @@ -725,16 +731,16 @@ msgstr "selhala inicializace knihovny socketů" msgid "can't open stream to log neon-messages" msgstr "" -#: src/webdav.c:386 +#: src/webdav.c:394 msgid "neon library does not support TLS/SSL" msgstr "knihovna neon nepodporuje TLS/SSL" -#: src/webdav.c:394 +#: src/webdav.c:402 #, c-format msgid "can't read server certificate %s" msgstr "nemohu přečíst serverový cerifikát %s" -#: src/webdav.c:412 +#: src/webdav.c:420 #, c-format msgid "" "Please enter the password to decrypt client\n" @@ -743,78 +749,78 @@ msgstr "" "Zadejte prosím heslo pro dešifrování klientského\n" "certifikátu %s.\n" -#: src/webdav.c:426 +#: src/webdav.c:434 #, c-format msgid "can't decrypt client certificate %s" msgstr "nemohu dešifrovat klientský certifikát %s" -#: src/webdav.c:478 src/webdav.c:481 +#: src/webdav.c:486 src/webdav.c:489 msgid "mounting failed; the server does not support WebDAV" msgstr "připojení selhalo; server nepodporuje WebDAV" -#: src/webdav.c:489 +#: src/webdav.c:497 msgid "warning: the server does not support locks" msgstr "varování: server nepodporuje zámky" -#: src/webdav.c:1557 +#: src/webdav.c:1565 msgid "authentication failure:" msgstr "selhání autentizace:" -#: src/webdav.c:1595 +#: src/webdav.c:1603 #, c-format msgid "%i can't open cache file" msgstr "%i nemůže otevřít soubor vyrovnávací paměti" -#: src/webdav.c:1603 +#: src/webdav.c:1611 #, c-format msgid "%i error writing to cache file" msgstr "%i chyba při zápisu do souboru vyrovnávací paměti" -#: src/webdav.c:1913 src/webdav.c:1916 +#: src/webdav.c:1921 src/webdav.c:1924 msgid "error processing server certificate" msgstr "chyba při zpracování certifikátu serveru" -#: src/webdav.c:1923 src/webdav.c:1959 +#: src/webdav.c:1931 src/webdav.c:1967 msgid "the server certificate is not yet valid" msgstr "certifikát serveru zatím není platný" -#: src/webdav.c:1925 src/webdav.c:1962 +#: src/webdav.c:1933 src/webdav.c:1970 msgid "the server certificate has expired" msgstr "platnost certifikátu serveru vypršela" -#: src/webdav.c:1927 src/webdav.c:1965 +#: src/webdav.c:1935 src/webdav.c:1973 msgid "the server certificate does not match the server name" msgstr "certifikát serveru nedopovídá jménu serveru" -#: src/webdav.c:1929 src/webdav.c:1968 +#: src/webdav.c:1937 src/webdav.c:1976 msgid "the server certificate is not trusted" msgstr "certifikát serveru je nedůvěryhodný" -#: src/webdav.c:1931 src/webdav.c:1971 +#: src/webdav.c:1939 src/webdav.c:1979 msgid "unknown certificate error" msgstr "neznámá chyba certifikátu" -#: src/webdav.c:1932 +#: src/webdav.c:1940 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1934 +#: src/webdav.c:1942 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1936 +#: src/webdav.c:1944 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1938 +#: src/webdav.c:1946 #, c-format msgid " fingerprint: %s" msgstr " otisk: %s" -#: src/webdav.c:1941 +#: src/webdav.c:1949 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -825,27 +831,27 @@ msgstr "" "ověřit jeho otisk! Server může být podvržen nebo může\n" "dojít k útoku s prostředníkem (man-in-the-middle attack).\n" -#: src/webdav.c:1944 +#: src/webdav.c:1952 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Přijmout certifikát pro toto sezení? [y,N] " -#: src/webdav.c:1972 +#: src/webdav.c:1980 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1973 +#: src/webdav.c:1981 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1974 +#: src/webdav.c:1982 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1977 +#: src/webdav.c:1985 msgid " accepted by user" msgstr " přijat uživatelem" diff --git a/po/davfs2.pot b/po/davfs2.pot index 50fd1d0..0b9188a 100644 --- a/po/davfs2.pot +++ b/po/davfs2.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-10-10 18:44+0200\n" +"POT-Creation-Date: 2009-10-18 10:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,9 +67,9 @@ msgid "error writing directory %s" msgstr "" #: src/cache.c:2771 src/mount_davfs.c:594 src/mount_davfs.c:596 -#: src/mount_davfs.c:773 src/mount_davfs.c:775 src/mount_davfs.c:781 -#: src/mount_davfs.c:821 src/mount_davfs.c:823 src/mount_davfs.c:840 -#: src/mount_davfs.c:842 src/mount_davfs.c:1685 src/mount_davfs.c:1687 +#: src/mount_davfs.c:782 src/mount_davfs.c:784 src/mount_davfs.c:790 +#: src/mount_davfs.c:830 src/mount_davfs.c:832 src/mount_davfs.c:849 +#: src/mount_davfs.c:851 src/mount_davfs.c:1722 src/mount_davfs.c:1724 msgid "can't read user data base" msgstr "" @@ -194,7 +194,7 @@ msgid "unmounting failed" msgstr "" #: src/mount_davfs.c:434 src/mount_davfs.c:497 src/mount_davfs.c:580 -#: src/mount_davfs.c:845 +#: src/mount_davfs.c:854 #, c-format msgid "group %s does not exist" msgstr "" @@ -229,7 +229,7 @@ msgstr "" msgid "can't change group of directory %s" msgstr "" -#: src/mount_davfs.c:613 src/mount_davfs.c:826 +#: src/mount_davfs.c:613 src/mount_davfs.c:835 msgid "can't read group data base" msgstr "" @@ -266,261 +266,267 @@ msgstr "" msgid "different file system type in %s" msgstr "" -#: src/mount_davfs.c:702 +#: src/mount_davfs.c:704 #, c-format msgid "different config file in %s" msgstr "" -#: src/mount_davfs.c:705 +#: src/mount_davfs.c:710 +#, c-format +msgid "different username in %s" +msgstr "" + +#: src/mount_davfs.c:714 #, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "" -#: src/mount_davfs.c:708 +#: src/mount_davfs.c:717 #, c-format msgid "different option `user' in %s" msgstr "" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:719 #, c-format msgid "different option `users' in %s" msgstr "" -#: src/mount_davfs.c:713 +#: src/mount_davfs.c:722 #, c-format msgid "different mount options in %s" msgstr "" -#: src/mount_davfs.c:716 +#: src/mount_davfs.c:725 #, c-format msgid "different uid in %s" msgstr "" -#: src/mount_davfs.c:718 +#: src/mount_davfs.c:727 #, c-format msgid "different gid in %s" msgstr "" -#: src/mount_davfs.c:720 +#: src/mount_davfs.c:729 #, c-format msgid "different dir_mode in %s" msgstr "" -#: src/mount_davfs.c:722 +#: src/mount_davfs.c:731 #, c-format msgid "different file_mode in %s" msgstr "" -#: src/mount_davfs.c:750 +#: src/mount_davfs.c:759 #, c-format msgid "can't evaluate path of mount point %s" msgstr "" -#: src/mount_davfs.c:755 +#: src/mount_davfs.c:764 #, c-format msgid "can't get home directory for uid %i" msgstr "" -#: src/mount_davfs.c:757 +#: src/mount_davfs.c:766 msgid "A relative mount point must lie within your home directory" msgstr "" -#: src/mount_davfs.c:765 +#: src/mount_davfs.c:774 #, c-format msgid "invalid mount point %s" msgstr "" -#: src/mount_davfs.c:768 +#: src/mount_davfs.c:777 #, c-format msgid "mount point %s does not exist" msgstr "" -#: src/mount_davfs.c:786 +#: src/mount_davfs.c:795 #, c-format msgid "" "%s is the home directory of user %s.\n" "You can't mount into another users home directory" msgstr "" -#: src/mount_davfs.c:814 +#: src/mount_davfs.c:823 msgid "you can't set file owner different from your uid" msgstr "" -#: src/mount_davfs.c:832 +#: src/mount_davfs.c:841 msgid "you must be member of the group of the file system" msgstr "" -#: src/mount_davfs.c:852 +#: src/mount_davfs.c:861 #, c-format msgid "user %s must be member of group %s" msgstr "" -#: src/mount_davfs.c:875 +#: src/mount_davfs.c:884 #, c-format msgid "can't mount %s on %s" msgstr "" -#: src/mount_davfs.c:877 +#: src/mount_davfs.c:886 #, c-format msgid "kernel does not know file system %s" msgstr "" -#: src/mount_davfs.c:879 +#: src/mount_davfs.c:888 msgid "mount point is busy" msgstr "" -#: src/mount_davfs.c:941 src/umount_davfs.c:88 +#: src/mount_davfs.c:950 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/mount_davfs.c:957 src/umount_davfs.c:113 +#: src/mount_davfs.c:966 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "" -#: src/mount_davfs.c:966 src/umount_davfs.c:119 +#: src/mount_davfs.c:975 src/umount_davfs.c:119 msgid "missing argument" msgstr "" -#: src/mount_davfs.c:979 src/umount_davfs.c:121 +#: src/mount_davfs.c:988 src/umount_davfs.c:121 msgid "too many arguments" msgstr "" -#: src/mount_davfs.c:985 +#: src/mount_davfs.c:994 msgid "no mountpoint specified" msgstr "" -#: src/mount_davfs.c:990 +#: src/mount_davfs.c:999 msgid "no WebDAV-server specified" msgstr "" -#: src/mount_davfs.c:993 +#: src/mount_davfs.c:1002 msgid "invalid URL" msgstr "" -#: src/mount_davfs.c:1012 +#: src/mount_davfs.c:1021 msgid "can't determine home directory" msgstr "" -#: src/mount_davfs.c:1090 src/webdav.c:407 +#: src/mount_davfs.c:1099 src/webdav.c:415 #, c-format msgid "can't read client certificate %s" msgstr "" -#: src/mount_davfs.c:1095 +#: src/mount_davfs.c:1104 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:1101 +#: src/mount_davfs.c:1110 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:1144 +#: src/mount_davfs.c:1162 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1146 src/mount_davfs.c:1162 +#: src/mount_davfs.c:1164 src/mount_davfs.c:1184 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1150 +#: src/mount_davfs.c:1168 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1152 src/mount_davfs.c:1168 src/webdav.c:414 +#: src/mount_davfs.c:1171 src/mount_davfs.c:1173 src/mount_davfs.c:1191 +#: src/mount_davfs.c:1193 src/webdav.c:422 msgid "Password: " msgstr "" -#: src/mount_davfs.c:1160 +#: src/mount_davfs.c:1182 #, c-format msgid "" "Please enter the username to authenticate with server\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1166 +#: src/mount_davfs.c:1188 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1215 +#: src/mount_davfs.c:1243 #, c-format msgid "pid %i, got signal %i" msgstr "" -#: src/mount_davfs.c:1247 +#: src/mount_davfs.c:1275 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." msgstr "" -#: src/mount_davfs.c:1264 +#: src/mount_davfs.c:1292 msgid "" "Warning: can't write entry into mtab, but will mount the file system anyway" msgstr "" -#: src/mount_davfs.c:1290 +#: src/mount_davfs.c:1318 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "" -#: src/mount_davfs.c:1293 +#: src/mount_davfs.c:1321 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "" -#: src/mount_davfs.c:1296 +#: src/mount_davfs.c:1324 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "" -#: src/mount_davfs.c:1556 +#: src/mount_davfs.c:1588 #, c-format msgid "option %s requires argument" msgstr "" -#: src/mount_davfs.c:1647 +#: src/mount_davfs.c:1684 #, c-format msgid "Unknown option %s.\n" msgstr "" -#: src/mount_davfs.c:2102 src/mount_davfs.c:2325 src/mount_davfs.c:2337 +#: src/mount_davfs.c:2140 src/mount_davfs.c:2363 src/mount_davfs.c:2375 #, c-format msgid "opening %s failed" msgstr "" -#: src/mount_davfs.c:2123 src/mount_davfs.c:2163 src/mount_davfs.c:2252 -#: src/mount_davfs.c:2353 src/mount_davfs.c:2421 +#: src/mount_davfs.c:2161 src/mount_davfs.c:2201 src/mount_davfs.c:2290 +#: src/mount_davfs.c:2391 src/mount_davfs.c:2459 msgid "malformed line" msgstr "" -#: src/mount_davfs.c:2233 src/mount_davfs.c:2246 +#: src/mount_davfs.c:2271 src/mount_davfs.c:2284 msgid "unknown option" msgstr "" -#: src/mount_davfs.c:2329 +#: src/mount_davfs.c:2367 #, c-format msgid "file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:2332 +#: src/mount_davfs.c:2370 #, c-format msgid "file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:2559 +#: src/mount_davfs.c:2597 #, c-format msgid "" "Usage:\n" @@ -529,14 +535,14 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2563 +#: src/mount_davfs.c:2601 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" "`mount' instead.\n" msgstr "" -#: src/mount_davfs.c:2565 +#: src/mount_davfs.c:2603 #, c-format msgid "" " mount : or\n" @@ -544,7 +550,7 @@ msgid "" " /etc/fstab.\n" msgstr "" -#: src/mount_davfs.c:2568 +#: src/mount_davfs.c:2606 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -555,7 +561,7 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2573 +#: src/mount_davfs.c:2611 #, c-format msgid "" "Recognised options:\n" @@ -566,7 +572,7 @@ msgid "" " dir_mode= : default directory mode (octal)\n" msgstr "" -#: src/mount_davfs.c:2579 +#: src/mount_davfs.c:2617 #, c-format msgid "" " ro : mount read-only\n" @@ -648,94 +654,94 @@ msgstr "" msgid "can't open stream to log neon-messages" msgstr "" -#: src/webdav.c:386 +#: src/webdav.c:394 msgid "neon library does not support TLS/SSL" msgstr "" -#: src/webdav.c:394 +#: src/webdav.c:402 #, c-format msgid "can't read server certificate %s" msgstr "" -#: src/webdav.c:412 +#: src/webdav.c:420 #, c-format msgid "" "Please enter the password to decrypt client\n" "certificate %s.\n" msgstr "" -#: src/webdav.c:426 +#: src/webdav.c:434 #, c-format msgid "can't decrypt client certificate %s" msgstr "" -#: src/webdav.c:478 src/webdav.c:481 +#: src/webdav.c:486 src/webdav.c:489 msgid "mounting failed; the server does not support WebDAV" msgstr "" -#: src/webdav.c:489 +#: src/webdav.c:497 msgid "warning: the server does not support locks" msgstr "" -#: src/webdav.c:1557 +#: src/webdav.c:1565 msgid "authentication failure:" msgstr "" -#: src/webdav.c:1595 -#, c-format -msgid "%i can't open cache file" -msgstr "" - #: src/webdav.c:1603 #, c-format +msgid "%i can't open cache file" +msgstr "" + +#: src/webdav.c:1611 +#, c-format msgid "%i error writing to cache file" msgstr "" -#: src/webdav.c:1913 src/webdav.c:1916 +#: src/webdav.c:1921 src/webdav.c:1924 msgid "error processing server certificate" msgstr "" -#: src/webdav.c:1923 src/webdav.c:1959 +#: src/webdav.c:1931 src/webdav.c:1967 msgid "the server certificate is not yet valid" msgstr "" -#: src/webdav.c:1925 src/webdav.c:1962 +#: src/webdav.c:1933 src/webdav.c:1970 msgid "the server certificate has expired" msgstr "" -#: src/webdav.c:1927 src/webdav.c:1965 +#: src/webdav.c:1935 src/webdav.c:1973 msgid "the server certificate does not match the server name" msgstr "" -#: src/webdav.c:1929 src/webdav.c:1968 +#: src/webdav.c:1937 src/webdav.c:1976 msgid "the server certificate is not trusted" msgstr "" -#: src/webdav.c:1931 src/webdav.c:1971 +#: src/webdav.c:1939 src/webdav.c:1979 msgid "unknown certificate error" msgstr "" -#: src/webdav.c:1932 +#: src/webdav.c:1940 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:1934 +#: src/webdav.c:1942 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:1936 +#: src/webdav.c:1944 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:1938 +#: src/webdav.c:1946 #, c-format msgid " fingerprint: %s" msgstr "" -#: src/webdav.c:1941 +#: src/webdav.c:1949 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -743,26 +749,26 @@ msgid "" "or there might be a man-in-the-middle-attack.\n" msgstr "" -#: src/webdav.c:1944 +#: src/webdav.c:1952 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "" -#: src/webdav.c:1972 +#: src/webdav.c:1980 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:1973 +#: src/webdav.c:1981 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:1974 +#: src/webdav.c:1982 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:1977 +#: src/webdav.c:1985 msgid " accepted by user" msgstr "" diff --git a/po/de.po b/po/de.po index 5675d76..577ec36 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: davfs2 1.3.3\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-10-10 18:44+0200\n" +"POT-Creation-Date: 2009-10-18 10:59+0200\n" "PO-Revision-Date: 2009-01-02 12:26+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -72,9 +72,9 @@ msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" #: src/cache.c:2771 src/mount_davfs.c:594 src/mount_davfs.c:596 -#: src/mount_davfs.c:773 src/mount_davfs.c:775 src/mount_davfs.c:781 -#: src/mount_davfs.c:821 src/mount_davfs.c:823 src/mount_davfs.c:840 -#: src/mount_davfs.c:842 src/mount_davfs.c:1685 src/mount_davfs.c:1687 +#: src/mount_davfs.c:782 src/mount_davfs.c:784 src/mount_davfs.c:790 +#: src/mount_davfs.c:830 src/mount_davfs.c:832 src/mount_davfs.c:849 +#: src/mount_davfs.c:851 src/mount_davfs.c:1722 src/mount_davfs.c:1724 msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" @@ -202,7 +202,7 @@ msgid "unmounting failed" msgstr "das Aushängen schlug fehl" #: src/mount_davfs.c:434 src/mount_davfs.c:497 src/mount_davfs.c:580 -#: src/mount_davfs.c:845 +#: src/mount_davfs.c:854 #, c-format msgid "group %s does not exist" msgstr "die Gruppe %s existiert nicht" @@ -237,7 +237,7 @@ msgstr "kann die Rechte des Verzeichnisses %s nicht ändern" msgid "can't change group of directory %s" msgstr "kann die Gruppenkennung des Verneichnisses %s nicht ändern" -#: src/mount_davfs.c:613 src/mount_davfs.c:826 +#: src/mount_davfs.c:613 src/mount_davfs.c:835 msgid "can't read group data base" msgstr "kann die Gruppendatenbank nicht lesen" @@ -277,76 +277,81 @@ msgstr "in %s ist eine andere URL angegeben" msgid "different file system type in %s" msgstr "in %s ist ein anderer Dateisystemtyp angegeben" -#: src/mount_davfs.c:702 +#: src/mount_davfs.c:704 #, c-format msgid "different config file in %s" msgstr "in %s ist eine andere Konfigurationsdatei angegeben" -#: src/mount_davfs.c:705 +#: src/mount_davfs.c:710 +#, fuzzy, c-format +msgid "different username in %s" +msgstr "in %s ist ein anderer dir_mode angegeben" + +#: src/mount_davfs.c:714 #, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "in %s ist weder die Option „user” noch die Option „users” angegeben" -#: src/mount_davfs.c:708 +#: src/mount_davfs.c:717 #, c-format msgid "different option `user' in %s" msgstr "in %s ist die Option „user” anders gesetzt" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:719 #, c-format msgid "different option `users' in %s" msgstr "in %s ist die Option „users” anders gesetzt" -#: src/mount_davfs.c:713 +#: src/mount_davfs.c:722 #, c-format msgid "different mount options in %s" msgstr "in %s sind andere Mount-Optionen angegeben" -#: src/mount_davfs.c:716 +#: src/mount_davfs.c:725 #, c-format msgid "different uid in %s" msgstr "in %s ist eine andere uid angegeben" -#: src/mount_davfs.c:718 +#: src/mount_davfs.c:727 #, c-format msgid "different gid in %s" msgstr "in %s ist eine andere gid angegeben" -#: src/mount_davfs.c:720 +#: src/mount_davfs.c:729 #, c-format msgid "different dir_mode in %s" msgstr "in %s ist ein anderer dir_mode angegeben" -#: src/mount_davfs.c:722 +#: src/mount_davfs.c:731 #, c-format msgid "different file_mode in %s" msgstr "in %s ist ein anderer file_mode angegeben" -#: src/mount_davfs.c:750 +#: src/mount_davfs.c:759 #, c-format msgid "can't evaluate path of mount point %s" msgstr "kann den eindeutigen Pfad des Einhängepunktes %s nicht ermitteln" -#: src/mount_davfs.c:755 +#: src/mount_davfs.c:764 #, c-format msgid "can't get home directory for uid %i" msgstr "kann das Home-Verzeichnis für die Benutzer-ID %i nicht ermitteln" -#: src/mount_davfs.c:757 +#: src/mount_davfs.c:766 msgid "A relative mount point must lie within your home directory" msgstr "Ein relativer Einhängepunkt muss in deinem Home-Verzeichnis liegen" -#: src/mount_davfs.c:765 +#: src/mount_davfs.c:774 #, c-format msgid "invalid mount point %s" msgstr "der Einhängepunkt %s ist nicht erlaubt" -#: src/mount_davfs.c:768 +#: src/mount_davfs.c:777 #, c-format msgid "mount point %s does not exist" msgstr "der Einhängepunkt %s existiert nicht" -#: src/mount_davfs.c:786 +#: src/mount_davfs.c:795 #, c-format msgid "" "%s is the home directory of user %s.\n" @@ -355,36 +360,36 @@ msgstr "" "%s ist das Home-Verzeichnis des Benutzers %s. Du kannst im Home-Verzeichnis " "eines anderen Benutzers kein Dateisystem einhängen" -#: src/mount_davfs.c:814 +#: src/mount_davfs.c:823 msgid "you can't set file owner different from your uid" msgstr "" "du kannst als Besitzer des Dateisystems keine fremde Benutzerkennung angeben" -#: src/mount_davfs.c:832 +#: src/mount_davfs.c:841 msgid "you must be member of the group of the file system" msgstr "" "du musst Mitglied in der Gruppe sein, zu der das Dateisystem gehören soll" -#: src/mount_davfs.c:852 +#: src/mount_davfs.c:861 #, c-format msgid "user %s must be member of group %s" msgstr "der Benutzer %s muss Mitglied der Gruppe %s sein" -#: src/mount_davfs.c:875 +#: src/mount_davfs.c:884 #, c-format msgid "can't mount %s on %s" msgstr "kann %s nicht auf %s einhängen" -#: src/mount_davfs.c:877 +#: src/mount_davfs.c:886 #, c-format msgid "kernel does not know file system %s" msgstr "der Kernel kenn das Dateisystem %s nicht" -#: src/mount_davfs.c:879 +#: src/mount_davfs.c:888 msgid "mount point is busy" msgstr "das Einhängepunkt wird anderweitig benutzt" -#: src/mount_davfs.c:941 src/umount_davfs.c:88 +#: src/mount_davfs.c:950 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -395,54 +400,54 @@ msgstr "" "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE " "ZWECKE.\n" -#: src/mount_davfs.c:957 src/umount_davfs.c:113 +#: src/mount_davfs.c:966 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "Fehler beim Analysieren der Befehlsargumente" -#: src/mount_davfs.c:966 src/umount_davfs.c:119 +#: src/mount_davfs.c:975 src/umount_davfs.c:119 msgid "missing argument" msgstr "zu wenig Argumente" -#: src/mount_davfs.c:979 src/umount_davfs.c:121 +#: src/mount_davfs.c:988 src/umount_davfs.c:121 msgid "too many arguments" msgstr "zu viele Argumente" -#: src/mount_davfs.c:985 +#: src/mount_davfs.c:994 msgid "no mountpoint specified" msgstr "es wurde kein Einhängepunkt angegeben" -#: src/mount_davfs.c:990 +#: src/mount_davfs.c:999 msgid "no WebDAV-server specified" msgstr "es wurde kein WebDAV-Server angegeben" -#: src/mount_davfs.c:993 +#: src/mount_davfs.c:1002 msgid "invalid URL" msgstr "die URL ist ungültig" -#: src/mount_davfs.c:1012 +#: src/mount_davfs.c:1021 msgid "can't determine home directory" msgstr "kann das Home-Verzeichnis nicht ermitteln" -#: src/mount_davfs.c:1090 src/webdav.c:407 +#: src/mount_davfs.c:1099 src/webdav.c:415 #, c-format msgid "can't read client certificate %s" msgstr "kann das Client-Zertifikat %s nicht lesen" -#: src/mount_davfs.c:1095 +#: src/mount_davfs.c:1104 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" "die Datei %s\n" "des Client-Zertifikats hat den falschen Besitzer" -#: src/mount_davfs.c:1101 +#: src/mount_davfs.c:1110 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" "die Dateirechte für das Cient-Zertifikat\n" "%s sind falsch" -#: src/mount_davfs.c:1144 +#: src/mount_davfs.c:1162 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -451,11 +456,11 @@ msgstr "" "Gib bitte den Benutzernamen für den Proxy %s an; wenn du keinen angeben " "willst, drücke Return.\n" -#: src/mount_davfs.c:1146 src/mount_davfs.c:1162 +#: src/mount_davfs.c:1164 src/mount_davfs.c:1184 msgid "Username:" msgstr "Benutzername:" -#: src/mount_davfs.c:1150 +#: src/mount_davfs.c:1168 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -464,11 +469,12 @@ msgstr "" "Gib bitte das Passwort von %s für den Proxy %s\n" "an; wenn du keines angeben willst, drücke Return.\n" -#: src/mount_davfs.c:1152 src/mount_davfs.c:1168 src/webdav.c:414 +#: src/mount_davfs.c:1171 src/mount_davfs.c:1173 src/mount_davfs.c:1191 +#: src/mount_davfs.c:1193 src/webdav.c:422 msgid "Password: " msgstr "Passwort:" -#: src/mount_davfs.c:1160 +#: src/mount_davfs.c:1182 #, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -477,7 +483,7 @@ msgstr "" "Gib bitte den Benutzernamen für den Server %s an; wenn du keinen angeben " "willst, drücke Return.\n" -#: src/mount_davfs.c:1166 +#: src/mount_davfs.c:1188 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -486,12 +492,12 @@ msgstr "" "Gib bitte das Passwort von %s für den Server %s\n" "an; wenn du keines angeben willst, drücke Return.\n" -#: src/mount_davfs.c:1215 +#: src/mount_davfs.c:1243 #, c-format msgid "pid %i, got signal %i" msgstr "PID %i, erhielt Signal %i" -#: src/mount_davfs.c:1247 +#: src/mount_davfs.c:1275 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -499,63 +505,63 @@ msgstr "" "Warnung: kann die Benutzerdatenbank nicht lesen. Ich hänge das Dateisystem " "trotzdem ein, aber der Eintrag in der mtab wird fehlen." -#: src/mount_davfs.c:1264 +#: src/mount_davfs.c:1292 msgid "" "Warning: can't write entry into mtab, but will mount the file system anyway" msgstr "" "Warnung: kann keinen Eintrag in die mtab schreiben, häne das Dateisystem " "trotzdem ein." -#: src/mount_davfs.c:1290 +#: src/mount_davfs.c:1318 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "das Argument der Option %s ist ungültig; es muss eine Dezimalzahl sein" -#: src/mount_davfs.c:1293 +#: src/mount_davfs.c:1321 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "das Argument der Option %s ist ungültig; es muss eine Oktalzahl sein" -#: src/mount_davfs.c:1296 +#: src/mount_davfs.c:1324 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "das Argument der Option %s ist ungültig; es muss eine Zahl sein" -#: src/mount_davfs.c:1556 +#: src/mount_davfs.c:1588 #, c-format msgid "option %s requires argument" msgstr "die Option %s verlangt ein Argument" -#: src/mount_davfs.c:1647 +#: src/mount_davfs.c:1684 #, c-format msgid "Unknown option %s.\n" msgstr "unbekannte Option %s.\n" -#: src/mount_davfs.c:2102 src/mount_davfs.c:2325 src/mount_davfs.c:2337 +#: src/mount_davfs.c:2140 src/mount_davfs.c:2363 src/mount_davfs.c:2375 #, c-format msgid "opening %s failed" msgstr "konnte %s nicht öffnen" -#: src/mount_davfs.c:2123 src/mount_davfs.c:2163 src/mount_davfs.c:2252 -#: src/mount_davfs.c:2353 src/mount_davfs.c:2421 +#: src/mount_davfs.c:2161 src/mount_davfs.c:2201 src/mount_davfs.c:2290 +#: src/mount_davfs.c:2391 src/mount_davfs.c:2459 msgid "malformed line" msgstr "Syntaxfehler in der Zeile" -#: src/mount_davfs.c:2233 src/mount_davfs.c:2246 +#: src/mount_davfs.c:2271 src/mount_davfs.c:2284 msgid "unknown option" msgstr "unbekannte Option" -#: src/mount_davfs.c:2329 +#: src/mount_davfs.c:2367 #, c-format msgid "file %s has wrong owner" msgstr "die Datei %s hat den falschen Besitzer" -#: src/mount_davfs.c:2332 +#: src/mount_davfs.c:2370 #, c-format msgid "file %s has wrong permissions" msgstr "die Dateirechte für %s sind falsch" -#: src/mount_davfs.c:2559 +#: src/mount_davfs.c:2597 #, c-format msgid "" "Usage:\n" @@ -568,7 +574,7 @@ msgstr "" " %s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/mount_davfs.c:2563 +#: src/mount_davfs.c:2601 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -577,7 +583,7 @@ msgstr "" "Um eine WebDAV-Resource zu einzuhängen, sollte %s nicht direkt\n" "aufgerufen werden; stattdessen sollte „mount” benutzt werden.\n" -#: src/mount_davfs.c:2565 +#: src/mount_davfs.c:2603 #, c-format msgid "" " mount : or\n" @@ -588,7 +594,7 @@ msgstr "" " mount : hänge die WebDAV-Resource entsprechend den\n" " Angaben in /etc/fstab ein.\n" -#: src/mount_davfs.c:2568 +#: src/mount_davfs.c:2606 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -605,7 +611,7 @@ msgstr "" " Kommas unterteilte Liste von Optionen.\n" "\n" -#: src/mount_davfs.c:2573 +#: src/mount_davfs.c:2611 #, c-format msgid "" "Recognised options:\n" @@ -622,7 +628,7 @@ msgstr "" " file_mode= : Standard-Rechte für Dateien (oktal)\n" " dir_mode= : Standard-Rechte für Verzeichnisse (oktal)\n" -#: src/mount_davfs.c:2579 +#: src/mount_davfs.c:2617 #, c-format msgid "" " ro : mount read-only\n" @@ -732,16 +738,16 @@ msgstr "die socket-Bibliothek konnte nicht initialisiert werden" msgid "can't open stream to log neon-messages" msgstr "kann die Ausgabe für neon-Log-Meldungen nicht öffnen" -#: src/webdav.c:386 +#: src/webdav.c:394 msgid "neon library does not support TLS/SSL" msgstr "die Neon-Bibliothek uterstützt TLS/SSL nicht" -#: src/webdav.c:394 +#: src/webdav.c:402 #, c-format msgid "can't read server certificate %s" msgstr "kann das Server-Zertifikat %s nicht lesen" -#: src/webdav.c:412 +#: src/webdav.c:420 #, c-format msgid "" "Please enter the password to decrypt client\n" @@ -750,78 +756,78 @@ msgstr "" "Gib bitte das Passwort für die Entschlüsselung des\n" "Client-Zertifikats %s ein.\n" -#: src/webdav.c:426 +#: src/webdav.c:434 #, c-format msgid "can't decrypt client certificate %s" msgstr "kann das Zertifikat %s nicht entschlüsseln" -#: src/webdav.c:478 src/webdav.c:481 +#: src/webdav.c:486 src/webdav.c:489 msgid "mounting failed; the server does not support WebDAV" msgstr "das Einhängen schlug fehl; der Server unterstützt WebDAV nicht" -#: src/webdav.c:489 +#: src/webdav.c:497 msgid "warning: the server does not support locks" msgstr "Warnung: der Server kann Dateien nicht sperren" -#: src/webdav.c:1557 +#: src/webdav.c:1565 msgid "authentication failure:" msgstr "Authentifizierungsfehler" -#: src/webdav.c:1595 +#: src/webdav.c:1603 #, c-format msgid "%i can't open cache file" msgstr "%i kann die Cache-Datei nicht öffnen" -#: src/webdav.c:1603 +#: src/webdav.c:1611 #, c-format msgid "%i error writing to cache file" msgstr "%i Fehler beim Schreiben der Cache-Datei" -#: src/webdav.c:1913 src/webdav.c:1916 +#: src/webdav.c:1921 src/webdav.c:1924 msgid "error processing server certificate" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1923 src/webdav.c:1959 +#: src/webdav.c:1931 src/webdav.c:1967 msgid "the server certificate is not yet valid" msgstr "das Server-Zertifikat ist noch nicht gültig" -#: src/webdav.c:1925 src/webdav.c:1962 +#: src/webdav.c:1933 src/webdav.c:1970 msgid "the server certificate has expired" msgstr "das Server-Zertifikat ist nicht mehr gültig" -#: src/webdav.c:1927 src/webdav.c:1965 +#: src/webdav.c:1935 src/webdav.c:1973 msgid "the server certificate does not match the server name" msgstr "das Server-Zertifikat passt nicht zum Namen des Servers" -#: src/webdav.c:1929 src/webdav.c:1968 +#: src/webdav.c:1937 src/webdav.c:1976 msgid "the server certificate is not trusted" msgstr "wir trauen dem Zertifikat nicht" -#: src/webdav.c:1931 src/webdav.c:1971 +#: src/webdav.c:1939 src/webdav.c:1979 msgid "unknown certificate error" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1932 +#: src/webdav.c:1940 #, c-format msgid " issuer: %s" msgstr " Aussteller: %s" -#: src/webdav.c:1934 +#: src/webdav.c:1942 #, c-format msgid " subject: %s" msgstr " Inhaber: %s" -#: src/webdav.c:1936 +#: src/webdav.c:1944 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1938 +#: src/webdav.c:1946 #, c-format msgid " fingerprint: %s" msgstr " Fingerabdruck: %s" -#: src/webdav.c:1941 +#: src/webdav.c:1949 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -832,26 +838,26 @@ msgstr "" "dass der Fingerabdruck stimmt. Der Server könnte gefälscht sein oder\n" "ein Angreifer könnte sich in die Verbindung zum Server eingeschaltet haben.\n" -#: src/webdav.c:1944 +#: src/webdav.c:1952 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Ich akzeptiere das Zertifikat für diese Sitzung [j,N]: " -#: src/webdav.c:1972 +#: src/webdav.c:1980 #, c-format msgid " issuer: %s" msgstr " Aussteller des Zertifikats: %s" -#: src/webdav.c:1973 +#: src/webdav.c:1981 #, c-format msgid " subject: %s" msgstr " Inhaber des Zertifikats: %s" -#: src/webdav.c:1974 +#: src/webdav.c:1982 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1977 +#: src/webdav.c:1985 msgid " accepted by user" msgstr " durch den Benutzer akzeptiert" diff --git a/src/mount_davfs.c b/src/mount_davfs.c index 6a5adc1..807d03e 100644 --- a/src/mount_davfs.c +++ b/src/mount_davfs.c @@ -681,7 +681,7 @@ check_fstab(const dav_args *args) setfsent(); struct fstab *ft = getfsfile(mpoint); - if (!ft) + if (!ft || !ft->fs_spec) error(EXIT_FAILURE, 0, _("no entry for %s found in %s"), url, _PATH_FSTAB); @@ -695,11 +695,20 @@ check_fstab(const dav_args *args) if (ft->fs_mntops) get_options(n_args, ft->fs_mntops); - if (strcmp(DAV_FS_TYPE, ft->fs_vfstype) != 0) + if (! ft->fs_vfstype || strcmp(DAV_FS_TYPE, ft->fs_vfstype) != 0) error(EXIT_FAILURE, 0, _("different file system type in %s"), _PATH_FSTAB); - if (strcmp(args->conf, n_args->conf) != 0) - error(EXIT_FAILURE, 0, _("different config file in %s"), _PATH_FSTAB); + if (args->conf || n_args->conf) { + if (!args->conf || !n_args->conf + || strcmp(args->conf, n_args->conf) != 0) + error(EXIT_FAILURE, 0, _("different config file in %s"), + _PATH_FSTAB); + } + if (args->cl_username || n_args->cl_username) { + if (!args->cl_username || !n_args->cl_username + || strcmp(args->cl_username, n_args->cl_username) != 0) + error(EXIT_FAILURE, 0, _("different username in %s"), _PATH_FSTAB); + } if (!n_args->user && !n_args->users) error(EXIT_FAILURE, 0, _("neither option `user' nor option `users' set in %s"), @@ -1140,6 +1149,15 @@ parse_secrets(dav_args *args) read_secrets(args, args->secrets); } + if (args->cl_username) { + if (args->username) + free(args->username); + if (args->password) + free(args->password); + args->username = args->cl_username; + args->cl_username = NULL; + } + if (args->askauth && args->useproxy && !args->p_user) { printf(_("Please enter the username to authenticate with proxy\n" "%s or hit enter for none.\n"), args->p_host); @@ -1184,6 +1202,8 @@ parse_secrets(dav_args *args) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Secrets:"); syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), " username: %s", args->username); + syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), + " cl_username: %s", args->cl_username); syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), " password: %s", args->password); syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), @@ -1417,6 +1437,8 @@ delete_args(dav_args *args) memset(args->username, '\0', strlen(args->username)); free(args->username); } + if (args->cl_username) + free(args->cl_username); if (args->password) { memset(args->password, '\0', strlen(args->password)); free(args->password); @@ -1502,6 +1524,7 @@ get_options(dav_args *args, char *option) { enum { CONF = 0, + USERNAME, UID, GID, FILE_MODE, @@ -1527,6 +1550,7 @@ get_options(dav_args *args, char *option) }; char *suboptions[] = { [CONF] = "conf", + [USERNAME] = "username", [UID] = "uid", [GID] = "gid", [FILE_MODE] = "file_mode", @@ -1568,6 +1592,11 @@ get_options(dav_args *args, char *option) free(args->conf); args->conf = ne_strdup(argument); break; + case USERNAME: + if (args->cl_username) + free(args->cl_username); + args->cl_username = ne_strdup(argument); + break; case UID: pwd = getpwnam(argument); if (!pwd) { @@ -1735,6 +1764,7 @@ new_args(void) args->secrets = NULL; } args->username = NULL; + args->cl_username = NULL; args->password = NULL; args->clicert = NULL; args->clicert_pw = NULL; diff --git a/src/mount_davfs.h b/src/mount_davfs.h index a38a1fa..a016072 100644 --- a/src/mount_davfs.h +++ b/src/mount_davfs.h @@ -58,6 +58,7 @@ typedef struct { char *servercert; /* User config file, system config file */ char *secrets; /* User config file */ char *username; /* User secrets file, system secrets file */ + char *cl_username; /* Command line */ char *password; /* User secrets file, system secrets file */ char *clicert; /* User config file, system config file */ char *clicert_pw; /* User secrets file, system secrets file */