-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch looks good to me. acked.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iEYEARECAAYFAlJpN2kACgkQrlYvE4MpobNvUwCeIny+stGme6c9j78MYVpCeCej
z6UAn0fs9zonBY4nLzs56+c575g/FDgp
=aXRf
-----END PGP SIGNATURE-----
>From 47f4e4e76cf3cf7af56b0d7fe824bdc660d1d169 Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@xxxxxxxxxx>
Date: Fri, 11 Oct 2013 10:05:50 -0400
Subject: [PATCH 64/74] Fix error when policy does not match the system.
---
policycoreutils/sepolicy/policy.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/policycoreutils/sepolicy/policy.c b/policycoreutils/sepolicy/policy.c
index 4eca22d..2a9e1c7 100644
--- a/policycoreutils/sepolicy/policy.c
+++ b/policycoreutils/sepolicy/policy.c
@@ -66,7 +66,6 @@ PyObject *wrap_policy(PyObject *UNUSED(self), PyObject *args){
}
apol_vector_destroy(&mod_paths);
- policy_load_options |= QPOL_POLICY_OPTION_MATCH_SYSTEM;
policy = apol_policy_create_from_policy_path(pol_path, policy_load_options, NULL, NULL);
apol_policy_path_destroy(&pol_path);
if (!policy) {
@@ -87,7 +86,7 @@ static PyMethodDef methods[] = {
{NULL, NULL, 0, NULL} /* sentinel */
};
-void init_policy() {
+void init_policy(void) {
PyObject *m;
m = Py_InitModule("_policy", methods);
init_info(m);
--
1.8.3.1
