diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-04-22 16:16:54 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-04-22 16:16:54 +0000 |
| commit | 9a19272fe84f679368fb14885aa02799a2c1a3c1 (patch) | |
| tree | 6398ac847be122119eb56619e15be5105dab7e46 /usr.bin | |
| parent | 6f1cff608f644b6af0190408e0ebcbd26c2df007 (diff) | |
do not auto-enable KerberosAuthentication; ok djm@, provos@, deraadt@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/servconf.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.8 | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index bce496beaea..730da2e91fd 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: servconf.c,v 1.106 2002/04/20 09:02:03 deraadt Exp $"); +RCSID("$OpenBSD: servconf.c,v 1.107 2002/04/22 16:16:53 markus Exp $"); #if defined(KRB4) || defined(KRB5) #include <krb.h> @@ -181,7 +181,7 @@ fill_default_server_options(ServerOptions *options) options->pubkey_authentication = 1; #if defined(KRB4) || defined(KRB5) if (options->kerberos_authentication == -1) - options->kerberos_authentication = (access(KEYFILE, R_OK) == 0); + options->kerberos_authentication = 0; if (options->kerberos_or_local_passwd == -1) options->kerberos_or_local_passwd = 1; if (options->kerberos_ticket_cleanup == -1) diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8 index 3eb8b5edb28..cc2db8a3b02 100644 --- a/usr.bin/ssh/sshd.8 +++ b/usr.bin/ssh/sshd.8 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.177 2002/04/21 16:19:27 stevesk Exp $ +.\" $OpenBSD: sshd.8,v 1.178 2002/04/22 16:16:53 markus Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -571,7 +571,7 @@ the Kerberos KDC. To use this option, the server needs a Kerberos servtab which allows the verification of the KDC's identity. Default is -.Dq yes . +.Dq no . .It Cm KerberosOrLocalPasswd If set then if password authentication through Kerberos fails then the password will be validated via any additional local mechanism diff --git a/usr.bin/ssh/sshd_config b/usr.bin/ssh/sshd_config index 352e76ae5e2..07899995a69 100644 --- a/usr.bin/ssh/sshd_config +++ b/usr.bin/ssh/sshd_config @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.50 2002/04/21 16:19:27 stevesk Exp $ +# $OpenBSD: sshd_config,v 1.51 2002/04/22 16:16:53 markus Exp $ # This is the sshd server system-wide configuration file. See sshd(8) # for more information. @@ -58,8 +58,7 @@ #ChallengeResponseAuthentication yes # Kerberos options -# KerberosAuthentication automatically enabled if keyfile exists -#KerberosAuthentication yes +#KerberosAuthentication no #KerberosOrLocalPasswd yes #KerberosTicketCleanup yes |