X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal-remote%2Fjournal-upload.c;h=b178df2d34bb0e24cfcff9905fbdc771d3de6955;hb=249968612f16a71df909d6e73785c18a9ff36a65;hp=a381ec59bf6834fd07132923c1dbb94e7adc5bbd;hpb=29fc0ddcd737af906986d4029579d4dfe838ba02;p=elogind.git

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index a381ec59b..b178df2d3 100644
--- 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"
 
-#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;
 
@@ -222,7 +222,7 @@ int start_upload(Uploader *u,
                 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);
@@ -495,16 +495,11 @@ static int parse_config(void) {
                 { "Upload",  "ServerCertificateFile",  config_parse_path,   0, &arg_cert   },
                 { "Upload",  "TrustedCertificateFile", config_parse_path,   0, &arg_trust  },
                 {}};
-        int r;
-
-        r = config_parse(NULL, PKGSYSCONFDIR "/journal-upload.conf", NULL,
-                         "Upload\0",
-                         config_item_table_lookup, items,
-                         false, false, NULL);
-        if (r < 0)
-                log_error("Failed to parse configuration file: %s", strerror(-r));
 
-        return r;
+        return config_parse(NULL, PKGSYSCONFDIR "/journal-upload.conf", NULL,
+                            "Upload\0",
+                            config_item_table_lookup, items,
+                            false, false, true, NULL);
 }
 
 static void help(void) {