From 8d821f0508f495deb376617c165cbcbf396a058a Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 23 Feb 2012 01:15:29 -0500 Subject: pam_sss: keep selinux optional Signed-off-by: Stephen Gallagher --- Makefile.am | 2 +- src/sss_client/pam_sss.c | 6 ++++++ src/tools/tools_util.c | 3 --- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index c0af34c7..8ce8c64d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -960,7 +960,7 @@ pam_sss_la_SOURCES = \ pam_sss_la_LDFLAGS = \ -lpam \ - -lselinux \ + $(SELINUX_LIBS) \ -module \ -avoid-version \ -Wl,--version-script,$(srcdir)/src/sss_client/sss_pam.exports diff --git a/src/sss_client/pam_sss.c b/src/sss_client/pam_sss.c index 45e31810..4fe4613a 100644 --- a/src/sss_client/pam_sss.c +++ b/src/sss_client/pam_sss.c @@ -41,7 +41,9 @@ #include #include #include +#ifdef HAVE_SELINUX #include +#endif #include "sss_pam_macros.h" #include "sss_cli.h" @@ -1083,11 +1085,13 @@ static int send_and_receive(pam_handle_t *pamh, struct pam_items *pi, size_t replen; int pam_status = PAM_SYSTEM_ERR; +#ifdef HAVE_SELINUX char *path = NULL; char *tmp_path = NULL; int pos, len; int fd; mode_t oldmask; +#endif /* HAVE_SELINUX */ print_pam_items(pi); @@ -1184,6 +1188,7 @@ static int send_and_receive(pam_handle_t *pamh, struct pam_items *pi, break; } +#ifdef HAVE_SELINUX if (asprintf(&path, "%s/logins/%s", selinux_policy_root(), pi->pam_user) < 0 || asprintf(&tmp_path, "%sXXXXXX", path) < 0) { @@ -1221,6 +1226,7 @@ static int send_and_receive(pam_handle_t *pamh, struct pam_items *pi, free(path); free(tmp_path); umask(oldmask); +#endif /* HAVE_SELINUX */ break; case SSS_PAM_SETCRED: case SSS_PAM_CLOSE_SESSION: diff --git a/src/tools/tools_util.c b/src/tools/tools_util.c index 404aef25..00448953 100644 --- a/src/tools/tools_util.c +++ b/src/tools/tools_util.c @@ -29,9 +29,6 @@ #include #include "config.h" -#ifdef HAVE_SELINUX -#include -#endif #include "util/util.h" #include "confdb/confdb.h" -- cgit