Imported from conserver-8.1.3.tar.gz

Imported from conserver-8.1.2.tar.gz
Imported from conserver-8.1.1.tar.gz
2025-06-24 09:46:39 +00:00 · 2004-03-22 17:14:45 -08:00 · 2004-03-11 09:54:13 -08:00 · 2004-02-10 07:26:45 -08:00 · 2004-01-18 09:31:24 -08:00 · 2003-12-10 10:37:48 -08:00
67 changed files with 7867 additions and 3278 deletions
--- a/160
+++ b/160
@ -1,6 +1,164 @@
 				CHANGES
 				=======

+version 8.1.3 (Mar 22, 2004):
+	- fixed small memory and file descriptor leak in client when
+	  using '^Ec;'
+	- '^Ec;' now only disconnects from the previous console only
+	  after a successfully move to a new console, allowing you to
+	  abort the move - suggested by Christopher T. Beers
+	  <ctbeers@syr.edu>
+
+version 8.1.2 (Mar 11, 2004):
+	- better handling of client command (^Ec|) when user is bumped,
+	  conserver is reconfigured, etc
+	- added 'initsubst' option for 'initcmd' substitutions like
+	  'devicesubst' and 'execsubst' - based on patch by Bill
+	  Sommerfeld <sommerfeld@east.sun.com>
+	- modified and added to *subst (initsubst, etc) syntax to allow
+	  for flexibility and future enhancement
+	- changed 'port' and 'portinc' minimums from 1 to 0 - it allows
+	  more flexibility and helps with 0-based counting
+	- removed unportable sys/cdefs.h from contrib/chat/chat.c -
+	  patch by Bill Sommerfeld <sommerfeld@east.sun.com>
+	- added --with-extmsgs configure switch to enable entertaining
+	  messages
+	- marked various undocumented client commands as deprecated so
+	  that they can be removed in a future version
+	- added ability to "move" to a new console via '^Ec;' -
+	  suggested by Christopher T. Beers <ctbeers@syr.edu>
+	- added a dump of console information when -S is used twice -
+	  suggested by Todd Stansell <todd@stansell.org>
+
+version 8.1.1 (Feb 10, 2004):
+	- fixed mistake in Makefiles where rpmbuild fails - reported by
+	  Martin Evans <m.d.t.evans@qmul.ac.uk>
+	- fixed a couple typos - reported by Matt Selsky
+	  <selsky@columbia.edu>
+
+version 8.1.0 (Jan 18, 2004):
+	- fixes for HP-UX compilation - patch by Petter Reinholdtsen
+	  <pere@hungry.com>
+	- fixes for compilation under various operating systems -
+	  patch by Albert Chin <conserver-users@mlists.thewrittenword.com>
+	- added a 'protocol' option for either 'telnet' or 'raw' socket
+	  communication - also reflected in -i output
+	- changed the client/server protocol to use 0xff as a command
+	  character for sending control commands - similiar to the
+	  telnet protocol - improves the ^Ec| interaction
+	- client -E option now disables ssl encryption attempts, useful
+	  for broken SSL environents - suggested by Graydon Dodson
+	  <grdodson@lexmark.com>
+	- bad error message connecting non-ssl client with ssl-required
+	  server - reported by Graydon Dodson <grdodson@lexmark.com>
+	- added note about pam configuration to conserver.passwd.man -
+	  suggested by Erik Sjolund <erik.sjolund@sbc.su.se>
+	- improved telnet protocol option handling such that connections
+	  to standard telnet ports should work properly
+
+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 <trataski@intlsteel.com> 
+	- 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
+	  discussions with David Williamson
+	  <david+conserver@williamsons.net> years ago  ;-)
+	- touched up Makefiles to test against .h files
+	- fixed inability to replay the console log while the console is
+	  down - reported by Matt Selsky <selsky@columbia.edu>
+	- added a console 'logfilemax' option for rotating the console
+	  logfile once the file is greater than the specified size
+	- added sample configuration files to conserver.cf/samples
+	- tweaked some failure messages and initcmd notifications
+
+version 8.0.7 (Nov 20, 2003):
+	- renamed util.[ch] to cutil.[ch] to prevent name conflict with
+	  system util.h, reordered some #includes, and fixed a configure
+	  test for sys/proc.h to build on OpenBSD 3.4 (and probably
+	  others) - reported by Kurt Raschke <kurt@raschke.net>
+	- fixed missing semi-colon for cygwin build - reported by
+	  Raymond Richmond <raymond.richmond@ualberta.ca>
+
+version 8.0.6 (Nov 16, 2003):
+	- code was missing regarding the 'setproctitle' option - patch
+	  by Dmitry Morozovsky <marck@rinet.ru>
+	- fixed the order of access list checking when
+	  --with-trustrevdns is used
+	- fixed various spelling errors - patches by Matt Selsky
+	  <selsky@columbia.edu>
+	- added console 'idletimeout' and 'idlestring' options to
+	  trigger the sending of 'idlestring' after a lack of activity
+	  for 'idletimeout' seconds - suggested by Ian Potts
+	  <ian.potts@db.com>
+	- added console 'portbase' and 'portinc' options to allow
+	  specifying a formula for referencing ports - inspired by Todd
+	  Stansell <todd@stansell.org>
+	- fixed problem where console 'port' option didn't take port
+	  names (manpage said it did)
+	- added server -U option and configuration option 'unifiedlog'
+	  to allow a copy of all console activity to go to a single file
+	- removed all sprintf() calls
+	- added 'devicesubst' and 'execsubst' console options for doing
+	  replacements with calculated port numbers on the 'device' and
+	  'exec' values
+	- NULL characters in console data caused data loss because of
+	  strlen() usage - reported by Toby Gerhart <toby.gerhart@eds.com>
+	- fixed a couple errors in contrib/redhat-rpm/conserver.spec -
+	  reported by Martin Evans <m.d.t.evans@qmul.ac.uk>
+	- added capability to use '!' in user access lists to prevent a
+	  user from having access - suggested by Matt Selsky
+	  <selsky@columbia.edu>
+
+version 8.0.5 (Oct 31, 2003):
+	- added 'loghostnames' config option (default is on) to log
+	  client hostnames instead of ip addresses (like pre-8.0.0) -
+	  suggested by Han Pilmeyer <han@zk3.dec.com>
+	- fixed bug where 'daemonmode' config file option wasn't being
+	  used
+	- fixed potential logfile (-L) opening problem processing SIGHUP
+	- fixed various potential conserver.cf issues with 'config'
+	  block values processing SIGHUP
+	- added 'setproctitle' config option (default is off) to enable
+	  changing the process title to contain runtime information -
+	  patch by Dmitry Morozovsky <marck@rinet.ru>
+
+version 8.0.4 (Oct 10, 2003):
+	- fixed client rejection bug that can nearly never happen -
+	  reported by Han Pilmeyer <han@zk3.dec.com>
+	- fixed bug where client is reconnected to the previous console
+	  when non-exact console names are used - reported by Rolf
+	  Petter Halle <rph@online.no>
+	- fixed bug where exact matchs on a remote console name never
+	  happened - reported by Toby Gerhart <toby.gerhart@eds.com>
+	- fixed bug where SIGHUP fails to update console aliases -
+	  reported by Han Pilmeyer <han@zk3.dec.com>
+
+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
+	  <toby.gerhart@eds.com>
+
+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
+	  day", displayed to the client on attachment to console -
+	  suggested by Toby Gerhart <toby.gerhart@eds.com>
+	- added ^Ecm client command for displaying MOTD and integrated
+	  it into the client console attachment sequence
+	- now unallocate client lists when forking new child conserver
+	  processes
+	- changed strdup() to local StrDup() so dmalloc can gracefully
+	  track changes
+	- added a ^Ec; sequence to let client signal server when it's
+	  ready to see console data, otherwise a chatty console can
+	  cause the login sequence to fail and you can never attach to
+	  the console
+
 version 8.0.1 (Sep 29, 2003):
 	- fixed bug in access list parsing where multiple addresses per
 	  line can cause errors - reported by Jay McCanta
@ -540,5 +698,5 @@ before version 6.05:
 	  and enhancements of various types were applied.

 #
-#  $Id: CHANGES,v 1.109 2003-09-29 08:41:20-07 bryan Exp $
+#  $Id: CHANGES,v 1.162 2004/03/23 00:55:04 bryan Exp $
 #
--- a/2
+++ b/2
@ -186,5 +186,5 @@ directed to faq@conserver.com.  The FAQ answers the following questions:
      through the same problem?

 #
-#  $Id: FAQ,v 1.9 2003-08-23 12:27:10-07 bryan Exp $
+#  $Id: FAQ,v 1.9 2003/08/23 19:27:10 bryan Exp $
 #
--- a/30
+++ b/30
@ -10,6 +10,34 @@ Upgrading?
    new features added to the client if you're considering *not*
    upgrading.

+    Version 8.1.3
+	- The '^Ec;' sequence won't work correctly with 8.1.2 (where it
+	  was introduced).
+
+    Version 8.1.2
+	- The 'devicesubst' and 'execsubst' formats have changed from
+	  8.1.1.  It's fairly simple to update your config file to the
+	  new format...just check the conserver.cf manpage.  Sorry for
+	  having to change things, but it's for a good reason (I should
+	  have though ahead when designing the original format).
+
+    Version 8.1.0
+
+	- The client/server protocol has changed to better protect 8-bit
+	  data and to allow programs invoked with '^Ec|' not have to
+	  worry about accidentally sending the escape sequence to the
+	  server.  Though it will look like things are mostly
+	  backward-compatible, don't count on it and just upgrade.
+
+    Version 8.0.2
+
+	- I've added a '^Ec;' sequence to allow the client to signal the
+	  server as to when it's ready to see console data.  Without
+	  this, verbose consoles will prevent clients from attaching
+	  (the client sees unexpected data).  An 8.0.2 client should be
+	  compatible with an 8.0.1 server, but an 8.0.1 client is not
+	  compatible with an 8.0.2 server.
+
    Version 8.0.1

 	- There's a slight client/server protocol change to implement
@ -246,5 +274,5 @@ Other Information And Gotchas


 #
-#  $Id: INSTALL,v 1.33 2003-09-28 17:50:05-07 bryan Exp $
+#  $Id: INSTALL,v 1.37 2004/03/23 00:55:04 bryan Exp $
 #
--- a/2
+++ b/2
@ -55,5 +55,5 @@ Contributions
    http://www.columbia.edu/acis/sy/unixdev/zinc

 #
-#  $Id: README,v 1.22 2003-08-23 12:34:24-07 bryan Exp $
+#  $Id: README,v 1.22 2003/08/23 19:34:24 bryan Exp $
 #
--- a/48
+++ b/48
@ -10,17 +10,11 @@ Bryan Stansell

 ---------------------------------------------------------------------------

- Singular logging so that swatch/logsurfer can watch for errors across
-  the board - unloved output comes close
-
 - Telnet protocol should be improved
-    - Not even RFC 854 compliant
-    - Option negotiation ignored - should we negotiate anything?
+    - Not even RFC 854 compliant...or maybe it is (as of 8.1.0)
+    - Option negotiation semi-ignored - should we negotiate anything more?
    - Others?

- better shadow file support
-    - what does this mean?  i've forgotten.
-
 - syslog?
    Daniel E. Singer <des@cs.duke.edu> would like to see it - especially
    in regards to --use-libwrap code
@ -30,14 +24,20 @@ Bryan Stansell
    - hpux has bigcrypt() also, which we support, so maybe we're covered

 - config file examples for various configurations
+    - sample conserver.cf has some...but it's not explained well

 - per-line timestamps
    - only when not connected?

 - pipe input/output (console <-> program) via 'console'
    - some apps (net-ups thing, gdb) might need to talk to user
+    - ^Ec| does this, but the interact with user bits might not work
+    - actually, ^Ec| does work right with 8.1.0...one change that might
+      be nice is the ability to NOT watch the i/o pass to the local
+      command - try sending a big file to the local host with xmodem.

 - autologout?  setting per console?  gack, would have to interpret data.
+    - this will never happen...i don't want to interpret data

 - "listen" capability (watch all/multiple consoles)

@ -50,6 +50,7 @@ Bryan Stansell
    - passphrase...hmmm..could really use some sort of send/expect
      thing here.  you could write a wrapper script of sorts, but it
      really would be nice to have a raw socket and do the right thing.
+    - this does work, using the 'initcmd' option, so, all done?

 - cyclades ts1000/2000 port : "Moses, Joel" <jmoses@deloitte.com>

@ -61,8 +62,7 @@ Bryan Stansell

 - server -M flag should accept multiple addresses (comma separated)
    - should client as well?
-
- logfile rotation based on size
+    - this may never happen...does anyone really need it?

 - automatic log rotation in general : Egan Ford <egan@us.ibm.com>

@ -73,6 +73,7 @@ Bryan Stansell

 - suggestions by Trevor Fiatal <trevor@seven.com>
    - include server hostname on 'console -x' output
+	- i think the -i output covers it, but maybe not

 - ability to configure strings to be sent to a console periodically :
  Greg A. Woods <woods@planix.com>
@ -80,6 +81,31 @@ Bryan Stansell
 - show attach/detach events to/of spy console clients : Greg A. Woods
  <woods@planix.com>

+- redefine client escape sequence in conserver.cf : Toby Gerhart
+  <toby.gerhart@eds.com>
+    - not even sure if this is possible w/o confusing the client,
+      but maybe with the new 8.1.0 client-server protocol, we can!
+
+- send a string when connected to a console, so you can set the
+  xterm title, for example : Richard Threadgill <richardt@tellme.com>
+    - this probably requires a client config file, so could play well
+      with the client config file requirement above
+
+- allow for very long replays (hundres of lines) : John Stoffel
+  <stoffel@lucent.com>
+
+- log rotation by date : Tom Pachla <tom.pachla@nlc-bnc.ca>
+
+- client config file (for -M, etc?) : Erik Sjolund
+  <erik.sjolund@sbc.su.se>
+
+- strict file permission checks on conserver.passwd/conserver.cf : Erik
+  Sjolund <erik.sjolund@sbc.su.se>
+
+- embedded startup delays per remote host...or "group" of consoles in
+  some way 'cause some ssh connections to console servers need
+  significant throttling : Jay McCanta <mccantaj@amgen.com>
+
 #
-#  $Id: TODO,v 1.37 2003-09-28 12:23:23-07 bryan Exp $
+#  $Id: TODO,v 1.47 2004/03/12 17:34:49 bryan Exp $
 #
--- a/autologin/INSTALL.old
+++ b/autologin/INSTALL.old
@ -1,4 +1,4 @@
-# $Id: INSTALL,v 1.3 94/07/11 12:38:19 ksb Exp $
+# $Id: INSTALL.old,v 1.1 2003/11/04 02:36:24 bryan Exp $

 To install this program you need root access and access to the physical
 console of the machine (either through the console server or via the physical
--- a/autologin/Makefile.in
+++ b/autologin/Makefile.in
@ -31,6 +31,8 @@ ALL = autologin

 all: $(ALL)

+$(AUTOLOGIN_OBJS): $(AUTOLOGIN_HDRS)
+
 autologin: $(AUTOLOGIN_OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o autologin $(AUTOLOGIN_OBJS) $(LIBS)

--- a/autologin/README
+++ b/autologin/README
@ -17,5 +17,5 @@ Good luck.
 Bryan Stansell

 #
-#  $Id: README,v 1.2 2002-09-23 14:08:42-07 bryan Exp $
+#  $Id: README,v 1.2 2002/09/23 21:08:42 bryan Exp $
 #
--- a/autologin/README.old
+++ b/autologin/README.old
@ -1,4 +1,4 @@
-# $Id: README,v 1.3 93/04/21 16:13:37 ksb Exp $
+# $Id: README.old,v 1.1 2003/11/04 02:36:24 bryan Exp $

 This program can be used to put a root shell on the console at boot time.
 See the manual page.
--- a/autologin/autologin.c
+++ b/autologin/autologin.c
@ -69,7 +69,7 @@
 */

 #ifndef	lint
-char	*rcsid = "$Id: autologin.c,v 1.23 2002-09-20 23:29:39-07 bryan Exp $";
+char	*rcsid = "$Id: autologin.c,v 1.23 2002/09/21 06:29:39 bryan Exp $";
 #endif	/* not lint */
 extern char	*progname;
 gid_t	 awGrps[NGROUPS_MAX];
--- a/autologin/autologin.m
+++ b/autologin/autologin.m
@ -1,7 +1,7 @@
 # mkcmd parser for autologin program
 %%
 static char *rcsid =
-	"$Id: autologin.m,v 1.2 92/07/28 13:18:34 ksb Exp $";
+	"$Id: autologin.m,v 1.1 2003/11/04 02:36:24 bryan Exp $";
 %%

 integer variable "iErrs" {
--- a/autologin/autologin.man
+++ b/autologin/autologin.man
@ -1,4 +1,4 @@
-.\" $Id: autologin.man,v 1.3 93/03/16 16:41:45 ksb Exp $
+.\" $Id: autologin.man,v 1.1 2003/11/04 02:36:24 bryan Exp $
 .TH AUTOLOGIN 8L PUCC
 .SH NAME
 autologin \- create an automatic login session from /etc/inittab
--- a/autologin/main.c
+++ b/autologin/main.c
@ -80,7 +80,7 @@ char **nargv, *ostr;
 #endif /* ! HAVE_GETOPT */

 char
-	*progname = "$Id$",
+	*progname = "$Id: main.c,v 1.1 2003/11/04 02:36:24 bryan Exp $",
 	*au_terse[] = {
 		" [-u] [-c cmd] [-e env=value] [-g group] [-l login] [-t tty]",
 		" -h",
@ -111,7 +111,7 @@ int
 #endif

 static char *rcsid =
-        "$Id: autologin.m,v 1.2 92/07/28 13:18:34 ksb Exp $";
+        "$Id: main.c,v 1.1 2003/11/04 02:36:24 bryan Exp $";

 /*
 * parser
--- a/compat.h
+++ b/compat.h
@ -7,8 +7,8 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netdb.h>
 #include <ctype.h>
 #include <signal.h>
@ -287,6 +287,10 @@ typedef int socklen_t;
 #define ONLRET 0
 #endif

+#ifndef SEEK_SET
+#define SEEK_SET L_SET
+#endif
+
 #ifndef PARAMS
 # if PROTOTYPES
 #  define PARAMS(protos) protos
--- a/config.guess
+++ b/config.guess
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.

-timestamp='2003-08-18'
+timestamp='2004-03-12'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -197,12 +197,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
    arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@ -221,6 +227,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@ -236,10 +245,24 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 	# covers most systems running today.  This code pipes the CPU
@ -277,11 +300,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    "EV7.9 (21364A)")
 		UNAME_MACHINE="alphaev79" ;;
 	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
    Alpha*:OpenVMS:*:*)
 	echo alpha-hp-vms
@ -307,6 +331,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@ -399,6 +426,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
        echo m68k-unknown-mint${UNAME_RELEASE}
        exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
    powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@ -742,6 +772,11 @@ EOF
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@ -751,7 +786,7 @@ EOF
    *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+    *:FreeBSD:*:*)
 	# Determine whether the default compiler uses glibc.
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@ -763,7 +798,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
 	# FreeBSD's kernel, but not the complete OS.
 	case ${LIBC} in gnu) kernel_only='k' ;; esac
 	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
@ -799,8 +834,13 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
    *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
@ -813,6 +853,9 @@ EOF
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
    m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@ -981,6 +1024,9 @@ EOF
    i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@ -1052,7 +1098,7 @@ EOF
 	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@ -1167,7 +1213,7 @@ EOF
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
    *:NonStop-UX:*:*)
@ -1211,6 +1257,9 @@ EOF
    SEI:*:*:SEIUX)
        echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
--- a/config.h.in
+++ b/config.h.in
@ -144,6 +144,9 @@
 /* Define to 1 if you have the `setpgrp' function. */
 #undef HAVE_SETPGRP

+/* Define to 1 if you have the `setproctitle' function. */
+#undef HAVE_SETPROCTITLE
+
 /* Define to 1 if you have the `setsid' function. */
 #undef HAVE_SETSID

@ -204,6 +207,9 @@
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #undef HAVE_SYS_IOCTL_H

+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
 /* Define to 1 if you have the <sys/proc.h> header file. */
 #undef HAVE_SYS_PROC_H

@ -318,6 +324,9 @@
 /* Defined if we trust reverse DNS */
 #undef TRUST_REVERSE_DNS

+/* Defined if we produce extended messages */
+#undef USE_EXTENDED_MESSAGES
+
 /* use tcp_wrappers libwrap */
 #undef USE_LIBWRAP

@ -342,3 +351,6 @@

 /* Define if <signal.h> does not define sig_atomic_t */
 #undef sig_atomic_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
--- a/config.sub
+++ b/config.sub
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.

-timestamp='2003-08-18'
+timestamp='2004-03-12'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -118,7 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@ -236,7 +237,7 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@ -248,6 +249,7 @@ case $basic_machine in
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
@ -260,7 +262,7 @@ case $basic_machine in
 	| pyramid \
 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
@ -306,7 +308,7 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@ -320,6 +322,7 @@ case $basic_machine in
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
@ -333,7 +336,7 @@ case $basic_machine in
 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
@ -360,6 +363,9 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@ -377,6 +383,9 @@ case $basic_machine in
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@ -436,12 +445,20 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@ -741,6 +758,10 @@ case $basic_machine in
 		basic_machine=or32-unknown
 		os=-coff
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@ -961,6 +982,10 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@ -1056,7 +1081,7 @@ case $basic_machine in
 	sh64)
 		basic_machine=sh64-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@ -1129,19 +1154,20 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1180,6 +1206,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@ -1201,6 +1230,9 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@ -1223,6 +1255,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@ -1471,9 +1506,15 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
--- a/1870
+++ b/1870
--- a/configure.in
+++ b/configure.in
@ -16,6 +16,7 @@ AH_TEMPLATE([HAVE_OPENSSL], [have openssl support])
 AH_TEMPLATE([HAVE_DMALLOC], [have dmalloc support])
 AH_TEMPLATE([HAVE_SA_LEN],[Defined if sa_len member exists in struct sockaddr])
 AH_TEMPLATE([TRUST_REVERSE_DNS],[Defined if we trust reverse DNS])
+AH_TEMPLATE([USE_EXTENDED_MESSAGES],[Defined if we produce extended messages])

 dnl ### Normal initialization. ######################################
 AC_INIT
@ -215,6 +216,19 @@ AC_ARG_WITH(trustrevdns,
 		;;
 	esac],[AC_MSG_RESULT(no)])

+AC_MSG_CHECKING(whether to display extended messages)
+AC_ARG_WITH(extmsgs,
+	AC_HELP_STRING([--with-extmsgs],[Produce extended messages]),
+	[case "$withval" in
+	    yes)
+		AC_DEFINE(USE_EXTENDED_MESSAGES)
+		AC_MSG_RESULT(yes)
+		;;
+	    *)
+		AC_MSG_RESULT(no)
+		;;
+	esac],[AC_MSG_RESULT(no)])
+
 dnl ### Check for compiler et al. ###################################
 AC_PROG_CC
 AC_PROG_INSTALL
@ -244,12 +258,19 @@ if test "$ac_cv_sys_posix_termios" != "yes"; then
    AC_MSG_ERROR([POSIX termios interface required])
 fi

-AC_CHECK_HEADERS(unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/proc.h sys/ioctl_compat.h usersec.h sys/select.h stropts.h sys/audit.h shadow.h sys/time.h crypt.h sysexits.h types.h sys/sockio.h)
+AC_CHECK_HEADERS(unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/ioctl_compat.h usersec.h sys/select.h stropts.h sys/audit.h shadow.h sys/time.h crypt.h sysexits.h types.h sys/sockio.h sys/param.h)
+dnl sys/proc.h needs sys/param.h on openbsd, apparently
+AC_CHECK_HEADERS(sys/proc.h, [], [],
+[#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+])
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_TYPE_MODE_T
 AC_TYPE_SIGNAL
 AC_TYPE_PID_T
+AC_TYPE_SIZE_T

 AC_CHECK_TYPE([sig_atomic_t],,
    AC_DEFINE(sig_atomic_t, volatile int,
@ -498,7 +519,7 @@ AC_CHECK_HEADERS(pty.h libutil.h util.h)
 AC_CHECK_LIB(util, openpty)
 AC_CHECK_FUNCS(openpty)

-AC_CHECK_FUNCS(getopt strerror getrlimit getsid setsid getuserattr setgroups tcgetpgrp tcsetpgrp tcgetattr tcsetattr tcsendbreak setpgrp getutent setttyent getspnam setlinebuf setvbuf ptsname grantpt unlockpt sigaction setsockopt getdtablesize putenv memset memcpy memcmp memmove sysconf getlogin inet_aton)
+AC_CHECK_FUNCS(getopt strerror getrlimit getsid setsid getuserattr setgroups tcgetpgrp tcsetpgrp tcgetattr tcsetattr tcsendbreak setpgrp getutent setttyent getspnam setlinebuf setvbuf ptsname grantpt unlockpt sigaction setsockopt getdtablesize putenv memset memcpy memcmp memmove sysconf getlogin inet_aton setproctitle)
 AC_FUNC_SETPGRP
 AC_CHECK_FUNC(strcasecmp,
 	[AC_DEFINE(HAVE_STRCASECMP, 1, [Define if strcasecmp is available])],
--- a/conserver.cf/INSTALL
+++ b/conserver.cf/INSTALL
@ -7,5 +7,5 @@ files with enough detail to get you going.
 That's about it.  Good luck.

 #
-#  $Id: INSTALL,v 1.3 2003-07-04 11:21:21-07 bryan Exp $
+#  $Id: INSTALL,v 1.3 2003/07/04 18:21:21 bryan Exp $
 #
--- a/conserver.cf/Makefile.in
+++ b/conserver.cf/Makefile.in
@ -3,7 +3,8 @@ srcdir = @srcdir@
 prefix = @prefix@
 mandir = @mandir@
 sysconfdir = @sysconfdir@
-exampledir = $(prefix)/share/examples/conserver
+datadir = @datadir@
+exampledir = $(datadir)/examples/conserver

 ### Installation programs and flags
 INSTALL = @INSTALL@
--- a/conserver.cf/conserver.cf
+++ b/conserver.cf/conserver.cf
@ -1,54 +1,114 @@
 #
-# $Id: conserver.cf,v 1.5 2003-07-04 11:05:04-07 bryan Exp $
+# Sample conserver.cf file, to give you ideas of what you can do with
+# the various configuration items.
 #
-# The character '&' in logfile names are substituted with the console
-# name.
-#
-default full {
-	rw *;
-}
+
+### set up global access
+default full	{ rw *; }
+
+### define some terminal server specifics
+# we set portbase and portinc so we can reference the ports in a
+# physical representation and let conserver do the math to figure
+# out the actual socket address
+default cisco	{ type host; portbase 2000; portinc 1; }
+default xyplex	{ type host; portbase 2000; portinc 100; }
+default iolan	{ type host; portbase 10000; portinc 1; }
+
+### set up some custom break sequences
+break 4 { string "+\d+\d+"; delay 300; }
+break 5 { string "\033c"; }
+
+### set the defaults for all the consoles
+# these get applied before anything else
 default * {
+	# The '&' character is substituted with the console name
 	logfile /var/consoles/&;
-	timestamp "";
+	# timestamps every hour with activity and break logging
+	timestamp 1hab;
+	# include the 'full' default
 	include full;
-}
-#
-# list of consoles we serve
-#
-console tweety {
+	# master server is localhost
 	master localhost;
-	type host;
-	host ts1;
-	port 2002;
 }
-console bambam {
-	master localhost;
-	type host;
-	host ts1;
-	port 2003;
+
+### define the first terminal server
+default ts1.conserver.com {
+	# use the xyplex defaults
+	include xyplex;
+	# host to connect to is ts1.conserver.com
+	host ts1.conserver.com;
+	# run login-xyplex when connecting to the term server
+	initcmd /usr/local/sbin/login-xyplex;
 }
-console shell {
-	master localhost;
-	logfile /dev/null;
+
+# now define the consoles on ts1.conserver.com
+# bryan isn't allowed on web1.conserver.com
+console web1.conserver.com { include ts1.conserver.com; port 2; rw !bryan; }
+console ns1.conserver.com { include ts1.conserver.com; port 10; }
+console ns2.conserver.com { include ts1.conserver.com; port 8; }
+
+### define the second terminal server
+# this one is a cisco, with simple socket connections
+default ts2.conserver.com { include cisco; host ts2.conserver.com; }
+
+# and the consoles on ts2.conserver.com
+console ldap1.conserver.com { include ts2.conserver.com; port 7; }
+
+### and now some one-off consoles
+# we still inherit the '*' default set
+# a simple ssh invocation
+console ssh {
 	type exec;
-	exec "";
-}
-console telnet {
-	master localhost;
-	logfile /dev/null;
-	type exec;
-	exec telnet host;
+	exec ssh localhost;
+	# provide a 'message-of-the-day'
+	motd "just a simple ssh to localhost";
 }
+
+# connect to /dev/ttya
 console ttya {
-	master localhost;
 	type device;
-	device /dev/ttya;
+	device /dev/ttya; parity none; baud 9600;
+	idlestring "#";
+	idletimeout 5m;		# send a '#' every 5 minutes of idle
+	timestamp "";		# no timestamps on this console
+}
+
+### define a group of users
+group sysadmin {
+    users bryan, todd;
+    users dave;
+}
+
+### reset the defaults for the next set of consoles
+# again, these get applied before anything else
+default * {
+	# The '&' character is substituted with the console name
+	logfile /var/consoles/&;
+	timestamp 5m;
+	rw sysadmin;  # use the group defined above
+	master localhost;
+}
+
+default cyclades {
+	# sets up /dev/ttyC0 through /dev/ttyC31, for a 32 port card
+	# referenced as ports 1 through 32
+	type device;
+	device /dev/ttyC.;
+	devicesubst .=Pd;
+	portbase -1;
+	portinc 1;
+	host none; # not really used, since devicesubst doesn't use it
 	baud 9600;
 	parity none;
 }
-#
-# list of clients we allow
-#
+
+console modem1.conserver.com { include cyclades; port 2; break 4; }
+# todd isn't allowed on modem2.conserver.com
+console modem2.conserver.com { include cyclades; port 6; rw !todd; }
+
+### list of clients we allow
 access * {
-	allowed 127.0.0.1 gnac.com;
+	allowed 10.0.0.0/8 192.168.0.0/16;
+	allowed cs1.conserver.com cs2.conserver.com cs3.conserver.com;
+	trusted 127.0.0.1;
 }
--- a/conserver.cf/conserver.cf.man
+++ b/conserver.cf/conserver.cf.man
@ -1,5 +1,5 @@
-.\" $Id: conserver.cf.man,v 1.42 2003-09-28 12:23:04-07 bryan Exp $
-.TH CONSERVER.CF 5 "2003-09-28" "conserver-8.0.1" "conserver"
+.\" $Id: conserver.cf.man,v 1.58 2004/02/24 02:59:36 bryan Exp $
+.TH CONSERVER.CF 5 "2004/02/24" "conserver-8.1.3" "conserver"
 .SH NAME
 conserver.cf \- console configuration file for
 .BR conserver (8)
@ -65,12 +65,12 @@ The parser has six characters that it considers special.
 These are: ``{'', ``}'', ``;'', ``#'', ``\e'', and ``"''.
 The first three (hereby called tokens) define the format of the
 configuration blocks and are used as word
-seperators, the next is the comment character, and the last two are
+separators, the next is the comment character, and the last two are
 quoting characters.
 .PP
-Word seperation occurs when the parser encounters an unquoted token
+Word separation occurs when the parser encounters an unquoted token
 and, in certain cases, whitespace.
-Whitespace is only used as a word seperator when the parser is
+Whitespace is only used as a word separator when the parser is
 looking for a block-type or keyword.
 When it's looking for a block-name or value, whitespace is like any
 other character, which allows you to embed whitespace in a block-name
@ -123,14 +123,16 @@ fashion (top down), so order is important.
 .RS
 .TP 15
 .B admin
-.RI [ " username" ,...
+.RI "[ [\fB!\fP]" username ,...
 | "" ]
 .br
 Define a list of users making up the admin list for the console server.
 If
 .I username
 matches a previously defined group name, all members of the previous
-group are added to the admin list.
+group are applied to the admin list (with access reversed if prefixed
+with a `!').
+Otherwise, users will be granted (or denied if prefixed with `!') access.
 If the null string (``""'') is used, any
 users previously defined for the console servers's admin list are removed.
 .TP
@ -202,7 +204,9 @@ alert
 backspace
 .TP
 .B \ed
-0.33 second delay
+delay specified by the
+.B delay
+option.
 .TP
 .B \ef
 form-feed
@ -316,6 +320,16 @@ Set the base port number used by child processes (see the
 .B \-b
 command-line flag).
 .TP
+.B setproctitle
+.RB [ " yes " | " true " | " on " | " no " | " false " | " off " ]
+.br
+Set whether or not the process title shows master/group functionality
+as well as the port number the process is listening on and how many
+consoles it is managing.
+The operating system must support the
+.BR setproctitle ()
+call.
+.TP
 .B sslcredentials
 .I filename
 .br
@ -331,6 +345,15 @@ command-line flag).
 Set whether or not encryption is required when talking to clients (see the
 .B \-E
 command-line flag).
+.TP
+.B unifiedlog
+.I filename
+.br
+Set the location of the unified log to
+.IR filename .
+See the
+.B \-U
+command-line flag for details.
 .RE
 .TP 8
 .B console
@ -360,7 +383,7 @@ Define a block of defaults identified as
 If 
 .I name
 is ``*'', the automatically applied default block is defined (basically
-all consoles have an implicit ``include "*";'' at the begining
+all consoles have an implicit ``include "*";'' at the beginning
 of their definition).
 .RS
 .TP 15
@ -387,6 +410,76 @@ Assign the serial device
 as the access to the console.
 Only consoles of type ``device'' will use this value.
 .TP
+.B devicesubst
+.RI [ c = t [ n ] f "[,...]"
+| "" ]
+.br
+Perform character substitutions on the
+.B device
+value.
+A series of replacements can be defined by specifying a
+comma-separated list of
+.IR c = t [ n ] f
+sequences where
+.I c
+is any printable character,
+.I t
+specifies the replacement value,
+.I n
+is a field length (optional),
+and
+.I f
+is the format string.
+.I t
+can be one of the characters below, catagorized as a string replacement
+or a numeric replacement, which dictates the use of the
+.I n
+and
+.I f
+fields.
+.RS
+.RS
+.sp
+.PD 0
+.TP
+String Replacement
+.TP
+.B h
+.B host
+value
+.TP
+.B c
+console name
+.sp
+.PP
+Numeric Replacement
+.TP
+.B p
+config
+.B port
+value
+.TP
+.B P
+calculated port value
+.PD
+.RE
+.RE
+.IP
+For string replacements, if the replacement isn't at least
+.I n
+characters, it will be padded with space characters on the left.
+.I f
+must be `s'.
+For numeric replacements, the value will be formatted to at least
+.I n
+characters, padded with 0s if
+.I n
+begins with a 0, and space characters otherwise.
+.I f
+must be either `d', `x' or `X', specifying a decimal, lower-case
+hexadecimal, or an uppercase hexadecimal conversion.
+If the null string (``""'') is used, no replacements will be done.
+.TP
 .B exec
 .RI [ " command "
 | "" ]
@ -399,7 +492,19 @@ invoking ``/bin/sh -ce "\fIcommand\fP"''.
 If the null string (``""'') is used or no
 .B exec
 keyword is specified, conserver will use the command ``/bin/sh -i''.
-Only consoles of type ``device'' will use this value.
+Only consoles of type ``exec'' will use this value.
+.TP
+.B execsubst
+.RI [ c = t [ n ] f "[,...]"
+| "" ]
+.br
+Perform character substitutions on the
+.B exec
+value.
+See the
+.B devicesubst
+option for an explanation of the format string.
+If the null string (``""'') is used, no replacements will be done.
 .TP
 .B host
 .I hostname
@ -410,7 +515,43 @@ as the host to connect to for accessing the console.
 You must also set the
 .B port
 option as well.
-Only consoles of type ``host'' will use this value.
+Normally, only consoles of type ``host'' will use this value, however
+if the
+.BR devicesubst ,
+.BR execsubst ,
+or
+.B initsubst
+keywords are used in any console type, this value is used.
+.TP
+.B idlestring
+.RI [ " string "
+| "" ]
+.br
+Assign the
+.I string
+that is sent to the console once the console is idle for an
+.I idletimeout
+amount of time.
+If the null string (``""'') is used, the string is unset and
+the default is used.
+The string is interpreted just as a
+.B break
+string is interpreted (see the
+.B break
+configuration items for details) where all delays specified (via ``\ed'')
+use the default delay time.
+The default string is ``\en''.
+.TP
+.B idletimeout
+.BR \fInumber\fP [ s | m | h ]
+.br
+Set the idle timeout of the console to
+.I number
+seconds.
+If an `s', `m', or `h' is used after
+.IR number ,
+the specified time is interpreted as seconds, minutes, or hours.
+Set the timeout to zero to disable the idle timeout (the default).
 .TP
 .B include
 .I default
@ -435,18 +576,65 @@ is passed as an argument to ``/bin/sh -ce''.
 If the null string (``""'') is used, the command is unset and
 nothing is invoked.
 .TP
+.B initsubst
+.RI [ c = t [ n ] f "[,...]"
+| "" ]
+.br
+Perform character substitutions on the
+.B initcmd
+value.
+See the
+.B devicesubst
+option for an explanation of the format string.
+If the null string (``""'') is used, no replacements will be done.
+.TP
 .B logfile
 .RI [ " filename "
 | "" ]
 .br
 Assign the logfile specified by
 .I filename
-to the console.  Any occurance of ``&'' in
+to the console.
+Any occurrence of ``&'' in
 .I filename
 will be replaced with the name of the console.
 If the null string (``""'') is used, the logfile name is unset and
 no logging will occur.
 .TP
+.B logfilemax
+.BR \fInumber\fP [ k | m ]
+.br
+Enable automatic rotation of
+.B logfile
+once it's size exceeds
+.I number
+bytes.
+Specifying
+.B k
+or
+.B m
+interpret
+.I number
+as kilobytes and megabytes.
+.I number
+must be at least 2048 bytes.
+A value of zero will turn off automatic rotation of
+.BR logfile .
+The
+.B logfile
+.I filename
+will be renamed
+.IR filename -\s-1YYYYMMDD\s0-\s-1HHMMSS\s0,
+where the extension is the current GMT year, month, day, hour,
+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 " ]
 .br
@ -456,6 +644,16 @@ The host may be specified by
 or using the address
 .IR ipaddr .
 .TP
+.B motd
+.RI [ " message "
+| "" ]
+.br
+Set the "message of the day" for the console to
+.IR message ,
+which gets displayed when a client attaches to the console.
+If the null string (``""'') is used, the MOTD is unset and
+no message will occur.
+.TP
 .B options
 .RI [ " option" ,...
 | "" ]
@ -534,7 +732,7 @@ The conserver option
 .B \-7
 will set this flag for all consoles.
 Default is
-.BR !stiphigh .
+.BR !striphigh .
 .TP
 .B reinitoncc
 Automatically reinitialize (``bring up'') a downed console when a client
@ -586,17 +784,81 @@ Set the port used to access the console.
 The port may be specified as a
 .I number
 or a
-.IR name ,
-in which case it will use
+.IR name .
+A
+.I name
+will cause a
 .BR getservbyname (3)
-to look up a port number.
+call to look up the port number.
+The
+.BR port ,
+.BR portbase ,
+and
+.B portinc
+values are all used to calculate the final port number to connect to.
+The formula used is
+.IR finalport " = "
+.BR portbase " + "
+.BR portinc " * " port .
+By using proper values in the formula, you can reference ports on a
+terminal server by their physical numbering of
+.RI 0.. n
+or
+.RI 1.. n
+(depending on if you like zero-based or one-based numbering).
+Warning: you can generate a \-1 value with this formula,
+which will become a very high numbered positive
+value (since things are stored unsigned).
 You must also set the
 .B host
 option as well.
-Only consoles of type ``host'' will use this value.
+Normally, only consoles of type ``host'' will use this value, however
+if the
+.BR devicesubst ,
+.BR execsubst ,
+or
+.B initsubst
+keywords are used in any console type, this value is used.
+.TP
+.B portbase
+.I number
+.br
+Set the base value for the port calculation formula.
+.I number
+must be 0 or greater.
+The default is zero.
+See
+.B port
+for the details of the formula.
+.TP
+.B portinc
+.I number
+.br
+Set the increment value for the port calculation formula.
+.I number
+must be 0 or greater.
+The default is one.
+See
+.B port
+for the details of the formula.
+.TP
+.B protocol
+.RB [ " telnet " | " raw " ]
+.br
+Set the protocol used to send and receive data from the console.
+If
+.B raw
+is used, all data is sent ``as is'', unprotected by any protocol specification.
+If
+.B telnet
+is used (which is the default), data is encapsulated in the telnet protocol.
+The
+.B striphigh
+console option still applies when data is read by the server, and if enabled,
+can impact the encapsulation process.
 .TP
 .B ro
-.RI [ " username" ,...
+.RI "[ [\fB!\fP]" username ,...
 | "" ]
 .br
 Define a list of users making up the read-only access list
@ -604,12 +866,15 @@ for the console.
 If
 .I username
 matches a previously defined group name, all members of the previous
-group are added to the read-only access list.
+group are applied to the read-only access list (with access reversed
+if prefixed with a `!').
+Otherwise, users will be granted (or denied if prefixed with `!')
+read-only access.
 If the null string (``""'') is used, any
 users previously defined for the console's read-only list are removed.
 .TP
 .B rw
-.RI [ " username" ,...
+.RI "[ [\fB!\fP]" username ,...
 | "" ]
 .br
 Define a list of users making up the read-write access list
@ -617,7 +882,10 @@ for the console.
 If
 .I username
 matches a previously defined group name, all members of the previous
-group are added to the read-write access list.
+group are applied to the read-write access list (with access reversed
+if prefixed with a `!').
+Otherwise, users will be granted (or denied if prefixed with `!')
+read-write access.
 If the null string (``""'') is used, any
 users previously defined for the console's read-write list are removed.
 .TP
@ -656,7 +924,8 @@ can be specified to add logging of break sequences sent to the console.
 .B type
 .RB [ " device " | " exec " | " host " ]
 .br
-Set the type of console.  The type
+Set the type of console.
+The type
 .RB `` device ''
 should be used for local serial ports (also set the
 .B device
@ -682,7 +951,7 @@ Define a user group identified as
 .RS
 .TP 15
 .B users
-.RI [ " username" ,...
+.RI "[ [\fB!\fP]" username ,...
 | "" ]
 .br
 Define a list of users making up the group
@ -690,7 +959,10 @@ Define a list of users making up the group
 If
 .I username
 matches a previously defined group name, all members of the previous
-group are added to the current group.
+group are applied to the current group (with access reversed
+if prefixed with a `!').
+Otherwise, users will be recorded with (or without if prefixed with `!')
+access.
 If the null string (``""'') is used, any
 users previously defined for this group are removed.
 .RE
--- 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.1" "conserver"
+.\" $Id: conserver.passwd.man,v 1.10 2004/01/08 16:12:33 bryan Exp $
+.TH CONSERVER.PASSWD 5 "2004/01/08" "conserver-8.1.3" "conserver"
 .SH NAME
 conserver.passwd \- user access information for
 .BR conserver (8)
@ -59,7 +59,8 @@ in the system
 If PAM support has been enabled
 .RB ( --with-pam ),
 PAM lookups will be done instead of
-.BR passwd " (or " shadow ") lookups."
+.BR passwd " (or " shadow ") lookups"
+(you may need to edit /etc/pam.conf or create /etc/pam.d/conserver).
 If this field is empty, password checking is bypassed for this user.
 .SH EXAMPLE
 .TP 24
--- a/conserver.cf/label.ps
+++ b/conserver.cf/label.ps
@ -1,5 +1,5 @@
 %!PS-Adobe-2.0 EPSF-1.2
-%%$Id: label.ps,v 1.8 94/01/21 09:37:42 ksb Exp $
+%%$Id: label.ps,v 1.1 2003/11/04 02:36:26 bryan Exp $
 %%Title: RJ-11
 %%Creator: A Braunsdorf
 %%CreationDate: 
--- a/conserver.cf/samples/README
+++ b/conserver.cf/samples/README
@ -0,0 +1,21 @@
+I put together the sample configuration files in this directory in hopes
+that it would help folks see some of the possibilities of the
+configuration file format.  Each of the files are syntatically correct,
+but have never actually been used.
+
+Each file is basically built upon the previous...theoretically, if not
+actually.  Hopefully they'll help show some of the cool things you can
+do with the configuration file and help those trying to figure out how
+they should even start.
+
+    simple.cf - A very simple, one console config file
+
+    basic.cf - A config with a couple consoles, mostly using defaults
+
+    average.cf - A config for many consoles, using breaks, user lists,
+		 etc...bascially customizing each area
+
+    average-distributed.cf - Taking average.cf to multiple conserver
+			     hosts with overrides on those hosts
+
+Bryan Stansell
--- a/conserver.cf/samples/average-distributed.cf
+++ b/conserver.cf/samples/average-distributed.cf
@ -0,0 +1,109 @@
+#
+# I took the average.cf file and expanded it to use a distributed
+# conserver setup...two conserver hosts (conserver1 and conserver2), but
+# the basic philosophy would hold for many more console and/or conserver
+# hosts.
+#
+
+# ------ define a user group ------
+group sysadmin {
+    users bryan, todd, dave;
+}
+# helpers is everyone but the sysadmin group
+group helpers {
+    users *, !sysadmin;
+}
+
+
+# ------ make sure breaks are the way we want --------
+break 1 { string "\z"; }
+break 2 { string "\r\d~\d^b"; delay 600; }
+break 3 { string "#."; }
+
+
+# ----- define some console types ------
+# yeah, just setting a break doesn't quite seem worth it, but perhaps,
+# some day, there will be more host-specific stuff.
+default sun-std { break 1; }
+default sun-alt { break 2; }
+default sun-lom { break 3; }
+
+
+# ------ defaults ------
+# we set a 'global' default so we can reuse the bits below.  we're going
+# to set the '*' default, then define consoles, reset the '*' default,
+# define more consoles, etc.
+default global {
+	logfile /var/consoles/&;	# '&' is replaced with console name
+	timestamp 1hab;			# write timestamps
+	rw sysadmin;			# allow sysadmins full access
+	ro helpers;			# allow helpers to watch
+	include sun-std;
+}
+
+
+# --------- define our terminal attributes ----------
+# simple tcp connections are "easy"
+default cisco { type host; portbase 2000; portinc 1; }
+default xyplex  { type host; portbase 2000; portinc 100; }
+
+# this is a cyclades card referenced with /dev/ttyC0 through /dev/ttyC31
+# (referenced as ports 1 through 32 in conserver.cf)
+# we set the various port calculation bits and pattern substitution to
+# come up with a generic definition
+default cyclades { type device; device /dev/ttyC&; baud 9600; parity none;
+		   devicesubst &=Pd; portbase -1; portinc 1; host unused; }
+
+## this is a term server accessed with an ssh command
+# it too uses pattern substitution and such to get the job done
+default ciscossh { type exec; portbase 2000; portinc 1;
+		   exec /usr/local/bin/ssh -p P -l tsuser H;
+		   execsubst H=hs,P=Pd; }
+
+
+# ------- set the global default for the first conserver host -------
+# the consoles below (until the default is reset) are managed
+# by conserver1.conserver.com
+default * { include global; master conserver1.conserver.com; }
+
+# ------- define the consoles on ts1.conserver.com --------
+default ts1.conserver.com { include cisco; host ts1.conserver.com; }
+console web1.conserver.com { include ts1.conserver.com; port 2; }
+console ns1.conserver.com { include ts1.conserver.com; port 10; }
+
+# ------- define the consoles on ts2.conserver.com --------
+default ts2.conserver.com { include xyplex; host ts2.conserver.com; }
+console web2.conserver.com { include ts2.conserver.com; port 4; }
+console ns2.conserver.com { include ts2.conserver.com; port 22; }
+
+# ------- set the global default for the second conserver host -------
+# the following consoles are managed by conserver2.conserver.com
+default * { include global; master conserver2.conserver.com; }
+
+# ------- define the consoles on ts3.conserver.com --------
+default ts3.conserver.com { include ciscossh; host ts3.conserver.com; }
+console ftp1.conserver.com { include ts3.conserver.com; include sun-lom;
+			     port 7; }
+
+# ------- set up the an access list to avoid the default -------
+# anything *not* matched here will fallback to the default access mode
+access * {
+	trusted 127.0.0.1;
+	allowed 10.0.0.0/8;
+}
+
+# conserver2 has an extra leg that is trusted
+access conserver2.conserver.com { trusted 192.168.0.0/16; }
+
+# ------- do some server configuration ---------
+# both conserver1.conserver.com and conserver2.conserver.com use the same
+# set of defaults
+config * {
+	defaultaccess rejected;
+	daemonmode on;
+	logfile /var/log/conserver;
+}
+
+# we're going to set the default access on conserver2 to allowed, because
+# it's in a higher-trust network
+config conserver2.conserver.com { defaultaccess allowed; }
--- a/conserver.cf/samples/average.cf
+++ b/conserver.cf/samples/average.cf
@ -0,0 +1,91 @@
+#
+# This would be what i'd expect a more common configuration file would
+# look like.  There are consoles attached to multiple devices, simple
+# access lists, etc.
+#
+
+# ------ define a user group ------
+group sysadmin {
+    users bryan, todd, dave;
+}
+# helpers is everyone but the sysadmin group
+group helpers {
+    users *, !sysadmin;
+}
+
+
+# ------ make sure breaks are the way we want --------
+break 1 { string "\z"; }
+break 2 { string "\r\d~\d^b"; delay 600; }
+break 3 { string "#."; }
+
+
+# ----- define some console types ------
+# yeah, just setting a break doesn't quite seem worth it, but perhaps,
+# some day, there will be more host-specific stuff.
+default sun-std { break 1; }
+default sun-alt { break 2; }
+default sun-lom { break 3; }
+
+
+# ------ defaults ------
+# now for some generic console defaults so that we don't have to
+# duplicate them for each console.
+default * {
+	logfile /var/consoles/&;	# '&' is replaced with console name
+	timestamp 1hab;			# write timestamps
+	rw sysadmin;			# allow sysadmins full access
+	ro helpers;			# allow helpers to watch
+	master localhost;
+	include sun-std;
+}
+
+
+# --------- define our terminal attributes ----------
+# simple tcp connections are "easy"
+default cisco { type host; portbase 2000; portinc 1; }
+default xyplex  { type host; portbase 2000; portinc 100; }
+
+# this is a cyclades card referenced with /dev/ttyC0 through /dev/ttyC31
+# (referenced as ports 1 through 32 in conserver.cf)
+# we set the various port calculation bits and pattern substitution to
+# come up with a generic definition
+default cyclades { type device; device /dev/ttyC&; baud 9600; parity none;
+		   devicesubst &=Pd; portbase -1; portinc 1; host unused; }
+
+## this is a term server accessed with an ssh command
+# it too uses pattern substitution and such to get the job done
+default ciscossh { type exec; portbase 2000; portinc 1;
+		   exec /usr/local/bin/ssh -p P -l tsuser H;
+		   execsubst H=hs,P=Pd; }
+
+
+# ------- define the consoles on ts1.conserver.com --------
+default ts1.conserver.com { include cisco; host ts1.conserver.com; }
+console web1.conserver.com { include ts1.conserver.com; port 2; }
+console ns1.conserver.com { include ts1.conserver.com; port 10; }
+
+# ------- define the consoles on ts2.conserver.com --------
+default ts2.conserver.com { include xyplex; host ts2.conserver.com; }
+console web2.conserver.com { include ts2.conserver.com; port 4; }
+console ns2.conserver.com { include ts2.conserver.com; port 22; }
+
+# ------- define the consoles on ts3.conserver.com --------
+default ts3.conserver.com { include ciscossh; host ts3.conserver.com; }
+console ftp1.conserver.com { include ts3.conserver.com; include sun-lom;
+			     port 7; }
+
+
+# ------- set up the an access list to avoid the default -------
+# anything *not* matched here will fallback to the default access mode
+access * {
+	trusted 127.0.0.1;
+	allowed 10.0.0.0/8;
+}
+
+# ------- do some server configuration ---------
+config * {
+	defaultaccess rejected;
+	daemonmode on;
+	logfile /var/log/conserver;
+}
--- a/conserver.cf/samples/basic.cf
+++ b/conserver.cf/samples/basic.cf
@ -0,0 +1,28 @@
+#
+# This is a fairly basic configuration file that interacts with one
+# terminal server.
+#
+
+# first, we're going to set some generic console defaults so that we
+# don't have to duplicate them for each console.
+default * {
+	logfile /var/consoles/&;	# '&' is replaced with console name
+	timestamp 1hab;			# write timestamps
+	rw *;				# allow all users
+	master localhost;
+	type host;
+	host ts1.conserver.com;		# consoles on ts1.conserver.co
+	portbase 2000;			# port numbers start at 2001 and
+	portinc 1;			# go up by 1 (port #1 == 2001, etc)
+}
+
+# define two consoles on the terminal server
+console web1.conserver.com { port 2; }	# calculates to tcp port 2002
+console ns1.conserver.com { port 10; }	# calculates to tcp port 2010
+
+# set up the an access list to avoid the default
+# anything *not* matched here will fallback to the default access (-a)
+# mode
+access * {
+	trusted 127.0.0.1;
+}
--- a/conserver.cf/samples/simple.cf
+++ b/conserver.cf/samples/simple.cf
@ -0,0 +1,11 @@
+#
+# I believe this is the smallest configuration file that is also fully
+# functional.  You have to be happy with the default access type (-a)
+# as well as the default access list that gets used.
+# 
+
+console simple {
+    master localhost;
+    type exec;
+    rw *;
+}
--- a/conserver.cf/test.cf
+++ b/conserver.cf/test.cf
@ -1,6 +1,6 @@
 # dummy conserver config file
 #
-# $Id: test.cf,v 1.2 2003-07-04 11:04:05-07 bryan Exp $
+# $Id: test.cf,v 1.2 2003/07/04 18:04:05 bryan Exp $
 #
 default full {
 	rw *;
--- a/conserver.html
+++ b/conserver.html
@ -9,6 +9,7 @@
    <META name="author" content=
    "Bryan Stansell &lt;bryan@conserver.com&gt;">
    <LINK rel="SHORTCUT ICON" href="conserver.ico">
+    <LINK rel="icon" href="conserver.ico">

    <TITLE>Conserver</TITLE>

@ -55,11 +56,11 @@
            <INPUT type="HIDDEN" name="method" value="and"> <INPUT
            type="HIDDEN" name="format" value="builtin-long">
            <INPUT type="HIDDEN" name="sort" value="score"> <INPUT
-            type="HIDDEN" name="config" value="htdig"> <INPUT type=
-            "HIDDEN" name="restrict" value=""> <INPUT type="HIDDEN"
-            name="exclude" value=""> <INPUT type="TEXT" size="20"
-            name="words" value=""> <INPUT type="SUBMIT" value=
-            "Search">
+            type="HIDDEN" name="config" value="conserver.com">
+            <INPUT type="HIDDEN" name="restrict" value=""> <INPUT
+            type="HIDDEN" name="exclude" value=""> <INPUT type=
+            "TEXT" size="20" name="words" value=""> <INPUT type=
+            "SUBMIT" value="Search">
          </FORM>
        </TD>
      </TR>
@ -159,35 +160,32 @@
          the website. Next, there's Kevin Braunsdorf's version at
          <A href=
          "ftp://ftp.physics.purdue.edu/pub/pundits/">ftp://ftp.physics.purdue.edu/pub/pundits/</A>.
-          Kevin is semi-actively working on his thread. Doesn't
-          look like any new versions have been out since August
+          It doesn't look like Kevin is working on his thread ony
+          more either. No new versions have been out since August
          2000 (version 8.5), but maybe this info will be out of
-          date by the time you read this. Lastly, the conserver.com
-          version is based on Kevin's "5.21-Beta" distribution, but
-          since <B>HEAVILY</B> modified and enhanced (more details
-          in the "Origin" section above).</P>
+          date by the time you read this (I last checked Feb 10,
+          2004). Lastly, the conserver.com version is based on
+          Kevin's "5.21-Beta" distribution, but since
+          <B>HEAVILY</B> modified and enhanced (more details in the
+          "Origin" section above).</P>

          <P>If I were looking for a conserver package I would
-          either use Kevin's latest distribution or the
-          conserver.com distribution. Which one? Well, obviously
-          I'm biased and believe the conserver.com distribution
-          should be your choice, but Kevin's does have UPS (serial
-          port line toggling bits) that the conserver.com version
-          doesn't have. What does the conserver.com distribution
-          have? Well, in reality, too many things to list. You'll
-          have to look at the <A href="CHANGES">CHANGES</A> file
-          and see the enhancements, bug fixes, and general
-          development since the original. Don't let the version
-          numbers fool you - you'll have to compare and contrast
-          for yourself.</P>
+          definitely use the conserver.com distribution. Why? It's
+          actively maintained, has many more features than the
+          other versions (see <A href="CHANGES">CHANGES</A> for a
+          semi-scary history), and has an active user community.
+          Kevin's version does have UPS support (basic serial port
+          line toggling bits) which is missing in the conserver.com
+          version, but no one has asked me for it, so does anyone
+          actually need it?</P>

          <H3>Downloading</H3>

-          <P>The current version, released on Sep 29, 2003, is <A
-          href="8.0.1.tar.gz">8.0.1.tar.gz</A>. You can get it via
+          <P>The current version, released on Mar 22, 2004, is <A
+          href="8.1.3.tar.gz">8.1.3.tar.gz</A>. You can get it via
          <A href=
-          "ftp://ftp.conserver.com/conserver/8.0.1.tar.gz">FTP</A>
-          or <A href="8.0.1.tar.gz">HTTP</A>. See the <A href=
+          "ftp://ftp.conserver.com/conserver/8.1.3.tar.gz">FTP</A>
+          or <A href="8.1.3.tar.gz">HTTP</A>. See the <A href=
          "CHANGES">CHANGES</A> file for information on the latest
          updates.</P>

@ -208,6 +206,11 @@
          <P>Check the <A href="INSTALL">INSTALL</A> file for
          instructions.</P>

+          <H3>Online Documentation</H3>
+
+          <P>I've put a small set of documentation <A href=
+          "docs/">here</A>. I'm hoping to expand it over time.</P>
+
          <H3>Systems Tested</H3>

          <P>Here's a list of systems that I've been told can
--- a/conserver/Makefile.in
+++ b/conserver/Makefile.in
@ -6,7 +6,8 @@ exec_prefix = @exec_prefix@
 sbindir = @sbindir@
 sysconfdir = @sysconfdir@
 mandir = @mandir@
-exampledir = $(prefix)/share/examples/conserver
+datadir = @datadir@
+exampledir = $(datadir)/examples/conserver

 ### Installation programs and flags
 INSTALL = @INSTALL@
@ -27,21 +28,24 @@ LIBS	= @LIBS@ @CONSLIBS@
 ### Makefile rules - no user-servicable parts below

 CONSERVER_OBJS = access.o client.o consent.o group.o main.o master.o \
-		 readcfg.o fallback.o util.o
+		 readcfg.o fallback.o cutil.o
 CONSERVER_HDRS = ../config.h $(top_srcdir)/compat.h $(srcdir)/access.h \
-		 $(srcdir)/client.h $(srcdir)/consent.h $(srcdir)/group.h \
-		 $(srcdir)/main.h $(srcdir)/master.h $(srcdir)/readcfg.h \
-		 $(srcdir)/util.h
+		 $(srcdir)/client.h $(srcdir)/consent.h $(srcdir)/cutil.h \
+		 $(srcdir)/group.h $(srcdir)/main.h $(srcdir)/master.h \
+		 $(srcdir)/readcfg.h $(srcdir)/version.h
+
 ALL = conserver convert


 all: $(ALL)

+$(CONSERVER_OBJS): $(CONSERVER_HDRS)
+
 conserver: $(CONSERVER_OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o conserver $(CONSERVER_OBJS) $(LIBS)

-convert: convert.o util.o
-	$(CC) $(CFLAGS) $(LDFLAGS) -o convert convert.o util.o $(LIBS)
+convert: convert.o cutil.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o convert convert.o cutil.o $(LIBS)

 .c.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
--- a/conserver/Sun-serial
+++ b/conserver/Sun-serial
@ -1,4 +1,4 @@
-# $Id: Sun-serial,v 2.1 93/02/09 11:45:12 ldv Exp $
+# $Id: Sun-serial,v 1.1 2003/11/04 02:36:25 bryan Exp $

 If you are going to be hooking Sun consoles to your console server, you
 will run into a problem:  The sun will halt whenever the cable is unplugged.
--- a/conserver/access.c
+++ b/conserver/access.c
@ -1,5 +1,5 @@
 /*
- *  $Id: access.c,v 5.66 2003-08-15 14:24:39-07 bryan Exp $
+ *  $Id: access.c,v 5.71 2003/11/20 13:56:38 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -36,7 +36,7 @@

 #include <compat.h>

-#include <util.h>
+#include <cutil.h>
 #include <access.h>
 #include <consent.h>
 #include <client.h>
@ -137,91 +137,138 @@ AccType(addr, peername)
    socklen_t so;
    struct hostent *he = (struct hostent *)0;
    int a;
+    char ret;
 #if TRUST_REVERSE_DNS
-    char *pcName;
-    int wlen;
-    char *hname;
-    int len;
+    char **revNames = (char **)0;
 #endif

    CONDDEBUG((1, "AccType(): ip=%s", inet_ntoa(*addr)));

+    ret = config->defaultaccess;
    so = sizeof(*addr);
-    for (pACtmp = pACList; pACtmp != (ACCESS *)0; pACtmp = pACtmp->pACnext) {
-	CONDDEBUG((1, "AccType(): who=%s, trust=%c", pACtmp->pcwho,
-		   pACtmp->ctrust));
-	if (pACtmp->isCIDR != 0) {
-	    if (AddrCmp(addr, pACtmp->pcwho) == 0)
-		return pACtmp->ctrust;
-	    continue;
-	}
-
-	if ((he = gethostbyname(pACtmp->pcwho)) == (struct hostent *)0) {
-	    Error("AccType(): gethostbyname(%s): %s", pACtmp->pcwho,
-		  hstrerror(h_errno));
-	    continue;
-	}
-	if (4 != he->h_length || AF_INET != he->h_addrtype) {
-	    Error
-		("AccType(): gethostbyname(%s): wrong address size (4 != %d) or address family (%d != %d)",
-		 pACtmp->pcwho, he->h_length, AF_INET, he->h_addrtype);
-	    continue;
-	}
-	for (a = 0; he->h_addr_list[a] != (char *)0; a++) {
-	    CONDDEBUG((1, "AccType(): addr=%s",
-		       inet_ntoa(*(struct in_addr *)
-				 (he->h_addr_list[a]))));
-	    if (
-#if HAVE_MEMCMP
-		   memcmp(&(addr->s_addr), he->h_addr_list[a],
-			  he->h_length)
-#else
-		   bcmp(&(addr->s_addr), he->h_addr_list[a], he->h_length)
-#endif
-		   == 0)
-		return pACtmp->ctrust;
-	}
-    }

 #if TRUST_REVERSE_DNS
    /* if we trust reverse dns, we get the names associated with
     * the address we're checking and then check each of those
-     * against the access list entries.
-     * we chop bits off client names so that we can put domain
-     * names in access lists or even top-level domains.
-     *    allowed conserver.com, net;
-     * this allows anything from conserver.com and anything in
-     * the .net top-level.  without TRUST_REVERSE_DNS, those names
-     * better map to ip addresses for them to take effect.
+     * against the access list entries (below).
     */
    if ((he =
 	 gethostbyaddr((char *)addr, so,
 		       AF_INET)) == (struct hostent *)0) {
 	Error("AccType(): gethostbyaddr(%s): %s", inet_ntoa(*addr),
 	      hstrerror(h_errno));
-	return config->defaultaccess;
-    }
-    for (pACtmp = pACList; pACtmp != (ACCESS *)0; pACtmp = pACtmp->pACnext) {
-	if (pACtmp->isCIDR != 0)
-	    continue;
-	wlen = strlen(pACtmp->pcwho);
-	for (hname = he->h_name, a = 0; hname != (char *)0;
-	     hname = he->h_aliases[a++]) {
-	    for (pcName = hname, len = strlen(pcName); len >= wlen;
-		 len = strlen(++pcName)) {
-		CONDDEBUG((1, "AccType(): name=%s", pcName));
-		if (strcasecmp(pcName, pACtmp->pcwho) == 0) {
-		    *peername = hname;
-		    return pACtmp->ctrust;
+    } else {
+	char *hname;
+	if (he->h_name != (char *)0) {
+	    /* count up the number of names */
+	    for (a = 0, hname = he->h_aliases[a]; hname != (char *)0;
+		 hname = he->h_aliases[++a]);
+	    a += 2;		/* h_name + (char *)0 */
+	    /* now duplicate them */
+	    if ((revNames =
+		 (char **)calloc(a, sizeof(char *))) != (char **)0) {
+		for (hname = he->h_name, a = 0; hname != (char *)0;
+		     hname = he->h_aliases[a++]) {
+		    if ((revNames[a] = StrDup(hname)) == (char *)0)
+			break;
+		    CONDDEBUG((1,"AccType(): revNames[%d]='%s'", a, hname));
 		}
-		pcName = strchr(pcName, '.');
-		if (pcName == (char *)0)
-		    break;
 	    }
 	}
    }
 #endif
-    return config->defaultaccess;
+
+    for (pACtmp = pACList; pACtmp != (ACCESS *)0; pACtmp = pACtmp->pACnext) {
+	CONDDEBUG((1, "AccType(): who=%s, trust=%c", pACtmp->pcwho,
+		   pACtmp->ctrust));
+	if (pACtmp->isCIDR != 0) {
+	    if (AddrCmp(addr, pACtmp->pcwho) == 0) {
+		ret = pACtmp->ctrust;
+		goto common_ret;
+	    }
+	    continue;
+	}
+
+	if ((he = gethostbyname(pACtmp->pcwho)) == (struct hostent *)0) {
+	    Error("AccType(): gethostbyname(%s): %s", pACtmp->pcwho,
+		  hstrerror(h_errno));
+	} else if (4 != he->h_length || AF_INET != he->h_addrtype) {
+	    Error
+		("AccType(): gethostbyname(%s): wrong address size (4 != %d) or address family (%d != %d)",
+		 pACtmp->pcwho, he->h_length, AF_INET, he->h_addrtype);
+	} else {
+	    for (a = 0; he->h_addr_list[a] != (char *)0; a++) {
+		CONDDEBUG((1, "AccType(): addr=%s",
+			   inet_ntoa(*(struct in_addr *)
+				     (he->h_addr_list[a]))));
+		if (
+#if HAVE_MEMCMP
+		       memcmp(&(addr->s_addr), he->h_addr_list[a],
+			      he->h_length)
+#else
+		       bcmp(&(addr->s_addr), he->h_addr_list[a],
+			    he->h_length)
+#endif
+		       == 0) {
+		    ret = pACtmp->ctrust;
+		    goto common_ret;
+		}
+	    }
+	}
+#if TRUST_REVERSE_DNS
+	/* we chop bits off client names so that we can put domain
+	 * names in access lists or even top-level domains.
+	 *    allowed conserver.com, net;
+	 * this allows anything from conserver.com and anything in
+	 * the .net top-level.  without TRUST_REVERSE_DNS, those names
+	 * better map to ip addresses for them to take effect.
+	 */
+	if (revNames != (char **)0) {
+	    char *pcName;
+	    int wlen;
+	    int len;
+	    wlen = strlen(pACtmp->pcwho);
+	    for (a = 0; revNames[a] != (char *)0; a++) {
+		for (pcName = revNames[a], len = strlen(pcName);
+		     len >= wlen; len = strlen(++pcName)) {
+		    CONDDEBUG((1, "AccType(): name=%s", pcName));
+		    if (strcasecmp(pcName, pACtmp->pcwho) == 0) {
+			if (peername != (char **)0)
+			    *peername = StrDup(revNames[a]);
+			ret = pACtmp->ctrust;
+			goto common_ret2;
+		    }
+		    pcName = strchr(pcName, '.');
+		    if (pcName == (char *)0)
+			break;
+		}
+	    }
+	}
+#endif
+    }
+
+  common_ret:
+    if (config->loghostnames == FLAGTRUE && peername != (char **)0) {
+#if TRUST_REVERSE_DNS
+	if (revNames != (char **)0 && revNames[0] != (char *)0)
+	    *peername = StrDup(revNames[0]);
+#else
+	if ((he =
+	     gethostbyaddr((char *)addr, so,
+			   AF_INET)) != (struct hostent *)0) {
+	    *peername = StrDup(he->h_name);
+	}
+#endif
+    }
+#if TRUST_REVERSE_DNS
+  common_ret2:
+    if (revNames != (char **)0) {
+	for (a = 0; revNames[a] != (char *)0; a++)
+	    free(revNames[a]);
+	free(revNames);
+    }
+#endif
+    return ret;
 }

 void
@ -241,7 +288,7 @@ SetDefAccess(pAddr, pHost)
 	addr = inet_ntoa(*pAddr);
 	if ((a = (ACCESS *)calloc(1, sizeof(ACCESS))) == (ACCESS *)0)
 	    OutOfMem();
-	if ((a->pcwho = strdup(addr)) == (char *)0)
+	if ((a->pcwho = StrDup(addr)) == (char *)0)
 	    OutOfMem();
 	a->ctrust = 'a';
 	a->pACnext = pACList;
@ -258,7 +305,7 @@ SetDefAccess(pAddr, pHost)

    if ((a = (ACCESS *)calloc(1, sizeof(ACCESS))) == (ACCESS *)0)
 	OutOfMem();
-    if ((a->pcwho = strdup(pcDomain)) == (char *)0)
+    if ((a->pcwho = StrDup(pcDomain)) == (char *)0)
 	OutOfMem();
    a->ctrust = 'a';
    a->pACnext = pACList;
--- a/conserver/access.h
+++ b/conserver/access.h
@ -1,5 +1,5 @@
 /*
- *  $Id: access.h,v 5.26 2003-08-10 11:11:20-07 bryan Exp $
+ *  $Id: access.h,v 5.26 2003/08/10 18:11:20 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
--- a/conserver/client.c
+++ b/conserver/client.c
@ -1,5 +1,5 @@
 /*
- *  $Id: client.c,v 5.70 2003-09-28 08:42:06-07 bryan Exp $
+ *  $Id: client.c,v 5.81 2004/03/20 14:40:40 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -36,7 +36,7 @@

 #include <compat.h>

-#include <util.h>
+#include <cutil.h>
 #include <consent.h>
 #include <access.h>
 #include <client.h>
@ -78,9 +78,10 @@ FindWrite(pCE)
 	pCL->fwantwr = 0;
 	pCL->fwr = 1;
 	if (pCE->nolog) {
-	    FileWrite(pCL->fd, "\r\n[attached (nologging)]\r\n", -1);
+	    FileWrite(pCL->fd, FLAGFALSE, "\r\n[attached (nologging)]\r\n",
+		      -1);
 	} else {
-	    FileWrite(pCL->fd, "\r\n[attached]\r\n", -1);
+	    FileWrite(pCL->fd, FLAGFALSE, "\r\n[attached]\r\n", -1);
 	}
 	TagLogfileAct(pCE, "%s attached", pCL->acid->string);
 	pCE->pCLwr = pCL;
@ -96,15 +97,15 @@ FindWrite(pCE)
 */
 void
 #if PROTOTYPES
-Replay(CONSFILE *fdLog, CONSFILE *fdOut, int iBack)
+Replay(CONSENT *pCE, CONSFILE *fdOut, int iBack)
 #else
-Replay(fdLog, fdOut, iBack)
-    CONSFILE *fdLog;
+Replay(pCE, fdOut, iBack)
+    CONSENT *pCE;
    CONSFILE *fdOut;
    int iBack;
 #endif
 {
-
+    CONSFILE *fdLog = (CONSFILE *)0;
    off_t file_pos;
    off_t buf_pos;
    char *buf;
@ -129,8 +130,18 @@ Replay(fdLog, fdOut, iBack)
    unsigned long dmallocMarkReplay = 0;
 #endif

-    if ((CONSFILE *)0 == fdLog) {
-	FileWrite(fdOut, "[no log file on this console]\r\n", -1);
+    if (pCE != (CONSENT *)0) {
+	fdLog = pCE->fdlog;
+
+	/* no logfile and down and logfile defined?  try and open it */
+	if (fdLog == (CONSFILE *)0 && !pCE->fup &&
+	    pCE->logfile != (char *)0)
+	    fdLog = FileOpen(pCE->logfile, O_RDONLY, 0644);
+    }
+
+    if (fdLog == (CONSFILE *)0) {
+	FileWrite(fdOut, FLAGFALSE, "[no log file on this console]\r\n",
+		  -1);
 	return;
    }

@ -177,17 +188,9 @@ Replay(fdLog, fdOut, iBack)
 	     * the rest (as we work our way back in the file) should be
 	     */
 	    buf_pos = (file_pos / BUFSIZ) * BUFSIZ;
-#if defined(SEEK_SET)
-	    /* PTX and maybe other Posix systems
-	     */
 	    if (FileSeek(fdLog, buf_pos, SEEK_SET) < 0) {
 		goto common_exit;
 	    }
-#else
-	    if (FileSeek(fdLog, buf_pos, L_SET) < 0) {
-		goto common_exit;
-	    }
-#endif
 	    if ((r = FileRead(fdLog, buf, BUFSIZ)) < 0) {
 		goto common_exit;
 	    }
@ -244,8 +247,9 @@ Replay(fdLog, fdOut, iBack)
 			InitString(lines[ln].line);
 		    } else {
 			BuildString((char *)0, lines[ln - 1].line);
-			BuildString(lines[ln].line->string,
-				    lines[ln - 1].line);
+			BuildStringN(lines[ln].line->string,
+				     lines[ln].line->used - 1,
+				     lines[ln - 1].line);
 			BuildString((char *)0, lines[ln].line);
 		    }
 		    ln--;
@ -311,8 +315,9 @@ Replay(fdLog, fdOut, iBack)
 	    if ((char *)0 != s) {
 		*s = '\000';
 	    }
-	    FileWrite(fdOut, lines[i].line->string, -1);
-	    FileWrite(fdOut, " .. ", -1);
+	    FileWrite(fdOut, FLAGTRUE, lines[i].line->string,
+		      lines[i].line->used - 1);
+	    FileWrite(fdOut, FLAGTRUE, " .. ", 4);

 	    /* build the end string by removing the leading "[-- MARK -- "
 	     * and replacing "]\r\n" on the end with " -- MARK --]\r\n"
@ -323,16 +328,22 @@ Replay(fdLog, fdOut, iBack)
 	    if ((char *)0 != s) {
 		*s = '\000';
 	    }
-	    FileWrite(fdOut, lines[i].mark_end->string + mark_len, -1);
-	    FileWrite(fdOut, " -- MARK --]\r\n", -1);
+	    FileWrite(fdOut, FLAGTRUE,
+		      lines[i].mark_end->string + mark_len, -1);
+	    FileWrite(fdOut, FLAGFALSE, " -- MARK --]\r\n", -1);
 	    u = lines[i].mark_end->used;
 	    s = lines[i].mark_end->string;
 	} else
-	    FileWrite(fdOut, lines[i].line->string, -1);
+	    FileWrite(fdOut, FLAGFALSE, lines[i].line->string,
+		      lines[i].line->used - 1);
    }

  common_exit:

+    /* if we opened the logfile, close it */
+    if (fdLog != pCE->fdlog)
+	FileClose(&fdLog);
+
    if ((struct lines *)0 != lines) {
 	for (i = 0; i < n_lines; i++) {
 	    DestroyString(lines[i].mark_end);
@ -356,8 +367,7 @@ Replay(fdLog, fdOut, iBack)
 */
 #define WHEN_SPY	0x01
 #define WHEN_ATTACH	0x02
-#define WHEN_VT100	0x04
-#define WHEN_EXPERT	0x08	/* ZZZ no way to set his yet    */
+#define WHEN_EXPERT	0x04	/* ZZZ no way to set his yet    */
 #define WHEN_ALWAYS	0x40

 #define HALFLINE	40
@ -369,6 +379,7 @@ typedef struct HLnode {

 static HELP aHLTable[] = {
    {WHEN_ALWAYS, ".    disconnect"},
+    {WHEN_ALWAYS, ";    move to another console"},
    {WHEN_ALWAYS, "a    attach read/write"},
    {WHEN_ALWAYS, "b    send broadcast message"},
    {WHEN_ATTACH, "c    toggle flow control"},
@ -381,6 +392,7 @@ static HELP aHLTable[] = {
    {WHEN_ATTACH, "l?   break sequence list"},
    {WHEN_ATTACH, "l0   send break per config file"},
    {WHEN_ATTACH, "l1-9 send specific break sequence"},
+    {WHEN_ALWAYS, "m    display the message of the day"},
    {WHEN_ALWAYS, "o    (re)open the tty and log file"},
    {WHEN_ALWAYS, "p    replay the last 60 lines"},
    {WHEN_ALWAYS, "r    replay the last 20 lines"},
@ -390,17 +402,13 @@ static HELP aHLTable[] = {
    {WHEN_ALWAYS, "w    who is on this console"},
    {WHEN_ALWAYS, "x    show console baud info"},
    {WHEN_ALWAYS, "z    suspend the connection"},
-    {WHEN_ALWAYS, "<cr> ignore/abort command"},
+    {WHEN_ATTACH, "|    attach local command"},
    {WHEN_ALWAYS, "?    print this message"},
+    {WHEN_ALWAYS, "<cr> ignore/abort command"},
    {WHEN_ALWAYS, "^R   replay the last line"},
    {WHEN_ATTACH, "\\ooo send character by octal code"},
    {WHEN_EXPERT, "^I   toggle tab expansion"},
-    {WHEN_EXPERT, ";    change to another console"},
    {WHEN_EXPERT, "+(-) do (not) drop line"},
-    {WHEN_VT100, "PF1  print this message"},
-    {WHEN_VT100, "PF2  disconnect"},
-    {WHEN_VT100, "PF3  replay the last 20 lines"},
-    {WHEN_VT100, "PF4  spy read only"}
 };

 /* list the commands we know for the user				(ksb)
@ -424,13 +432,10 @@ HelpUser(pCL)

    iCmp = WHEN_ALWAYS | WHEN_SPY;
    if (pCL->fwr) {
-	FileWrite(pCL->fd, acH1, sizeof(acH1) - 1);
+	FileWrite(pCL->fd, FLAGTRUE, acH1, sizeof(acH1) - 1);
 	iCmp |= WHEN_ATTACH;
    } else {
-	FileWrite(pCL->fd, acH2, sizeof(acH2) - 1);
-    }
-    if ('\033' == pCL->ic[0] && 'O' == pCL->ic[1]) {
-	iCmp |= WHEN_VT100;
+	FileWrite(pCL->fd, FLAGTRUE, acH2, sizeof(acH2) - 1);
    }

    BuildString((char *)0, acLine);
@ -445,12 +450,14 @@ HelpUser(pCL)
 		}
 		BuildString(aHLTable[i].actext, acLine);
 		BuildString(acEoln, acLine);
-		FileWrite(pCL->fd, acLine->string, -1);
+		FileWrite(pCL->fd, FLAGTRUE, acLine->string,
+			  acLine->used - 1);
 		BuildString((char *)0, acLine);
 		continue;
 	    } else {
 		BuildString(acEoln, acLine);
-		FileWrite(pCL->fd, acLine->string, -1);
+		FileWrite(pCL->fd, FLAGTRUE, acLine->string,
+			  acLine->used - 1);
 		BuildString((char *)0, acLine);
 	    }
 	}
@ -459,15 +466,17 @@ HelpUser(pCL)
 	    BuildString(aHLTable[i].actext, acLine);
 	    if (acLine->used > HALFLINE) {
 		BuildString(acEoln, acLine);
-		FileWrite(pCL->fd, acLine->string, -1);
+		FileWrite(pCL->fd, FLAGTRUE, acLine->string,
+			  acLine->used - 1);
 		BuildString((char *)0, acLine);
 	    }
 	}
    }
    if (acLine->used != 0) {
 	BuildString(acEoln, acLine);
-	FileWrite(pCL->fd, acLine->string, -1);
+	FileWrite(pCL->fd, FLAGTRUE, acLine->string, acLine->used - 1);
    }
+    FileWrite(pCL->fd, FLAGFALSE, (char *)0, 0);
 }

 int
@ -493,7 +502,8 @@ ClientAccessOk(pCL)
 	request_init(&request, RQ_DAEMON, progname, RQ_FILE, cfd, 0);
 	fromhost(&request);
 	if (!hosts_access(&request)) {
-	    FileWrite(pCL->fd, "access from your host refused\r\n", -1);
+	    FileWrite(pCL->fd, FLAGFALSE,
+		      "access from your host refused\r\n", -1);
 	    retval = 0;
 	    goto setpeer;
 	}
@ -503,13 +513,14 @@ ClientAccessOk(pCL)
    so = sizeof(in_port);
    if (-1 ==
 	(getpeer = getpeername(cfd, (struct sockaddr *)&in_port, &so))) {
-	FileWrite(pCL->fd, "getpeername failed\r\n", -1);
+	FileWrite(pCL->fd, FLAGFALSE, "getpeername failed\r\n", -1);
 	retval = 0;
 	goto setpeer;
    }
    pCL->caccess = AccType(&in_port.sin_addr, &peername);
    if (pCL->caccess == 'r') {
-	FileWrite(pCL->fd, "access from your host refused\r\n", -1);
+	FileWrite(pCL->fd, FLAGFALSE, "access from your host refused\r\n",
+		  -1);
 	retval = 0;
    }

@ -523,5 +534,7 @@ ClientAccessOk(pCL)
 	else
 	    BuildString("<unknown>", pCL->peername);
    }
+    if (peername != (char *)0)
+	free(peername);
    return retval;
 }
--- a/conserver/client.h
+++ b/conserver/client.h
@ -1,5 +1,5 @@
 /*
- *  $Id: client.h,v 5.32 2003-09-28 08:41:20-07 bryan Exp $
+ *  $Id: client.h,v 5.36 2003/12/25 19:22:00 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -46,7 +46,9 @@ typedef enum clientState {
    S_IDENT,			/* probational connection (who is this)    */
    S_PASSWD,			/* still needs a passwd to connect         */
    S_QUOTE,			/* send any character we can spell         */
-    S_BCAST			/* send a broadcast message to all clients */
+    S_BCAST,			/* send a broadcast message to all clients */
+    S_CWAIT,			/* wait for client                         */
+    S_CEXEC			/* client execing a program                */
 } CLIENTSTATE;

 typedef struct client {		/* Connection Information:              */
@ -63,7 +65,6 @@ typedef struct client {		/* Connection Information:              */
    time_t typetym;		/* time of last keystroke               */
    char actym[32];		/* pre-formatted time                   */
    struct consent
-     *pCEwant,			/* what machine we would like to be on  */
     *pCEto;			/* host a client gets output from       */
    struct client
    **ppCLbscan,		/* back link for scan ptr               */
@ -83,7 +84,7 @@ typedef struct client {		/* Connection Information:              */
      cnct_port;		/* where from                           */
 } CONSCLIENT;

-extern void Replay PARAMS((CONSFILE *, CONSFILE *, int));
+extern void Replay PARAMS((CONSENT *, CONSFILE *, int));
 extern void HelpUser PARAMS((CONSCLIENT *));
 extern void FindWrite PARAMS((CONSENT *));
 extern int ClientAccessOk PARAMS((CONSCLIENT *));
--- a/conserver/consent.c
+++ b/conserver/consent.c
@ -1,5 +1,5 @@
 /*
- *  $Id: consent.c,v 5.127 2003-09-28 10:37:20-07 bryan Exp $
+ *  $Id: consent.c,v 5.137 2004/02/20 14:58:13 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -42,7 +42,7 @@

 #include <pwd.h>

-#include <util.h>
+#include <cutil.h>
 #include <consent.h>
 #include <client.h>
 #include <group.h>
@ -236,6 +236,23 @@ TtyDev(pCE)
 	ConsDown(pCE, FLAGTRUE, FLAGTRUE);
 	return -1;
    }
+    if (fDebug >= 2) {
+	int i;
+	Debug(2, "TtyDev(): [%s] termp.c_iflag=%lu", pCE->server,
+	      (unsigned long)termp.c_iflag);
+	Debug(2, "TtyDev(): [%s] termp.c_oflag=%lu", pCE->server,
+	      (unsigned long)termp.c_oflag);
+	Debug(2, "TtyDev(): [%s] termp.c_cflag=%lu", pCE->server,
+	      (unsigned long)termp.c_cflag);
+	Debug(2, "TtyDev(): [%s] termp.c_lflag=%lu", pCE->server,
+	      (unsigned long)termp.c_lflag);
+#if defined(NCCS)
+	for (i = 0; i < NCCS; i++) {
+	    Debug(2, "TtyDev(): [%s] termp.c_cc[%d]=%lu", pCE->server, i,
+		  (unsigned long)termp.c_cc[i]);
+	}
+#endif
+    }
 # if HAVE_STROPTS_H
    /*
     * eat all the streams modules upto and including ttcompat
@ -260,11 +277,12 @@ StopInit(pCE)
 	return;

    if (pCE->initpid != 0) {
-	Verbose("[%s] initcmd terminated: pid %lu", pCE->server,
-		(unsigned long)pCE->initpid);
+	kill(pCE->initpid, SIGHUP);
 	CONDDEBUG((1, "StopInit(): sending initcmd pid %lu signal %d",
 		   (unsigned long)pCE->initpid, SIGHUP));
-	kill(pCE->initpid, SIGHUP);
+	Msg("[%s] initcmd terminated: pid %lu", pCE->server,
+	    (unsigned long)pCE->initpid);
+	TagLogfileAct(pCE, "initcmd terminated");
 	pCE->initpid = 0;
    }

@ -358,8 +376,9 @@ StartInit(pCE)
 		pCE->initpid = 0;
 		return;
 	    }
-	    Verbose("[%s] initcmd started: pid %lu", pCE->server,
-		    (unsigned long)pCE->initpid);
+	    Msg("[%s] initcmd started: pid %lu", pCE->server,
+		(unsigned long)pCE->initpid);
+	    TagLogfileAct(pCE, "initcmd started");
 	    FD_SET(pin[0], &rinit);
 	    if (maxfd < pin[0] + 1)
 		maxfd = pin[0] + 1;
@ -689,7 +708,7 @@ ConsInit(pCE)
    TagLogfile(pCE, "Console up");

    switch (pCE->type) {
-	case UNKNOWN:		/* shut up gcc */
+	case UNKNOWNTYPE:	/* shut up gcc */
 	    break;
 	case EXEC:
 	    if ((cofile =
@ -739,7 +758,7 @@ ConsInit(pCE)
 		      hp->h_length);
 #endif
 		port.sin_family = hp->h_addrtype;
-		port.sin_port = htons(pCE->port);
+		port.sin_port = htons(pCE->netport);

 		if ((cofile = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 		    Error
@ -790,6 +809,9 @@ ConsInit(pCE)
 	    } else {
 		pCE->ioState = INCONNECT;
 		pCE->stateTimer = time((time_t *)0) + CONNECTTIMEOUT;
+		if (timers[T_STATE] == (time_t)0 ||
+		    timers[T_STATE] > pCE->stateTimer)
+		    timers[T_STATE] = pCE->stateTimer;
 		pCE->fup = 1;
 	    }
 	    break;
@ -821,14 +843,14 @@ ConsInit(pCE)
    }

    switch (pCE->type) {
-	case UNKNOWN:		/* shut up gcc */
+	case UNKNOWNTYPE:	/* shut up gcc */
 	    break;
 	case EXEC:
 	    Verbose("[%s] pid %lu on %s", pCE->server, pCE->ipid,
 		    pCE->execSlave);
 	    break;
 	case HOST:
-	    Verbose("[%s] port %hu on %s", pCE->server, pCE->port,
+	    Verbose("[%s] port %hu on %s", pCE->server, pCE->netport,
 		    pCE->host);
 	    break;
 	case DEVICE:
@ -837,13 +859,28 @@ 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;

+    tyme = time((time_t *)0);
+
+    if (pCE->ioState == ISNORMAL) {
+	pCE->lastWrite = tyme;
+	if (pCE->idletimeout != (time_t)0 &&
+	    (timers[T_CIDLE] == (time_t)0 ||
+	     timers[T_CIDLE] > pCE->lastWrite + pCE->idletimeout))
+	    timers[T_CIDLE] = pCE->lastWrite + pCE->idletimeout;
+    }
+
    /* If we have marks, adjust the next one so that it's in the future */
    if (pCE->nextMark > 0) {
-	tyme = time((time_t *)0);
 	if (tyme >= pCE->nextMark) {
 	    /* Add as many pCE->mark values as necessary so that we move
 	     * beyond the current time.
@ -854,7 +891,10 @@ ConsInit(pCE)
    }

    if (pCE->downHard == FLAGTRUE) {
-	Msg("[%s] console up", pCE->server);
+	if (pCE->ioState == ISNORMAL)
+	    Msg("[%s] console up", pCE->server);
+	else
+	    Msg("[%s] console initializing", pCE->server);
 	pCE->downHard = FLAGFALSE;
    }

--- a/conserver/consent.h
+++ b/conserver/consent.h
@ -1,5 +1,5 @@
 /*
- *  $Id: consent.h,v 5.47 2003-09-28 08:43:04-07 bryan Exp $
+ *  $Id: consent.h,v 5.56 2004/02/20 14:58:14 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -52,7 +52,7 @@ typedef struct parity {		/* a parity bits table                  */
 } PARITY;

 typedef enum consType {
-    UNKNOWN = 0,
+    UNKNOWNTYPE = 0,
    DEVICE,
    EXEC,
    HOST
@ -65,6 +65,7 @@ typedef struct names {

 typedef struct consentUsers {
    NAMES *user;
+    short not;
    struct consentUsers *next;
 } CONSENTUSERS;

@ -78,6 +79,7 @@ typedef struct consent {	/* console information                  */
    NAMES *aliases;		/* aliases for server name              */
    /* type == DEVICE */
    char *device;		/* device file                          */
+    char *devicesubst;		/* device substitution pattern          */
    BAUD *baud;			/* the baud on this console port        */
    PARITY *parity;		/* the parity on this line              */
    FLAG hupcl;			/* use HUPCL                            */
@ -90,14 +92,24 @@ typedef struct consent {	/* console information                  */
 #endif
    /* type == HOST */
    char *host;			/* hostname                             */
-    unsigned short port;	/* port number                          */
+    unsigned short netport;	/* final port    | netport = portbase + */
+    unsigned short port;	/* port number   |      portinc * port  */
+    unsigned short portbase;	/* port base                            */
+    unsigned short portinc;	/* port increment                       */
+    unsigned short raw;		/* raw or telnet protocol?              */
    /* type == EXEC */
    char *exec;			/* exec command                         */
+    char *execsubst;		/* exec substitution pattern            */
    /* global stuff */
    char *master;		/* master hostname                      */
    unsigned short breakNum;	/* break type [1-9]                     */
    char *logfile;		/* logfile                              */
+    off_t logfilemax;		/* size limit for rolling logfile       */
    char *initcmd;		/* initcmd command                      */
+    char *initsubst;		/* initcmd substitution pattern         */
+    char *motd;			/* motd                                 */
+    time_t idletimeout;		/* idle timeout                         */
+    char *idlestring;		/* string to print when idle            */
    /* timestamp stuff */
    int mark;			/* Mark (chime) interval                */
    long nextMark;		/* Next mark (chime) time               */
@ -122,6 +134,7 @@ typedef struct consent {	/* console information                  */
    int wbufIAC;		/* next IAC location in wbuf            */
    IOSTATE ioState;		/* state of the socket                  */
    time_t stateTimer;		/* timer for ioState states             */
+    time_t lastWrite;		/* time of last data sent to console    */

    /*** state information ***/
    char acline[132 * 2 + 2];	/* max chars we will call a line        */
--- 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.1" "conserver"
+.\" $Id: conserver.man,v 1.43 2004/03/23 01:02:29 bryan Exp $
+.TH CONSERVER 8 "2004/03/23" "conserver-8.1.3" "conserver"
 .SH NAME
 conserver \- console server daemon
 .SH SYNOPSIS
@ -26,6 +26,8 @@ conserver \- console server daemon
 .IR logfile ]
 .RB [ \-O
 .IR min ]
+.RB [ \-U
+.IR logfile ]
 .SH DESCRIPTION
 .B Conserver
 is the daemon that manages
@ -93,7 +95,7 @@ Close all connections and exit.
 .TP
 SIGHUP
 Reread the configuration file.
-New consoles are managed by forking off new childen, deleted
+New consoles are managed by forking off new children, deleted
 consoles (and their clients) are dropped,
 and changes to consoles are done "in place", resetting the console
 port (bringing it down and up) only when necessary.
@ -147,7 +149,7 @@ the signing certificate must be properly trusted, which usually means
 the public portion is in
 .IB OPENSSL_ROOT /ssl/certs
 (on both the client and server sides).
-See the sample self-signing certficate making script
+See the sample self-signing certificate making script
 .B contrib/maketestcerts
 for further clues.
 To allow
@ -322,6 +324,37 @@ connect to remote consoles will result in an informative message to the user.
 .B \-S
 Do not run the server, just perform a syntax check of configuration file and
 exit with a non-zero value if there is an error.
+Using more than one
+.B \-S
+will cause conserver to output various information about each console in 5
+colon-separated fields, enclosed in curly-braces.
+The philosophy behind the output is to provide information to allow external
+detection of multiple consoles access the same physical port.
+Since this is
+.I highly
+environment-specific, conserver cannot do the check internally.
+.RS
+.TP 9
+.I name
+The name of the console.
+.TP
+.I master
+The hostname of the master conserver host for the console.
+.TP
+.I aliases
+The console aliases in a comma-separated list.
+.TP
+.I type
+The type of console.
+Values will be a `/' for a local device, `|' for
+a command, or `!' for a remote port.
+.TP
+.I details
+Multiple values are comma-separated and depend on the type of the console.
+Local devices will have the values of the device file and baud rate/parity.
+Commands will have string to invoke.
+Remote ports will have the values of the remote hostname and port number.
+.RE
 .TP
 .B \-u
 Send unloved console output to
@ -332,6 +365,17 @@ independent of whether logging of individual consoles is enabled via
 .B conserver.cf
 entries.
 .TP
+.BI \-U logfile
+Copy all console data to the ``unified''
+.IR logfile .
+The output is the same as the
+.B \-u
+output, but all consoles, not
+just those without a user, are logged.
+Each line of output is prefixed with the console name.
+If a user is attached read/write, a `*' is appended to the console name,
+to allow log watching utilites to ignore potential user-introduced alarms.
+.TP
 .B \-v
 Echo the configuration as it is being read (be verbose).
 .TP
--- a/conserver/conserver.passwd
+++ b/conserver/conserver.passwd
@ -1,4 +0,0 @@
-bryan:r71mXjfALB5Ak:any
-djs:r71mXjfALB5Ak:login
-chogan:*passwd*:foobar,login,shell
-hogan:*passwd*:any
--- a/conserver/convert.c
+++ b/conserver/convert.c
@ -1,5 +1,5 @@
 /*
- *  $Id: convert.c,v 1.7 2003-08-15 14:24:39-07 bryan Exp $
+ *  $Id: convert.c,v 1.8 2003/11/20 13:56:38 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -32,7 +32,7 @@

 #include <compat.h>

-#include <util.h>
+#include <cutil.h>
 #include <consent.h>
 #include <client.h>
 #include <group.h>
--- a/conserver/cutil.c
+++ b/conserver/cutil.c
--- a/conserver/cutil.h
+++ b/conserver/cutil.h
@ -1,5 +1,5 @@
 /*
- *  $Id: util.h,v 1.53 2003-09-28 08:45:31-07 bryan Exp $
+ *  $Id: cutil.h,v 1.61 2004/03/10 02:55:45 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -18,8 +18,11 @@

 /* communication constants
 */
+#define OB_IAC		0xff	/* quote char                   */
+#define OB_EXEC		'E'	/* exec a command on the client */
+#define OB_GOTO		'G'	/* goto next console            */
 #define OB_SUSP		'Z'	/* suspended by server          */
-#define OB_DROP		'.'	/* dropped by server            */
+#define OB_ABRT		'.'	/* abort                        */

 /* Struct to wrap information about a "file"...
 * This can be a socket, local file, whatever.  We do this so
@ -67,6 +70,12 @@ typedef struct consFile {
    int fd;
    int fdout;			/* only used when a simplePipe */
    STRING *wbuf;
+    FLAG quoteiac;
+    FLAG sawiac;
+    FLAG sawiacsusp;
+    FLAG sawiacexec;
+    FLAG sawiacabrt;
+    FLAG sawiacgoto;
 #if HAVE_OPENSSL
    /* SSL stuff */
    SSL *ssl;
@ -74,6 +83,10 @@ typedef struct consFile {
    FLAG waitForRead;
 #endif
    /* Add crypto stuff to suit */
+#if DEBUG_CONSFILE_IO
+    int debugrfd;
+    int debugwfd;
+#endif
 } CONSFILE;

 extern int isMultiProc, fDebug, fVerbose, fErrorPrinted;
@ -102,9 +115,9 @@ extern CONSFILE *FileOpenPipe PARAMS((int, int));
 extern CONSFILE *FileOpen PARAMS((const char *, int, int));
 extern int FileClose PARAMS((CONSFILE **));
 extern int FileRead PARAMS((CONSFILE *, void *, int));
-extern int FileWrite PARAMS((CONSFILE *, char *, int));
-extern void FileVWrite PARAMS((CONSFILE *, char *, va_list));
-extern void FilePrint PARAMS((CONSFILE *, char *, ...));
+extern int FileWrite PARAMS((CONSFILE *, FLAG, char *, int));
+extern void FileVWrite PARAMS((CONSFILE *, FLAG, char *, va_list));
+extern void FilePrint PARAMS((CONSFILE *, FLAG, char *, ...));
 extern int FileStat PARAMS((CONSFILE *, struct stat *));
 extern int FileSeek PARAMS((CONSFILE *, off_t, int));
 extern int FileSend PARAMS((CONSFILE *, const void *, size_t, int));
@ -114,6 +127,7 @@ extern int FileUnopen PARAMS((CONSFILE *));
 extern void OutOfMem PARAMS(());
 extern char *BuildTmpString PARAMS((const char *));
 extern char *BuildTmpStringChar PARAMS((const char));
+extern char *BuildTmpStringPrint PARAMS((char *, ...));
 extern char *BuildString PARAMS((const char *, STRING *));
 extern char *BuildStringChar PARAMS((const char, STRING *));
 extern char *BuildStringPrint PARAMS((STRING *, char *, ...));
@ -126,6 +140,11 @@ extern STRING *AllocString PARAMS((void));
 extern char *ReadLine PARAMS((FILE *, STRING *, int *));
 extern enum consFileType FileGetType PARAMS((CONSFILE *));
 extern void FileSetType PARAMS((CONSFILE *, enum consFileType));
+extern void FileSetQuoteIAC PARAMS((CONSFILE *, FLAG));
+extern FLAG FileSawQuoteSusp PARAMS((CONSFILE *));
+extern FLAG FileSawQuoteExec PARAMS((CONSFILE *));
+extern FLAG FileSawQuoteAbrt PARAMS((CONSFILE *));
+extern FLAG FileSawQuoteGoto PARAMS((CONSFILE *));
 extern void Bye PARAMS((int));
 extern void DestroyDataStructures PARAMS((void));
 extern int IsMe PARAMS((char *));
@ -134,6 +153,10 @@ extern int FileCanRead PARAMS((CONSFILE *, fd_set *, fd_set *));
 extern int FileCanWrite PARAMS((CONSFILE *, fd_set *, fd_set *));
 extern int FileBufEmpty PARAMS((CONSFILE *));
 extern int SetFlags PARAMS((int, int, int));
+extern char *StrDup PARAMS((char *));
+extern int ParseIACBuf PARAMS((CONSFILE *, void *, int *));
+extern void *MemMove PARAMS((void *, void *, size_t));
+extern char *StringChar PARAMS((STRING *, int, char));
 #if HAVE_OPENSSL
 extern SSL *FileGetSSL PARAMS((CONSFILE *));
 extern void FileSetSSL PARAMS((CONSFILE *, SSL *));
--- a/conserver/fallback.c
+++ b/conserver/fallback.c
@ -1,5 +1,5 @@
 /*
- *  $Id: fallback.c,v 5.58 2003-08-15 08:18:26-07 bryan Exp $
+ *  $Id: fallback.c,v 5.60 2003/11/20 13:56:38 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -16,7 +16,7 @@

 #include <compat.h>

-#include <util.h>
+#include <cutil.h>

 /*
 * get a pty for the user
@ -261,7 +261,7 @@ FallBack(slave, sfd)
    }
    if ((*slave) != (char *)0)
 	free(*slave);
-    if (((*slave) = strdup(pcTSlave->string))
+    if (((*slave) = StrDup(pcTSlave->string))
 	== (char *)0)
 	OutOfMem();
    return fd;
--- a/conserver/group.c
+++ b/conserver/group.c
--- a/conserver/group.h
+++ b/conserver/group.h
@ -1,5 +1,5 @@
 /*
- *  $Id: group.h,v 5.38 2003-09-19 08:58:18-07 bryan Exp $
+ *  $Id: group.h,v 5.43 2003/12/20 06:11:53 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -34,6 +34,15 @@
 * 4. This notice may not be removed or altered.
 */

+/* timers used to have various things happen */
+#define T_STATE		0
+#define T_CIDLE		1
+#define T_MARK		2
+#define T_REINIT	3
+#define T_AUTOUP	4
+#define T_ROLL		5
+#define T_MAX		6	/* T_MAX *must* be last */
+
 /* return values used by CheckPass()
 */
 #define AUTH_SUCCESS	0	/* ok                                   */
@ -52,22 +61,25 @@ typedef struct grpent {		/* group info                           */
    struct grpent *pGEnext;	/* next group entry                     */
 } GRPENT;

+extern time_t timers[];
+
 extern void Spawn PARAMS((GRPENT *));
 extern int CheckPass PARAMS((char *, char *));
 extern void TagLogfile PARAMS((const CONSENT *, char *, ...));
 extern void TagLogfileAct PARAMS((const CONSENT *, char *, ...));
-extern void CleanupBreak PARAMS((short));
 extern void DestroyGroup PARAMS((GRPENT *));
 extern void DestroyConsent PARAMS((GRPENT *, CONSENT *));
 extern void SendClientsMsg PARAMS((CONSENT *, char *));
 extern void ResetMark PARAMS((void));
 extern void DestroyConsentUsers PARAMS((CONSENTUSERS **));
 extern CONSENTUSERS *ConsentFindUser PARAMS((CONSENTUSERS *, char *));
+extern int ConsentUserOk PARAMS((CONSENTUSERS *, char *));
 extern void DisconnectClient
 PARAMS((GRPENT *, CONSCLIENT *, char *, FLAG));
 extern int ClientAccess PARAMS((CONSENT *, char *));
 extern void DestroyClient PARAMS((CONSCLIENT *));
 extern int CheckPasswd PARAMS((CONSCLIENT *, char *));
+extern void ExpandString PARAMS((char *, CONSENT *, short));
 #if HAVE_OPENSSL
 extern int AttemptSSL PARAMS((CONSCLIENT *));
 #endif
--- a/conserver/main.c
+++ b/conserver/main.c
@ -1,5 +1,5 @@
 /*
- *  $Id: main.c,v 5.160 2003-09-29 07:01:35-07 bryan Exp $
+ *  $Id: main.c,v 5.178 2004/03/11 16:23:59 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -31,7 +31,7 @@

 #include <pwd.h>

-#include <util.h>
+#include <cutil.h>
 #include <consent.h>
 #include <client.h>
 #include <group.h>
@ -49,11 +49,9 @@
 #endif


-int fAll = 0, fNoinit = 0, fVersion = 0, fStrip = 0, fDaemon = 0, fReopen =
+int fAll = 0, fNoinit = 0, fVersion = 0, fStrip = 0, fReopen =
    0, fNoautoreup = 0, fSyntaxOnly = 0;

-char chDefAcc = 'r';
-
 char *pcConfig = CONFIGFILE;
 int isMaster = 1;
 int cMaxMemb = MAXMEMB;
@ -64,8 +62,20 @@ static STRING *startedMsg = (STRING *)0;
 CONFIG *optConf = (CONFIG *)0;
 CONFIG *config = (CONFIG *)0;
 char *interface = (char *)0;
+CONFIG defConfig =
+    { (STRING *)0, 'r', FLAGFALSE, LOGFILEPATH, PASSWDFILE, DEFPORT,
+    FLAGTRUE,
+    FLAGTRUE, 0, DEFBASEPORT, (char *)0
+#if HAVE_SETPROCTITLE
+	, FLAGFALSE
+#endif
+#if HAVE_OPENSSL
+	, (char *)0, FLAGTRUE
+#endif
+};

 struct sockaddr_in in_port;
+CONSFILE *unifiedlog = (CONSFILE *)0;

 #if HAVE_DMALLOC && DMALLOC_MARK_MAIN
 unsigned long dmallocMarkMain = 0;
@ -383,10 +393,23 @@ ReopenLogfile()
     * after that, all bets are off...probably not see the errors (well,
     * aside from the tail of the old logfile, if it was rolled).
     */
-    if (!fDaemon || config->logfile == (char *)0)
+    if (config->daemonmode != FLAGTRUE)
 	return;

    close(1);
+
+    /* so, if we aren't in daemon mode, we just return before closing
+     * anything.  if we are, there are two possibilities.  first, if
+     * logfile is set, we close fd 1, open a file, etc.  all should be
+     * well.  if logfile isn't set, we end up closing fd 1 and 2 and
+     * returning (in case the logfile was set and then unset [config
+     * file change]).
+     */
+    if (config->logfile == (char *)0) {
+	close(2);
+	return;
+    }
+
    if (1 != open(config->logfile, O_WRONLY | O_CREAT | O_APPEND, 0644)) {
 	tag = 0;
 	Error("ReopenLogfile(): open(%s): %s", config->logfile,
@ -402,6 +425,31 @@ ReopenLogfile()
    tag = 0;
 }

+void
+#if PROTOTYPES
+ReopenUnifiedlog(void)
+#else
+ReopenUnifiedlog()
+#endif
+{
+    /* close any existing */
+    if (unifiedlog != (CONSFILE *)0)
+	FileClose(&unifiedlog);
+
+    /* return if we aren't opening again */
+    if (config->unifiedlog == (char *)0)
+	return;
+
+    /* open a new one */
+    if ((unifiedlog =
+	 FileOpen(config->unifiedlog, O_WRONLY | O_CREAT | O_APPEND,
+		  0644)) == (CONSFILE *)0) {
+	Error("ReopenUnifiedlog(): open(%s): %s", config->unifiedlog,
+	      strerror(errno));
+	return;
+    }
+}
+
 /* become a daemon							(ksb)
 */
 static void
@ -475,7 +523,7 @@ Usage(wantfull)
 #endif
 {
    static char u_terse[] =
-	"[-7dDEFhinoRSuvV] [-a type] [-m max] [-M addr] [-p port] [-b port] [-c cred] [-C config] [-P passwd] [-L logfile] [-O min]";
+	"[-7dDEFhinoRSuvV] [-a type] [-m max] [-M addr] [-p port] [-b port] [-c cred] [-C config] [-P passwd] [-L logfile] [-O min] [-U logfile]";
    static char *full[] = {
 	"7          strip the high bit off all console data",
 	"a type     set the default access type",
@ -507,6 +555,7 @@ Usage(wantfull)
 	"R          disable automatic client redirection",
 	"S          syntax check of configuration file",
 	"u          copy \"unloved\" console data to stdout",
+	"U logfile  copy all console data to the \"unified\" logfile",
 	"v          be verbose on startup",
 	"V          output version info",
 	(char *)0
@ -543,6 +592,9 @@ Version()
 #endif
 #if HAVE_PAM
 	"pam",
+#endif
+#if TRUST_REVERSE_DNS
+	"trustrevdns",
 #endif
 	(char *)0
    };
@ -555,17 +607,18 @@ Version()
    isMultiProc = 0;

    Msg("%s", THIS_VERSION);
-    Msg("default access type `%c'", chDefAcc);
+    Msg("default access type `%c'", defConfig.defaultaccess);
    Msg("default escape sequence `%s%s'", FmtCtl(DEFATTN, acA1),
 	FmtCtl(DEFESC, acA2));
    Msg("default configuration in `%s'", CONFIGFILE);
-    Msg("default password in `%s'", PASSWDFILE);
-    Msg("default logfile is `%s'", LOGFILEPATH);
+    Msg("default password in `%s'", defConfig.passwdfile);
+    Msg("default logfile is `%s'", defConfig.logfile);
    Msg("default pidfile is `%s'", PIDFILE);
    Msg("default limit is %d member%s per group", MAXMEMB,
 	MAXMEMB == 1 ? "" : "s");
-    Msg("default primary port referenced as `%s'", DEFPORT);
-    Msg("default secondary base port referenced as `%s'", DEFBASEPORT);
+    Msg("default primary port referenced as `%s'", defConfig.primaryport);
+    Msg("default secondary base port referenced as `%s'",
+	defConfig.secondaryport);

    BuildString((char *)0, acA1);
    if (optionlist[0] == (char *)0)
@ -704,6 +757,10 @@ SummarizeDataStructures()
 		size += strlen(pCE->initcmd);
 	    if (pCE->execSlave != (char *)0)
 		size += strlen(pCE->execSlave);
+	    if (pCE->motd != (char *)0)
+		size += strlen(pCE->motd);
+	    if (pCE->idlestring != (char *)0)
+		size += strlen(pCE->idlestring);
 	    if (pCE->fdlog != (CONSFILE *)0)
 		size += sizeof(CONSFILE);
 	    if (pCE->cofile != (CONSFILE *)0)
@ -796,7 +853,7 @@ DumpDataStructures()

    for (pGE = pGroups; pGE != (GRPENT *)0; pGE = pGE->pGEnext) {
 	CONDDEBUG((1,
-		   "DumpDataStructures(): group: id=%u pid=%lu, port=%hu, imembers=%d",
+		   "DumpDataStructures(): group: id=%u port=%hu, pid=%lu, imembers=%d",
 		   pGE->id, pGE->port, (unsigned long)pGE->pid,
 		   pGE->imembers));

@ -807,8 +864,9 @@ DumpDataStructures()
 			       "DumpDataStructures():  server=%s, type=DEVICE",
 			       EMPTYSTR(pCE->server)));
 		    CONDDEBUG((1,
-			       "DumpDataStructures():  baud=%s, parity=%s",
-			       pCE->baud->acrate, pCE->parity->key));
+			       "DumpDataStructures():  baud=%s, parity=%s, device=%s",
+			       pCE->baud->acrate, pCE->parity->key,
+			       EMPTYSTR(pCE->device)));
 		    break;
 		case EXEC:
 		    CONDDEBUG((1,
@ -826,13 +884,13 @@ DumpDataStructures()
 			       "DumpDataStructures():  server=%s, type=HOST",
 			       EMPTYSTR(pCE->server)));
 		    CONDDEBUG((1,
-			       "DumpDataStructures():  host=%s, port=%hu, telnetState=%d",
-			       EMPTYSTR(pCE->host), pCE->port,
-			       pCE->telnetState));
+			       "DumpDataStructures():  host=%s, raw=%hu, netport=%hu, port=%hu, telnetState=%d",
+			       EMPTYSTR(pCE->host), pCE->raw, pCE->netport,
+			       pCE->port, pCE->telnetState));
 		    break;
-		case UNKNOWN:
+		case UNKNOWNTYPE:
 		    CONDDEBUG((1,
-			       "DumpDataStructures():  server=%s, type=UNKNOWN",
+			       "DumpDataStructures():  server=%s, type=UNKNOWNTYPE",
 			       EMPTYSTR(pCE->server)));
 		    break;
 	    }
@ -880,18 +938,22 @@ DumpDataStructures()
 		       "DumpDataStructures():  initpid=%lu, initcmd=%s, initfile=%d",
 		       (unsigned long)pCE->initpid, EMPTYSTR(pCE->initcmd),
 		       FileFDNum(pCE->initfile)));
+	    CONDDEBUG((1,
+		       "DumpDataStructures():  motd=%s, idletimeout=%d, idlestring=%s",
+		       EMPTYSTR(pCE->motd), pCE->idletimeout,
+		       EMPTYSTR(pCE->idlestring)));
 	    if (pCE->ro) {
 		CONSENTUSERS *u;
 		for (u = pCE->ro; u != (CONSENTUSERS *)0; u = u->next) {
-		    CONDDEBUG((1, "DumpDataStructures():  ro=%s",
-			       u->user->name));
+		    CONDDEBUG((1, "DumpDataStructures():  ro=%s%s",
+			       (u->not ? "!" : ""), u->user->name));
 		}
 	    }
 	    if (pCE->rw) {
 		CONSENTUSERS *u;
 		for (u = pCE->rw; u != (CONSENTUSERS *)0; u = u->next) {
-		    CONDDEBUG((1, "DumpDataStructures():  rw=%s",
-			       u->user->name));
+		    CONDDEBUG((1, "DumpDataStructures():  rw=%s%s",
+			       (u->not ? "!" : ""), u->user->name));
 		}
 	    }
 	    CONDDEBUG((1, "DumpDataStructures():  ------"));
@ -1110,7 +1172,7 @@ main(argc, argv)
 {
    int i;
    FILE *fpConfig = (FILE *)0;
-    static char acOpts[] = "7a:b:c:C:dDEFhiL:m:M:noO:p:P:RSuVv";
+    static char acOpts[] = "7a:b:c:C:dDEFhiL:m:M:noO:p:P:RSuU:Vv";
    extern int optopt;
    extern char *optarg;
    struct passwd *pwd;
@ -1126,9 +1188,9 @@ main(argc, argv)

    thepid = getpid();
    if ((char *)0 == (progname = strrchr(argv[0], '/'))) {
-	progname = argv[0];
+	progname = StrDup(argv[0]);
    } else {
-	++progname;
+	progname = StrDup(++progname);
    }

    setpwent();
@ -1179,21 +1241,21 @@ main(argc, argv)
 		}
 		break;
 	    case 'b':
-		if ((optConf->secondaryport = strdup(optarg)) == (char *)0)
+		if ((optConf->secondaryport = StrDup(optarg)) == (char *)0)
 		    OutOfMem();
 		break;
 	    case 'c':
 #if HAVE_OPENSSL
 		if ((optConf->sslcredentials =
-		     strdup(optarg)) == (char *)0)
+		     StrDup(optarg)) == (char *)0)
 		    OutOfMem();
 #endif
 		break;
 	    case 'C':
-		pcConfig = optarg;
+		pcConfig = StrDup(optarg);
 		break;
 	    case 'd':
-		fDaemon = 1;
+		optConf->daemonmode = FLAGTRUE;
 		break;
 	    case 'D':
 		fDebug++;
@ -1213,7 +1275,7 @@ main(argc, argv)
 		fNoinit = 1;
 		break;
 	    case 'L':
-		if ((optConf->logfile = strdup(optarg)) == (char *)0)
+		if ((optConf->logfile = StrDup(optarg)) == (char *)0)
 		    OutOfMem();
 		break;
 	    case 'm':
@ -1225,7 +1287,7 @@ main(argc, argv)
 		}
 		break;
 	    case 'M':
-		interface = optarg;
+		interface = StrDup(optarg);
 		break;
 	    case 'n':
 		/* noop now */
@ -1239,22 +1301,26 @@ main(argc, argv)
 		optConf->reinitcheck = atoi(optarg);
 		break;
 	    case 'p':
-		if ((optConf->primaryport = strdup(optarg)) == (char *)0)
+		if ((optConf->primaryport = StrDup(optarg)) == (char *)0)
 		    OutOfMem();
 		break;
 	    case 'P':
-		if ((optConf->passwdfile = strdup(optarg)) == (char *)0)
+		if ((optConf->passwdfile = StrDup(optarg)) == (char *)0)
 		    OutOfMem();
 		break;
 	    case 'R':
 		optConf->redirect = FLAGFALSE;
 		break;
 	    case 'S':
-		fSyntaxOnly = 1;
+		fSyntaxOnly++;
 		break;
 	    case 'u':
 		fAll = 1;
 		break;
+	    case 'U':
+		if ((optConf->unifiedlog = StrDup(optarg)) == (char *)0)
+		    OutOfMem();
+		break;
 	    case 'V':
 		fVersion = 1;
 		break;
@ -1345,6 +1411,9 @@ main(argc, argv)
    }
    ProbeInterfaces();

+    /* initialize the timers */
+    for (i = 0; i < T_MAX; i++)
+	timers[i] = (time_t)0;

    /* read the config file */
    if ((FILE *)0 == (fpConfig = fopen(pcConfig, "r"))) {
@ -1356,11 +1425,11 @@ main(argc, argv)

    /* set up the port to bind to */
    if (optConf->primaryport != (char *)0)
-	config->primaryport = strdup(optConf->primaryport);
+	config->primaryport = StrDup(optConf->primaryport);
    else if (pConfig->primaryport != (char *)0)
-	config->primaryport = strdup(pConfig->primaryport);
+	config->primaryport = StrDup(pConfig->primaryport);
    else
-	config->primaryport = strdup(DEFPORT);
+	config->primaryport = StrDup(defConfig.primaryport);
    if (config->primaryport == (char *)0)
 	OutOfMem();

@ -1377,8 +1446,7 @@ main(argc, argv)
 	struct servent *pSE;
 	if ((struct servent *)0 ==
 	    (pSE = getservbyname(config->primaryport, "tcp"))) {
-	    Error("getservbyname(%s): %s", config->primaryport,
-		  strerror(errno));
+	    Error("getservbyname(%s) failed", config->primaryport);
 	    Bye(EX_OSERR);
 	} else {
 	    bindPort = ntohs((unsigned short)pSE->s_port);
@ -1387,11 +1455,11 @@ main(argc, argv)

    /* set up the secondary port to bind to */
    if (optConf->secondaryport != (char *)0)
-	config->secondaryport = strdup(optConf->secondaryport);
+	config->secondaryport = StrDup(optConf->secondaryport);
    else if (pConfig->secondaryport != (char *)0)
-	config->secondaryport = strdup(pConfig->secondaryport);
+	config->secondaryport = StrDup(pConfig->secondaryport);
    else
-	config->secondaryport = strdup(DEFBASEPORT);
+	config->secondaryport = StrDup(defConfig.secondaryport);
    if (config->secondaryport == (char *)0)
 	OutOfMem();

@ -1408,8 +1476,7 @@ main(argc, argv)
 	struct servent *pSE;
 	if ((struct servent *)0 ==
 	    (pSE = getservbyname(config->secondaryport, "tcp"))) {
-	    Error("getservbyname(%s): %s", config->secondaryport,
-		  strerror(errno));
+	    Error("getservbyname(%s) failed", config->secondaryport);
 	    Bye(EX_OSERR);
 	} else {
 	    bindBasePort = ntohs((unsigned short)pSE->s_port);
@ -1417,20 +1484,20 @@ main(argc, argv)
    }

    if (optConf->passwdfile != (char *)0)
-	config->passwdfile = strdup(optConf->passwdfile);
+	config->passwdfile = StrDup(optConf->passwdfile);
    else if (pConfig->passwdfile != (char *)0)
-	config->passwdfile = strdup(pConfig->passwdfile);
+	config->passwdfile = StrDup(pConfig->passwdfile);
    else
-	config->passwdfile = strdup(PASSWDFILE);
+	config->passwdfile = StrDup(defConfig.passwdfile);
    if (config->passwdfile == (char *)0)
 	OutOfMem();

    if (optConf->logfile != (char *)0)
-	config->logfile = strdup(optConf->logfile);
+	config->logfile = StrDup(optConf->logfile);
    else if (pConfig->logfile != (char *)0)
-	config->logfile = strdup(pConfig->logfile);
+	config->logfile = StrDup(pConfig->logfile);
    else
-	config->logfile = strdup(LOGFILEPATH);
+	config->logfile = StrDup(defConfig.logfile);
    if (config->logfile == (char *)0)
 	OutOfMem();

@ -1439,36 +1506,72 @@ main(argc, argv)
    else if (pConfig->reinitcheck != 0)
 	config->reinitcheck = pConfig->reinitcheck;
    else
-	config->reinitcheck = 0;
+	config->reinitcheck = defConfig.reinitcheck;

    if (optConf->defaultaccess != '\000')
 	config->defaultaccess = optConf->defaultaccess;
    else if (pConfig->defaultaccess != '\000')
 	config->defaultaccess = pConfig->defaultaccess;
    else
-	config->defaultaccess = chDefAcc;
+	config->defaultaccess = defConfig.defaultaccess;
+
+    if (optConf->daemonmode != FLAGUNKNOWN)
+	config->daemonmode = optConf->daemonmode;
+    else if (pConfig->daemonmode != FLAGUNKNOWN)
+	config->daemonmode = pConfig->daemonmode;
+    else
+	config->daemonmode = defConfig.daemonmode;

    if (optConf->redirect != FLAGUNKNOWN)
 	config->redirect = optConf->redirect;
    else if (pConfig->redirect != FLAGUNKNOWN)
 	config->redirect = pConfig->redirect;
    else
-	config->redirect = FLAGTRUE;
+	config->redirect = defConfig.redirect;

+    if (optConf->loghostnames != FLAGUNKNOWN)
+	config->loghostnames = optConf->loghostnames;
+    else if (pConfig->loghostnames != FLAGUNKNOWN)
+	config->loghostnames = pConfig->loghostnames;
+    else
+	config->loghostnames = defConfig.loghostnames;
+
+    if (optConf->unifiedlog != (char *)0) {
+	config->unifiedlog = StrDup(optConf->unifiedlog);
+	if (config->unifiedlog == (char *)0)
+	    OutOfMem();
+    } else if (pConfig->unifiedlog != (char *)0) {
+	config->unifiedlog = StrDup(pConfig->unifiedlog);
+	if (config->unifiedlog == (char *)0)
+	    OutOfMem();
+    } else if (defConfig.unifiedlog != (char *)0) {
+	config->unifiedlog = StrDup(defConfig.unifiedlog);
+	if (config->unifiedlog == (char *)0)
+	    OutOfMem();
+    }
 #if HAVE_OPENSSL
    if (optConf->sslrequired != FLAGUNKNOWN)
 	config->sslrequired = optConf->sslrequired;
    else if (pConfig->sslrequired != FLAGUNKNOWN)
 	config->sslrequired = pConfig->sslrequired;
    else
-	config->sslrequired = FLAGTRUE;
+	config->sslrequired = defConfig.sslrequired;

    if (optConf->sslcredentials != (char *)0)
-	config->sslcredentials = optConf->sslcredentials;
+	config->sslcredentials = StrDup(optConf->sslcredentials);
    else if (pConfig->sslcredentials != (char *)0)
-	config->sslcredentials = pConfig->sslcredentials;
+	config->sslcredentials = StrDup(pConfig->sslcredentials);
    else
-	config->sslcredentials = (char *)0;
+	config->sslcredentials = StrDup(defConfig.sslcredentials);
+#endif
+
+#if HAVE_SETPROCTITLE
+    if (optConf->setproctitle != FLAGUNKNOWN)
+	config->setproctitle = optConf->setproctitle;
+    else if (pConfig->setproctitle != FLAGUNKNOWN)
+	config->setproctitle = pConfig->setproctitle;
+    else
+	config->setproctitle = defConfig.setproctitle;
 #endif

 #if HAVE_DMALLOC && DMALLOC_MARK_MAIN
@ -1483,9 +1586,11 @@ main(argc, argv)
 	SetupSSL();
 #endif

-	if (fDaemon)
+	if (config->daemonmode == FLAGTRUE)
 	    Daemonize();

+	ReopenUnifiedlog();
+
 	/* if no one can use us we need to come up with a default
 	 */
 	if (pACList == (ACCESS *)0)
@ -1503,6 +1608,20 @@ main(argc, argv)
 		    (unsigned long)pGE->pid, pGE->port);
 	}

+#if HAVE_SETPROCTITLE
+	if (config->setproctitle == FLAGTRUE) {
+	    REMOTE *pRC;
+	    GRPENT *pGE;
+	    int local = 0, remote = 0;
+	    for (pGE = pGroups; pGE != (GRPENT *)0; pGE = pGE->pGEnext)
+		local += pGE->imembers;
+	    for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext)
+		remote++;
+	    setproctitle("master: port %hu, %d local, %d remote", bindPort,
+			 local, remote);
+	}
+#endif
+
 	if (fVerbose) {
 	    ACCESS *pACtmp;
 	    for (pACtmp = pACList; pACtmp != (ACCESS *)0;
@ -1533,6 +1652,9 @@ main(argc, argv)
 	SignalKids(SIGTERM);
    }

+    if (unifiedlog != (CONSFILE *)0)
+	FileClose(&unifiedlog);
+
    DumpDataStructures();

    Msg("terminated");
--- a/conserver/main.h
+++ b/conserver/main.h
@ -1,5 +1,5 @@
 /*
- *  $Id: main.h,v 5.49 2003-06-15 19:50:28-07 bryan Exp $
+ *  $Id: main.h,v 5.51 2003/11/10 15:37:24 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -47,8 +47,11 @@ extern struct sockaddr_in in_port;
 extern int isMaster;
 extern CONFIG *optConf;
 extern CONFIG *config;
+extern CONFIG defConfig;
+extern CONSFILE *unifiedlog;
 #if HAVE_OPENSSL
 extern SSL_CTX *ctx;
 #endif
 extern void ReopenLogfile PARAMS((void));
+extern void ReopenUnifiedlog PARAMS((void));
 extern void DumpDataStructures PARAMS((void));
--- a/conserver/master.c
+++ b/conserver/master.c
@ -1,5 +1,5 @@
 /*
- *  $Id: master.c,v 5.115 2003-09-29 08:39:13-07 bryan Exp $
+ *  $Id: master.c,v 5.124 2003/12/25 19:22:00 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -29,7 +29,7 @@

 #include <compat.h>

-#include <util.h>
+#include <cutil.h>
 #include <consent.h>
 #include <client.h>
 #include <group.h>
@ -42,7 +42,8 @@

 static sig_atomic_t fSawQuit = 0, fSawHUP = 0, fSawUSR2 = 0, fSawUSR1 =
    0, fSawCHLD = 0;
-static CONSCLIENT *pCLfree = (CONSCLIENT *)0;
+CONSCLIENT *pCLmfree = (CONSCLIENT *)0;
+CONSCLIENT *pCLmall = (CONSCLIENT *)0;
 #if HAVE_DMALLOC && DMALLOC_MARK_CLIENT_CONNECTION
 static unsigned long dmallocMarkClientConnection = 0;
 #endif
@ -230,6 +231,28 @@ SignalKids(arg)
    }
 }

+REMOTE *
+#if PROTOTYPES
+FindRemoteConsole(char *args)
+#else
+FindRemoteConsole(args)
+    char *args;
+#endif
+{
+    REMOTE *pRC;
+    NAMES *name;
+
+    for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext) {
+	if (strcasecmp(args, pRC->rserver) == 0)
+	    return pRC;
+	for (name = pRC->aliases; name != (NAMES *)0; name = name->next) {
+	    if (strcasecmp(args, name->name) == 0)
+		return pRC;
+	}
+    }
+    return pRC;
+}
+
 void
 #if PROTOTYPES
 CommandCall(CONSCLIENT *pCL, char *args)
@ -262,9 +285,7 @@ CommandCall(pCL, args)
    }
    if (config->redirect == FLAGTRUE ||
 	(config->redirect != FLAGTRUE && found == 0)) {
-	for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext) {
-	    if (strcasecmp(args, pRC->rserver) != 0)
-		continue;
+	if ((pRC = FindRemoteConsole(args)) != (REMOTE *)0) {
 	    ambiguous = BuildTmpString(pRC->rserver);
 	    ambiguous = BuildTmpString(", ");
 	    ++found;
@ -331,25 +352,27 @@ CommandCall(pCL, args)
    }
    switch (found) {
 	case 0:
-	    FilePrint(pCL->fd, "console `%s' not found\r\n", args);
+	    FilePrint(pCL->fd, FLAGFALSE, "console `%s' not found\r\n",
+		      args);
 	    break;
 	case 1:
 	    if ((REMOTE *)0 != pRCFound) {
 		if (config->redirect != FLAGTRUE) {
-		    FilePrint(pCL->fd,
+		    FilePrint(pCL->fd, FLAGFALSE,
 			      "automatic redirection disabled - console on master `%s'\r\n",
 			      pRCFound->rhost);
 		} else {
-		    FilePrint(pCL->fd, "@%s\r\n", pRCFound->rhost);
+		    FilePrint(pCL->fd, FLAGFALSE, "@%s\r\n",
+			      pRCFound->rhost);
 		}
 	    } else {
-		FilePrint(pCL->fd, "%hu\r\n", prnum);
+		FilePrint(pCL->fd, FLAGFALSE, "%hu\r\n", prnum);
 	    }
 	    break;
 	default:
 	    found = strlen(ambiguous);
 	    ambiguous[found - 2] = '\000';
-	    FilePrint(pCL->fd,
+	    FilePrint(pCL->fd, FLAGFALSE,
 		      "ambiguous console abbreviation, `%s'\r\n\tchoices are %s\r\n",
 		      args, ambiguous);
 	    break;
@ -390,8 +413,8 @@ DropMasterClient(pCLServing, force)
    }
    *(pCLServing->ppCLbscan) = pCLServing->pCLscan;
    /* put on the free list */
-    pCLServing->pCLnext = pCLfree;
-    pCLfree = pCLServing;
+    pCLServing->pCLnext = pCLmfree;
+    pCLmfree = pCLServing;

    /* we didn't touch pCLServing->pCLscan so the loop works */
 #if HAVE_DMALLOC && DMALLOC_MARK_CLIENT_CONNECTION
@ -410,7 +433,7 @@ DoNormalRead(pCLServing)
 {
    char *pcCmd;
    char *pcArgs;
-    int nr, i;
+    int nr, i, l;
    unsigned char acIn[BUFSIZ];

    /* read connection */
@ -419,199 +442,221 @@ DoNormalRead(pCLServing)
 	return;
    }

-    for (i = 0; i < nr; ++i) {
-	if ('\n' != acIn[i]) {
-	    BuildStringChar(acIn[i], pCLServing->accmd);
+    while ((l = ParseIACBuf(pCLServing->fd, acIn, &nr)) >= 0) {
+	if (l == 0)		/* we ignore special OB_IAC stuff */
 	    continue;
-	}
-	if ((pCLServing->accmd->used > 1) &&
-	    ('\r' ==
-	     pCLServing->accmd->string[pCLServing->accmd->used - 2])) {
-	    pCLServing->accmd->string[pCLServing->accmd->used - 2] =
-		'\000';
-	    pCLServing->accmd->used--;
-	}
+	for (i = 0; i < l; ++i) {
+	    if ('\n' != acIn[i]) {
+		BuildStringChar(acIn[i], pCLServing->accmd);
+		continue;
+	    }
+	    if ((pCLServing->accmd->used > 1) &&
+		('\r' ==
+		 pCLServing->accmd->string[pCLServing->accmd->used - 2])) {
+		pCLServing->accmd->string[pCLServing->accmd->used - 2] =
+		    '\000';
+		pCLServing->accmd->used--;
+	    }

-	/* process password here...before we corrupt accmd */
-	if (pCLServing->iState == S_PASSWD) {
-	    if (CheckPasswd(pCLServing, pCLServing->accmd->string) !=
-		AUTH_SUCCESS) {
-		FileWrite(pCLServing->fd, "invalid password\r\n", -1);
+	    /* process password here...before we corrupt accmd */
+	    if (pCLServing->iState == S_PASSWD) {
+		if (CheckPasswd(pCLServing, pCLServing->accmd->string) !=
+		    AUTH_SUCCESS) {
+		    FileWrite(pCLServing->fd, FLAGFALSE,
+			      "invalid password\r\n", -1);
+		    BuildString((char *)0, pCLServing->accmd);
+		    DropMasterClient(pCLServing, FLAGFALSE);
+		    return;
+		}
+		Verbose("<master> login %s", pCLServing->acid->string);
+		FileWrite(pCLServing->fd, FLAGFALSE, "ok\r\n", 4);
+		pCLServing->iState = S_NORMAL;
 		BuildString((char *)0, pCLServing->accmd);
-		DropMasterClient(pCLServing, FLAGFALSE);
-		return;
+		continue;
 	    }
-	    Verbose("<master> login %s", pCLServing->acid->string);
-	    FileWrite(pCLServing->fd, "ok\r\n", -1);
-	    pCLServing->iState = S_NORMAL;
-	    BuildString((char *)0, pCLServing->accmd);
-	    continue;
-	}

-	if ((char *)0 != (pcArgs = strchr(pCLServing->accmd->string, ':'))) {
-	    *pcArgs++ = '\000';
-	} else if ((char *)0 !=
-		   (pcArgs = strchr(pCLServing->accmd->string, ' '))) {
-	    *pcArgs++ = '\000';
-	}
-	if (pcArgs != (char *)0)
-	    pcArgs = PruneSpace(pcArgs);
-	pcCmd = PruneSpace(pCLServing->accmd->string);
-	if (strcmp(pcCmd, "help") == 0) {
-	    static char *apcHelp1[] = {
-		"exit   disconnect\r\n",
-		"help   this help message\r\n",
-		"login  log in\r\n",
-#if HAVE_OPENSSL
-		"ssl    start ssl session\r\n",
-#endif
-		(char *)0
-	    };
-	    static char *apcHelp2[] = {
-		"call      provide port for given console\r\n",
-		"exit      disconnect\r\n",
-		"groups    provide ports for group leaders\r\n",
-		"help      this help message\r\n",
-		"master    provide a list of master servers\r\n",
-		"pid       provide pid of master process\r\n",
-		"quit*     terminate conserver (SIGTERM)\r\n",
-		"restart*  restart conserver (SIGHUP)\r\n",
-		"version   provide version info for server\r\n",
-		"* = requires admin privileges\r\n",
-		(char *)0
-	    };
-	    char **ppc;
-	    for (ppc =
-		 (pCLServing->iState == S_IDENT ? apcHelp1 : apcHelp2);
-		 (char *)0 != *ppc; ++ppc) {
-		FileWrite(pCLServing->fd, *ppc, -1);
+	    if ((char *)0 !=
+		(pcArgs = strchr(pCLServing->accmd->string, ':'))) {
+		*pcArgs++ = '\000';
+	    } else if ((char *)0 !=
+		       (pcArgs = strchr(pCLServing->accmd->string, ' '))) {
+		*pcArgs++ = '\000';
 	    }
-	} else if (strcmp(pcCmd, "exit") == 0) {
-	    FileWrite(pCLServing->fd, "goodbye\r\n", -1);
-	    DropMasterClient(pCLServing, FLAGFALSE);
-	    return;
+	    if (pcArgs != (char *)0)
+		pcArgs = PruneSpace(pcArgs);
+	    pcCmd = PruneSpace(pCLServing->accmd->string);
+	    if (strcmp(pcCmd, "help") == 0) {
+		static char *apcHelp1[] = {
+		    "exit   disconnect\r\n",
+		    "help   this help message\r\n",
+		    "login  log in\r\n",
 #if HAVE_OPENSSL
-	} else if (pCLServing->iState == S_IDENT &&
-		   strcmp(pcCmd, "ssl") == 0) {
-	    FileWrite(pCLServing->fd, "ok\r\n", -1);
-	    if (!AttemptSSL(pCLServing)) {
+		    "ssl    start ssl session\r\n",
+#endif
+		    (char *)0
+		};
+		static char *apcHelp2[] = {
+		    "call      provide port for given console\r\n",
+		    "exit      disconnect\r\n",
+		    "groups    provide ports for group leaders\r\n",
+		    "help      this help message\r\n",
+		    "master    provide a list of master servers\r\n",
+		    "pid       provide pid of master process\r\n",
+		    "quit*     terminate conserver (SIGTERM)\r\n",
+		    "restart*  restart conserver (SIGHUP)\r\n",
+		    "version   provide version info for server\r\n",
+		    "* = requires admin privileges\r\n",
+		    (char *)0
+		};
+		char **ppc;
+		for (ppc =
+		     (pCLServing->iState == S_IDENT ? apcHelp1 : apcHelp2);
+		     (char *)0 != *ppc; ++ppc) {
+		    FileWrite(pCLServing->fd, FLAGTRUE, *ppc, -1);
+		}
+		FileWrite(pCLServing->fd, FLAGFALSE, (char *)0, 0);
+	    } else if (strcmp(pcCmd, "exit") == 0) {
+		FileWrite(pCLServing->fd, FLAGFALSE, "goodbye\r\n", -1);
 		DropMasterClient(pCLServing, FLAGFALSE);
 		return;
-	    }
-#endif
-	} else if (pCLServing->iState == S_IDENT &&
-		   strcmp(pcCmd, "login") == 0) {
 #if HAVE_OPENSSL
-	    if (config->sslrequired == FLAGTRUE &&
-		FileGetType(pCLServing->fd) != SSLSocket) {
-		FileWrite(pCLServing->fd, "encryption required\r\n", -1);
-	    } else {
+	    } else if (pCLServing->iState == S_IDENT &&
+		       strcmp(pcCmd, "ssl") == 0) {
+		FileWrite(pCLServing->fd, FLAGFALSE, "ok\r\n", -1);
+		if (!AttemptSSL(pCLServing)) {
+		    DropMasterClient(pCLServing, FLAGFALSE);
+		    return;
+		}
 #endif
-		if (pcArgs == (char *)0) {
-		    FileWrite(pCLServing->fd,
-			      "login requires argument\r\n", -1);
+	    } else if (pCLServing->iState == S_IDENT &&
+		       strcmp(pcCmd, "login") == 0) {
+#if HAVE_OPENSSL
+		if (config->sslrequired == FLAGTRUE &&
+		    FileGetType(pCLServing->fd) != SSLSocket) {
+		    FileWrite(pCLServing->fd, FLAGFALSE,
+			      "encryption required\r\n", -1);
 		} else {
-		    BuildString((char *)0, pCLServing->username);
-		    BuildString((char *)0, pCLServing->acid);
-		    BuildString(pcArgs, pCLServing->username);
-		    BuildString(pcArgs, pCLServing->acid);
-		    BuildStringChar('@', pCLServing->acid);
-		    BuildString(pCLServing->peername->string,
-				pCLServing->acid);
-		    if (pCLServing->caccess == 't' ||
-			CheckPasswd(pCLServing, "") == AUTH_SUCCESS) {
-			pCLServing->iState = S_NORMAL;
-			Verbose("<master> login %s",
-				pCLServing->acid->string);
-			FileWrite(pCLServing->fd, "ok\r\n", -1);
-		    } else {
-			FilePrint(pCLServing->fd, "passwd? %s\r\n",
-				  myHostname);
-			pCLServing->iState = S_PASSWD;
-		    }
-		}
-#if HAVE_OPENSSL
-	    }
 #endif
-	} else if (pCLServing->iState == S_NORMAL &&
-		   strcmp(pcCmd, "master") == 0) {
-	    int iSep = 1;
-
-	    if ((GRPENT *)0 != pGroups) {
-		struct sockaddr_in lcl;
-		socklen_t so = sizeof(lcl);
-		if (-1 ==
-		    getsockname(FileFDNum(pCLServing->fd),
-				(struct sockaddr *)&lcl, &so)) {
-		    FileWrite(pCLServing->fd,
-			      "getsockname failed, try again later\r\n",
-			      -1);
-		    Error("Master(): getsockname(%u): %s",
-			  FileFDNum(pCLServing->fd), strerror(errno));
-		    Bye(EX_OSERR);
+		    if (pcArgs == (char *)0) {
+			FileWrite(pCLServing->fd, FLAGFALSE,
+				  "login requires argument\r\n", -1);
+		    } else {
+			BuildString((char *)0, pCLServing->username);
+			BuildString((char *)0, pCLServing->acid);
+			BuildString(pcArgs, pCLServing->username);
+			BuildString(pcArgs, pCLServing->acid);
+			BuildStringChar('@', pCLServing->acid);
+			BuildString(pCLServing->peername->string,
+				    pCLServing->acid);
+			if (pCLServing->caccess == 't' ||
+			    CheckPasswd(pCLServing, "") == AUTH_SUCCESS) {
+			    pCLServing->iState = S_NORMAL;
+			    Verbose("<master> login %s",
+				    pCLServing->acid->string);
+			    FileWrite(pCLServing->fd, FLAGFALSE, "ok\r\n",
+				      4);
+			} else {
+			    FilePrint(pCLServing->fd, FLAGFALSE,
+				      "passwd? %s\r\n", myHostname);
+			    pCLServing->iState = S_PASSWD;
+			}
+		    }
+#if HAVE_OPENSSL
 		}
-		FilePrint(pCLServing->fd, "@%s", inet_ntoa(lcl.sin_addr));
-		iSep = 0;
-	    }
-	    if (config->redirect == FLAGTRUE) {
-		REMOTE *pRC;
-		for (pRC = pRCUniq; (REMOTE *)0 != pRC; pRC = pRC->pRCuniq) {
-		    FilePrint(pCLServing->fd, ":@%s" + iSep, pRC->rhost);
+#endif
+	    } else if (pCLServing->iState == S_NORMAL &&
+		       strcmp(pcCmd, "master") == 0) {
+		int iSep = 1;
+
+		if ((GRPENT *)0 != pGroups) {
+		    struct sockaddr_in lcl;
+		    socklen_t so = sizeof(lcl);
+		    if (-1 ==
+			getsockname(FileFDNum(pCLServing->fd),
+				    (struct sockaddr *)&lcl, &so)) {
+			FileWrite(pCLServing->fd, FLAGFALSE,
+				  "getsockname failed, try again later\r\n",
+				  -1);
+			Error("Master(): getsockname(%u): %s",
+			      FileFDNum(pCLServing->fd), strerror(errno));
+			Bye(EX_OSERR);
+		    }
+		    FilePrint(pCLServing->fd, FLAGTRUE, "@%s",
+			      inet_ntoa(lcl.sin_addr));
 		    iSep = 0;
 		}
-	    }
-	    FileWrite(pCLServing->fd, "\r\n", -1);
-	} else if (pCLServing->iState == S_NORMAL &&
-		   strcmp(pcCmd, "pid") == 0) {
-	    FilePrint(pCLServing->fd, "%lu\r\n", (unsigned long)thepid);
-	} else if (pCLServing->iState == S_NORMAL &&
-		   strcmp(pcCmd, "version") == 0) {
-	    FilePrint(pCLServing->fd, "version `%s'\r\n", THIS_VERSION);
-	} else if (pCLServing->iState == S_NORMAL &&
-		   strcmp(pcCmd, "quit") == 0) {
-	    if (ConsentFindUser(pADList, pCLServing->username->string) !=
-		(CONSENTUSERS *)0 ||
-		ConsentFindUser(pADList, "*") != (CONSENTUSERS *)0) {
-		Verbose("quit command by %s", pCLServing->acid->string);
-		FileWrite(pCLServing->fd, "ok -- terminated\r\n", -1);
-		DropMasterClient(pCLServing, FLAGFALSE);
-		kill(thepid, SIGTERM);
-		return;
-	    } else
-		FileWrite(pCLServing->fd, "unauthorized command\r\n", -1);
-	} else if (pCLServing->iState == S_NORMAL &&
-		   strcmp(pcCmd, "restart") == 0) {
-	    if (ConsentFindUser(pADList, pCLServing->username->string) !=
-		(CONSENTUSERS *)0 ||
-		ConsentFindUser(pADList, "*") != (CONSENTUSERS *)0) {
-		FileWrite(pCLServing->fd, "ok -- restarting\r\n", -1);
-		Verbose("restart command by %s", pCLServing->acid->string);
-		kill(thepid, SIGHUP);
-	    } else
-		FileWrite(pCLServing->fd, "unauthorized command\r\n", -1);
-	} else if (pCLServing->iState == S_NORMAL &&
-		   strcmp(pcCmd, "groups") == 0) {
-	    int iSep = 1;
-	    GRPENT *pGE;
+		if (config->redirect == FLAGTRUE) {
+		    REMOTE *pRC;
+		    for (pRC = pRCUniq; (REMOTE *)0 != pRC;
+			 pRC = pRC->pRCuniq) {
+			FilePrint(pCLServing->fd, FLAGTRUE, ":@%s" + iSep,
+				  pRC->rhost);
+			iSep = 0;
+		    }
+		}
+		FileWrite(pCLServing->fd, FLAGFALSE, "\r\n", -1);
+	    } else if (pCLServing->iState == S_NORMAL &&
+		       strcmp(pcCmd, "pid") == 0) {
+		FilePrint(pCLServing->fd, FLAGFALSE, "%lu\r\n",
+			  (unsigned long)thepid);
+	    } else if (pCLServing->iState == S_NORMAL &&
+		       strcmp(pcCmd, "version") == 0) {
+		FilePrint(pCLServing->fd, FLAGFALSE, "version `%s'\r\n",
+			  THIS_VERSION);
+	    } else if (pCLServing->iState == S_NORMAL &&
+		       strcmp(pcCmd, "quit") == 0) {
+		if (ConsentUserOk(pADList, pCLServing->username->string) ==
+		    1) {
+		    Verbose("quit command by %s",
+			    pCLServing->acid->string);
+		    FileWrite(pCLServing->fd, FLAGFALSE,
+			      "ok -- terminated\r\n", -1);
+		    DropMasterClient(pCLServing, FLAGFALSE);
+		    kill(thepid, SIGTERM);
+		    return;
+		} else
+		    FileWrite(pCLServing->fd, FLAGFALSE,
+			      "unauthorized command\r\n", -1);
+	    } else if (pCLServing->iState == S_NORMAL &&
+		       strcmp(pcCmd, "restart") == 0) {
+		if (ConsentUserOk(pADList, pCLServing->username->string) ==
+		    1) {
+		    FileWrite(pCLServing->fd, FLAGFALSE,
+			      "ok -- restarting\r\n", -1);
+		    Verbose("restart command by %s",
+			    pCLServing->acid->string);
+		    kill(thepid, SIGHUP);
+		} else
+		    FileWrite(pCLServing->fd, FLAGFALSE,
+			      "unauthorized command\r\n", -1);
+	    } else if (pCLServing->iState == S_NORMAL &&
+		       strcmp(pcCmd, "groups") == 0) {
+		int iSep = 1;
+		GRPENT *pGE;

-	    for (pGE = pGroups; pGE != (GRPENT *)0; pGE = pGE->pGEnext) {
-		if (0 == pGE->imembers)
-		    continue;
-		FilePrint(pCLServing->fd, ":%hu" + iSep, pGE->port);
-		iSep = 0;
-	    }
-	    FileWrite(pCLServing->fd, "\r\n", -1);
-	} else if (pCLServing->iState == S_NORMAL &&
-		   strcmp(pcCmd, "call") == 0) {
-	    if (pcArgs == (char *)0)
-		FileWrite(pCLServing->fd, "call requires argument\r\n",
+		for (pGE = pGroups; pGE != (GRPENT *)0; pGE = pGE->pGEnext) {
+		    if (0 == pGE->imembers)
+			continue;
+		    FilePrint(pCLServing->fd, FLAGTRUE, ":%hu" + iSep,
+			      pGE->port);
+		    iSep = 0;
+		}
+		FileWrite(pCLServing->fd, FLAGFALSE, "\r\n", 2);
+	    } else if (pCLServing->iState == S_NORMAL &&
+		       strcmp(pcCmd, "call") == 0) {
+		if (pcArgs == (char *)0)
+		    FileWrite(pCLServing->fd, FLAGFALSE,
+			      "call requires argument\r\n", -1);
+		else
+		    CommandCall(pCLServing, pcArgs);
+	    } else {
+		FileWrite(pCLServing->fd, FLAGFALSE, "unknown command\r\n",
 			  -1);
-	    else
-		CommandCall(pCLServing, pcArgs);
-	} else {
-	    FileWrite(pCLServing->fd, "unknown command\r\n", -1);
+	    }
+	    BuildString((char *)0, pCLServing->accmd);
 	}
-	BuildString((char *)0, pCLServing->accmd);
+	nr -= l;
+	MemMove(acIn, acIn + l, nr);
    }
 }

@ -633,7 +678,6 @@ Master()
    FILE *fp;
    CONSCLIENT *pCLServing = (CONSCLIENT *)0;
    CONSCLIENT *pCL = (CONSCLIENT *)0;
-    CONSCLIENT *pCLall = (CONSCLIENT *)0;


    /* set up signal handler */
@ -656,13 +700,13 @@ Master()
    SimpleSignal(SIGINT, FlagSawINT);

    /* prime the free connection slots */
-    if ((pCLfree = (CONSCLIENT *)calloc(1, sizeof(CONSCLIENT)))
+    if ((pCLmfree = (CONSCLIENT *)calloc(1, sizeof(CONSCLIENT)))
 	== (CONSCLIENT *)0)
 	OutOfMem();
-    pCLfree->accmd = AllocString();
-    pCLfree->peername = AllocString();
-    pCLfree->username = AllocString();
-    pCLfree->acid = AllocString();
+    pCLmfree->accmd = AllocString();
+    pCLmfree->peername = AllocString();
+    pCLmfree->username = AllocString();
+    pCLmfree->acid = AllocString();

    /* set up port for master to listen on
     */
@ -727,11 +771,12 @@ Master()
 	    fSawHUP = 0;
 	    Msg("processing SIGHUP");
 	    ReopenLogfile();
+	    ReopenUnifiedlog();
 	    SignalKids(SIGHUP);
 	    ReReadCfg(msfd);
 	    /* fix up the client descriptors since ReReadCfg() doesn't
 	     * see them like it can in the child processes */
-	    for (pCL = pCLall; pCL != (CONSCLIENT *)0; pCL = pCL->pCLscan) {
+	    for (pCL = pCLmall; pCL != (CONSCLIENT *)0; pCL = pCL->pCLscan) {
 		FD_SET(FileFDNum(pCL->fd), &rinit);
 		if (maxfd < FileFDNum(pCL->fd) + 1)
 		    maxfd = FileFDNum(pCL->fd) + 1;
@ -748,6 +793,7 @@ Master()
 	    fSawUSR2 = 0;
 	    Msg("processing SIGUSR2");
 	    ReopenLogfile();
+	    ReopenUnifiedlog();
 	    SignalKids(SIGUSR2);
 	}
 	if (fSawQuit) {		/* Something above set the quit flag */
@ -768,7 +814,7 @@ Master()
 	}

 	/* anything on a connection? */
-	for (pCLServing = pCLall; (CONSCLIENT *)0 != pCLServing;
+	for (pCLServing = pCLmall; (CONSCLIENT *)0 != pCLServing;
 	     pCLServing = pCLServing->pCLscan) {
 	    switch (pCLServing->ioState) {
 #if HAVE_OPENSSL
@ -791,7 +837,9 @@ Master()
 			FileCanWrite(pCLServing->fd, &rmask, &wmask)) {
 			CONDDEBUG((1, "Master(): flushing fd %d",
 				   FileFDNum(pCLServing->fd)));
-			if (FileWrite(pCLServing->fd, (char *)0, 0) < 0) {
+			if (FileWrite
+			    (pCLServing->fd, FLAGFALSE, (char *)0,
+			     0) < 0) {
 			    DropMasterClient(pCLServing, FLAGTRUE);
 			    break;
 			}
@ -823,7 +871,7 @@ Master()
 	so = sizeof(struct sockaddr_in);
 	for (cfd = 0; cfd == 0;) {
 	    cfd =
-		accept(msfd, (struct sockaddr *)&pCLfree->cnct_port, &so);
+		accept(msfd, (struct sockaddr *)&pCLmfree->cnct_port, &so);
 	    if (cfd < 0 && errno == EINTR)
 		cfd = 0;
 	}
@ -837,12 +885,13 @@ Master()
 	}

 	/* set to non-blocking and wrap in a File object */
-	if (SetFlags(cfd, O_NONBLOCK, 0))
-	    pCLfree->fd = FileOpenFD(cfd, simpleSocket);
-	else
-	    pCLfree->fd = (CONSFILE *)0;
+	if (SetFlags(cfd, O_NONBLOCK, 0)) {
+	    pCLmfree->fd = FileOpenFD(cfd, simpleSocket);
+	    FileSetQuoteIAC(pCLmfree->fd, FLAGTRUE);
+	} else
+	    pCLmfree->fd = (CONSFILE *)0;

-	if ((CONSFILE *)0 == pCLfree->fd) {
+	if ((CONSFILE *)0 == pCLmfree->fd) {
 	    Error("Master(): FileOpenFD(%u): %s", cfd, strerror(errno));
 #if HAVE_DMALLOC && DMALLOC_MARK_CLIENT_CONNECTION
 	    CONDDEBUG((1, "Master(): dmalloc / MarkClientConnection"));
@ -852,27 +901,27 @@ Master()
 	}

 	/* remove from the free list */
-	pCL = pCLfree;
-	pCLfree = pCL->pCLnext;
+	pCL = pCLmfree;
+	pCLmfree = pCL->pCLnext;

 	/* add another if we ran out */
-	if (pCLfree == (CONSCLIENT *)0) {
-	    if ((pCLfree = (CONSCLIENT *)calloc(1, sizeof(CONSCLIENT)))
+	if (pCLmfree == (CONSCLIENT *)0) {
+	    if ((pCLmfree = (CONSCLIENT *)calloc(1, sizeof(CONSCLIENT)))
 		== (CONSCLIENT *)0)
 		OutOfMem();
-	    pCLfree->accmd = AllocString();
-	    pCLfree->peername = AllocString();
-	    pCLfree->username = AllocString();
-	    pCLfree->acid = AllocString();
+	    pCLmfree->accmd = AllocString();
+	    pCLmfree->peername = AllocString();
+	    pCLmfree->username = AllocString();
+	    pCLmfree->acid = AllocString();
 	}

 	/* link into all clients list */
-	pCL->pCLscan = pCLall;
-	pCL->ppCLbscan = &pCLall;
+	pCL->pCLscan = pCLmall;
+	pCL->ppCLbscan = &pCLmall;
 	if ((CONSCLIENT *)0 != pCL->pCLscan) {
 	    pCL->pCLscan->ppCLbscan = &pCL->pCLscan;
 	}
-	pCLall = pCL;
+	pCLmall = pCL;

 	FD_SET(cfd, &rinit);
 	if (maxfd < cfd + 1)
@ -888,16 +937,18 @@ Master()
 	if (ClientAccessOk(pCL)) {
 	    pCL->ioState = ISNORMAL;
 	    /* say hi to start */
-	    FileWrite(pCL->fd, "ok\r\n", -1);
+	    FileWrite(pCL->fd, FLAGFALSE, "ok\r\n", 4);
 	} else
 	    DropMasterClient(pCL, FLAGFALSE);
    }

+    close(msfd);
+
    /* clean up the free list */
-    while (pCLfree != (CONSCLIENT *)0) {
-	pCL = pCLfree->pCLnext;
-	DestroyClient(pCLfree);
-	pCLfree = pCL;
+    while (pCLmfree != (CONSCLIENT *)0) {
+	pCL = pCLmfree->pCLnext;
+	DestroyClient(pCLmfree);
+	pCLmfree = pCL;
    }

    unlink(PIDFILE);
--- a/conserver/master.h
+++ b/conserver/master.h
@ -1,5 +1,5 @@
 /*
- *  $Id: master.h,v 5.16 2003-03-06 10:13:41-08 bryan Exp $
+ *  $Id: master.h,v 5.17 2003/10/03 14:23:37 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -37,5 +37,7 @@
 /*
 * stuff the master process needs
 */
+extern CONSCLIENT *pCLmall;
+extern CONSCLIENT *pCLmfree;
 extern void Master PARAMS((void));
 extern void SignalKids PARAMS((int));
--- a/conserver/readcfg.c
+++ b/conserver/readcfg.c
--- a/conserver/readcfg.h
+++ b/conserver/readcfg.h
@ -1,22 +1,28 @@
 /*
- *  $Id: readcfg.h,v 5.32 2003-09-28 08:54:16-07 bryan Exp $
+ *  $Id: readcfg.h,v 5.38 2003/11/10 15:37:24 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
 *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
 */

+#define BREAKDELAYDEFAULT 250
+
 typedef struct config {
    STRING *name;
    char defaultaccess;
    FLAG daemonmode;
    char *logfile;
-    char *initcmd;
    char *passwdfile;
    char *primaryport;
    FLAG redirect;
+    FLAG loghostnames;
    int reinitcheck;
    char *secondaryport;
+    char *unifiedlog;
+#if HAVE_SETPROCTITLE
+    FLAG setproctitle;
+#endif
 #if HAVE_OPENSSL
    char *sslcredentials;
    FLAG sslrequired;
--- a/conserver/version.h
+++ b/conserver/version.h
@ -1,5 +1,5 @@
 /*
- *  $Id: version.h,v 1.47 2003-09-28 13:34:49-07 bryan Exp $
+ *  $Id: version.h,v 1.59 2004/03/16 04:17:31 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.1"
+#define THIS_VERSION "conserver.com version 8.1.3"
--- a/console/Makefile.in
+++ b/console/Makefile.in
@ -15,7 +15,7 @@ MKDIR = @MKDIR@

 ### Compiler and link options
 CC	= @CC@
-CFLAGS	= @CFLAGS@ # -DPUCC -DSUN5
+CFLAGS	= @CFLAGS@
 DEFS	= @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)\"
 CPPFLAGS = -I.. -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/conserver $(DEFS) @CPPFLAGS@
 LDFLAGS	= @LDFLAGS@
@ -25,18 +25,23 @@ LIBS	= @LIBS@

 ### Makefile rules - no user-servicable parts below

-CONSOLE_OBJS = console.o getpassword.o ../conserver/util.o
-CONSOLE_HDRS = ../config.h $(top_srcdir)/compat.h $(top_srcdir)/conserver/port.h
+CONSOLE_OBJS = console.o getpassword.o ../conserver/cutil.o
+CONSOLE_HDRS = ../config.h $(top_srcdir)/compat.h \
+	       $(top_srcdir)/conserver/cutil.h \
+	       $(top_srcdir)/conserver/version.h \
+	       $(srcdir)/getpassword.h
 ALL = console


 all: $(ALL)

+$(CONSOLE_OBJS): $(CONSOLE_HDRS)
+
 console: $(CONSOLE_OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o console $(CONSOLE_OBJS) $(LIBS)

-../conserver/util.o:
-	( cd ../conserver && $(MAKE) $(MAKE_FLAGS) util.o ) || exit 1;
+../conserver/cutil.o:
+	( cd ../conserver && $(MAKE) $(MAKE_FLAGS) cutil.o ) || exit 1;

 .c.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
--- a/console/console.c
+++ b/console/console.c
--- a/console/console.man
+++ b/console/console.man
@ -1,5 +1,5 @@
-.\" $Id: console.man,v 1.36 2003-09-28 15:30:52-07 bryan Exp $
-.TH CONSOLE 1 "2003-09-28" "conserver-8.0.1" "conserver"
+.\" $Id: console.man,v 1.45 2004/03/20 14:40:42 bryan Exp $
+.TH CONSOLE 1 "2004/03/20" "conserver-8.1.3" "conserver"
 .SH NAME
 console \- console server client program
 .SH SYNOPSIS
@ -302,7 +302,7 @@ were typed).
 .PP
 The
 .B \-i
-option outputs information regarding each console in 13 colon-separated fields.
+option outputs information regarding each console in 15 colon-separated fields.
 .TP
 .I name
 The name of the console.
@ -318,22 +318,22 @@ a command, or `!' for a remote port.
 .TP
 .I console-details
 The details regarding the console.
-The values here (all comma seperated) depend on the type of the console.
-Local devices will have values of the device file, baud rate, and
+The values here (all comma-separated) depend on the type of the console.
+Local devices will have values of the device file, baud rate/parity, and
 file descriptor for the device.
 Commands will have values of the command, the command's pid, the
 pseudo-tty, and file descriptor for the pseudo-tty.
 Remote ports will have values of the remote hostname, remote port number,
-and file descriptor for the socket connection.
+``raw'' or ``telnet'' protocol, and file descriptor for the socket connection.
 .TP
 .I users-list
 The details of each user connected to the console.
 The details for each
-user are an `@' seperated list of `w', `r', or `s' (for read-write, read-only,
+user are an `@' separated list of `w', `r', or `s' (for read-write, read-only,
 or suspended), username, hostname the user is on, the user's idle time,
 and (for `r' and `s' users only) ``rw'' or ``ro'' (if the user wants
 read-write mode or not).
-Each user bundle is seperated by commas.
+Each user bundle is separated by commas.
 .TP
 .I state
 The state of the console.
@ -347,7 +347,7 @@ that the server can open the file for read, but not write.
 .TP
 .I logfile-details
 The details regarding the logging for the console.
-The comma seperated
+The comma-separated
 values will be the logfile, ``log'' or ``nolog'' (if logging is on
 or not - toggled via ^EcL), ``act'' or ``noact'' (if activity logging is
 enabled or not - the `a' timestamp option), the timestamp interval, and
@ -362,13 +362,19 @@ is at work, it will have the value of ``autoup'', otherwise it
 will be ``noautoup''.
 .TP
 .I aliases
-The console aliases are presented in a comma seperated list.
+The console aliases are presented in a comma-separated list.
 .TP
 .I options
-The active options for the console are presented in a comma seperated list.
+The active options for the console are presented in a comma-separated list.
 .TP
 .I initcmd
 The initcmd configuration option for the console.
+.TP
+.I idletimeout
+The idletimeout configuration option for the console.
+.TP
+.I idlestring
+The idlestring configuration option for the console.
 .SH "ESCAPE SEQUENCES"
 The connection can be controlled by a two-character escape sequence, followed
 by a command.
@ -381,6 +387,12 @@ Commands are:
 .sp
 .PD 0
 .TP 13
+.B \.
+disconnect
+.TP
+.B ;
+move to another console
+.TP
 .B a
 attach read-write if nobody already is
 .TP
@ -402,6 +414,9 @@ forcibly attach read-write
 .B g
 group info
 .TP
+.B i
+information dump
+.TP
 .B L
 toggle logging on/off
 .TP
@ -414,6 +429,9 @@ send the break sequence associated with this console
 .B l1-9
 send the specific break sequence
 .TP
+.B m
+display the "message of the day"
+.TP
 .B o
 close (if open) and reopen the line (to clear errors (silo overflows))
 and the log file
@ -442,6 +460,9 @@ examine this group's devices and modes
 .B z
 suspend this connection
 .TP
+.B |
+attach a local command to the console
+.TP
 .B ?
 display list of commands
 .TP
@ -455,8 +476,6 @@ replay the last line only
 send character having octal code
 .IR ooo " (must"
 specify three octal digits)
-.IP \.
-disconnect
 .PD
 .PP
 If any other character is hit after the escape sequence, all three characters
--- a/console/getpassword.c
+++ b/console/getpassword.c
@ -1,5 +1,5 @@
 /*
- *  $Id: getpassword.c,v 1.7 2003-09-28 12:29:17-07 bryan Exp $
+ *  $Id: getpassword.c,v 1.8 2003/11/20 13:56:41 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -12,7 +12,7 @@

 #include <pwd.h>

-#include <util.h>
+#include <cutil.h>
 #include <version.h>


--- a/console/getpassword.h
+++ b/console/getpassword.h
@ -1,5 +1,5 @@
 /*
- *  $Id: getpassword.h,v 1.3 2003-09-11 02:10:58-07 bryan Exp $
+ *  $Id: getpassword.h,v 1.3 2003/09/11 09:10:58 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
--- a/contrib/README
+++ b/contrib/README
@ -24,5 +24,5 @@ will be helpful.
 Bryan Stansell

 #
-#  $Id: README,v 1.4 2003-09-29 07:29:37-07 bryan Exp $
+#  $Id: README,v 1.4 2003/09/29 14:29:37 bryan Exp $
 #
--- a/contrib/chat/chat.c
+++ b/contrib/chat/chat.c
@ -88,15 +88,6 @@
 #define const
 #endif

-#include <sys/cdefs.h>
-#ifndef __NetBSD__
-#if 1
-static const char rcsid[] = "Id: chat.c,v 1.26 1999/12/23 01:39:54 paulus Exp ";
-#else
-__RCSID("$NetBSD: chat.c,v 1.25 2001/09/24 13:22:38 wiz Exp $");
-#endif
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 #include <time.h>
--- a/contrib/redhat-rpm/conserver.spec
+++ b/contrib/redhat-rpm/conserver.spec
@ -4,7 +4,7 @@
 #

 %define pkg  conserver
-%define ver  conserver-8.0.1
+%define ver  8.1.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
@ -17,7 +17,7 @@
 Summary: Serial console server daemon/client
 Name: %{pkg}
 Version: %{ver}
-Release: 1.%{distver}x
+Release: 1.%{distver}
 Copyright: distributable
 Group: System Environment/Daemons
 URL: http://www.conserver.com/
@ -100,4 +100,6 @@ fi
 %{prefix}/share/man/man8/conserver.8.gz
 %{prefix}/share/man/man5/conserver.cf.5.gz
 %{prefix}/share/man/man5/conserver.passwd.5.gz
+%{prefix}/share/examples/conserver/conserver.cf
+%{prefix}/share/examples/conserver/conserver.passwd
 %{prefix}/sbin/conserver
--- 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.1"
+VERSION="8.1.3"
 DESC="Console server and client"
 CLASSES=none
 ARCH=sparc
--- a/test/dotest
+++ b/test/dotest
@ -33,7 +33,7 @@ dotest()
    else
 	if [ -f results/test$testnum ]; then
 	    if diff -i test.out results/test$testnum >test$testnum.diff 2>&1; then
-		echo "succeded"
+		echo "succeeded"
 		rm -f test$testnum.diff
 	    else
 		echo "failed (diffs in test$testnum.diff)"
--- a/test/results/test2
+++ b/test/results/test2
@ -1,16 +1,18 @@
 [Enter `^Ec?' for help]
 [help]
- .    disconnect                        a    attach read/write
- b    send broadcast message            c    toggle flow control
- d    down a console                    e    change escape sequence
- f    force attach read/write           g    group info
- i    information dump                  L    toggle logging on/off
- l?   break sequence list               l0   send break per config file
- l1-9 send specific break sequence      o    (re)open the tty and log file
+ .    disconnect                        ;    move to another console
+ a    attach read/write                 b    send broadcast message
+ c    toggle flow control               d    down a console
+ e    change escape sequence            f    force attach read/write
+ g    group info                        i    information dump
+ L    toggle logging on/off             l?   break sequence list
+ l0   send break per config file        l1-9 send specific break sequence
+ m    display the message of the day    o    (re)open the tty and log file
 p    replay the last 60 lines          r    replay the last 20 lines
 s    spy read only                     u    show host status
 v    show version info                 w    who is on this console
 x    show console baud info            z    suspend the connection
- <cr> ignore/abort command              ?    print this message
- ^R   replay the last line              \ooo send character by octal code
+ |    attach local command              ?    print this message
+ <cr> ignore/abort command              ^R   replay the last line
+ \ooo send character by octal code
 [disconnect]
--- a/test/results/test7
+++ b/test/results/test7
@ -1,16 +1,18 @@
 [Enter `^Ec?' for help]
 [help]
- .    disconnect                        a    attach read/write
- b    send broadcast message            c    toggle flow control
- d    down a console                    e    change escape sequence
- f    force attach read/write           g    group info
- i    information dump                  L    toggle logging on/off
- l?   break sequence list               l0   send break per config file
- l1-9 send specific break sequence      o    (re)open the tty and log file
+ .    disconnect                        ;    move to another console
+ a    attach read/write                 b    send broadcast message
+ c    toggle flow control               d    down a console
+ e    change escape sequence            f    force attach read/write
+ g    group info                        i    information dump
+ L    toggle logging on/off             l?   break sequence list
+ l0   send break per config file        l1-9 send specific break sequence
+ m    display the message of the day    o    (re)open the tty and log file
 p    replay the last 60 lines          r    replay the last 20 lines
 s    spy read only                     u    show host status
 v    show version info                 w    who is on this console
 x    show console baud info            z    suspend the connection
- <cr> ignore/abort command              ?    print this message
- ^R   replay the last line              \ooo send character by octal code
+ |    attach local command              ?    print this message
+ <cr> ignore/abort command              ^R   replay the last line
+ \ooo send character by octal code
 [disconnect]
Author	SHA1	Message	Date
Bryan Stansell	29b909ee59	Imported from conserver-8.1.3.tar.gz	2004-03-22 17:14:45 -08:00
Bryan Stansell	aea0e2a547	Imported from conserver-8.1.2.tar.gz	2004-03-11 09:54:13 -08:00
Bryan Stansell	9eed9f2d8f	Imported from conserver-8.1.1.tar.gz	2004-02-10 07:26:45 -08:00
Bryan Stansell	25a4dcb0fd	Imported from conserver-8.1.0.tar.gz	2004-01-18 09:31:24 -08:00
Bryan Stansell	75cfd02f7a	Imported from conserver-8.0.9.tar.gz	2003-12-10 10:37:48 -08:00
Bryan Stansell	ad7a90dd69	Imported from conserver-8.0.8.tar.gz	2003-12-02 08:40:59 -08:00
Bryan Stansell	691c3102c9	Imported from conserver-8.0.7.tar.gz	2003-11-20 06:49:09 -08:00
Bryan Stansell	eafae7c27d	Imported from conserver-8.0.6.tar.gz	2003-11-16 11:33:39 -08:00
Bryan Stansell	92cf41a9f2	Imported from conserver-8.0.5.tar.gz	2003-10-31 10:15:09 -08:00
Bryan Stansell	1c188a41d6	Imported from conserver-8.0.4.tar.gz	2003-10-10 13:39:21 -07:00
Bryan Stansell	aeb8ac0057	Imported from conserver-8.0.3.tar.gz	2003-10-06 10:08:22 -07:00
Bryan Stansell	66e0902358	Imported from conserver-8.0.2.tar.gz	2003-10-05 18:08:18 -07:00