summaryrefslogtreecommitdiff
path: root/ssh_api.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-04-30 23:13:25 +0000
committerDamien Miller <djm@mindrot.org>2017-05-01 09:42:37 +1000
commit97f4d3083b036ce3e68d6346a6140a22123d5864 (patch)
tree301c95453934721eca9855cd01b1d0da089e3246 /ssh_api.c
parent99f95ba82673d33215dce17bfa1512b57f54ec09 (diff)
upstream commit
remove compat20/compat13/compat15 variables ok markus@ Upstream-ID: 43802c035ceb3fef6c50c400e4ecabf12354691c
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)