summaryrefslogtreecommitdiffstats
path: root/recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch')
-rw-r--r--recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch b/recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch
index e9df8be..8abf847 100644
--- a/recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch
+++ b/recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch
@@ -1,4 +1,4 @@
1From c96010440e7a2a87787a535fd0f9ccf26a2b4a5e Mon Sep 17 00:00:00 2001 1From 0fddb654b4193e91b8534cbbeaa5fd9b6aa1ead2 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com> 2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Mon, 20 Jan 2014 03:53:48 -0500 3Date: Mon, 20 Jan 2014 03:53:48 -0500
4Subject: [PATCH] libsemanage: allow to disable audit support 4Subject: [PATCH] libsemanage: allow to disable audit support
@@ -13,7 +13,7 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
13 3 files changed, 31 insertions(+), 2 deletions(-) 13 3 files changed, 31 insertions(+), 2 deletions(-)
14 14
15diff --git a/src/Makefile b/src/Makefile 15diff --git a/src/Makefile b/src/Makefile
16index d525996..2f5e159 100644 16index 8dfbd76..4012f28 100644
17--- a/src/Makefile 17--- a/src/Makefile
18+++ b/src/Makefile 18+++ b/src/Makefile
19@@ -27,6 +27,14 @@ ifeq ($(DEBUG),1) 19@@ -27,6 +27,14 @@ ifeq ($(DEBUG),1)
@@ -41,7 +41,7 @@ index d525996..2f5e159 100644
41 41
42 $(LIBPC): $(LIBPC).in ../VERSION 42 $(LIBPC): $(LIBPC).in ../VERSION
43diff --git a/src/seusers_local.c b/src/seusers_local.c 43diff --git a/src/seusers_local.c b/src/seusers_local.c
44index 795a33d..6539cdf 100644 44index eb3f82b..45da825 100644
45--- a/src/seusers_local.c 45--- a/src/seusers_local.c
46+++ b/src/seusers_local.c 46+++ b/src/seusers_local.c
47@@ -8,7 +8,11 @@ typedef struct semanage_seuser record_t; 47@@ -8,7 +8,11 @@ typedef struct semanage_seuser record_t;
@@ -72,7 +72,7 @@ index 795a33d..6539cdf 100644
72 72
73 int semanage_seuser_modify_local(semanage_handle_t * handle, 73 int semanage_seuser_modify_local(semanage_handle_t * handle,
74 const semanage_seuser_key_t * key, 74 const semanage_seuser_key_t * key,
75@@ -164,8 +170,11 @@ int semanage_seuser_modify_local(semanage_handle_t * handle, 75@@ -165,8 +171,11 @@ int semanage_seuser_modify_local(semanage_handle_t * handle,
76 (void) semanage_seuser_query(handle, key, &previous); 76 (void) semanage_seuser_query(handle, key, &previous);
77 handle->msg_callback = callback; 77 handle->msg_callback = callback;
78 rc = dbase_modify(handle, dconfig, key, new); 78 rc = dbase_modify(handle, dconfig, key, new);
@@ -84,7 +84,7 @@ index 795a33d..6539cdf 100644
84 err: 84 err:
85 if (previous) 85 if (previous)
86 semanage_seuser_free(previous); 86 semanage_seuser_free(previous);
87@@ -181,8 +190,12 @@ int semanage_seuser_del_local(semanage_handle_t * handle, 87@@ -182,8 +191,12 @@ int semanage_seuser_del_local(semanage_handle_t * handle,
88 dbase_config_t *dconfig = semanage_seuser_dbase_local(handle); 88 dbase_config_t *dconfig = semanage_seuser_dbase_local(handle);
89 rc = dbase_del(handle, dconfig, key); 89 rc = dbase_del(handle, dconfig, key);
90 semanage_seuser_query(handle, key, &seuser); 90 semanage_seuser_query(handle, key, &seuser);
@@ -98,7 +98,7 @@ index 795a33d..6539cdf 100644
98 semanage_seuser_free(seuser); 98 semanage_seuser_free(seuser);
99 return rc; 99 return rc;
100diff --git a/tests/Makefile b/tests/Makefile 100diff --git a/tests/Makefile b/tests/Makefile
101index 69f49a3..f914492 100644 101index 241ff17..fa03fb6 100644
102--- a/tests/Makefile 102--- a/tests/Makefile
103+++ b/tests/Makefile 103+++ b/tests/Makefile
104@@ -4,10 +4,18 @@ CILS = $(sort $(wildcard *.cil)) 104@@ -4,10 +4,18 @@ CILS = $(sort $(wildcard *.cil))
@@ -114,7 +114,7 @@ index 69f49a3..f914492 100644
114+endif 114+endif
115+ 115+
116 EXECUTABLE = libsemanage-tests 116 EXECUTABLE = libsemanage-tests
117 CFLAGS += -g -O0 -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter 117 CFLAGS += -g -O0 -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute
118 override CFLAGS += -I../src -I../include 118 override CFLAGS += -I../src -I../include
119-override LDLIBS += -lcunit -lbz2 -laudit -lselinux -lsepol 119-override LDLIBS += -lcunit -lbz2 -laudit -lselinux -lsepol
120+override LDLIBS += -lcunit -lbz2 $(LIBAUDIT) -lselinux -lsepol 120+override LDLIBS += -lcunit -lbz2 $(LIBAUDIT) -lselinux -lsepol