diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | session.c | 8 |
2 files changed, 7 insertions, 7 deletions
@@ -70,6 +70,10 @@ | |||
70 | [authfd.c authfile.c channels.c kexdh.c kexgex.c packet.c ssh.c | 70 | [authfd.c authfile.c channels.c kexdh.c kexgex.c packet.c ssh.c |
71 | sshconnect.c sshconnect1.c] | 71 | sshconnect.c sshconnect1.c] |
72 | use xxx_put_cstring() | 72 | use xxx_put_cstring() |
73 | - markus@cvs.openbsd.org 2001/06/07 22:25:02 | ||
74 | [session.c] | ||
75 | don't overwrite errno | ||
76 | delay deletion of the xauth cookie | ||
73 | 20010606 | 77 | 20010606 |
74 | - OpenBSD CVS Sync | 78 | - OpenBSD CVS Sync |
75 | - markus@cvs.openbsd.org 2001/05/17 21:34:15 | 79 | - markus@cvs.openbsd.org 2001/05/17 21:34:15 |
@@ -5580,4 +5584,4 @@ | |||
5580 | - Wrote replacements for strlcpy and mkdtemp | 5584 | - Wrote replacements for strlcpy and mkdtemp |
5581 | - Released 1.0pre1 | 5585 | - Released 1.0pre1 |
5582 | 5586 | ||
5583 | $Id: ChangeLog,v 1.1267 2001/06/09 01:42:01 mouring Exp $ | 5587 | $Id: ChangeLog,v 1.1268 2001/06/09 01:44:07 mouring Exp $ |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.82 2001/06/05 16:46:19 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.83 2001/06/07 22:25:02 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1950,10 +1950,6 @@ session_free(Session *s) | |||
1950 | void | 1950 | void |
1951 | session_close(Session *s) | 1951 | session_close(Session *s) |
1952 | { | 1952 | { |
1953 | if (s->display) { | ||
1954 | xauthfile_cleanup_proc(s->pw); | ||
1955 | fatal_remove_cleanup(xauthfile_cleanup_proc, s->pw); | ||
1956 | } | ||
1957 | session_pty_cleanup(s); | 1953 | session_pty_cleanup(s); |
1958 | session_free(s); | 1954 | session_free(s); |
1959 | session_proctitle(s); | 1955 | session_proctitle(s); |
@@ -2055,9 +2051,9 @@ session_setup_x11fwd(Session *s) | |||
2055 | strlcpy(xauthfile, "/tmp/ssh-XXXXXXXX", MAXPATHLEN); | 2051 | strlcpy(xauthfile, "/tmp/ssh-XXXXXXXX", MAXPATHLEN); |
2056 | temporarily_use_uid(s->pw); | 2052 | temporarily_use_uid(s->pw); |
2057 | if (mkdtemp(xauthfile) == NULL) { | 2053 | if (mkdtemp(xauthfile) == NULL) { |
2058 | restore_uid(); | ||
2059 | error("private X11 dir: mkdtemp %s failed: %s", | 2054 | error("private X11 dir: mkdtemp %s failed: %s", |
2060 | xauthfile, strerror(errno)); | 2055 | xauthfile, strerror(errno)); |
2056 | restore_uid(); | ||
2061 | xfree(xauthfile); | 2057 | xfree(xauthfile); |
2062 | xauthfile = NULL; | 2058 | xauthfile = NULL; |
2063 | return 0; | 2059 | return 0; |