Imported from conserver-8.1.9.tar.gz

Imported from conserver-8.1.8.tar.gz
Imported from conserver-8.1.7.tar.gz
2025-06-24 09:46:39 +00:00 · 2004-07-14 16:21:13 -07:00 · 2004-06-09 15:28:27 -07:00 · 2004-05-28 11:03:33 -07:00 · 2004-05-25 17:41:29 -07:00
35 changed files with 3383 additions and 1517 deletions
--- a/49
+++ b/49
@ -1,6 +1,53 @@
 				CHANGES
 				=======

+version 8.1.9 (Jul 14, 2004):
+	- fixed bug processing access lists when duplicates exist in the
+	  list - reported by Phil Dibowitz <phil@usc.edu>
+	- fixed bug where 'idletimeout' was not recognized in default
+	  blocks - reported by John Cagle <jcagle@gmail.com>
+	- added an 'autocomplete' config option to set the console name
+	  autocompletion behavior - suggested by John Stoffel
+	  <stoffel@lucent.com>
+
+version 8.1.8 (Jun 9, 2004):
+	- added 'initspinmax' and 'initspintimer' console options to
+	  help calm console initialization "spinning"
+	- fixed setsockopt() error on 64bit solaris - reported by Trond
+	  Hagen <trond@basefarm.no>
+
+version 8.1.7 (May 28, 2004):
+	- cleaned up the manpages a bit to make things clearer and more
+	  standard - reported by Dave Stuit <djs@tellme.com>
+	- added an east coast mirror!  http://conserver.syr.edu/ -
+	  thanks to Christopher T. Beers <ctbeers@syr.edu>
+	- primary group of users not included in '@group' syntax -
+	  reported by Phil Dibowitz <phil@usc.edu>
+	- changed '@group' behavior such that groups are checked when
+	  needed, instead of cached at startup, which is more logical
+	- missing variables when building convert with tcp_wrappers -
+	  reported by Nikolaos Papavassiliou
+	  <Nikolaos.Papavassiliou@reuters.com>
+	- added --with-rpath option - suggested by Phil Dibowitz
+	  <phil@usc.edu>
+
+version 8.1.6 (May 25, 2004):
+	- added ability to configure client via system-wide console.cf
+	  file and per-user .consolerc - suggested (independently) by
+	  Erik Sjolund <erik.sjolund@sbc.su.se> and Trevor Fiatal
+	  <trevor@fiatal.net>
+	- fixed bug where break strings were not properly sent -
+	  reported by Tim Small <tim@buttersideup.com>
+	- fixed bug in config file 'protocol' value handling - reported
+	  by Kees Cook <kees@osdl.org>
+	- conserver no longer uses the local domain name in the default
+	  access list (the default list is only created if no access
+	  list is specified in the configuration file) - inspired by
+	  William P LePera <lepera@us.ibm.com>
+	- added a 'terminal' console configuration block for printing
+	  strings when attaching and detaching from consoles - suggested
+	  by Richard Threadgill <richardt@tellme.com>
+
 version 8.1.5 (May 7, 2004):
 	- changed remaining O_NDELAY flags to O_NONBLOCK
 	- added PROTOCOLS file to describe the client/server protocol
@ -722,5 +769,5 @@ before version 6.05:
 	  and enhancements of various types were applied.

 #
-#  $Id: CHANGES,v 1.174 2004/05/07 16:04:58 bryan Exp $
+#  $Id: CHANGES,v 1.192 2004/07/14 18:08:28 bryan Exp $
 #
--- a/8
+++ b/8
@ -16,6 +16,12 @@ Documentation
 Downloading

    The latest version can be found at http://www.conserver.com/
+    (US-West).
+
+    Mirrors of the site are at:
+
+	Australia	http://planetmirror.com/pub/conserver/
+	US-East		http://conserver.syr.edu/


 Systems Tested
@ -55,5 +61,5 @@ Contributions
    http://www.columbia.edu/acis/sy/unixdev/zinc

 #
-#  $Id: README,v 1.22 2003/08/23 19:34:24 bryan Exp $
+#  $Id: README,v 1.23 2004/05/27 23:39:29 bryan Exp $
 #
--- a/15
+++ b/15
@ -86,26 +86,17 @@ Bryan Stansell
    - 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>
+- netgroup support?  : Nikolaos Papavassiliou
+  <Nikolaos.Papavassiliou@reuters.com>

 #
-#  $Id: TODO,v 1.47 2004/03/12 17:34:49 bryan Exp $
+#  $Id: TODO,v 1.50 2004/05/28 01:58:43 bryan Exp $
 #
--- a/config.guess
+++ b/config.guess
@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

-timestamp='2004-03-12'
+timestamp='2004-06-24'

 # 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
@ -53,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)

 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
@ -212,6 +212,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@ -227,9 +230,6 @@ 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 ;;
@ -307,9 +307,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
    Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@ -764,7 +761,7 @@ EOF
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@ -787,21 +784,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# 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}
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@ -1096,7 +1079,7 @@ EOF
    M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
 	exit 0 ;;
-    M68*:*:R3V[567]*:*)
+    M68*:*:R3V[5678]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 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=''
@ -1260,6 +1243,13 @@ EOF
    *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms && exit 0 ;;
+	    I*) echo ia64-dec-vms && exit 0 ;;
+	    V*) echo vax-dec-vms && exit 0 ;;
+	esac
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
--- a/config.h.in
+++ b/config.h.in
@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */

+/* Client config file path */
+#undef CLIENTCONFIGFILE
+
 /* Config file path */
 #undef CONFIGFILE

@ -57,6 +60,9 @@
 /* Define to 1 if you have the `getspnam' function. */
 #undef HAVE_GETSPNAM

+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
 /* Define to 1 if you have the `getuserattr' function. */
 #undef HAVE_GETUSERATTR

--- a/config.sub
+++ b/config.sub
@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

-timestamp='2004-03-12'
+timestamp='2004-06-24'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
@ -145,7 +145,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@ -300,7 +300,7 @@ case $basic_machine in
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@ -326,8 +326,9 @@ case $basic_machine in
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@ -445,6 +446,10 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
 	cr16c)
 		basic_machine=cr16c-unknown
 		os=-elf
@ -659,10 +664,6 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@ -743,10 +744,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@ -1059,6 +1056,9 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@ -1374,6 +1374,9 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
--- a/114
+++ b/114
@ -847,6 +847,8 @@ Optional Packages:
  --with-port=PORT        Specify port number [conserver]
  --with-base=PORT        Base port for secondary channel [0]
  --with-master=MASTER    Specify master server hostname [console]
+  --with-ccffile=CFFILE   Specify client config filename
+                          [SYSCONFDIR/console.cf]
  --with-cffile=CFFILE    Specify config filename
                          [SYSCONFDIR/conserver.cf]
  --with-pwdfile=PWDFILE  Specify password filename
@ -860,6 +862,7 @@ Optional Packages:
  --with-uds[=DIR]
                          Use Unix domain sockets for client/server
                          communication [/tmp/conserver]
+  --with-rpath            Use -R as well as -L for libraries
  --with-libwrap[=PATH]
                          Compile in libwrap (tcp_wrappers) support
  --with-openssl[=PATH]
@ -1432,6 +1435,47 @@ _ACEOF
 echo "${ECHO_T}'console'" >&6
 fi;

+echo "$as_me:$LINENO: checking for client configuration filename" >&5
+echo $ECHO_N "checking for client configuration filename... $ECHO_C" >&6
+
+# Check whether --with-ccffile or --without-ccffile was given.
+if test "${with_ccffile+set}" = set; then
+  withval="$with_ccffile"
+  case "$withval" in
+	    yes|no)
+		cat >>confdefs.h <<_ACEOF
+#define CLIENTCONFIGFILE SYSCONFDIR "/console.cf"
+_ACEOF
+
+		echo "$as_me:$LINENO: result: '$sysconfdir/console.cf'" >&5
+echo "${ECHO_T}'$sysconfdir/console.cf'" >&6
+		;;
+	    [\\/]* | ?:[\\/]* )
+		cat >>confdefs.h <<_ACEOF
+#define CLIENTCONFIGFILE "$withval"
+_ACEOF
+
+		echo "$as_me:$LINENO: result: '$withval'" >&5
+echo "${ECHO_T}'$withval'" >&6
+		;;
+	    *)
+		cat >>confdefs.h <<_ACEOF
+#define CLIENTCONFIGFILE SYSCONFDIR "/$withval"
+_ACEOF
+
+		echo "$as_me:$LINENO: result: '$sysconfdir/$withval'" >&5
+echo "${ECHO_T}'$sysconfdir/$withval'" >&6
+		;;
+	esac
+else
+  cat >>confdefs.h <<_ACEOF
+#define CLIENTCONFIGFILE SYSCONFDIR "/console.cf"
+_ACEOF
+
+	echo "$as_me:$LINENO: result: '$sysconfdir/console.cf'" >&5
+echo "${ECHO_T}'$sysconfdir/console.cf'" >&6
+fi;
+
 echo "$as_me:$LINENO: checking for configuration filename" >&5
 echo $ECHO_N "checking for configuration filename... $ECHO_C" >&6

@ -1698,6 +1742,7 @@ fi;

 echo "$as_me:$LINENO: checking whether to use Unix domain sockets" >&5
 echo $ECHO_N "checking whether to use Unix domain sockets... $ECHO_C" >&6
+cons_with_uds="NO"

 # Check whether --with-uds or --without-uds was given.
 if test "${with_uds+set}" = set; then
@ -1714,6 +1759,7 @@ _ACEOF

 		echo "$as_me:$LINENO: result: /tmp/conserver" >&5
 echo "${ECHO_T}/tmp/conserver" >&6
+		cons_with_uds="YES"
 		;;
 	    no)
 		echo "$as_me:$LINENO: result: no" >&5
@ -1730,6 +1776,7 @@ _ACEOF

 		echo "$as_me:$LINENO: result: '$withval'" >&5
 echo "${ECHO_T}'$withval'" >&6
+		cons_with_uds="YES"
 		if expr "$withval" : '/' >/dev/null 2>&1; then
 		    :
 		else
@ -1743,6 +1790,29 @@ else
 echo "${ECHO_T}no" >&6
 fi;

+use_dash_r=no
+echo "$as_me:$LINENO: checking whether to use -R paths as well as -L" >&5
+echo $ECHO_N "checking whether to use -R paths as well as -L... $ECHO_C" >&6
+
+# Check whether --with-rpath or --without-rpath was given.
+if test "${with_rpath+set}" = set; then
+  withval="$with_rpath"
+  case "$withval" in
+	    yes|no)
+		echo "$as_me:$LINENO: result: $withval" >&5
+echo "${ECHO_T}$withval" >&6
+		use_dash_r=$withval
+		;;
+	    *)
+		echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+		;;
+	esac
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@ -5424,6 +5494,7 @@ fi



+cons_with_libwrap="NO"

 # Check whether --with-libwrap or --without-libwrap was given.
 if test "${with_libwrap+set}" = set; then
@ -5431,7 +5502,11 @@ if test "${with_libwrap+set}" = set; then
  if test "$withval" != "no"; then
 	if test "$withval" != "yes"; then
 	    WRAPCPPFLAGS="-I$withval/include"
-	    WRAPLDFLAGS="-L$withval/lib"
+	    if test "$use_dash_r" != "yes"; then
+		WRAPLDFLAGS="-L$withval/lib"
+	    else
+		WRAPLDFLAGS="-L$withval/lib -R$withval/lib"
+	    fi
 	else
 	    WRAPCPPFLAGS=""
 	    WRAPLDFLAGS=""
@ -5627,6 +5702,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (exit $ac_status); }; }; then
  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+		 cons_with_libwrap="YES"
 		 cat >>confdefs.h <<\_ACEOF
 #define USE_LIBWRAP 1
 _ACEOF
@ -5685,6 +5761,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (exit $ac_status); }; }; then
  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+		     cons_with_libwrap="YES"
 		     cat >>confdefs.h <<\_ACEOF
 #define USE_LIBWRAP 1
 _ACEOF
@ -5714,6 +5791,7 @@ fi

 fi;

+cons_with_openssl="NO"

 # Check whether --with-openssl or --without-openssl was given.
 if test "${with_openssl+set}" = set; then
@ -5721,7 +5799,11 @@ if test "${with_openssl+set}" = set; then
  if test "$withval" != "no"; then
 	if test "$withval" != "yes"; then
 	    OPENSSLCPPFLAGS="-I$withval/include"
-	    OPENSSLLDFLAGS="-L$withval/lib"
+	    if test "$use_dash_r" != "yes"; then
+		OPENSSLLDFLAGS="-L$withval/lib"
+	    else
+		OPENSSLLDFLAGS="-L$withval/lib -R$withval/lib"
+	    fi
 	else
 	    OPENSSLCPPFLAGS=""
 	    OPENSSLLDFLAGS=""
@ -5916,6 +5998,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (exit $ac_status); }; }; then
  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+		cons_with_openssl="YES"
 		cat >>confdefs.h <<\_ACEOF
 #define HAVE_OPENSSL 1
 _ACEOF
@ -5943,6 +6026,7 @@ fi

 fi;

+cons_with_dmalloc="NO"

 # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
@ -5950,7 +6034,11 @@ if test "${with_dmalloc+set}" = set; then
  if test "$withval" != "no"; then
 	if test "$withval" != "yes"; then
 	    DMALLOCCPPFLAGS="-I$withval/include"
-	    DMALLOCLDFLAGS="-L$withval/lib"
+	    if test "$use_dash_r" != "yes"; then
+		DMALLOCLDFLAGS="-L$withval/lib"
+	    else
+		DMALLOCLDFLAGS="-L$withval/lib -R$withval/lib"
+	    fi
 	else
 	    DMALLOCCPPFLAGS=""
 	    DMALLOCLDFLAGS=""
@ -6145,6 +6233,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (exit $ac_status); }; }; then
  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+		cons_with_dmalloc="YES"
 		cat >>confdefs.h <<\_ACEOF
 #define HAVE_DMALLOC 1
 _ACEOF
@ -6175,6 +6264,7 @@ fi;



+cons_with_pam="NO"
 echo "$as_me:$LINENO: checking for PAM support" >&5
 echo $ECHO_N "checking for PAM support... $ECHO_C" >&6

@ -6371,6 +6461,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (exit $ac_status); }; }; then
  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+		    cons_with_pam="YES"
 		    cat >>confdefs.h <<\_ACEOF
 #define HAVE_PAM 1
 _ACEOF
@ -6431,6 +6522,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (exit $ac_status); }; }; then
  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+			cons_with_pam="YES"
 			cat >>confdefs.h <<\_ACEOF
 #define HAVE_PAM 1
 _ACEOF
@ -6824,7 +6916,8 @@ done



-for ac_func in 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
+
+for ac_func in 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 gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@ -8665,3 +8758,16 @@ if test "$no_create" != yes; then
  $ac_cs_success || { (exit 1); exit 1; }
 fi

+
+
+echo "=============================================================="
+echo "                      Feature Summary"
+echo ""
+echo "  Unix domain sockets (--with-uds)    : $cons_with_uds"
+echo "         TCP wrappers (--with-libwrap): $cons_with_libwrap"
+echo "              OpenSSL (--with-openssl): $cons_with_openssl"
+echo "              dmalloc (--with-dmalloc): $cons_with_dmalloc"
+echo "          PAM support (--with-pam)    : $cons_with_pam"
+echo ""
+echo "=============================================================="
+
--- a/configure.in
+++ b/configure.in
@ -4,6 +4,7 @@ AH_TEMPLATE([DEFPORT], [Socket used to communicate])
 AH_TEMPLATE([DEFBASEPORT], [Base socket used for secondary channel])
 AH_TEMPLATE([MASTERHOST], [Hostname of console server])
 AH_TEMPLATE([CONFIGFILE], [Config file path])
+AH_TEMPLATE([CLIENTCONFIGFILE], [Client config file path])
 AH_TEMPLATE([PASSWDFILE], [Password file path])
 AH_TEMPLATE([LOGFILEPATH], [Logfile path])
 AH_TEMPLATE([MAXMEMB], [Number of consoles per child process])
@ -98,6 +99,26 @@ AC_ARG_WITH(master,
 	[AC_DEFINE_UNQUOTED(MASTERHOST, "console")
 	AC_MSG_RESULT('console')])

+AC_MSG_CHECKING(for client configuration filename)
+AC_ARG_WITH(ccffile,
+	AS_HELP_STRING([--with-ccffile=CFFILE],[Specify client config filename @<:@SYSCONFDIR/console.cf@:>@]),
+	[case "$withval" in
+	    yes|no)
+		AC_DEFINE_UNQUOTED(CLIENTCONFIGFILE, [SYSCONFDIR "/console.cf"])
+		AC_MSG_RESULT('$sysconfdir/console.cf')
+		;;
+	    [[\\/]]* | ?:[[\\/]]* )
+		AC_DEFINE_UNQUOTED(CLIENTCONFIGFILE, ["$withval"])
+		AC_MSG_RESULT('$withval')
+		;;
+	    *)
+		AC_DEFINE_UNQUOTED(CLIENTCONFIGFILE, [SYSCONFDIR "/$withval"])
+		AC_MSG_RESULT('$sysconfdir/$withval')
+		;;
+	esac],
+	[AC_DEFINE_UNQUOTED(CLIENTCONFIGFILE, [SYSCONFDIR "/console.cf"])
+	AC_MSG_RESULT('$sysconfdir/console.cf')])
+
 AC_MSG_CHECKING(for configuration filename)
 AC_ARG_WITH(cffile,
 	AS_HELP_STRING([--with-cffile=CFFILE],[Specify config filename @<:@SYSCONFDIR/conserver.cf@:>@]),
@ -233,6 +254,7 @@ AC_ARG_WITH(extmsgs,
 	esac],[AC_MSG_RESULT(no)])

 AC_MSG_CHECKING(whether to use Unix domain sockets)
+cons_with_uds="NO"
 AC_ARG_WITH(uds,
 	AS_HELP_STRING([--with-uds@<:@=DIR@:>@    ],
 	    [Use Unix domain sockets for client/server communication @<:@/tmp/conserver@:>@]),
@ -241,6 +263,7 @@ AC_ARG_WITH(uds,
 		AC_DEFINE_UNQUOTED(UDSDIR, "/tmp/conserver")
 		AC_DEFINE(USE_UNIX_DOMAIN_SOCKETS)
 		AC_MSG_RESULT([/tmp/conserver])
+		cons_with_uds="YES"
 		;;
 	    no)
 		AC_MSG_RESULT(no)
@ -249,6 +272,7 @@ AC_ARG_WITH(uds,
 		AC_DEFINE_UNQUOTED(UDSDIR, "$withval")
 		AC_DEFINE(USE_UNIX_DOMAIN_SOCKETS)
 		AC_MSG_RESULT('$withval')
+		cons_with_uds="YES"
 		if expr "$withval" : '/' >/dev/null 2>&1; then
 		    :
 		else
@ -258,6 +282,21 @@ AC_ARG_WITH(uds,
 		;;
 	esac],[AC_MSG_RESULT(no)])

+use_dash_r=no
+AC_MSG_CHECKING(whether to use -R paths as well as -L)
+AC_ARG_WITH(rpath,
+	AS_HELP_STRING([--with-rpath],[Use -R as well as -L for libraries]),
+	[case "$withval" in
+	    yes|no)
+		AC_MSG_RESULT($withval)
+		use_dash_r=$withval
+		;;
+	    *)
+		AC_MSG_RESULT(no)
+		;;
+	esac],
+	[AC_MSG_RESULT(no)])
+
 dnl ### Check for compiler et al. ###################################
 AC_PROG_CC
 AC_PROG_INSTALL
@ -343,13 +382,18 @@ AC_SEARCH_LIBS(crypt,crypt)
 AC_SUBST(CONSLIBS)
 AC_SUBST(CONSCPPFLAGS)
 AC_SUBST(CONSLDFLAGS)
+cons_with_libwrap="NO"
 AC_ARG_WITH(libwrap,
    AS_HELP_STRING([--with-libwrap@<:@=PATH@:>@],
 	[Compile in libwrap (tcp_wrappers) support]),
    [if test "$withval" != "no"; then
 	if test "$withval" != "yes"; then
 	    WRAPCPPFLAGS="-I$withval/include"
-	    WRAPLDFLAGS="-L$withval/lib"
+	    if test "$use_dash_r" != "yes"; then
+		WRAPLDFLAGS="-L$withval/lib"
+	    else
+		WRAPLDFLAGS="-L$withval/lib -R$withval/lib"
+	    fi
 	else
 	    WRAPCPPFLAGS=""
 	    WRAPLDFLAGS=""
@ -370,6 +414,7 @@ AC_ARG_WITH(libwrap,
 		int deny_severity  = 0;
 		],[hosts_access((void *)0)],
 		[AC_MSG_RESULT(yes)
+		 cons_with_libwrap="YES"
 		 AC_DEFINE(USE_LIBWRAP)
 		 CONSLIBS="$CONSLIBS -lwrap"
 		 CONSLDFLAGS="$CONSLDFLAGS $WRAPLDFLAGS"
@ -382,6 +427,7 @@ AC_ARG_WITH(libwrap,
 		    int deny_severity  = 0;
 		    ],[hosts_access((void *)0)],
 		    [AC_MSG_RESULT(yes)
+		     cons_with_libwrap="YES"
 		     AC_DEFINE(USE_LIBWRAP)
 		     CONSLIBS="$CONSLIBS -lwrap -lnsl"
 		     CONSLDFLAGS="$CONSLDFLAGS $WRAPLDFLAGS"
@ -393,13 +439,18 @@ AC_ARG_WITH(libwrap,
    fi]
 )

+cons_with_openssl="NO"
 AC_ARG_WITH(openssl,
    AS_HELP_STRING([--with-openssl@<:@=PATH@:>@],
 	[Compile in OpenSSL support]),
    [if test "$withval" != "no"; then
 	if test "$withval" != "yes"; then
 	    OPENSSLCPPFLAGS="-I$withval/include"
-	    OPENSSLLDFLAGS="-L$withval/lib"
+	    if test "$use_dash_r" != "yes"; then
+		OPENSSLLDFLAGS="-L$withval/lib"
+	    else
+		OPENSSLLDFLAGS="-L$withval/lib -R$withval/lib"
+	    fi
 	else
 	    OPENSSLCPPFLAGS=""
 	    OPENSSLLDFLAGS=""
@ -419,6 +470,7 @@ AC_ARG_WITH(openssl,
 	    AC_TRY_LINK([#include <openssl/ssl.h>
 		],[SSL_library_init()],
 		[AC_MSG_RESULT(yes)
+		cons_with_openssl="YES"
 		AC_DEFINE(HAVE_OPENSSL)
 		have_openssl=yes],
 		[AC_MSG_RESULT(no)])],)
@ -431,13 +483,18 @@ AC_ARG_WITH(openssl,
    fi]
 )

+cons_with_dmalloc="NO"
 AC_ARG_WITH(dmalloc,
    AS_HELP_STRING([--with-dmalloc@<:@=PATH@:>@],
 	[Compile in dmalloc support]),
    [if test "$withval" != "no"; then
 	if test "$withval" != "yes"; then
 	    DMALLOCCPPFLAGS="-I$withval/include"
-	    DMALLOCLDFLAGS="-L$withval/lib"
+	    if test "$use_dash_r" != "yes"; then
+		DMALLOCLDFLAGS="-L$withval/lib"
+	    else
+		DMALLOCLDFLAGS="-L$withval/lib -R$withval/lib"
+	    fi
 	else
 	    DMALLOCCPPFLAGS=""
 	    DMALLOCLDFLAGS=""
@ -457,6 +514,7 @@ AC_ARG_WITH(dmalloc,
 	    AC_TRY_LINK([#include <dmalloc.h>
 		],[dmalloc_debug(0)],
 		[AC_MSG_RESULT(yes)
+		cons_with_dmalloc="YES"
 		AC_DEFINE(HAVE_DMALLOC)
 		have_dmalloc=yes],
 		[AC_MSG_RESULT(no)])],)
@ -505,6 +563,7 @@ dnl 	else
 dnl 	    AC_MSG_RESULT(no)
 dnl 	fi],[AC_MSG_RESULT(no)])

+cons_with_pam="NO"
 AC_MSG_CHECKING(for PAM support)
 AC_ARG_WITH(pam,
    AS_HELP_STRING([--with-pam],
@ -517,6 +576,7 @@ AC_ARG_WITH(pam,
 		AC_MSG_CHECKING(for PAM library -lpam)
 		AC_TRY_LINK_FUNC([pam_start],
 		    [AC_MSG_RESULT(yes)
+		    cons_with_pam="YES"
 		    AC_DEFINE(HAVE_PAM)
 		    CONSLIBS="$CONSLIBS -lpam"],
 		    [LIBS="$LIBS -ldl"
@ -524,6 +584,7 @@ AC_ARG_WITH(pam,
 		    AC_MSG_CHECKING(for PAM library -lpam with -ldl)
 		    AC_TRY_LINK_FUNC([pam_end],
 			[AC_MSG_RESULT(yes)
+			cons_with_pam="YES"
 			AC_DEFINE(HAVE_PAM)
 			CONSLIBS="$CONSLIBS -lpam -ldl"],
 			[AC_MSG_RESULT(no)])])],)
@ -548,7 +609,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 setproctitle)
+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 gettimeofday)
 AC_FUNC_SETPGRP
 AC_CHECK_FUNC(strcasecmp,
 	[AC_DEFINE(HAVE_STRCASECMP, 1, [Define if strcasecmp is available])],
@ -566,3 +627,16 @@ dnl ### Create output files. #######################################
 AC_CONFIG_FILES([Makefile conserver/Makefile conserver.cf/Makefile console/Makefile autologin/Makefile contrib/chat/Makefile])
 AC_CONFIG_FILES([conserver/conserver.rc], [chmod +x conserver/conserver.rc])
 AC_OUTPUT
+
+[
+echo "=============================================================="
+echo "                      Feature Summary"
+echo ""
+echo "  Unix domain sockets (--with-uds)    : $cons_with_uds"
+echo "         TCP wrappers (--with-libwrap): $cons_with_libwrap"
+echo "              OpenSSL (--with-openssl): $cons_with_openssl"
+echo "              dmalloc (--with-dmalloc): $cons_with_dmalloc"
+echo "          PAM support (--with-pam)    : $cons_with_pam"
+echo ""
+echo "=============================================================="
+]
--- a/conserver.cf/conserver.cf.man
+++ b/conserver.cf/conserver.cf.man
@ -1,5 +1,5 @@
-.\" $Id: conserver.cf.man,v 1.63 2004/05/07 03:42:51 bryan Exp $
-.TH CONSERVER.CF 5 "2004/05/07" "conserver-8.1.5" "conserver"
+.\" $Id: conserver.cf.man,v 1.68 2004/07/14 05:28:42 bryan Exp $
+.TH CONSERVER.CF 5 "2004/07/14" "conserver-8.1.9" "conserver"
 .SH NAME
 conserver.cf \- console configuration file for
 .BR conserver (8)
@ -126,9 +126,8 @@ must begin in ``column 0'' - no whitespace is allowed between it and
 the start of the physical line.
 There is an include file depth limit of 10 to prevent infinite recursion.
 .SH BLOCKS
-.TP 8
-.B access
-.RI [ " hostname " | " ipaddr " ]
+.TP
+\f3access\fP \f2hostname\fP|\f2ipaddr\fP
 .br
 Define an access block for the host named
 .I hostname
@ -139,10 +138,8 @@ all conserver hosts.
 Access lists are used in a first match
 fashion (top down), so order is important.
 .RS
-.TP 15
-.B admin
-.RI "[ [\f3!\fP]" username ,...
-| "" ]
+.TP
+\f3admin\fP [\f3!\fP]\f2username\fP[\f3,\fP...]|\f3""\fP
 .br
 Define a list of users making up the admin list for the console server.
 If
@ -162,49 +159,43 @@ If
 .I username
 doesn't match a previous group and doesn't begin with `@', the users
 will be granted (or denied, if prefixed with `!') access.
-If the null string (``""'') is used, any
+If the null string (``\f3""\fP'') is used, any
 users previously defined for the console servers's admin list are removed.
 .TP
-.B allowed
-.IR hostname ", ..."
+\f3allowed\fP \f2hostname\fP[\f3,\fP...]
 .br
 The list of hostnames are added to the ``allowed'' list, which grants
 connections from the hosts but requires username authentication.
 .TP
-.B include
-.I accessgroup
+\f3include\fP \f2accessgroup\fP
 .br
 The access lists defined using the name
 .I accessgroup
 are applied to the current access block.
 The included access block must be previously defined.
 .TP
-.B rejected
-.IR hostname ", ..."
+\f3rejected\fP \f2hostname\fP[\f3,\fP...]
 .br
 The list of hostnames are added to the ``rejected'' list, which rejects
 connections from the hosts.
 .TP
-.B trusted
-.IR hostname ", ..."
+\f3trusted\fP \f2hostname\fP[\f3,\fP...]
 .br
 The list of hostnames are added to the ``trusted'' list, which grants
 connections from the hosts without username authentication.
 .RE
-.TP 8
-.B break
-.I n
+.TP
+\f3break\fP \f2n\fP
 .br
 Define a break sequence where 0 < 
 .I n
 < 10.
 Break sequences are accessed via the
-.RI ``^El n ''
+.RI ``^Ecl n ''
 client escape sequence.
 .RS
-.TP 15
-.B delay
-.I n
+.TP
+\f3delay\fP \f2n\fP
 .br
 Set the time delay for the
 .B \ed
@ -213,8 +204,7 @@ sequence to
 milliseconds.
 The default time delay is 250ms.
 .TP
-.B string
-.I breakseq
+\f3string\fP \f2breakseq\fP
 .br
 Assign the string
 .IR breakseq
@ -223,6 +213,7 @@ to the specified slot
 A break sequence is a simple character string with the exception of `\e'
 and `^':
 .RS
+.RS
 .sp
 .PD 0
 .TP 6
@ -280,9 +271,9 @@ is ``and''ed with 0x1f)
 .PD
 .RE
 .RE
-.TP 8
-.B config
-.RI [ " hostname " | " ipaddr " ]
+.RE
+.TP
+\f3config\fP \f2hostname\fP|\f2ipaddr\fP
 .br
 Define a configuration block for the host named
 .I hostname
@ -291,27 +282,28 @@ or using the address
 If the value of ``*'' is used, the configuration block will be applied to
 all conserver hosts.
 .RS
-.TP 15
-.B defaultaccess
-.RB [ " rejected " | " trusted "
-.RB | " allowed " ]
+.TP
+\f3autocomplete\fP \f3yes\fP|\f3true\fP|\f3on\fP|\f3no\fP|\f3false\fP|\f3off
+.br
+Turn the console name autocompletion feature on or off.
+If autocompletion is on, a client can use any unique leading portion of a
+console name when connecting to a console.
+Autocompletion is on by default.
+.TP
+\f3defaultaccess\fP \f3rejected\fP|\f3trusted\fP|\f3allowed\fP
 .br
 Set the default access permission for all hosts not matched by
 an access list (see the
 .B \-a
 command-line flag).
 .TP
-.B daemonmode
-.RB [ " yes " | " true "
-.RB | " on " | " no "
-.RB | " false " | " off " ]
+\f3daemonmode\fP \f3yes\fP|\f3true\fP|\f3on\fP|\f3no\fP|\f3false\fP|\f3off
 .br
 Set whether or not to become a daemon when run (see the
 .B \-d
 command-line flag).
 .TP
-.B initdelay
-.I number
+\f3initdelay\fP \f2number\fP
 .br
 Set the number of seconds between console initializations.
 All consoles with the same
@ -337,54 +329,43 @@ If
 .I number
 is zero, all consoles are initialized without delay.
 .TP
-.B logfile
-.I filename
+\f3logfile\fP \f2filename\fP
 .br
 Set the logfile to write to when in daemon mode (see the
 .B \-L
 command-line flag).
 .TP
-.B passwdfile
-.I filename
+\f3passwdfile\fP \f2filename\fP
 .br
 Set the password file location used for authentication (see the
 .B \-P
 command-line flag).
 .TP
-.B primaryport
-.RI [ " number " | " name " ]
+\f3primaryport\fP \f2number\fP|\f2name\fP
 .br
 Set the port used by the master conserver process (see the
 .B \-p
 command-line flag).
 .TP
-.B redirect
-.RB [ " yes " | " true "
-.RB | " on " | " no "
-.RB | " false " | " off " ]
+\f3redirect\fP \f3yes\fP|\f3true\fP|\f3on\fP|\f3no\fP|\f3false\fP|\f3off
 .br
 Turn redirection on or off (see the
 .B \-R
 command-line flag).
 .TP
-.B reinitcheck
-.I number
+\f3reinitcheck\fP \f2number\fP
 .br
 Set the number of minutes used between reinitialization checks (see the
 .B \-O
 command-line flag).
 .TP
-.B secondaryport
-.RI [ " number " | " name " ]
+\f3secondaryport\fP \f2number\fP|\f2name\fP
 .br
 Set the base port number used by child processes (see the
 .B \-b
 command-line flag).
 .TP
-.B setproctitle
-.RB [ " yes " | " true "
-.RB | " on " | " no "
-.RB | " false " | " off " ]
+\f3setproctitle\fP \f3yes\fP|\f3true\fP|\f3on\fP|\f3no\fP|\f3false\fP|\f3off
 .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
@ -393,8 +374,7 @@ The operating system must support the
 .BR setproctitle ()
 call.
 .TP
-.B sslcredentials
-.I filename
+\f3sslcredentials\fP \f2filename\fP
 .br
 Set the
 .SM SSL
@ -402,17 +382,13 @@ credentials file location (see the
 .B \-c
 command-line flag).
 .TP
-.B sslrequired
-.RB [ " yes " | " true "
-.RB | " on " | " no "
-.RB | " false " | " off " ]
+\f3sslrequired\fP \f3yes\fP|\f3true\fP|\f3on\fP|\f3no\fP|\f3false\fP|\f3off
 .br
 Set whether or not encryption is required when talking to clients (see the
 .B \-E
 command-line flag).
 .TP
-.B unifiedlog
-.I filename
+\f3unifiedlog\fP \f2filename\fP
 .br
 Set the location of the unified log to
 .IR filename .
@ -420,9 +396,8 @@ See the
 .B \-U
 command-line flag for details.
 .RE
-.TP 8
-.B console
-.I name
+.TP
+\f3console\fP \f2name\fP
 .br
 Define a console identified as
 .IR name .
@ -430,18 +405,15 @@ The keywords are the same as the
 .B default
 block with the following addition.
 .RS
-.TP 15
-.B aliases
-.RI [ " name" ", ..."
-| "" ]
+.TP
+\f3aliases\fP \f2name\fP[\f3,\fP...]|\f3""\fP
 .br
 Define a list of console aliases.
-If the null string (``""'') is used, any
+If the null string (``\f3""\fP'') is used, any
 aliases previously defined for the console are removed.
 .RE
-.TP 8
-.B default
-.I name
+.TP
+\f3default\fP \f2name\fP
 .br
 Define a block of defaults identified as
 .IR name .
@ -451,36 +423,27 @@ is ``*'', the automatically applied default block is defined (basically
 all consoles have an implicit ``include "*";'' at the beginning
 of their definition).
 .RS
-.TP 15
-.B baud
-.RB [ " 300 " | " 600 "
-.RB | " 1800 " | " 2400 "
-.RB | " 4800 "  | " 9600 "
-.RB | " 19200 " | " 38400 "
-.RB | " 57600 " | " 115200 " ]
+.TP
+\f3baud\fP \f3300\fP|\f3600\fP|\f31800\fP|\f32400\fP|\f34800\fP|\f39600\fP|\f319200\fP|\f338400\fP|\f357600\fP|\f3115200\fP
 .br
 Assign the baud rate to the console.
 Only consoles of type ``device'' will use this value.
 .TP
-.B break
-.I n
+\f3break\fP \f2n\fP
 .br
 Assign the break sequence
 .I n
 as the default for the console, which is used by
 the ``^Ecl0'' client escape sequence.
 .TP
-.B device
-.I filename
+\f3device\fP \f2filename\fP
 .br
 Assign the serial device
 .I filename
 as the access to the console.
 Only consoles of type ``device'' will use this value.
 .TP
-.B devicesubst
-[\f2c\fP=\f2t\fP[\f2n\fP]\f2f\fP[,...]
-| "" ]
+\f3devicesubst\fP \f2c\fP\f3=\fP\f2t\fP[\f2n\fP]\f2f\fP[\f3,\fP...]|\f3""\fP
 .br
 Perform character substitutions on the
 .B device
@ -546,25 +509,21 @@ 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.
+If the null string (``\f3""\fP'') is used, no replacements will be done.
 .TP
-.B exec
-.RI [ " command "
-| "" ]
+\f3exec\fP \f2command|\f3""\fP
 .br
 Assign the string
 .I command
 as the command to access the console.
 Conserver will run the command by
 invoking ``/bin/sh -ce "\f2command\fP"''.
-If the null string (``""'') is used or no
+If the null string (``\f3""\fP'') is used or no
 .B exec
 keyword is specified, conserver will use the command ``/bin/sh -i''.
 Only consoles of type ``exec'' will use this value.
 .TP
-.B execsubst
-[\f2c\fP=\f2t\fP[\f2n\fP]\f2f\fP[,...]
-| "" ]
+\f3execsubst\fP \f2c\fP\f3=\fP\f2t\fP[\f2n\fP]\f2f\fP[\f3,\fP...]|\f3""\fP
 .br
 Perform character substitutions on the
 .B exec
@ -572,10 +531,9 @@ value.
 See the
 .B devicesubst
 option for an explanation of the format string.
-If the null string (``""'') is used, no replacements will be done.
+If the null string (``\f3""\fP'') is used, no replacements will be done.
 .TP
-.B host
-.I hostname
+\f3host\fP \f2hostname\fP
 .br
 Assign
 .I hostname
@ -591,16 +549,14 @@ or
 .B initsubst
 keywords are used in any console type, this value is used.
 .TP
-.B idlestring
-.RI [ " string "
-| "" ]
+\f3idlestring\fP \f2string\fP|\f3""\fP
 .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
+If the null string (``\f3""\fP'') is used, the string is unset and
 the default is used.
 The string is interpreted just as a
 .B break
@ -610,8 +566,7 @@ configuration items for details) where all delays specified (via ``\ed'')
 use the default delay time.
 The default string is ``\en''.
 .TP
-.B idletimeout
-\f2number\fP[\f3s\fP|\f3m\fP|\f3h\fP]
+\f3idletimeout\fP \f2number\fP[\f3s\fP|\f3m\fP|\f3h\fP]
 .br
 Set the idle timeout of the console to
 .I number
@ -621,17 +576,14 @@ If an `s', `m', or `h' is used after
 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
+\f3include\fP \f2default\fP
 .br
 The default block defined using the name
 .I default
 is applied to the current console or default block.
 The included default block must be previously defined.
 .TP
-.B initcmd
-.RI [ " command "
-| "" ]
+\f3initcmd\fP \f3command\fP|\f3""\fP
 .br
 Invoke
 .I command
@ -641,12 +593,49 @@ to stdin, stdout, and stderr of
 The
 .I command
 is passed as an argument to ``/bin/sh -ce''.
-If the null string (``""'') is used, the command is unset and
+If the null string (``\f3""\fP'') is used, the command is unset and
 nothing is invoked.
 .TP
-.B initsubst
-[\f2c\fP=\f2t\fP[\f2n\fP]\f2f\fP[,...]
-| "" ]
+\f3initspinmax\fP \f2n\fP|\f3""\fP
+.br
+Set the maximum number of ``spins'' allowed for the console to
+.IR n ,
+where 0 <=
+.I n
+<= 254.
+A console is determined to be ``spinning'' if an attempt to initialize
+the console occurs in under
+.B initspintimer
+seconds from it's previous initialization and this quick
+initialization occurs
+.B initspinmax
+times in a row.
+If, at any point, the time between initializations is greater than
+.BR initspintimer ,
+the counter for reaching
+.B initspinmax
+resets to zero.
+When a console is determined to be ``spinning'' it is forced down.
+If the null string (``\f3""\fP'') is specified, the default of
+.B 5
+is used.
+.TP
+\f3initspintimer\fP \f2t\fP|\f3""\fP
+.br
+Set the number of seconds a console must be ``up'' to not be
+considered ``spinning'' to
+.IR t ,
+where 0 <=
+.I t
+<= 254.
+See
+.B initspinmax
+for a full description of console ``spinning.''
+If the null string (``\f3""\fP'') is specified, the default of
+.B 1
+is used.
+.TP
+\f3initsubst\fP \f2c\fP\f3=\fP\f2t\fP[\f2n\fP]\f2f\fP[\f3,\fP...]|\f3""\fP
 .br
 Perform character substitutions on the
 .B initcmd
@ -654,11 +643,9 @@ value.
 See the
 .B devicesubst
 option for an explanation of the format string.
-If the null string (``""'') is used, no replacements will be done.
+If the null string (``\f3""\fP'') is used, no replacements will be done.
 .TP
-.B logfile
-.RI [ " filename "
-| "" ]
+\f3logfile\fP \f2filename\fP|\f3""\fP
 .br
 Assign the logfile specified by
 .I filename
@ -666,11 +653,10 @@ 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
+If the null string (``\f3""\fP'') is used, the logfile name is unset and
 no logging will occur.
 .TP
-.B logfilemax
-\f2number\fP[\f3k\fP|\f3m\fP]
+\f3logfilemax\fP \f2number\fP[\f3k\fP|\f3m\fP]
 .br
 Enable automatic rotation of
 .B logfile
@ -703,8 +689,7 @@ 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 " ]
+\f3master\fP \f2hostname\fP|\f3ipaddr\fP
 .br
 Define which conserver host manages the console.
 The host may be specified by
@ -712,19 +697,15 @@ The host may be specified by
 or using the address
 .IR ipaddr .
 .TP
-.B motd
-.RI [ " message "
-| "" ]
+\f3motd\fP \f2message\fP|\f3""\fP
 .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
+If the null string (``\f3""\fP'') is used, the MOTD is unset and
 no message will occur.
 .TP
-.B options
-.RI [ " option" ,...
-| "" ]
+\f3options\fP [\f3!\fP]option[\f3,\fP...]|\f3""\fP
 .br
 You can negate the option by prefixing it with a
 .RB `` ! ''
@ -839,16 +820,12 @@ Default is
 .PD
 .RE
 .TP
-.B parity
-.RB [ " even " | " mark "
-.RB | " none " | " odd "
-.RB | " space " ]
+\f3parity\fP \f3even\fP|\f3mark\fP|\f3none\fP|\f3odd\fP|\f3space\fP
 .br
 Set the parity option for the console.
 Only consoles of type ``device'' will use this value.
 .TP
-.B port
-.RI [ " number " | " name " ]
+\f3port\fP \f2number\fP|\f2name\fP
 .br
 Set the port used to access the console.
 The port may be specified as a
@ -890,8 +867,7 @@ or
 .B initsubst
 keywords are used in any console type, this value is used.
 .TP
-.B portbase
-.I number
+\f3portbase\fP \f2number\fP
 .br
 Set the base value for the port calculation formula.
 .I number
@ -901,8 +877,7 @@ See
 .B port
 for the details of the formula.
 .TP
-.B portinc
-.I number
+\f3portinc\fP \f2number\fP
 .br
 Set the increment value for the port calculation formula.
 .I number
@ -912,8 +887,7 @@ See
 .B port
 for the details of the formula.
 .TP
-.B protocol
-.RB [ " telnet " | " raw " ]
+\f3protocol\fP \f3telnet\fP|\f3raw\fP
 .br
 Set the protocol used to send and receive data from the console.
 If
@ -927,9 +901,7 @@ The
 console option still applies when data is read by the server, and if enabled,
 can impact the encapsulation process.
 .TP
-.B ro
-.RI "[ [\f3!\fP]" username ,...
-| "" ]
+\f3ro\fP [\f3!\fP]\f2username\fP[\f3,\fP...]|\f3""\fP
 .br
 Define a list of users making up the read-only access list
 for the console.
@ -950,12 +922,10 @@ If
 .I username
 doesn't match a previous group and doesn't begin with `@', the users
 will be granted (or denied, if prefixed with `!') read-only access.
-If the null string (``""'') is used, any
+If the null string (``\f3""\fP'') is used, any
 users previously defined for the console's read-only list are removed.
 .TP
-.B rw
-.RI "[ [\f3!\fP]" username ,...
-| "" ]
+\f3rw\fP [\f3!\fP]\f2username\fP[\f3,\fP...]|\f3""\fP
 .br
 Define a list of users making up the read-write access list
 for the console.
@ -976,13 +946,10 @@ If
 .I username
 doesn't match a previous group and doesn't begin with `@', the users
 will be granted (or denied, if prefixed with `!') read-write access.
-If the null string (``""'') is used, any
+If the null string (``\f3""\fP'') is used, any
 users previously defined for the console's read-write list are removed.
 .TP
-.B timestamp
-[
-[\f2number\fP[\f3m\fP|\f3h\fP|\f3d\fP|\f3l\fP]][\f3a\fP][\f3b\fP]
-| "" ]
+\f3timestamp\fP [\f2number\fP[\f3m\fP|\f3h\fP|\f3d\fP|\f3l\fP]][\f3a\fP][\f3b\fP]|\f3""\fP
 .br
 Specifies the time between timestamps applied to the console
 log file and whether to log read/write connection actions.
@ -1011,9 +978,7 @@ A
 .RB ` b '
 can be specified to add logging of break sequences sent to the console.
 .TP
-.B type
-.RB [ " device " | " exec "
-.RB | " host " ]
+\f3type\fP \f3device\fP|\f3exec\fP|\f3host\fP
 .br
 Set the type of console.
 The type
@ -1033,17 +998,14 @@ and
 .B port
 options).
 .RE
-.TP 8
-.B group
-.I name
+.TP
+\f3group\fP \f2name\fP
 .br
 Define a user group identified as
 .I name
 .RS
-.TP 15
-.B users
-.RI "[ [\f3!\fP]" username ,...
-| "" ]
+.TP
+\f3users\fP [\f3!\fP]\f2username\fP[\f3,\fP...]|\f3""\fP
 .br
 Define a list of users making up the group
 .IR name .
@ -1064,7 +1026,7 @@ If
 .I username
 doesn't match a previous group and doesn't begin with `@', the users
 will be recorded with (or without, if prefixed with `!') access.
-If the null string (``""'') is used, any
+If the null string (``\f3""\fP'') is used, any
 users previously defined for this group are removed.
 .RE
 .SH AUTHORS
--- a/conserver.cf/conserver.passwd.man
+++ b/conserver.cf/conserver.passwd.man
@ -1,5 +1,5 @@
 .\" $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.5" "conserver"
+.TH CONSERVER.PASSWD 5 "2004/01/08" "conserver-8.1.9" "conserver"
 .SH NAME
 conserver.passwd \- user access information for
 .BR conserver (8)
--- a/conserver.html
+++ b/conserver.html
@ -36,7 +36,8 @@
        <TD colspan="2" align="center">Please pick your closest
        mirror: &nbsp;&nbsp;<A href=
        "http://planetmirror.com/pub/conserver/">Australia</A>
-        &nbsp;&nbsp;<A href="http://www.conserver.com/">US
+        &nbsp;&nbsp;<A href="http://conserver.syr.edu/">US-East</A>
+        &nbsp;&nbsp;<A href="http://www.conserver.com/">US-West
        (Primary)</A><BR>
        <BR>
        </TD>
@ -181,11 +182,11 @@

          <H3>Downloading</H3>

-          <P>The current version, released on May 7, 2004, is <A
-          href="8.1.5.tar.gz">8.1.5.tar.gz</A>. You can get it via
+          <P>The current version, released on Jul 14, 2004, is <A
+          href="8.1.9.tar.gz">8.1.9.tar.gz</A>. You can get it via
          <A href=
-          "ftp://ftp.conserver.com/conserver/8.1.5.tar.gz">FTP</A>
-          or <A href="8.1.5.tar.gz">HTTP</A>. See the <A href=
+          "ftp://ftp.conserver.com/conserver/8.1.9.tar.gz">FTP</A>
+          or <A href="8.1.9.tar.gz">HTTP</A>. See the <A href=
          "CHANGES">CHANGES</A> file for information on the latest
          updates.</P>

--- a/conserver/access.c
+++ b/conserver/access.c
@ -1,5 +1,5 @@
 /*
- *  $Id: access.c,v 5.71 2003/11/20 13:56:38 bryan Exp $
+ *  $Id: access.c,v 5.73 2004/05/23 16:44:25 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -171,7 +171,8 @@ AccType(addr, peername)
 		     hname = he->h_aliases[a++]) {
 		    if ((revNames[a] = StrDup(hname)) == (char *)0)
 			break;
-		    CONDDEBUG((1,"AccType(): revNames[%d]='%s'", a, hname));
+		    CONDDEBUG((1, "AccType(): revNames[%d]='%s'", a,
+			       hname));
 		}
 	    }
 	}
@ -280,11 +281,26 @@ SetDefAccess(pAddr, pHost)
    char *pHost;
 #endif
 {
-    char *pcDomain;
-    char *addr;
    ACCESS *a;

+    while (pACList != (ACCESS *)0) {
+	a = pACList->pACnext;
+	DestroyAccessList(pACList);
+	pACList = a;
+    }
+
+#if USE_UNIX_DOMAIN_SOCKETS
+    if ((pACList = (ACCESS *)calloc(1, sizeof(ACCESS))) == (ACCESS *)0)
+	OutOfMem();
+    if ((pACList->pcwho = StrDup("127.0.0.1")) == (char *)0)
+	OutOfMem();
+    pACList->ctrust = 'a';
+    CONDDEBUG((1, "SetDefAccess(): trust=%c, who=%s", pACList->ctrust,
+	       pACList->pcwho));
+#else
    while (pAddr->s_addr != (in_addr_t) 0) {
+	char *addr;
+
 	addr = inet_ntoa(*pAddr);
 	if ((a = (ACCESS *)calloc(1, sizeof(ACCESS))) == (ACCESS *)0)
 	    OutOfMem();
@ -298,21 +314,7 @@ SetDefAccess(pAddr, pHost)
 		   pACList->pcwho));
 	pAddr++;
    }
-
-    if ((char *)0 == (pcDomain = strchr(pHost, '.')))
-	return;
-    ++pcDomain;
-
-    if ((a = (ACCESS *)calloc(1, sizeof(ACCESS))) == (ACCESS *)0)
-	OutOfMem();
-    if ((a->pcwho = StrDup(pcDomain)) == (char *)0)
-	OutOfMem();
-    a->ctrust = 'a';
-    a->pACnext = pACList;
-    pACList = a;
-
-    CONDDEBUG((1, "SetDefAccess(): trust=%c, who=%s", pACList->ctrust,
-	       pACList->pcwho));
+#endif
 }

 void
--- a/conserver/client.c
+++ b/conserver/client.c
@ -1,5 +1,5 @@
 /*
- *  $Id: client.c,v 5.83 2004/04/13 18:12:00 bryan Exp $
+ *  $Id: client.c,v 5.84 2004/05/28 16:39:51 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -514,6 +514,7 @@ ClientAccessOk(pCL)
 # if defined(USE_LIBWRAP)
    {
 	struct request_info request;
+	CONDDEBUG((1, "ClientAccessOk(): doing tcpwrappers check"));
 	request_init(&request, RQ_DAEMON, progname, RQ_FILE, cfd, 0);
 	fromhost(&request);
 	if (!hosts_access(&request)) {
--- a/conserver/consent.c
+++ b/conserver/consent.c
@ -1,5 +1,5 @@
 /*
- *  $Id: consent.c,v 5.138 2004/04/16 16:58:09 bryan Exp $
+ *  $Id: consent.c,v 5.140 2004/06/03 21:53:59 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -678,6 +678,40 @@ ConsInit(pCE)
    extern int FallBack PARAMS((char **, int *));
    int cofile = -1;
    int ret;
+#if HAVE_GETTIMEOFDAY
+    struct timeval tv;
+#else
+    time_t tv;
+#endif
+
+    if (pCE->spintimer > 0 && pCE->spinmax > 0) {
+#if HAVE_GETTIMEOFDAY
+	if (gettimeofday(&tv, (void *)0) == 0) {
+	    /* less than pCE->spintimer seconds gone by? */
+	    if ((tv.tv_sec <= pCE->lastInit.tv_sec + pCE->spintimer - 1)
+		|| (tv.tv_sec == pCE->lastInit.tv_sec + 1 &&
+		    tv.tv_usec <= pCE->lastInit.tv_usec)) {
+#else
+	if ((tv = time((time_t *)0)) != (time_t)-1) {
+	    /* less than pCE->spintimer seconds gone by? (approx) */
+	    if (tv <= pCE->lastInit + pCE->spintimer) {
+#endif
+		pCE->spincount++;
+		if (pCE->spincount >= pCE->spinmax) {
+		    pCE->spincount = 0;
+		    pCE->lastInit = tv;
+		    Error
+			("[%s] initialization rate exceeded: forcing down",
+			 pCE->server);
+		    ConsDown(pCE, FLAGTRUE, FLAGTRUE);
+		    return;
+		}
+	    } else
+		pCE->spincount = 0;
+	    pCE->lastInit = tv;
+	} else
+	    pCE->spincount = 0;
+    }

    /* clean up old stuff
     */
@ -734,7 +768,9 @@ ConsInit(pCE)
 	    {
 		struct sockaddr_in port;
 		struct hostent *hp;
-		size_t one = 1;
+#if HAVE_SETSOCKOPT
+		int one = 1;
+#endif

 		usleep(100000);	/* Not all terminal servers can keep up */

@ -767,6 +803,7 @@ ConsInit(pCE)
 		    ConsDown(pCE, FLAGTRUE, FLAGTRUE);
 		    return;
 		}
+#if HAVE_SETSOCKOPT
 		if (setsockopt
 		    (cofile, SOL_SOCKET, SO_KEEPALIVE, (char *)&one,
 		     sizeof(one)) < 0) {
@ -776,6 +813,7 @@ ConsInit(pCE)
 		    ConsDown(pCE, FLAGTRUE, FLAGTRUE);
 		    return;
 		}
+#endif

 		if (!SetFlags(cofile, O_NONBLOCK, 0)) {
 		    ConsDown(pCE, FLAGTRUE, FLAGTRUE);
@ -897,6 +935,13 @@ ConsInit(pCE)
 	    Msg("[%s] console initializing", pCE->server);
 	pCE->downHard = FLAGFALSE;
    }
+#if HAVE_GETTIMEOFDAY
+    if (gettimeofday(&tv, (void *)0) == 0)
+	pCE->lastInit = tv;
+#else
+    if ((tv = time((time_t *)0)) != (time_t)-1)
+	pCE->lastInit = tv;
+#endif

    if (pCE->ioState == ISNORMAL)
 	StartInit(pCE);
--- a/conserver/consent.h
+++ b/conserver/consent.h
@ -1,5 +1,5 @@
 /*
- *  $Id: consent.h,v 5.56 2004/02/20 14:58:14 bryan Exp $
+ *  $Id: consent.h,v 5.58 2004/06/01 23:45:47 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -96,7 +96,7 @@ typedef struct consent {	/* console information                  */
    unsigned short port;	/* port number   |      portinc * port  */
    unsigned short portbase;	/* port base                            */
    unsigned short portinc;	/* port increment                       */
-    unsigned short raw;		/* raw or telnet protocol?              */
+    FLAG raw;			/* raw or telnet protocol?              */
    /* type == EXEC */
    char *exec;			/* exec command                         */
    char *execsubst;		/* exec substitution pattern            */
@ -110,6 +110,8 @@ typedef struct consent {	/* console information                  */
    char *motd;			/* motd                                 */
    time_t idletimeout;		/* idle timeout                         */
    char *idlestring;		/* string to print when idle            */
+    unsigned short spinmax;	/* initialization spin maximum          */
+    unsigned short spintimer;	/* initialization spin timer            */
    /* timestamp stuff */
    int mark;			/* Mark (chime) interval                */
    long nextMark;		/* Next mark (chime) time               */
@ -135,6 +137,12 @@ typedef struct consent {	/* console information                  */
    IOSTATE ioState;		/* state of the socket                  */
    time_t stateTimer;		/* timer for ioState states             */
    time_t lastWrite;		/* time of last data sent to console    */
+#if HAVE_GETTIMEOFDAY
+    struct timeval lastInit;	/* time of last initialization          */
+#else
+    time_t lastInit;		/* time of last initialization          */
+#endif
+    unsigned short spincount;	/* initialization spin counter          */

    /*** 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.46 2004/04/13 18:19:26 bryan Exp $
-.TH CONSERVER 8 "2004/04/13" "conserver-8.1.5" "conserver"
+.\" $Id: conserver.man,v 1.50 2004/06/08 16:19:46 bryan Exp $
+.TH CONSERVER 8 "2004/06/08" "conserver-8.1.9" "conserver"
 .SH NAME
 conserver \- console server daemon
 .SH SYNOPSIS
@ -297,8 +297,9 @@ However, if
 was used to enable Unix domain sockets for client/server communication,
 this points conserver to the directory where it should store the sockets.
 The default
-.IR master
-directory, ``/tmp/conserver'',
+.I master
+directory
+.RB (`` /tmp/conserver '')
 may be changed at compile time using the
 .B --with-uds
 option.
@ -317,6 +318,9 @@ Enable periodic attempts (every
 .I min
 minutes) to open (``bring up'') all downed
 consoles (similar to sending a SIGUSR1).
+Without this option, or if
+.I min
+is zero, no periodic attempts occur.
 .TP
 .BI \-p port
 Set the TCP port for the master process to listen on.
@ -447,14 +451,16 @@ any interaction with the server is done with the default escape sequence.
 This is, by no means, a complete description of the entire client/server
 interaction.
 It is, however, a brief explanation in order to give a idea of
-what the program does.
+what the program does.  See the
+.B \s-1PROTOCOL\s0
+file in the distribution for further details.
 .SH FILES
 .PP
 The following default file locations may be overridden
 at compile time or by the command-line options described above.
 Run
 .B conserver \-V
-(with no other options) to see the defaults set at compile time.
+to see the defaults set at compile time.
 .PP
 .PD 0
 .TP 25
--- a/conserver/convert.c
+++ b/conserver/convert.c
@ -1,5 +1,5 @@
 /*
- *  $Id: convert.c,v 1.8 2003/11/20 13:56:38 bryan Exp $
+ *  $Id: convert.c,v 1.10 2004/05/28 01:08:28 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -41,6 +41,16 @@
 #include <master.h>
 #include <main.h>

+#if defined(USE_LIBWRAP)
+/* we don't use it...but we link to it */
+int allow_severity;
+int deny_severity;
+#endif
+
+
+SECTION sections[] = {
+    {(char *)0, (void *)0, (void *)0, (void *)0, (void *)0}
+};

 void
 DestroyDataStructures()
@ -139,7 +149,7 @@ ReadLine2(fp, save, iLine)
    if (!peek && (ret == (char *)0)) {
 	(*iLine)++;
 	wholeline = BuildString(bufstr->string, wholestr);
-	if (wholeline[0] == '\000')
+	if (wholeline != (char *)0 && wholeline[0] == '\000')
 	    wholeline = (char *)0;
    }

--- a/conserver/cutil.c
+++ b/conserver/cutil.c
@ -1,5 +1,5 @@
 /*
- *  $Id: cutil.c,v 1.116 2004/03/19 05:23:21 bryan Exp $
+ *  $Id: cutil.c,v 1.118 2004/05/25 00:38:15 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -10,6 +10,10 @@

 #include <cutil.h>

+#include <net/if.h>
+#if HAVE_SYS_SOCKIO_H
+# include <sys/sockio.h>
+#endif
 #if HAVE_OPENSSL
 #include <openssl/ssl.h>
 #endif
@ -29,6 +33,7 @@ fd_set winit;
 int maxfd = 0;
 int debugLineNo = 0;
 char *debugFileName = (char *)0;
+int isMaster = 1;

 /* in the routines below (the init code) we can bomb if malloc fails	(ksb)
 */
@ -2122,6 +2127,189 @@ PruneSpace(string)
 	return string;
 }

+/* fills the myAddrs array with host interface addresses */
+void
+#if PROTOTYPES
+ProbeInterfaces(in_addr_t bindAddr)
+#else
+ProbeInterfaces(bindAddr)
+    in_addr_t bindAddr;
+#endif
+{
+#ifdef SIOCGIFCONF
+    struct ifconf ifc;
+    struct ifreq *ifr;
+#ifdef SIOCGIFFLAGS
+    struct ifreq ifrcopy;
+#endif
+    int sock;
+    int r = 0, m = 0;
+    int bufsize = 2048;
+    int count = 0;
+
+    /* if we use -M, just fill the array with that interface */
+    if (bindAddr != INADDR_ANY) {
+	myAddrs = (struct in_addr *)calloc(2, sizeof(struct in_addr));
+	if (myAddrs == (struct in_addr *)0)
+	    OutOfMem();
+#if HAVE_MEMCPY
+	memcpy(&(myAddrs[0].s_addr), &bindAddr, sizeof(in_addr_t));
+#else
+	bcopy(&bindAddr, &(myAddrs[0].s_addr), sizeof(in_addr_t));
+#endif
+	Verbose("interface address %s (-M option)", inet_ntoa(myAddrs[0]));
+	return;
+    }
+
+    if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
+	Error("ProbeInterfaces(): socket(): %s", strerror(errno));
+	Bye(EX_OSERR);
+    }
+
+    while (bufsize) {
+	ifc.ifc_len = bufsize;
+	ifc.ifc_req = (struct ifreq *)malloc(ifc.ifc_len);
+	if (ifc.ifc_req == (struct ifreq *)0)
+	    OutOfMem();
+	if (ioctl(sock, SIOCGIFCONF, &ifc) != 0) {
+	    free(ifc.ifc_req);
+	    close(sock);
+	    Error("ProbeInterfaces(): ioctl(SIOCGIFCONF): %s",
+		  strerror(errno));
+	    Bye(EX_OSERR);
+	}
+	/* if the return size plus a 512 byte "buffer zone" is less than
+	 * the buffer we passed in (bufsize), we're done.  otherwise
+	 * allocate a bigger buffer and try again.  with a too-small
+	 * buffer, some implementations (freebsd) will fill the buffer
+	 * best it can (leaving a gap - returning <=bufsize) and others
+	 * (linux) will return a buffer length the same size as passed
+	 * in (==bufsize).  so, we'll assume a 512 byte gap would have
+	 * been big enough to put one more record and as long as we have
+	 * that "buffer zone", we should have all the interfaces.
+	 */
+	if (ifc.ifc_len + 512 < bufsize)
+	    break;
+	free(ifc.ifc_req);
+	bufsize += 2048;
+    }
+
+    /* this is probably way overkill, but better to kill a few bytes
+     * than loop through looking for valid interfaces that are up
+     * twice, huh?
+     */
+    count = ifc.ifc_len / sizeof(*ifr);
+    CONDDEBUG((1, "ProbeInterfaces(): ifc_len==%d max_count==%d",
+	       ifc.ifc_len, count));
+
+    /* set up myAddrs array */
+    if (myAddrs != (struct in_addr *)0)
+	free(myAddrs);
+    myAddrs = (struct in_addr *)0;
+    if (count == 0) {
+	free(ifc.ifc_req);
+	close(sock);
+	return;
+    }
+    myAddrs = (struct in_addr *)calloc(count + 1, sizeof(struct in_addr));
+    if (myAddrs == (struct in_addr *)0)
+	OutOfMem();
+
+    for (m = r = 0; r < ifc.ifc_len;) {
+	struct sockaddr *sa;
+	ifr = (struct ifreq *)&ifc.ifc_buf[r];
+	sa = (struct sockaddr *)&ifr->ifr_addr;
+	/* don't use less than a ifreq sized chunk */
+	if ((ifc.ifc_len - r) < sizeof(*ifr))
+	    break;
+#ifdef HAVE_SA_LEN
+	if (sa->sa_len > sizeof(ifr->ifr_addr))
+	    r += sizeof(ifr->ifr_name) + sa->sa_len;
+	else
+#endif
+	    r += sizeof(*ifr);
+
+	if (sa->sa_family == AF_INET) {
+	    struct sockaddr_in *sin = (struct sockaddr_in *)sa;
+#ifdef SIOCGIFFLAGS
+	    /* make sure the interface is up */
+	    ifrcopy = *ifr;
+	    if ((ioctl(sock, SIOCGIFFLAGS, &ifrcopy) == 0) &&
+		((ifrcopy.ifr_flags & IFF_UP) == 0))
+		continue;
+#endif
+	    CONDDEBUG((1, "ProbeInterfaces(): name=%s addr=%s",
+		       ifr->ifr_name, inet_ntoa(sin->sin_addr)));
+#if HAVE_MEMCPY
+	    memcpy(&myAddrs[m], &(sin->sin_addr), sizeof(struct in_addr));
+#else
+	    bcopy(&(sin->sin_addr), &myAddrs[m], sizeof(struct in_addr));
+#endif
+	    Verbose("interface address %s (%s)", inet_ntoa(myAddrs[m]),
+		    ifr->ifr_name);
+	    m++;
+	}
+    }
+    if (m == 0) {
+	free(myAddrs);
+	myAddrs = (struct in_addr *)0;
+    }
+    close(sock);
+    free(ifc.ifc_req);
+#else /* use the hostname like the old code did (but use all addresses!) */
+    int count;
+    struct hostent *he;
+
+    /* if we use -M, just fill the array with that interface */
+    if (bindAddr != INADDR_ANY) {
+	myAddrs = (struct in_addr *)calloc(2, sizeof(struct in_addr));
+	if (myAddrs == (struct in_addr *)0)
+	    OutOfMem();
+#if HAVE_MEMCPY
+	memcpy(&(myAddrs[0].s_addr), &bindAddr, sizeof(in_addr_t));
+#else
+	bcopy(&bindAddr, &(myAddrs[0].s_addr), sizeof(in_addr_t));
+#endif
+	Verbose("interface address %s (-M option)", inet_ntoa(myAddrs[0]));
+	return;
+    }
+
+    Verbose("using hostname for interface addresses");
+    if ((struct hostent *)0 == (he = gethostbyname(myHostname))) {
+	Error("ProbeInterfaces(): gethostbyname(%s): %s", myHostname,
+	      hstrerror(h_errno));
+	return;
+    }
+    if (4 != he->h_length || AF_INET != he->h_addrtype) {
+	Error
+	    ("ProbeInterfaces(): gethostbyname(%s): wrong address size (4 != %d) or address family (%d != %d)",
+	     myHostname, he->h_length, AF_INET, he->h_addrtype);
+	return;
+    }
+
+    for (count = 0; he->h_addr_list[count] != (char *)0; count++);
+    if (myAddrs != (struct in_addr *)0)
+	free(myAddrs);
+    myAddrs = (struct in_addr *)0;
+    if (count == 0)
+	return;
+    myAddrs = (struct in_addr *)calloc(count + 1, sizeof(struct in_addr));
+    if (myAddrs == (struct in_addr *)0)
+	OutOfMem();
+    for (count--; count >= 0; count--) {
+#if HAVE_MEMCPY
+	memcpy(&(myAddrs[count].s_addr), he->h_addr_list[count],
+	       he->h_length);
+#else
+	bcopy(he->h_addr_list[count], &(myAddrs[count].s_addr),
+	      he->h_length);
+#endif
+	Verbose("interface address %s (hostname address)",
+		inet_ntoa(myAddrs[count]));
+    }
+#endif
+}
+
 int
 #if PROTOTYPES
 IsMe(char *id)
@ -2388,3 +2576,725 @@ ParseIACBuf(cfp, msg, len)
    }
    return l;
 }
+
+/* the format of the file should be as follows
+ *
+ * <section keyword> [section name] {
+ *      <item keyword> [item value];
+ *                   .
+ *                   .
+ * }
+ *
+ * whitespace gets retained in [section name], and [item value]
+ * values.  for example,
+ *
+ *    users  bryan  todd ;
+ *
+ *  will give users the value of 'bryan  todd'.  the leading and
+ *  trailing whitespace is nuked, but the middle stuff isn't.
+ *
+ *  a little note about the 'state' var...
+ *      START = before <section keyword>
+ *      NAME = before [section name]
+ *      LEFTB = before left curly brace
+ *      KEY = before <item keyword>
+ *      VALUE = before [item value]
+ *      SEMI = before semi-colon
+ */
+
+typedef enum states {
+    START,
+    NAME,
+    LEFTB,
+    KEY,
+    VALUE,
+    SEMI
+} STATES;
+
+typedef enum tokens {
+    DONE,
+    LEFTBRACE,
+    RIGHTBRACE,
+    SEMICOLON,
+    WORD,
+    INCLUDE
+} TOKEN;
+
+int line = 1;			/* current line number */
+char *file = (char *)0;
+
+TOKEN
+#if PROTOTYPES
+GetWord(FILE *fp, int *line, short spaceok, STRING *word)
+#else
+GetWord(fp, line, spaceok, word)
+    FILE *fp;
+    int *line;
+    short spaceok;
+    STRING *word;
+#endif
+{
+    int c;
+    short backslash = 0;
+    short quote = 0;
+    short comment = 0;
+    short sawQuote = 0;
+    short quotedBackslash = 0;
+    char *include = "include";
+    short checkInc = -1;
+    /* checkInc == -3, saw #include
+     *          == -2, saw nothin'
+     *          == -1, saw \n or start of file
+     *          == 0, saw "\n#"
+     */
+
+    BuildString((char *)0, word);
+    while ((c = fgetc(fp)) != EOF) {
+	if (c == '\n') {
+	    (*line)++;
+	    if (checkInc == -2)
+		checkInc = -1;
+	}
+	if (comment) {
+	    if (c == '\n')
+		comment = 0;
+	    if (checkInc >= 0) {
+		if (include[checkInc] == '\000') {
+		    if (isspace(c))
+			checkInc = -3;
+		} else if (c == include[checkInc])
+		    checkInc++;
+		else
+		    checkInc = -2;
+	    } else if (checkInc == -3) {
+		static STRING *fname = (STRING *)0;
+		if (fname == (STRING *)0)
+		    fname = AllocString();
+		if (fname->used != 0 || !isspace(c)) {
+		    if (c == '\n') {
+			if (fname->used > 0) {
+			    while (fname->used > 1 && isspace((int)
+							      (fname->
+							       string
+							       [fname->
+								used -
+								2])))
+				fname->used--;
+			    if (fname->used > 0)
+				fname->string[fname->used - 1] = '\000';
+			}
+			checkInc = -2;
+			if (fname->used > 0) {
+			    BuildString((char *)0, word);
+			    BuildString(fname->string, word);
+			    BuildString((char *)0, fname);
+			    return INCLUDE;
+			}
+		    } else
+			BuildStringChar(c, fname);
+		}
+	    }
+	    continue;
+	}
+	if (backslash) {
+	    BuildStringChar(c, word);
+	    backslash = 0;
+	    continue;
+	}
+	if (quote) {
+	    if (c == '"') {
+		if (quotedBackslash) {
+		    BuildStringChar(c, word);
+		    quotedBackslash = 0;
+		} else
+		    quote = 0;
+	    } else {
+		if (quotedBackslash) {
+		    BuildStringChar('\\', word);
+		    quotedBackslash = 0;
+		}
+		if (c == '\\')
+		    quotedBackslash = 1;
+		else
+		    BuildStringChar(c, word);
+	    }
+	    continue;
+	}
+	if (c == '\\') {
+	    backslash = 1;
+	} else if (c == '#') {
+	    comment = 1;
+	    if (checkInc == -1)
+		checkInc = 0;
+	} else if (c == '"') {
+	    quote = 1;
+	    sawQuote = 1;
+	} else if (isspace(c)) {
+	    if (word->used <= 1)
+		continue;
+	    if (spaceok) {
+		BuildStringChar(c, word);
+		continue;
+	    }
+	  gotword:
+	    while (word->used > 1 &&
+		   isspace((int)(word->string[word->used - 2])))
+		word->used--;
+	    if (word->used > 0)
+		word->string[word->used - 1] = '\000';
+	    return WORD;
+	} else if (c == '{') {
+	    if (word->used <= 1 && !sawQuote) {
+		BuildStringChar(c, word);
+		return LEFTBRACE;
+	    } else {
+		ungetc(c, fp);
+		goto gotword;
+	    }
+	} else if (c == '}') {
+	    if (word->used <= 1 && !sawQuote) {
+		BuildStringChar(c, word);
+		return RIGHTBRACE;
+	    } else {
+		ungetc(c, fp);
+		goto gotword;
+	    }
+	} else if (c == ';') {
+	    if (word->used <= 1 && !sawQuote) {
+		BuildStringChar(c, word);
+		return SEMICOLON;
+	    } else {
+		ungetc(c, fp);
+		goto gotword;
+	    }
+	} else {
+	    BuildStringChar(c, word);
+	}
+    }
+    /* this should only happen in rare cases */
+    if (quotedBackslash) {
+	BuildStringChar('\\', word);
+	quotedBackslash = 0;
+    }
+    /* if we saw "valid" data, it's a word */
+    if (word->used > 1 || sawQuote)
+	goto gotword;
+    return DONE;
+}
+
+void
+#if PROTOTYPES
+ParseFile(char *filename, FILE *fp, int level)
+#else
+ParseFile(filename, fp, level)
+    char *filename;
+    FILE *fp;
+    int level;
+#endif
+{
+    /* things that should be used between recursions */
+    static STATES state = START;
+    static STRING *word = (STRING *)0;
+    static short spaceok = 0;
+    static int secIndex = 0;
+    static int keyIndex = 0;
+
+    /* other stuff that's local to each recursion */
+    char *p;
+    TOKEN token = DONE;
+    int nextline = 1;		/* "next" line number */
+
+    if (level >= 10) {
+	if (isMaster)
+	    Error("ParseFile(): nesting too deep, not parsing `%s'",
+		  filename);
+	return;
+    }
+
+    /* set some globals */
+    line = 1;
+    file = filename;
+
+    /* if we're parsing the base file, set static vars */
+    if (level == 0) {
+	state = START;
+	spaceok = 0;
+	secIndex = 0;
+	keyIndex = 0;
+    }
+
+    /* initialize local things */
+    if (word == (STRING *)0)
+	word = AllocString();
+
+    while ((token = GetWord(fp, &nextline, spaceok, word)) != DONE) {
+	if (token == INCLUDE) {
+	    FILE *lfp;
+	    if ((FILE *)0 == (lfp = fopen(word->string, "r"))) {
+		if (isMaster)
+		    Error("ParseFile(): fopen(%s): %s", word->string,
+			  strerror(errno));
+	    } else {
+		char *fname;
+		/* word gets destroyed, so save the name */
+		fname = StrDup(word->string);
+		ParseFile(fname, lfp, level + 1);
+		fclose(lfp);
+		free(fname);
+	    }
+	} else {
+	    switch (state) {
+		case START:
+		    switch (token) {
+			case WORD:
+			    for (secIndex = 0;
+				 (p = sections[secIndex].id) != (char *)0;
+				 secIndex++) {
+				if (strcasecmp(word->string, p) == 0) {
+				    CONDDEBUG((1,
+					       "ReadCfg(): got keyword '%s' [%s:%d]",
+					       word->string, file, line));
+				    state = NAME;
+				    break;
+				}
+			    }
+			    if (state == START) {
+				if (isMaster)
+				    Error("invalid keyword '%s' [%s:%d]",
+					  word->string, file, line);
+			    }
+			    break;
+			case LEFTBRACE:
+			case RIGHTBRACE:
+			case SEMICOLON:
+			    if (isMaster)
+				Error("invalid token '%s' [%s:%d]",
+				      word->string, file, line);
+			    break;
+			case DONE:	/* just shutting up gcc */
+			case INCLUDE:	/* just shutting up gcc */
+			    break;
+		    }
+		    break;
+		case NAME:
+		    switch (token) {
+			case WORD:
+			    (*sections[secIndex].begin) (word->string);
+			    state = LEFTB;
+			    break;
+			case RIGHTBRACE:
+			    if (isMaster)
+				Error("premature token '%s' [%s:%d]",
+				      word->string, file, line);
+			    state = START;
+			    break;
+			case LEFTBRACE:
+			case SEMICOLON:
+			    if (isMaster)
+				Error("invalid token '%s' [%s:%d]",
+				      word->string, file, line);
+			    break;
+			case DONE:	/* just shutting up gcc */
+			case INCLUDE:	/* just shutting up gcc */
+			    break;
+		    }
+		    break;
+		case LEFTB:
+		    switch (token) {
+			case LEFTBRACE:
+			    state = KEY;
+			    break;
+			case RIGHTBRACE:
+			    if (isMaster)
+				Error("premature token '%s' [%s:%d]",
+				      word->string, file, line);
+			    (*sections[secIndex].abort) ();
+			    state = START;
+			    break;
+			case SEMICOLON:
+			    if (isMaster)
+				Error("invalid token '%s' [%s:%d]",
+				      word->string, file, line);
+			    break;
+			case WORD:
+			    if (isMaster)
+				Error("invalid word '%s' [%s:%d]",
+				      word->string, file, line);
+			    break;
+			case DONE:	/* just shutting up gcc */
+			case INCLUDE:	/* just shutting up gcc */
+			    break;
+		    }
+		    break;
+		case KEY:
+		    switch (token) {
+			case WORD:
+			    for (keyIndex = 0;
+				 (p =
+				  sections[secIndex].items[keyIndex].id) !=
+				 (char *)0; keyIndex++) {
+				if (strcasecmp(word->string, p) == 0) {
+				    CONDDEBUG((1,
+					       "got keyword '%s' [%s:%d]",
+					       word->string, file, line));
+				    state = VALUE;
+				    break;
+				}
+			    }
+			    if (state == KEY) {
+				if (isMaster)
+				    Error("invalid keyword '%s' [%s:%d]",
+					  word->string, file, line);
+			    }
+			    break;
+			case RIGHTBRACE:
+			    (*sections[secIndex].end) ();
+			    state = START;
+			    break;
+			case LEFTBRACE:
+			    if (isMaster)
+				Error("invalid token '%s' [%s:%d]",
+				      word->string, file, line);
+			    break;
+			case SEMICOLON:
+			    if (isMaster)
+				Error("premature token '%s' [%s:%d]",
+				      word->string, file, line);
+			case DONE:	/* just shutting up gcc */
+			case INCLUDE:	/* just shutting up gcc */
+			    break;
+		    }
+		    break;
+		case VALUE:
+		    switch (token) {
+			case WORD:
+			    (*sections[secIndex].items[keyIndex].
+			     reg) (word->string);
+			    state = SEMI;
+			    break;
+			case SEMICOLON:
+			    if (isMaster)
+				Error("invalid token '%s' [%s:%d]",
+				      word->string, file, line);
+			    state = KEY;
+			    break;
+			case RIGHTBRACE:
+			    if (isMaster)
+				Error("premature token '%s' [%s:%d]",
+				      word->string, file, line);
+			    (*sections[secIndex].abort) ();
+			    state = START;
+			    break;
+			case LEFTBRACE:
+			    if (isMaster)
+				Error("invalid token '%s' [%s:%d]",
+				      word->string, file, line);
+			    break;
+			case DONE:	/* just shutting up gcc */
+			case INCLUDE:	/* just shutting up gcc */
+			    break;
+		    }
+		    break;
+		case SEMI:
+		    switch (token) {
+			case SEMICOLON:
+			    state = KEY;
+			    break;
+			case RIGHTBRACE:
+			    if (isMaster)
+				Error("premature token '%s' [%s:%d]",
+				      word->string, file, line);
+			    (*sections[secIndex].abort) ();
+			    state = START;
+			    break;
+			case LEFTBRACE:
+			    if (isMaster)
+				Error("invalid token '%s' [%s:%d]",
+				      word->string, file, line);
+			    break;
+			case WORD:
+			    if (isMaster)
+				Error("invalid word '%s' [%s:%d]",
+				      word->string, file, line);
+			    break;
+			case DONE:	/* just shutting up gcc */
+			case INCLUDE:	/* just shutting up gcc */
+			    break;
+		    }
+		    break;
+	    }
+	    switch (state) {
+		case NAME:
+		case VALUE:
+		    spaceok = 1;
+		    break;
+		case KEY:
+		case LEFTB:
+		case START:
+		case SEMI:
+		    spaceok = 0;
+		    break;
+	    }
+	}
+	line = nextline;
+    }
+
+    if (level == 0) {
+	int i;
+
+	/* check for proper ending of file and do any cleanup */
+	switch (state) {
+	    case START:
+		break;
+	    case KEY:
+	    case LEFTB:
+	    case VALUE:
+	    case SEMI:
+		(*sections[secIndex].abort) ();
+		/* fall through */
+	    case NAME:
+		if (isMaster)
+		    Error("premature EOF seen [%s:%d]", file, line);
+		break;
+	}
+
+	/* now clean up all the temporary space used */
+	for (i = 0; sections[i].id != (char *)0; i++) {
+	    (*sections[i].destroy) ();
+	}
+    }
+}
+
+void
+#if PROTOTYPES
+ProcessSubst(SUBST * s, char **repl, char **str, char *name, char *id)
+#else
+ProcessSubst(s, repl, str, name, id)
+    SUBST *s;
+    char **repl;
+    char **str;
+    char *name;
+    char *id;
+#endif
+{
+    /*
+     * (CONSENT *pCE) and (char **repl) are used when a replacement is to
+     * actually happen...repl is the string to munch, pCE holds the data.
+     *
+     * (char **str) is used to store a copy of (char *id), if it passes
+     * the format check.
+     *
+     * the idea is that this is first called when the config file is read,
+     * putting the result in (char **str).  then we call it again, near
+     * the end, permuting (char **repl) with values from (CONSENT *pCE) with
+     * the saved string now coming in as (char *id).  got it?
+     *
+     * you could pass all arguments in...then both types of actions occur.
+     */
+    char *p;
+    char *repfmt[255];
+    unsigned short repnum;
+    int i;
+
+    enum repstate {
+	REP_BEGIN,
+	REP_LTR,
+	REP_EQ,
+	REP_INT,
+	REP_END
+    } state;
+
+    if (str != (char **)0) {
+	if (*str != (char *)0) {
+	    free(*str);
+	    *str = (char *)0;
+	}
+    }
+
+    if ((id == (char *)0) || (*id == '\000'))
+	return;
+
+    repnum = 0;
+    state = REP_BEGIN;
+
+    for (i = 0; i < 256; i++)
+	repfmt[i] = (char *)0;
+
+    for (p = id; *p != '\000'; p++) {
+	switch (state) {
+	    case REP_BEGIN:
+		/* must be printable */
+		if (*p == ',' || !isgraph((int)(*p)))
+		    goto subst_err;
+
+		/* make sure we haven't seen this replacement char yet */
+		repnum = (unsigned short)(*p);
+		if (repfmt[repnum] != (char *)0) {
+		    if (isMaster)
+			Error
+			    ("substitution characters of `%s' option are the same [%s:%d]",
+			     name, file, line);
+		    return;
+		}
+		state = REP_LTR;
+		break;
+	    case REP_LTR:
+		if (*p != '=')
+		    goto subst_err;
+		state = REP_EQ;
+		break;
+	    case REP_EQ:
+		repfmt[repnum] = p;
+		if (s->tokens[(unsigned)(*(repfmt[repnum]))] != ISNOTHING)
+		    state = REP_INT;
+		else
+		    goto subst_err;
+		break;
+	    case REP_INT:
+		if (*p == 'd' || *p == 'x' || *p == 'X') {
+		    if (s->tokens[(unsigned)(*(repfmt[repnum]))] !=
+			ISNUMBER)
+			goto subst_err;
+		    state = REP_END;
+		} else if (*p == 's') {
+		    if (s->tokens[(unsigned)(*(repfmt[repnum]))] !=
+			ISSTRING)
+			goto subst_err;
+		    state = REP_END;
+		} else if (!isdigit((int)(*p)))
+		    goto subst_err;
+		break;
+	    case REP_END:
+		if (*p != ',')
+		    goto subst_err;
+		state = REP_BEGIN;
+		break;
+	}
+    }
+
+    if (state != REP_END) {
+      subst_err:
+	if (isMaster)
+	    Error
+		("invalid `%s' specification `%s' (char #%d: `%c') [%s:%d]",
+		 name, id, (p - id) + 1, *p, file, line);
+	return;
+    }
+
+    if (str != (char **)0) {
+	if ((*str = StrDup(id)) == (char *)0)
+	    OutOfMem();
+    }
+
+    if (s != (SUBST *) 0 && repl != (char **)0) {
+	static STRING *result = (STRING *)0;
+
+	if (result == (STRING *)0)
+	    result = AllocString();
+	BuildString((char *)0, result);
+
+	for (p = *repl; *p != '\000'; p++) {
+	    if (repfmt[(unsigned short)(*p)] != (char *)0) {
+		char *r = repfmt[(unsigned short)(*p)];
+		int plen = 0;
+		char *c = (char *)0;
+		int o = 0;
+
+		if (s->tokens[(unsigned)(*r)] == ISSTRING) {
+		    /* check the pattern for a length */
+		    if (isdigit((int)(*(r + 1))))
+			plen = atoi(r + 1);
+
+		    /* this should never return zero, but just in case */
+		    if ((*s->callback) (*r, &c, (int *)0) == 0)
+			c = "";
+		    plen -= strlen(c);
+
+		    /* pad it out, if necessary */
+		    for (i = 0; i < plen; i++)
+			BuildStringChar(' ', result);
+
+		    /* throw in the string */
+		    BuildString(c, result);
+		} else {
+		    int i = 0;
+		    unsigned short port = 0;
+		    unsigned short base = 0;
+		    int padzero = 0;
+		    static STRING *num = (STRING *)0;
+
+		    if (num == (STRING *)0)
+			num = AllocString();
+		    BuildString((char *)0, num);
+
+		    /* this should never return zero, but just in case */
+		    if ((*s->callback) (*r, (char **)0, &i) == 0)
+			port = 0;
+		    else
+			port = (unsigned short)i;
+
+		    /* check the pattern for a length and padding */
+		    for (c = r + 1; *c != '\000'; c++)
+			if (!isdigit((int)(*c)))
+			    break;
+		    if (c != r + 1) {
+			plen = atoi(r + 1);
+			padzero = (r[1] == '0');
+		    }
+
+		    /* check for base */
+		    switch (*c) {
+			case 'd':
+			    base = 10;
+			    break;
+			case 'x':
+			case 'X':
+			    base = 16;
+			    break;
+			default:
+			    return;
+		    }
+		    while (port >= base) {
+			if (port % base >= 10)
+			    BuildStringChar((port % base) - 10 +
+					    (*c == 'x' ? 'a' : 'A'), num);
+			else
+			    BuildStringChar((port % base) + '0', num);
+			port /= base;
+		    }
+		    if (port >= 10)
+			BuildStringChar(port - 10 +
+					(*c == 'x' ? 'a' : 'A'), num);
+		    else
+			BuildStringChar(port + '0', num);
+
+		    /* if we're supposed to be a certain length, pad it */
+		    while (num->used - 1 < plen) {
+			if (padzero == 0)
+			    BuildStringChar(' ', num);
+			else
+			    BuildStringChar('0', num);
+		    }
+
+		    /* reverse the text to put it in forward order */
+		    o = num->used - 1;
+		    for (i = 0; i < o / 2; i++) {
+			char temp;
+
+			temp = num->string[i];
+			num->string[i]
+			    = num->string[o - i - 1];
+			num->string[o - i - 1] = temp;
+		    }
+		    BuildStringN(num->string, o, result);
+		}
+	    } else
+		BuildStringChar(*p, result);
+	}
+	free(*repl);
+	if ((*repl = StrDup(result->string)) == (char *)0)
+	    OutOfMem();
+    }
+
+    return;
+}
--- a/conserver/cutil.h
+++ b/conserver/cutil.h
@ -1,5 +1,5 @@
 /*
- *  $Id: cutil.h,v 1.61 2004/03/10 02:55:45 bryan Exp $
+ *  $Id: cutil.h,v 1.63 2004/05/25 00:38:15 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -89,6 +89,37 @@ typedef struct consFile {
 #endif
 } CONSFILE;

+typedef struct item {
+    char *id;
+    void (*reg) PARAMS((char *));
+} ITEM;
+
+typedef struct section {
+    char *id;
+    void (*begin) PARAMS((char *));
+    void (*end) PARAMS((void));
+    void (*abort) PARAMS((void));
+    void (*destroy) PARAMS((void));
+    ITEM *items;
+} SECTION;
+
+typedef enum substToken {
+    ISNOTHING = 0,
+    ISNUMBER,
+    ISSTRING
+} SUBSTTOKEN;
+
+typedef struct subst {
+    SUBSTTOKEN tokens[255];
+    /* data for callback function
+     */
+    void *data;
+    /* function to retrieve a value (as a char* or int or both) for
+     * a substitution
+     */
+    int (*callback) PARAMS((char, char **, int *));
+} SUBST;
+
 extern int isMultiProc, fDebug, fVerbose, fErrorPrinted;
 extern char *progname;
 extern pid_t thepid;
@ -100,6 +131,10 @@ extern fd_set winit;
 extern int maxfd;
 extern int debugLineNo;
 extern char *debugFileName;
+extern int line;		/* used by ParseFile */
+extern char *file;		/* used by ParseFile */
+extern SECTION sections[];	/* used by ParseFile */
+extern int isMaster;

 extern const char *StrTime PARAMS((time_t *));
 extern void Debug PARAMS((int, char *, ...));
@ -157,6 +192,10 @@ 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));
+extern void ParseFile PARAMS((char *, FILE *, int));
+extern void ProbeInterfaces PARAMS((in_addr_t));
+extern void ProcessSubst
+PARAMS((SUBST *, char **, char **, char *, char *));
 #if HAVE_OPENSSL
 extern SSL *FileGetSSL PARAMS((CONSFILE *));
 extern void FileSetSSL PARAMS((CONSFILE *, SSL *));
--- a/conserver/group.c
+++ b/conserver/group.c
@ -1,5 +1,5 @@
 /*
- *  $Id: group.c,v 5.298 2004/05/07 15:39:51 bryan Exp $
+ *  $Id: group.c,v 5.305 2004/07/14 05:28:42 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -55,6 +55,7 @@
 #include <compat.h>

 #include <pwd.h>
+#include <grp.h>
 #if PROTOTYPES
 #include <stdarg.h>
 #else
@ -393,11 +394,40 @@ ConsentFindUser(pCU, id)
    char *id;
 #endif
 {
+    short close = 0;
+    struct group *g = (struct group *)0;
+    struct passwd *pwd = (struct passwd *)0;
+
    for (; pCU != (CONSENTUSERS *)0; pCU = pCU->next) {
-	if (strcmp(pCU->user->name, id) == 0) {
-	    return pCU;
+	if (pCU->user->name[0] == '@' && pCU->user->name[1] != '\000') {
+	    if (close == 0) {
+		close = 1;
+		/* try to grab the primary group */
+		pwd = getpwnam(id);
+	    }
+
+	    /* grab the group info */
+	    if ((g = getgrnam(pCU->user->name + 1)) == (struct group *)0) {
+		Error("ConsentFindUser(): unknown group name `%s'",
+		      pCU->user->name + 1);
+	    } else if (pwd != (struct passwd *)0 &&
+		       pwd->pw_gid == g->gr_gid) {
+		goto donehunting;
+	    } else if (g->gr_mem != (char **)0) {
+		char **m;
+		for (m = g->gr_mem; *m != (char *)0; m++)
+		    if (strcmp(*m, id) == 0)
+			goto donehunting;
+	    }
+	} else if (strcmp(pCU->user->name, id) == 0) {
+	    goto donehunting;
 	}
    }
+  donehunting:
+    if (close) {
+	endgrent();
+	endpwent();
+    }
    return pCU;
 }

@ -1610,8 +1640,8 @@ PutConsole(pCEServing, c, quote)
     * quote == 2, telnet - processed by telnet protocol
     * if console != telnet, 1 == 2
     */
-    if (quote == 1 && pCEServing->type == HOST && !pCEServing->raw &&
-	c == IAC) {
+    if (quote == 1 && pCEServing->type == HOST &&
+	pCEServing->raw != FLAGTRUE && c == IAC) {
 	BuildStringChar((char)c, pCEServing->wbuf);
 	if (pCEServing->wbufIAC == 0)
 	    pCEServing->wbufIAC = pCEServing->wbuf->used;
@ -1685,11 +1715,11 @@ ExpandString(str, pCE, breaknum)
 		++octs;
 		oct = oct * 8 + (s - '0');
 		continue;
-	    } else if (s == 'd' && pCE != (CONSENT *)0) {
+	    } else if (s == 'd') {
 		PutConsole(pCE, IAC, 0);
 		PutConsole(pCE, '0' + breaknum, 0);
 		continue;
-	    } else if (s == 'z' && pCE != (CONSENT *)0) {
+	    } else if (s == 'z') {
 		PutConsole(pCE, IAC, 0);
 		PutConsole(pCE, BREAK, 0);
 		continue;
@ -2148,7 +2178,7 @@ CommandInfo(pGE, pCLServing, pCEServing, tyme)
 	    case HOST:
 		FilePrint(pCLServing->fd, FLAGTRUE, "!:%s,%hu,%s",
 			  pCE->host, pCE->netport,
-			  (pCE->raw ? "raw" : "telnet"));
+			  (pCE->raw == FLAGTRUE ? "raw" : "telnet"));
 		break;
 	    case DEVICE:
 		FilePrint(pCLServing->fd, FLAGTRUE, "/:%s,%s%c",
@ -2407,7 +2437,7 @@ DoConsoleRead(pCEServing)
    CONDDEBUG((1, "DoConsoleRead(): read %d bytes from fd %d", nr,
 	       cofile));

-    if (pCEServing->type == HOST && !pCEServing->raw) {
+    if (pCEServing->type == HOST && pCEServing->raw != FLAGTRUE) {
 	/* Do a little Telnet Protocol interpretation
 	 * state = 0: normal
 	 *       = 1: Saw a IAC char
@ -2908,7 +2938,8 @@ DoClientRead(pGE, pCLServing)
 			    if (n != (NAMES *)0)
 				break;
 			}
-			if (pCEwant == (CONSENT *)0) {
+			if (pCEwant == (CONSENT *)0 &&
+			    config->autocomplete == FLAGTRUE) {
 			    NAMES *n = (NAMES *)0;
 			    int len = strlen(pcArgs);
 			    for (pCE = pGE->pCElist; pCE != (CONSENT *)0;
@ -3933,11 +3964,19 @@ FlushConsole(pCEServing)
    }

    if (pCEServing->wbuf->used > 1) {
+	char *iac = StringChar(pCEServing->wbuf, 0, (char)IAC);
+	CONDDEBUG((1, "Kiddie(): hunting for new IAC for [%s]",
+		   pCEServing->server));
+	if (iac == (char *)0)
+	    pCEServing->wbufIAC = 0;
+	else
+	    pCEServing->wbufIAC = (iac - pCEServing->wbuf->string) + 2;
 	CONDDEBUG((1,
 		   "Kiddie(): watching writability for fd %d 'cause we have buffered data",
 		   FileFDNum(pCEServing->cofile)));
 	FD_SET(FileFDNum(pCEServing->cofile), &winit);
    } else {
+	pCEServing->wbufIAC = 0;
 	if (FileBufEmpty(pCEServing->cofile)) {
 	    CONDDEBUG((1,
 		       "Kiddie(): removing writability for fd %d 'cause we don't have buffered data",
@ -4308,6 +4347,13 @@ Kiddie(pGE, sfd)
 			}
 			pCEServing->ioState = ISNORMAL;
 			pCEServing->lastWrite = time((time_t *)0);
+#if HAVE_GETTIMEOFDAY
+			if (gettimeofday(&tv, (void *)0) == 0)
+			    pCEServing->lastInit = tv;
+#else
+			if ((tv = time((time_t *)0)) != (time_t)-1)
+			    pCEServing->lastInit = tv;
+#endif
 			/* waiting for a connect(), we watch the write bit,
 			 * so switch around and now watch for the read and
 			 * start gathering data
@ -4589,7 +4635,9 @@ Spawn(pGE)
    static STRING *portPath = (STRING *)0;
 #else
    socklen_t so;
+# if HAVE_SETSOCKOPT
    int true = 1;
+# endif
    unsigned short portInc = 0;
    struct sockaddr_in lstn_port;
 #endif
--- a/conserver/group.h
+++ b/conserver/group.h
@ -1,5 +1,5 @@
 /*
- *  $Id: group.h,v 5.45 2004/05/07 03:42:49 bryan Exp $
+ *  $Id: group.h,v 5.46 2004/05/25 00:38:15 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -80,7 +80,6 @@ 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));
 extern void DeUtmp PARAMS((GRPENT *, int));
 #if HAVE_OPENSSL
 extern int AttemptSSL PARAMS((CONSCLIENT *));
--- a/conserver/main.c
+++ b/conserver/main.c
@ -1,5 +1,5 @@
 /*
- *  $Id: main.c,v 5.180 2004/05/07 03:42:49 bryan Exp $
+ *  $Id: main.c,v 5.186 2004/07/14 05:28:42 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -40,11 +40,7 @@
 #include <readcfg.h>
 #include <version.h>

-#include <net/if.h>
 #include <dirent.h>
-#if HAVE_SYS_SOCKIO_H
-# include <sys/sockio.h>
-#endif
 #if HAVE_OPENSSL
 # include <openssl/opensslv.h>
 #endif
@ -54,9 +50,8 @@ int fAll = 0, fNoinit = 0, fVersion = 0, fStrip = 0, fReopen =
    0, fNoautoreup = 0, fSyntaxOnly = 0;

 char *pcConfig = CONFIGFILE;
-int isMaster = 1;
 int cMaxMemb = MAXMEMB;
-in_addr_t bindAddr;
+in_addr_t bindAddr = INADDR_ANY;
 unsigned short bindPort;
 unsigned short bindBasePort;
 static STRING *startedMsg = (STRING *)0;
@ -64,7 +59,8 @@ CONFIG *optConf = (CONFIG *)0;
 CONFIG *config = (CONFIG *)0;
 char *interface = (char *)0;
 CONFIG defConfig =
-    { (STRING *)0, 'r', FLAGFALSE, LOGFILEPATH, PASSWDFILE, DEFPORT,
+    { (STRING *)0, FLAGTRUE, 'r', FLAGFALSE, LOGFILEPATH, PASSWDFILE,
+    DEFPORT,
    FLAGTRUE, FLAGTRUE, 0, DEFBASEPORT, (char *)0, 0
 #if HAVE_SETPROCTITLE
 	, FLAGFALSE
@ -603,6 +599,9 @@ Version()
 #endif
 #if TRUST_REVERSE_DNS
 	"trustrevdns",
+#endif
+#if USE_UNIX_DOMAIN_SOCKETS
+	"uds",
 #endif
 	(char *)0
    };
@ -651,10 +650,12 @@ Version()
    BuildStringChar('0' + DMALLOC_VERSION_MINOR, acA1);
    BuildStringChar('.', acA1);
    BuildStringChar('0' + DMALLOC_VERSION_PATCH, acA1);
+#if defined(DMALLOC_VERSION_BETA)
    if (DMALLOC_VERSION_BETA != 0) {
 	BuildString("-b", acA1);
 	BuildStringChar('0' + DMALLOC_VERSION_BETA, acA1);
    }
+#endif
    Msg("dmalloc version: %s", acA1->string);
 #endif
 #if HAVE_OPENSSL
@ -720,6 +721,8 @@ DestroyDataStructures()
    DestroyBreakList();
    DestroyStrings();
    DestroyUserList();
+    if (substData != (SUBST *) 0)
+	free(substData);
 }

 void
@ -851,13 +854,13 @@ DumpDataStructures()
    GRPENT *pGE;
    CONSENT *pCE;
    REMOTE *pRC;
-    char *empty = "<empty>";

 #if HAVE_DMALLOC && DMALLOC_MARK_MAIN
    CONDDEBUG((1, "DumpDataStructures(): dmalloc / MarkMain"));
    dmalloc_log_changed(dmallocMarkMain, 1, 0, 1);
 #endif
-#define EMPTYSTR(x) x == (char *)0 ? empty : x
+#define EMPTYSTR(x) x == (char *)0 ? "(null)" : x
+#define FLAGSTR(x) x == FLAGTRUE ? "true" : (x == FLAGFALSE ? "false" : "unset")
    if (!fDebug)
 	return;

@ -896,9 +899,9 @@ DumpDataStructures()
 			       "DumpDataStructures():  server=%s, type=HOST",
 			       EMPTYSTR(pCE->server)));
 		    CONDDEBUG((1,
-			       "DumpDataStructures():  host=%s, raw=%hu, netport=%hu, port=%hu, telnetState=%d",
-			       EMPTYSTR(pCE->host), pCE->raw, pCE->netport,
-			       pCE->port, pCE->telnetState));
+			       "DumpDataStructures():  host=%s, raw=%s, netport=%hu, port=%hu, telnetState=%d",
+			       EMPTYSTR(pCE->host), FLAGSTR(pCE->raw),
+			       pCE->netport, pCE->port, pCE->telnetState));
 		    break;
 		case UNKNOWNTYPE:
 		    CONDDEBUG((1,
@ -920,32 +923,27 @@ DumpDataStructures()
 	    CONDDEBUG((1,
 		       "DumpDataStructures():  mark=%d, nextMark=%ld, autoReup=%hu, downHard=%s",
 		       pCE->mark, pCE->nextMark, pCE->autoReUp,
-		       pCE->downHard == FLAGTRUE ? "true" : "false"));
+		       FLAGSTR(pCE->downHard)));
 	    CONDDEBUG((1,
 		       "DumpDataStructures():  nolog=%d, cofile=%d, activitylog=%s, breaklog=%s",
 		       pCE->nolog, FileFDNum(pCE->cofile),
-		       pCE->activitylog == FLAGTRUE ? "true" : "false",
-		       pCE->breaklog == FLAGTRUE ? "true" : "false"));
+		       FLAGSTR(pCE->activitylog), FLAGSTR(pCE->breaklog)));
 	    CONDDEBUG((1,
 		       "DumpDataStructures():  ixon=%s, ixany=%s, ixoff=%s",
-		       pCE->ixon == FLAGTRUE ? "true" : "false",
-		       pCE->ixany == FLAGTRUE ? "true" : "false",
-		       pCE->ixoff == FLAGTRUE ? "true" : "false"));
+		       FLAGSTR(pCE->ixon), FLAGSTR(pCE->ixany),
+		       FLAGSTR(pCE->ixoff)));
 	    CONDDEBUG((1,
 		       "DumpDataStructures():  autoreinit=%s, hupcl=%s, cstopb=%s, ondemand=%s",
-		       pCE->autoreinit == FLAGTRUE ? "true" : "false",
-		       pCE->hupcl == FLAGTRUE ? "true" : "false",
-		       pCE->cstopb == FLAGTRUE ? "true" : "false",
-		       pCE->ondemand == FLAGTRUE ? "true" : "false"));
+		       FLAGSTR(pCE->autoreinit), FLAGSTR(pCE->hupcl),
+		       FLAGSTR(pCE->cstopb), FLAGSTR(pCE->ondemand)));
 #if defined(CRTSCTS)
 	    CONDDEBUG((1, "DumpDataStructures():  crtscts=%s",
-		       pCE->crtscts == FLAGTRUE ? "true" : "false"));
+		       FLAGSTR(pCE->crtscts)));
 #endif
 	    CONDDEBUG((1,
 		       "DumpDataStructures():  reinitoncc=%s, striphigh=%s, unloved=%s",
-		       pCE->reinitoncc == FLAGTRUE ? "true" : "false",
-		       pCE->striphigh == FLAGTRUE ? "true" : "false",
-		       pCE->unloved == FLAGTRUE ? "true" : "false"));
+		       FLAGSTR(pCE->reinitoncc), FLAGSTR(pCE->striphigh),
+		       FLAGSTR(pCE->unloved)));
 	    CONDDEBUG((1,
 		       "DumpDataStructures():  initpid=%lu, initcmd=%s, initfile=%d",
 		       (unsigned long)pCE->initpid, EMPTYSTR(pCE->initcmd),
@ -983,188 +981,6 @@ DumpDataStructures()
    }
 }

-/* fills the myAddrs array with host interface addresses */
-void
-#if PROTOTYPES
-ProbeInterfaces(void)
-#else
-ProbeInterfaces()
-#endif
-{
-#ifdef SIOCGIFCONF
-    struct ifconf ifc;
-    struct ifreq *ifr;
-#ifdef SIOCGIFFLAGS
-    struct ifreq ifrcopy;
-#endif
-    int sock;
-    int r = 0, m = 0;
-    int bufsize = 2048;
-    int count = 0;
-
-    /* if we use -M, just fill the array with that interface */
-    if (bindAddr != INADDR_ANY) {
-	myAddrs = (struct in_addr *)calloc(2, sizeof(struct in_addr));
-	if (myAddrs == (struct in_addr *)0)
-	    OutOfMem();
-#if HAVE_MEMCPY
-	memcpy(&(myAddrs[0].s_addr), &bindAddr, sizeof(in_addr_t));
-#else
-	bcopy(&bindAddr, &(myAddrs[0].s_addr), sizeof(in_addr_t));
-#endif
-	Verbose("interface address %s (-M option)", inet_ntoa(myAddrs[0]));
-	return;
-    }
-
-    if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
-	Error("ProbeInterfaces(): socket(): %s", strerror(errno));
-	Bye(EX_OSERR);
-    }
-
-    while (bufsize) {
-	ifc.ifc_len = bufsize;
-	ifc.ifc_req = (struct ifreq *)malloc(ifc.ifc_len);
-	if (ifc.ifc_req == (struct ifreq *)0)
-	    OutOfMem();
-	if (ioctl(sock, SIOCGIFCONF, &ifc) != 0) {
-	    free(ifc.ifc_req);
-	    close(sock);
-	    Error("ProbeInterfaces(): ioctl(SIOCGIFCONF): %s",
-		  strerror(errno));
-	    Bye(EX_OSERR);
-	}
-	/* if the return size plus a 512 byte "buffer zone" is less than
-	 * the buffer we passed in (bufsize), we're done.  otherwise
-	 * allocate a bigger buffer and try again.  with a too-small
-	 * buffer, some implementations (freebsd) will fill the buffer
-	 * best it can (leaving a gap - returning <=bufsize) and others
-	 * (linux) will return a buffer length the same size as passed
-	 * in (==bufsize).  so, we'll assume a 512 byte gap would have
-	 * been big enough to put one more record and as long as we have
-	 * that "buffer zone", we should have all the interfaces.
-	 */
-	if (ifc.ifc_len + 512 < bufsize)
-	    break;
-	free(ifc.ifc_req);
-	bufsize += 2048;
-    }
-
-    /* this is probably way overkill, but better to kill a few bytes
-     * than loop through looking for valid interfaces that are up
-     * twice, huh?
-     */
-    count = ifc.ifc_len / sizeof(*ifr);
-    CONDDEBUG((1, "ProbeInterfaces(): ifc_len==%d max_count==%d",
-	       ifc.ifc_len, count));
-
-    /* set up myAddrs array */
-    if (myAddrs != (struct in_addr *)0)
-	free(myAddrs);
-    myAddrs = (struct in_addr *)0;
-    if (count == 0) {
-	free(ifc.ifc_req);
-	close(sock);
-	return;
-    }
-    myAddrs = (struct in_addr *)calloc(count + 1, sizeof(struct in_addr));
-    if (myAddrs == (struct in_addr *)0)
-	OutOfMem();
-
-    for (m = r = 0; r < ifc.ifc_len;) {
-	struct sockaddr *sa;
-	ifr = (struct ifreq *)&ifc.ifc_buf[r];
-	sa = (struct sockaddr *)&ifr->ifr_addr;
-	/* don't use less than a ifreq sized chunk */
-	if ((ifc.ifc_len - r) < sizeof(*ifr))
-	    break;
-#ifdef HAVE_SA_LEN
-	if (sa->sa_len > sizeof(ifr->ifr_addr))
-	    r += sizeof(ifr->ifr_name) + sa->sa_len;
-	else
-#endif
-	    r += sizeof(*ifr);
-
-	if (sa->sa_family == AF_INET) {
-	    struct sockaddr_in *sin = (struct sockaddr_in *)sa;
-#ifdef SIOCGIFFLAGS
-	    /* make sure the interface is up */
-	    ifrcopy = *ifr;
-	    if ((ioctl(sock, SIOCGIFFLAGS, &ifrcopy) == 0) &&
-		((ifrcopy.ifr_flags & IFF_UP) == 0))
-		continue;
-#endif
-	    CONDDEBUG((1, "ProbeInterfaces(): name=%s addr=%s",
-		       ifr->ifr_name, inet_ntoa(sin->sin_addr)));
-#if HAVE_MEMCPY
-	    memcpy(&myAddrs[m], &(sin->sin_addr), sizeof(struct in_addr));
-#else
-	    bcopy(&(sin->sin_addr), &myAddrs[m], sizeof(struct in_addr));
-#endif
-	    Verbose("interface address %s (%s)", inet_ntoa(myAddrs[m]),
-		    ifr->ifr_name);
-	    m++;
-	}
-    }
-    if (m == 0) {
-	free(myAddrs);
-	myAddrs = (struct in_addr *)0;
-    }
-    close(sock);
-    free(ifc.ifc_req);
-#else /* use the hostname like the old code did (but use all addresses!) */
-    int count;
-    struct hostent *he;
-
-    /* if we use -M, just fill the array with that interface */
-    if (bindAddr != INADDR_ANY) {
-	myAddrs = (struct in_addr *)calloc(2, sizeof(struct in_addr));
-	if (myAddrs == (struct in_addr *)0)
-	    OutOfMem();
-#if HAVE_MEMCPY
-	memcpy(&(myAddrs[0].s_addr), &bindAddr, sizeof(in_addr_t));
-#else
-	bcopy(&bindAddr, &(myAddrs[0].s_addr), sizeof(in_addr_t));
-#endif
-	Verbose("interface address %s (-M option)", inet_ntoa(myAddrs[0]));
-	return;
-    }
-
-    Verbose("using hostname for interface addresses");
-    if ((struct hostent *)0 == (he = gethostbyname(myHostname))) {
-	Error("ProbeInterfaces(): gethostbyname(%s): %s", myHostname,
-	      hstrerror(h_errno));
-	return;
-    }
-    if (4 != he->h_length || AF_INET != he->h_addrtype) {
-	Error
-	    ("ProbeInterfaces(): gethostbyname(%s): wrong address size (4 != %d) or address family (%d != %d)",
-	     myHostname, he->h_length, AF_INET, he->h_addrtype);
-	return;
-    }
-
-    for (count = 0; he->h_addr_list[count] != (char *)0; count++);
-    if (myAddrs != (struct in_addr *)0)
-	free(myAddrs);
-    myAddrs = (struct in_addr *)0;
-    if (count == 0)
-	return;
-    myAddrs = (struct in_addr *)calloc(count + 1, sizeof(struct in_addr));
-    if (myAddrs == (struct in_addr *)0)
-	OutOfMem();
-    for (count--; count >= 0; count--) {
-#if HAVE_MEMCPY
-	memcpy(&(myAddrs[count].s_addr), he->h_addr_list[count],
-	       he->h_length);
-#else
-	bcopy(he->h_addr_list[count], &(myAddrs[count].s_addr),
-	      he->h_length);
-#endif
-	Verbose("interface address %s (hostname address)",
-		inet_ntoa(myAddrs[count]));
-    }
-#endif
-}
-
 /* This makes sure a directory exists and tries to create it if it
 * doesn't.  returns 0 for success, -1 for error
 */
@ -1290,9 +1106,9 @@ main(argc, argv)

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

    setpwent();
@ -1354,7 +1170,7 @@ main(argc, argv)
 #endif
 		break;
 	    case 'C':
-		pcConfig = StrDup(optarg);
+		pcConfig = optarg;
 		break;
 	    case 'd':
 		optConf->daemonmode = FLAGTRUE;
@ -1520,7 +1336,7 @@ main(argc, argv)
 	Error("gethostname(): %s", strerror(errno));
 	Bye(EX_OSERR);
    }
-    ProbeInterfaces();
+    ProbeInterfaces(bindAddr);

    /* initialize the timers */
    for (i = 0; i < T_MAX; i++)
@ -1642,6 +1458,13 @@ main(argc, argv)
    else
 	config->redirect = defConfig.redirect;

+    if (optConf->autocomplete != FLAGUNKNOWN)
+	config->autocomplete = optConf->autocomplete;
+    else if (pConfig->autocomplete != FLAGUNKNOWN)
+	config->autocomplete = pConfig->autocomplete;
+    else
+	config->autocomplete = defConfig.autocomplete;
+
    if (optConf->loghostnames != FLAGUNKNOWN)
 	config->loghostnames = optConf->loghostnames;
    else if (pConfig->loghostnames != FLAGUNKNOWN)
--- a/conserver/main.h
+++ b/conserver/main.h
@ -1,5 +1,5 @@
 /*
- *  $Id: main.h,v 5.52 2004/04/13 18:12:00 bryan Exp $
+ *  $Id: main.h,v 5.53 2004/05/21 04:15:17 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -44,7 +44,6 @@ extern unsigned short bindPort, bindBasePort;
 extern char *pcConfig;
 extern int cMaxMemb;
 extern struct sockaddr_in in_port;
-extern int isMaster;
 extern CONFIG *optConf;
 extern CONFIG *config;
 extern CONFIG defConfig;
--- a/conserver/master.c
+++ b/conserver/master.c
@ -1,5 +1,5 @@
 /*
- *  $Id: master.c,v 5.126 2004/05/06 02:09:07 bryan Exp $
+ *  $Id: master.c,v 5.128 2004/07/14 05:28:42 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -292,7 +292,8 @@ CommandCall(pCL, args)
 	    pRCFound = pRC;
 	}
    }
-    if (found == 0) {		/* Then look for substring matches */
+    if (found == 0 && config->autocomplete == FLAGTRUE) {
+	/* Then look for substring matches */
 	NAMES *name = (NAMES *)0;
 	int foundOne = 0;
 	for (pGE = pGroups; pGE != (GRPENT *)0; pGE = pGE->pGEnext) {
@ -686,7 +687,9 @@ Master()
    static STRING *portPath = (STRING *)0;
 #else
    struct sockaddr_in master_port;
+# if HAVE_SETSOCKOPT
    int true = 1;
+# endif
 #endif
    FILE *fp;
    CONSCLIENT *pCLServing = (CONSCLIENT *)0;
--- a/conserver/readcfg.c
+++ b/conserver/readcfg.c
--- a/conserver/readcfg.h
+++ b/conserver/readcfg.h
@ -1,5 +1,5 @@
 /*
- *  $Id: readcfg.h,v 5.39 2004/05/07 03:42:49 bryan Exp $
+ *  $Id: readcfg.h,v 5.41 2004/07/14 05:28:42 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -10,6 +10,7 @@

 typedef struct config {
    STRING *name;
+    FLAG autocomplete;
    char defaultaccess;
    FLAG daemonmode;
    char *logfile;
@ -43,6 +44,7 @@ extern ACCESS *pACList;		/* `who do you love' (or trust) */
 extern CONSENTUSERS *pADList;	/* list of admin users */
 extern BREAKS breakList[9];	/* list of break sequences */
 extern CONFIG *pConfig;		/* settings seen by config parser */
+extern SUBST *substData;	/* substitution function data */

 extern void ReadCfg PARAMS((char *, FILE *));
 extern void ReReadCfg PARAMS((int));
--- a/conserver/version.h
+++ b/conserver/version.h
@ -1,5 +1,5 @@
 /*
- *  $Id: version.h,v 1.61 2004/04/16 16:58:09 bryan Exp $
+ *  $Id: version.h,v 1.65 2004/07/14 05:28:42 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.1.5"
+#define THIS_VERSION "conserver.com version 8.1.9"
--- a/console/Makefile.in
+++ b/console/Makefile.in
@ -25,11 +25,11 @@ LIBS	= @LIBS@

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

-CONSOLE_OBJS = console.o getpassword.o ../conserver/cutil.o
+CONSOLE_OBJS = console.o getpassword.o readconf.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
+	       $(srcdir)/getpassword.h $(srcdir)/readconf.h
 ALL = console


--- a/console/console.c
+++ b/console/console.c
@ -1,5 +1,5 @@
 /*
- *  $Id: console.c,v 5.164 2004/04/20 01:30:13 bryan Exp $
+ *  $Id: console.c,v 5.167 2004/05/25 23:03:25 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -34,6 +34,7 @@
 #include <getpassword.h>
 #include <cutil.h>
 #include <version.h>
+#include <readconf.h>
 #if HAVE_OPENSSL
 #include <openssl/ssl.h>
 #include <openssl/err.h>
@ -41,24 +42,11 @@
 #endif


-int fReplay = 0, fVersion = 0, fStrip = 0;
+int fReplay = 0, fVersion = 0;
 int showExecData = 1;
-#if HAVE_OPENSSL
-int fReqEncryption = 1;
-int fAllowUnencrypted = 0;
-char *pcCredFile = (char *)0;
-#endif
 int chAttn = -1, chEsc = -1;
-char *pcInMaster =
-#if USE_UNIX_DOMAIN_SOCKETS
-    UDSDIR;
-#else
-    MASTERHOST;			/* which machine is current */
-#endif
-char *pcPort = DEFPORT;
 unsigned short bindPort;
 CONSFILE *cfstdout;
-char *pcUser = (char *)0;
 int disconnectCount = 0;
 STRING *execCmd = (STRING *)0;
 CONSFILE *execCmdFile = (CONSFILE *)0;
@ -67,6 +55,8 @@ CONSFILE *gotoConsole = (CONSFILE *)0;
 CONSFILE *prevConsole = (CONSFILE *)0;
 char *gotoName = (char *)0;
 char *prevName = (char *)0;
+CONFIG *optConf = (CONFIG *)0;
+CONFIG *config = (CONFIG *)0;

 #if HAVE_OPENSSL
 SSL_CTX *ctx = (SSL_CTX *)0;
@ -92,15 +82,17 @@ SetupSSL()
 	    Error("Could not load SSL default CA file and/or directory");
 	    Bye(EX_UNAVAILABLE);
 	}
-	if (pcCredFile != (char *)0) {
-	    if (SSL_CTX_use_certificate_chain_file(ctx, pcCredFile) != 1) {
+	if (config->sslcredentials != (char *)0) {
+	    if (SSL_CTX_use_certificate_chain_file
+		(ctx, config->sslcredentials) != 1) {
 		Error("Could not load SSL certificate from '%s'",
-		      pcCredFile);
+		      config->sslcredentials);
 		Bye(EX_UNAVAILABLE);
 	    }
 	    if (SSL_CTX_use_PrivateKey_file
-		(ctx, pcCredFile, SSL_FILETYPE_PEM) != 1) {
-		Error("Could not SSL private key from '%s'", pcCredFile);
+		(ctx, config->sslcredentials, SSL_FILETYPE_PEM) != 1) {
+		Error("Could not SSL private key from '%s'",
+		      config->sslcredentials);
 		Bye(EX_UNAVAILABLE);
 	    }
 	}
@ -191,54 +183,56 @@ Usage(wantfull)
 #endif
 {
    static char *full[] = {
-	"7       strip the high bit off all console data",
-	"a(A)    attach politely (and replay last 20 lines)",
-	"b(B)    send broadcast message to all users (on master)",
+	"7         strip the high bit off all console data",
+	"a(A)      attach politely (and replay last 20 lines)",
+	"b(B)      send broadcast message to all users (on master)",
 #if HAVE_OPENSSL
-	"c cred  load an SSL certificate and key from the PEM encoded file",
+	"c cred    load an SSL certificate and key from the PEM encoded file",
 #else
-	"c cred  ignored - encryption not compiled into code",
+	"c cred    ignored - encryption not compiled into code",
 #endif
-	"d       disconnect [user][@console]",
-	"D       enable debug output, sent to stderr",
-	"e esc   set the initial escape characters",
+	"C config  override per-user config file",
+	"d         disconnect [user][@console]",
+	"D         enable debug output, sent to stderr",
+	"e esc     set the initial escape characters",
 #if HAVE_OPENSSL
-	"E       don't attempt encrypted connections",
+	"E         don't attempt encrypted connections",
 #else
-	"E       ignored - encryption not compiled into code",
+	"E         ignored - encryption not compiled into code",
 #endif
-	"f(F)    force read/write connection (and replay)",
-	"h       output this message",
-	"i(I)    display information in machine-parseable form (on master)",
-	"l user  use username instead of current username",
-	"M mach  master server to poll first",
-	"p port  port to connect to",
-	"P       display pids of daemon(s)",
-	"q(Q)    send a quit command to the (master) server",
-	"r(R)    display (master) daemon version (think 'r'emote version)",
-	"s(S)    spy on a console (and replay)",
-	"t       send a text message to [user][@console]",
-	"u       show users on the various consoles",
+	"f(F)      force read/write connection (and replay)",
+	"h         output this message",
+	"i(I)      display information in machine-parseable form (on master)",
+	"l user    use username instead of current username",
+	"M master  master server to poll first",
+	"n         do not read system-wide config file",
+	"p port    port to connect to",
+	"P         display pids of daemon(s)",
+	"q(Q)      send a quit command to the (master) server",
+	"r(R)      display (master) daemon version (think 'r'emote version)",
+	"s(S)      spy on a console (and replay)",
+	"t         send a text message to [user][@console]",
+	"u         show users on the various consoles",
 #if HAVE_OPENSSL
-	"U       allow unencrypted connections if SSL not available",
+	"U         allow unencrypted connections if SSL not available",
 #else
-	"U       ignored - encryption not compiled into code",
+	"U         ignored - encryption not compiled into code",
 #endif
-	"v       be more verbose",
-	"V       show version information",
-	"w(W)    show who is on which console (on master)",
-	"x       examine ports and baud rates",
+	"v         be more verbose",
+	"V         show version information",
+	"w(W)      show who is on which console (on master)",
+	"x         examine ports and baud rates",
 	(char *)0
    };

    fprintf(stderr,
-	    "usage: %s [-aAfFsS] [-7DEUv] [-c cred] [-M mach] [-p port] [-e esc] [-l username] console\n",
+	    "usage: %s [-aAfFsS] [-7DEnUv] [-c cred] [-C config] [-M master] [-p port] [-e esc] [-l username] console\n",
 	    progname);
    fprintf(stderr,
-	    "       %s [-hiIPrRuVwWx] [-7DEUv] [-c cred] [-M mach] [-p port] [-d [user][@console]] [-[bB] message] [-t [user][@console] message]\n",
+	    "       %s [-hiIPrRuVwWx] [-7DEnUv] [-c cred] [-C config] [-M master] [-p port] [-d [user][@console]] [-[bB] message] [-t [user][@console] message]\n",
 	    progname);
    fprintf(stderr,
-	    "       %s [-qQ] [-7DEUv] [-c cred] [-M mach] [-p port]\n",
+	    "       %s [-qQ] [-7DEnUv] [-c cred] [-C config] [-M master] [-p port]\n",
 	    progname);

    if (wantfull) {
@ -272,6 +266,9 @@ Version()
 #endif
 #if HAVE_PAM
 	"pam",
+#endif
+#if USE_UNIX_DOMAIN_SOCKETS
+	"uds",
 #endif
 	(char *)0
    };
@ -290,6 +287,8 @@ Version()
 #endif
    Msg("default escape sequence `%s%s\'", FmtCtl(DEFATTN, acA1),
 	FmtCtl(DEFESC, acA2));
+    Msg("default site-wide configuration in `%s'", CLIENTCONFIGFILE);
+    Msg("default per-user configuration in `%s'", "$HOME/.consolerc");

    BuildString((char *)0, acA1);
    if (optionlist[0] == (char *)0)
@ -310,10 +309,12 @@ Version()
    BuildStringChar('0' + DMALLOC_VERSION_MINOR, acA1);
    BuildStringChar('.', acA1);
    BuildStringChar('0' + DMALLOC_VERSION_PATCH, acA1);
+#if defined(DMALLOC_VERSION_BETA)
    if (DMALLOC_VERSION_BETA != 0) {
 	BuildString("-b", acA1);
 	BuildStringChar('0' + DMALLOC_VERSION_BETA, acA1);
    }
+#endif
    Msg("dmalloc version: %s", acA1->string);
 #endif
 #if HAVE_OPENSSL
@ -388,7 +389,7 @@ ValidateEsc()
 {
    unsigned char c1, c2;

-    if (!fStrip)
+    if (config->striphigh != FLAGTRUE)
 	return;

    if (chAttn == -1 || chEsc == -1) {
@ -463,7 +464,7 @@ GetPort(pcToHost, sPort)
 #if USE_UNIX_DOMAIN_SOCKETS
    if (portPath == (STRING *)0)
 	portPath = AllocString();
-    BuildStringPrint(portPath, "%s/%hu", pcInMaster, sPort);
+    BuildStringPrint(portPath, "%s/%hu", config->master, sPort);
    port.sun_family = AF_UNIX;
    if (portPath->used > sizeof(port.sun_path)) {
 	Error("GetPort: path to socket too long: %s", portPath->string);
@ -607,7 +608,15 @@ DestroyDataStructures()
    C2Cooked();
    if (cfstdout != (CONSFILE *)0)
 	FileUnopen(cfstdout);
+    DestroyConfig(pConfig);
+    DestroyConfig(optConf);
+    DestroyConfig(config);
+    DestroyTerminal(pTerm);
+    if (myAddrs != (struct in_addr *)0)
+	free(myAddrs);
    DestroyStrings();
+    if (substData != (SUBST *) 0)
+	free(substData);
 }

 char *
@ -944,6 +953,129 @@ DoExec(pcf)
    }
 }

+void
+#if PROTOTYPES
+ExpandString(char *str, CONSFILE *c)
+#else
+ExpandString(str, c)
+    char *str;
+    CONSFILE *c;
+#endif
+{
+    char s;
+    short backslash = 0;
+    short cntrl = 0;
+    char oct = '\000';
+    short octs = 0;
+    static STRING *exp = (STRING *)0;
+
+    if (str == (char *)0 || c == (CONSFILE *)0)
+	return;
+
+    if (exp == (STRING *)0)
+	exp = AllocString();
+
+    BuildString((char *)0, exp);
+
+    backslash = 0;
+    cntrl = 0;
+    while ((s = (*str++)) != '\000') {
+	if (octs > 0 && octs < 3 && s >= '0' && s <= '7') {
+	    ++octs;
+	    oct = oct * 8 + (s - '0');
+	    continue;
+	}
+	if (octs != 0) {
+	    BuildStringChar(oct, exp);
+	    octs = 0;
+	    oct = '\000';
+	}
+	if (backslash) {
+	    backslash = 0;
+	    if (s == 'a')
+		s = '\a';
+	    else if (s == 'b')
+		s = '\b';
+	    else if (s == 'f')
+		s = '\f';
+	    else if (s == 'n')
+		s = '\n';
+	    else if (s == 'r')
+		s = '\r';
+	    else if (s == 't')
+		s = '\t';
+	    else if (s == 'v')
+		s = '\v';
+	    else if (s == '^')
+		s = '^';
+	    else if (s >= '0' && s <= '7') {
+		++octs;
+		oct = oct * 8 + (s - '0');
+		continue;
+	    }
+	    BuildStringChar(s, exp);
+	    continue;
+	}
+	if (cntrl) {
+	    cntrl = 0;
+	    if (s == '?')
+		s = 0x7f;	/* delete */
+	    else
+		s = s & 0x1f;
+	    BuildStringChar(s, exp);
+	    continue;
+	}
+	if (s == '\\') {
+	    backslash = 1;
+	    continue;
+	}
+	if (s == '^') {
+	    cntrl = 1;
+	    continue;
+	}
+	BuildStringChar(s, exp);
+    }
+
+    if (octs != 0)
+	BuildStringChar(oct, exp);
+
+    if (backslash)
+	BuildStringChar('\\', exp);
+
+    if (cntrl)
+	BuildStringChar('^', exp);
+
+    if (exp->used > 1)
+	FileWrite(c, FLAGFALSE, exp->string, exp->used - 1);
+}
+
+void
+#if PROTOTYPES
+PrintSubst(CONSFILE *pcf, char *pcMach, char *string, char *subst)
+#else
+PrintSubst(pcf, pcMach, string, subst)
+    CONSFILE *pcf;
+    char *pcMach;
+    char *string;
+    char *subst;
+#endif
+{
+    if (string == (char *)0)
+	return;
+
+    if (subst != (char *)0) {
+	char *str;
+	if ((str = StrDup(string)) == (char *)0)
+	    OutOfMem();
+	substData->data = (void *)config;
+	config->console = pcMach;
+	ProcessSubst(substData, &str, (char **)0, (char *)0, subst);
+	ExpandString(str, pcf);
+	free(str);
+    } else
+	ExpandString(string, pcf);
+}
+
 void
 #if PROTOTYPES
 Interact(CONSFILE *pcf, char *pcMach)
@ -962,8 +1094,10 @@ Interact(pcf, pcMach)
    /* if this is true, it means we successfully moved to a new console
     * so we need to close the old one.
     */
-    if (prevConsole != (CONSFILE *)0)
+    if (prevConsole != (CONSFILE *)0) {
 	FileClose(&prevConsole);
+	PrintSubst(cfstdout, prevName, pTerm->detach, pTerm->detachsubst);
+    }
    if (prevName != (char *)0) {
 	free(prevName);
 	prevName = (char *)0;
@ -976,6 +1110,8 @@ Interact(pcf, pcMach)
 	FileWrite(pcf, FLAGFALSE, "\n", 1);
    }

+    PrintSubst(cfstdout, pcMach, pTerm->attach, pTerm->attachsubst);
+
    C2Raw();

    /* set socket to non-blocking */
@ -1024,7 +1160,7 @@ Interact(pcf, pcMach)
 		    FilePrint(pcf, FLAGFALSE, "%c%c", OB_IAC, OB_ABRT);
 		    FileSetQuoteIAC(pcf, FLAGTRUE);
 		} else {
-		    if (fStrip) {
+		    if (config->striphigh == FLAGTRUE) {
 			for (i = 0; i < nc; ++i)
 			    acMesg[i] &= 127;
 		    }
@ -1091,7 +1227,7 @@ Interact(pcf, pcMach)
 		    }
 		    continue;
 		}
-		if (fStrip) {
+		if (config->striphigh == FLAGTRUE) {
 		    for (i = 0; i < l; ++i)
 			acMesg[i] &= 127;
 		}
@ -1123,7 +1259,7 @@ Interact(pcf, pcMach)
 		}
 	    }
 	    if (execCmdFile == (CONSFILE *)0) {
-		if (fStrip) {
+		if (config->striphigh == FLAGTRUE) {
 		    for (i = 0; i < nc; ++i)
 			acMesg[i] &= 127;
 		}
@ -1154,7 +1290,11 @@ Interact(pcf, pcMach)
 	    }
 	}
    }
+
    C2Cooked();
+
+    PrintSubst(cfstdout, pcMach, pTerm->detach, pTerm->detachsubst);
+
    if (fVerbose)
 	printf("Console %s closed.\n", pcMach);
 }
@ -1386,7 +1526,7 @@ DoCmds(master, pports, cmdi)
 	    continue;
 	}
 #if HAVE_OPENSSL
-	if (fReqEncryption) {
+	if (config->sslenabled == FLAGTRUE) {
 	    FileWrite(pcf, FLAGFALSE, "ssl\r\n", 5);
 	    t = ReadReply(pcf, 0);
 	    if (strcmp(t, "ok\r\n") == 0) {
@ -1397,7 +1537,7 @@ DoCmds(master, pports, cmdi)
 		    FileClose(&pcf);
 		    continue;
 		}
-	    } else if (fAllowUnencrypted == 0) {
+	    } else if (config->sslrequired == FLAGTRUE) {
 		Error("Encryption not supported by server `%s'",
 		      serverName);
 		FileClose(&pcf);
@ -1406,7 +1546,7 @@ DoCmds(master, pports, cmdi)
 	}
 #endif

-	FilePrint(pcf, FLAGFALSE, "login %s\r\n", pcUser);
+	FilePrint(pcf, FLAGFALSE, "login %s\r\n", config->username);

 	t = ReadReply(pcf, 0);
 	if (strncmp(t, "passwd?", 7) == 0) {
@ -1425,7 +1565,7 @@ DoCmds(master, pports, cmdi)
 	    if (tmpString->used <= 1) {
 		char *pass;
 		BuildStringPrint(tmpString, "Enter %s@%s's password: ",
-				 pcUser, hostname);
+				 config->username, hostname);
 		pass = GetPassword(tmpString->string);
 		if (pass == (char *)0) {
 		    Error("could not get password from tty for `%s'",
@ -1590,13 +1730,15 @@ main(argc, argv)
    int opt;
    int fLocal;
    static STRING *acPorts = (STRING *)0;
-    static char acOpts[] = "7aAb:B:c:d:De:EfFhiIl:M:p:PqQrRsSt:uUvVwWx";
+    static char acOpts[] = "7aAb:B:c:C:d:De:EfFhiIl:M:np:PqQrRsSt:uUvVwWx";
    extern int optind;
    extern int optopt;
    extern char *optarg;
    static STRING *textMsg = (STRING *)0;
    int cmdi;
    static STRING *consoleName = (STRING *)0;
+    short readSystemConf = 1;
+    char *userConf = (char *)0;

    isMultiProc = 0;		/* make sure stuff DOESN'T have the pid */

@ -1613,6 +1755,17 @@ main(argc, argv)
 	++progname;
    }

+    /* prep the config options */
+    if ((optConf = (CONFIG *)calloc(1, sizeof(CONFIG))) == (CONFIG *)0)
+	OutOfMem();
+    if ((config = (CONFIG *)calloc(1, sizeof(CONFIG))) == (CONFIG *)0)
+	OutOfMem();
+    if ((pConfig = (CONFIG *)calloc(1, sizeof(CONFIG))) == (CONFIG *)0)
+	OutOfMem();
+    /* and the terminal options */
+    if ((pTerm = (TERM *)calloc(1, sizeof(TERM))) == (TERM *)0)
+	OutOfMem();
+
    /* command line parsing
     */
    pcCmd = (char *)0;
@ -1620,7 +1773,7 @@ main(argc, argv)
    while ((opt = getopt(argc, argv, acOpts)) != EOF) {
 	switch (opt) {
 	    case '7':		/* strip high-bit */
-		fStrip = 1;
+		optConf->striphigh = FLAGTRUE;
 		break;

 	    case 'A':		/* attach with log replay */
@ -1641,9 +1794,15 @@ main(argc, argv)
 		    OutOfMem();
 		break;

+	    case 'C':
+		userConf = optarg;
+		break;
+
 	    case 'c':
 #if HAVE_OPENSSL
-		pcCredFile = optarg;
+		if ((optConf->sslcredentials =
+		     StrDup(optarg)) == (char *)0)
+		    OutOfMem();
 #endif
 		break;

@ -1661,12 +1820,13 @@ main(argc, argv)

 	    case 'E':
 #if HAVE_OPENSSL
-		fReqEncryption = 0;
+		optConf->sslenabled = FLAGFALSE;
 #endif
 		break;

 	    case 'e':		/* set escape chars */
-		ParseEsc(optarg);
+		if ((optConf->escape = StrDup(optarg)) == (char *)0)
+		    OutOfMem();
 		break;

 	    case 'F':		/* force attach with log replay */
@ -1684,15 +1844,22 @@ main(argc, argv)
 		break;

 	    case 'l':
-		pcUser = optarg;
+		if ((optConf->username = StrDup(optarg)) == (char *)0)
+		    OutOfMem();
 		break;

 	    case 'M':
-		pcInMaster = optarg;
+		if ((optConf->master = StrDup(optarg)) == (char *)0)
+		    OutOfMem();
+		break;
+
+	    case 'n':
+		readSystemConf = 0;
 		break;

 	    case 'p':
-		pcPort = optarg;
+		if ((optConf->port = StrDup(optarg)) == (char *)0)
+		    OutOfMem();
 		break;

 	    case 'P':		/* send a pid command to the server     */
@ -1737,7 +1904,7 @@ main(argc, argv)

 	    case 'U':
 #if HAVE_OPENSSL
-		fAllowUnencrypted = 1;
+		optConf->sslrequired = FLAGFALSE;
 #endif
 		break;

@ -1783,6 +1950,109 @@ main(argc, argv)
 	Bye(EX_OK);
    }

+    ProbeInterfaces(INADDR_ANY);
+
+    if (readSystemConf)
+	ReadConf(CLIENTCONFIGFILE, FLAGFALSE);
+
+    if (userConf == (char *)0) {
+	/* read the config files */
+	char *h = (char *)0;
+
+	if (((h = getenv("HOME")) == (char *)0) &&
+	    ((pwdMe = getpwuid(getuid())) == (struct passwd *)0)) {
+	    Error("$HOME does not exist and getpwuid fails: %d: %s",
+		  (int)(getuid()), strerror(errno));
+	} else {
+	    if (h == (char *)0) {
+		if (pwdMe->pw_dir == (char *)0 ||
+		    pwdMe->pw_dir[0] == '\000') {
+		    Error("Home directory for uid %d is not defined",
+			  (int)(getuid()));
+		    Bye(EX_UNAVAILABLE);
+		} else {
+		    h = pwdMe->pw_dir;
+		}
+	    }
+	}
+	if (h != (char *)0) {
+	    BuildTmpString((char *)0);
+	    BuildTmpString(h);
+	    h = BuildTmpString("/.consolerc");
+	    ReadConf(h, FLAGFALSE);
+	    BuildTmpString((char *)0);
+	}
+    } else
+	ReadConf(userConf, FLAGTRUE);
+
+    if (optConf->striphigh != FLAGUNKNOWN)
+	config->striphigh = optConf->striphigh;
+    else if (pConfig->striphigh != FLAGUNKNOWN)
+	config->striphigh = pConfig->striphigh;
+    else
+	config->striphigh = FLAGFALSE;
+
+    if (optConf->escape != (char *)0)
+	ParseEsc(optConf->escape);
+    else if (pConfig->escape != (char *)0)
+	ParseEsc(pConfig->escape);
+
+    if (optConf->username != (char *)0)
+	config->username = StrDup(optConf->username);
+    else if (pConfig->username != (char *)0)
+	config->username = StrDup(pConfig->username);
+    else
+	config->username = (char *)0;
+
+    if (optConf->master != (char *)0 && optConf->master[0] != '\000')
+	config->master = StrDup(optConf->master);
+    else if (pConfig->master != (char *)0 && pConfig->master[0] != '\000')
+	config->master = StrDup(pConfig->master);
+    else
+	config->master = StrDup(
+#if USE_UNIX_DOMAIN_SOCKETS
+				   UDSDIR
+#else
+				   MASTERHOST	/* which machine is current */
+#endif
+	    );
+    if (config->master == (char *)0)
+	OutOfMem();
+
+    if (optConf->port != (char *)0 && optConf->port[0] != '\000')
+	config->port = StrDup(optConf->port);
+    else if (pConfig->port != (char *)0 && pConfig->port[0] != '\000')
+	config->port = StrDup(pConfig->port);
+    else
+	config->port = StrDup(DEFPORT);
+    if (config->port == (char *)0)
+	OutOfMem();
+
+#if HAVE_OPENSSL
+    if (optConf->sslcredentials != (char *)0 &&
+	optConf->sslcredentials[0] != '\000')
+	config->sslcredentials = StrDup(optConf->sslcredentials);
+    else if (pConfig->sslcredentials != (char *)0 &&
+	     pConfig->sslcredentials[0] != '\000')
+	config->sslcredentials = StrDup(pConfig->sslcredentials);
+    else
+	config->sslcredentials = (char *)0;
+
+    if (optConf->sslenabled != FLAGUNKNOWN)
+	config->sslenabled = optConf->sslenabled;
+    else if (pConfig->sslenabled != FLAGUNKNOWN)
+	config->sslenabled = pConfig->sslenabled;
+    else
+	config->sslenabled = FLAGTRUE;
+
+    if (optConf->sslrequired != FLAGUNKNOWN)
+	config->sslrequired = optConf->sslrequired;
+    else if (pConfig->sslrequired != FLAGUNKNOWN)
+	config->sslrequired = pConfig->sslrequired;
+    else
+	config->sslrequired = FLAGTRUE;
+#endif
+
    /* finish resolving the command to do */
    if (pcCmd == (char *)0) {
 	pcCmd = "attach";
@ -1813,23 +2083,20 @@ main(argc, argv)
 	Bye(EX_UNAVAILABLE);
    }
 #if !USE_UNIX_DOMAIN_SOCKETS
-    /* if we somehow lost the port (or got an empty string), reset */
-    if (pcPort == (char *)0 || pcPort[0] == '\000')
-	pcPort = DEFPORT;
-
    /* Look for non-numeric characters */
-    for (opt = 0; pcPort[opt] != '\000'; opt++)
-	if (!isdigit((int)pcPort[opt]))
+    for (opt = 0; config->port[opt] != '\000'; opt++)
+	if (!isdigit((int)config->port[opt]))
 	    break;

-    if (pcPort[opt] == '\000') {
+    if (config->port[opt] == '\000') {
 	/* numeric only */
-	bindPort = atoi(pcPort);
+	bindPort = atoi(config->port);
    } else {
 	/* non-numeric only */
 	struct servent *pSE;
-	if ((pSE = getservbyname(pcPort, "tcp")) == (struct servent *)0) {
-	    Error("getservbyname(%s) failed", pcPort);
+	if ((pSE =
+	     getservbyname(config->port, "tcp")) == (struct servent *)0) {
+	    Error("getservbyname(%s) failed", config->port);
 	    Bye(EX_UNAVAILABLE);
 	} else {
 	    bindPort = ntohs((u_short) pSE->s_port);
@ -1837,24 +2104,28 @@ main(argc, argv)
    }
 #endif

-    if (pcUser == (char *)0 || pcUser[0] == '\000') {
-	if (((pcUser = getenv("LOGNAME")) == (char *)0) &&
-	    ((pcUser = getenv("USER")) == (char *)0) &&
+    if (config->username == (char *)0 || config->username[0] == '\000') {
+	if (config->username != (char *)0)
+	    free(config->username);
+	if (((config->username = getenv("LOGNAME")) == (char *)0) &&
+	    ((config->username = getenv("USER")) == (char *)0) &&
 	    ((pwdMe = getpwuid(getuid())) == (struct passwd *)0)) {
 	    Error
 		("$LOGNAME and $USER do not exist and getpwuid fails: %d: %s",
 		 (int)(getuid()), strerror(errno));
 	    Bye(EX_UNAVAILABLE);
 	}
-	if (pcUser == (char *)0) {
+	if (config->username == (char *)0) {
 	    if (pwdMe->pw_name == (char *)0 || pwdMe->pw_name[0] == '\000') {
 		Error("Username for uid %d does not exist",
 		      (int)(getuid()));
 		Bye(EX_UNAVAILABLE);
 	    } else {
-		pcUser = pwdMe->pw_name;
+		config->username = pwdMe->pw_name;
 	    }
 	}
+	if ((config->username = StrDup(config->username)) == (char *)0)
+	    OutOfMem();
    }

    if (execCmd == (STRING *)0)
@ -1866,7 +2137,7 @@ main(argc, argv)

    BuildString((char *)0, acPorts);
    BuildStringChar('@', acPorts);
-    BuildString(pcInMaster, acPorts);
+    BuildString(config->master, acPorts);

 #if HAVE_OPENSSL
    SetupSSL();			/* should only do if we want ssl - provide flag! */
@ -1890,7 +2161,7 @@ main(argc, argv)

    for (;;) {
 	if (gotoConsole == (CONSFILE *)0)
-	    DoCmds(pcInMaster, acPorts->string, cmdi);
+	    DoCmds(config->master, acPorts->string, cmdi);
 	else
 	    Interact(gotoConsole, gotoName);

--- a/console/console.man
+++ b/console/console.man
@ -1,15 +1,17 @@
-.\" $Id: console.man,v 1.48 2004/04/20 01:30:13 bryan Exp $
-.TH CONSOLE 1 "2004/04/20" "conserver-8.1.5" "conserver"
+.\" $Id: console.man,v 1.55 2004/07/14 05:28:42 bryan Exp $
+.TH CONSOLE 1 "2004/07/14" "conserver-8.1.9" "conserver"
 .SH NAME
 console \- console server client program
 .SH SYNOPSIS
 .B console
 .RB [ \-aAfFsS ]
-.RB [ \-7DEUv ]
+.RB [ \-7DEnUv ]
 .RB [ \-c
 .IR cred ]
+.RB [ \-C
+.IR config ]
 .BR [ \-M
-.IR mach ]
+.IR master ]
 .BR [ \-p
 .IR port ]
 .BR [ \-e
@ -20,11 +22,13 @@ console \- console server client program
 .br
 .B console
 .RB [ \-hiIPrRuVwWx ]
-.RB [ \-7DEUv ]
+.RB [ \-7DEnUv ]
 .RB [ \-c
 .IR cred ]
+.RB [ \-C
+.IR config ]
 .RB [ \-M
-.IR mach ]
+.IR master ]
 .RB [ \-p
 .IR port ]
 .RB [ \-d
@ -37,11 +41,13 @@ console \- console server client program
 .br
 .B console
 .RB [ \-qQ ]
-.RB [ \-7DEUv ]
+.RB [ \-7DEnUv ]
 .RB [ \-c
 .IR cred ]
+.RB [ \-C
+.IR config ]
 .RB [ \-M
-.IR mach ]
+.IR master ]
 .RB [ \-p
 .IR port ]
 .SH DESCRIPTION
@ -55,7 +61,8 @@ In the first form above,
 asks the user's password before
 granting interactive access to a console (on a non-trusted system),
 since such a session may provide single-user access.
-Only as much of the console name as is required to
+If the server's autocompletion feature is enabled,
+only as much of the console name as is required to
 identify it uniquely to the server is required.
 .PP
 For non-interactive options,
@ -120,6 +127,10 @@ to users on the primary server.
 Load an SSL certificate and key from the PEM encoded file
 .IR cred .
 .TP
+.BI \-C config
+Use the per-user configuration file
+.IR conf .
+.TP
 .B \-d
 Disconnect the users specified by
 .IR user @ console .
@ -187,19 +198,34 @@ uses $USER if its uid matches the user's real uid,
 or $LOGNAME if its uid matches the user's real uid,
 or else the name associated with the user's real uid.
 .TP
-.BI \-M mach
+.BI \-M master
 The
 .B console
 client program polls
-.I mach
+.I master
 as the primary server,
 rather than the default set at compile time (typically
 .RB `` console '').
 The default
-.I mach
+.I master
 may be changed at compile time using the
 .B --with-master
 option.
+If
+.B --with-uds
+is used to enable Unix domain sockets, however, this option points
+.B console
+to the directory which holds those sockets.
+The default
+.I master
+directory
+.RB (`` /tmp/conserver '')
+may be changed at compile time using the
+.B --with-uds
+option.
+.TP
+.BI \-n
+Do not read the system-wide configuration file.
 .TP
 .BI \-p port
 Set the port to connect to.
@ -211,6 +237,9 @@ may be changed at compile time
 using the
 .B --with-port
 option.
+If the
+.B --with-uds
+option was used, this option is ignored.
 .TP
 .B \-P
 Display the pid of the master daemon process on each server.
@ -395,6 +424,287 @@ The idletimeout configuration option for the console.
 .TP
 .I idlestring
 The idlestring configuration option for the console.
+.SH CONFIGURATION
+.B Console
+reads configuration information from the system-wide configuration file
+.RB ( console.cf ),
+then the per-user configuration file
+.RB ( .consolerc ),
+and then applies command-line arguments.
+Each configuration location can override the previous.
+The same happens when parsing an individual file - the later entries
+always override the earlier entries.
+Because of that, you should put ``global'' defaults first and
+more specific defaults second.
+.PP
+The configuration file is read using the same parser as 
+.BR conserver.cf (5),
+and you should check that manpage for parser details.
+.B Console
+recognizes the following configuration blocks.
+.TP
+\f3config\fP \f2hostname\fP|\f2ipaddr\fP
+.br
+Define a configuration block for the client host named
+.I hostname
+or using the address
+.IR ipaddr .
+If the value of ``*'' is used, the configuration block will be applied to
+all client hosts.
+.RS
+.TP
+\f3escape\fP \f2esc\fP
+.br
+Set the escape sequence (see the
+.B \-e
+command-line flag).
+.TP
+\f3master\fP \f2master\fP
+.br
+Set the default master to
+.I master
+(see the
+.B \-M
+command-line flag).
+.TP
+\f3port\fP \f2port\fP
+.br
+Set the default port to
+.I port
+(see the
+.B \-p
+command-line flag).
+.TP
+\f3sslcredentials\fP \f2filename\fP
+.br
+Set the
+.SM SSL
+credentials file location (see the
+.B \-c
+command-line flag).
+.TP
+\f3sslenabled\fP \f3yes\fP|\f3true\fP|\f3on\fP|\f3no\fP|\f3false\fP|\f3off\fP
+.br
+Set whether or not encryption is attempted when talking to servers (see the
+.B \-E
+command-line flag).
+.TP
+\f3sslrequired\fP \f3yes\fP|\f3true\fP|\f3on\fP|\f3no\fP|\f3false\fP|\f3off\fP
+.br
+Set whether or not encryption is required when talking to servers (see the
+.B \-U
+command-line flag).
+.TP
+\f3striphigh\fP \f3yes\fP|\f3true\fP|\f3on\fP|\f3no\fP|\f3false\fP|\f3off\fP
+.br
+Set whether or not to strip the high bit off all data received
+(see the
+.B \-7
+command-line flag).
+.TP
+\f3username\fP \f2user\fP
+.br
+Set the username passed to the server to
+.I user
+(see the
+.B \-l
+command-line flag).
+.RE
+.TP
+\f3terminal\fP \f2type\fP
+.br
+Define a configuration block when using a terminal of type
+.IR type .
+If the value of ``*'' is used, the configuration block will be applied to
+all terminal types.
+.RS
+.TP
+\f3attach\fP \f2string\fP|\f3""\fP
+.br
+Set a
+.I string
+to print when successfully attached to a console.
+Character substitions will be performed based on the
+.B attachsubst
+value and occur
+.I before
+interpretation of the special characters below.
+If the null string (``\f3""\fP'') is used, no string will be printed.
+.I string
+is a simple character string with the exception of `\e'
+and `^':
+.RS
+.RS
+.sp
+.PD 0
+.TP 6
+.B \ea
+alert
+.TP
+.B \eb
+backspace
+.TP
+.B \ef
+form-feed
+.TP
+.B \en
+newline
+.TP
+.B \er
+carriage-return
+.TP
+.B \et
+tab
+.TP
+.B \ev
+vertical-tab
+.TP
+.B \e\e
+backslash
+.TP
+.B \e^
+circumflex
+.TP
+.BI \e ooo
+octal representation of a character (where
+.I ooo
+is one to three octal digits)
+.TP
+.BI \e c
+character
+.I c
+.TP
+.B ^?
+delete
+.TP
+.BI ^ c
+control character
+.RI ( c
+is ``and''ed with 0x1f)
+.PD
+.RE
+.RE
+.IP
+An interesting use of
+.B attach
+and
+.B attachsubst
+would be:
+.RS
+.IP
+.ft CR
+.nf
+terminal xterm {
+    attach "^[]0;conserver: U@C^G";
+    attachsubst U=us,C=cs;
+}
+.fi
+.ft
+.RE
+.TP
+\f3attachsubst\fP \f2c\fP\f3=\fP\f2t\fP[\f2n\fP]\f2f\fP[\f3,\fP...]|\f3""\fP
+.br
+Perform character substitutions on the
+.B attach
+value.
+A series of replacements can be defined by specifying a
+comma-separated list of
+\f2c\fP\f3=\fP\f2t\fP[\f2n\fP]\f2f\fP
+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 u
+username
+.TP
+.B c
+console name
+.sp
+.PP
+Numeric Replacement
+.TP
+none available (yet)
+.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 (``\f3""\fP'') is used, no replacements will be done.
+.TP
+\f3detach\fP \f2string\fP|\f3""\fP
+.br
+Set a
+.I string
+to print once detached from a console.
+Character substitions will be performed based on the
+.B detachsubst
+value.
+See the
+.B attach
+option for an explanation of
+.IR string .
+If the null string (``\f3""\fP'') is used, no string will be printed.
+.TP
+\f3detachsubst\fP \f2c\fP\f3=\fP\f2t\fP[\f2n\fP]\f2f\fP[\f3,\fP...]|\f3""\fP
+.br
+Perform character substitutions on the
+.B detach
+value.
+See the
+.B attachsubst
+option for an explanation of the format string.
+.RE
+.PP
+A simple configuration to set a new default escape sequence and override
+the master location would be:
+.IP
+.ft CR
+.nf
+# override options for all hosts
+config * {
+    master localhost;
+    escape ^Ee;
+}
+# set things more specific to host1
+# note: if the entries were reversed, host1
+# would also use localhost.
+config host1 {
+    master console1;
+}
+.fi
+.ft
 .SH "ESCAPE SEQUENCES"
 The connection can be controlled by a two-character escape sequence, followed
 by a command.
@ -501,7 +811,7 @@ specify three octal digits)
 If any other character is hit after the escape sequence, all three characters
 will be discarded.
 Note that a line break or a down command
-can only be sent from a full two-way attachment.
+can only be sent from a read-write connection.
 To send the escape sequence through the connection one must redefine
 the outer escape sequence, or use
 .BI ^Ec\e ooo
@ -512,16 +822,16 @@ In the
 .B \-u
 output, the login ``<none>'' indicates no one is
 viewing that console, and the login ``<spies>'' indicates that
-no one has a full two-way attachment.
+no one has a read-write connection (only read-only).
 .PP
 When running a local command via
 .RB `` ^Ec| '',
 you can type 
-.B ^C
+.RB ` ^C '
 to send the command a SIGHUP,
-.B ^\e
+.RB ` ^\e '
 to send the command a SIGKILL, and
-.B o
+.RB ` o '
 to toggle the display of the console data.
 .SH EXAMPLES
 .TP 15
@ -574,6 +884,22 @@ or number of days is displayed.
 console \-e "^[1" lv426
 Requests a connection to the host ``lv426'' with the escape characters
 set to ``escape one''.
+.SH FILES
+.PP
+The following default file locations may be overridden
+at compile time or by the command-line options described above.
+Run
+.B console \-V
+to see the defaults set at compile time.
+.PP
+.PD 0
+.TP 25
+.B /etc/console.cf
+system-wide configuration file
+.TP
+.B \s-1$HOME\s0/.consolerc
+per-user configuration file
+.PD
 .SH BUGS
 It is possible to create a loop of console connections, with ugly results.
 Never run
--- a/console/readconf.c
+++ b/console/readconf.c
@ -0,0 +1,720 @@
+/*
+ *  $Id: readconf.c,v 5.2 2004/05/25 00:38:15 bryan Exp $
+ *
+ *  Copyright conserver.com, 2000
+ *
+ *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
+ */
+
+#include <compat.h>
+
+#include <cutil.h>
+#include <readconf.h>
+
+CONFIG *parserConfigTemp = (CONFIG *)0;
+CONFIG *parserConfigDefault = (CONFIG *)0;
+CONFIG *pConfig = (CONFIG *)0;
+TERM *parserTermTemp = (TERM *)0;
+TERM *parserTermDefault = (TERM *)0;
+TERM *pTerm = (TERM *)0;
+
+void
+#if PROTOTYPES
+DestroyConfig(CONFIG *c)
+#else
+DestroyConfig(c)
+    CONFIG *c;
+#endif
+{
+    if (c == (CONFIG *)0)
+	return;
+    if (c->username != (char *)0)
+	free(c->username);
+    if (c->master != (char *)0)
+	free(c->master);
+    if (c->port != (char *)0)
+	free(c->port);
+    if (c->escape != (char *)0)
+	free(c->escape);
+#if HAVE_OPENSSL
+    if (c->sslcredentials != (char *)0)
+	free(c->sslcredentials);
+#endif
+    free(c);
+}
+
+void
+#if PROTOTYPES
+ApplyConfigDefault(CONFIG *c)
+#else
+ApplyConfigDefault(c)
+    CONFIG *c;
+#endif
+{
+    if (parserConfigDefault == (CONFIG *)0)
+	return;
+
+    if (parserConfigDefault->username != (char *)0) {
+	if (c->username != (char *)0)
+	    free(c->username);
+	if ((c->username =
+	     StrDup(parserConfigDefault->username)) == (char *)0)
+	    OutOfMem();
+    }
+    if (parserConfigDefault->master != (char *)0) {
+	if (c->master != (char *)0)
+	    free(c->master);
+	if ((c->master = StrDup(parserConfigDefault->master)) == (char *)0)
+	    OutOfMem();
+    }
+    if (parserConfigDefault->port != (char *)0) {
+	if (c->port != (char *)0)
+	    free(c->port);
+	if ((c->port = StrDup(parserConfigDefault->port)) == (char *)0)
+	    OutOfMem();
+    }
+    if (parserConfigDefault->escape != (char *)0) {
+	if (c->escape != (char *)0)
+	    free(c->escape);
+	if ((c->escape = StrDup(parserConfigDefault->escape)) == (char *)0)
+	    OutOfMem();
+    }
+    if (parserConfigDefault->striphigh != FLAGUNKNOWN)
+	c->striphigh = parserConfigDefault->striphigh;
+#if HAVE_OPENSSL
+    if (parserConfigDefault->sslcredentials != (char *)0) {
+	if (c->sslcredentials != (char *)0)
+	    free(c->sslcredentials);
+	if ((c->sslcredentials =
+	     StrDup(parserConfigDefault->sslcredentials)) == (char *)0)
+	    OutOfMem();
+    }
+    if (parserConfigDefault->sslrequired != FLAGUNKNOWN)
+	c->sslrequired = parserConfigDefault->sslrequired;
+    if (parserConfigDefault->sslenabled != FLAGUNKNOWN)
+	c->sslenabled = parserConfigDefault->sslenabled;
+#endif
+}
+
+void
+#if PROTOTYPES
+ConfigBegin(char *id)
+#else
+ConfigBegin(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "ConfigBegin(%s) [%s:%d]", id, file, line));
+    if (id == (char *)0 || id[0] == '\000') {
+	Error("empty config name [%s:%d]", file, line);
+	return;
+    }
+    if (parserConfigTemp != (CONFIG *)0)
+	DestroyConfig(parserConfigTemp);
+    if ((parserConfigTemp = (CONFIG *)calloc(1, sizeof(CONFIG)))
+	== (CONFIG *)0)
+	OutOfMem();
+    ApplyConfigDefault(parserConfigTemp);
+    parserConfigTemp->name = AllocString();
+    BuildString(id, parserConfigTemp->name);
+}
+
+void
+#if PROTOTYPES
+ConfigEnd(void)
+#else
+ConfigEnd()
+#endif
+{
+    CONDDEBUG((1, "ConfigEnd() [%s:%d]", file, line));
+
+    if (parserConfigTemp == (CONFIG *)0)
+	return;
+
+    if (parserConfigTemp->name->used > 1) {
+	if ((parserConfigTemp->name->string[0] == '*' &&
+	     parserConfigTemp->name->string[1] == '\000') ||
+	    IsMe(parserConfigTemp->name->string)) {
+	    DestroyConfig(parserConfigDefault);
+	    parserConfigDefault = parserConfigTemp;
+	    parserConfigTemp = (CONFIG *)0;
+	}
+    }
+
+    DestroyConfig(parserConfigTemp);
+    parserConfigTemp = (CONFIG *)0;
+}
+
+void
+#if PROTOTYPES
+ConfigAbort(void)
+#else
+ConfigAbort()
+#endif
+{
+    CONDDEBUG((1, "ConfigAbort() [%s:%d]", file, line));
+    if (parserConfigTemp == (CONFIG *)0)
+	return;
+
+    DestroyConfig(parserConfigTemp);
+    parserConfigTemp = (CONFIG *)0;
+}
+
+void
+#if PROTOTYPES
+ConfigDestroy(void)
+#else
+ConfigDestroy()
+#endif
+{
+    CONDDEBUG((1, "ConfigDestroy() [%s:%d]", file, line));
+
+    if (parserConfigTemp != (CONFIG *)0) {
+	DestroyConfig(parserConfigTemp);
+	parserConfigTemp = (CONFIG *)0;
+    }
+
+    if (parserConfigDefault != (CONFIG *)0) {
+	DestroyConfig(pConfig);
+	pConfig = parserConfigDefault;
+	parserConfigDefault = (CONFIG *)0;
+    }
+}
+
+void
+#if PROTOTYPES
+DestroyTerminal(TERM *t)
+#else
+DestroyTerminal(t)
+    TERM *t;
+#endif
+{
+    if (t == (TERM *)0)
+	return;
+    if (t->attach != (char *)0)
+	free(t->attach);
+    if (t->attachsubst != (char *)0)
+	free(t->attachsubst);
+    if (t->detach != (char *)0)
+	free(t->detach);
+    if (t->detachsubst != (char *)0)
+	free(t->detachsubst);
+    free(t);
+}
+
+void
+#if PROTOTYPES
+ApplyTermDefault(TERM *t)
+#else
+ApplyTermDefault(t)
+    TERM *t;
+#endif
+{
+    if (parserTermDefault == (TERM *)0)
+	return;
+
+    if (parserTermDefault->attach != (char *)0) {
+	if (t->attach != (char *)0)
+	    free(t->attach);
+	if ((t->attach = StrDup(parserTermDefault->attach)) == (char *)0)
+	    OutOfMem();
+    }
+    if (parserTermDefault->attachsubst != (char *)0) {
+	if (t->attachsubst != (char *)0)
+	    free(t->attachsubst);
+	if ((t->attachsubst =
+	     StrDup(parserTermDefault->attachsubst)) == (char *)0)
+	    OutOfMem();
+    }
+    if (parserTermDefault->detach != (char *)0) {
+	if (t->detach != (char *)0)
+	    free(t->detach);
+	if ((t->detach = StrDup(parserTermDefault->detach)) == (char *)0)
+	    OutOfMem();
+    }
+    if (parserTermDefault->detachsubst != (char *)0) {
+	if (t->detachsubst != (char *)0)
+	    free(t->detachsubst);
+	if ((t->detachsubst =
+	     StrDup(parserTermDefault->detachsubst)) == (char *)0)
+	    OutOfMem();
+    }
+}
+
+void
+#if PROTOTYPES
+TerminalBegin(char *id)
+#else
+TerminalBegin(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "TerminalBegin(%s) [%s:%d]", id, file, line));
+    if (id == (char *)0 || id[0] == '\000') {
+	Error("empty terminal name [%s:%d]", file, line);
+	return;
+    }
+    if (parserTermTemp != (TERM *)0)
+	DestroyTerminal(parserTermTemp);
+    if ((parserTermTemp = (TERM *)calloc(1, sizeof(TERM)))
+	== (TERM *)0)
+	OutOfMem();
+    ApplyTermDefault(parserTermTemp);
+    parserTermTemp->name = AllocString();
+    BuildString(id, parserTermTemp->name);
+}
+
+void
+#if PROTOTYPES
+TerminalEnd(void)
+#else
+TerminalEnd()
+#endif
+{
+    static char *term = (char *)0;
+
+    CONDDEBUG((1, "TerminalEnd() [%s:%d]", file, line));
+
+    if (parserTermTemp == (TERM *)0)
+	return;
+
+    if (term == (char *)0) {
+	if ((term = getenv("TERM")) == (char *)0) {
+	    term = "";
+	}
+    }
+
+    if (parserTermTemp->name->used > 1) {
+	if ((parserTermTemp->name->string[0] == '*' &&
+	     parserTermTemp->name->string[1] == '\000') ||
+	    strcmp(parserTermTemp->name->string, term) == 0) {
+	    DestroyTerminal(parserTermDefault);
+	    parserTermDefault = parserTermTemp;
+	    parserTermTemp = (TERM *)0;
+	}
+    }
+
+    DestroyTerminal(parserTermTemp);
+    parserTermTemp = (TERM *)0;
+}
+
+void
+#if PROTOTYPES
+TerminalAbort(void)
+#else
+TerminalAbort()
+#endif
+{
+    CONDDEBUG((1, "TerminalAbort() [%s:%d]", file, line));
+    if (parserTermTemp == (TERM *)0)
+	return;
+
+    DestroyTerminal(parserTermTemp);
+    parserTermTemp = (TERM *)0;
+}
+
+void
+#if PROTOTYPES
+TerminalDestroy(void)
+#else
+TerminalDestroy()
+#endif
+{
+    CONDDEBUG((1, "TerminalDestroy() [%s:%d]", file, line));
+
+    if (parserTermTemp != (TERM *)0) {
+	DestroyTerminal(parserTermTemp);
+	parserTermTemp = (TERM *)0;
+    }
+
+    if (parserTermDefault != (TERM *)0) {
+	DestroyTerminal(pTerm);
+	pTerm = parserTermDefault;
+	parserTermDefault = (TERM *)0;
+    }
+}
+
+void
+#if PROTOTYPES
+ProcessYesNo(char *id, FLAG *flag)
+#else
+ProcessYesNo(id, flag)
+    char *id;
+    FLAG *flag;
+#endif
+{
+    if (id == (char *)0 || id[0] == '\000')
+	*flag = FLAGFALSE;
+    else if (strcasecmp("yes", id) == 0 || strcasecmp("true", id) == 0 ||
+	     strcasecmp("on", id) == 0)
+	*flag = FLAGTRUE;
+    else if (strcasecmp("no", id) == 0 || strcasecmp("false", id) == 0 ||
+	     strcasecmp("off", id) == 0)
+	*flag = FLAGFALSE;
+}
+
+void
+#if PROTOTYPES
+ConfigItemEscape(char *id)
+#else
+ConfigItemEscape(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "ConfigItemEscape(%s) [%s:%d]", id, file, line));
+
+    if (parserConfigTemp->escape != (char *)0)
+	free(parserConfigTemp->escape);
+
+    if ((id == (char *)0) || (*id == '\000')) {
+	parserConfigTemp->escape = (char *)0;
+	return;
+    }
+    if ((parserConfigTemp->escape = StrDup(id)) == (char *)0)
+	OutOfMem();
+}
+
+void
+#if PROTOTYPES
+ConfigItemMaster(char *id)
+#else
+ConfigItemMaster(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "ConfigItemMaster(%s) [%s:%d]", id, file, line));
+
+    if (parserConfigTemp->master != (char *)0)
+	free(parserConfigTemp->master);
+
+    if ((id == (char *)0) || (*id == '\000')) {
+	parserConfigTemp->master = (char *)0;
+	return;
+    }
+    if ((parserConfigTemp->master = StrDup(id)) == (char *)0)
+	OutOfMem();
+}
+
+void
+#if PROTOTYPES
+ConfigItemPort(char *id)
+#else
+ConfigItemPort(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "ConfigItemPort(%s) [%s:%d]", id, file, line));
+
+    if (parserConfigTemp->port != (char *)0)
+	free(parserConfigTemp->port);
+
+    if ((id == (char *)0) || (*id == '\000')) {
+	parserConfigTemp->port = (char *)0;
+	return;
+    }
+    if ((parserConfigTemp->port = StrDup(id)) == (char *)0)
+	OutOfMem();
+}
+
+void
+#if PROTOTYPES
+ConfigItemSslcredentials(char *id)
+#else
+ConfigItemSslcredentials(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "ConfigItemSslcredentials(%s) [%s:%d]", id, file, line));
+#if HAVE_OPENSSL
+    if (parserConfigTemp->sslcredentials != (char *)0)
+	free(parserConfigTemp->sslcredentials);
+
+    if ((id == (char *)0) || (*id == '\000')) {
+	parserConfigTemp->sslcredentials = (char *)0;
+	return;
+    }
+    if ((parserConfigTemp->sslcredentials = StrDup(id)) == (char *)0)
+	OutOfMem();
+#else
+    Error
+	("sslcredentials ignored - encryption not compiled into code [%s:%d]",
+	 file, line);
+#endif
+}
+
+void
+#if PROTOTYPES
+ConfigItemSslrequired(char *id)
+#else
+ConfigItemSslrequired(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "ConfigItemSslrequired(%s) [%s:%d]", id, file, line));
+#if HAVE_OPENSSL
+    ProcessYesNo(id, &(parserConfigTemp->sslrequired));
+#else
+    Error
+	("sslrequired ignored - encryption not compiled into code [%s:%d]",
+	 file, line);
+#endif
+}
+
+void
+#if PROTOTYPES
+ConfigItemSslenabled(char *id)
+#else
+ConfigItemSslenabled(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "ConfigItemSslenabled(%s) [%s:%d]", id, file, line));
+#if HAVE_OPENSSL
+    ProcessYesNo(id, &(parserConfigTemp->sslenabled));
+#else
+    Error("sslenabled ignored - encryption not compiled into code [%s:%d]",
+	  file, line);
+#endif
+}
+
+void
+#if PROTOTYPES
+ConfigItemStriphigh(char *id)
+#else
+ConfigItemStriphigh(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "ConfigItemStriphigh(%s) [%s:%d]", id, file, line));
+    ProcessYesNo(id, &(parserConfigTemp->striphigh));
+}
+
+void
+#if PROTOTYPES
+ConfigItemUsername(char *id)
+#else
+ConfigItemUsername(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "ConfigItemUsername(%s) [%s:%d]", id, file, line));
+
+    if (parserConfigTemp->username != (char *)0)
+	free(parserConfigTemp->username);
+
+    if ((id == (char *)0) || (*id == '\000')) {
+	parserConfigTemp->username = (char *)0;
+	return;
+    }
+    if ((parserConfigTemp->username = StrDup(id)) == (char *)0)
+	OutOfMem();
+}
+
+SUBST *substData = (SUBST *) 0;
+
+int
+#if PROTOTYPES
+SubstCallback(char c, char **s, int *i)
+#else
+SubstCallback(c, s, i)
+    char c;
+    char **s;
+    int *i;
+#endif
+{
+    int retval = 0;
+
+    if (substData == (SUBST *) 0) {
+	if ((substData =
+	     (SUBST *) calloc(1, sizeof(SUBST))) == (SUBST *) 0)
+	    OutOfMem();
+	substData->callback = &SubstCallback;
+	substData->tokens['u'] = ISSTRING;
+	substData->tokens['c'] = ISSTRING;
+    }
+
+    if (s != (char **)0) {
+	CONFIG *pc;
+	if (substData->data == (void *)0)
+	    return 0;
+
+	pc = (CONFIG *)(substData->data);
+	if (c == 'u') {
+	    (*s) = pc->username;
+	    retval = 1;
+	} else if (c == 'c') {
+	    (*s) = pc->console;
+	    retval = 1;
+	}
+    }
+
+    return retval;
+}
+
+void
+#if PROTOTYPES
+TerminalItemAttach(char *id)
+#else
+TerminalItemAttach(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "TerminalItemAttach(%s) [%s:%d]", id, file, line));
+
+    if (parserTermTemp->attach != (char *)0)
+	free(parserTermTemp->attach);
+
+    if ((id == (char *)0) || (*id == '\000')) {
+	parserTermTemp->attach = (char *)0;
+	return;
+    }
+    if ((parserTermTemp->attach = StrDup(id)) == (char *)0)
+	OutOfMem();
+}
+
+void
+#if PROTOTYPES
+TerminalItemAttachsubst(char *id)
+#else
+TerminalItemAttachsubst(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "TerminalItemAttachsubst(%s) [%s:%d]", id, file, line));
+    ProcessSubst(substData, (char **)0, &(parserTermTemp->attachsubst),
+		 "attachsubst", id);
+}
+
+void
+#if PROTOTYPES
+TerminalItemDetach(char *id)
+#else
+TerminalItemDetach(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "TerminalItemDetach(%s) [%s:%d]", id, file, line));
+
+    if (parserTermTemp->detach != (char *)0)
+	free(parserTermTemp->detach);
+
+    if ((id == (char *)0) || (*id == '\000')) {
+	parserTermTemp->detach = (char *)0;
+	return;
+    }
+    if ((parserTermTemp->detach = StrDup(id)) == (char *)0)
+	OutOfMem();
+}
+
+void
+#if PROTOTYPES
+TerminalItemDetachsubst(char *id)
+#else
+TerminalItemDetachsubst(id)
+    char *id;
+#endif
+{
+    CONDDEBUG((1, "TerminalItemDetachsubst(%s) [%s:%d]", id, file, line));
+    ProcessSubst(substData, (char **)0, &(parserTermTemp->detachsubst),
+		 "detachsubst", id);
+}
+
+ITEM keyConfig[] = {
+    {"escape", ConfigItemEscape},
+    {"master", ConfigItemMaster},
+    {"port", ConfigItemPort},
+    {"sslcredentials", ConfigItemSslcredentials},
+    {"sslrequired", ConfigItemSslrequired},
+    {"sslenabled", ConfigItemSslenabled},
+    {"striphigh", ConfigItemStriphigh},
+    {"username", ConfigItemUsername},
+    {(char *)0, (void *)0}
+};
+
+ITEM keyTerminal[] = {
+    {"attach", TerminalItemAttach},
+    {"attachsubst", TerminalItemAttachsubst},
+    {"detach", TerminalItemDetach},
+    {"detachsubst", TerminalItemDetachsubst},
+    {(char *)0, (void *)0}
+};
+
+SECTION sections[] = {
+    {"config", ConfigBegin, ConfigEnd, ConfigAbort, ConfigDestroy,
+     keyConfig},
+    {"terminal", TerminalBegin, TerminalEnd, TerminalAbort,
+     TerminalDestroy, keyTerminal},
+    {(char *)0, (void *)0, (void *)0, (void *)0, (void *)0}
+};
+
+void
+#if PROTOTYPES
+ReadConf(char *filename, FLAG verbose)
+#else
+ReadConf(filename, verbose)
+    char *filename;
+    FLAG verbose;
+#endif
+{
+    FILE *fp;
+
+    if ((FILE *)0 == (fp = fopen(filename, "r"))) {
+	if (verbose == FLAGTRUE)
+	    Error("could not open `%s'", filename);
+	return;
+    }
+
+    /* initialize the substition bits */
+    SubstCallback('\000', (char **)0, (int *)0);
+
+    parserConfigDefault = pConfig;
+    pConfig = (CONFIG *)0;
+
+    parserTermDefault = pTerm;
+    pTerm = (TERM *)0;
+
+    ParseFile(filename, fp, 0);
+
+    /* shouldn't really happen, but in case i screw up the stuff
+     * ParseFile calls...
+     */
+    if (pConfig == (CONFIG *)0) {
+	if ((pConfig = (CONFIG *)calloc(1, sizeof(CONFIG)))
+	    == (CONFIG *)0)
+	    OutOfMem();
+    }
+
+    if (pTerm == (TERM *)0) {
+	if ((pTerm = (TERM *)calloc(1, sizeof(TERM)))
+	    == (TERM *)0)
+	    OutOfMem();
+    }
+
+    if (fDebug) {
+#define EMPTYSTR(x) x == (char *)0 ? "(null)" : x
+#define FLAGSTR(x) x == FLAGTRUE ? "true" : (x == FLAGFALSE ? "false" : "unset")
+	CONDDEBUG((1, "pConfig->username = %s",
+		   EMPTYSTR(pConfig->username)));
+	CONDDEBUG((1, "pConfig->master = %s", EMPTYSTR(pConfig->master)));
+	CONDDEBUG((1, "pConfig->port = %s", EMPTYSTR(pConfig->port)));
+	CONDDEBUG((1, "pConfig->escape = %s", EMPTYSTR(pConfig->escape)));
+	CONDDEBUG((1, "pConfig->striphigh = %s",
+		   FLAGSTR(pConfig->striphigh)));
+#if HAVE_OPENSSL
+	CONDDEBUG((1, "pConfig->sslcredentials = %s",
+		   EMPTYSTR(pConfig->sslcredentials)));
+	CONDDEBUG((1, "pConfig->sslrequired = %s",
+		   FLAGSTR(pConfig->sslrequired)));
+	CONDDEBUG((1, "pConfig->sslenabled = %s",
+		   FLAGSTR(pConfig->sslenabled)));
+#endif
+	CONDDEBUG((1, "pTerm->attach = %s", EMPTYSTR(pTerm->attach)));
+	CONDDEBUG((1, "pTerm->attachsubst = %s",
+		   EMPTYSTR(pTerm->attachsubst)));
+	CONDDEBUG((1, "pTerm->detach = %s", EMPTYSTR(pTerm->detach)));
+	CONDDEBUG((1, "pTerm->detachsubst = %s",
+		   EMPTYSTR(pTerm->detachsubst)));
+    }
+
+    fclose(fp);
+}
--- a/console/readconf.h
+++ b/console/readconf.h
@ -0,0 +1,38 @@
+/*
+ *  $Id: readconf.h,v 5.3 2004/05/25 23:03:25 bryan Exp $
+ *
+ *  Copyright conserver.com, 2000
+ *
+ *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
+ */
+
+typedef struct config {
+    STRING *name;
+    char *console;
+    char *username;
+    char *master;
+    char *port;
+    char *escape;
+    FLAG striphigh;
+#if HAVE_OPENSSL
+    char *sslcredentials;
+    FLAG sslrequired;
+    FLAG sslenabled;
+#endif
+} CONFIG;
+
+typedef struct term {
+    STRING *name;
+    char *attach;
+    char *attachsubst;
+    char *detach;
+    char *detachsubst;
+} TERM;
+
+extern CONFIG *pConfig;
+extern TERM *pTerm;
+extern SUBST *substData;
+
+extern void ReadConf PARAMS((char *, FLAG));
+extern void DestroyConfig PARAMS((CONFIG *));
+extern void DestroyTerminal PARAMS((TERM *));
--- a/contrib/redhat-rpm/conserver.spec
+++ b/contrib/redhat-rpm/conserver.spec
@ -4,7 +4,7 @@
 #

 %define pkg  conserver
-%define ver  8.1.5
+%define ver  8.1.9

 # define the name of the machine on which the main conserver
 # daemon will be running if you don't want to use the default
--- a/contrib/solaris-package/pkginfo
+++ b/contrib/solaris-package/pkginfo
@ -1,7 +1,7 @@
 PKG="conserver"
 NAME="Console server and client"
 CATEGORY="system"
-VERSION="8.1.5"
+VERSION="8.1.9"
 DESC="Console server and client"
 CLASSES=none
 ARCH=sparc
--- a/test/dotest
+++ b/test/dotest
@ -14,6 +14,7 @@ cleanup()
 	[ "$i" != "conserver.log" ] && [ -f "$i" ] && rm -f "$i";
    done
    [ "$exitval" = 0 ] && rm -f conserver.log
+    [ -d 127.0.0.1 ] && sleep 1 && rm -rf 127.0.0.1
    exit $exitval
 }

@ -25,7 +26,7 @@ dotest()
 	eval "$2" > test.out 2>&1
    else
 	echo "$1" | \
-	    ../console/console -M 127.0.0.1 -p 7777 shell > test.out 2>&1
+	    ../console/console -n -C /dev/null -M 127.0.0.1 -p 7777 shell > test.out 2>&1
    fi
    if [ "$record" ]; then
 	echo "recorded"
@ -72,7 +73,7 @@ sleep 3

 [ ! -d results ] && mkdir results

-dotest EVAL "../console/console -M 127.0.0.1 -p 7777 -u | sed -e 's/[0-9][0-9]*//g' -e 's/[ 	][ 	]*/ /g'"
+dotest EVAL "../console/console -n -C /dev/null -M 127.0.0.1 -p 7777 -u | sed -e 's/[0-9][0-9]*//g' -e 's/[ 	][ 	]*/ /g'"
 dotest 'c?c.'
 dotest 'cl?c.'
 dotest 'cdc.'
@ -84,14 +85,14 @@ cp test2.cf c.cf
 kill -1 $pid
 sleep 3

-dotest EVAL "../console/console -M 127.0.0.1 -p 7777 -u | sed -e 's/[0-9][0-9]*//g' -e 's/[ 	][ 	]*/ /g'"
+dotest EVAL "../console/console -n -C /dev/null -M 127.0.0.1 -p 7777 -u | sed -e 's/[0-9][0-9]*//g' -e 's/[ 	][ 	]*/ /g'"
 dotest 'c?c.'
 dotest 'cl?c.'
 dotest 'cdc.'
 dotest 'coc.'

-dotest EVAL "echo 'tu.' | ../console/console -M 127.0.0.1 -p 7777 -e 'tu' shell"
-dotest EVAL "../console/console -M 127.0.0.1 -p 7777 -R | sed -e 's/ [^ ]*$//'"
-dotest EVAL "../console/console -M 127.0.0.1 -p 7777 -x | sed -e 's/ on [^ ]* */ on /'"
+dotest EVAL "echo 'tu.' | ../console/console -n -C /dev/null -M 127.0.0.1 -p 7777 -e 'tu' shell"
+dotest EVAL "../console/console -n -C /dev/null -M 127.0.0.1 -p 7777 -R | sed -e 's/ [^ ]*$//'"
+dotest EVAL "../console/console -n -C /dev/null -M 127.0.0.1 -p 7777 -x | sed -e 's/ on [^ ]* */ on /'"

 cleanup
Author	SHA1	Message	Date
Bryan Stansell	faad858599	Imported from conserver-8.1.9.tar.gz	2004-07-14 16:21:13 -07:00
Bryan Stansell	27475bdd30	Imported from conserver-8.1.8.tar.gz	2004-06-09 15:28:27 -07:00
Bryan Stansell	c0f8de9c24	Imported from conserver-8.1.7.tar.gz	2004-05-28 11:03:33 -07:00
Bryan Stansell	cf461c7ce8	Imported from conserver-8.1.6.tar.gz	2004-05-25 17:41:29 -07:00