diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | session.c | 11 |
2 files changed, 13 insertions, 3 deletions
@@ -5,6 +5,9 @@ | |||
5 | [dispatch.c] | 5 | [dispatch.c] |
6 | we support rekeying | 6 | we support rekeying |
7 | protocol errors are fatal. | 7 | protocol errors are fatal. |
8 | - markus@cvs.openbsd.org 2001/06/11 10:18:24 | ||
9 | [session.c] | ||
10 | reset pointer to NULL after xfree(); report from solar@openwall.com | ||
8 | 11 | ||
9 | 20010611 | 12 | 20010611 |
10 | - (bal) NeXT/MacOS X lack libgen.h and dirname(). Patch by Mark Miller | 13 | - (bal) NeXT/MacOS X lack libgen.h and dirname(). Patch by Mark Miller |
@@ -5610,4 +5613,4 @@ | |||
5610 | - Wrote replacements for strlcpy and mkdtemp | 5613 | - Wrote replacements for strlcpy and mkdtemp |
5611 | - Released 1.0pre1 | 5614 | - Released 1.0pre1 |
5612 | 5615 | ||
5613 | $Id: ChangeLog,v 1.1278 2001/06/12 00:15:57 mouring Exp $ | 5616 | $Id: ChangeLog,v 1.1279 2001/06/12 00:21:34 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.83 2001/06/07 22:25:02 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.84 2001/06/11 10:18:24 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -364,6 +364,8 @@ do_authenticated1(Authctxt *authctxt) | |||
364 | if (!success) { | 364 | if (!success) { |
365 | xfree(s->auth_proto); | 365 | xfree(s->auth_proto); |
366 | xfree(s->auth_data); | 366 | xfree(s->auth_data); |
367 | s->auth_proto = NULL; | ||
368 | s->auth_data = NULL; | ||
367 | } | 369 | } |
368 | break; | 370 | break; |
369 | 371 | ||
@@ -1047,7 +1049,7 @@ do_child(Session *s, const char *command) | |||
1047 | extern char **environ; | 1049 | extern char **environ; |
1048 | struct stat st; | 1050 | struct stat st; |
1049 | char *argv[10]; | 1051 | char *argv[10]; |
1050 | int do_xauth = s->auth_proto != NULL && s->auth_data != NULL; | 1052 | int do_xauth; |
1051 | #ifdef WITH_IRIX_PROJECT | 1053 | #ifdef WITH_IRIX_PROJECT |
1052 | prid_t projid; | 1054 | prid_t projid; |
1053 | #endif /* WITH_IRIX_PROJECT */ | 1055 | #endif /* WITH_IRIX_PROJECT */ |
@@ -1059,6 +1061,9 @@ do_child(Session *s, const char *command) | |||
1059 | #endif /* WITH_IRIX_ARRAY */ | 1061 | #endif /* WITH_IRIX_ARRAY */ |
1060 | #endif /* WITH_IRIX_JOBS */ | 1062 | #endif /* WITH_IRIX_JOBS */ |
1061 | 1063 | ||
1064 | do_xauth = | ||
1065 | s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL; | ||
1066 | |||
1062 | /* remove hostkey from the child's memory */ | 1067 | /* remove hostkey from the child's memory */ |
1063 | destroy_sensitive_data(); | 1068 | destroy_sensitive_data(); |
1064 | 1069 | ||
@@ -1731,6 +1736,8 @@ session_x11_req(Session *s) | |||
1731 | if (!success) { | 1736 | if (!success) { |
1732 | xfree(s->auth_proto); | 1737 | xfree(s->auth_proto); |
1733 | xfree(s->auth_data); | 1738 | xfree(s->auth_data); |
1739 | s->auth_proto = NULL; | ||
1740 | s->auth_data = NULL; | ||
1734 | } | 1741 | } |
1735 | return success; | 1742 | return success; |
1736 | } | 1743 | } |