tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 01:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2014/02/26 21:53:37

Browse Source 
[sshd.c]
     ssh_gssapi_prepare_supported_oids needs GSSAPI
This commit is contained in:
Damien Miller 2014-02-27 10:20:07 +11:00
parent 1348129a34
commit fb3423b612
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -13,6 +13,9 @@
[channels.c] [channels.c]
don't assume that the socks4 username is \0 terminated; don't assume that the socks4 username is \0 terminated;
spotted by Ben Hawkes; ok markus@ 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 20140224
- OpenBSD CVS Sync - OpenBSD CVS Sync

4
sshd.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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 */ /* Enable challenge-response authentication for privilege separation */
privsep_challenge_enable(); privsep_challenge_enable();
#ifdef GSSAPI
/* Cache supported mechanism OIDs for later use */ /* Cache supported mechanism OIDs for later use */
if (options.gss_authentication) if (options.gss_authentication)
ssh_gssapi_prepare_supported_oids(); ssh_gssapi_prepare_supported_oids();
#endif
arc4random_stir(); arc4random_stir();
arc4random_buf(rnd, sizeof(rnd)); arc4random_buf(rnd, sizeof(rnd));