summaryrefslogtreecommitdiff
path: root/ssh_api.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
committerColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
commit62f54f20bf351468e0124f63cc2902ee40d9b0e9 (patch)
tree3e090f2711b94ca5029d3fa3e8047b1ed1448b1f /ssh_api.c
parent6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874 (diff)
parent66bf74a92131b7effe49fb0eefe5225151869dc5 (diff)
Import openssh_7.6p1.orig.tar.gz
Diffstat (limited to 'ssh_api.c')
-rw-r--r--ssh_api.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ssh_api.c b/ssh_api.c
index 2a9f1497c..c84b4e713 100644
--- a/ssh_api.c
+++ b/ssh_api.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh_api.c,v 1.7 2016/05/04 14:22:33 markus Exp $ */ 1/* $OpenBSD: ssh_api.c,v 1.8 2017/04/30 23:13:25 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2012 Markus Friedl. All rights reserved. 3 * Copyright (c) 2012 Markus Friedl. All rights reserved.
4 * 4 *
@@ -371,7 +371,6 @@ _ssh_read_banner(struct ssh *ssh, char **bannerp)
371 } 371 }
372 if (remote_major != 2) 372 if (remote_major != 2)
373 return SSH_ERR_PROTOCOL_MISMATCH; 373 return SSH_ERR_PROTOCOL_MISMATCH;
374 enable_compat20();
375 chop(buf); 374 chop(buf);
376 debug("Remote version string %.100s", buf); 375 debug("Remote version string %.100s", buf);
377 if ((*bannerp = strdup(buf)) == NULL) 376 if ((*bannerp = strdup(buf)) == NULL)