diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-03 01:12:30 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-03 01:12:30 -0400 |
| commit | 799a8f39d8eb9ea725e85a598c0f5dbd658c8ba7 (patch) | |
| tree | a41bc848157cf8a0f09b5ea299d278850e99cd2f /src/journal-remote | |
| parent | e72f054eb531418f99cd6d1d48d3542d1f95e07d (diff) | |
journal-remote: rename KEY_FILE to avoid confict with <linux/input.h>
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-remote.c | 12 | ||||
| -rw-r--r-- | src/journal-remote/journal-upload.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index bc36efafa2..1df178691a 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -52,9 +52,9 @@ #define REMOTE_JOURNAL_PATH "/var/log/journal/remote" -#define KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" -#define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" -#define TRUST_FILE CERTIFICATE_ROOT "/ca/trusted.pem" +#define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" +#define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" +#define TRUST_FILE CERTIFICATE_ROOT "/ca/trusted.pem" static char* arg_url = NULL; static char* arg_getter = NULL; @@ -1144,7 +1144,7 @@ static void help(void) { " --[no-]compress Use XZ-compression in the output journal (default: yes)\n" " --[no-]seal Use Event sealing in the output journal (default: no)\n" " --key=FILENAME Specify key in PEM format (default:\n" - " \"" KEY_FILE "\")\n" + " \"" PRIV_KEY_FILE "\")\n" " --cert=FILENAME Specify certificate in PEM format (default:\n" " \"" CERT_FILE "\")\n" " --trust=FILENAME|all Specify CA certificate or disable checking (default:\n" @@ -1420,10 +1420,10 @@ static int parse_argv(int argc, char *argv[]) { static int load_certificates(char **key, char **cert, char **trust) { int r; - r = read_full_file(arg_key ?: KEY_FILE, key, NULL); + r = read_full_file(arg_key ?: PRIV_KEY_FILE, key, NULL); if (r < 0) { log_error("Failed to read key from file '%s': %s", - arg_key ?: KEY_FILE, strerror(-r)); + arg_key ?: PRIV_KEY_FILE, strerror(-r)); return r; } diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 72396bf205..b178df2d34 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); |