From a698700967e72257f5fb6ebbca96ef00a2375490 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Thu, 27 Sep 2007 11:54:43 +0000 Subject: Relevant BUGIDs: rhbz #306901, rhbz #295151 Purpose of commit: bugfix Commit summary: --------------- 2007-09-27 Tomas Mraz * modules/pam_succeed_if/pam_succeed_if.c (evaluate_inlist): Fix in operator rhbz #295151. * modules/pam_namespace/pam_namespace.c (poly_name): Do not try to get context when SELinux is disabled rhbz #306901. --- ChangeLog | 7 +++++++ modules/pam_namespace/pam_namespace.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb8e2803..2b3f2364 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-09-27 Tomas Mraz + + * modules/pam_succeed_if/pam_succeed_if.c (evaluate_inlist): Fix in + operator rhbz #295151. + * modules/pam_namespace/pam_namespace.c (poly_name): Do not try to + get context when SELinux is disabled. + 2007-09-27 Thorsten Kukuk * xtests/tst-pam_succeed_if1.c: New test case for diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c index 73d8e591..d3612f59 100644 --- a/modules/pam_namespace/pam_namespace.c +++ b/modules/pam_namespace/pam_namespace.c @@ -589,8 +589,9 @@ static int poly_name(const struct polydir_s *polyptr, char **i_name, #ifdef WITH_SELINUX *i_context = NULL; *origcon = NULL; - if ((rc=form_context(polyptr, i_context, origcon, idata)) != PAM_SUCCESS) { - return rc; + if ((idata->flags & PAMNS_SELINUX_ENABLED) && + (rc=form_context(polyptr, i_context, origcon, idata)) != PAM_SUCCESS) { + return rc; } #endif -- cgit v1.2.3