[apparmor] [patch] [2.9 branch] fix aa-mergeprof capability handling

[Steve Beattie]

On Thu, May 14, 2015 at 02:05:40AM +0200, Christian Boltz wrote:
> Hello,
> 
> this patch fixes the 2.9 aa-mergeprof capability handling.
> 
> Thanks to a broken optimization (which missed a "not" in the if
> condition), aa-mergeprof never asked to merge capability rules.
> 
> Also fix a syntax / parameter error uncovered after fixing the
> condition.
> 
> This patch is only meant for the 2.9 branch.
> 
> 
> 
> [ mergeprof-2.9-fix-capability.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/20150601/578234b7/attachment-0001.pgp>