Bug #11020: xdm doesn't set SSH_AUTH_SOCK even though using with pam_ssh

Wasn't calling pam_setcred()/pam_getenvlist() if setusercontext() was present
X.Org Bugzilla #11020: <https://bugs.freedesktop.org/show_bug.cgi?id=11020>

1 files changed, 4 insertions, 0 deletions

diff --git a/session.c b/session.c
index 384fd78..195c26f 100644
--- a/session.c
+++ b/session.c
@@ -627,6 +627,8 @@ StartClient (
 	    return (0);
 	}
 #endif   /* QNX4 doesn't support multi-groups, no initgroups() */
+#endif /* !HAS_SETUSERCONTEXT */
+
 #ifdef USE_PAM
 	if (pamh) {
 	    long i;
@@ -647,6 +649,8 @@ StartClient (
 
 	}
 #endif
+
+#ifndef HAS_SETUSERCONTEXT
 	if (setuid(verify->uid) < 0) {
 	    LogError ("setuid %d (user \"%s\") failed, errno=%d\n",
 		     verify->uid, name, errno);