diff --git a/ChangeLog b/ChangeLog index e57aba7..89a36fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ ChangeLog for davfs2 2009-11-14 Werner Baumann (werner.baumann@onlinehome.de) * cache.c, dav_init_cache: Initialize fs_stat->files. + * cache.c, dav_create: + Log entry if dav_lock returns EEXIST. 2009-11-03 Werner Baumann (werner.baumann@onlinehome.de) * webdav.c, ssl_verify: diff --git a/INSTALL b/INSTALL index 1c7be1c..8067024 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -2009-04-12 +2009-1-14 ---------- # Copyright (C) 2006, 2007, 2008, 2009 Werner Baumann @@ -7,7 +7,7 @@ # permitted in any medium without royalty. -DAVFS2 1.3.2 INSTALLATION +DAVFS2 1.4.4 INSTALLATION ========================= 1 UPDATING FROM PREVIOUS VERSION @@ -51,8 +51,8 @@ the files from the backup directory you may need some day. ---------------- davfs2 uses the neon libraries for communication with the server. -libneon (2.5, 2.6, 2.7 or 2.8) must be installed. Your distribution will most -likely provide a package. +libneon (0.25, 0.26, 0.27, 0.28 or 0.29) must be installed. Your distribution +will most likely provide a package. You will also need the neon header files. Distributions usually provide development packages for this. If your distribution don't come with libneon or it does not support TLS and diff --git a/NEWS b/NEWS index 6b263b6..da7a449 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,13 @@ # permitted in any medium without royalty. +What is new in davfs2 1.4.4 +=========================== + +If option 'ask_auth 0' is set, davfs2 will no langer prompt the user +for suspicious server certificates but terminate silently. + + What is new in davfs2 1.4.2 =========================== diff --git a/configure.ac b/configure.ac index 5b96c14..878928f 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_PREREQ(2.59) -AC_INIT(davfs2, 1.4.4-pre1, http://savannah.nongnu.org/projects/davfs2) +AC_INIT(davfs2, 1.4.4, http://savannah.nongnu.org/projects/davfs2) AC_CONFIG_SRCDIR([src/cache.c]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE diff --git a/po/cs.po b/po/cs.po index 4d3f1ea..7e17f9b 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-11-01 20:01+0100\n" +"POT-Creation-Date: 2009-11-14 13:26+0100\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bitX-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n" -#: src/cache.c:657 +#: src/cache.c:658 msgid "" "connection timed out two times;\n" "trying one last time" @@ -24,12 +24,12 @@ msgstr "" "spojení vypršelo dvakrát;\n" "zkouším to ještě jednou a naposledy" -#: src/cache.c:662 +#: src/cache.c:663 #, c-format msgid "Last try succeeded.\n" msgstr "Poslední pokus byl úspěšný.\n" -#: src/cache.c:665 +#: src/cache.c:666 msgid "" "server temporarily unreachable;\n" "mounting anyway" @@ -37,7 +37,7 @@ msgstr "" "server je dočasně nedostupný;\n" "přesto připojuji" -#: src/cache.c:668 +#: src/cache.c:669 #, c-format msgid "" "Mounting failed.\n" @@ -46,78 +46,84 @@ msgstr "" "Připojení selhalo;\n" "%s" -#: src/cache.c:708 +#: src/cache.c:709 #, c-format msgid "can't replace %s with %s" msgstr "nemohu nahradit %s pomocí %s" -#: src/cache.c:712 +#: src/cache.c:713 #, c-format msgid "error writing new index file %s" msgstr "chyba při zápisu nového indexového souboru %s" -#: src/cache.c:716 +#: src/cache.c:717 #, c-format msgid "can't create new index file for %s" msgstr "nemohu vytvořit nový indexový soubor pro %s" -#: src/cache.c:2554 src/cache.c:2588 +#: src/cache.c:939 +msgid "" +"The server reports a file that should not exist.Maybe it is an error in the " +"servers LOCK impementation.You may try option 'use_locks 0' in davfs2.conf." +msgstr "" + +#: src/cache.c:2562 src/cache.c:2596 #, c-format msgid "can't create cache file %s" msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" -#: src/cache.c:2603 +#: src/cache.c:2611 #, c-format msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" -#: src/cache.c:2771 src/mount_davfs.c:595 src/mount_davfs.c:597 +#: src/cache.c:2779 src/mount_davfs.c:595 src/mount_davfs.c:597 #: src/mount_davfs.c:783 src/mount_davfs.c:785 src/mount_davfs.c:791 #: src/mount_davfs.c:831 src/mount_davfs.c:833 src/mount_davfs.c:850 #: src/mount_davfs.c:852 src/mount_davfs.c:1725 src/mount_davfs.c:1727 msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" -#: src/cache.c:2782 +#: src/cache.c:2790 #, c-format msgid "can't open cache directory %s" msgstr "nemohu otevřít kešovací adresář %s" -#: src/cache.c:2797 +#: src/cache.c:2805 #, c-format msgid "can't create cache directory %s" msgstr "nemohu vytvořit kešovací adresář %s" -#: src/cache.c:2804 +#: src/cache.c:2812 #, c-format msgid "can't access cache directory %s" msgstr "nemohu přistoupit ke kešovacímu adresáři %s" -#: src/cache.c:2807 +#: src/cache.c:2815 #, c-format msgid "wrong owner of cache directory %s" msgstr "chybný vlastník kešovacího adresáře %s" -#: src/cache.c:2811 +#: src/cache.c:2819 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "pro kešovací adresář %s nastaveno chybné oprávnění" -#: src/cache.c:2841 +#: src/cache.c:2849 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2914 +#: src/cache.c:2922 #, c-format msgid "error parsing %s" msgstr "chyba při zpracování %s" -#: src/cache.c:2915 +#: src/cache.c:2923 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2960 +#: src/cache.c:2968 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" diff --git a/po/davfs2.pot b/po/davfs2.pot index 249f71f..492c76f 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-11-01 20:01+0100\n" +"POT-Creation-Date: 2009-11-14 13:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,102 +17,108 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/cache.c:657 +#: src/cache.c:658 msgid "" "connection timed out two times;\n" "trying one last time" msgstr "" -#: src/cache.c:662 +#: src/cache.c:663 #, c-format msgid "Last try succeeded.\n" msgstr "" -#: src/cache.c:665 +#: src/cache.c:666 msgid "" "server temporarily unreachable;\n" "mounting anyway" msgstr "" -#: src/cache.c:668 +#: src/cache.c:669 #, c-format msgid "" "Mounting failed.\n" "%s" msgstr "" -#: src/cache.c:708 +#: src/cache.c:709 #, c-format msgid "can't replace %s with %s" msgstr "" -#: src/cache.c:712 +#: src/cache.c:713 #, c-format msgid "error writing new index file %s" msgstr "" -#: src/cache.c:716 +#: src/cache.c:717 #, c-format msgid "can't create new index file for %s" msgstr "" -#: src/cache.c:2554 src/cache.c:2588 +#: src/cache.c:939 +msgid "" +"The server reports a file that should not exist.Maybe it is an error in the " +"servers LOCK impementation.You may try option 'use_locks 0' in davfs2.conf." +msgstr "" + +#: src/cache.c:2562 src/cache.c:2596 #, c-format msgid "can't create cache file %s" msgstr "" -#: src/cache.c:2603 +#: src/cache.c:2611 #, c-format msgid "error writing directory %s" msgstr "" -#: src/cache.c:2771 src/mount_davfs.c:595 src/mount_davfs.c:597 +#: src/cache.c:2779 src/mount_davfs.c:595 src/mount_davfs.c:597 #: src/mount_davfs.c:783 src/mount_davfs.c:785 src/mount_davfs.c:791 #: src/mount_davfs.c:831 src/mount_davfs.c:833 src/mount_davfs.c:850 #: src/mount_davfs.c:852 src/mount_davfs.c:1725 src/mount_davfs.c:1727 msgid "can't read user data base" msgstr "" -#: src/cache.c:2782 +#: src/cache.c:2790 #, c-format msgid "can't open cache directory %s" msgstr "" -#: src/cache.c:2797 +#: src/cache.c:2805 #, c-format msgid "can't create cache directory %s" msgstr "" -#: src/cache.c:2804 +#: src/cache.c:2812 #, c-format msgid "can't access cache directory %s" msgstr "" -#: src/cache.c:2807 +#: src/cache.c:2815 #, c-format msgid "wrong owner of cache directory %s" msgstr "" -#: src/cache.c:2811 +#: src/cache.c:2819 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "" -#: src/cache.c:2841 +#: src/cache.c:2849 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2914 +#: src/cache.c:2922 #, c-format msgid "error parsing %s" msgstr "" -#: src/cache.c:2915 +#: src/cache.c:2923 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2960 +#: src/cache.c:2968 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" diff --git a/po/de.po b/po/de.po index b3ea048..7706b94 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-11-01 20:01+0100\n" +"POT-Creation-Date: 2009-11-14 13:26+0100\n" "PO-Revision-Date: 2009-01-02 12:26+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/cache.c:657 +#: src/cache.c:658 msgid "" "connection timed out two times;\n" "trying one last time" @@ -24,12 +24,12 @@ msgstr "" "die Verbindung wurde zweimal wegen Zeitüberschreitung abgebrochen;\n" "ich versuche es zum letzten mal" -#: src/cache.c:662 +#: src/cache.c:663 #, c-format msgid "Last try succeeded.\n" msgstr "Der letzte Versuch war erfolgreich.\n" -#: src/cache.c:665 +#: src/cache.c:666 msgid "" "server temporarily unreachable;\n" "mounting anyway" @@ -37,7 +37,7 @@ msgstr "" "der Server ist zur Zeit nicht erreichbar;\n" "das Dateisystem wird trotzdem eingehängt" -#: src/cache.c:668 +#: src/cache.c:669 #, c-format msgid "" "Mounting failed.\n" @@ -46,78 +46,87 @@ msgstr "" "das Einhängen schlug fehl;\n" "%s" -#: src/cache.c:708 +#: src/cache.c:709 #, c-format msgid "can't replace %s with %s" msgstr "kann %s nicht durch %s ersetzen" -#: src/cache.c:712 +#: src/cache.c:713 #, c-format msgid "error writing new index file %s" msgstr "Fehler beim Schreiben der neuen Indexdatei %s" -#: src/cache.c:716 +#: src/cache.c:717 #, c-format msgid "can't create new index file for %s" msgstr "kann keine neue Indexdatei für %s erzeugen" -#: src/cache.c:2554 src/cache.c:2588 +#: src/cache.c:939 +msgid "" +"The server reports a file that should not exist.Maybe it is an error in the " +"servers LOCK impementation.You may try option 'use_locks 0' in davfs2.conf." +msgstr "" +"Der Server meldet eine Datei, die es nicht geben sollte. Vielleicht " +"behandelt der Server LOCK-Requests fehlerhaft. Du kannst es mit der Option " +"'use_locks 0' in davfs2.conf versuchen." + +#: src/cache.c:2562 src/cache.c:2596 #, c-format msgid "can't create cache file %s" msgstr "kann die Cachedatei %s nicht erzeugen" -#: src/cache.c:2603 +#: src/cache.c:2611 #, c-format msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" -#: src/cache.c:2771 src/mount_davfs.c:595 src/mount_davfs.c:597 +#: src/cache.c:2779 src/mount_davfs.c:595 src/mount_davfs.c:597 #: src/mount_davfs.c:783 src/mount_davfs.c:785 src/mount_davfs.c:791 #: src/mount_davfs.c:831 src/mount_davfs.c:833 src/mount_davfs.c:850 #: src/mount_davfs.c:852 src/mount_davfs.c:1725 src/mount_davfs.c:1727 msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" -#: src/cache.c:2782 +#: src/cache.c:2790 #, c-format msgid "can't open cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht öffnen" -#: src/cache.c:2797 +#: src/cache.c:2805 #, c-format msgid "can't create cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht erzeugen" -#: src/cache.c:2804 +#: src/cache.c:2812 #, c-format msgid "can't access cache directory %s" msgstr "Zugriff auf das Cachverzeichnis %s verweigert" -#: src/cache.c:2807 +#: src/cache.c:2815 #, c-format msgid "wrong owner of cache directory %s" msgstr "das Cacheverzeichnis %s hat den falschen Besitzer" -#: src/cache.c:2811 +#: src/cache.c:2819 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "das Cachverzeichnis %s hat die falschen Dateirechte" -#: src/cache.c:2841 +#: src/cache.c:2849 msgid "found orphaned file in cache:" msgstr "fand verwaiste Datei im Cache:" -#: src/cache.c:2914 +#: src/cache.c:2922 #, c-format msgid "error parsing %s" msgstr "Syntaxfehler in %s" -#: src/cache.c:2915 +#: src/cache.c:2923 #, c-format msgid " at line %i" msgstr " in Zeile %i" -#: src/cache.c:2960 +#: src/cache.c:2968 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" @@ -283,9 +292,9 @@ msgid "different config file in %s" msgstr "in %s ist eine andere Konfigurationsdatei angegeben" #: src/mount_davfs.c:711 -#, fuzzy, c-format +#, c-format msgid "different username in %s" -msgstr "in %s ist ein anderer dir_mode angegeben" +msgstr "in %s ist ein anderer Benutzername angegeben" #: src/mount_davfs.c:715 #, c-format diff --git a/src/cache.c b/src/cache.c index 850e2af..ad2bb88 100644 --- a/src/cache.c +++ b/src/cache.c @@ -931,8 +931,15 @@ dav_create(dav_node **nodep, dav_node *parent, const char *name, uid_t uid, (*nodep)->uid = uid; (*nodep)->gid = pw->pw_gid; int ret = create_cache_file(*nodep); + if (!ret) ret = dav_lock(path, &(*nodep)->lock_expire, &(*nodep)->remote_exists); + if (ret == EEXIST) + syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR), + _("The server reports a file that should not exist." + "Maybe it is an error in the servers LOCK impementation." + "You may try option 'use_locks 0' in davfs2.conf.")); + if (!ret) { (*nodep)->smtime = (*nodep)->mtime; if (!is_created(*nodep))