RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-03-11 09:17:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2011/05/20 02:00:19

Browse Source 
[servconf.c]
     Add comment documenting what should be after the preauth check.  ok djm
This commit is contained in:
Damien Miller 2011-05-20 19:03:49 +10:00
parent 5d74e58e62
commit c2411909c7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20,6 +20,9 @@
the options TrustedUserCAKeys, RevokedKeysFile, AuthorizedKeysFile the options TrustedUserCAKeys, RevokedKeysFile, AuthorizedKeysFile
and AuthorizedPrincipalsFile were not being correctly applied in and AuthorizedPrincipalsFile were not being correctly applied in
Match blocks, despite being overridable there; ok dtucker@ Match blocks, despite being overridable there; ok dtucker@
- dtucker@cvs.openbsd.org 2011/05/20 02:00:19
[servconf.c]
Add comment documenting what should be after the preauth check. ok djm
20110515 20110515
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

6
servconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: servconf.c,v 1.216 2011/05/20 00:55:02 djm Exp $ */ /* $OpenBSD: servconf.c,v 1.217 2011/05/20 02:00:19 dtucker Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1505,6 +1505,10 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth)
M_CP_STROPT(authorized_keys_file); M_CP_STROPT(authorized_keys_file);
M_CP_STROPT(authorized_principals_file); M_CP_STROPT(authorized_principals_file);
/*
* The only things that should be below this point are string options
* which are only used after authentication.
*/
if (preauth) if (preauth)
return; return;
M_CP_STROPT(adm_forced_command); M_CP_STROPT(adm_forced_command);