diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-04-30 23:10:43 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-01 09:37:40 +1000 |
commit | 56912dea6ef63dae4eb1194e5d88973a7c6c5740 (patch) | |
tree | c0425585449d257a90a42efce5f602f7ce16779f /sshconnect.c | |
parent | d4084cd230f7319056559b00db8b99296dad49d5 (diff) |
upstream commit
unifdef WITH_SSH1 ok markus@
Upstream-ID: 9716e62a883ef8826c57f4d33b4a81a9cc7755c7
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sshconnect.c b/sshconnect.c index 948b638ad..26ffbc802 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.273 2017/03/10 03:22:40 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.274 2017/04/30 23:10:43 djm 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 |
@@ -1382,12 +1382,7 @@ ssh_login(Sensitive *sensitive, const char *orighost, | |||
1382 | ssh_kex2(host, hostaddr, port); | 1382 | ssh_kex2(host, hostaddr, port); |
1383 | ssh_userauth2(local_user, server_user, host, sensitive); | 1383 | ssh_userauth2(local_user, server_user, host, sensitive); |
1384 | } else { | 1384 | } else { |
1385 | #ifdef WITH_SSH1 | ||
1386 | ssh_kex(host, hostaddr); | ||
1387 | ssh_userauth1(local_user, server_user, host, sensitive); | ||
1388 | #else | ||
1389 | fatal("ssh1 is not supported"); | 1385 | fatal("ssh1 is not supported"); |
1390 | #endif | ||
1391 | } | 1386 | } |
1392 | free(local_user); | 1387 | free(local_user); |
1393 | } | 1388 | } |