chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal-remote: fix parsing of fd command line argument
[elogind.git]
/
src
/
journal-remote
/
journal-upload.c
diff --git
a/src/journal-remote/journal-upload.c
b/src/journal-remote/journal-upload.c
index 72396bf205a22192d32b56ba0f708d0f503573b1..b178df2d34bb0e24cfcff9905fbdc771d3de6955 100644
(file)
--- a/
src/journal-remote/journal-upload.c
+++ b/
src/journal-remote/journal-upload.c
@@
-34,9
+34,9
@@
#include "conf-parser.h"
#include "journal-upload.h"
#include "conf-parser.h"
#include "journal-upload.h"
-#define
KEY_FILE
CERTIFICATE_ROOT "/private/journal-upload.pem"
-#define CERT_FILE CERTIFICATE_ROOT "/certs/journal-upload.pem"
-#define TRUST_FILE CERTIFICATE_ROOT "/ca/trusted.pem"
+#define
PRIV_KEY_FILE
CERTIFICATE_ROOT "/private/journal-upload.pem"
+#define CERT_FILE
CERTIFICATE_ROOT "/certs/journal-upload.pem"
+#define TRUST_FILE
CERTIFICATE_ROOT "/ca/trusted.pem"
static const char* arg_url;
static const char* arg_url;
@@
-222,7
+222,7
@@
int start_upload(Uploader *u,
if (arg_key || startswith(u->url, "https://")) {
assert(arg_cert);
if (arg_key || startswith(u->url, "https://")) {
assert(arg_cert);
- easy_setopt(curl, CURLOPT_SSLKEY, arg_key ?: KEY_FILE,
+ easy_setopt(curl, CURLOPT_SSLKEY, arg_key ?:
PRIV_
KEY_FILE,
LOG_ERR, return -EXFULL);
easy_setopt(curl, CURLOPT_SSLCERT, arg_cert ?: CERT_FILE,
LOG_ERR, return -EXFULL);
LOG_ERR, return -EXFULL);
easy_setopt(curl, CURLOPT_SSLCERT, arg_cert ?: CERT_FILE,
LOG_ERR, return -EXFULL);