Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/external/bsd/openssh/dist CID 1293642: Check returns



details:   https://anonhg.NetBSD.org/src/rev/212793c90833
branches:  trunk
changeset: 807532:212793c90833
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Apr 13 17:50:31 2015 +0000

description:
CID 1293642: Check returns

diffstat:

 crypto/external/bsd/openssh/dist/serverloop.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 1e79668a183b -r 212793c90833 crypto/external/bsd/openssh/dist/serverloop.c
--- a/crypto/external/bsd/openssh/dist/serverloop.c     Mon Apr 13 17:45:19 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/serverloop.c     Mon Apr 13 17:50:31 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: serverloop.c,v 1.10 2015/04/03 23:58:19 christos Exp $ */
+/*     $NetBSD: serverloop.c,v 1.11 2015/04/13 17:50:31 christos Exp $ */
 /* $OpenBSD: serverloop.c,v 1.178 2015/02/20 22:17:21 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: serverloop.c,v 1.10 2015/04/03 23:58:19 christos Exp $");
+__RCSID("$NetBSD: serverloop.c,v 1.11 2015/04/13 17:50:31 christos Exp $");
 #include <sys/param.h> /* MIN MAX */
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -861,9 +861,12 @@
                if (!rekeying) {
                        channel_after_select(readset, writeset);
                        if (packet_need_rekeying()) {
+                               int r;
                                debug("need rekeying");
                                active_state->kex->done = 0;
-                               kex_send_kexinit(active_state);
+                                if ((r = kex_send_kexinit(active_state)) != 0)
+                                       logit("%s: kex_send_kexinit: %s",
+                                           __func__, ssh_err(r));
                        }
                }
                process_input(readset);



Home | Main Index | Thread Index | Old Index