From 4d3f22769985191bd9e79c557714c5eda971b652 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Sat, 9 Jun 2001 01:44:07 +0000 Subject: - markus@cvs.openbsd.org 2001/06/07 22:25:02 [session.c] don't overwrite errno delay deletion of the xauth cookie --- ChangeLog | 6 +++++- session.c | 8 ++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b343a6d91..e956d8e5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,10 @@ [authfd.c authfile.c channels.c kexdh.c kexgex.c packet.c ssh.c sshconnect.c sshconnect1.c] use xxx_put_cstring() + - markus@cvs.openbsd.org 2001/06/07 22:25:02 + [session.c] + don't overwrite errno + delay deletion of the xauth cookie 20010606 - OpenBSD CVS Sync - markus@cvs.openbsd.org 2001/05/17 21:34:15 @@ -5580,4 +5584,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1267 2001/06/09 01:42:01 mouring Exp $ +$Id: ChangeLog,v 1.1268 2001/06/09 01:44:07 mouring Exp $ diff --git a/session.c b/session.c index a29546d2f..9f472a22b 100644 --- a/session.c +++ b/session.c @@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.82 2001/06/05 16:46:19 markus Exp $"); +RCSID("$OpenBSD: session.c,v 1.83 2001/06/07 22:25:02 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -1950,10 +1950,6 @@ session_free(Session *s) void session_close(Session *s) { - if (s->display) { - xauthfile_cleanup_proc(s->pw); - fatal_remove_cleanup(xauthfile_cleanup_proc, s->pw); - } session_pty_cleanup(s); session_free(s); session_proctitle(s); @@ -2055,9 +2051,9 @@ session_setup_x11fwd(Session *s) strlcpy(xauthfile, "/tmp/ssh-XXXXXXXX", MAXPATHLEN); temporarily_use_uid(s->pw); if (mkdtemp(xauthfile) == NULL) { - restore_uid(); error("private X11 dir: mkdtemp %s failed: %s", xauthfile, strerror(errno)); + restore_uid(); xfree(xauthfile); xauthfile = NULL; return 0; -- cgit v1.2.3