summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-05-19 14:58:22 +1000
committerDamien Miller <djm@mindrot.org>2008-05-19 14:58:22 +1000
commitba3a6599a2c1f2547747653608c6235bb8f252e4 (patch)
tree9a6b0ea60ba876b2d58a2dd2c1ae88ea97b46844
parent4f755cdc05f5c6dee7cb1894f8d3bcaee33443d0 (diff)
downloadopenssh-git-ba3a6599a2c1f2547747653608c6235bb8f252e4.tar.gz
- pyr@cvs.openbsd.org 2008/05/07 06:43:35
[sshd_config] push the sshd_config bits in, spotted by ajacoutot@
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ee0b0e5..01274c69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,9 @@
unless users are also denied shell access, as they can always install
their own forwarders.''
ok djm@, ok and a mild frown markus@
+ - pyr@cvs.openbsd.org 2008/05/07 06:43:35
+ [sshd_config]
+ push the sshd_config bits in, spotted by ajacoutot@
20080403
- (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
@@ -3912,4 +3915,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4916 2008/05/19 04:57:41 djm Exp $
+$Id: ChangeLog,v 1.4917 2008/05/19 04:58:22 djm Exp $
diff --git a/sshd_config b/sshd_config
index ddfbbe91..1f97a9dc 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
-# $OpenBSD: sshd_config,v 1.77 2008/02/08 23:24:07 djm Exp $
+# $OpenBSD: sshd_config,v 1.78 2008/05/07 06:43:35 pyr Exp $
# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.
@@ -84,6 +84,7 @@ Protocol 2
# and ChallengeResponseAuthentication to 'no'.
#UsePAM no
+#AllowAgentForwarding yes
#AllowTcpForwarding yes
#GatewayPorts no
#X11Forwarding no