On Fri, Aug 12, 2016 at 10:57:41PM +0200, Christian Boltz wrote: > Hello, > > $subject. > > This change also needs some other changes in ask_the_questions(): > - set q.options and q.selected inside the loop (because glob() and > glob_ext() add another option) > - set 'selection' outside the if block to avoid doing it in nearly every > if branch > - make sure to add the selected rule, not just rule_obj (which doesn't > contain a modified, for example globbed, rule) > - skip 'deny' if an #include is selected > - re-add handling for CMD_GLOB and CMD_GLOB_EXT (was lost when switching > to FileRule) > - add selection_to_rule_obj() helper function > - add glob and glob with ext buttons in available_buttons() if > rule_obj.can_glob or rule_obj.can_glob_ext > > Also apply the changes in ask_the_questions() to aa-mergeprof to keep it > in sync with aa.py, and disable the old path handling in aa-mergeprof. > > Note: in its current state, aa-mergeprof will ask for some "superfluous" > file permissions, and doesn't check for 'x' conflicts. One of the > following patches will fix that. > > [ 18-re-add-globbing-to-logprof.diff ]
Acked-by: Steve Beattie <st...@nxnw.org> -- Steve Beattie <sbeat...@ubuntu.com> http://NxNW.org/~steve/
signature.asc
Description: PGP signature
-- AppArmor mailing list AppArmor@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
