Relevant BUGIDs: rhbz #306901, rhbz #295151

Purpose of commit: bugfix

Commit summary:
---------------
2007-09-27  Tomas Mraz  <t8m@centrum.cz>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index bb8e2803d0381087a1fa4afae8127642970d34e4..2b3f2364879daba000957990d5fe0c3349f60e24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-27  Tomas Mraz  <t8m@centrum.cz>
+
+       * 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  <kukuk@thkukuk.de>
 
        * 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 73d8e5915c268f18d6d6016f96a2387d60c5b09e..d3612f59f6cda7db0c2c6033f877490b39b40b49 100644 (file)
--- 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