upstream commit

don't fatal when a !ssh1 sshd is reexeced from a w/ssh1
 listener; reported by miod@; ok miod@ markus@

diff --git a/sshd.c b/sshd.c
index e1c767c14a3a5692b4dea6b8b520847d2475eb83..6aa17fa654bac2f8f05e925b08d309d92efbed4d 100644 (file)
--- a/sshd.c
+++ b/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
@@ -1092,8 +1092,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
        }