diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-06-07 22:25:03 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-06-07 22:25:03 +0000 |
| commit | 8f77676de4469d88c9bcbd505fb035a0dce52091 (patch) | |
| tree | 3cfa053d9bb3e973739b766c155eadcf423e7a40 | |
| parent | 37530f1fce2dc161622b9f5c597003f871496c9b (diff) | |
don't overwrite errno
delay deletion of the xauth cookie
| -rw-r--r-- | usr.bin/ssh/session.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index b68999db9f3..92ff0553dad 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/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" @@ -1568,10 +1568,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); @@ -1673,9 +1669,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; |