diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-01-06 03:45:41 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-01-30 11:05:18 +1100 |
commit | 13bd2e2d622d01dc85d22b94520a5b243d006049 (patch) | |
tree | d6f0eb108feb4a9bc6eab12789ce2d2531480cd2 | |
parent | f89b928534c9e77f608806a217d39a2960cc7fd0 (diff) |
upstream commit
sshd_config is documented to set
GSSAPIStrictAcceptorCheck=yes by default, so actually make it do this.
bz#2637 ok dtucker
Upstream-ID: 99ef8ac51f17f0f7aec166cb2e34228d4d72a665
-rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index 795ddbab7..c9105a592 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.301 2016/11/30 03:00:05 djm Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.302 2017/01/06 03:45:41 djm Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -270,7 +270,7 @@ fill_default_server_options(ServerOptions *options) | |||
270 | if (options->gss_cleanup_creds == -1) | 270 | if (options->gss_cleanup_creds == -1) |
271 | options->gss_cleanup_creds = 1; | 271 | options->gss_cleanup_creds = 1; |
272 | if (options->gss_strict_acceptor == -1) | 272 | if (options->gss_strict_acceptor == -1) |
273 | options->gss_strict_acceptor = 0; | 273 | options->gss_strict_acceptor = 1; |
274 | if (options->password_authentication == -1) | 274 | if (options->password_authentication == -1) |
275 | options->password_authentication = 1; | 275 | options->password_authentication = 1; |
276 | if (options->kbd_interactive_authentication == -1) | 276 | if (options->kbd_interactive_authentication == -1) |