summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-06-07 10:19:24 +0100
committerColin Watson <cjwatson@debian.org>2020-06-07 11:03:12 +0100
commit30337f8b66c66af6b368d1e3c789e75f1247176c (patch)
tree17e0b8652fea31c04faa19ffc4cd088552ee473a /auth2.c
parentaef2be11c5ea90bc66e774923e6570213e54c195 (diff)
parent39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff)
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from https://github.com/openssh-gsskex/openssh-gsskex.
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 92a6bcaf4..05d6c2447 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.157 2019/09/06 04:53:27 djm Exp $ */ 1/* $OpenBSD: auth2.c,v 1.158 2020/03/06 18:16:21 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -219,7 +219,7 @@ input_service_request(int type, u_int32_t seq, struct ssh *ssh)
219 r = 0; 219 r = 0;
220 out: 220 out:
221 free(service); 221 free(service);
222 return 0; 222 return r;
223} 223}
224 224
225#define MIN_FAIL_DELAY_SECONDS 0.005 225#define MIN_FAIL_DELAY_SECONDS 0.005