summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2009-01-28 16:20:17 +1100
committerDamien Miller <djm@mindrot.org>2009-01-28 16:20:17 +1100
commit17819015f0debf7dc6a4e908b6e830ff105e4685 (patch)
treed9342eb81646f503a93f4645186c067df5791da9
parenta70ac76a87a7e45488fbc4cdc0d538b4c8483078 (diff)
- okan@cvs.openbsd.org 2008/12/30 00:46:56
[sshd_config.5] add AllowAgentForwarding to available Match keywords list ok djm
-rw-r--r--ChangeLog6
-rw-r--r--sshd_config.55
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index dee0e703a..0abbd02eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,10 @@
27 - stevesk@cvs.openbsd.org 2008/12/29 02:23:26 27 - stevesk@cvs.openbsd.org 2008/12/29 02:23:26
28 [pathnames.h] 28 [pathnames.h]
29 no need to escape single quotes in comments 29 no need to escape single quotes in comments
30 - okan@cvs.openbsd.org 2008/12/30 00:46:56
31 [sshd_config.5]
32 add AllowAgentForwarding to available Match keywords list
33 ok djm
30 34
3120090107 3520090107
32 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. 36 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@@ -5036,5 +5040,5 @@
5036 OpenServer 6 and add osr5bigcrypt support so when someone migrates 5040 OpenServer 6 and add osr5bigcrypt support so when someone migrates
5037 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 5041 passwords between UnixWare and OpenServer they will still work. OK dtucker@
5038 5042
5039$Id: ChangeLog,v 1.5167 2009/01/28 05:19:52 djm Exp $ 5043$Id: ChangeLog,v 1.5168 2009/01/28 05:20:17 djm Exp $
5040 5044
diff --git a/sshd_config.5 b/sshd_config.5
index a4a4be6e5..1829b330d 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.98 2008/11/04 08:22:13 djm Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.99 2008/12/30 00:46:56 okan Exp $
38.Dd $Mdocdate: November 4 2008 $ 38.Dd $Mdocdate: December 30 2008 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -593,6 +593,7 @@ Only a subset of keywords may be used on the lines following a
593.Cm Match 593.Cm Match
594keyword. 594keyword.
595Available keywords are 595Available keywords are
596.Cm AllowAgentForwarding ,
596.Cm AllowTcpForwarding , 597.Cm AllowTcpForwarding ,
597.Cm Banner , 598.Cm Banner ,
598.Cm ChrootDirectory , 599.Cm ChrootDirectory ,