From 2b58d92add64b53b16cbb438e7b69e85d046afd1 Mon Sep 17 00:00:00 2001

From: Dan Walsh <dwalsh@redhat.com>

Date: Tue, 20 Sep 2011 15:46:38 -0400

Subject: [PATCH 5/6] Fix sepol calls to work with latest libsepol

---

 configure.ac |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)

Index: setools-3.3.6/configure.ac

===================================================================

--- setools-3.3.6.orig/configure.ac

+++ setools-3.3.6/configure.ac

@@ -503,7 +503,7 @@ AC_COMPILE_IFELSE(

                   [AC_LANG_SOURCE([

 #include <sepol/policydb/expand.h>

 int main () {

-  return role_set_expand(NULL, NULL, NULL, NULL);

+  return role_set_expand(NULL, NULL, NULL, NULL, NULL);

 }])],

                   sepol_new_user_role_mapping="yes",

                   sepol_new_user_role_mapping="no")

@@ -539,7 +539,7 @@ if test ${sepol_check_boolmap} = "yes";

                          [AC_LANG_SOURCE([

 #include <sepol/policydb/expand.h>

 int main () {

-  return expand_module_avrules(NULL, NULL, NULL, NULL, NULL, 0, 0);

+  return expand_module_avrules(NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0);

 }])],

                          AC_MSG_RESULT([yes]),

                          AC_MSG_ERROR([this version of libsepol is incompatible with SETools]))

Index: setools-3.3.6/libqpol/src/policy_define.c

===================================================================

--- setools-3.3.6.orig/libqpol/src/policy_define.c

+++ setools-3.3.6/libqpol/src/policy_define.c

@@ -2031,7 +2031,7 @@ int define_role_trans(void)

 	/* This ebitmap business is just to ensure that there are not conflicting role_trans rules */

 #ifdef HAVE_SEPOL_USER_ROLE_MAPPING

-	if (role_set_expand(&roles, &e_roles, policydbp, NULL))

+	if (role_set_expand(&roles, &e_roles, policydbp, NULL, NULL))

 #else

 	if (role_set_expand(&roles, &e_roles, policydbp))

 #endif