Hey Christian, On Wed, Aug 06, 2014 at 10:45:55PM +0200, Christian Boltz wrote: > the test profiles in parser/tst/simple_tests/profile/flags/* contain > #include <includes/base> > which doesn't exist.
Except that it does, as parser/tst/simple_tests/includes/base. The simple.pl script [1] adds parser/tst/simple_tests/ as an include dir. The path was explicitly chosen to not align with abstractions/base, to ensure that test results wouldn't differ depending on whether abstractions/base has been installed into a system location or not. > Instead of changing it to abstractions/, it's better to completely > remove the #include line. Those tests are for testing flags, not include > files ;-) On the one hand, that's entirely correct. On the other, we do want to ensure there's no weird interactions between parsing flags and the rest of a complex profile, but that should probably be the exception rather than the rule. So on the whole, I'm okay with this patch. Acked-by: Steve Beattie <[email protected]> > In some cases (inside hats), I replaced the include with > /foo/bar r, > to avoid empty hats. > > The patch is quite big (~1000 lines), therefore I'll attach it instead > of pasting it into the mail. > > With the patch applied, all tests give the expected result with > apparmor-parser 2.8.95. > > > Regards, > > Christian Boltz > -- > > ich kapire es aber noch immer nicht... man kann mir diesen Sachen doch > > gar nix anfangen :/ > Hallo? Du sprichst über ein Produkt eines Herstellers, der Windows auf > den Markt gebracht hat! > [> Sascha Peters und Werner Flamme in postfixbuch-users] > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad.sd 2014-08-06 > 20:34:17 +0000 > @@ -5,29 +5,21 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(debug) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 flags=(audit,debug) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist2 r, > } > > /does/not/exist3 flags=(debug,complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist5 r, > } > > /does/not/exist4 flags=(audit,complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist7 r, > > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad10.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad10.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad10.sd 2014-08-06 > 20:33:38 +0000 > @@ -5,8 +5,6 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(chroot_relative, namepace_relative) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad11.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad11.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad11.sd 2014-08-06 > 19:50:26 +0000 > @@ -5,8 +5,6 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(mediate_deleted, delegate_deleted) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad12.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad12.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad12.sd 2014-08-06 > 20:33:40 +0000 > @@ -5,8 +5,6 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(attach_disconnected, no_attach_disconnected) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad13.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad13.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad13.sd 2014-08-06 > 20:33:40 +0000 > @@ -5,8 +5,6 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(chroot_attach, chroot_no_attach) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad2.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad2.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad2.sd 2014-08-06 > 20:33:43 +0000 > @@ -5,8 +5,6 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(capability) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad3.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad3.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad3.sd 2014-08-06 > 20:33:43 +0000 > @@ -11,8 +11,6 @@ > } > > audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist2 r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad4.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad4.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad4.sd 2014-08-06 > 20:33:43 +0000 > @@ -6,8 +6,6 @@ > # > /does/not/exist flags=({{{ }} { } { } audit > {{}}}{{{} {}{}{} / ^ ) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad5.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad5.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad5.sd 2014-08-06 > 20:34:17 +0000 > @@ -5,29 +5,21 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist (debug) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 (audit,debug) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist2 r, > } > > /does/not/exist3 (debug,complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist5 r, > } > > /does/not/exist4 (audit,complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist7 r, > > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad6.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad6.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad6.sd 2014-08-06 > 20:33:43 +0000 > @@ -5,8 +5,6 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist (capability) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad7.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad7.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad7.sd 2014-08-06 > 20:33:43 +0000 > @@ -11,8 +11,6 @@ > } > > audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist2 r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_bad8.sd' > --- parser/tst/simple_tests/profile/flags/flags_bad8.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_bad8.sd 2014-08-06 > 20:33:43 +0000 > @@ -6,8 +6,6 @@ > # > /does/not/exist ({{{ }} { } { } audit > {{}}}{{{} {}{}{} / ^ ) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_hats_ok.sd' > --- parser/tst/simple_tests/profile/flags/flags_hats_ok.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_hats_ok.sd 2014-08-06 > 20:43:11 +0000 > @@ -5,144 +5,132 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > > ^FOO { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist2 flags=(complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist2 r, > > ^FOO flags=(complain) { > - #include <includes/base> > + /foo/bar r, > } > > ^FOO2 (complain) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist3 flags=(complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist3 r, > > ^FOO flags=(audit) { > - #include <includes/base> > + /foo/bar r, > } > ^FOO2 (audit) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist4 { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist4 r, > > ^FOO flags=(complain) { > - #include <includes/base> > + /foo/bar r, > } > ^FOO2 (complain) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist5 flags=(audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist5 r, > > ^FOO { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist6 flags=(audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist6 r, > > ^FOO flags=(audit) { > - #include <includes/base> > + /foo/bar r, > } > ^FOO2 (audit) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist7 flags=(audit) { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist7 r, > > ^FOO flags=(complain) { > - #include <includes/base> > + /foo/bar r, > } > ^FOO2 (complain) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist8 { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist8 r, > > ^FOO flags=(audit) { > - #include <includes/base> > + /foo/bar r, > } > ^FOO2 (audit) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist9 { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist9 r, > > ^FOO flags=(audit) { > - #include <includes/base> > + /foo/bar r, > } > > ^FOO2 (audit) { > - #include <includes/base> > + /foo/bar r, > } > > ^BAR { > - #include <includes/fonts> > + /foo/bar r, > } > > ^BAZ flags=(audit) { > - #include <includes/fonts> > + /foo/bar r, > } > > ^BAZ2 (audit) { > - #include <includes/fonts> > + /foo/bar r, > } > > ^BIF flags=(complain) { > - #include <includes/base> > + /foo/bar r, > } > > ^BIF2 (complain) { > - #include <includes/base> > + /foo/bar r, > } > > ^BUZ flags=(complain,audit) { > @@ -155,144 +143,142 @@ > } > > /does/not/exist11 flags=(complain) { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > > ^FOO { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist12 flags=(complain) { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist2 r, > > ^FOO flags=(complain) { > - #include <includes/base> > + /foo/bar r, > } > > ^FOO2 (complain) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist13 flags=(complain) { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist3 r, > > ^FOO flags=(audit) { > - #include <includes/base> > + /foo/bar r, > } > ^FOO2 (audit) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist14 { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist4 r, > > ^FOO flags=(complain) { > - #include <includes/base> > + /foo/bar r, > } > ^FOO2 (complain) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist15 flags=(audit) { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist5 r, > > ^FOO { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist16 flags=(audit) { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist6 r, > > ^FOO flags=(audit) { > - #include <includes/base> > + /foo/bar r, > } > ^FOO2 (audit) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist17 flags=(audit) { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist7 r, > > ^FOO flags=(complain) { > - #include <includes/base> > + /foo/bar r, > } > ^FOO2 (complain) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist18 { > - #include <includes/base> > + /foo/bar r, > > /usr/X11R6/lib/lib*so* r, > /does/not/exist8 r, > > ^FOO flags=(audit) { > - #include <includes/base> > + /foo/bar r, > } > ^FOO2 (audit) { > - #include <includes/base> > + /foo/bar r, > } > } > > /does/not/exist19 { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist9 r, > > ^FOO flags=(audit) { > - #include <includes/base> > + /foo/bar r, > } > > ^FOO2 (audit) { > - #include <includes/base> > + /foo/bar r, > } > > ^BAR { > - #include <includes/fonts> > + /foo/bar r, > } > > ^BAZ flags=(audit) { > - #include <includes/fonts> > + /foo/bar r, > } > > ^BAZ2 (audit) { > - #include <includes/fonts> > + /foo/bar r, > } > > ^BIF flags=(complain) { > - #include <includes/base> > + /foo/bar r, > } > > ^BIF2 (complain) { > - #include <includes/base> > + /foo/bar r, > } > > ^BUZ flags=(complain,audit) { > > === modified file 'parser/tst/simple_tests/profile/flags/flags_ok.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok.sd 2010-12-20 20:29:10 > +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok.sd 2014-08-06 20:36:39 > +0000 > @@ -5,71 +5,51 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 flags=(audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist2 r, > } > > /does/not/exist3 flags=(complain,audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist5 r, > } > > /does/not/exist4 flags=(audit,complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist7 r, > } > > /does/not/exist5 flags=(audit,complain,audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist8 r, > } > > /does/not/exist6 (complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist7 (audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist2 r, > } > > /does/not/exist8 (complain,audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist5 r, > } > > /does/not/exist9 (audit,complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist7 r, > } > > /does/not/exist10 (audit,complain,audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist8 r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_ok1.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok1.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok1.sd 2014-08-06 > 20:34:23 +0000 > @@ -5,36 +5,26 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(chroot_relative) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist1 flags=(audit, chroot_relative) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 flags=(chroot_relative, audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist3 flags=(complain, chroot_relative) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist4 flags=(chroot_relative, complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_ok10.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok10.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok10.sd 2014-08-06 > 20:33:43 +0000 > @@ -5,8 +5,6 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(chroot_relative, mediate_deleted, > attach_disconnected, chroot_attach) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_ok2.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok2.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok2.sd 2014-08-06 > 20:34:23 +0000 > @@ -5,36 +5,26 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(namespace_relative) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist1 flags=(audit, namespace_relative) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 flags=(namespace_relative, audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist3 flags=(complain, namespace_relative) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist4 flags=(namespace_relative, complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_ok3.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok3.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok3.sd 2014-08-06 > 19:49:43 +0000 > @@ -5,36 +5,26 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(mediate_deleted) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist1 flags=(audit, mediate_deleted) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 flags=(mediate_deleted, audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist3 flags=(complain, mediate_deleted) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist4 flags=(mediate_deleted, complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_ok4.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok4.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok4.sd 2014-08-06 > 20:34:23 +0000 > @@ -5,36 +5,26 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(delegate_deleted) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist1 flags=(audit, delegate_deleted) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 flags=(delegate_deleted, audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist3 flags=(complain, delegate_deleted) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist4 flags=(delegate_deleted, complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_ok5.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok5.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok5.sd 2014-08-06 > 20:34:23 +0000 > @@ -5,36 +5,26 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(attach_disconnected) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist1 flags=(audit, attach_disconnected) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 flags=(attach_disconnected, audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist3 flags=(complain, attach_disconnected) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist4 flags=(attach_disconnected, complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_ok6.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok6.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok6.sd 2014-08-06 > 20:34:23 +0000 > @@ -5,36 +5,26 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(no_attach_disconnected) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist1 flags=(audit, no_attach_disconnected) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 flags=(no_attach_disconnected, audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist3 flags=(complain, no_attach_disconnected) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist4 flags=(no_attach_disconnected, complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_ok7.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok7.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok7.sd 2014-08-06 > 20:34:23 +0000 > @@ -5,36 +5,26 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(chroot_attach) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist1 flags=(audit, chroot_attach) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 flags=(chroot_attach, audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist3 flags=(complain, chroot_attach) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist4 flags=(chroot_attach, complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file 'parser/tst/simple_tests/profile/flags/flags_ok8.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok8.sd 2010-12-20 > 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok8.sd 2014-08-06 > 20:34:23 +0000 > @@ -5,36 +5,26 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist flags=(chroot_no_attach) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist1 flags=(audit, chroot_no_attach) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist2 flags=(chroot_no_attach, audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist3 flags=(complain, chroot_no_attach) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > /does/not/exist4 flags=(chroot_no_attach, complain) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist r, > } > > === modified file > 'parser/tst/simple_tests/profile/flags/flags_ok_whitespace.sd' > --- parser/tst/simple_tests/profile/flags/flags_ok_whitespace.sd > 2010-12-20 20:29:10 +0000 > +++ parser/tst/simple_tests/profile/flags/flags_ok_whitespace.sd > 2014-08-06 20:34:13 +0000 > @@ -5,22 +5,16 @@ > # Last Modified: Sun Apr 17 19:44:44 2005 > # > /does/not/exist3 flags=(complain, audit) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist5 r, > } > > /does/not/exist4 flags = (audit , complain){ > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist7 r, > } > > /does/not/exist5 flags = ( audit , complain , audit ) { > - #include <includes/base> > - > /usr/X11R6/lib/lib*so* r, > /does/not/exist8 r, > } > > -- > AppArmor mailing list > [email protected] > Modify settings or unsubscribe at: > https://lists.ubuntu.com/mailman/listinfo/apparmor -- Steve Beattie <[email protected]> http://NxNW.org/~steve/
signature.asc
Description: Digital signature
-- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
