X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=58778a81f687dd2310343a1eeb4ac564a0454473;hb=89834a7c1c5f194d072d42d1c30077f5b2c207ec;hp=5f8b240b001f2d8e7742657457f315e2d983be02;hpb=4367379907f40cbe7df6a64e51c36f34dd854197;p=elogind.git

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 5f8b240b0..58778a81f 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -6,16 +6,16 @@
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
@@ -46,22 +46,24 @@ 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) {
 
-        printf("%s [OPTIONS...] {COMMAND} ...\n\n"
+        printf("%s [OPTIONS...] [MATCH]\n\n"
                "Send control commands to or query the journal.\n\n"
                "  -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"
                "  -q --quiet          Don't show privilege warning\n"
-               "     --new-id128      Generate a new 128 Bit id\n",
+               "     --new-id128      Generate a new 128 Bit id\n"
+               "  -l --local          Only local entries\n",
                program_invocation_short_name);
 
         return 0;
@@ -87,6 +89,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "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             }
         };
 
@@ -95,7 +98,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hfo:an:q", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hfo:an:ql", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -148,6 +151,11 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case 'q':
                         arg_quiet = true;
+                        break;
+
+                case 'l':
+                        arg_local = true;
+                        break;
 
                 case '?':
                         return -EINVAL;
@@ -210,10 +218,12 @@ 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);
+        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;
@@ -281,7 +291,7 @@ int main(int argc, char *argv[]) {
 
                         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;