summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2015-03-31 22:55:24 +0000
committerdjm <djm@openbsd.org>2015-03-31 22:55:24 +0000
commit4f06c5d1f2d76b4edffaa6c8f9baa5573156d2e5 (patch)
treecc2cf92c4533b2f4464901b80f960fce850fa4d9
parentboth rpe and zhuk pointed out some problems with my if/elf template. (diff)
downloadwireguard-openbsd-4f06c5d1f2d76b4edffaa6c8f9baa5573156d2e5.tar.xz
wireguard-openbsd-4f06c5d1f2d76b4edffaa6c8f9baa5573156d2e5.zip
don't fatal when a !ssh1 sshd is reexeced from a w/ssh1 listener;
reported by miod@; ok miod@ markus@
-rw-r--r--usr.bin/ssh/sshd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index a7a183a6e93..b30b74bcd56 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.444 2015/02/20 22:17:21 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.445 2015/03/31 22:55:24 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1050,8 +1050,6 @@ recv_rexec_state(int fd, Buffer *conf)
sensitive_data.server_key->rsa) != 0)
fatal("%s: rsa_generate_additional_parameters "
"error", __func__);
-#else
- fatal("ssh1 not supported");
#endif
}
buffer_free(&m);