systemd-upload: print paths in help()

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 08037539bea3734fe11446c4c0e53bc7721bc545..d78607c541e13881a87b0fe77791d2da36375337 100644 (file)
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -1173,7 +1173,7 @@ static void help(void) {
                "     --listen-raw=ADDR    Listen for connections at ADDR\n"
                "     --listen-http=ADDR   Listen for HTTP connections at ADDR\n"
                "     --listen-https=ADDR  Listen for HTTPS connections at ADDR\n"
-               "  -o --output=FILE|DIR Write output to FILE or DIR/external-*.journal\n"
+               "  -o --output=FILE|DIR    Write output to FILE or DIR/external-*.journal\n"
                "     --compress[=BOOL]    Use XZ-compression in the output journal (default: yes)\n"
                "     --seal[=BOOL]        Use Event sealing in the output journal (default: no)\n"
                "     --key=FILENAME       Specify key in PEM format (default:\n"

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index bf3a059c3b11ef8f794d7a1abc976fba5698438d..3937683790ac20cdddbc8623362836a1357e6bfa 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -506,9 +506,12 @@ static void help(void) {
                "  -h --help                 Show this help\n"
                "     --version              Show package version\n"
                "  -u --url=URL              Upload to this address\n"
-               "     --key=FILENAME         Specify key in PEM format\n"
-               "     --cert=FILENAME        Specify certificate in PEM format\n"
-               "     --trust=FILENAME       Specify CA certificate in PEM format\n"
+               "     --key=FILENAME         Specify key in PEM format (default:\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"
+               "                            \"" TRUST_FILE "\")\n"
                "     --system               Use the system journal\n"
                "     --user                 Use the user journal for the current user\n"
                "  -m --merge                Use  all available journals\n"

diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
index 83ea1a9ef83323a3165c7ee93965841ec14fd8cb..bd3ceefb93496baa593962ad29f8b9ec84fbc4ef 100644 (file)
--- a/src/shared/socket-label.c
+++ b/src/shared/socket-label.c
@@ -150,7 +150,8 @@ int make_socket_fd(int log_level, const char* address, int flags) {
 
         r = socket_address_parse(&a, address);
         if (r < 0) {
-                log_error("Failed to parse socket: %s", strerror(-r));
+                log_error("Failed to parse socket address \"%s\": %s",
+                          address, strerror(-r));
                 return r;
         }