[apparmor] [Patch] [Parser] Fix bare include keyword

Steve Beattie steve at nxnw.org
Wed Jun 24 19:31:57 UTC 2015


On Wed, Jun 17, 2015 at 02:41:30AM -0700, John Johansen wrote:
> Fix the regression that caused using 'include' instead of '#include' for
> includes to stop working.
> 
> Signed-off-by: John Johansen <john.johansen at canonical.com>
> 
> diff --git a/parser/parser_lex.l b/parser/parser_lex.l
> index 5af788a..974548d 100644
> --- a/parser/parser_lex.l
> +++ b/parser/parser_lex.l
> @@ -517,7 +517,7 @@ LT_EQUAL	<=
>  	}
>  }
>  
> -#include/.*\r?\n	{
> +#?include/.*\r?\n	{
>  	/* Don't use PUSH() macro here as we don't want #include echoed out.
>  	 * It needs to be handled specially
>  	 */ 

While I'm not rescinding my ack, this does introduce a new flex warning:

parser_lex.l:519: warning, dangerous trailing context

-- 
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/20150624/15910672/attachment.pgp>


More information about the AppArmor mailing list