summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/servconf.c b/servconf.c
index e7fc2a781..b51b86a8f 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
@@ -343,7 +343,7 @@ static struct {
343 { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL }, 343 { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL },
344 { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL }, 344 { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },
345 { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL }, 345 { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
346 { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */ 346 { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */
347#ifdef KRB5 347#ifdef KRB5
348 { "kerberosauthentication", sKerberosAuthentication, SSHCFG_ALL }, 348 { "kerberosauthentication", sKerberosAuthentication, SSHCFG_ALL },
349 { "kerberosorlocalpasswd", sKerberosOrLocalPasswd, SSHCFG_GLOBAL }, 349 { "kerberosorlocalpasswd", sKerberosOrLocalPasswd, SSHCFG_GLOBAL },
@@ -417,10 +417,10 @@ static struct {
417 { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL }, 417 { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
418 { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL }, 418 { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },
419 { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL }, 419 { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },
420 { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL }, 420 { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
421 { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL }, 421 { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
422 { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL }, 422 { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },
423 { "match", sMatch, SSHCFG_ALL }, 423 { "match", sMatch, SSHCFG_ALL },
424 { "permitopen", sPermitOpen, SSHCFG_ALL }, 424 { "permitopen", sPermitOpen, SSHCFG_ALL },
425 { "forcecommand", sForceCommand, SSHCFG_ALL }, 425 { "forcecommand", sForceCommand, SSHCFG_ALL },
426 { "chrootdirectory", sChrootDirectory, SSHCFG_ALL }, 426 { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
@@ -1376,7 +1376,7 @@ parse_server_match_config(ServerOptions *options, const char *user,
1376/* 1376/*
1377 * Copy any supported values that are set. 1377 * Copy any supported values that are set.
1378 * 1378 *
1379 * If the preauth flag is set, we do not bother copying the the string or 1379 * If the preauth flag is set, we do not bother copying the string or
1380 * array values that are not used pre-authentication, because any that we 1380 * array values that are not used pre-authentication, because any that we
1381 * do use must be explictly sent in mm_getpwnamallow(). 1381 * do use must be explictly sent in mm_getpwnamallow().
1382 */ 1382 */