From 75cfd02f7aafcf335bc4cc47a30136800f641453 Mon Sep 17 00:00:00 2001 From: Bryan Stansell Date: Wed, 10 Dec 2003 10:37:48 -0800 Subject: [PATCH] Imported from conserver-8.0.9.tar.gz --- CHANGES | 8 +++++++- conserver.cf/conserver.cf.man | 8 ++++++-- conserver.cf/conserver.passwd.man | 2 +- conserver.html | 8 ++++---- conserver/consent.c | 10 ++++++++-- conserver/conserver.man | 2 +- conserver/group.c | 10 ++++++++-- conserver/version.h | 4 ++-- console/console.man | 2 +- contrib/redhat-rpm/conserver.spec | 2 +- contrib/solaris-package/pkginfo | 2 +- 11 files changed, 40 insertions(+), 18 deletions(-) diff --git a/CHANGES b/CHANGES index 8d79986..3fd8772 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,12 @@ CHANGES ======= +version 8.0.9 (Dec 10, 2003): + - fixed major bug in connect() handling which causes most + socket-based consoles to timeout after 10 seconds - reported + by Tom Rataski + - added a couple details to the 'logfilemax' manpage entry + version 8.0.8 (Dec 2, 2003): - added client ^Ec| sequence for running a command on the client and having it's I/O directed to the console - inspired by @@ -637,5 +643,5 @@ before version 6.05: and enhancements of various types were applied. # -# $Id: CHANGES,v 1.140 2003/12/02 16:26:59 bryan Exp $ +# $Id: CHANGES,v 1.141 2003/12/10 18:33:40 bryan Exp $ # diff --git a/conserver.cf/conserver.cf.man b/conserver.cf/conserver.cf.man index 1105603..509424e 100644 --- a/conserver.cf/conserver.cf.man +++ b/conserver.cf/conserver.cf.man @@ -1,5 +1,5 @@ -.\" $Id: conserver.cf.man,v 1.53 2003/12/01 02:15:39 bryan Exp $ -.TH CONSERVER.CF 5 "2003/12/01" "conserver-8.0.8" "conserver" +.\" $Id: conserver.cf.man,v 1.54 2003/12/10 18:33:56 bryan Exp $ +.TH CONSERVER.CF 5 "2003/12/10" "conserver-8.0.9" "conserver" .SH NAME conserver.cf \- console configuration file for .BR conserver (8) @@ -593,6 +593,10 @@ minute, and second (to prevent issues with clock rollbacks). File sizes are checked every 5 minutes with an additional initial pseudo-random delay of up to one minute (to help prevent all processes checking all consoles simultaneously). +2.5% (minimum 100 bytes, maximum 4000 bytes) of the old +logfile is read from the end of the file. +All data past the first newline is moved (not copied) to the new logfile +so that a replay of the console works and starts on a line boundary. .TP .B master .RI [ " hostname " | " ipaddr " ] diff --git a/conserver.cf/conserver.passwd.man b/conserver.cf/conserver.passwd.man index ea3cd56..141d225 100644 --- a/conserver.cf/conserver.passwd.man +++ b/conserver.cf/conserver.passwd.man @@ -1,5 +1,5 @@ .\" $Id: conserver.passwd.man,v 1.9 2003/07/04 20:20:52 bryan Exp $ -.TH CONSERVER.PASSWD 5 "2003/07/04" "conserver-8.0.8" "conserver" +.TH CONSERVER.PASSWD 5 "2003/07/04" "conserver-8.0.9" "conserver" .SH NAME conserver.passwd \- user access information for .BR conserver (8) diff --git a/conserver.html b/conserver.html index de8f1d5..b60b387 100644 --- a/conserver.html +++ b/conserver.html @@ -183,11 +183,11 @@

Downloading

-

The current version, released on Dec 2, 2003, is 8.0.8.tar.gz. You can get it via +

The current version, released on Dec 10, 2003, is 8.0.9.tar.gz. You can get it via FTP - or HTTP. See the FTP + or HTTP. See the CHANGES file for information on the latest updates.

diff --git a/conserver/consent.c b/conserver/consent.c index f04e8a3..0784a9e 100644 --- a/conserver/consent.c +++ b/conserver/consent.c @@ -1,5 +1,5 @@ /* - * $Id: consent.c,v 5.132 2003/12/02 16:21:42 bryan Exp $ + * $Id: consent.c,v 5.133 2003/12/10 18:33:47 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -842,7 +842,13 @@ ConsInit(pCE) break; } - FD_SET(cofile, &rinit); + /* if we're waiting for connect() to finish, watch the + * write bit, otherwise watch for the read bit + */ + if (pCE->ioState == INCONNECT) + FD_SET(cofile, &winit); + else + FD_SET(cofile, &rinit); if (maxfd < cofile + 1) maxfd = cofile + 1; diff --git a/conserver/conserver.man b/conserver/conserver.man index 981746c..2ad6d67 100644 --- a/conserver/conserver.man +++ b/conserver/conserver.man @@ -1,6 +1,6 @@ .\" @(#)conserver.8 01/06/91 OSU CIS; Thomas A. Fine .\" $Id: conserver.man,v 1.40 2003/11/10 15:37:24 bryan Exp $ -.TH CONSERVER 8 "2003/11/10" "conserver-8.0.8" "conserver" +.TH CONSERVER 8 "2003/11/10" "conserver-8.0.9" "conserver" .SH NAME conserver \- console server daemon .SH SYNOPSIS diff --git a/conserver/group.c b/conserver/group.c index 9c59d64..f9c5d1e 100644 --- a/conserver/group.c +++ b/conserver/group.c @@ -1,5 +1,5 @@ /* - * $Id: group.c,v 5.279 2003/12/02 16:21:43 bryan Exp $ + * $Id: group.c,v 5.280 2003/12/10 18:33:47 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -3942,7 +3942,7 @@ Kiddie(pGE, sfd) switch (pCEServing->ioState) { case INCONNECT: /* deal with this state above as well */ - if (FileCanRead(pCEServing->cofile, &rmask, &wmask)) { + if (FileCanWrite(pCEServing->cofile, &rmask, &wmask)) { socklen_t slen; int flags = 0; int cofile = FileFDNum(pCEServing->cofile); @@ -3973,6 +3973,12 @@ Kiddie(pGE, sfd) } pCEServing->ioState = ISNORMAL; pCEServing->lastWrite = time((time_t *)0); + /* waiting for a connect(), we watch the write bit, + * so switch around and now watch for the read and + * start gathering data + */ + FD_SET(cofile, &rinit); + FD_CLR(cofile, &winit); if (pCEServing->idletimeout != (time_t)0 && (timers[T_IDLE] == (time_t)0 || timers[T_IDLE] > diff --git a/conserver/version.h b/conserver/version.h index e669a85..8b3bed2 100644 --- a/conserver/version.h +++ b/conserver/version.h @@ -1,5 +1,5 @@ /* - * $Id: version.h,v 1.54 2003/11/28 00:47:29 bryan Exp $ + * $Id: version.h,v 1.55 2003/12/10 18:33:48 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -14,4 +14,4 @@ @(#) Copyright 2000 conserver.com.\n\ All rights reserved.\n" -#define THIS_VERSION "conserver.com version 8.0.8" +#define THIS_VERSION "conserver.com version 8.0.9" diff --git a/console/console.man b/console/console.man index 1e7ebb3..5ab5070 100644 --- a/console/console.man +++ b/console/console.man @@ -1,5 +1,5 @@ .\" $Id: console.man,v 1.41 2003/11/28 00:47:30 bryan Exp $ -.TH CONSOLE 1 "2003/11/28" "conserver-8.0.8" "conserver" +.TH CONSOLE 1 "2003/11/28" "conserver-8.0.9" "conserver" .SH NAME console \- console server client program .SH SYNOPSIS diff --git a/contrib/redhat-rpm/conserver.spec b/contrib/redhat-rpm/conserver.spec index 80974d2..f088ce1 100644 --- a/contrib/redhat-rpm/conserver.spec +++ b/contrib/redhat-rpm/conserver.spec @@ -4,7 +4,7 @@ # %define pkg conserver -%define ver 8.0.8 +%define ver 8.0.9 # define the name of the machine on which the main conserver # daemon will be running if you don't want to use the default diff --git a/contrib/solaris-package/pkginfo b/contrib/solaris-package/pkginfo index cbfc6ad..ef68097 100644 --- a/contrib/solaris-package/pkginfo +++ b/contrib/solaris-package/pkginfo @@ -1,7 +1,7 @@ PKG="conserver" NAME="Console server and client" CATEGORY="system" -VERSION="8.0.8" +VERSION="8.0.9" DESC="Console server and client" CLASSES=none ARCH=sparc