diff options
author | Damien Miller <djm@mindrot.org> | 2013-09-14 09:48:55 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-09-14 09:48:55 +1000 |
commit | ff9d6c2a4171ee32e8fe28fc3b86eb33bd5c845b (patch) | |
tree | 8ae2cff84ee188556739efaaa02c64d9e324ab5f | |
parent | 8bab5e7b5ff6721d926b5ebf05a3a24489889c58 (diff) |
- sthen@cvs.openbsd.org 2013/09/07 13:53:11
[sshd_config]
Remove commented-out kerberos/gssapi config options from sample config,
kerberos support is currently not enabled in ssh in OpenBSD. Discussed with
various people; ok deraadt@
ID SYNC ONLY for portable; kerberos/gssapi is still pretty popular
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshd_config | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -22,6 +22,12 @@ | |||
22 | ok djm | 22 | ok djm |
23 | ID SYNC ONLY for portable; we don't trust other arc4random implementations | 23 | ID SYNC ONLY for portable; we don't trust other arc4random implementations |
24 | to do this right. | 24 | to do this right. |
25 | - sthen@cvs.openbsd.org 2013/09/07 13:53:11 | ||
26 | [sshd_config] | ||
27 | Remove commented-out kerberos/gssapi config options from sample config, | ||
28 | kerberos support is currently not enabled in ssh in OpenBSD. Discussed with | ||
29 | various people; ok deraadt@ | ||
30 | ID SYNC ONLY for portable; kerberos/gssapi is still pretty popular | ||
25 | 31 | ||
26 | 20130828 | 32 | 20130828 |
27 | - (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the | 33 | - (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the |
diff --git a/sshd_config b/sshd_config index b786361d1..8d8eeea34 100644 --- a/sshd_config +++ b/sshd_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sshd_config,v 1.90 2013/05/16 04:09:14 dtucker Exp $ | 1 | # $OpenBSD: sshd_config,v 1.91 2013/09/07 13:53:11 sthen Exp $ |
2 | 2 | ||
3 | # This is the sshd server system-wide configuration file. See | 3 | # This is the sshd server system-wide configuration file. See |
4 | # sshd_config(5) for more information. | 4 | # sshd_config(5) for more information. |