diff options
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 dd5161ecd..da8c3d0a5 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 |
@@ -361,7 +361,7 @@ static struct { | |||
361 | { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL }, | 361 | { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL }, |
362 | { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL }, | 362 | { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL }, |
363 | { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL }, | 363 | { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL }, |
364 | { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */ | 364 | { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */ |
365 | #ifdef KRB5 | 365 | #ifdef KRB5 |
366 | { "kerberosauthentication", sKerberosAuthentication, SSHCFG_ALL }, | 366 | { "kerberosauthentication", sKerberosAuthentication, SSHCFG_ALL }, |
367 | { "kerberosorlocalpasswd", sKerberosOrLocalPasswd, SSHCFG_GLOBAL }, | 367 | { "kerberosorlocalpasswd", sKerberosOrLocalPasswd, SSHCFG_GLOBAL }, |
@@ -446,10 +446,10 @@ static struct { | |||
446 | { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL }, | 446 | { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL }, |
447 | { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL }, | 447 | { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL }, |
448 | { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL }, | 448 | { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL }, |
449 | { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL }, | 449 | { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL}, |
450 | { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL }, | 450 | { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL }, |
451 | { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL }, | 451 | { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL }, |
452 | { "match", sMatch, SSHCFG_ALL }, | 452 | { "match", sMatch, SSHCFG_ALL }, |
453 | { "permitopen", sPermitOpen, SSHCFG_ALL }, | 453 | { "permitopen", sPermitOpen, SSHCFG_ALL }, |
454 | { "forcecommand", sForceCommand, SSHCFG_ALL }, | 454 | { "forcecommand", sForceCommand, SSHCFG_ALL }, |
455 | { "chrootdirectory", sChrootDirectory, SSHCFG_ALL }, | 455 | { "chrootdirectory", sChrootDirectory, SSHCFG_ALL }, |
@@ -1426,7 +1426,7 @@ parse_server_match_config(ServerOptions *options, const char *user, | |||
1426 | /* | 1426 | /* |
1427 | * Copy any supported values that are set. | 1427 | * Copy any supported values that are set. |
1428 | * | 1428 | * |
1429 | * If the preauth flag is set, we do not bother copying the the string or | 1429 | * If the preauth flag is set, we do not bother copying the string or |
1430 | * array values that are not used pre-authentication, because any that we | 1430 | * array values that are not used pre-authentication, because any that we |
1431 | * do use must be explictly sent in mm_getpwnamallow(). | 1431 | * do use must be explictly sent in mm_getpwnamallow(). |
1432 | */ | 1432 | */ |