diff --git a/CHANGES b/CHANGES index 86d574c..5c8b9e7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,12 @@ CHANGES ======= +version 8.0.3 (Oct 6, 2003): + - the SIGHUP process fails to pick up changes to certain fields + because of a horribly broken SwapStr() function [broken in + all previous 8.0.x versions] - reported by Toby Gerhart + + version 8.0.2 (Oct 5, 2003): - reworked the i/o calls to better buffer data - added console 'motd' option for holding a "message of the @@ -556,5 +562,5 @@ before version 6.05: and enhancements of various types were applied. # -# $Id: CHANGES,v 1.115 2003-10-05 18:04:09-07 bryan Exp $ +# $Id: CHANGES,v 1.116 2003-10-06 10:05:23-07 bryan Exp $ # diff --git a/conserver.cf/conserver.cf.man b/conserver.cf/conserver.cf.man index 862e78b..665db38 100644 --- a/conserver.cf/conserver.cf.man +++ b/conserver.cf/conserver.cf.man @@ -1,5 +1,5 @@ .\" $Id: conserver.cf.man,v 1.43 2003-10-02 19:01:05-07 bryan Exp $ -.TH CONSERVER.CF 5 "2003-10-02" "conserver-8.0.2" "conserver" +.TH CONSERVER.CF 5 "2003-10-02" "conserver-8.0.3" "conserver" .SH NAME conserver.cf \- console configuration file for .BR conserver (8) diff --git a/conserver.cf/conserver.passwd.man b/conserver.cf/conserver.passwd.man index a6d0179..dda6290 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 13:20:52-07 bryan Exp $ -.TH CONSERVER.PASSWD 5 "2003-07-04" "conserver-8.0.2" "conserver" +.TH CONSERVER.PASSWD 5 "2003-07-04" "conserver-8.0.3" "conserver" .SH NAME conserver.passwd \- user access information for .BR conserver (8) diff --git a/conserver.html b/conserver.html index 34bd208..8b9b75f 100644 --- a/conserver.html +++ b/conserver.html @@ -183,11 +183,11 @@

The conserver.com Distribution

Downloading

-

The current version, released on Oct 5, 2003, is 8.0.2.tar.gz. You can get it via +

The current version, released on Oct 6, 2003, is 8.0.3.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/conserver.man b/conserver/conserver.man index f7fc6cc..3975f1f 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.38 2003-09-22 08:33:41-07 bryan Exp $ -.TH CONSERVER 8 "2003-09-22" "conserver-8.0.2" "conserver" +.TH CONSERVER 8 "2003-09-22" "conserver-8.0.3" "conserver" .SH NAME conserver \- console server daemon .SH SYNOPSIS diff --git a/conserver/readcfg.c b/conserver/readcfg.c index c9faf26..f5f255e 100644 --- a/conserver/readcfg.c +++ b/conserver/readcfg.c @@ -1,5 +1,5 @@ /* - * $Id: readcfg.c,v 5.144 2003-10-03 06:32:34-07 bryan Exp $ + * $Id: readcfg.c,v 5.145 2003-10-06 10:07:26-07 bryan Exp $ * * Copyright conserver.com, 2000 * @@ -1736,17 +1736,17 @@ ConsoleAbort() void #if PROTOTYPES -SwapStr(char *s1, char *s2) +SwapStr(char **s1, char **s2) #else SwapStr(s1, s2) - char *s1; - char *s2; + char **s1; + char **s2; #endif { char *s; - s = s1; - s1 = s2; - s2 = s; + s = *s1; + *s1 = *s2; + *s2 = s; } void @@ -2046,24 +2046,24 @@ ConsoleAdd(c) } if (pCEmatch->logfile != (char *)0 && c->logfile != (char *)0) { if (strcmp(pCEmatch->logfile, c->logfile) != 0) { - SwapStr(pCEmatch->logfile, c->logfile); + SwapStr(&pCEmatch->logfile, &c->logfile); closeMatch = 0; } } else if (pCEmatch->logfile != (char *)0 || c->logfile != (char *)0) { - SwapStr(pCEmatch->logfile, c->logfile); + SwapStr(&pCEmatch->logfile, &c->logfile); closeMatch = 0; } if (pCEmatch->initcmd != (char *)0 && c->initcmd != (char *)0) { if (strcmp(pCEmatch->initcmd, c->initcmd) != 0) { - SwapStr(pCEmatch->initcmd, c->initcmd); + SwapStr(&pCEmatch->initcmd, &c->initcmd); /* only trigger reinit if we're running the old command */ if (pCEmatch->initpid != 0) closeMatch = 0; } } else if (pCEmatch->initcmd != (char *)0 || c->initcmd != (char *)0) { - SwapStr(pCEmatch->initcmd, c->initcmd); + SwapStr(&pCEmatch->initcmd, &c->initcmd); /* only trigger reinit if we're running the old command */ if (pCEmatch->initpid != 0) closeMatch = 0; @@ -2073,12 +2073,12 @@ ConsoleAdd(c) case EXEC: if (pCEmatch->exec != (char *)0 && c->exec != (char *)0) { if (strcmp(pCEmatch->exec, c->exec) != 0) { - SwapStr(pCEmatch->exec, c->exec); + SwapStr(&pCEmatch->exec, &c->exec); closeMatch = 0; } } else if (pCEmatch->exec != (char *)0 || c->exec != (char *)0) { - SwapStr(pCEmatch->exec, c->exec); + SwapStr(&pCEmatch->exec, &c->exec); closeMatch = 0; } if (pCEmatch->ixany != c->ixany) { @@ -2104,12 +2104,12 @@ ConsoleAdd(c) if (pCEmatch->device != (char *)0 && c->device != (char *)0) { if (strcmp(pCEmatch->device, c->device) != 0) { - SwapStr(pCEmatch->device, c->device); + SwapStr(&pCEmatch->device, &c->device); closeMatch = 0; } } else if (pCEmatch->device != (char *)0 || c->device != (char *)0) { - SwapStr(pCEmatch->device, c->device); + SwapStr(&pCEmatch->device, &c->device); closeMatch = 0; } if (pCEmatch->baud != c->baud) { @@ -2150,12 +2150,12 @@ ConsoleAdd(c) case HOST: if (pCEmatch->host != (char *)0 && c->host != (char *)0) { if (strcasecmp(pCEmatch->host, c->host) != 0) { - SwapStr(pCEmatch->host, c->host); + SwapStr(&pCEmatch->host, &c->host); closeMatch = 0; } } else if (pCEmatch->host != (char *)0 || c->host != (char *)0) { - SwapStr(pCEmatch->host, c->host); + SwapStr(&pCEmatch->host, &c->host); closeMatch = 0; } if (pCEmatch->port != c->port) { @@ -2168,7 +2168,7 @@ ConsoleAdd(c) } /* and now the rest (minus the "runtime" members - see below) */ - SwapStr(pCEmatch->motd, c->motd); + SwapStr(&pCEmatch->motd, &c->motd); pCEmatch->activitylog = c->activitylog; pCEmatch->breaklog = c->breaklog; pCEmatch->mark = c->mark; diff --git a/conserver/version.h b/conserver/version.h index 67d1924..17269c8 100644 --- a/conserver/version.h +++ b/conserver/version.h @@ -1,5 +1,5 @@ /* - * $Id: version.h,v 1.48 2003-10-05 17:04:09-07 bryan Exp $ + * $Id: version.h,v 1.49 2003-10-06 10:07:59-07 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.2" +#define THIS_VERSION "conserver.com version 8.0.3" diff --git a/console/console.man b/console/console.man index 76cf0ab..911f4a9 100644 --- a/console/console.man +++ b/console/console.man @@ -1,5 +1,5 @@ .\" $Id: console.man,v 1.37 2003-10-02 19:00:45-07 bryan Exp $ -.TH CONSOLE 1 "2003-10-02" "conserver-8.0.2" "conserver" +.TH CONSOLE 1 "2003-10-02" "conserver-8.0.3" "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 1cb5b47..81303df 100644 --- a/contrib/redhat-rpm/conserver.spec +++ b/contrib/redhat-rpm/conserver.spec @@ -4,7 +4,7 @@ # %define pkg conserver -%define ver conserver-8.0.2 +%define ver conserver-8.0.3 # 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 7244c16..610b689 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="conserver-8.0.2" +VERSION="conserver-8.0.3" DESC="Console server and client" CLASSES=none ARCH=sparc