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)
- 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 8ee0b0e55..01274c697 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,9 @@
52 unless users are also denied shell access, as they can always install 52 unless users are also denied shell access, as they can always install
53 their own forwarders.'' 53 their own forwarders.''
54 ok djm@, ok and a mild frown markus@ 54 ok djm@, ok and a mild frown markus@
55 - pyr@cvs.openbsd.org 2008/05/07 06:43:35
56 [sshd_config]
57 push the sshd_config bits in, spotted by ajacoutot@
55 58
5620080403 5920080403
57 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile- 60 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
@@ -3912,4 +3915,4 @@
3912 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3915 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3913 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3916 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3914 3917
3915$Id: ChangeLog,v 1.4916 2008/05/19 04:57:41 djm Exp $ 3918$Id: ChangeLog,v 1.4917 2008/05/19 04:58:22 djm Exp $
diff --git a/sshd_config b/sshd_config
index ddfbbe91e..1f97a9dcc 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
1# $OpenBSD: sshd_config,v 1.77 2008/02/08 23:24:07 djm Exp $ 1# $OpenBSD: sshd_config,v 1.78 2008/05/07 06:43:35 pyr 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.
@@ -84,6 +84,7 @@ Protocol 2
84# and ChallengeResponseAuthentication to 'no'. 84# and ChallengeResponseAuthentication to 'no'.
85#UsePAM no 85#UsePAM no
86 86
87#AllowAgentForwarding yes
87#AllowTcpForwarding yes 88#AllowTcpForwarding yes
88#GatewayPorts no 89#GatewayPorts no
89#X11Forwarding no 90#X11Forwarding no