2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c9fec8bf9..686c76904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20081105
+ - OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2008/11/03 08:59:41
+     [servconf.c]
+     include MaxSessions in sshd -T output; patch from imorgan AT nas.nasa.gov
+
 20081103
  - OpenBSD CVS Sync
    - sthen@cvs.openbsd.org 2008/07/24 23:55:30
@@ -4847,4 +4853,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.5127 2008/11/03 09:18:12 djm Exp $
+$Id: ChangeLog,v 1.5128 2008/11/05 05:12:11 djm Exp $
diff --git a/servconf.c b/servconf.c
index 547f757a0..f2d414334 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.188 2008/10/09 03:50:54 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.189 2008/11/03 08:59:41 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1553,6 +1553,7 @@ dump_config(ServerOptions *o)
         dump_cfg_int(sKeyRegenerationTime, o->key_regeneration_time);
         dump_cfg_int(sX11DisplayOffset, o->x11_display_offset);
         dump_cfg_int(sMaxAuthTries, o->max_authtries);
+        dump_cfg_int(sMaxSessions, o->max_sessions);
         dump_cfg_int(sClientAliveInterval, o->client_alive_interval);
         dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);