Attachment 1395 Details for Bug 1401 – patch for removing staled credentials in .Xauthority

[patch] patch for removing staled credentials in .Xauthority

openssh-4.7p1-xauth.diff (text/plain), 1.07 KB, created by Anicka Bernathova on 2007-12-12 07:31:43 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Anicka Bernathova

Created: 2007-12-12 07:31:43 AEDT

Size: 1.07 KB

patch

obsolete

>--- session.c
>+++ session.c
>@@ -2250,8 +2250,41 @@
> session_close(Session *s)
> {
> 	u_int i;
>+	int do_xauth;
> 
> 	debug("session_close: session %d pid %ld", s->self, (long)s->pid);
>+
>+	do_xauth = s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL;
>+	if (do_xauth && options.xauth_location != NULL) {
>+		pid_t pid;
>+		FILE *f;
>+		char cmd[1024];
>+		struct passwd * pw = s->pw;
>+
>+		if (!(pid = fork())) {
>+			permanently_set_uid(pw);
>+
>+			/* Remove authority data from .Xauthority if appropriate. */
>+			debug("Running %.500s remove %.100s\n",
>+				options.xauth_location, s->auth_display);
>+            
>+			snprintf(cmd, sizeof cmd, "unset XAUTHORITY && HOME=\"%.200s\" %s -q -",
>+                     		s->pw->pw_dir, options.xauth_location);
>+            		f = popen(cmd, "w");
>+			if (f) {
>+				fprintf(f, "remove %s\n", s->auth_display);
>+				pclose(f);
>+			} else
>+				error("Could not run %s\n", cmd);
>+			exit(0);
>+		} else if (pid > 0) {
>+			int status;
>+
>+			waitpid(pid, &status, 0);
>+		}
>+	}
>+
>+        
> 	if (s->ttyfd != -1)
> 		session_pty_cleanup(s);
> 	if (s->term)

Actions: View | Diff

Attachments on bug 1401: 1395