Merge changes from CUPS 1.4svn-r8469.

[thirdparty/cups.git] / scheduler / auth.c

diff --git a/scheduler/auth.c b/scheduler/auth.c
index cc2f9a412acedc8585e933294255a49aaf4ab605..abf55e3e2069c319f655c2293bbe130640f3ee2f 100644 (file)
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -687,15 +687,6 @@ cupsdAuthorize(cupsd_client_t *con)        /* I - Client connection */
 #    endif /* PAM_TTY */
 #  endif /* HAVE_PAM_SET_ITEM */
 
-#  ifdef HAVE_PAM_SETCRED
-            pamerr = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT);
-           if (pamerr != PAM_SUCCESS)
-             cupsdLogMessage(CUPSD_LOG_WARN,
-                             "cupsdAuthorize: pam_setcred() "
-                             "returned %d (%s)!", pamerr,
-                             pam_strerror(pamh, pamerr));
-#  endif /* HAVE_PAM_SETCRED */
-
            pamerr = pam_authenticate(pamh, PAM_SILENT);
            if (pamerr != PAM_SUCCESS)
            {
@@ -707,6 +698,15 @@ cupsdAuthorize(cupsd_client_t *con)        /* I - Client connection */
              return;
            }
 
+#  ifdef HAVE_PAM_SETCRED
+            pamerr = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT);
+           if (pamerr != PAM_SUCCESS)
+             cupsdLogMessage(CUPSD_LOG_WARN,
+                             "cupsdAuthorize: pam_setcred() "
+                             "returned %d (%s)!", pamerr,
+                             pam_strerror(pamh, pamerr));
+#  endif /* HAVE_PAM_SETCRED */
+
            pamerr = pam_acct_mgmt(pamh, PAM_SILENT);
            if (pamerr != PAM_SUCCESS)
            {