From 301eb4384f7fb6dc84d94241da41716ab311237e Mon Sep 17 00:00:00 2001 From: posophe Date: Mon, 23 Mar 2015 03:16:51 +0100 Subject: [PATCH 1/9] add to header define_cond_filename_trans --- libqpol/src/policy_define.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libqpol/src/policy_define.h b/libqpol/src/policy_define.h index 14c17479..38ad1461 100644 --- a/libqpol/src/policy_define.h +++ b/libqpol/src/policy_define.h @@ -26,6 +26,7 @@ /* Used by SETools to determine if source MLS or not */ int define_mls(void); +avrule_t *define_cond_filename_trans(); avrule_t *define_cond_compute_type(int which); avrule_t *define_cond_pol_list(avrule_t *avlist, avrule_t *stmt); avrule_t *define_cond_te_avtab(int which); From 68985c59c588c14e62330d7bbf98d1c7cef78ba7 Mon Sep 17 00:00:00 2001 From: posophe Date: Mon, 23 Mar 2015 03:18:24 +0100 Subject: [PATCH 2/9] fix java build flags --- libapol/swig/java/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libapol/swig/java/Makefile.am b/libapol/swig/java/Makefile.am index ea087b8b..69c75990 100644 --- a/libapol/swig/java/Makefile.am +++ b/libapol/swig/java/Makefile.am @@ -97,7 +97,7 @@ classes = $(patsubst %.java, $(package_dir)/%.class, $(java_files)) # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) - $(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^ + $(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) From e93be117eb07860ca3cc39cac5757836a081bce8 Mon Sep 17 00:00:00 2001 From: posophe Date: Mon, 23 Mar 2015 03:19:06 +0100 Subject: [PATCH 3/9] fix java build flags --- libpoldiff/swig/java/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpoldiff/swig/java/Makefile.am b/libpoldiff/swig/java/Makefile.am index 6be72d39..f4e8e51e 100644 --- a/libpoldiff/swig/java/Makefile.am +++ b/libpoldiff/swig/java/Makefile.am @@ -72,7 +72,7 @@ classes = $(patsubst %.java, $(package_dir)/%.class, $(java_files)) # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) - $(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^ + $(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) From 965a31d676e68513e59f37cd71bf9f99aa59106e Mon Sep 17 00:00:00 2001 From: posophe Date: Mon, 23 Mar 2015 03:19:46 +0100 Subject: [PATCH 4/9] fix java build flags --- libqpol/swig/java/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libqpol/swig/java/Makefile.am b/libqpol/swig/java/Makefile.am index a25eacb5..1b787bf3 100644 --- a/libqpol/swig/java/Makefile.am +++ b/libqpol/swig/java/Makefile.am @@ -76,7 +76,7 @@ classes = $(patsubst %.java,$(package_dir)/%.class,$(filter %.java, $(BUILT_SOUR # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(filter %.java, $(BUILT_SOURCES)) - $(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^ + $(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) From 763a4c8a67f8637949e60c3bf340e38ee70ba6bf Mon Sep 17 00:00:00 2001 From: posophe Date: Mon, 23 Mar 2015 03:20:15 +0100 Subject: [PATCH 5/9] fix java build flags --- libseaudit/swig/java/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libseaudit/swig/java/Makefile.am b/libseaudit/swig/java/Makefile.am index f843204b..9ddb9cf6 100644 --- a/libseaudit/swig/java/Makefile.am +++ b/libseaudit/swig/java/Makefile.am @@ -69,7 +69,7 @@ classes = $(patsubst %.java, $(package_dir)/%.class, $(java_files)) # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) - $(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^ + $(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) From d18ec9f100bf024dab166b81d7c01b6ab41f29f7 Mon Sep 17 00:00:00 2001 From: posophe Date: Mon, 23 Mar 2015 03:20:47 +0100 Subject: [PATCH 6/9] fix java build flags --- libsefs/swig/java/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsefs/swig/java/Makefile.am b/libsefs/swig/java/Makefile.am index 088b61ba..ef1443a5 100644 --- a/libsefs/swig/java/Makefile.am +++ b/libsefs/swig/java/Makefile.am @@ -64,7 +64,7 @@ classes = $(patsubst %.java, $(package_dir)/%.class, $(java_files)) # just depend upon the first class file, and let the Java compiler # create the rest of them. $(firstword $(classes)): $(java_files) - $(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^ + $(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^ $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes)) From 4a92db518fa8b3b9441931e0c67af9b9b8c5f0bf Mon Sep 17 00:00:00 2001 From: posophe Date: Mon, 23 Mar 2015 03:25:46 +0100 Subject: [PATCH 7/9] Add missing return in non void functions --- libqpol/src/module_compiler.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libqpol/src/module_compiler.c b/libqpol/src/module_compiler.c index b00d97e6..6660cd8a 100644 --- a/libqpol/src/module_compiler.c +++ b/libqpol/src/module_compiler.c @@ -310,6 +310,7 @@ role_datum_t *declare_role(unsigned char isattr) assert(0); /* should never get here */ } } + return 0; } type_datum_t *declare_type(unsigned char primary, unsigned char isattr) @@ -373,6 +374,7 @@ type_datum_t *declare_type(unsigned char primary, unsigned char isattr) assert(0); /* should never get here */ } } + return 0; } static int user_implicit_bounds(hashtab_t users_tab, @@ -509,6 +511,7 @@ user_datum_t *declare_user(void) assert(0); /* should never get here */ } } + return 0; } /* Return a type_datum_t for the local avrule_decl with the given ID. @@ -927,6 +930,7 @@ static int require_role_or_attribute(int pass, unsigned char isattr) assert(0); /* should never get here */ } } + return 0; } int require_role(int pass) @@ -990,6 +994,7 @@ static int require_type_or_attribute(int pass, unsigned char isattr) assert(0); /* should never get here */ } } + return 0; } int require_type(int pass) @@ -1051,6 +1056,7 @@ int require_user(int pass) assert(0); /* should never get here */ } } + return 0; } static int require_bool_tunable(int pass, int is_tunable) @@ -1102,6 +1108,7 @@ static int require_bool_tunable(int pass, int is_tunable) assert(0); /* should never get here */ } } + return 0; } int require_bool(int pass) @@ -1175,6 +1182,7 @@ int require_sens(int pass) assert(0); /* should never get here */ } } + return 0; } int require_cat(int pass) @@ -1228,6 +1236,7 @@ int require_cat(int pass) assert(0); /* should never get here */ } } + return 0; } static int is_scope_in_stack(scope_datum_t * scope, scope_stack_t * stack) From 2f399313e0da036467d62c8a07d0499bb5575b00 Mon Sep 17 00:00:00 2001 From: posophe Date: Mon, 23 Mar 2015 03:28:23 +0100 Subject: [PATCH 8/9] Add missing return in non void functions --- libqpol/src/policy_define.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libqpol/src/policy_define.c b/libqpol/src/policy_define.c index 15f70ba3..6b25584e 100644 --- a/libqpol/src/policy_define.c +++ b/libqpol/src/policy_define.c @@ -1058,6 +1058,7 @@ int define_category(void) assert(0); /* should never get here */ } } + return 0; } return 0; From 908174f9cc74ca04221d0fcb12cf11e137589ade Mon Sep 17 00:00:00 2001 From: posophe Date: Mon, 23 Mar 2015 03:30:20 +0100 Subject: [PATCH 9/9] Handle variable with a strcmp dunction --- sediff/result_item_render.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sediff/result_item_render.c b/sediff/result_item_render.c index 36fbbfb2..d0274cf3 100644 --- a/sediff/result_item_render.c +++ b/sediff/result_item_render.c @@ -27,6 +27,7 @@ #include "result_item_render.h" #include +#include static const char *form_name_map[] = { "Added", "Added New Type", "Removed", "Removed Missing Type", "Modified" @@ -139,7 +140,7 @@ void result_item_print_string_inline(GtkTextBuffer * tb, GtkTextIter * iter, con } case ' ': { - if (current_tag != "modified") { + if ( strcmp( current_tag, "modified") != 0 ) { gtk_text_buffer_insert_with_tags_by_name(tb, iter, s + start, end - start + 1, current_tag, NULL); start = end + 1; current_tag = "modified";