From 7016947229edcaa268a82bf69fde37e521b13233 Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@redhat.com>
Date: Tue, 24 Jul 2012 15:36:10 -0400
Subject: Move SELinux processing from session to account PAM stack

The idea is to rename session provider to selinux provider. Processing
of SELinux rules has to be performed in account stack in order to ensure
that pam_selinux (which is the first module in PAM session stack) will
get the correct input from SSSD.

Processing of account PAM stack is bound to access provider. That means
we need to have two providers executed when SSS_PAM_ACCT_MGMT message
is received from PAM responder. Change in data_provider_be.c ensures
just that - after access provider finishes its actions, the control is
given to selinux provider and only after this provider finishes is the
result returned to PAM responder.
---
 src/sss_client/pam_sss.c | 110 +++++++++++++++++++++++------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

(limited to 'src/sss_client')

diff --git a/src/sss_client/pam_sss.c b/src/sss_client/pam_sss.c
index 50c5048bf..3fecfabe2 100644
--- a/src/sss_client/pam_sss.c
+++ b/src/sss_client/pam_sss.c
@@ -1180,71 +1180,71 @@ static int send_and_receive(pam_handle_t *pamh, struct pam_items *pi,
                           pi->pam_user, pam_status,
                           pam_strerror(pamh,pam_status));
                 }
-            }
-            break;
-        case SSS_PAM_OPEN_SESSION:
-            if (pi->selinux_user == NULL) {
-                pam_status = PAM_SUCCESS;
-                break;
-            }
+            } else {
+                if (pi->selinux_user == NULL) {
+                    pam_status = PAM_SUCCESS;
+                    break;
+                }
 
 #ifdef HAVE_SELINUX
-            if (asprintf(&path, "%s/logins/%s", selinux_policy_root(),
-                         pi->pam_user) <  0 ||
-                asprintf(&tmp_path, "%sXXXXXX", path) < 0) {
-                pam_status = PAM_SYSTEM_ERR;
-                goto done;
-            }
+                if (asprintf(&path, "%s/logins/%s", selinux_policy_root(),
+                             pi->pam_user) <  0 ||
+                    asprintf(&tmp_path, "%sXXXXXX", path) < 0) {
+                    pam_status = PAM_SYSTEM_ERR;
+                    goto done;
+                }
 
-            oldmask = umask(022);
-            fd = mkstemp(tmp_path);
-            umask(oldmask);
-            if (fd < 0) {
-                logger(pamh, LOG_ERR, "creating the temp file for SELinux "
-                       "data failed. %s", tmp_path);
-                pam_status = PAM_SYSTEM_ERR;
-                goto done;
-            }
+                oldmask = umask(022);
+                fd = mkstemp(tmp_path);
+                umask(oldmask);
+                if (fd < 0) {
+                    logger(pamh, LOG_ERR, "creating the temp file for SELinux "
+                           "data failed. %s", tmp_path);
+                    pam_status = PAM_SYSTEM_ERR;
+                    goto done;
+                }
 
-            /* First write filter for all services */
-            services = strdup(ALL_SERVICES);
-            if (services == NULL) {
-                pam_status = PAM_SYSTEM_ERR;
-                goto done;
-            }
+                /* First write filter for all services */
+                services = strdup(ALL_SERVICES);
+                if (services == NULL) {
+                    pam_status = PAM_SYSTEM_ERR;
+                    goto done;
+                }
 
-            errno = 0;
-            written = sss_atomic_write_s(fd, (void *)services, ALL_SERVICES_LEN);
-            if (written == -1) {
-                ret = errno;
-                logger(pamh, LOG_ERR, "writing to SELinux data file %s"
-                        "failed [%d]: %s", tmp_path, ret, strerror(ret));
-                pam_status = PAM_SYSTEM_ERR;
-                goto done;
-            }
-            len = strlen(pi->selinux_user);
-
-            errno = 0;
-            written = sss_atomic_write_s(fd, pi->selinux_user, len);
-            if (written == -1) {
-                ret = errno;
-                logger(pamh, LOG_ERR, "writing to SELinux data file %s"
-                        "failed [%d]: %s", tmp_path, ret, strerror(ret));
-                pam_status = PAM_SYSTEM_ERR;
-                goto done;
-            }
+                errno = 0;
+                written = sss_atomic_write_s(fd, (void *)services, ALL_SERVICES_LEN);
+                if (written == -1) {
+                    ret = errno;
+                    logger(pamh, LOG_ERR, "writing to SELinux data file %s"
+                            "failed [%d]: %s", tmp_path, ret, strerror(ret));
+                    pam_status = PAM_SYSTEM_ERR;
+                    goto done;
+                }
+                len = strlen(pi->selinux_user);
 
-            if (written != len) {
-                logger(pamh, LOG_ERR, "Expected to write %d bytes, wrote %d",
-                       written, len);
-                goto done;
-            }
+                errno = 0;
+                written = sss_atomic_write_s(fd, pi->selinux_user, len);
+                if (written == -1) {
+                    ret = errno;
+                    logger(pamh, LOG_ERR, "writing to SELinux data file %s"
+                            "failed [%d]: %s", tmp_path, ret, strerror(ret));
+                    pam_status = PAM_SYSTEM_ERR;
+                    goto done;
+                }
+
+                if (written != len) {
+                    logger(pamh, LOG_ERR, "Expected to write %d bytes, wrote %d",
+                           written, len);
+                    goto done;
+                }
 
-            close(fd);
+                close(fd);
 
-            rename(tmp_path, path);
+                rename(tmp_path, path);
 #endif /* HAVE_SELINUX */
+            }
             break;
+        case SSS_PAM_OPEN_SESSION:
         case SSS_PAM_SETCRED:
         case SSS_PAM_CLOSE_SESSION:
             break;
-- 
cgit