aboutsummaryrefslogtreecommitdiff
path: root/Linux-PAM/modules/pam_namespace/pam_namespace.c
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 16:03:16 -0800
committerSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 16:05:55 -0800
commit281e859131adad49301befbc50cfc5cd282c6937 (patch)
treece45ce19af410930b834390fb8a8256bcace5006 /Linux-PAM/modules/pam_namespace/pam_namespace.c
parent9a4298687784e7812c8aeef6e0e97830febbf393 (diff)
parent10ac36fdc45532acb00ec47aab28b5cc6198820f (diff)
downloadpam-281e859131adad49301befbc50cfc5cd282c6937.tar.gz
pam-281e859131adad49301befbc50cfc5cd282c6937.tar.bz2
pam-281e859131adad49301befbc50cfc5cd282c6937.zip
New upstream version 0.99.9.0
Diffstat (limited to 'Linux-PAM/modules/pam_namespace/pam_namespace.c')
-rw-r--r--Linux-PAM/modules/pam_namespace/pam_namespace.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Linux-PAM/modules/pam_namespace/pam_namespace.c b/Linux-PAM/modules/pam_namespace/pam_namespace.c
index 73d8e591..d3612f59 100644
--- a/Linux-PAM/modules/pam_namespace/pam_namespace.c
+++ b/Linux-PAM/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