- markus@cvs.openbsd.org 2001/06/07 22:25:02

     [session.c]
     don't overwrite errno
     delay deletion of the xauth cookie

diff --git a/ChangeLog b/ChangeLog
index e79bf3939b41d2e6b8228b7f6b5f6aecc0cdf1f2..6b361360b0657927f15b2dc4a1512450e363002b 100644 (file)
--- 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 

diff --git a/session.c b/session.c
index a29546d2fc38e81b2b66661dfe1aa92330823692..9f472a22b11ac8a04d3fa32deed18ac586a3baab 100644 (file)
--- 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;