diff --git a/ChangeLog b/ChangeLog index af644d1..2cfd5c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ ChangeLog for davfs2 -------------------- +2020-06-05 Werner Baumann (werner.baumann@onlinehome.de) + * configure.ac, defaults.h, etc/davfs2.conf, + mount_davfs.h, mount_davfs.c, new_args, read_config, + webdav.c, dav_init_wbdav: + Add option sharepoint_href_bug. + 2020-02-07 Werner Baumann (werner.baumann@onlinehome.de) * mount_davfs.c, parse_commandline: Ignore option -n (sr #110191). diff --git a/configure.ac b/configure.ac index e577488..30f4572 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ gl_INIT # Checks for libraries. AM_GNU_GETTEXT_VERSION(0.19) AM_GNU_GETTEXT([external]) -NE_REQUIRE_VERSIONS([0], [27 28 29 30]) +NE_REQUIRE_VERSIONS([0], [27 28 29 30 31]) DAV_CHECK_NEON # Checks for header files. diff --git a/etc/davfs2.conf b/etc/davfs2.conf index 0f7d3d9..5687bf9 100644 --- a/etc/davfs2.conf +++ b/etc/davfs2.conf @@ -46,6 +46,7 @@ # ignore_dav_header 0 # use_compression 1 # min_propset 0 +# sharepoint_href_bug 0 # server_charset # connect_timeout 10 # seconds # read_timeout 30 # seconds diff --git a/po/cs.po b/po/cs.po index b940e0a..e106161 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: 2019-12-08 17:34+0100\n" +"POT-Creation-Date: 2020-06-05 11:05+0200\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -82,7 +82,7 @@ msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" -#: src/cache.c:2661 src/mount_davfs.c:1034 +#: src/cache.c:2661 src/mount_davfs.c:1036 #, c-format msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" @@ -231,8 +231,8 @@ msgstr "soubor %s má chybného vlastníka" msgid "file %s has wrong permissions" msgstr "soubor %s má chybná oprávnění" -#: src/mount_davfs.c:648 src/mount_davfs.c:700 src/mount_davfs.c:1335 -#: src/mount_davfs.c:1339 +#: src/mount_davfs.c:648 src/mount_davfs.c:700 src/mount_davfs.c:1337 +#: src/mount_davfs.c:1341 #, c-format msgid "can't open file %s" msgstr "nemohu otevřít soubor %s" @@ -323,12 +323,12 @@ msgstr "musíte být členem skupiny souborového systému" msgid "user %s must be member of group %s" msgstr "uživatel %s musí být členem skupiny %s" -#: src/mount_davfs.c:820 src/mount_davfs.c:1160 +#: src/mount_davfs.c:820 src/mount_davfs.c:1162 #, c-format msgid "can't change effective user id" msgstr "nemohu změnit identifikátor efektivního uživatele" -#: src/mount_davfs.c:864 src/umount_davfs.c:89 +#: src/mount_davfs.c:865 src/umount_davfs.c:89 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -339,67 +339,67 @@ 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:880 src/umount_davfs.c:115 +#: src/mount_davfs.c:882 src/umount_davfs.c:115 #, c-format msgid "unknown error parsing arguments" msgstr "neznámá chyba při zpracování argumentů" -#: src/mount_davfs.c:889 src/umount_davfs.c:121 +#: src/mount_davfs.c:891 src/umount_davfs.c:121 #, c-format msgid "missing argument" msgstr "chybějící argument" -#: src/mount_davfs.c:902 +#: src/mount_davfs.c:904 #, 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:905 src/umount_davfs.c:123 +#: src/mount_davfs.c:907 src/umount_davfs.c:123 #, c-format msgid "too many arguments" msgstr "příliš mnoho argumentů" -#: src/mount_davfs.c:912 +#: src/mount_davfs.c:914 #, c-format 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:917 +#: src/mount_davfs.c:919 #, c-format msgid "no WebDAV-server specified" msgstr "nebyl zadán žádný WebDAV server" -#: src/mount_davfs.c:920 +#: src/mount_davfs.c:922 #, c-format msgid "invalid URL" msgstr "neplatné URL" -#: src/mount_davfs.c:950 +#: src/mount_davfs.c:952 #, c-format msgid "user %s does not exist" msgstr "uživatel %s neexistuje" -#: src/mount_davfs.c:958 +#: src/mount_davfs.c:960 #, c-format msgid "group %s does not exist" msgstr "skupina %s neexistuje" -#: src/mount_davfs.c:1025 +#: src/mount_davfs.c:1027 #, c-format msgid "program is not setuid root" msgstr "program není spuštěn jako setuid root" -#: src/mount_davfs.c:1043 +#: src/mount_davfs.c:1045 #, c-format msgid "can't read group data base" msgstr "nemohu přečíst údaje o skupinách" -#: src/mount_davfs.c:1070 src/mount_davfs.c:1083 src/mount_davfs.c:1085 -#: src/mount_davfs.c:1103 src/mount_davfs.c:1105 src/mount_davfs.c:1120 +#: src/mount_davfs.c:1072 src/mount_davfs.c:1085 src/mount_davfs.c:1087 +#: src/mount_davfs.c:1105 src/mount_davfs.c:1107 src/mount_davfs.c:1122 msgid "Password: " msgstr "Heslo: " -#: src/mount_davfs.c:1074 +#: src/mount_davfs.c:1076 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -409,11 +409,11 @@ msgstr "" "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1076 src/mount_davfs.c:1096 +#: src/mount_davfs.c:1078 src/mount_davfs.c:1098 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1080 +#: src/mount_davfs.c:1082 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -422,7 +422,7 @@ 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:1094 +#: src/mount_davfs.c:1096 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -432,7 +432,7 @@ msgstr "" "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1100 +#: src/mount_davfs.c:1102 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -441,7 +441,7 @@ 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:1118 +#: src/mount_davfs.c:1120 #, c-format msgid "" "Please enter the password to decrypt client\n" @@ -450,100 +450,105 @@ msgstr "" "Zadejte prosím heslo pro dešifrování klientského\n" "certifikátu %s.\n" -#: src/mount_davfs.c:1125 +#: src/mount_davfs.c:1127 #, c-format msgid "can't decrypt client certificate %s" msgstr "nemohu dešifrovat klientský certifikát %s" -#: src/mount_davfs.c:1188 +#: src/mount_davfs.c:1190 #, c-format msgid "pid %i, got signal %i" msgstr "pid %i dostal signál %i" -#: src/mount_davfs.c:1252 +#: src/mount_davfs.c:1254 #, fuzzy, c-format msgid "can't create file %s" msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" -#: src/mount_davfs.c:1256 +#: src/mount_davfs.c:1258 #, fuzzy, c-format msgid "can't lock file %s" msgstr "nemohu otevřít soubor %s" -#: src/mount_davfs.c:1278 +#: src/mount_davfs.c:1280 #, fuzzy, c-format msgid "" "Warning: can't write entry into %s, 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:1314 +#: src/mount_davfs.c:1316 #, 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:1317 +#: src/mount_davfs.c:1319 #, 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:1320 +#: src/mount_davfs.c:1322 #, 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:1346 +#: src/mount_davfs.c:1348 #, fuzzy, c-format msgid "error writing to file %s" msgstr "chyba při zápisu nového indexového souboru %s" -#: src/mount_davfs.c:1593 +#: src/mount_davfs.c:1595 #, c-format msgid "option %s requires argument" msgstr "volba %s vyžaduje argument" -#: src/mount_davfs.c:1681 +#: src/mount_davfs.c:1683 #, c-format msgid "Unknown option %s.\n" msgstr "Neznámá volba %s.\n" -#: src/mount_davfs.c:2071 +#: src/mount_davfs.c:2074 #, fuzzy, c-format msgid "can't read certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:2103 src/mount_davfs.c:2116 +#: src/mount_davfs.c:2106 src/mount_davfs.c:2119 #, c-format msgid "can't read client certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:2107 +#: src/mount_davfs.c:2110 #, c-format msgid "client certificate file %s has wrong owner" msgstr "klientský certifikát %s má chybného vlastníka" -#: src/mount_davfs.c:2111 +#: src/mount_davfs.c:2114 #, 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:2133 src/mount_davfs.c:2366 +#: src/mount_davfs.c:2136 src/mount_davfs.c:2376 #, fuzzy, c-format msgid "opening %s failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:2154 src/mount_davfs.c:2198 src/mount_davfs.c:2296 -#: src/mount_davfs.c:2393 src/mount_davfs.c:2451 src/mount_davfs.c:2464 +#: src/mount_davfs.c:2157 src/mount_davfs.c:2201 src/mount_davfs.c:2306 +#: src/mount_davfs.c:2403 src/mount_davfs.c:2461 src/mount_davfs.c:2474 #, c-format msgid "malformed line" msgstr "špatně zapsaný řádek" -#: src/mount_davfs.c:2274 src/mount_davfs.c:2290 +#: src/mount_davfs.c:2236 +#, c-format +msgid "Option sharepoint_href_bug requires Neon version 0.31 or newer" +msgstr "" + +#: src/mount_davfs.c:2284 src/mount_davfs.c:2300 #, c-format msgid "unknown option" msgstr "neznámá volba" -#: src/mount_davfs.c:2596 +#: src/mount_davfs.c:2606 #, c-format msgid "" "Usage:\n" @@ -556,7 +561,7 @@ msgstr "" " %s -h,--help : vytiskne tuto zprávu\n" "\n" -#: src/mount_davfs.c:2600 +#: src/mount_davfs.c:2610 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -565,7 +570,7 @@ msgstr "" "Pro připojení zdroje WebDAV nevolejte přímo %s, ale\n" "použijte místo toho `mount'.\n" -#: src/mount_davfs.c:2602 +#: src/mount_davfs.c:2612 #, c-format msgid "" " mount : or\n" @@ -576,7 +581,7 @@ msgstr "" " mount : připojí zdroj WebDAV tak, jak je zadáno\n" " v /etc/fstab.\n" -#: src/mount_davfs.c:2605 +#: src/mount_davfs.c:2615 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -593,7 +598,7 @@ msgstr "" " označuje seznam voleb oddělených čárkou.\n" "\n" -#: src/mount_davfs.c:2610 +#: src/mount_davfs.c:2620 #, c-format msgid "" "Recognised options:\n" @@ -612,7 +617,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:2616 +#: src/mount_davfs.c:2626 #, fuzzy, c-format msgid "" " ro : mount read-only\n" @@ -732,86 +737,86 @@ msgstr "selhala inicializace knihovny socketů" msgid "can't open stream to log neon-messages" msgstr "" -#: src/webdav.c:399 +#: src/webdav.c:404 #, c-format msgid "neon library does not support TLS/SSL" msgstr "knihovna neon nepodporuje TLS/SSL" -#: src/webdav.c:473 src/webdav.c:476 +#: src/webdav.c:478 src/webdav.c:481 #, c-format msgid "mounting failed; the server does not support WebDAV" msgstr "připojení selhalo; server nepodporuje WebDAV" -#: src/webdav.c:484 +#: src/webdav.c:489 #, c-format msgid "warning: the server does not support locks" msgstr "varování: server nepodporuje zámky" -#: src/webdav.c:1492 +#: src/webdav.c:1497 msgid "authentication failure:" msgstr "selhání autentizace:" -#: src/webdav.c:1530 +#: src/webdav.c:1535 #, c-format msgid "%i can't open cache file" msgstr "%i nemůže otevřít soubor vyrovnávací paměti" -#: src/webdav.c:1538 +#: src/webdav.c:1543 #, 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:1799 src/webdav.c:1828 src/webdav.c:1865 +#: src/webdav.c:1804 src/webdav.c:1833 src/webdav.c:1870 #, c-format msgid "the server certificate is not trusted" msgstr "certifikát serveru je nedůvěryhodný" -#: src/webdav.c:1808 src/webdav.c:1811 +#: src/webdav.c:1813 src/webdav.c:1816 #, c-format msgid "error processing server certificate" msgstr "chyba při zpracování certifikátu serveru" -#: src/webdav.c:1822 src/webdav.c:1856 +#: src/webdav.c:1827 src/webdav.c:1861 #, c-format msgid "the server certificate is not yet valid" msgstr "certifikát serveru zatím není platný" -#: src/webdav.c:1824 src/webdav.c:1859 +#: src/webdav.c:1829 src/webdav.c:1864 #, c-format msgid "the server certificate has expired" msgstr "platnost certifikátu serveru vypršela" -#: src/webdav.c:1826 src/webdav.c:1862 +#: src/webdav.c:1831 src/webdav.c:1867 #, c-format msgid "the server certificate does not match the server name" msgstr "certifikát serveru nedopovídá jménu serveru" -#: src/webdav.c:1830 src/webdav.c:1868 +#: src/webdav.c:1835 src/webdav.c:1873 #, c-format msgid "unknown certificate error" msgstr "neznámá chyba certifikátu" -#: src/webdav.c:1831 +#: src/webdav.c:1836 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1833 +#: src/webdav.c:1838 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1835 +#: src/webdav.c:1840 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1837 +#: src/webdav.c:1842 #, c-format msgid " fingerprint: %s" msgstr " otisk: %s" -#: src/webdav.c:1839 +#: src/webdav.c:1844 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -822,27 +827,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:1842 +#: src/webdav.c:1847 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Přijmout certifikát pro toto sezení? [y,N] " -#: src/webdav.c:1869 +#: src/webdav.c:1874 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1870 +#: src/webdav.c:1875 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1871 +#: src/webdav.c:1876 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1874 +#: src/webdav.c:1879 msgid " accepted by user" msgstr " přijat uživatelem" diff --git a/po/davfs2.pot b/po/davfs2.pot index 09c4b88..5735fa0 100644 --- a/po/davfs2.pot +++ b/po/davfs2.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: davfs2 1.4.6\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2019-12-08 17:34+0100\n" +"POT-Creation-Date: 2020-06-05 11:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -77,7 +77,7 @@ msgstr "" msgid "error writing directory %s" msgstr "" -#: src/cache.c:2661 src/mount_davfs.c:1034 +#: src/cache.c:2661 src/mount_davfs.c:1036 #, c-format msgid "can't read user data base" msgstr "" @@ -225,8 +225,8 @@ msgstr "" msgid "file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:648 src/mount_davfs.c:700 src/mount_davfs.c:1335 -#: src/mount_davfs.c:1339 +#: src/mount_davfs.c:648 src/mount_davfs.c:700 src/mount_davfs.c:1337 +#: src/mount_davfs.c:1341 #, c-format msgid "can't open file %s" msgstr "" @@ -314,210 +314,215 @@ msgstr "" msgid "user %s must be member of group %s" msgstr "" -#: src/mount_davfs.c:820 src/mount_davfs.c:1160 +#: src/mount_davfs.c:820 src/mount_davfs.c:1162 #, c-format msgid "can't change effective user id" msgstr "" -#: src/mount_davfs.c:864 src/umount_davfs.c:89 +#: src/mount_davfs.c:865 src/umount_davfs.c:89 #, 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:880 src/umount_davfs.c:115 +#: src/mount_davfs.c:882 src/umount_davfs.c:115 #, c-format msgid "unknown error parsing arguments" msgstr "" -#: src/mount_davfs.c:889 src/umount_davfs.c:121 +#: src/mount_davfs.c:891 src/umount_davfs.c:121 #, c-format msgid "missing argument" msgstr "" -#: src/mount_davfs.c:902 +#: src/mount_davfs.c:904 #, c-format msgid "can't evaluate path of mount point %s" msgstr "" -#: src/mount_davfs.c:905 src/umount_davfs.c:123 +#: src/mount_davfs.c:907 src/umount_davfs.c:123 #, c-format msgid "too many arguments" msgstr "" -#: src/mount_davfs.c:912 +#: src/mount_davfs.c:914 #, c-format msgid "A relative mount point must lie within your home directory" msgstr "" -#: src/mount_davfs.c:917 +#: src/mount_davfs.c:919 #, c-format msgid "no WebDAV-server specified" msgstr "" -#: src/mount_davfs.c:920 +#: src/mount_davfs.c:922 #, c-format msgid "invalid URL" msgstr "" -#: src/mount_davfs.c:950 +#: src/mount_davfs.c:952 #, c-format msgid "user %s does not exist" msgstr "" -#: src/mount_davfs.c:958 +#: src/mount_davfs.c:960 #, c-format msgid "group %s does not exist" msgstr "" -#: src/mount_davfs.c:1025 +#: src/mount_davfs.c:1027 #, c-format msgid "program is not setuid root" msgstr "" -#: src/mount_davfs.c:1043 +#: src/mount_davfs.c:1045 #, c-format msgid "can't read group data base" msgstr "" -#: src/mount_davfs.c:1070 src/mount_davfs.c:1083 src/mount_davfs.c:1085 -#: src/mount_davfs.c:1103 src/mount_davfs.c:1105 src/mount_davfs.c:1120 +#: src/mount_davfs.c:1072 src/mount_davfs.c:1085 src/mount_davfs.c:1087 +#: src/mount_davfs.c:1105 src/mount_davfs.c:1107 src/mount_davfs.c:1122 msgid "Password: " msgstr "" -#: src/mount_davfs.c:1074 +#: src/mount_davfs.c:1076 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1076 src/mount_davfs.c:1096 +#: src/mount_davfs.c:1078 src/mount_davfs.c:1098 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1080 +#: src/mount_davfs.c:1082 #, 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:1094 +#: src/mount_davfs.c:1096 #, c-format msgid "" "Please enter the username to authenticate with server\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1100 +#: src/mount_davfs.c:1102 #, 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:1118 +#: src/mount_davfs.c:1120 #, c-format msgid "" "Please enter the password to decrypt client\n" "certificate %s.\n" msgstr "" -#: src/mount_davfs.c:1125 +#: src/mount_davfs.c:1127 #, c-format msgid "can't decrypt client certificate %s" msgstr "" -#: src/mount_davfs.c:1188 +#: src/mount_davfs.c:1190 #, c-format msgid "pid %i, got signal %i" msgstr "" -#: src/mount_davfs.c:1252 +#: src/mount_davfs.c:1254 #, c-format msgid "can't create file %s" msgstr "" -#: src/mount_davfs.c:1256 +#: src/mount_davfs.c:1258 #, c-format msgid "can't lock file %s" msgstr "" -#: src/mount_davfs.c:1278 +#: src/mount_davfs.c:1280 #, c-format msgid "" "Warning: can't write entry into %s, but will mount the file system anyway" msgstr "" -#: src/mount_davfs.c:1314 +#: src/mount_davfs.c:1316 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "" -#: src/mount_davfs.c:1317 +#: src/mount_davfs.c:1319 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "" -#: src/mount_davfs.c:1320 +#: src/mount_davfs.c:1322 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "" -#: src/mount_davfs.c:1346 +#: src/mount_davfs.c:1348 #, c-format msgid "error writing to file %s" msgstr "" -#: src/mount_davfs.c:1593 +#: src/mount_davfs.c:1595 #, c-format msgid "option %s requires argument" msgstr "" -#: src/mount_davfs.c:1681 +#: src/mount_davfs.c:1683 #, c-format msgid "Unknown option %s.\n" msgstr "" -#: src/mount_davfs.c:2071 +#: src/mount_davfs.c:2074 #, c-format msgid "can't read certificate %s" msgstr "" -#: src/mount_davfs.c:2103 src/mount_davfs.c:2116 +#: src/mount_davfs.c:2106 src/mount_davfs.c:2119 #, c-format msgid "can't read client certificate %s" msgstr "" -#: src/mount_davfs.c:2107 +#: src/mount_davfs.c:2110 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:2111 +#: src/mount_davfs.c:2114 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:2133 src/mount_davfs.c:2366 +#: src/mount_davfs.c:2136 src/mount_davfs.c:2376 #, c-format msgid "opening %s failed" msgstr "" -#: src/mount_davfs.c:2154 src/mount_davfs.c:2198 src/mount_davfs.c:2296 -#: src/mount_davfs.c:2393 src/mount_davfs.c:2451 src/mount_davfs.c:2464 +#: src/mount_davfs.c:2157 src/mount_davfs.c:2201 src/mount_davfs.c:2306 +#: src/mount_davfs.c:2403 src/mount_davfs.c:2461 src/mount_davfs.c:2474 #, c-format msgid "malformed line" msgstr "" -#: src/mount_davfs.c:2274 src/mount_davfs.c:2290 +#: src/mount_davfs.c:2236 +#, c-format +msgid "Option sharepoint_href_bug requires Neon version 0.31 or newer" +msgstr "" + +#: src/mount_davfs.c:2284 src/mount_davfs.c:2300 #, c-format msgid "unknown option" msgstr "" -#: src/mount_davfs.c:2596 +#: src/mount_davfs.c:2606 #, c-format msgid "" "Usage:\n" @@ -526,14 +531,14 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2600 +#: src/mount_davfs.c:2610 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" "`mount' instead.\n" msgstr "" -#: src/mount_davfs.c:2602 +#: src/mount_davfs.c:2612 #, c-format msgid "" " mount : or\n" @@ -541,7 +546,7 @@ msgid "" " /etc/fstab.\n" msgstr "" -#: src/mount_davfs.c:2605 +#: src/mount_davfs.c:2615 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -552,7 +557,7 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2610 +#: src/mount_davfs.c:2620 #, c-format msgid "" "Recognised options:\n" @@ -563,7 +568,7 @@ msgid "" " dir_mode= : default directory mode (octal)\n" msgstr "" -#: src/mount_davfs.c:2616 +#: src/mount_davfs.c:2626 #, c-format msgid "" " ro : mount read-only\n" @@ -654,86 +659,86 @@ msgstr "" msgid "can't open stream to log neon-messages" msgstr "" -#: src/webdav.c:399 +#: src/webdav.c:404 #, c-format msgid "neon library does not support TLS/SSL" msgstr "" -#: src/webdav.c:473 src/webdav.c:476 +#: src/webdav.c:478 src/webdav.c:481 #, c-format msgid "mounting failed; the server does not support WebDAV" msgstr "" -#: src/webdav.c:484 +#: src/webdav.c:489 #, c-format msgid "warning: the server does not support locks" msgstr "" -#: src/webdav.c:1492 +#: src/webdav.c:1497 msgid "authentication failure:" msgstr "" -#: src/webdav.c:1530 +#: src/webdav.c:1535 #, c-format msgid "%i can't open cache file" msgstr "" -#: src/webdav.c:1538 +#: src/webdav.c:1543 #, c-format msgid "%i error writing to cache file" msgstr "" -#: src/webdav.c:1799 src/webdav.c:1828 src/webdav.c:1865 +#: src/webdav.c:1804 src/webdav.c:1833 src/webdav.c:1870 #, c-format msgid "the server certificate is not trusted" msgstr "" -#: src/webdav.c:1808 src/webdav.c:1811 +#: src/webdav.c:1813 src/webdav.c:1816 #, c-format msgid "error processing server certificate" msgstr "" -#: src/webdav.c:1822 src/webdav.c:1856 +#: src/webdav.c:1827 src/webdav.c:1861 #, c-format msgid "the server certificate is not yet valid" msgstr "" -#: src/webdav.c:1824 src/webdav.c:1859 +#: src/webdav.c:1829 src/webdav.c:1864 #, c-format msgid "the server certificate has expired" msgstr "" -#: src/webdav.c:1826 src/webdav.c:1862 +#: src/webdav.c:1831 src/webdav.c:1867 #, c-format msgid "the server certificate does not match the server name" msgstr "" -#: src/webdav.c:1830 src/webdav.c:1868 +#: src/webdav.c:1835 src/webdav.c:1873 #, c-format msgid "unknown certificate error" msgstr "" -#: src/webdav.c:1831 +#: src/webdav.c:1836 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:1833 +#: src/webdav.c:1838 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:1835 +#: src/webdav.c:1840 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:1837 +#: src/webdav.c:1842 #, c-format msgid " fingerprint: %s" msgstr "" -#: src/webdav.c:1839 +#: src/webdav.c:1844 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -741,26 +746,26 @@ msgid "" "or there might be a man-in-the-middle-attack.\n" msgstr "" -#: src/webdav.c:1842 +#: src/webdav.c:1847 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "" -#: src/webdav.c:1869 +#: src/webdav.c:1874 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:1870 +#: src/webdav.c:1875 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:1871 +#: src/webdav.c:1876 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:1874 +#: src/webdav.c:1879 msgid " accepted by user" msgstr "" diff --git a/po/de.po b/po/de.po index 822eb3b..ec9610d 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: davfs2 1.5.0\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2019-12-08 17:34+0100\n" -"PO-Revision-Date: 2019-12-08 17:39+0100\n" +"POT-Creation-Date: 2020-06-05 11:05+0200\n" +"PO-Revision-Date: 2020-06-05 11:10+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" "Language: de\n" @@ -85,7 +85,7 @@ msgstr "kann die Cachedatei %s nicht erzeugen" msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" -#: src/cache.c:2661 src/mount_davfs.c:1034 +#: src/cache.c:2661 src/mount_davfs.c:1036 #, c-format msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" @@ -235,8 +235,8 @@ msgstr "die Datei %s hat den falschen Besitzer" msgid "file %s has wrong permissions" msgstr "die Dateirechte für %s sind falsch" -#: src/mount_davfs.c:648 src/mount_davfs.c:700 src/mount_davfs.c:1335 -#: src/mount_davfs.c:1339 +#: src/mount_davfs.c:648 src/mount_davfs.c:700 src/mount_davfs.c:1337 +#: src/mount_davfs.c:1341 #, c-format msgid "can't open file %s" msgstr "kann die Datei %s nicht öffnen" @@ -329,12 +329,12 @@ msgstr "" msgid "user %s must be member of group %s" msgstr "der Benutzer %s muss Mitglied der Gruppe %s sein" -#: src/mount_davfs.c:820 src/mount_davfs.c:1160 +#: src/mount_davfs.c:820 src/mount_davfs.c:1162 #, c-format msgid "can't change effective user id" msgstr "kann die effektive Benutzer-ID nicht ändern" -#: src/mount_davfs.c:864 src/umount_davfs.c:89 +#: src/mount_davfs.c:865 src/umount_davfs.c:89 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -345,67 +345,67 @@ msgstr "" "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE " "ZWECKE.\n" -#: src/mount_davfs.c:880 src/umount_davfs.c:115 +#: src/mount_davfs.c:882 src/umount_davfs.c:115 #, c-format msgid "unknown error parsing arguments" msgstr "Fehler beim Analysieren der Befehlsargumente" -#: src/mount_davfs.c:889 src/umount_davfs.c:121 +#: src/mount_davfs.c:891 src/umount_davfs.c:121 #, c-format msgid "missing argument" msgstr "zu wenig Argumente" -#: src/mount_davfs.c:902 +#: src/mount_davfs.c:904 #, 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:905 src/umount_davfs.c:123 +#: src/mount_davfs.c:907 src/umount_davfs.c:123 #, c-format msgid "too many arguments" msgstr "zu viele Argumente" -#: src/mount_davfs.c:912 +#: src/mount_davfs.c:914 #, c-format 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:917 +#: src/mount_davfs.c:919 #, c-format msgid "no WebDAV-server specified" msgstr "es wurde kein WebDAV-Server angegeben" -#: src/mount_davfs.c:920 +#: src/mount_davfs.c:922 #, c-format msgid "invalid URL" msgstr "die URL ist ungültig" -#: src/mount_davfs.c:950 +#: src/mount_davfs.c:952 #, c-format msgid "user %s does not exist" msgstr "der Benutzer %s existiert nicht" -#: src/mount_davfs.c:958 +#: src/mount_davfs.c:960 #, c-format msgid "group %s does not exist" msgstr "die Gruppe %s existiert nicht" -#: src/mount_davfs.c:1025 +#: src/mount_davfs.c:1027 #, c-format msgid "program is not setuid root" msgstr "die Programmdatei hat das setuid-Bit nicht gesetzt" -#: src/mount_davfs.c:1043 +#: src/mount_davfs.c:1045 #, c-format msgid "can't read group data base" msgstr "kann die Gruppendatenbank nicht lesen" -#: src/mount_davfs.c:1070 src/mount_davfs.c:1083 src/mount_davfs.c:1085 -#: src/mount_davfs.c:1103 src/mount_davfs.c:1105 src/mount_davfs.c:1120 +#: src/mount_davfs.c:1072 src/mount_davfs.c:1085 src/mount_davfs.c:1087 +#: src/mount_davfs.c:1105 src/mount_davfs.c:1107 src/mount_davfs.c:1122 msgid "Password: " msgstr "Passwort:" -#: src/mount_davfs.c:1074 +#: src/mount_davfs.c:1076 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -414,11 +414,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:1076 src/mount_davfs.c:1096 +#: src/mount_davfs.c:1078 src/mount_davfs.c:1098 msgid "Username:" msgstr "Benutzername:" -#: src/mount_davfs.c:1080 +#: src/mount_davfs.c:1082 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -427,7 +427,7 @@ 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:1094 +#: src/mount_davfs.c:1096 #, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -436,7 +436,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:1100 +#: src/mount_davfs.c:1102 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -445,7 +445,7 @@ 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:1118 +#: src/mount_davfs.c:1120 #, c-format msgid "" "Please enter the password to decrypt client\n" @@ -454,27 +454,27 @@ msgstr "" "Gib bitte das Passwort für die Entschlüsselung des\n" "Client-Zertifikats %s ein.\n" -#: src/mount_davfs.c:1125 +#: src/mount_davfs.c:1127 #, c-format msgid "can't decrypt client certificate %s" msgstr "kann das Zertifikat %s nicht entschlüsseln" -#: src/mount_davfs.c:1188 +#: src/mount_davfs.c:1190 #, c-format msgid "pid %i, got signal %i" msgstr "PID %i, erhielt Signal %i" -#: src/mount_davfs.c:1252 +#: src/mount_davfs.c:1254 #, c-format msgid "can't create file %s" msgstr "kann die Datei %s nicht erzeugen" -#: src/mount_davfs.c:1256 +#: src/mount_davfs.c:1258 #, c-format msgid "can't lock file %s" msgstr "kann die Datei %s nicht sperren" -#: src/mount_davfs.c:1278 +#: src/mount_davfs.c:1280 #, c-format msgid "" "Warning: can't write entry into %s, but will mount the file system anyway" @@ -482,77 +482,83 @@ msgstr "" "Warnung: kann keinen Eintrag in die Datei %s schreiben, hänge das " "Dateisystem trotzdem ein." -#: src/mount_davfs.c:1314 +#: src/mount_davfs.c:1316 #, 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:1317 +#: src/mount_davfs.c:1319 #, 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:1320 +#: src/mount_davfs.c:1322 #, 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:1346 +#: src/mount_davfs.c:1348 #, c-format msgid "error writing to file %s" msgstr "Fehler beim Schreiben der neuen Indexdatei %s" -#: src/mount_davfs.c:1593 +#: src/mount_davfs.c:1595 #, c-format msgid "option %s requires argument" msgstr "die Option %s verlangt ein Argument" -#: src/mount_davfs.c:1681 +#: src/mount_davfs.c:1683 #, c-format msgid "Unknown option %s.\n" msgstr "unbekannte Option %s.\n" -#: src/mount_davfs.c:2071 +#: src/mount_davfs.c:2074 #, c-format msgid "can't read certificate %s" msgstr "kann das Zertifikat %s nicht lesen" -#: src/mount_davfs.c:2103 src/mount_davfs.c:2116 +#: src/mount_davfs.c:2106 src/mount_davfs.c:2119 #, c-format msgid "can't read client certificate %s" msgstr "kann das Client-Zertifikat %s nicht lesen" -#: src/mount_davfs.c:2107 +#: src/mount_davfs.c:2110 #, 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:2111 +#: src/mount_davfs.c:2114 #, 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:2133 src/mount_davfs.c:2366 +#: src/mount_davfs.c:2136 src/mount_davfs.c:2376 #, c-format msgid "opening %s failed" msgstr "konnte %s nicht öffnen" -#: src/mount_davfs.c:2154 src/mount_davfs.c:2198 src/mount_davfs.c:2296 -#: src/mount_davfs.c:2393 src/mount_davfs.c:2451 src/mount_davfs.c:2464 +#: src/mount_davfs.c:2157 src/mount_davfs.c:2201 src/mount_davfs.c:2306 +#: src/mount_davfs.c:2403 src/mount_davfs.c:2461 src/mount_davfs.c:2474 #, c-format msgid "malformed line" msgstr "Syntaxfehler in der Zeile" -#: src/mount_davfs.c:2274 src/mount_davfs.c:2290 +#: src/mount_davfs.c:2236 +#, c-format +msgid "Option sharepoint_href_bug requires Neon version 0.31 or newer" +msgstr "" +"Die Option sharepoint_href_bug erfordert die Neon-Version 0.31 oder neuer" + +#: src/mount_davfs.c:2284 src/mount_davfs.c:2300 #, c-format msgid "unknown option" msgstr "unbekannte Option" -#: src/mount_davfs.c:2596 +#: src/mount_davfs.c:2606 #, c-format msgid "" "Usage:\n" @@ -565,7 +571,7 @@ msgstr "" " %s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/mount_davfs.c:2600 +#: src/mount_davfs.c:2610 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -574,7 +580,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:2602 +#: src/mount_davfs.c:2612 #, c-format msgid "" " mount : or\n" @@ -585,7 +591,7 @@ msgstr "" " mount : hänge die WebDAV-Resource entsprechend den\n" " Angaben in /etc/fstab ein.\n" -#: src/mount_davfs.c:2605 +#: src/mount_davfs.c:2615 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -602,7 +608,7 @@ msgstr "" " Kommas unterteilte Liste von Optionen.\n" "\n" -#: src/mount_davfs.c:2610 +#: src/mount_davfs.c:2620 #, c-format msgid "" "Recognised options:\n" @@ -619,7 +625,7 @@ msgstr "" " file_mode= : Standard-Rechte für Dateien (oktal)\n" " dir_mode= : Standard-Rechte für Verzeichnisse (oktal)\n" -#: src/mount_davfs.c:2616 +#: src/mount_davfs.c:2626 #, c-format msgid "" " ro : mount read-only\n" @@ -724,8 +730,7 @@ msgstr "" #: src/umount_davfs.c:195 #, c-format msgid "%s: waiting for %s (pid %s) to terminate gracefully ." -msgstr "" -"%s: warte bis %s (PID %s) ordentlich endet ." +msgstr "%s: warte bis %s (PID %s) ordentlich endet ." #: src/umount_davfs.c:208 #, c-format @@ -743,86 +748,86 @@ 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:399 +#: src/webdav.c:404 #, c-format msgid "neon library does not support TLS/SSL" msgstr "die Neon-Bibliothek uterstützt TLS/SSL nicht" -#: src/webdav.c:473 src/webdav.c:476 +#: src/webdav.c:478 src/webdav.c:481 #, c-format msgid "mounting failed; the server does not support WebDAV" msgstr "das Einhängen schlug fehl; der Server unterstützt WebDAV nicht" -#: src/webdav.c:484 +#: src/webdav.c:489 #, c-format msgid "warning: the server does not support locks" msgstr "Warnung: der Server kann Dateien nicht sperren" -#: src/webdav.c:1492 +#: src/webdav.c:1497 msgid "authentication failure:" msgstr "Authentifizierungsfehler" -#: src/webdav.c:1530 +#: src/webdav.c:1535 #, c-format msgid "%i can't open cache file" msgstr "%i kann die Cache-Datei nicht öffnen" -#: src/webdav.c:1538 +#: src/webdav.c:1543 #, c-format msgid "%i error writing to cache file" msgstr "%i Fehler beim Schreiben der Cache-Datei" -#: src/webdav.c:1799 src/webdav.c:1828 src/webdav.c:1865 +#: src/webdav.c:1804 src/webdav.c:1833 src/webdav.c:1870 #, c-format msgid "the server certificate is not trusted" msgstr "wir trauen dem Zertifikat nicht" -#: src/webdav.c:1808 src/webdav.c:1811 +#: src/webdav.c:1813 src/webdav.c:1816 #, c-format msgid "error processing server certificate" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1822 src/webdav.c:1856 +#: src/webdav.c:1827 src/webdav.c:1861 #, c-format msgid "the server certificate is not yet valid" msgstr "das Server-Zertifikat ist noch nicht gültig" -#: src/webdav.c:1824 src/webdav.c:1859 +#: src/webdav.c:1829 src/webdav.c:1864 #, c-format msgid "the server certificate has expired" msgstr "das Server-Zertifikat ist nicht mehr gültig" -#: src/webdav.c:1826 src/webdav.c:1862 +#: src/webdav.c:1831 src/webdav.c:1867 #, c-format msgid "the server certificate does not match the server name" msgstr "das Server-Zertifikat passt nicht zum Namen des Servers" -#: src/webdav.c:1830 src/webdav.c:1868 +#: src/webdav.c:1835 src/webdav.c:1873 #, c-format msgid "unknown certificate error" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1831 +#: src/webdav.c:1836 #, c-format msgid " issuer: %s" msgstr " Aussteller: %s" -#: src/webdav.c:1833 +#: src/webdav.c:1838 #, c-format msgid " subject: %s" msgstr " Inhaber: %s" -#: src/webdav.c:1835 +#: src/webdav.c:1840 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1837 +#: src/webdav.c:1842 #, c-format msgid " fingerprint: %s" msgstr " Fingerabdruck: %s" -#: src/webdav.c:1839 +#: src/webdav.c:1844 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -833,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:1842 +#: src/webdav.c:1847 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Ich akzeptiere das Zertifikat für diese Sitzung [j,N]: " -#: src/webdav.c:1869 +#: src/webdav.c:1874 #, c-format msgid " issuer: %s" msgstr " Aussteller des Zertifikats: %s" -#: src/webdav.c:1870 +#: src/webdav.c:1875 #, c-format msgid " subject: %s" msgstr " Inhaber des Zertifikats: %s" -#: src/webdav.c:1871 +#: src/webdav.c:1876 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1874 +#: src/webdav.c:1879 msgid " accepted by user" msgstr " durch den Benutzer akzeptiert" diff --git a/src/defaults.h b/src/defaults.h index d24105e..84faf89 100644 --- a/src/defaults.h +++ b/src/defaults.h @@ -208,6 +208,10 @@ May be overridden by system config file and user config file. */ #define DAV_MIN_PROPSET 0 +/* Use Neon work around for SharePoint href-elements with characters + that are not allowed in href-elements. */ +#define DAV_SHAREPOINT_HREF_BUG 0 + /* Timeout in seconds used when libneon supports non blocking io A value of zero means use the TCP default May be overriden by system config file and user config file. */ diff --git a/src/mount_davfs.c b/src/mount_davfs.c index f039457..e6a9215 100644 --- a/src/mount_davfs.c +++ b/src/mount_davfs.c @@ -1722,6 +1722,7 @@ new_args(void) args->ignore_dav_header = DAV_IGNORE_DAV_HEADER; args->use_compression = DAV_USE_COMPRESSION; args->min_propset = DAV_MIN_PROPSET; + args->sharepoint_href_bug = DAV_SHAREPOINT_HREF_BUG; args->connect_timeout = DAV_CONNECT_TIMEOUT; args->read_timeout = DAV_READ_TIMEOUT; args->retry = DAV_RETRY; @@ -2228,6 +2229,13 @@ read_config(dav_args *args, const char * filename, int system) args->use_compression = arg_to_int(parmv[1], 10, parmv[0]); } else if (strcmp(parmv[0], "min_propset") == 0) { args->min_propset = arg_to_int(parmv[1], 10, parmv[0]); + } else if (strcmp(parmv[0], "sharepoint_href_bug") == 0) { +#if NE_VERSION_MAJOR > 0 || NE_VERSION_MINOR > 30 + args->sharepoint_href_bug = arg_to_int(parmv[1], 10, parmv[0]); +#else + error(EXIT_FAILURE, 0, _("Option sharepoint_href_bug requires " + "Neon version 0.31 or newer")); +#endif } else if (strcmp(parmv[0], "connect_timeout") == 0) { args->connect_timeout = arg_to_int(parmv[1], 10, parmv[0]); } else if (strcmp(parmv[0], "read_timeout") == 0) { diff --git a/src/mount_davfs.h b/src/mount_davfs.h index 668e9c2..04ed586 100644 --- a/src/mount_davfs.h +++ b/src/mount_davfs.h @@ -94,6 +94,7 @@ typedef struct { int ignore_dav_header; /* User config file, system config file */ int use_compression; /* User config file, system config file */ int min_propset; /* User config file, system config file */ + int sharepoint_href_bug; /* User config file, system config file */ time_t connect_timeout; /* User config file, system config file */ time_t read_timeout; /* User config file, system config file */ time_t retry; /* User config file, system config file */ diff --git a/src/webdav.c b/src/webdav.c index 63f0642..5abfd2e 100644 --- a/src/webdav.c +++ b/src/webdav.c @@ -379,6 +379,11 @@ dav_init_webdav(dav_args *args) ne_set_useragent(session, useragent); free(useragent); +#if NE_VERSION_MAJOR > 0 || NE_VERSION_MINOR > 30 + if (args->sharepoint_href_bug) + ne_set_session_flag(session, NE_SESSFLAG_SHAREPOINT, 1); +#endif + if (args->username) username = xstrdup(args->username); if (args->password)