|
Peter Hutterer |
afc2c6e |
From 080b3903ee57a682ac67306d7ff855bbf1dccda3 Mon Sep 17 00:00:00 2001
|
|
Peter Hutterer |
afc2c6e |
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Peter Hutterer |
afc2c6e |
Date: Wed, 4 Jan 2012 09:31:51 +1000
|
|
Peter Hutterer |
afc2c6e |
Subject: [PATCH] Xext: fix selinux build failure
|
|
Peter Hutterer |
afc2c6e |
|
|
Peter Hutterer |
afc2c6e |
The server builds with -Werror=missing-braces, causing
|
|
Peter Hutterer |
afc2c6e |
|
|
Peter Hutterer |
afc2c6e |
xselinux_hooks.c: In function 'SELinuxFlaskInit':
|
|
Peter Hutterer |
afc2c6e |
xselinux_hooks.c:851:12: error: missing braces around initializer
|
|
Peter Hutterer |
afc2c6e |
[-Werror=missing-braces]
|
|
Peter Hutterer |
afc2c6e |
xselinux_hooks.c:851:12: error: (near initialization for
|
|
Peter Hutterer |
afc2c6e |
'avc_option.<anonymous>') [-Werror=missing-braces]
|
|
Peter Hutterer |
afc2c6e |
cc1: some warnings being treated as errors
|
|
Peter Hutterer |
afc2c6e |
|
|
Peter Hutterer |
afc2c6e |
Source is libselinux' libselinux-rhat.patch which changes struct selinux_opt
|
|
Peter Hutterer |
afc2c6e |
from { int, char * } to { int, union { char*, char** }}.
|
|
Peter Hutterer |
afc2c6e |
|
|
Peter Hutterer |
afc2c6e |
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Peter Hutterer |
afc2c6e |
---
|
|
Peter Hutterer |
afc2c6e |
Xext/xselinux_hooks.c | 2 +-
|
|
Peter Hutterer |
afc2c6e |
Xext/xselinux_label.c | 2 +-
|
|
Peter Hutterer |
afc2c6e |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
Peter Hutterer |
afc2c6e |
|
|
Peter Hutterer |
afc2c6e |
diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
|
|
Peter Hutterer |
afc2c6e |
index 0d4c9ab..943e5cc 100644
|
|
Peter Hutterer |
afc2c6e |
--- a/Xext/xselinux_hooks.c
|
|
Peter Hutterer |
afc2c6e |
+++ b/Xext/xselinux_hooks.c
|
|
Peter Hutterer |
afc2c6e |
@@ -848,7 +848,7 @@ SELinuxFlaskReset(void)
|
|
Peter Hutterer |
afc2c6e |
void
|
|
Peter Hutterer |
afc2c6e |
SELinuxFlaskInit(void)
|
|
Peter Hutterer |
afc2c6e |
{
|
|
Peter Hutterer |
afc2c6e |
- struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, (char *)0 };
|
|
Peter Hutterer |
afc2c6e |
+ struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, { (char *)0 } };
|
|
Peter Hutterer |
afc2c6e |
security_context_t ctx;
|
|
Peter Hutterer |
afc2c6e |
int ret = TRUE;
|
|
Peter Hutterer |
afc2c6e |
|
|
Peter Hutterer |
afc2c6e |
diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c
|
|
Peter Hutterer |
afc2c6e |
index e5929fa..de49f83 100644
|
|
Peter Hutterer |
afc2c6e |
--- a/Xext/xselinux_label.c
|
|
Peter Hutterer |
afc2c6e |
+++ b/Xext/xselinux_label.c
|
|
Peter Hutterer |
afc2c6e |
@@ -354,7 +354,7 @@ SELinuxDefaultClientLabel(void)
|
|
Peter Hutterer |
afc2c6e |
void
|
|
Peter Hutterer |
afc2c6e |
SELinuxLabelInit(void)
|
|
Peter Hutterer |
afc2c6e |
{
|
|
Peter Hutterer |
afc2c6e |
- struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, (char *)1 };
|
|
Peter Hutterer |
afc2c6e |
+ struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, { (char *)1 } };
|
|
Peter Hutterer |
afc2c6e |
|
|
Peter Hutterer |
afc2c6e |
label_hnd = selabel_open(SELABEL_CTX_X, &selabel_option, 1);
|
|
Peter Hutterer |
afc2c6e |
if (!label_hnd)
|
|
Peter Hutterer |
afc2c6e |
--
|
|
Peter Hutterer |
afc2c6e |
1.7.7.4
|
|
Peter Hutterer |
afc2c6e |
|