[apparmor] [patch] [32/38] Re-implement exec conflict handling in aa-mergeprof

[Steve Beattie]

On Fri, Aug 12, 2016 at 11:05:46PM +0200, Christian Boltz wrote:
> this patch eplaces the old (hasher-based) conflict_mode() with the new
> (FileRule-based) ask_conflict_mode() function. If it detects conflicting
> exec rules, it asks the user which one to keep.
> 
> Also call ask_conflict_mode() from ask_the_questions() so that it is
> actually used.
> 
> Note: This patch isn't covered by unittests, but I did some manual
> testing to make sure it works as expected.
> 
> [ 32-mergeprof-handle-conflicts.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: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20160926/a4278d23/attachment.pgp>