From cb30d3ba665d9185d0691b265437e347d0d004fd Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 30 Aug 2017 16:56:41 +0900 Subject: [PATCH] journal-remote: show error if SplitMode=host with 'active' source is specified --- src/journal-remote/journal-remote.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 7201421d915..64b1105901a 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -66,7 +66,7 @@ static int arg_seal = false; static int http_socket = -1, https_socket = -1; static char** arg_gnutls_log = NULL; -static JournalWriteSplitMode arg_split_mode = JOURNAL_WRITE_SPLIT_HOST; +static JournalWriteSplitMode arg_split_mode = _JOURNAL_WRITE_SPLIT_INVALID; static char* arg_output = NULL; static char *arg_key = NULL; @@ -1492,9 +1492,17 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } + if (!IN_SET(arg_split_mode, JOURNAL_WRITE_SPLIT_NONE, _JOURNAL_WRITE_SPLIT_INVALID)) { + log_error("For active sources, only --split-mode=none is allowed."); + return -EINVAL; + } + arg_split_mode = JOURNAL_WRITE_SPLIT_NONE; } + if (arg_split_mode == _JOURNAL_WRITE_SPLIT_INVALID) + arg_split_mode = JOURNAL_WRITE_SPLIT_HOST; + if (arg_split_mode == JOURNAL_WRITE_SPLIT_NONE && arg_output) { if (is_dir(arg_output, true) > 0) { log_error("For SplitMode=none, output must be a file."); -- 2.47.3