diff options
| author | des <des@FreeBSD.org> | 2004-10-28 16:11:31 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-10-28 16:11:31 +0000 |
| commit | a744ec13ade7d70128cd82393862d02c1f712f6a (patch) | |
| tree | 2b93d7eeb78a97c2cc9e93d61346f39150ed165f /crypto/openssh/sshd_config | |
| parent | ca12ec184bb7b4d1d0ff5dc213f5da06de091b8c (diff) | |
| download | FreeBSD-src-a744ec13ade7d70128cd82393862d02c1f712f6a.zip FreeBSD-src-a744ec13ade7d70128cd82393862d02c1f712f6a.tar.gz | |
Resolve conflicts
Diffstat (limited to 'crypto/openssh/sshd_config')
| -rw-r--r-- | crypto/openssh/sshd_config | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index 2f7c103..980da4b 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.68 2003/12/29 16:39:50 millert Exp $ +# $OpenBSD: sshd_config,v 1.69 2004/05/23 23:59:53 dtucker Exp $ # $FreeBSD$ # This is the sshd server system-wide configuration file. See @@ -14,7 +14,7 @@ # Note that some of FreeBSD's defaults differ from OpenBSD's, and # FreeBSD has a few additional options. -#VersionAddendum FreeBSD-20040419 +#VersionAddendum FreeBSD-20041028 #Port 22 #Protocol 2 @@ -40,6 +40,7 @@ #LoginGraceTime 2m #PermitRootLogin no #StrictModes yes +#MaxAuthTries 6 #RSAAuthentication yes #PubkeyAuthentication yes @@ -72,8 +73,14 @@ #GSSAPIAuthentication no #GSSAPICleanupCredentials yes -# Set this to 'no' to disable PAM authentication (via challenge-response) -# and session processing. +# Set this to 'no' to disable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication mechanism. +# Depending on your PAM configuration, this may bypass the setting of +# PasswordAuthentication, PermitEmptyPasswords, and +# "PermitRootLogin without-password". If you just want the PAM account and +# session checks to run without PAM authentication, then enable this but set +# ChallengeResponseAuthentication=no #UsePAM yes #AllowTcpForwarding yes |
