Attachment 28022 Details for Bug 57238

[patch] Make pam_xauth copy the DISPLAY variable when copying X privs

pam-0.77-xauth-copy-display.patch (text/plain), 2.04 KB, created by Ben Kahn on 2005-01-29 05:48:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Kahn

Created: 2005-01-29 05:48:22 UTC

Size: 2.04 KB

patch

obsolete

>diff -r -u Linux-PAM-0.77/modules/pam_xauth/pam_xauth.c Linux-PAM-0.77-new/modules/pam_xauth/pam_xauth.c
>--- Linux-PAM-0.77/modules/pam_xauth/pam_xauth.c	2003-07-24 15:21:50.000000000 -0400
>+++ Linux-PAM-0.77-new/modules/pam_xauth/pam_xauth.c	2005-01-28 16:14:23.831195649 -0500
>@@ -59,6 +59,7 @@
> #define DATANAME "pam_xauth_cookie_file"
> #define XAUTHBIN "/usr/X11R6/bin/xauth"
> #define XAUTHENV "XAUTHORITY"
>+#define DISPLAYENV "DISPLAY"
> #define HOMEENV  "HOME"
> #define XAUTHDEF ".Xauthority"
> #define XAUTHTMP ".xauthXXXXXX"
>@@ -271,7 +272,7 @@
> pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
> {
> 	char xauthpath[] = XAUTHBIN;
>-	char *cookiefile = NULL, *xauthority = NULL,
>+	char *cookiefile = NULL, *xauthority = NULL, *d = NULL,
> 	     *cookie = NULL, *display = NULL, *tmp = NULL;
> 	const char *user, *xauth = xauthpath;
> 	struct passwd *tpwd, *rpwd;
>@@ -314,12 +315,20 @@
> 	}
> 
> 	/* If DISPLAY isn't set, we don't really care, now do we? */
>-	if ((display = getenv("DISPLAY")) == NULL) {
>+	if ((display = getenv(DISPLAYENV)) == NULL) {
> 		if (debug) {
> 			syslog(LOG_DEBUG, "pam_xauth: user has no DISPLAY,"
> 			       " doing nothing");
> 		}
> 		return PAM_SUCCESS;
>+	} else {
>+		/* But if it is, we need to make sure it gets copied. */
>+                d = malloc(strlen(DISPLAYENV) + 1 +
>+                           strlen(display) + 1);
>+                                                                                                                                                             
>+                strcpy(d, DISPLAYENV);
>+                strcat(d, "=");
>+                strcat(d, display);
> 	}
> 
> 	/* Read the target user's name. */
>@@ -550,6 +559,12 @@
> 		pam_putenv(pamh, xauthority);
> 		putenv(xauthority); /* The environment owns this string now. */
> 
>+
>+		/* Now is a good time to put the copied DISPLAY environment too. */
>+		unsetenv(DISPLAYENV);
>+		pam_putenv(pamh, d);
>+		putenv(d);
>+
> 		/* Merge the cookie we read before into the new file. */
> 		if (debug) {
> 			syslog(LOG_DEBUG, "pam_xauth: writing key `%s' to "

Actions: View | Diff

Attachments on bug 57238: 23708 | 23713 | 24332 | 28021 | 28022 | 28114 | 28115