diff options
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | po/cs.po | 51 | ||||
| -rw-r--r-- | po/de.po | 97 | ||||
| -rw-r--r-- | po/es.po | 34 | ||||
| -rw-r--r-- | po/fr.po | 44 | ||||
| -rw-r--r-- | po/hu.po | 34 | ||||
| -rw-r--r-- | po/it.po | 51 | ||||
| -rw-r--r-- | po/ja.po | 51 | ||||
| -rw-r--r-- | po/pl.po | 53 | ||||
| -rw-r--r-- | po/pt.po | 51 | ||||
| -rw-r--r-- | po/pt_BR.po | 34 | ||||
| -rw-r--r-- | po/ru.po | 34 | ||||
| -rw-r--r-- | po/sr.po | 53 | ||||
| -rw-r--r-- | po/tr.po | 53 | ||||
| -rw-r--r-- | po/weechat.pot | 34 | ||||
| -rw-r--r-- | src/plugins/relay/relay-network.c | 74 |
16 files changed, 552 insertions, 197 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 54c8a6d0d..aa48d6426 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -52,6 +52,7 @@ New features:: * irc: add `${username}` in server options "nicks" and "username", change their default values to use it * logger: add info "logger_log_file" * relay: rename "ssl" options and protocol to "tls" + * relay: make TLS certificate/key loading error handling more verbose (issue #1558) Bug fixes:: @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4701,15 +4701,6 @@ msgstr "" msgid "No secured data set" msgstr "Nenastavena chráněná data" -#, fuzzy -msgid "secured data" -msgstr "Chráněná data:" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "Prosím vložte heslo k dešifrování dat chráněných WeeChatem:" @@ -11212,6 +11203,15 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "" +#, fuzzy +msgid "secured data" +msgstr "Chráněná data:" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" + msgid "list of bars" msgstr "seznam polí" @@ -12107,11 +12107,42 @@ msgid "relay pointer (optional)" msgstr "ukazatel přesměrování (volitelné)" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" +"%s%s: varovní: nenalezen SSL certifikát/klíč (volba relay.network." +"ssl_cert_key)" + +#, fuzzy, c-format #| msgid "%s: SSL certificate and key have been set" msgid "%s: TLS certificate and key have been set" msgstr "%s: SSL certifikát a klíč byl nastaven" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" +"%s%s: varovní: nenalezen SSL certifikát/klíč (volba relay.network." +"ssl_cert_key)" + +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" +"%s%s: varovní: nenalezen SSL certifikát/klíč (volba relay.network." +"ssl_cert_key)" + +#, fuzzy, c-format msgid "%s%s: unable to initialize priority for TLS" msgstr "%sChyba: nemohu inicializovat plugin \"%s\"" @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-14 15:49+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" @@ -5874,16 +5874,6 @@ msgstr "" msgid "No secured data set" msgstr "Keine schutzwürdigen Daten definiert" -msgid "secured data" -msgstr "schutzwürdige Daten" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" -"schutzwürdige Daten: Namen und Werte (Vorsicht: Dies sind vertrauliche " -"Daten: drucken oder protokollieren Sie diese NICHT)" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" "Bitte gebe die Passphrase ein um die durch WeeChat geschützten Daten zu " @@ -9177,34 +9167,6 @@ msgstr "Aushandlung der Clientfähigkeit" msgid "ls || list || req|ack [<capability> [<capability>...]] || end" msgstr "ls || list || req|ack [<capability> [<capability>...]] || end" -#| msgid "" -#| " ls: list the capabilities supported by the server\n" -#| " list: list the capabilities currently enabled\n" -#| " req: request a new capability or remove a capability (if starting with " -#| "\"-\", for example: \"-multi-prefix\")\n" -#| " ack: acknowledge capabilities which require client-side " -#| "acknowledgement\n" -#| " end: end the capability negotiation\n" -#| "\n" -#| "Without argument, \"ls\" and \"list\" are sent.\n" -#| "\n" -#| "Capabilities supported by WeeChat are: account-notify, away-notify, " -#| "batch, cap-notify, chghost, extended-join, invite-notify, message-tags, " -#| "multi-prefix, server-time, setname, userhost-in-names.\n" -#| "\n" -#| "The capabilities to automatically enable on servers can be set in option " -#| "irc.server_default.capabilities (or by server in option irc.server.xxx." -#| "capabilities).\n" -#| "\n" -#| "Examples:\n" -#| " display supported and enabled capabilities:\n" -#| " /cap\n" -#| " request capabilities multi-prefix and away-notify:\n" -#| " /cap req multi-prefix away-notify\n" -#| " request capability extended-join, remove capability multi-prefix:\n" -#| " /cap req extended-join -multi-prefix\n" -#| " remove capability away-notify:\n" -#| " /cap req -away-notify" msgid "" " ls: list the capabilities supported by the server\n" " list: list the capabilities currently enabled\n" @@ -10851,11 +10813,11 @@ msgid "" "\"weechat\" if not found), server options are evaluated with ${irc_server." "xxx} and ${server} is replaced by the server name)" msgstr "" -"Auf dem Server zu verwendender Nickname (durch Komma getrennt) (Hinweis:" -" Inhalt wird evaluiert, siehe /help eval; ${username} wird durch" -" Systembenutzernamen ersetzt (\"weechat\" wird genutzt, falls nicht" -" gefunden), Serveroptionen werden mit ${irc_server.xxx} evaluiert und" -" ${server} wird durch den Servernamen ersetzt)" +"Auf dem Server zu verwendender Nickname (durch Komma getrennt) (Hinweis: " +"Inhalt wird evaluiert, siehe /help eval; ${username} wird durch " +"Systembenutzernamen ersetzt (\"weechat\" wird genutzt, falls nicht " +"gefunden), Serveroptionen werden mit ${irc_server.xxx} evaluiert und " +"${server} wird durch den Servernamen ersetzt)" msgid "" "get an alternate nick when all the declared nicks are already used on " @@ -13610,6 +13572,16 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "siehe Funktion \"hook_focus\" in API Dokumentation" +msgid "secured data" +msgstr "schutzwürdige Daten" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" +"schutzwürdige Daten: Namen und Werte (Vorsicht: Dies sind vertrauliche " +"Daten: drucken oder protokollieren Sie diese NICHT)" + msgid "list of bars" msgstr "Auflistung der Bars" @@ -14653,10 +14625,41 @@ msgstr "Liste der Relay-Clients" msgid "relay pointer (optional)" msgstr "Relay Pointer (optional)" +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no TLS certificate/key found (option relay.network." +#| "tls_cert_key)" +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" +"%s%s: Warnung: kein TLS Zertifikat/Schlüssel gefunden (Einstellung relay." +"network.tls_cert_key)" + #, c-format msgid "%s: TLS certificate and key have been set" msgstr "%s: TLS Zertifikat und Schlüssel wurden festgelegt" +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no TLS certificate/key found (option relay.network." +#| "tls_cert_key)" +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" +"%s%s: Warnung: kein TLS Zertifikat/Schlüssel gefunden (Einstellung relay." +"network.tls_cert_key)" + +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no TLS certificate/key found (option relay.network." +#| "tls_cert_key)" +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" +"%s%s: Warnung: kein TLS Zertifikat/Schlüssel gefunden (Einstellung relay." +"network.tls_cert_key)" + #, c-format msgid "%s%s: unable to initialize priority for TLS" msgstr "%s%s: Initialisierung der Priorität für TLS fehlgeschlagen" @@ -15974,8 +15977,7 @@ msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat" msgid "" "list|listfull|listdefault || add|addoff|addreplace <name> <hook> " -"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<" -"return_code>\" [\"<post_action>\"]]]]]] " +"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] " "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> " "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-" "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del " @@ -15983,8 +15985,7 @@ msgid "" "monitor [<filter>]" msgstr "" "list|listfull|listdefault || add|addoff|addreplace <name> <hook> " -"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<" -"return_code>\" [\"<post_action>\"]]]]]] " +"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] " "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> " "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-" "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del " @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Santiago Forero <santiago@forero.xyz>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5322,14 +5322,6 @@ msgstr "" msgid "No secured data set" msgstr "" -msgid "secured data" -msgstr "" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" @@ -11941,6 +11933,14 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "" +msgid "secured data" +msgstr "" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" + msgid "list of bars" msgstr "lista de barras" @@ -12864,11 +12864,27 @@ msgstr "Lista de clientes en el repetidor" msgid "relay pointer (optional)" msgstr "puntero del retransmisor (opcional)" +#, c-format +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" + #, fuzzy, c-format #| msgid "%s: SSL certificate and key have been set" msgid "%s: TLS certificate and key have been set" msgstr "%s: certificado SSL y llave configurados" +#, c-format +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" + +#, c-format +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" + #, fuzzy, c-format #| msgid "%s%s: unable to initialize priority for SSL" msgid "%s%s: unable to initialize priority for TLS" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" -"PO-Revision-Date: 2023-05-14 15:29+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" +"PO-Revision-Date: 2023-05-18 09:50+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -5746,16 +5746,6 @@ msgstr "" msgid "No secured data set" msgstr "Pas de donnée sécurisée définie" -msgid "secured data" -msgstr "données sécurisées" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" -"données sécurisées : noms et valeurs (attention : les valeurs sont des " -"données sensibles : il ne faut PAS les afficher/logger)" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" "Veuillez entrer votre phrase de chiffrement pour déchiffrer les données " @@ -13311,6 +13301,16 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "voir la fonction hook_focus dans la Référence API extension" +msgid "secured data" +msgstr "données sécurisées" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" +"données sécurisées : noms et valeurs (attention : les valeurs sont des " +"données sensibles : il ne faut PAS les afficher/logger)" + msgid "list of bars" msgstr "liste des barres" @@ -14344,10 +14344,30 @@ msgid "relay pointer (optional)" msgstr "pointeur vers le relay (optionnel)" #, c-format +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" +"%s%s : pas de certificat/clé TLS trouvés (l'option relay.network." +"tls_cert_key est vide)" + +#, c-format msgid "%s: TLS certificate and key have been set" msgstr "%s : certificat et clé TLS ont été définis" #, c-format +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "%s%s : erreur gnutls : %s : %s (option relay.network.tls_cert_key)" + +#, c-format +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" +"%s%s : erreur : le fichier avec le certificat/clé TLS n'est pas lisible : " +"\"%s\" (option relay.network.tls_cert_key)" + +#, c-format msgid "%s%s: unable to initialize priority for TLS" msgstr "%s%s : impossible d'initialiser la priorité pour TLS" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4249,14 +4249,6 @@ msgstr "" msgid "No secured data set" msgstr "" -msgid "secured data" -msgstr "" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" @@ -10600,6 +10592,14 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "" +msgid "secured data" +msgstr "" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" + #, fuzzy msgid "list of bars" msgstr "Aliaszok listája:\n" @@ -11492,10 +11492,26 @@ msgstr "Aliaszok listája:\n" msgid "relay pointer (optional)" msgstr "" +#, c-format +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" + #, fuzzy, c-format msgid "%s: TLS certificate and key have been set" msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n" +#, c-format +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" + +#, c-format +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" + #, fuzzy, c-format msgid "%s%s: unable to initialize priority for TLS" msgstr "%s nem sikerült a modult betölteni \"%s\"\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4969,15 +4969,6 @@ msgstr "" msgid "No secured data set" msgstr "Dati sicuri non configurati" -#, fuzzy -msgid "secured data" -msgstr "Dati sicuri:" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" "Inserire la parola chiave per decifrare i dati messi al sicuro da WeeChat:" @@ -11665,6 +11656,15 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "" +#, fuzzy +msgid "secured data" +msgstr "Dati sicuri:" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" + msgid "list of bars" msgstr "elenco delle barre" @@ -12603,11 +12603,42 @@ msgid "relay pointer (optional)" msgstr "puntatore al relay (opzionale)" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" +"%s%s: attenzione: nessun certificato/chiave SSL trovato (opzione relay." +"network.ssl_cert_key)" + +#, fuzzy, c-format #| msgid "%s: SSL certificate and key have been set" msgid "%s: TLS certificate and key have been set" msgstr "%s: il certificato SSL e la chiave sono stati impostati" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" +"%s%s: attenzione: nessun certificato/chiave SSL trovato (opzione relay." +"network.ssl_cert_key)" + +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" +"%s%s: attenzione: nessun certificato/chiave SSL trovato (opzione relay." +"network.ssl_cert_key)" + +#, fuzzy, c-format #| msgid "%s%s: unable to initialize priority for SSL" msgid "%s%s: unable to initialize priority for TLS" msgstr "%s%s: impossibile inizializzare la priorità per SSL" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" @@ -5571,15 +5571,6 @@ msgstr "" msgid "No secured data set" msgstr "保護データが設定されていません" -#, fuzzy -msgid "secured data" -msgstr "保護データ:" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" "WeeChat が暗号化したデータの復号化を行うにはパスフレーズを入力してください:" @@ -12868,6 +12859,15 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "" +#, fuzzy +msgid "secured data" +msgstr "保護データ:" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" + msgid "list of bars" msgstr "バーのリスト" @@ -13862,11 +13862,42 @@ msgid "relay pointer (optional)" msgstr "リレーポインタ (任意)" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" +"%s%s: 警告: SSL 証明書/鍵が見つかりません (オプション relay.network." +"ssl_cert_key)" + +#, fuzzy, c-format #| msgid "%s: SSL certificate and key have been set" msgid "%s: TLS certificate and key have been set" msgstr "%s: SSL 証明書と鍵が設定されました" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" +"%s%s: 警告: SSL 証明書/鍵が見つかりません (オプション relay.network." +"ssl_cert_key)" + +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" +"%s%s: 警告: SSL 証明書/鍵が見つかりません (オプション relay.network." +"ssl_cert_key)" + +#, fuzzy, c-format #| msgid "%s%s: unable to initialize priority for SSL" msgid "%s%s: unable to initialize priority for TLS" msgstr "%s%s: SSL 優先度の初期化に失敗" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" @@ -6020,16 +6020,6 @@ msgstr "" msgid "No secured data set" msgstr "Brak zabezpieczonych danych" -msgid "secured data" -msgstr "zabezpieczone dane" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" -"zabezpieczone dane: nazwy i wartości (uważaj: to są wrażliwe dane: NIE " -"wyświetlaj/zapisuj ich nigdzie)" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" "Podaj swoje hasło w celu rozszyfrowania danych zabezpieczonych przez WeeChat:" @@ -13884,6 +13874,16 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "zobacz funkcję „hook_focus” w opisie API wtyczek" +msgid "secured data" +msgstr "zabezpieczone dane" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" +"zabezpieczone dane: nazwy i wartości (uważaj: to są wrażliwe dane: NIE " +"wyświetlaj/zapisuj ich nigdzie)" + msgid "list of bars" msgstr "lista pasków" @@ -14970,11 +14970,42 @@ msgid "relay pointer (optional)" msgstr "wskaźnik relay (opcjonalny)" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" +"%s%s: ostrzeżenie: nie znaleziono certyfikatu/klucza SSL (opcja relay." +"network.ssl_cert_key)" + +#, fuzzy, c-format #| msgid "%s: SSL certificate and key have been set" msgid "%s: TLS certificate and key have been set" msgstr "%s: certyfikat SSL i klucz zostały ustawione" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" +"%s%s: ostrzeżenie: nie znaleziono certyfikatu/klucza SSL (opcja relay." +"network.ssl_cert_key)" + +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" +"%s%s: ostrzeżenie: nie znaleziono certyfikatu/klucza SSL (opcja relay." +"network.ssl_cert_key)" + +#, fuzzy, c-format #| msgid "%s%s: unable to initialize priority for SSL" msgid "%s%s: unable to initialize priority for TLS" msgstr "%s%s: nie można zainicjować priorytetu dla SSL" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" @@ -5606,15 +5606,6 @@ msgstr "" msgid "No secured data set" msgstr "Nenhum dado protegido definido" -#, fuzzy -msgid "secured data" -msgstr "Dados protegidos:" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" "Introduza a palavra de acesso para desencriptar os dados protegidos pelo " @@ -12640,6 +12631,15 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "" +#, fuzzy +msgid "secured data" +msgstr "Dados protegidos:" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" + msgid "list of bars" msgstr "lista de barras" @@ -13606,11 +13606,42 @@ msgid "relay pointer (optional)" msgstr "ponteiro para relay (opcional)" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" +"%s%s: aviso: não foi encontrado nenhum certificado/chave SSL (opção relay." +"network.ssl_cert_key)" + +#, fuzzy, c-format #| msgid "%s: SSL certificate and key have been set" msgid "%s: TLS certificate and key have been set" msgstr "%s: o certificado e a chave SSL foram enviados" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" +"%s%s: aviso: não foi encontrado nenhum certificado/chave SSL (opção relay." +"network.ssl_cert_key)" + +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" +"%s%s: aviso: não foi encontrado nenhum certificado/chave SSL (opção relay." +"network.ssl_cert_key)" + +#, fuzzy, c-format #| msgid "%s%s: unable to initialize priority for SSL" msgid "%s%s: unable to initialize priority for TLS" msgstr "%s%s: não foi possível inicializar a prioridade de SSL" diff --git a/po/pt_BR.po b/po/pt_BR.po index c513c2070..42713ef71 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4958,14 +4958,6 @@ msgstr "" msgid "No secured data set" msgstr "" -msgid "secured data" -msgstr "" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" @@ -11160,6 +11152,14 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "" +msgid "secured data" +msgstr "" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" + msgid "list of bars" msgstr "lista de barras" @@ -12067,10 +12067,26 @@ msgstr "lista de clientes relay" msgid "relay pointer (optional)" msgstr "" +#, c-format +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" + #, fuzzy, c-format msgid "%s: TLS certificate and key have been set" msgstr "%s: certificado SSL e chave foram setados" +#, c-format +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" + +#, c-format +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" + #, fuzzy, c-format msgid "%s%s: unable to initialize priority for TLS" msgstr "%s%s: não foi possível inicializar prioridade para SSL" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4283,14 +4283,6 @@ msgstr "" msgid "No secured data set" msgstr "" -msgid "secured data" -msgstr "" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" @@ -10638,6 +10630,14 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "" +msgid "secured data" +msgstr "" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" + #, fuzzy msgid "list of bars" msgstr "Список сокращений:\n" @@ -11527,10 +11527,26 @@ msgstr "Список сокращений:\n" msgid "relay pointer (optional)" msgstr "" +#, c-format +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" + #, fuzzy, c-format msgid "%s: TLS certificate and key have been set" msgstr "Не могу записать лог-файл \"%s\"\n" +#, c-format +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" + +#, c-format +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" + #, fuzzy, c-format msgid "%s%s: unable to initialize priority for TLS" msgstr "%s не могу инициализировать plugin \"%s\"\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-14 15:29+0200\n" "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5604,16 +5604,6 @@ msgstr "" msgid "No secured data set" msgstr "Нису постављени никакви обезбеђени подаци" -msgid "secured data" -msgstr "обезбеђени подаци" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" -"обезбеђени подаци: имена и вредности (будите пажљиви: вредности су осетљиви " -"подаци: НЕМОЈТЕ да их штампате/логујете било где)" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" "Унесите своју тајну реченицу да би се дешифровали подаци које је обезбедио " @@ -13027,6 +13017,16 @@ msgid "see function \"hook_focus\" in Plugin API reference" msgstr "" "погледајте функцију „hook_focus” у API референтном приручнику за додатке" +msgid "secured data" +msgstr "обезбеђени подаци" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" +"обезбеђени подаци: имена и вредности (будите пажљиви: вредности су осетљиви " +"подаци: НЕМОЈТЕ да их штампате/логујете било где)" + msgid "list of bars" msgstr "листа трака" @@ -14030,10 +14030,41 @@ msgstr "листа релеј клијената" msgid "relay pointer (optional)" msgstr "показивач на релеј (није обавезан)" +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no TLS certificate/key found (option relay.network." +#| "tls_cert_key)" +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" +"%s%s: упозорење: није пронађен ниједан TLS сертификат/кључ (опција relay." +"network.tls_cert_key)" + #, c-format msgid "%s: TLS certificate and key have been set" msgstr "%s: TLS сертификат и кључ нису постављени" +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no TLS certificate/key found (option relay.network." +#| "tls_cert_key)" +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" +"%s%s: упозорење: није пронађен ниједан TLS сертификат/кључ (опција relay." +"network.tls_cert_key)" + +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no TLS certificate/key found (option relay.network." +#| "tls_cert_key)" +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" +"%s%s: упозорење: није пронађен ниједан TLS сертификат/кључ (опција relay." +"network.tls_cert_key)" + #, c-format msgid "%s%s: unable to initialize priority for TLS" msgstr "%s%s: није успела иницијализација приоритета за TLS" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5649,16 +5649,6 @@ msgstr "" msgid "No secured data set" msgstr "Ayarlanan güvenli veri yok" -msgid "secured data" -msgstr "güvenli veri" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" -"güvenli veri: adlar ve değerler (dikkatli olun, değerler hassas veridir, " -"hiçbir zaman bir yerde yazdırmayın/günlüklemeyin)" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" "WeeChat'in güvenli sakladığı verinin şifresini çözmek için parolanızı girin:" @@ -13428,6 +13418,16 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "eklenti API başvurusunda \"hook_focus\" işlevine bakın" +msgid "secured data" +msgstr "güvenli veri" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" +"güvenli veri: adlar ve değerler (dikkatli olun, değerler hassas veridir, " +"hiçbir zaman bir yerde yazdırmayın/günlüklemeyin)" + msgid "list of bars" msgstr "çubuklar listesi" @@ -14494,11 +14494,42 @@ msgid "relay pointer (optional)" msgstr "iletim işaretçisi (isteğe bağlı)" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" +"%s%s: Uyarı: Bir SSL sertifika/anahtar seçeneği bulunamadı (relay.network." +"ssl_cert_key seçeneği)" + +#, fuzzy, c-format #| msgid "%s: SSL certificate and key have been set" msgid "%s: TLS certificate and key have been set" msgstr "%s: SSL sertifikası ve anahtar ayarlandı" #, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" +"%s%s: Uyarı: Bir SSL sertifika/anahtar seçeneği bulunamadı (relay.network." +"ssl_cert_key seçeneği)" + +#, fuzzy, c-format +#| msgid "" +#| "%s%s: warning: no SSL certificate/key found (option relay.network." +#| "ssl_cert_key)" +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" +"%s%s: Uyarı: Bir SSL sertifika/anahtar seçeneği bulunamadı (relay.network." +"ssl_cert_key seçeneği)" + +#, fuzzy, c-format #| msgid "%s%s: unable to initialize priority for SSL" msgid "%s%s: unable to initialize priority for TLS" msgstr "%s%s: SSL için öncelik ilklendirilemiyor" diff --git a/po/weechat.pot b/po/weechat.pot index 1575de58c..fc67c62fb 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-14 14:33+0200\n" +"POT-Creation-Date: 2023-05-18 09:49+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3886,14 +3886,6 @@ msgstr "" msgid "No secured data set" msgstr "" -msgid "secured data" -msgstr "" - -msgid "" -"secured data: names and values (be careful: the values are sensitive data: " -"do NOT print/log them anywhere)" -msgstr "" - msgid "Please enter your passphrase to decrypt the data secured by WeeChat:" msgstr "" @@ -9584,6 +9576,14 @@ msgstr "" msgid "see function \"hook_focus\" in Plugin API reference" msgstr "" +msgid "secured data" +msgstr "" + +msgid "" +"secured data: names and values (be careful: the values are sensitive data: " +"do NOT print/log them anywhere)" +msgstr "" + msgid "list of bars" msgstr "" @@ -10394,10 +10394,26 @@ msgid "relay pointer (optional)" msgstr "" #, c-format +msgid "" +"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is " +"empty)" +msgstr "" + +#, c-format msgid "%s: TLS certificate and key have been set" msgstr "" #, c-format +msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)" +msgstr "" + +#, c-format +msgid "" +"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option " +"relay.network.tls_cert_key)" +msgstr "" + +#, c-format msgid "%s%s: unable to initialize priority for TLS" msgstr "" diff --git a/src/plugins/relay/relay-network.c b/src/plugins/relay/relay-network.c index 906cc85d7..4ed53ef83 100644 --- a/src/plugins/relay/relay-network.c +++ b/src/plugins/relay/relay-network.c @@ -20,6 +20,7 @@ */ #include <stdlib.h> +#include <unistd.h> #include <gnutls/gnutls.h> @@ -47,6 +48,7 @@ gnutls_dh_params_t *relay_gnutls_dh_params = NULL; void relay_network_set_tls_cert_key (int verbose) { + const char *ptr_option; char *certkey_path; int ret; struct t_hashtable *options; @@ -56,6 +58,20 @@ relay_network_set_tls_cert_key (int verbose) relay_network_init_tls_cert_key_ok = 0; + ptr_option = weechat_config_string (relay_config_network_tls_cert_key); + + if (!ptr_option || !ptr_option[0]) + { + if (verbose) + { + weechat_printf (NULL, + _("%s%s: no TLS certificate/key found (option " + "relay.network.tls_cert_key is empty)"), + weechat_prefix ("error"), RELAY_PLUGIN_NAME); + } + return; + } + options = weechat_hashtable_new ( 32, WEECHAT_HASHTABLE_STRING, @@ -63,26 +79,42 @@ relay_network_set_tls_cert_key (int verbose) NULL, NULL); if (options) weechat_hashtable_set (options, "directory", "config"); - certkey_path = weechat_string_eval_path_home ( - weechat_config_string (relay_config_network_tls_cert_key), - NULL, NULL, options); + certkey_path = weechat_string_eval_path_home (ptr_option, + NULL, NULL, options); if (options) weechat_hashtable_free (options); - if (certkey_path) + + if (certkey_path && certkey_path[0]) { - ret = gnutls_certificate_set_x509_key_file (relay_gnutls_x509_cred, - certkey_path, - certkey_path, - GNUTLS_X509_FMT_PEM); - if (ret >= 0) + if (access (certkey_path, R_OK) == 0) { - relay_network_init_tls_cert_key_ok = 1; - if (verbose) + ret = gnutls_certificate_set_x509_key_file (relay_gnutls_x509_cred, + certkey_path, + certkey_path, + GNUTLS_X509_FMT_PEM); + if (ret >= 0) { - weechat_printf (NULL, - _("%s: TLS certificate and key have been " - "set"), - RELAY_PLUGIN_NAME); + relay_network_init_tls_cert_key_ok = 1; + if (verbose) + { + weechat_printf (NULL, + _("%s: TLS certificate and key have been " + "set"), + RELAY_PLUGIN_NAME); + } + } + else + { + if (verbose) + { + weechat_printf (NULL, + _("%s%s: gnutls error: %s: %s " + "(option relay.network.tls_cert_key)"), + weechat_prefix ("error"), + RELAY_PLUGIN_NAME, + gnutls_strerror_name (ret), + gnutls_strerror (ret)); + } } } else @@ -90,13 +122,17 @@ relay_network_set_tls_cert_key (int verbose) if (verbose) { weechat_printf (NULL, - _("%s%s: warning: no TLS certificate/key " - "found (option relay.network.tls_cert_key)"), - weechat_prefix ("error"), RELAY_PLUGIN_NAME); + _("%s%s: error: file with TLS certificate/key " + "is not readable: \"%s\" " + "(option relay.network.tls_cert_key)"), + weechat_prefix ("error"), RELAY_PLUGIN_NAME, + certkey_path); } } - free (certkey_path); } + + if (certkey_path) + free (certkey_path); } /* |