[apparmor] [PATCH 04/11] Cleanup invert dfa control flag logic so that the flags are always positive

Steve Beattie steve at nxnw.org
Fri Oct 22 07:48:41 BST 2010


On Mon, Oct 18, 2010 at 05:20:36PM -0700, John Johansen wrote:
> The dfa flags currently are a weird mix of position and negative assertions.
> Its cleaner just to have them all assert one way and let the cmd line
> options apply them correctly.

ACK.

> ---
>  parser/libapparmor_re/Makefile      |    4 ++--
>  parser/libapparmor_re/apparmor_re.h |    8 ++++----
>  parser/libapparmor_re/regexp.y      |    8 ++++----
>  parser/parser_main.c                |   26 +++++++++++++-------------
>  4 files changed, 23 insertions(+), 23 deletions(-)
> 
> diff --git a/parser/libapparmor_re/Makefile b/parser/libapparmor_re/Makefile
> index 76d7473..4de254c 100644
> --- a/parser/libapparmor_re/Makefile
> +++ b/parser/libapparmor_re/Makefile
> @@ -15,8 +15,8 @@ all : ${TARGET}
>  libapparmor_re.a: regexp.o
>  	ar ${ARFLAGS} $@ $^
>  
> -regexp.o : regexp.cc
> -	$(LINK.cc) $^ -c -o $@
> +regexp.o : regexp.cc apparmor_re.h
> +	$(LINK.cc) $< -c -o $@
>  
>  regexp.cc : regexp.y flex-tables.h
>  	${BISON} -o $@ $<

Nice catch, though the following patch is also needed, I think:

---
 parser/Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: b/parser/Makefile
===================================================================
--- a/parser/Makefile
+++ b/parser/Makefile
@@ -161,10 +161,10 @@ parser_misc.o: parser_misc.c parser.h pa
 parser_yacc.o: parser_yacc.c parser_yacc.h
 	$(CC) $(EXTRA_CFLAGS) -c -o $@ $<
 
-parser_main.o: parser_main.c parser.h parser_version.h
+parser_main.o: parser_main.c parser.h parser_version.h libapparmor_re/apparmor_re.h
 	$(CC) $(EXTRA_CFLAGS) -c -o $@ $<
 
-parser_interface.o: parser_interface.c parser.h
+parser_interface.o: parser_interface.c parser.h libapparmor_re/apparmor_re.h
 	$(CC) $(EXTRA_CFLAGS) -c -o $@ $<
 
 parser_include.o: parser_include.c parser.h parser_include.h
@@ -173,7 +173,7 @@ parser_include.o: parser_include.c parse
 parser_merge.o: parser_merge.c parser.h
 	$(CC) $(EXTRA_CFLAGS) -c -o $@ $<
 
-parser_regex.o: parser_regex.c parser.h
+parser_regex.o: parser_regex.c parser.h libapparmor_re/apparmor_re.h
 	$(CC) $(EXTRA_CFLAGS) -c -o $@ $<
 
 parser_symtab.o: parser_symtab.c parser.h


-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/apparmor/attachments/20101021/a4f8cef8/attachment.pgp 


More information about the AppArmor mailing list