SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal-upload: fix --trust=all option

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-10-23 00:27:55 -04:00
parent 30776485c5
commit 8847551bcb
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal-remote/journal-upload.c
+6 -3
View File
@@ -63,7 +63,7 @@ static const char *arg_save_state = NULL;
#define STATE_FILE "/var/lib/systemd/journal-upload/state"
#define easy_setopt(curl, opt, value, level, cmd) \
{ \
do { \
code = curl_easy_setopt(curl, opt, value); \
if (code) { \
log_full(level, \
@@ -71,7 +71,7 @@ static const char *arg_save_state = NULL;
curl_easy_strerror(code)); \
cmd; \
} \
}
} while(0)
static size_t output_callback(char *buf,
size_t size,
@@ -254,7 +254,10 @@ int start_upload(Uploader *u,
LOG_ERR, return -EXFULL);
}
if (arg_trust || startswith(u->url, "https://"))
if (streq_ptr(arg_trust, "all"))
easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0,
LOG_ERR, return -EUCLEAN);
else if (arg_trust || startswith(u->url, "https://"))
easy_setopt(curl, CURLOPT_CAINFO, arg_trust ?: TRUST_FILE,
LOG_ERR, return -EXFULL);