diff options
| author | Tomas Mraz <tm@t8m.info> | 2007-09-27 11:54:43 +0000 |
|---|---|---|
| committer | Tomas Mraz <tm@t8m.info> | 2007-09-27 11:54:43 +0000 |
| commit | a698700967e72257f5fb6ebbca96ef00a2375490 (patch) | |
| tree | 07ab4782a8a13e862dd0f7ab3d3fcbc4483984e7 | |
| parent | 2526591274d04d584584ea7ae9a96042477f1c74 (diff) | |
| download | pam-a698700967e72257f5fb6ebbca96ef00a2375490.tar.gz pam-a698700967e72257f5fb6ebbca96ef00a2375490.tar.bz2 pam-a698700967e72257f5fb6ebbca96ef00a2375490.zip | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | modules/pam_namespace/pam_namespace.c | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -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 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 |