From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 18 Oct 2014 05:30:54 +0000 (-0400)
Subject: systemd-upload: print paths in help()
X-Git-Tag: v217~142
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1af719edc5958c01c19204fb68d6fc45c9eea85c

systemd-upload: print paths in help()
---

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 08037539b..d78607c54 100644
--- 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 bf3a059c3..393768379 100644
--- 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 83ea1a9ef..bd3ceefb9 100644
--- 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;
         }