X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald.h;h=3c69f7ec248f50fc07cf9bce23672db3f42999f4;hb=db5eea5a79b98a2b889f15dc21a5e0b57859b86b;hp=3da57c50cadf8e04e0758a107d3bb243a9f445e1;hpb=224f2ee221e77c326d1d7761abb6e812432b2163;p=elogind.git diff --git a/src/journal/journald.h b/src/journal/journald.h index 3da57c50c..3c69f7ec2 100644 --- a/src/journal/journald.h +++ b/src/journal/journald.h @@ -9,16 +9,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 . ***/ @@ -29,6 +29,7 @@ #include "journal-file.h" #include "hashmap.h" #include "util.h" +#include "audit.h" #include "journal-rate-limit.h" #include "list.h" @@ -40,6 +41,7 @@ typedef struct Server { int syslog_fd; int native_fd; int stdout_fd; + int proc_kmsg_fd; JournalFile *runtime_journal; JournalFile *system_journal; @@ -63,11 +65,18 @@ typedef struct Server { bool forward_to_syslog; bool forward_to_console; + bool import_proc_kmsg; + char proc_kmsg_buffer[LINE_MAX+1]; + size_t proc_kmsg_length; + uint64_t cached_available_space; usec_t cached_available_space_timestamp; uint64_t var_available_timestamp; + gid_t file_gid; + bool file_gid_valid; + LIST_HEAD(StdoutStream, stdout_streams); unsigned n_stdout_streams; } Server;