[apparmor] [patch 21/24] Split dfa optimization and dump flag handling into a separate file so that it can be shared with DFA test programs

[Steve Beattie]

On Tue, Mar 11, 2014 at 12:34:22AM -0700, John Johansen wrote:
> On 03/10/2014 11:34 PM, Steve Beattie wrote:
> > On Fri, Mar 07, 2014 at 09:31:42AM -0800, john.johansen at canonical.com wrote:
> >> Signed-off-by: John Johansen <john.johansen at canonical.com>
> > 
> > So, on actually reviewing this patch, as long as the Makefile snippet I
> > mentioned in my other reply to this patch is applied, I'm okay with this
> > patch: Acked-by: Steve Beattie <steve at nxnw.org>
> > 
> > I do have a comment:
> > 
> >> --- /dev/null
> >> +++ 2.9-test/parser/common_optarg.c
> > 
> > [SNIP]
> > 
> >> +void display_dump(const char *command)
> >> +{
> >> +	display_version();
> >> +	printf("\n%s: --dump [Option]\n\n"
> >> +	       "Options:\n"
> >> +	       "--------\n"
> >> +	       "     none specified \tDump variables\n"
> > 
> > Can we kill the above line, because it's not an accurate reflection of
> > how the parser works:
> 
> or I could just fix it? your call

I was going with the simplest solution that would let you get back
to working on other stuff.

> > 
> >   $ ./apparmor_parser -Q --dump  /etc/apparmor.d/sbin.portmap
> >   ./apparmor_parser: Invalid --Dump option /etc/apparmor.d/sbin.portmap
> > 
> > ('apparmor-parser --dump variables' works as expected. I thought I
> > used to have a dump flag that would dump the variable table with the
> > variables expanded, but that seems to have gone away.)
> > 
> >> +	       "     variables      \tDump variables\n"
> >> +	       ,command);
> >> +	print_flag_table(dumpflag_table);
> >> +}
> >> +
> > 
> hrmmm I don't remember removing that, but I might have accidentally when
> I bodged in all the other dump options.

Oh, actually, the --dump expanded-variables option still works,
but it's not listed in the help options. Anyway, it's not a huge deal.


-- 
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/20140311/82ccf4e2/attachment.pgp>