Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

Pull audit updates from Paul Moore: "Two small patches from the audit next branch; only one of which has any real significant code changes, the other is simply a MAINTAINERS update for audit. The single code patch is pretty small and rather straightforward, it changes the audit "version" number reported to userspace from an integer to a bitmap which is used to indicate the functionality of the running kernel. This really doesn't have much impact on the kernel, but it will make life easier for the audit userspace folks. Thankfully we were still on a version number which allowed us to do this without breaking userspace" * 'upstream' of git://git.infradead.org/users/pcmoore/audit: audit: convert status version to a feature bitmap audit: add Paul Moore to the MAINTAINERS entry

Linus Torvalds committed 11 years ago

Commit a99abce2 parents e3aa91a 0f7e94e3 files · +17 −7Browse files

Showing the changes to kernel (1 of 3 files). Show all

Unified · Split

kernel/audit.c+1−1

@@ -833,7 +833,7 @@ static int audit_receive_msg(struct sk_buff skb, struct nlmsghdr nlh) · 832 unmodified lines
833	833	s.backlog_limit = audit_backlog_limit;
834	834	s.lost = atomic_read(&audit_lost);
835	835	s.backlog = skb_queue_len(&audit_skb_queue);
836		− s.version = AUDIT_VERSION_LATEST;
	836	+ s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
837	837	s.backlog_wait_time = audit_backlog_wait_time;
838	838	audit_send_reply(skb, seq, AUDIT_GET, 0, 0, &s, sizeof(s));
839	839	break;