X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=38c9d73b441f0560a7a59947cdab9c4e18431e65;hb=e7bf07b3d444dddf67503df56acfbdbbe3e5261a;hp=52db7a9365185adfd94475f8342c444f1bd0c533;hpb=62f21ec91ad8e7e24079962f4df066b0094fe68d;p=elogind.git

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 52db7a936..38c9d73b4 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -45,6 +45,7 @@ static bool arg_no_pager = false;
 static int arg_lines = -1;
 static bool arg_no_tail = false;
 static bool arg_new_id128 = false;
+static bool arg_quiet = false;
 
 static int help(void) {
 
@@ -59,6 +60,7 @@ static int help(void) {
                "     --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"
+               "  -q --quiet          Don't show privilege warning\n"
                "     --new-id128      Generate a new 128 Bit id\n",
                program_invocation_short_name);
 
@@ -84,6 +86,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "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'           },
                 { NULL,        0,                 NULL, 0             }
         };
 
@@ -92,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) {
 
@@ -143,6 +146,9 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_new_id128 = true;
                         break;
 
+                case 'q':
+                        arg_quiet = true;
+
                 case '?':
                         return -EINVAL;
 
@@ -204,6 +210,11 @@ int main(int argc, char *argv[]) {
                 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));
@@ -282,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;