diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2013-05-14 08:44:11 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-05-14 10:07:08 +0200 |
| commit | 39472b5dfcc82815ae819a5b5831859249962a4c (patch) | |
| tree | 82df7a8847c08e4cbdf3d2dfd8eeaee328742cc2 /src | |
| parent | 5aad10b49e193ee14a86e1277146a223005a2d6b (diff) | |
| download | sssd-39472b5dfcc82815ae819a5b5831859249962a4c.tar.gz sssd-39472b5dfcc82815ae819a5b5831859249962a4c.tar.xz sssd-39472b5dfcc82815ae819a5b5831859249962a4c.zip | |
Fix broken build with selinux.
Header file selinux/selinux.h was removed in commit 245cc346 from file
ipa_selinux.c, because it breaks build without selinux. But new
error was introduced. This patch fixes compilation with selinux and include
header file selinux/selinux.h only if both macros
exist HAVE_SELINUX and HAVE_SELINUX_LOGIN_DIR.
Now ipa_selinux.c should be correctly built with and without selinux.
Diffstat (limited to 'src')
| -rw-r--r-- | src/providers/ipa/ipa_selinux.c | 4 | ||||
| -rw-r--r-- | src/providers/ipa/ipa_selinux.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c index eed0cd499..ce8f39ccc 100644 --- a/src/providers/ipa/ipa_selinux.c +++ b/src/providers/ipa/ipa_selinux.c @@ -37,7 +37,8 @@ #include "providers/ipa/ipa_selinux_maps.h" #include "providers/ipa/ipa_subdomains.h" -#ifdef HAVE_SELINUX_LOGIN_DIR +#if defined HAVE_SELINUX && defined HAVE_SELINUX_LOGIN_DIR +#include <selinux/selinux.h> static struct tevent_req * ipa_get_selinux_send(TALLOC_CTX *mem_ctx, @@ -1297,6 +1298,7 @@ ipa_get_selinux_recv(struct tevent_req *req, return EOK; } +/*end of #if defined HAVE_SELINUX && defined HAVE_SELINUX_LOGIN_DIR */ #else /* Simply return success if HAVE_SELINUX_LOGIN_DIR is not defined. */ void ipa_selinux_handler(struct be_req *be_req) diff --git a/src/providers/ipa/ipa_selinux.h b/src/providers/ipa/ipa_selinux.h index e8fd4a06a..08cdaef7e 100644 --- a/src/providers/ipa/ipa_selinux.h +++ b/src/providers/ipa/ipa_selinux.h @@ -32,7 +32,7 @@ #define ALL_SERVICES "*" #define selogin_path(mem_ctx, username) \ talloc_asprintf(mem_ctx, "%s/logins/%s", selinux_policy_root(), username) -#endif +#endif /* HAVE_SELINUX_LOGIN_DIR */ struct ipa_selinux_ctx { struct ipa_id_ctx *id_ctx; |