summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sshd_config2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f963980f..ee7c6690 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,12 @@
ok djm
ID SYNC ONLY for portable; we don't trust other arc4random implementations
to do this right.
+ - 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
20130828
- (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the
diff --git a/sshd_config b/sshd_config
index b786361d..8d8eeea3 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
-# $OpenBSD: sshd_config,v 1.90 2013/05/16 04:09:14 dtucker Exp $
+# $OpenBSD: sshd_config,v 1.91 2013/09/07 13:53:11 sthen Exp $
# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.