diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | session.c | 6 |
2 files changed, 13 insertions, 3 deletions
@@ -1,4 +1,10 @@ | |||
1 | 20040118 | 1 | 20050120 |
2 | - (dtucker) OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2004/12/23 17:35:48 | ||
4 | [session.c] | ||
5 | check for NULL; from mpech | ||
6 | |||
7 | 20050118 | ||
2 | - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement | 8 | - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement |
3 | "make survey" and "make send-survey". This will provide data on the | 9 | "make survey" and "make send-survey". This will provide data on the |
4 | configure parameters, platform and platform features to the development | 10 | configure parameters, platform and platform features to the development |
@@ -1969,4 +1975,4 @@ | |||
1969 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1975 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1970 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1976 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1971 | 1977 | ||
1972 | $Id: ChangeLog,v 1.3608 2005/01/18 01:45:42 dtucker Exp $ | 1978 | $Id: ChangeLog,v 1.3609 2005/01/19 23:55:46 dtucker Exp $ |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.180 2004/07/28 09:40:29 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.181 2004/12/23 17:35:48 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -245,6 +245,10 @@ do_authenticated1(Authctxt *authctxt) | |||
245 | u_int proto_len, data_len, dlen, compression_level = 0; | 245 | u_int proto_len, data_len, dlen, compression_level = 0; |
246 | 246 | ||
247 | s = session_new(); | 247 | s = session_new(); |
248 | if (s == NULL) { | ||
249 | error("no more sessions"); | ||
250 | return; | ||
251 | } | ||
248 | s->authctxt = authctxt; | 252 | s->authctxt = authctxt; |
249 | s->pw = authctxt->pw; | 253 | s->pw = authctxt->pw; |
250 | 254 | ||