diff --git a/ChangeLog b/ChangeLog index b7d85fa83..353fa9667 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,9 +7,11 @@ v0.3.6-dev, 2011-08-26 Version 0.3.6 (under dev!) -------------------------- +* core: change default value of option weechat.network.gnutls_ca_file to + "/etc/ssl/certs/ca-certificates.crt" * core: replace deprecated gnutls function - "gnutls_certificate_client_set_retrieve_function" by new function - "gnutls_certificate_set_retrieve_function" (gnutls >= 2.11.0) + gnutls_certificate_client_set_retrieve_function by new function + gnutls_certificate_set_retrieve_function (gnutls >= 2.11.0) * core: use dynamic buffer size for calls to vsnprintf * core: fix memory leak in unhook of hook_connect * core: fix memory leak in display of empty bar items diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt index 930d20810..cc90c3c4c 100644 --- a/doc/de/autogen/user/weechat_options.txt +++ b/doc/de/autogen/user/weechat_options.txt @@ -626,7 +626,7 @@ * *weechat.network.gnutls_ca_file* ** Beschreibung: `Datei beinhaltet die digitalen Zertifikate ("%h" wird durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: "~/.weechat")` ** Typ: Zeichenkette -** Werte: beliebige Zeichenkette (Standardwert: `"%h/ssl/CAs.pem"`) +** Werte: beliebige Zeichenkette (Standardwert: `"/etc/ssl/certs/ca-certificates.crt"`) * *weechat.network.gnutls_handshake_timeout* ** Beschreibung: `Zeitüberschreitung (in Sekunden) für gnutls handshake` diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index 88f1f8870..1bfd01fe0 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -626,7 +626,7 @@ * *weechat.network.gnutls_ca_file* ** description: `file containing the certificate authorities ("%h" will be replaced by WeeChat home, "~/.weechat" by default)` ** type: string -** values: any string (default value: `"%h/ssl/CAs.pem"`) +** values: any string (default value: `"/etc/ssl/certs/ca-certificates.crt"`) * *weechat.network.gnutls_handshake_timeout* ** description: `timeout (in seconds) for gnutls handshake` diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index c5eed781f..e68ef75ed 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -626,7 +626,7 @@ * *weechat.network.gnutls_ca_file* ** description: `fichier contenant les autorités de certification ("%h" sera remplacé par le répertoire de base WeeChat, par défaut: "~/.weechat")` ** type: chaîne -** valeurs: toute chaîne (valeur par défaut: `"%h/ssl/CAs.pem"`) +** valeurs: toute chaîne (valeur par défaut: `"/etc/ssl/certs/ca-certificates.crt"`) * *weechat.network.gnutls_handshake_timeout* ** description: `délai d'attente maximum (en secondes) pour la poignée de main (handshake) gnutls` diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index 71e27dd69..2cd069055 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -626,7 +626,7 @@ * *weechat.network.gnutls_ca_file* ** descrizione: `file contenente le autorità certificative ("%h" sarà sostituito dalla home di WeeChat, "~/.weechat come predefinita)` ** tipo: stringa -** valori: qualsiasi stringa (valore predefinito: `"%h/ssl/CAs.pem"`) +** valori: qualsiasi stringa (valore predefinito: `"/etc/ssl/certs/ca-certificates.crt"`) * *weechat.network.gnutls_handshake_timeout* ** descrizione: `timeout (in secondi) per l'handshake di gnutls` diff --git a/src/core/wee-config.c b/src/core/wee-config.c index c622da141..0c0cf715b 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -2437,7 +2437,7 @@ config_weechat_init_options () "gnutls_ca_file", "string", N_("file containing the certificate authorities (\"%h\" will be " "replaced by WeeChat home, \"~/.weechat\" by default)"), - NULL, 0, 0, "%h/ssl/CAs.pem", NULL, 0, NULL, NULL, + NULL, 0, 0, "/etc/ssl/certs/ca-certificates.crt", NULL, 0, NULL, NULL, &config_change_network_gnutls_ca_file, NULL, NULL, NULL); config_network_gnutls_handshake_timeout = config_file_new_option ( weechat_config_file, ptr_section,