Hello,
Am Mittwoch, 5. Februar 2014 schrieben Sie:
> ------------------------------------------------------------
> revno: 2363
> committer: John Johansen <john.johan...@canonical.com>
> branch nick: apparmor
> timestamp: Tue 2014-02-04 20:56:17 -0500
> message:
> Move short_options next to long_options to make them easier to keep
> in sync
> === modified file 'parser/parser_main.c'
[...]
> === modified file 'parser/parser_regex.c'
> --- parser/parser_regex.c 2014-01-24 18:47:42 +0000
> +++ parser/parser_regex.c 2014-02-05 01:56:17 +0000
> @@ -493,8 +493,6 @@
> if ((entry->mode >> AA_USER_SHIFT) & AA_EXEC_INHERIT)
> entry->mode |= AA_EXEC_MMAP << AA_USER_SHIFT;
>
> - /* relying on ptrace and change_profile not getting merged earlier
> */ -
> /* the link bit on the first pair entry should not get masked
> * out by a deny rule, as both pieces of the link pair must
> * match. audit info for the link is carried on the second
> @@ -556,19 +554,6 @@
> if (!aare_add_rule_vec(dfarules, 0, AA_ONEXEC, 0, index, vec,
> dfaflags)) return FALSE;
> }
> - if (entry->mode & (AA_USER_PTRACE | AA_OTHER_PTRACE)) {
> - int mode = entry->mode & (AA_USER_PTRACE | AA_OTHER_PTRACE);
> - if (entry->ns) {
> - const char *vec[2];
> - vec[0] = entry->ns;
> - vec[1] = entry->name;
> - if (!aare_add_rule_vec(dfarules, 0, mode, 0, 2, vec,
dfaflags))
> - return FALSE;
> - } else {
> - if (!aare_add_rule(dfarules, entry->name, 0, mode, 0,
dfaflags))
> - return FALSE;
> - }
> - }
> return TRUE;
> }
This part doesn't look related to short options ;-)
Regards,
Christian Boltz
--
> Henne, did you actually test this before closing the bug as invalid?
of course i did not test it. do you think i'm bored?
[> Christian Boltz and Hendrik Vogelsang in
https://bugzilla.novell.com/show_bug.cgi?id=420972]
--
AppArmor mailing list
AppArmor@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/apparmor
