static int arg_lines = -1;
static bool arg_no_tail = false;
static bool arg_new_id128 = false;
+static bool arg_quiet = false;
+static bool arg_local = false;
static int help(void) {
" -h --help Show this help\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
- " -a --all Show all properties, including long and unprintable\n"
+ " -a --all Show all fields, including long and unprintable\n"
" -f --follow Follow journal\n"
" -n --lines=INTEGER Journal entries to show\n"
" --no-tail Show all lines, even in follow mode\n"
" -o --output=STRING Change journal output mode (short, short-monotonic,\n"
" verbose, export, json, cat)\n"
- " --new-id128 Generate a new 128 Bit id\n",
+ " -q --quiet Don't show privilege warning\n"
+ " --new-id128 Generate a new 128 Bit id\n"
+ " -l --local Only local entries\n",
program_invocation_short_name);
return 0;
{ "lines", required_argument, NULL, 'n' },
{ "no-tail", no_argument, NULL, ARG_NO_TAIL },
{ "new-id128", no_argument, NULL, ARG_NEW_ID128 },
+ { "quiet", no_argument, NULL, 'q' },
+ { "local", no_argument, NULL, 'l' },
{ NULL, 0, NULL, 0 }
};
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "hfo:an:", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hfo:an:ql", options, NULL)) >= 0) {
switch (c) {
arg_new_id128 = true;
break;
+ case 'q':
+ arg_quiet = true;
+ break;
+
+ case 'l':
+ arg_local = true;
+ break;
+
case '?':
return -EINVAL;
goto finish;
}
- r = sd_journal_open(&j, 0);
+#ifdef HAVE_ACL
+ if (!arg_quiet && geteuid() != 0 && in_group("adm") <= 0)
+ log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this message off.");
+#endif
+
+ r = sd_journal_open(&j, arg_local ? SD_JOURNAL_LOCAL_ONLY : 0);
if (r < 0) {
log_error("Failed to open journal: %s", strerror(-r));
goto finish;
line ++;
- r = output_journal(j, arg_output, line, arg_show_all);
+ r = output_journal(j, arg_output, line, 0, arg_show_all);
if (r < 0)
goto finish;