summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2020-07-03 10:10:17 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-07-15 15:06:44 +1000
commit8af4a743693ccbea3e15fc9e93edbeb610fa94f4 (patch)
tree4f28ce6a27dc66a01298bf0f13f8a155abe24801 /sshd.c
parent03da4c2b70468f04ed1c08518ea0a70e67232739 (diff)
upstream: don't exit the listener on send_rexec_state errors; ok
djm OpenBSD-Commit-ID: 57cbd757d130d3f45b7d41310b3a15eeec137d5c
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index 44cc3ac92..85229ac80 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.557 2020/06/18 23:34:19 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.558 2020/07/03 10:10:17 markus 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
@@ -965,7 +965,7 @@ send_rexec_state(int fd, struct sshbuf *conf)
965 rexec_send_rng_seed(m); 965 rexec_send_rng_seed(m);
966#endif 966#endif
967 if (ssh_msg_send(fd, 0, m) == -1) 967 if (ssh_msg_send(fd, 0, m) == -1)
968 fatal("%s: ssh_msg_send failed", __func__); 968 error("%s: ssh_msg_send failed", __func__);
969 969
970 sshbuf_free(m); 970 sshbuf_free(m);
971 sshbuf_free(inc); 971 sshbuf_free(inc);