diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
commit | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (patch) | |
tree | d12ff16d94cffc5d84dba0193eaaa616967c9c2c /servconf.c | |
parent | cadac134eda6ed97478afdc528a68dd33f31dbc5 (diff) | |
parent | 1e4cfeee6c17b02af09418c5afe4a4d71aaaf0c8 (diff) |
import openssh-5.3p1-gsskex-all-20100124.patch
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/servconf.c b/servconf.c index 68c44fc81..d9726c435 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.194 2009/01/22 10:02:34 djm Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.195 2009/04/14 21:10:54 jj Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -354,7 +354,7 @@ static struct { | |||
354 | { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL }, | 354 | { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL }, |
355 | { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL }, | 355 | { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL }, |
356 | { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL }, | 356 | { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL }, |
357 | { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */ | 357 | { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */ |
358 | #ifdef KRB5 | 358 | #ifdef KRB5 |
359 | { "kerberosauthentication", sKerberosAuthentication, SSHCFG_ALL }, | 359 | { "kerberosauthentication", sKerberosAuthentication, SSHCFG_ALL }, |
360 | { "kerberosorlocalpasswd", sKerberosOrLocalPasswd, SSHCFG_GLOBAL }, | 360 | { "kerberosorlocalpasswd", sKerberosOrLocalPasswd, SSHCFG_GLOBAL }, |
@@ -434,10 +434,10 @@ static struct { | |||
434 | { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL }, | 434 | { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL }, |
435 | { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL }, | 435 | { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL }, |
436 | { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL }, | 436 | { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL }, |
437 | { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL }, | 437 | { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL}, |
438 | { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL }, | 438 | { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL }, |
439 | { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL }, | 439 | { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL }, |
440 | { "match", sMatch, SSHCFG_ALL }, | 440 | { "match", sMatch, SSHCFG_ALL }, |
441 | { "permitopen", sPermitOpen, SSHCFG_ALL }, | 441 | { "permitopen", sPermitOpen, SSHCFG_ALL }, |
442 | { "forcecommand", sForceCommand, SSHCFG_ALL }, | 442 | { "forcecommand", sForceCommand, SSHCFG_ALL }, |
443 | { "chrootdirectory", sChrootDirectory, SSHCFG_ALL }, | 443 | { "chrootdirectory", sChrootDirectory, SSHCFG_ALL }, |
@@ -1405,7 +1405,7 @@ parse_server_match_config(ServerOptions *options, const char *user, | |||
1405 | /* | 1405 | /* |
1406 | * Copy any supported values that are set. | 1406 | * Copy any supported values that are set. |
1407 | * | 1407 | * |
1408 | * If the preauth flag is set, we do not bother copying the the string or | 1408 | * If the preauth flag is set, we do not bother copying the string or |
1409 | * array values that are not used pre-authentication, because any that we | 1409 | * array values that are not used pre-authentication, because any that we |
1410 | * do use must be explictly sent in mm_getpwnamallow(). | 1410 | * do use must be explictly sent in mm_getpwnamallow(). |
1411 | */ | 1411 | */ |