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 /compat.c | |
| parent | d4084cd230f7319056559b00db8b99296dad49d5 (diff) | |
| download | openssh-git-56912dea6ef63dae4eb1194e5d88973a7c6c5740.tar.gz | |
upstream commit
unifdef WITH_SSH1 ok markus@
Upstream-ID: 9716e62a883ef8826c57f4d33b4a81a9cc7755c7
Diffstat (limited to 'compat.c')
| -rw-r--r-- | compat.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: compat.c,v 1.100 2017/02/03 23:01:19 djm Exp $ */ +/* $OpenBSD: compat.c,v 1.101 2017/04/30 23:10:43 djm Exp $ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * @@ -233,11 +233,6 @@ proto_spec(const char *spec) for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) { switch (atoi(p)) { case 1: -#ifdef WITH_SSH1 - if (ret == SSH_PROTO_UNKNOWN) - ret |= SSH_PROTO_1_PREFERRED; - ret |= SSH_PROTO_1; -#endif break; case 2: ret |= SSH_PROTO_2; |