X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=38c9d73b441f0560a7a59947cdab9c4e18431e65;hb=4f4d6a7073e6aa740291bbe54da809024d372955;hp=914dd8d0f4c14bc56d83bf02e2e596f2a3c5ca2c;hpb=55ee336cdcb57efe2ef9a4152f5b9e1063ec1a06;p=elogind.git

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 914dd8d0f..38c9d73b4 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -44,7 +44,8 @@ static bool arg_show_all = false;
 static bool arg_no_pager = false;
 static int arg_lines = -1;
 static bool arg_no_tail = false;
-static bool arg_new_id = false;
+static bool arg_new_id128 = false;
+static bool arg_quiet = false;
 
 static int help(void) {
 
@@ -57,8 +58,10 @@ static int help(void) {
                "  -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, verbose, export, json)\n"
-               "     --new-id         Generate a new 128 Bit id\n",
+               "  -o --output=STRING  Change journal output mode (short, short-monotonic,\n"
+               "                      verbose, export, json, cat)\n"
+               "  -q --quiet          Don't show privilege warning\n"
+               "     --new-id128      Generate a new 128 Bit id\n",
                program_invocation_short_name);
 
         return 0;
@@ -70,7 +73,7 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_VERSION = 0x100,
                 ARG_NO_PAGER,
                 ARG_NO_TAIL,
-                ARG_NEW_ID
+                ARG_NEW_ID128
         };
 
         static const struct option options[] = {
@@ -82,7 +85,8 @@ static int parse_argv(int argc, char *argv[]) {
                 { "all",       no_argument,       NULL, 'a'           },
                 { "lines",     required_argument, NULL, 'n'           },
                 { "no-tail",   no_argument,       NULL, ARG_NO_TAIL   },
-                { "new-id",    no_argument,       NULL, ARG_NEW_ID    },
+                { "new-id128", no_argument,       NULL, ARG_NEW_ID128 },
+                { "quiet",     no_argument,       NULL, 'q'           },
                 { NULL,        0,                 NULL, 0             }
         };
 
@@ -91,7 +95,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hfo:an:", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hfo:an:q", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -138,10 +142,13 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_no_tail = true;
                         break;
 
-                case ARG_NEW_ID:
-                        arg_new_id = true;
+                case ARG_NEW_ID128:
+                        arg_new_id128 = true;
                         break;
 
+                case 'q':
+                        arg_quiet = true;
+
                 case '?':
                         return -EINVAL;
 
@@ -151,13 +158,13 @@ static int parse_argv(int argc, char *argv[]) {
                 }
         }
 
-        if (arg_follow && !arg_no_tail)
+        if (arg_follow && !arg_no_tail && arg_lines < 0)
                 arg_lines = 10;
 
         return 1;
 }
 
-static int generate_new_id(void) {
+static int generate_new_id128(void) {
         sd_id128_t id;
         int r;
         unsigned i;
@@ -198,11 +205,16 @@ int main(int argc, char *argv[]) {
         if (r <= 0)
                 goto finish;
 
-        if (arg_new_id) {
-                r = generate_new_id();
+        if (arg_new_id128) {
+                r = generate_new_id128();
                 goto finish;
         }
 
+#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, 0);
         if (r < 0) {
                 log_error("Failed to open journal: %s", strerror(-r));
@@ -281,7 +293,7 @@ int main(int argc, char *argv[]) {
                 if (!arg_follow)
                         break;
 
-                r = fd_wait_for_event(fd, POLLIN);
+                r = fd_wait_for_event(fd, POLLIN, (usec_t) -1);
                 if (r < 0) {
                         log_error("Couldn't wait for event: %s", strerror(-r));
                         goto finish;