diff options
author | Damien Miller <djm@mindrot.org> | 2014-02-27 10:20:07 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-02-27 10:20:07 +1100 |
commit | fb3423b612713d9cde67c8a75f6f51188d6a3de3 (patch) | |
tree | abb792a7266ad3a51a5894d48b5a2f76461a62a3 | |
parent | 1348129a34f0f7728c34d86c100a32dcc8d1f922 (diff) |
- markus@cvs.openbsd.org 2014/02/26 21:53:37
[sshd.c]
ssh_gssapi_prepare_supported_oids needs GSSAPI
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sshd.c | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -13,6 +13,9 @@ [channels.c] don't assume that the socks4 username is \0 terminated; spotted by Ben Hawkes; ok markus@ + - markus@cvs.openbsd.org 2014/02/26 21:53:37 + [sshd.c] + ssh_gssapi_prepare_supported_oids needs GSSAPI 20140224 - OpenBSD CVS Sync @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.419 2014/02/26 20:28:44 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.420 2014/02/26 21:53:37 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -618,9 +618,11 @@ privsep_preauth_child(void) /* Enable challenge-response authentication for privilege separation */ privsep_challenge_enable(); +#ifdef GSSAPI /* Cache supported mechanism OIDs for later use */ if (options.gss_authentication) ssh_gssapi_prepare_supported_oids(); +#endif arc4random_stir(); arc4random_buf(rnd, sizeof(rnd)); |