From: Michal Schmidt <mschmidt@redhat.com>
Date: Wed, 16 Nov 2011 23:16:22 +0000 (+0100)
Subject: execute: make setup_pam() return -errno when possible
X-Git-Tag: v38~190
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9ba353983adc026b75a503c1381f6e5c8062f3e0

execute: make setup_pam() return -errno when possible

The only caller currently checks if the result is non-zero,
so nothing changes there.
---

diff --git a/src/execute.c b/src/execute.c
index 065101431..203986178 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