[apparmor] [patch] Add and use logprof_header() and logprof_header_localvars() in *Rule classes

[Steve Beattie]

On Sun, May 24, 2015 at 10:45:43PM +0200, Christian Boltz wrote:
> Hello,
> 
> this patch adds and uses logprof_header() and logprof_header_localvars()
> in/to the *Rule classes
> 
> BaseRule:
> - add logprof_header() - sets the 'Qualifier' (audit, allow/deny) header
>   if a qualifier is specified, calls logprof_header_localvars() and then
>   returns an array of headers to display in aa-logprof and aa-mergeprof
> - add logprof_header_localvars() - dummy function that needs to be
>   implemented in the child classes
> 
> NetworkRule: add logprof_header_localvars() - adds 'Network Family'
> and 'Socket Type' to the headers
> 
> CapabilityRule: add logprof_header_localvars() - adds 'Capability' to
> the headers
> 
> Also change aa-mergeprof to use rule_obj.logprof_header() for network
> and capability rules. This means deleting lots of lines (that moved to
> the *Rule classes) and also deleting the last differences between
> capabiltiy and network rules.
> 
> Finally add tests for the newly added functions.
> 
> [ 23-mergeprof-move-headers-to-rule-classes.diff ]

Acked-by: Steve Beattie <steve at nxnw.org>. Thanks.

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20150529/e9aa2ab1/attachment.pgp>