From 859dc200c20c5dd7e49e443bd29ab6c31dfb0b69 Mon Sep 17 00:00:00 2001

From: Michal Schmidt <mschmidt@redhat.com>

Date: Thu, 17 Nov 2011 00:16:22 +0100

Subject: [PATCH] execute: make setup_pam() return -errno when possible

The only caller currently checks if the result is non-zero,

so nothing changes there.

(cherry picked from commit 9ba353983adc026b75a503c1381f6e5c8062f3e0)

---

 src/execute.c |    8 +++++++-

 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/execute.c b/src/execute.c

index 0651014..2039861 100644

--- a/src/execute.c

+++ b/src/execute.c

@@ -716,6 +716,7 @@ static int setup_pam(

         pam_handle_t *handle = NULL;

         sigset_t ss, old_ss;

         int pam_code = PAM_SUCCESS;

+        int err;

         char **e = NULL;

         bool close_session = false;

         pid_t pam_pid = 0, parent_pid;

@@ -835,6 +836,11 @@ static int setup_pam(

         return 0;

 fail:

+        if (pam_code != PAM_SUCCESS)

+                err = -EPERM;  /* PAM errors do not map to errno */

+        else

+                err = -errno;

+

         if (handle) {

                 if (close_session)

                         pam_code = pam_close_session(handle, PAM_DATA_SILENT);

@@ -851,7 +857,7 @@ fail:

                 kill(pam_pid, SIGCONT);

         }

-        return EXIT_PAM;

+        return err;

 }

 #endif