History

Merge git://git.infradead.org/users/eparis/audit

Pull audit updates from Eric Paris. * git://git.infradead.org/users/eparis/audit: (28 commits) AUDIT: make audit_is_compat depend on CONFIG_AUDIT_COMPAT_GENERIC audit: renumber AUDIT_FEATURE_CHANGE into the 1300 range audit: do not cast audit_rule_data pointers pointlesly AUDIT: Allow login in non-init namespaces audit: define audit_is_compat in kernel internal header kernel: Use RCU_INIT_POINTER(x, NULL) in audit.c sched: declare pid_alive as inline audit: use uapi/linux/audit.h for AUDIT_ARCH declarations syscall_get_arch: remove useless function arguments audit: remove stray newline from audit_log_execve_info() audit_panic() call audit: remove stray newlines from audit_log_lost messages audit: include subject in login records audit: remove superfluous new- prefix in AUDIT_LOGIN messages audit: allow user processes to log from another PID namespace audit: anchor all pid references in the initial pid namespace audit: convert PPIDs to the inital PID namespace. pid: get pid_t ppid of task in init_pid_ns audit: rename the misleading audit_get_context() to audit_take_context() audit: Add generic compat syscall support audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL ...

Linus Torvalds committed 12 years ago

Commit 0b747172 parents b7e70ca 312103d36 files · +351 −119Browse files

Showing the changes to init (1 of 36 files). Show all

Unified · Split

init/Kconfig+4−1
@@ -292,9 +292,12 @@ config AUDIT · 291 unmodified lines
292 logging of avc messages output). Does not do system-call292 logging of avc messages output). Does not do system-call
293 auditing without CONFIG_AUDITSYSCALL.293 auditing without CONFIG_AUDITSYSCALL.
294 294
295config HAVE_ARCH_AUDITSYSCALL
296 bool
297
295config AUDITSYSCALL298config AUDITSYSCALL
296 bool "Enable system-call auditing support"299 bool "Enable system-call auditing support"
297 depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT) || ALPHA)300 depends on AUDIT && HAVE_ARCH_AUDITSYSCALL
298 default y if SECURITY_SELINUX301 default y if SECURITY_SELINUX
299 help302 help
300 Enable low-overhead system-call auditing infrastructure that303 Enable low-overhead system-call auditing infrastructure that