From: Frederic Crozat <fcrozat@mandriva.com>
Date: Wed, 3 Mar 2010 13:05:23 +0000 (+0100)
Subject: Fix build when selinux is disabled but libaudit enabled
X-Git-Tag: dbus-1.2.22~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=008cd59ef713a1efc3c9588cf1079c6a80ddf0c7;p=thirdparty%2Fdbus.git

Fix build when selinux is disabled but libaudit enabled

https://bugs.freedesktop.org/show_bug.cgi?id=26859
---

diff --git a/bus/selinux.c b/bus/selinux.c
index e61efc5d8..5a9af5ac7 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -29,12 +29,12 @@
 #include "utils.h"
 #include "config-parser.h"
 
-#ifdef HAVE_SELINUX
-#include <sys/types.h>
-#include <unistd.h>
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#ifdef HAVE_SELINUX
+#include <sys/types.h>
+#include <unistd.h>
 #include <limits.h>
 #include <pthread.h>
 #include <syslog.h>
@@ -46,11 +46,11 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <grp.h>
+#endif /* HAVE_SELINUX */
 #ifdef HAVE_LIBAUDIT
 #include <cap-ng.h>
 #include <libaudit.h>
 #endif /* HAVE_LIBAUDIT */
-#endif /* HAVE_SELINUX */
 
 #define BUS_SID_FROM_SELINUX(sid)  ((BusSELinuxID*) (sid))
 #define SELINUX_SID_FROM_BUS(sid)  ((security_id_t) (sid))