summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-27 10:20:07 +1100
committerDamien Miller <djm@mindrot.org>2014-02-27 10:20:07 +1100
commitfb3423b612713d9cde67c8a75f6f51188d6a3de3 (patch)
treeabb792a7266ad3a51a5894d48b5a2f76461a62a3
parent1348129a34f0f7728c34d86c100a32dcc8d1f922 (diff)
- markus@cvs.openbsd.org 2014/02/26 21:53:37
[sshd.c] ssh_gssapi_prepare_supported_oids needs GSSAPI
-rw-r--r--ChangeLog3
-rw-r--r--sshd.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f37b7e5fd..7aa8a9f38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 [channels.c] 13 [channels.c]
14 don't assume that the socks4 username is \0 terminated; 14 don't assume that the socks4 username is \0 terminated;
15 spotted by Ben Hawkes; ok markus@ 15 spotted by Ben Hawkes; ok markus@
16 - markus@cvs.openbsd.org 2014/02/26 21:53:37
17 [sshd.c]
18 ssh_gssapi_prepare_supported_oids needs GSSAPI
16 19
1720140224 2020140224
18 - OpenBSD CVS Sync 21 - OpenBSD CVS Sync
diff --git a/sshd.c b/sshd.c
index 51d7078e4..7523de977 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.419 2014/02/26 20:28:44 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.420 2014/02/26 21:53:37 markus 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
@@ -618,9 +618,11 @@ privsep_preauth_child(void)
618 /* Enable challenge-response authentication for privilege separation */ 618 /* Enable challenge-response authentication for privilege separation */
619 privsep_challenge_enable(); 619 privsep_challenge_enable();
620 620
621#ifdef GSSAPI
621 /* Cache supported mechanism OIDs for later use */ 622 /* Cache supported mechanism OIDs for later use */
622 if (options.gss_authentication) 623 if (options.gss_authentication)
623 ssh_gssapi_prepare_supported_oids(); 624 ssh_gssapi_prepare_supported_oids();
625#endif
624 626
625 arc4random_stir(); 627 arc4random_stir();
626 arc4random_buf(rnd, sizeof(rnd)); 628 arc4random_buf(rnd, sizeof(rnd));