Remove deprecated option servercert

This commit is contained in:
wbaumann 2014-04-06 16:24:20 +00:00
parent cf5bb1eec6
commit 6558307e8f
8 changed files with 404 additions and 455 deletions

View File

@ -1,6 +1,10 @@
ChangeLog for davfs2 ChangeLog for davfs2
-------------------- --------------------


2014-04-06 Werner Baumann (werner.baumann@onlinehome.de)
* mount_davfs.c:
Remove deprecated option servercert.

2014-04-05 Werner Baumann (werner.baumann@onlinehome.de) 2014-04-05 Werner Baumann (werner.baumann@onlinehome.de)
* umount_davfs.c: * umount_davfs.c:
Allways try 'umount -i'. Allways try 'umount -i'.

View File

@ -1,5 +1,5 @@
# davfs2 configuration file 2012-02-05 # davfs2 configuration file 2014-04-06
# version 10 # version 12
# ------------------------------------ # ------------------------------------


# Copyright (C) 2006, 2007, 2008, 2009 Werner Baumann # Copyright (C) 2006, 2007, 2008, 2009 Werner Baumann
@ -30,7 +30,6 @@
# use_proxy 1 # system wide config file only # use_proxy 1 # system wide config file only
# proxy # system wide config file only # proxy # system wide config file only
# trust_ca_cert # trust_ca_cert
# servercert # deprecated: use trust_ca_cert
# trust_server_cert # trust_server_cert
# clientcert # clientcert
# secrets ~/.davfs2/secrets # user config file only # secrets ~/.davfs2/secrets # user config file only

View File

@ -147,18 +147,13 @@ cannot be verified using the system's data base of trusted certificate
authorities (CA). The certificate file must contain the self-signed authorities (CA). The certificate file must contain the self-signed
certificate of the top level CA in the chain of trust. It may be a certificate of the top level CA in the chain of trust. It may be a
self-signed server certificate (but see also \fBtrust_server_cert\fR). self-signed server certificate (but see also \fBtrust_server_cert\fR).
With this option the system's CA data base is ignored.
.br .br
\fBNote:\fR Even if the server's certificate is trusted that does not mean \fBNote:\fR Even if the server's certificate is trusted that does not mean
it is accepted. Additionally the certificate's date must be valid and it is accepted. Additionally the certificate's date must be valid and
either the CommonName or the SubjectAltName must match the host name either the CommonName or the SubjectAltName must match the host name
of the server. of the server.


.TP
.B servercert
Same as \fBtrust_ca_cert\fR but badly named.
.br
\fBDeprecated\fR

.TP .TP
.B trust_server_cert .B trust_server_cert
Name of a certificate file in PEM format. The name of the file may be Name of a certificate file in PEM format. The name of the file may be

View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-03-15 17:24+0100\n" "POT-Creation-Date: 2014-04-06 18:16+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -275,8 +275,8 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:126 davfs2.conf.5:205 davfs2.conf.5:212 davfs2.conf.5:290 #: davfs2.conf.5:126 davfs2.conf.5:200 davfs2.conf.5:207 davfs2.conf.5:285
#: davfs2.conf.5:304 davfs2.conf.5:438 #: davfs2.conf.5:299 davfs2.conf.5:433
msgid "Default: 1" msgid "Default: 1"
msgstr "" msgstr ""


@ -301,7 +301,7 @@ msgid "B<trust_ca_cert>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:144 davfs2.conf.5:168 #: davfs2.conf.5:144 davfs2.conf.5:163
msgid "" msgid ""
"Name of a certificate file in PEM format. The name of the file may be given " "Name of a certificate file in PEM format. The name of the file may be given "
"as absolute path or as file name only. In the latter case the directories " "as absolute path or as file name only. In the latter case the directories "
@ -310,17 +310,18 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:150 #: davfs2.conf.5:151
msgid "" msgid ""
"This option is useful when the certificate presented by the server cannot be " "This option is useful when the certificate presented by the server cannot be "
"verified using the system's data base of trusted certificate authorities " "verified using the system's data base of trusted certificate authorities "
"(CA). The certificate file must contain the self-signed certificate of the " "(CA). The certificate file must contain the self-signed certificate of the "
"top level CA in the chain of trust. It may be a self-signed server " "top level CA in the chain of trust. It may be a self-signed server "
"certificate (but see also B<trust_server_cert>)." "certificate (but see also B<trust_server_cert>). With this option the "
"system's CA data base is ignored."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:155 #: davfs2.conf.5:156
msgid "" msgid ""
"B<Note:> Even if the server's certificate is trusted that does not mean it " "B<Note:> Even if the server's certificate is trusted that does not mean it "
"is accepted. Additionally the certificate's date must be valid and either " "is accepted. Additionally the certificate's date must be valid and either "
@ -328,29 +329,13 @@ msgid ""
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:156 #: davfs2.conf.5:157
#, no-wrap
msgid "B<servercert>"
msgstr ""

#. type: Plain text
#: davfs2.conf.5:159
msgid "Same as B<trust_ca_cert> but badly named."
msgstr ""

#. type: Plain text
#: davfs2.conf.5:161
msgid "B<Deprecated>"
msgstr ""

#. type: TP
#: davfs2.conf.5:162
#, no-wrap #, no-wrap
msgid "B<trust_server_cert>" msgid "B<trust_server_cert>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:174 #: davfs2.conf.5:169
msgid "" msgid ""
"Usefull when the server's certificate can't be verified or is even invalid, " "Usefull when the server's certificate can't be verified or is even invalid, "
"but B<you know> that you can trust this certificate. When the server " "but B<you know> that you can trust this certificate. When the server "
@ -360,25 +345,25 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:176 #: davfs2.conf.5:171
msgid "This is the preferred option for self signed server certificates." msgid "This is the preferred option for self signed server certificates."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:179 #: davfs2.conf.5:174
msgid "" msgid ""
"No other ways to verify the certificate will be tried and the certificate " "No other ways to verify the certificate will be tried and the certificate "
"will not be checked for validity." "will not be checked for validity."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:180 #: davfs2.conf.5:175
#, no-wrap #, no-wrap
msgid "B<clientcert>" msgid "B<clientcert>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:187 #: davfs2.conf.5:182
msgid "" msgid ""
"Name of a certificate in PKCS#12 format that will be used to authenticate " "Name of a certificate in PKCS#12 format that will be used to authenticate "
"with the server. The name of the file may be given as absolute path or as " "with the server. The name of the file may be given as absolute path or as "
@ -388,13 +373,13 @@ msgid ""
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:188 davfs2.conf.5:509 #: davfs2.conf.5:183 davfs2.conf.5:504
#, no-wrap #, no-wrap
msgid "B<secrets>" msgid "B<secrets>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:193 #: davfs2.conf.5:188
msgid "" msgid ""
"Name of a file that holds the credentials for servers and the proxy, and " "Name of a file that holds the credentials for servers and the proxy, and "
"passwords to decrypt the client certificate. The name must be an absolute " "passwords to decrypt the client certificate. The name must be an absolute "
@ -402,25 +387,25 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:195 #: davfs2.conf.5:190
msgid "Default: ~/.@PACKAGE@/@SECRETSFILE@" msgid "Default: ~/.@PACKAGE@/@SECRETSFILE@"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:198 #: davfs2.conf.5:193
msgid "" msgid ""
"B<Only allowed in the user configuration file.> The system wide secrets file " "B<Only allowed in the user configuration file.> The system wide secrets file "
"is allways I<@SYS_CONF_DIR@/@SECRETSFILE@>." "is allways I<@SYS_CONF_DIR@/@SECRETSFILE@>."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:199 #: davfs2.conf.5:194
#, no-wrap #, no-wrap
msgid "B<ask_auth>" msgid "B<ask_auth>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:203 #: davfs2.conf.5:198
msgid "" msgid ""
"Ask the user interactively for credentials and passwords if not found in the " "Ask the user interactively for credentials and passwords if not found in the "
"secretsfile. Ask the user if a servercert cannot be verified. 0 = no, 1 = " "secretsfile. Ask the user if a servercert cannot be verified. 0 = no, 1 = "
@ -428,26 +413,26 @@ msgid ""
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:206 #: davfs2.conf.5:201
#, no-wrap #, no-wrap
msgid "B<use_locks>" msgid "B<use_locks>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:210 #: davfs2.conf.5:205
msgid "" msgid ""
"Whether to lock files on the server when they are opened for writing. 0 = " "Whether to lock files on the server when they are opened for writing. 0 = "
"no, 1 = yes." "no, 1 = yes."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:213 #: davfs2.conf.5:208
#, no-wrap #, no-wrap
msgid "B<lock_owner>" msgid "B<lock_owner>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:218 #: davfs2.conf.5:213
msgid "" msgid ""
"A string send to the server to identify the owner of a lock. If a WebDAV " "A string send to the server to identify the owner of a lock. If a WebDAV "
"resource is used at the same time by different clients using the same " "resource is used at the same time by different clients using the same "
@ -455,36 +440,36 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:220 #: davfs2.conf.5:215
msgid "Default: the username from the credentials" msgid "Default: the username from the credentials"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:221 #: davfs2.conf.5:216
#, no-wrap #, no-wrap
msgid "B<lock_timeout>" msgid "B<lock_timeout>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:225 #: davfs2.conf.5:220
msgid "" msgid ""
"How long in seconds locks should be valid, before the server removes them. " "How long in seconds locks should be valid, before the server removes them. "
"The server may ignore this and set its own timeout value." "The server may ignore this and set its own timeout value."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:227 #: davfs2.conf.5:222
msgid "Default: 1800" msgid "Default: 1800"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:228 #: davfs2.conf.5:223
#, no-wrap #, no-wrap
msgid "B<lock_refresh>" msgid "B<lock_refresh>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:233 #: davfs2.conf.5:228
msgid "" msgid ""
"That many seconds before the lock times out, B<@PROGRAM_NAME@> will try to " "That many seconds before the lock times out, B<@PROGRAM_NAME@> will try to "
"refresh the lock. The value should be substantially greater than " "refresh the lock. The value should be substantially greater than "
@ -492,18 +477,18 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:235 davfs2.conf.5:428 #: davfs2.conf.5:230 davfs2.conf.5:423
msgid "Default: 60" msgid "Default: 60"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:236 #: davfs2.conf.5:231
#, no-wrap #, no-wrap
msgid "B<use_expect100>" msgid "B<use_expect100>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:242 #: davfs2.conf.5:237
msgid "" msgid ""
"To avoid uploading big files that will be refused by the server, " "To avoid uploading big files that will be refused by the server, "
"B<@PROGRAM_NAME@> uses the header I<expect: 100-continue> to get the o.k. " "B<@PROGRAM_NAME@> uses the header I<expect: 100-continue> to get the o.k. "
@ -512,19 +497,19 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:244 davfs2.conf.5:252 davfs2.conf.5:270 davfs2.conf.5:280 #: davfs2.conf.5:239 davfs2.conf.5:247 davfs2.conf.5:265 davfs2.conf.5:275
#: davfs2.conf.5:297 davfs2.conf.5:458 #: davfs2.conf.5:292 davfs2.conf.5:453
msgid "Default: 0" msgid "Default: 0"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:245 #: davfs2.conf.5:240
#, no-wrap #, no-wrap
msgid "B<if_match_bug>" msgid "B<if_match_bug>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:250 #: davfs2.conf.5:245
msgid "" msgid ""
"Some servers do not handle If-Match and If-None-Match-headers correctly. " "Some servers do not handle If-Match and If-None-Match-headers correctly. "
"This otion tells B<@PROGRAM_NAME@> to use HEAD instead of thes headers. 0 = " "This otion tells B<@PROGRAM_NAME@> to use HEAD instead of thes headers. 0 = "
@ -532,13 +517,13 @@ msgid ""
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:253 #: davfs2.conf.5:248
#, no-wrap #, no-wrap
msgid "B<drop_weak_etags>" msgid "B<drop_weak_etags>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:262 #: davfs2.conf.5:257
msgid "" msgid ""
"Popular servers send a weak etag whenever they are not able to calculate a " "Popular servers send a weak etag whenever they are not able to calculate a "
"strong one. This weak etag will never be valid, but after one second it is " "strong one. This weak etag will never be valid, but after one second it is "
@ -550,7 +535,7 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:266 #: davfs2.conf.5:261
msgid "" msgid ""
"You should turn this on, when you can't use locks and there is the danger of " "You should turn this on, when you can't use locks and there is the danger of "
"concurrent access to the same resource. In this case the etag is not used at " "concurrent access to the same resource. In this case the etag is not used at "
@ -558,18 +543,18 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:268 #: davfs2.conf.5:263
msgid "0 = no, 1 = yes." msgid "0 = no, 1 = yes."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:271 #: davfs2.conf.5:266
#, no-wrap #, no-wrap
msgid "B<allow_cookie>" msgid "B<allow_cookie>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:278 #: davfs2.conf.5:273
msgid "" msgid ""
"Some servers will only work when they are allowed to set a cookie and this " "Some servers will only work when they are allowed to set a cookie and this "
"cookie is returned in subsequent requests. This option adds very simple " "cookie is returned in subsequent requests. This option adds very simple "
@ -578,13 +563,13 @@ msgid ""
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:281 #: davfs2.conf.5:276
#, no-wrap #, no-wrap
msgid "B<precheck>" msgid "B<precheck>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:288 #: davfs2.conf.5:283
msgid "" msgid ""
"If option B<if_match_bug> is set: use HEAD-requests to check for existence " "If option B<if_match_bug> is set: use HEAD-requests to check for existence "
"or modification of a file to avoid unintended overwriting what somebody else " "or modification of a file to avoid unintended overwriting what somebody else "
@ -593,39 +578,39 @@ msgid ""
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:291 #: davfs2.conf.5:286
#, no-wrap #, no-wrap
msgid "B<ignore_dav_header>" msgid "B<ignore_dav_header>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:295 #: davfs2.conf.5:290
msgid "" msgid ""
"Some servers send wrong information about their capabilities in the DAV-" "Some servers send wrong information about their capabilities in the DAV-"
"header. In this case the header should be ignored." "header. In this case the header should be ignored."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:298 #: davfs2.conf.5:293
#, no-wrap #, no-wrap
msgid "B<use_compression>" msgid "B<use_compression>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:302 #: davfs2.conf.5:297
msgid "" msgid ""
"Use gzip-compression for downloading files, if supported by the server. " "Use gzip-compression for downloading files, if supported by the server. "
"Uploads will still be uncompressed." "Uploads will still be uncompressed."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:305 #: davfs2.conf.5:300
#, no-wrap #, no-wrap
msgid "B<server_charset>" msgid "B<server_charset>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:311 #: davfs2.conf.5:306
msgid "" msgid ""
"When extracting file names from the path component of the URL, " "When extracting file names from the path component of the URL, "
"B<@PROGRAM_NAME@> will assume they are encoded using this character set and " "B<@PROGRAM_NAME@> will assume they are encoded using this character set and "
@ -634,7 +619,7 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:319 #: davfs2.conf.5:314
msgid "" msgid ""
"There is no means in HTTP to know the character encoding of the path " "There is no means in HTTP to know the character encoding of the path "
"component. There may be even different encodings within the same path, as " "component. There may be even different encodings within the same path, as "
@ -646,18 +631,18 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:321 #: davfs2.conf.5:316
msgid "Default: no character set conversion" msgid "Default: no character set conversion"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:322 #: davfs2.conf.5:317
#, no-wrap #, no-wrap
msgid "B<connect_timeout>" msgid "B<connect_timeout>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:328 #: davfs2.conf.5:323
msgid "" msgid ""
"When creating a TCP connection to the server B<@PROGRAM_NAME@> will wait " "When creating a TCP connection to the server B<@PROGRAM_NAME@> will wait "
"that many seconds for an answer before assuming an error. If a value of '0' " "that many seconds for an answer before assuming an error. If a value of '0' "
@ -666,43 +651,43 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:331 #: davfs2.conf.5:326
msgid "" msgid ""
"This parameter only takes effect if the version of neon in use (neon version " "This parameter only takes effect if the version of neon in use (neon version "
"E<gt> 0.26) and the OS support non-blocking I/O." "E<gt> 0.26) and the OS support non-blocking I/O."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:333 davfs2.conf.5:448 #: davfs2.conf.5:328 davfs2.conf.5:443
msgid "Default: 10" msgid "Default: 10"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:334 #: davfs2.conf.5:329
#, no-wrap #, no-wrap
msgid "B<read_timeout>" msgid "B<read_timeout>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:338 #: davfs2.conf.5:333
msgid "" msgid ""
"How long in seconds B<@PROGRAM_NAME@> will wait for an answer from the " "How long in seconds B<@PROGRAM_NAME@> will wait for an answer from the "
"server before assuming an error." "server before assuming an error."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:340 davfs2.conf.5:348 #: davfs2.conf.5:335 davfs2.conf.5:343
msgid "Default: 30" msgid "Default: 30"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:341 #: davfs2.conf.5:336
#, no-wrap #, no-wrap
msgid "B<retry>" msgid "B<retry>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:346 #: davfs2.conf.5:341
msgid "" msgid ""
"When B<@PROGRAM_NAME@> can not reach the server it will try again after " "When B<@PROGRAM_NAME@> can not reach the server it will try again after "
"B<retry> seconds. For subsequent retries the interval will be increased up " "B<retry> seconds. For subsequent retries the interval will be increased up "
@ -710,36 +695,36 @@ msgid ""
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:349 #: davfs2.conf.5:344
#, no-wrap #, no-wrap
msgid "B<max_retry>" msgid "B<max_retry>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:352 #: davfs2.conf.5:347
msgid "Maximum value of the retry interval." msgid "Maximum value of the retry interval."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:354 #: davfs2.conf.5:349
msgid "Default: 300" msgid "Default: 300"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:355 #: davfs2.conf.5:350
#, no-wrap #, no-wrap
msgid "B<max_upload_attempts>" msgid "B<max_upload_attempts>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:359 #: davfs2.conf.5:354
msgid "" msgid ""
"When uploading a changed file fails temporarily B<@PROGRAM_NAME@> will retry " "When uploading a changed file fails temporarily B<@PROGRAM_NAME@> will retry "
"with increasing intervals, but not more often than this." "with increasing intervals, but not more often than this."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:364 #: davfs2.conf.5:359
msgid "" msgid ""
"With a bad connection this will cause additional traffic. To reduce traffic " "With a bad connection this will cause additional traffic. To reduce traffic "
"caused by unsuccessful attempts option B<use_expect100> can be set. But " "caused by unsuccessful attempts option B<use_expect100> can be set. But "
@ -747,18 +732,18 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:366 #: davfs2.conf.5:361
msgid "Default: 15" msgid "Default: 15"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:367 #: davfs2.conf.5:362
#, no-wrap #, no-wrap
msgid "B<add_header>" msgid "B<add_header>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:373 #: davfs2.conf.5:368
msgid "" msgid ""
"Your server might expect special headers to do what you want. Different from " "Your server might expect special headers to do what you want. Different from "
"other options, this one takes two values: the name of the header and its " "other options, this one takes two values: the name of the header and its "
@ -767,17 +752,17 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:375 #: davfs2.conf.5:370
msgid "add_header Translate F" msgid "add_header Translate F"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:377 #: davfs2.conf.5:372
msgid "B<@PROGRAM_NAME@> will add header \"Translate: F\" on all requests." msgid "B<@PROGRAM_NAME@> will add header \"Translate: F\" on all requests."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:381 #: davfs2.conf.5:376
msgid "" msgid ""
"This option is cumulative. You can enter more than one add_header option and " "This option is cumulative. You can enter more than one add_header option and "
"all of them will be added. Also add_header options from @SYS_CONF_DIR@/" "all of them will be added. Also add_header options from @SYS_CONF_DIR@/"
@ -785,19 +770,19 @@ msgid ""
msgstr "" msgstr ""


#. type: SH #. type: SH
#: davfs2.conf.5:383 #: davfs2.conf.5:378
#, no-wrap #, no-wrap
msgid "Cache Related Options" msgid "Cache Related Options"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:385 #: davfs2.conf.5:380
#, no-wrap #, no-wrap
msgid "B<backup_dir>" msgid "B<backup_dir>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:390 #: davfs2.conf.5:385
msgid "" msgid ""
"Each mounted @PACKAGE@ file system has a directory to store backups of files " "Each mounted @PACKAGE@ file system has a directory to store backups of files "
"that could not be stored back to the server. This sets the name of this " "that could not be stored back to the server. This sets the name of this "
@ -805,25 +790,25 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:392 #: davfs2.conf.5:387
msgid "Default: lost+found" msgid "Default: lost+found"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:393 #: davfs2.conf.5:388
#, no-wrap #, no-wrap
msgid "B<cache_dir>" msgid "B<cache_dir>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:397 #: davfs2.conf.5:392
msgid "" msgid ""
"The directory where B<@PROGRAM_NAME@> will store cached files. For every " "The directory where B<@PROGRAM_NAME@> will store cached files. For every "
"mount point a subdirectory will be created." "mount point a subdirectory will be created."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:401 #: davfs2.conf.5:396
msgid "" msgid ""
"In the systemwide configuration file this will set the system wide cache, " "In the systemwide configuration file this will set the system wide cache, "
"used by root. In a users configuration file it will set the cache used by " "used by root. In a users configuration file it will set the cache used by "
@ -831,18 +816,18 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:403 #: davfs2.conf.5:398
msgid "Defaults: @SYS_CACHE_DIR@ and ~/.@PACKAGE@/cache" msgid "Defaults: @SYS_CACHE_DIR@ and ~/.@PACKAGE@/cache"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:404 #: davfs2.conf.5:399
#, no-wrap #, no-wrap
msgid "B<cache_size>" msgid "B<cache_size>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:409 #: davfs2.conf.5:404
msgid "" msgid ""
"The amount of disk space in MiByte that may be used. B<@PROGRAM_NAME@> will " "The amount of disk space in MiByte that may be used. B<@PROGRAM_NAME@> will "
"always take enough space to cache open files, ignoring this value if " "always take enough space to cache open files, ignoring this value if "
@ -850,18 +835,18 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:411 #: davfs2.conf.5:406
msgid "Default: 50" msgid "Default: 50"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:412 #: davfs2.conf.5:407
#, no-wrap #, no-wrap
msgid "B<table_size>" msgid "B<table_size>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:418 #: davfs2.conf.5:413
msgid "" msgid ""
"B<@PROGRAM_NAME@> maintains a hash table with an entry for each known file " "B<@PROGRAM_NAME@> maintains a hash table with an entry for each known file "
"or directory. This gives the number of entries in this table. For large file " "or directory. This gives the number of entries in this table. For large file "
@ -870,18 +855,18 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:420 #: davfs2.conf.5:415
msgid "Default: 1024" msgid "Default: 1024"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:421 #: davfs2.conf.5:416
#, no-wrap #, no-wrap
msgid "B<dir_refresh>" msgid "B<dir_refresh>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:426 #: davfs2.conf.5:421
msgid "" msgid ""
"After B<@PROGRAM_NAME@> has got information about files in a directory it " "After B<@PROGRAM_NAME@> has got information about files in a directory it "
"considers it valid for this time in seconds. Note: This does not affect " "considers it valid for this time in seconds. Note: This does not affect "
@ -889,13 +874,13 @@ msgid ""
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:429 #: davfs2.conf.5:424
#, no-wrap #, no-wrap
msgid "B<file_refresh>" msgid "B<file_refresh>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:436 #: davfs2.conf.5:431
msgid "" msgid ""
"When a file or directory is opened by an application, B<@PROGRAM_NAME@> will " "When a file or directory is opened by an application, B<@PROGRAM_NAME@> will "
"first check the server for a newer version. But some applications do open " "first check the server for a newer version. But some applications do open "
@ -905,13 +890,13 @@ msgid ""
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:439 #: davfs2.conf.5:434
#, no-wrap #, no-wrap
msgid "B<delay_upload>" msgid "B<delay_upload>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:446 #: davfs2.conf.5:441
msgid "" msgid ""
"When a file that has been changed is closed, B<@PROGRAM_NAME@> will wait " "When a file that has been changed is closed, B<@PROGRAM_NAME@> will wait "
"that many seconds before it will upload it to the server. This will avoid " "that many seconds before it will upload it to the server. This will avoid "
@ -921,13 +906,13 @@ msgid ""
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:449 #: davfs2.conf.5:444
#, no-wrap #, no-wrap
msgid "B<gui_optimize>" msgid "B<gui_optimize>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:456 #: davfs2.conf.5:451
msgid "" msgid ""
"When a file is opened, B<@PROGRAM_NAME@> will have to check the server " "When a file is opened, B<@PROGRAM_NAME@> will have to check the server "
"whether there is a newer version. Graphical User Interfaces tend to open " "whether there is a newer version. Graphical User Interfaces tend to open "
@ -937,19 +922,19 @@ msgid ""
msgstr "" msgstr ""


#. type: SH #. type: SH
#: davfs2.conf.5:460 #: davfs2.conf.5:455
#, no-wrap #, no-wrap
msgid "Debugging Options" msgid "Debugging Options"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:462 #: davfs2.conf.5:457
#, no-wrap #, no-wrap
msgid "B<debug>" msgid "B<debug>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:470 #: davfs2.conf.5:465
msgid "" msgid ""
"Send debug messages to the syslog daemon. The value tells what kind of " "Send debug messages to the syslog daemon. The value tells what kind of "
"information shall be logged. The messages are send with facility LOG_DAEMON " "information shall be logged. The messages are send with facility LOG_DAEMON "
@ -960,7 +945,7 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:474 #: davfs2.conf.5:469
msgid "" msgid ""
"Unlike other options, this option is cumulative. If there are several debug " "Unlike other options, this option is cumulative. If there are several debug "
"entries with different values, all of them will be applied. Also debug " "entries with different values, all of them will be applied. Also debug "
@ -969,171 +954,171 @@ msgid ""
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:477 #: davfs2.conf.5:472
msgid "" msgid ""
"B<Note:> Debug messages let the log-files grow quickly. Never use this " "B<Note:> Debug messages let the log-files grow quickly. Never use this "
"option in normal operation of mount.davfs." "option in normal operation of mount.davfs."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:479 #: davfs2.conf.5:474
msgid "Default: no debugging messages" msgid "Default: no debugging messages"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:480 #: davfs2.conf.5:475
#, no-wrap #, no-wrap
msgid "B<Recognized values:>" msgid "B<Recognized values:>"
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:482 #: davfs2.conf.5:477
#, no-wrap #, no-wrap
msgid "B<config>" msgid "B<config>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:485 #: davfs2.conf.5:480
msgid "Command line and configuration options." msgid "Command line and configuration options."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:485 #: davfs2.conf.5:480
#, no-wrap #, no-wrap
msgid "B<kernel>" msgid "B<kernel>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:488 #: davfs2.conf.5:483
msgid "Upcalls from the kernel file system." msgid "Upcalls from the kernel file system."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:488 #: davfs2.conf.5:483
#, no-wrap #, no-wrap
msgid "B<cache>" msgid "B<cache>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:491 #: davfs2.conf.5:486
msgid "Cache operations like adding and removing nodes." msgid "Cache operations like adding and removing nodes."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:491 #: davfs2.conf.5:486
#, no-wrap #, no-wrap
msgid "B<http>" msgid "B<http>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:494 #: davfs2.conf.5:489
msgid "HTTP headers." msgid "HTTP headers."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:494 #: davfs2.conf.5:489
#, no-wrap #, no-wrap
msgid "B<xml>" msgid "B<xml>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:497 #: davfs2.conf.5:492
msgid "Parsing of the XML-body of WebDAV-requests." msgid "Parsing of the XML-body of WebDAV-requests."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:497 #: davfs2.conf.5:492
#, no-wrap #, no-wrap
msgid "B<httpauth>" msgid "B<httpauth>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:500 #: davfs2.conf.5:495
msgid "Negotiation of authentication." msgid "Negotiation of authentication."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:500 #: davfs2.conf.5:495
#, no-wrap #, no-wrap
msgid "B<locks>" msgid "B<locks>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:503 #: davfs2.conf.5:498
msgid "Information about locks." msgid "Information about locks."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:503 #: davfs2.conf.5:498
#, no-wrap #, no-wrap
msgid "B<ssl>" msgid "B<ssl>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:506 #: davfs2.conf.5:501
msgid "TLS/SSL related stuff like certificates." msgid "TLS/SSL related stuff like certificates."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:506 #: davfs2.conf.5:501
#, no-wrap #, no-wrap
msgid "B<httpbody>" msgid "B<httpbody>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:509 #: davfs2.conf.5:504
msgid "Complete body of HTTP-responses." msgid "Complete body of HTTP-responses."
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:512 #: davfs2.conf.5:507
msgid "" msgid ""
"Also print confidential information, which is usually omitted or obscured." "Also print confidential information, which is usually omitted or obscured."
msgstr "" msgstr ""


#. type: TP #. type: TP
#: davfs2.conf.5:512 #: davfs2.conf.5:507
#, no-wrap #, no-wrap
msgid "B<most>" msgid "B<most>"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:515 #: davfs2.conf.5:510
msgid "Includes config, kernel, cache and http." msgid "Includes config, kernel, cache and http."
msgstr "" msgstr ""


#. type: SH #. type: SH
#: davfs2.conf.5:518 mount.davfs.8:537 umount.davfs.8:79 #: davfs2.conf.5:513 mount.davfs.8:536 umount.davfs.8:79
#, no-wrap #, no-wrap
msgid "AUTHORS" msgid "AUTHORS"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:522 #: davfs2.conf.5:517
msgid "" msgid ""
"This man page was written by by Werner Baumann E<lt>werner." "This man page was written by by Werner Baumann E<lt>werner."
"baumann@onlinehome.deE<gt>." "baumann@onlinehome.deE<gt>."
msgstr "" msgstr ""


#. type: SH #. type: SH
#: davfs2.conf.5:524 mount.davfs.8:554 umount.davfs.8:84 #: davfs2.conf.5:519 mount.davfs.8:553 umount.davfs.8:84
#, no-wrap #, no-wrap
msgid "DAVFS2 HOME" msgid "DAVFS2 HOME"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:527 mount.davfs.8:557 umount.davfs.8:87 #: davfs2.conf.5:522 mount.davfs.8:556 umount.davfs.8:87
msgid "@PACKAGE_BUGREPORT@" msgid "@PACKAGE_BUGREPORT@"
msgstr "" msgstr ""


#. type: SH #. type: SH
#: davfs2.conf.5:529 mount.davfs.8:559 umount.davfs.8:89 #: davfs2.conf.5:524 mount.davfs.8:558 umount.davfs.8:89
#, no-wrap #, no-wrap
msgid "SEE ALSO" msgid "SEE ALSO"
msgstr "" msgstr ""


#. type: Plain text #. type: Plain text
#: davfs2.conf.5:535 #: davfs2.conf.5:530
msgid "" msgid ""
"B<@PROGRAM_NAME@>(8), B<u@PROGRAM_NAME@>(8), B<mount>(8), B<umount>(8), " "B<@PROGRAM_NAME@>(8), B<u@PROGRAM_NAME@>(8), B<mount>(8), B<umount>(8), "
"B<fstab>(5)" "B<fstab>(5)"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2125,8 +2125,7 @@ read_config(dav_args *args, const char * filename, int system)
args->dav_group = xstrdup(parmv[1]); args->dav_group = xstrdup(parmv[1]);
} else if (strcmp(parmv[0], "buf_size") == 0) { } else if (strcmp(parmv[0], "buf_size") == 0) {
args->buf_size = arg_to_int(parmv[1], 10, parmv[0]); args->buf_size = arg_to_int(parmv[1], 10, parmv[0]);
} else if (strcmp(parmv[0], "trust_ca_cert") == 0 } else if (strcmp(parmv[0], "trust_ca_cert") == 0) {
|| strcmp(parmv[0], "servercert") == 0) {
if (args->trust_ca_cert) if (args->trust_ca_cert)
free(args->trust_ca_cert); free(args->trust_ca_cert);
args->trust_ca_cert = xstrdup(parmv[1]); args->trust_ca_cert = xstrdup(parmv[1]);

View File

@ -384,10 +384,10 @@ dav_init_webdav(dav_args *args)
if (args->server_cert) { if (args->server_cert) {
server_cert = args->server_cert; server_cert = args->server_cert;
args->server_cert = NULL; args->server_cert = NULL;
} else if (args->ca_cert) {
ne_ssl_trust_cert(session, args->ca_cert);
} else { } else {
ne_ssl_trust_default_ca(session); ne_ssl_trust_default_ca(session);
if (args->ca_cert)
ne_ssl_trust_cert(session, args->ca_cert);
} }


if (args->client_cert) if (args->client_cert)