diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-29 22:10:40 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-29 22:10:40 +0200 |
| commit | 2ea69f8d5e4a83397c5050914adf6452cafa9559 (patch) | |
| tree | 0906a2b4440a0262d9ef2b3d79977e6b33ea74e6 /src/journal-remote/journal-gatewayd.c | |
| parent | 41d5895f80962ab91472f5ec86fa55da60e14551 (diff) | |
| parent | 7f96539d45028650f2ba9452095473a9c455d84b (diff) | |
Merge pull request #1408 from poettering/systemctl-and-more
Systemctl and more
Diffstat (limited to 'src/journal-remote/journal-gatewayd.c')
| -rw-r--r-- | src/journal-remote/journal-gatewayd.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index 4e5572db0b..29df842277 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -24,9 +24,7 @@ #include <unistd.h> #include <fcntl.h> #include <getopt.h> - #include <microhttpd.h> - #ifdef HAVE_GNUTLS #include <gnutls/gnutls.h> #endif @@ -34,15 +32,15 @@ #include "sd-journal.h" #include "sd-daemon.h" #include "sd-bus.h" -#include "log.h" -#include "util.h" + #include "bus-util.h" +#include "fileio.h" +#include "hostname-util.h" +#include "log.h" #include "logs-show.h" #include "microhttpd-util.h" -#include "build.h" -#include "fileio.h" #include "sigbus.h" -#include "hostname-util.h" +#include "util.h" static char *arg_key_pem = NULL; static char *arg_cert_pem = NULL; @@ -909,9 +907,7 @@ static int parse_argv(int argc, char *argv[]) { return 0; case ARG_VERSION: - puts(PACKAGE_STRING); - puts(SYSTEMD_FEATURES); - return 0; + return version(); case ARG_KEY: if (arg_key_pem) { |