summaryrefslogtreecommitdiff
path: root/src/journal-remote
diff options
context:
space:
mode:
authorMarkus Grimm <grimm@magazino.eu>2018-11-12 07:47:47 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-11-12 15:47:47 +0900
commitd7ef030b26885691402368e46708188e1af1f223 (patch)
tree867104a6a68ea4a60f2444a6f002e3d6f2d58ef0 /src/journal-remote
parentf628e3eea7cfdaab136f33bf999989d85f04f004 (diff)
downloadsystemd-d7ef030b26885691402368e46708188e1af1f223.tar.gz
journal-remote: bugfix to re-enable ssl key check (#10707)
Diffstat (limited to 'src/journal-remote')
-rw-r--r--src/journal-remote/journal-remote-main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index b52e9329ef..76e7af28bf 100644
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -1114,9 +1114,11 @@ int main(int argc, char **argv) {
return EXIT_FAILURE;
}
- if (arg_listen_https || https_socket >= 0)
+ if (arg_listen_https || https_socket >= 0) {
if (load_certificates(&key, &cert, &trust) < 0)
return EXIT_FAILURE;
+ s.check_trust = !arg_trust_all;
+ }
if (create_remoteserver(&s, key, cert, trust) < 0)
return EXIT_FAILURE;