summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-01-23 05:27:21 +0000
committerDamien Miller <djm@mindrot.org>2018-01-23 16:40:29 +1100
commit14b5c635d1190633b23ac3372379517fb645b0c2 (patch)
tree8ef70b4660b04ba6add4c314d52f84375cb16788 /auth2.c
parent7c77991f5de5d8475cbeb7cbb06d0c7d1611d7bb (diff)
upstream commit
Drop compatibility hacks for some ancient SSH implementations, including ssh.com <=2.* and OpenSSH <= 3.*. These versions were all released in or before 2001 and predate the final SSH RFCs. The hacks in question aren't necessary for RFC- compliant SSH implementations. ok markus@ OpenBSD-Commit-ID: 4be81c67db57647f907f4e881fb9341448606138
Diffstat (limited to 'auth2.c')
-rw-r--r--auth2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth2.c b/auth2.c
index 862e09960..4f5b481c9 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.143 2017/06/24 06:34:38 djm Exp $ */ 1/* $OpenBSD: auth2.c,v 1.144 2018/01/23 05:27:21 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -153,7 +153,7 @@ userauth_banner(void)
153{ 153{
154 char *banner = NULL; 154 char *banner = NULL;
155 155
156 if (options.banner == NULL || (datafellows & SSH_BUG_BANNER) != 0) 156 if (options.banner == NULL)
157 return; 157 return;
158 158
159 if ((banner = PRIVSEP(auth2_read_banner())) == NULL) 159 if ((banner = PRIVSEP(auth2_read_banner())) == NULL)