diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:03:12 +0100 |
commit | 30337f8b66c66af6b368d1e3c789e75f1247176c (patch) | |
tree | 17e0b8652fea31c04faa19ffc4cd088552ee473a /auth-rhosts.c | |
parent | aef2be11c5ea90bc66e774923e6570213e54c195 (diff) | |
parent | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff) |
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'auth-rhosts.c')
-rw-r--r-- | auth-rhosts.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/auth-rhosts.c b/auth-rhosts.c index 587f53721..3bcc73766 100644 --- a/auth-rhosts.c +++ b/auth-rhosts.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-rhosts.c,v 1.51 2019/10/02 00:42:30 djm Exp $ */ | 1 | /* $OpenBSD: auth-rhosts.c,v 1.52 2020/04/17 03:30:05 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 |
@@ -296,7 +296,9 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname, | |||
296 | * Check if we have been configured to ignore .rhosts | 296 | * Check if we have been configured to ignore .rhosts |
297 | * and .shosts files. | 297 | * and .shosts files. |
298 | */ | 298 | */ |
299 | if (options.ignore_rhosts) { | 299 | if (options.ignore_rhosts == IGNORE_RHOSTS_YES || |
300 | (options.ignore_rhosts == IGNORE_RHOSTS_SHOSTS && | ||
301 | strcmp(rhosts_files[rhosts_file_index], ".shosts") != 0)) { | ||
300 | auth_debug_add("Server has been configured to " | 302 | auth_debug_add("Server has been configured to " |
301 | "ignore %.100s.", rhosts_files[rhosts_file_index]); | 303 | "ignore %.100s.", rhosts_files[rhosts_file_index]); |
302 | continue; | 304 | continue; |