diff options
| -rw-r--r-- | Makefile.am | 23 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/journal/.gitignore | 2 | ||||
| -rw-r--r-- | src/journal/audit-type.c | 31 | ||||
| -rw-r--r-- | src/journal/audit-type.h | 26 |
5 files changed, 81 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index be7e9a211e..c854b63a8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -218,6 +218,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/network \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ + -I $(top_builddir)/src/journal \ -I $(top_srcdir)/src/timedate \ -I $(top_srcdir)/src/timesync \ -I $(top_srcdir)/src/resolve \ @@ -1313,13 +1314,25 @@ src/shared/cap-from-name.gperf: src/shared/cap-list.txt src/shared/cap-from-name.h: src/shared/cap-from-name.gperf $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@ +audit_list_includes = -include linux/audit.h missing.h +if HAVE_AUDIT +audit_list_includes += -include libaudit.h +endif + +src/journal/audit_type-list.txt: + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/audit.h -include missing.h - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@ + +src/journal/audit_type-to-name.h: src/journal/audit_type-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf " case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ + src/resolve/dns_type-list.txt: src/resolve/dns-type.h $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@ src/resolve/dns_type-to-name.h: src/resolve/dns_type-list.txt - $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf " case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print "\ndefault: return NULL;\n\t}\n}\n" }' <$< >$@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf " case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ src/resolve/dns_type-from-name.gperf: src/resolve/dns_type-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@ @@ -4634,7 +4647,13 @@ libsystemd_journal_internal_la_SOURCES = \ src/journal/catalog.h \ src/journal/mmap-cache.c \ src/journal/mmap-cache.h \ - src/journal/compress.c + src/journal/compress.c \ + src/journal/audit-type.h \ + src/journal/audit-type.c \ + src/journal/audit_type-to-name.h + +gperf_txt_sources += \ + src/journal/audit_type-list.txt # using _CFLAGS = in the conditional below would suppress AM_CFLAGS libsystemd_journal_internal_la_CFLAGS = \ diff --git a/configure.ac b/configure.ac index fbb437eaa2..600e20383a 100644 --- a/configure.ac +++ b/configure.ac @@ -781,6 +781,7 @@ else AUDIT_LIBS= fi AC_SUBST(AUDIT_LIBS) +AM_CONDITIONAL([HAVE_AUDIT], [test "x$have_audit" != xno]) # ------------------------------------------------------------------------------ AC_ARG_ENABLE([elfutils], diff --git a/src/journal/.gitignore b/src/journal/.gitignore index d6a79460cd..0f094f59d6 100644 --- a/src/journal/.gitignore +++ b/src/journal/.gitignore @@ -1,2 +1,4 @@ /journald-gperf.c /libsystemd-journal.pc +/audit_type-list.txt +/audit_type-to-name.h diff --git a/src/journal/audit-type.c b/src/journal/audit-type.c new file mode 100644 index 0000000000..b8c8ee531d --- /dev/null +++ b/src/journal/audit-type.c @@ -0,0 +1,31 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2015 Zbigniew Jędrzejewski-Szmek + + systemd is free software; you can redistribute it and/or modify it + 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +#include <linux/audit.h> +#ifdef HAVE_AUDIT +# include <libaudit.h> +#endif + +#include "audit-type.h" +#include "macro.h" +#include "missing.h" + +#include "audit_type-to-name.h" diff --git a/src/journal/audit-type.h b/src/journal/audit-type.h new file mode 100644 index 0000000000..9f37716cd6 --- /dev/null +++ b/src/journal/audit-type.h @@ -0,0 +1,26 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +#pragma once + +/*** + This file is part of systemd. + + Copyright 2015 Zbigniew Jędrzejewski-Szmek + + systemd is free software; you can redistribute it and/or modify it + 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + + +const char *audit_type_to_string(int type); +int audit_type_from_string(const char *s); |