diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-03-31 22:55:24 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-01 10:00:45 +1100 |
commit | c9a0805a6280681901c270755a7cd630d7c5280e (patch) | |
tree | ffa25da4c7c48ec27436c0bcd7530957b7c6287c | |
parent | 704d8c88988cae38fb755a6243b119731d223222 (diff) |
upstream commit
don't fatal when a !ssh1 sshd is reexeced from a w/ssh1
listener; reported by miod@; ok miod@ markus@
-rw-r--r-- | sshd.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.444 2015/02/20 22:17:21 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.445 2015/03/31 22:55:24 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1092,8 +1092,6 @@ recv_rexec_state(int fd, Buffer *conf) | |||
1092 | sensitive_data.server_key->rsa) != 0) | 1092 | sensitive_data.server_key->rsa) != 0) |
1093 | fatal("%s: rsa_generate_additional_parameters " | 1093 | fatal("%s: rsa_generate_additional_parameters " |
1094 | "error", __func__); | 1094 | "error", __func__); |
1095 | #else | ||
1096 | fatal("ssh1 not supported"); | ||
1097 | #endif | 1095 | #endif |
1098 | } | 1096 | } |
1099 | 1097 | ||