summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--servconf.c3
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 @@
120081105
2 - OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2008/11/03 08:59:41
4 [servconf.c]
5 include MaxSessions in sshd -T output; patch from imorgan AT nas.nasa.gov
6
120081103 720081103
2 - OpenBSD CVS Sync 8 - OpenBSD CVS Sync
3 - sthen@cvs.openbsd.org 2008/07/24 23:55:30 9 - sthen@cvs.openbsd.org 2008/07/24 23:55:30
@@ -4847,4 +4853,4 @@
4847 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4853 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4848 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4854 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4849 4855
4850$Id: ChangeLog,v 1.5127 2008/11/03 09:18:12 djm Exp $ 4856$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 @@
1/* $OpenBSD: servconf.c,v 1.188 2008/10/09 03:50:54 djm Exp $ */ 1/* $OpenBSD: servconf.c,v 1.189 2008/11/03 08:59:41 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -1553,6 +1553,7 @@ dump_config(ServerOptions *o)
1553 dump_cfg_int(sKeyRegenerationTime, o->key_regeneration_time); 1553 dump_cfg_int(sKeyRegenerationTime, o->key_regeneration_time);
1554 dump_cfg_int(sX11DisplayOffset, o->x11_display_offset); 1554 dump_cfg_int(sX11DisplayOffset, o->x11_display_offset);
1555 dump_cfg_int(sMaxAuthTries, o->max_authtries); 1555 dump_cfg_int(sMaxAuthTries, o->max_authtries);
1556 dump_cfg_int(sMaxSessions, o->max_sessions);
1556 dump_cfg_int(sClientAliveInterval, o->client_alive_interval); 1557 dump_cfg_int(sClientAliveInterval, o->client_alive_interval);
1557 dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max); 1558 dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);
1558 1559