Imported from conserver-8.0.7.tar.gz

Imported from conserver-8.0.6.tar.gz
Imported from conserver-8.0.5.tar.gz
2025-06-24 17:55:08 +00:00 · 2003-11-20 06:49:09 -08:00 · 2003-11-16 11:33:39 -08:00 · 2003-10-31 10:15:09 -08:00
57 changed files with 2584 additions and 1147 deletions
--- a/53
+++ b/53
@ -1,6 +1,57 @@
 				CHANGES
 				=======

+version 8.0.7 (Nov 20, 2003):
+	- renamed util.[ch] to cutil.[ch] to prevent name conflict with
+	  system util.h, reordered some #includes, and fixed a configure
+	  test for sys/proc.h to build on OpenBSD 3.4 (and probably
+	  others) - reported by Kurt Raschke <kurt@raschke.net>
+	- fixed missing semi-colon for cygwin build - reported by
+	  Raymond Richmond <raymond.richmond@ualberta.ca>
+
+version 8.0.6 (Nov 16, 2003):
+	- code was missing regarding the 'setproctitle' option - patch
+	  by Dmitry Morozovsky <marck@rinet.ru>
+	- fixed the order of access list checking when
+	  --with-trustrevdns is used
+	- fixed various spelling errors - patches by Matt Selsky
+	  <selsky@columbia.edu>
+	- added console 'idletimeout' and 'idlestring' options to
+	  trigger the sending of 'idlestring' after a lack of activity
+	  for 'idletimeout' seconds - suggested by Ian Potts
+	  <ian.potts@db.com>
+	- added console 'portbase' and 'portinc' options to allow
+	  specifying a formula for referencing ports - inspired by Todd
+	  Stansell <todd@stansell.org>
+	- fixed problem where console 'port' option didn't take port
+	  names (manpage said it did)
+	- added server -U option and configuration option 'unifiedlog'
+	  to allow a copy of all console activity to go to a single file
+	- removed all sprintf() calls
+	- added 'devicesubst' and 'execsubst' console options for doing
+	  replacements with calculated port numbers on the 'device' and
+	  'exec' values
+	- NULL characters in console data caused data loss because of
+	  strlen() usage - reported by Toby Gerhart <toby.gerhart@eds.com>
+	- fixed a couple errors in contrib/redhat-rpm/conserver.spec -
+	  reported by Martin Evans <m.d.t.evans@qmul.ac.uk>
+	- added capability to use '!' in user access lists to prevent a
+	  user from having access - suggested by Matt Selsky
+	  <selsky@columbia.edu>
+
+version 8.0.5 (Oct 31, 2003):
+	- added 'loghostnames' config option (default is on) to log
+	  client hostnames instead of ip addresses (like pre-8.0.0) -
+	  suggested by Han Pilmeyer <han@zk3.dec.com>
+	- fixed bug where 'daemonmode' config file option wasn't being
+	  used
+	- fixed potential logfile (-L) opening problem processing SIGHUP
+	- fixed various potential conserver.cf issues with 'config'
+	  block values processing SIGHUP
+	- added 'setproctitle' config option (default is off) to enable
+	  changing the process title to contain runtime information -
+	  patch by Dmitry Morozovsky <marck@rinet.ru>
+
 version 8.0.4 (Oct 10, 2003):
 	- fixed client rejection bug that can nearly never happen -
 	  reported by Han Pilmeyer <han@zk3.dec.com>
@ -573,5 +624,5 @@ before version 6.05:
 	  and enhancements of various types were applied.

 #
-#  $Id: CHANGES,v 1.118 2003-10-10 09:02:38-07 bryan Exp $
+#  $Id: CHANGES,v 1.135 2003/11/20 14:48:29 bryan Exp $
 #
--- a/2
+++ b/2
@ -186,5 +186,5 @@ directed to faq@conserver.com.  The FAQ answers the following questions:
      through the same problem?

 #
-#  $Id: FAQ,v 1.9 2003-08-23 12:27:10-07 bryan Exp $
+#  $Id: FAQ,v 1.9 2003/08/23 19:27:10 bryan Exp $
 #
--- a/2
+++ b/2
@ -255,5 +255,5 @@ Other Information And Gotchas


 #
-#  $Id: INSTALL,v 1.34 2003-10-03 10:52:31-07 bryan Exp $
+#  $Id: INSTALL,v 1.34 2003/10/03 17:52:31 bryan Exp $
 #
--- a/2
+++ b/2
@ -55,5 +55,5 @@ Contributions
    http://www.columbia.edu/acis/sy/unixdev/zinc

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

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

- Singular logging so that swatch/logsurfer can watch for errors across
-  the board - unloved output comes close
-
 - Telnet protocol should be improved
    - Not even RFC 854 compliant
    - Option negotiation ignored - should we negotiate anything?
@ -80,6 +77,15 @@ Bryan Stansell
 - show attach/detach events to/of spy console clients : Greg A. Woods
  <woods@planix.com>

+- redefine client escape sequence in conserver.cf : Toby Gerhart
+  <toby.gerhart@eds.com>
+
+- send a string when connected to a console, so you can set the
+  xterm title, for example : Richard Threadgill <richardt@tellme.com>
+
+- allows for very long replays (hundres of lines) : John Stoffel
+  <stoffel@lucent.com>
+
 #
-#  $Id: TODO,v 1.37 2003-09-28 12:23:23-07 bryan Exp $
+#  $Id: TODO,v 1.42 2003/11/15 17:08:15 bryan Exp $
 #
--- a/autologin/INSTALL.old
+++ b/autologin/INSTALL.old
@ -1,4 +1,4 @@
-# $Id: INSTALL,v 1.3 94/07/11 12:38:19 ksb Exp $
+# $Id: INSTALL.old,v 1.1 2003/11/04 02:36:24 bryan Exp $

 To install this program you need root access and access to the physical
 console of the machine (either through the console server or via the physical
--- a/autologin/README
+++ b/autologin/README
@ -17,5 +17,5 @@ Good luck.
 Bryan Stansell

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

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

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

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

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

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

 /*
 * parser
--- a/compat.h
+++ b/compat.h
@ -7,8 +7,8 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netdb.h>
 #include <ctype.h>
 #include <signal.h>
--- a/config.guess
+++ b/config.guess
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.

-timestamp='2003-08-18'
+timestamp='2003-10-16'

 # 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
@ -221,6 +221,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@ -307,6 +310,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@ -742,6 +748,11 @@ EOF
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@ -751,7 +762,7 @@ EOF
    *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+    *:FreeBSD:*:*)
 	# Determine whether the default compiler uses glibc.
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@ -763,7 +774,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
 	# FreeBSD's kernel, but not the complete OS.
 	case ${LIBC} in gnu) kernel_only='k' ;; esac
 	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
@ -799,8 +810,13 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
    *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
@ -1052,7 +1068,7 @@ EOF
 	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@ -1167,7 +1183,7 @@ EOF
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
    *:NonStop-UX:*:*)
@ -1211,6 +1227,9 @@ EOF
    SEI:*:*:SEIUX)
        echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
+    *:DRAGONFLY:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
+	exit 0 ;;
 esac

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

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

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

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

--- a/config.sub
+++ b/config.sub
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.

-timestamp='2003-08-18'
+timestamp='2003-11-03'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -118,7 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@ -248,6 +249,7 @@ case $basic_machine in
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
@ -320,6 +322,7 @@ case $basic_machine in
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
@ -741,6 +744,10 @@ case $basic_machine in
 		basic_machine=or32-unknown
 		os=-coff
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@ -961,6 +968,10 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@ -1129,19 +1140,19 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1180,6 +1191,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@ -1223,6 +1237,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@ -1471,9 +1488,15 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
--- a/60
+++ b/60
@ -3485,7 +3485,7 @@ fi



-for ac_header in unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/proc.h sys/ioctl_compat.h usersec.h sys/select.h stropts.h sys/audit.h shadow.h sys/time.h crypt.h sysexits.h types.h sys/sockio.h
+for ac_header in unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/ioctl_compat.h usersec.h sys/select.h stropts.h sys/audit.h shadow.h sys/time.h crypt.h sysexits.h types.h sys/sockio.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@ -3626,6 +3626,61 @@ fi

 done

+
+for ac_header in sys/proc.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
 echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
@ -6155,7 +6210,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
+
+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
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
--- a/configure.in
+++ b/configure.in
@ -244,7 +244,13 @@ if test "$ac_cv_sys_posix_termios" != "yes"; then
    AC_MSG_ERROR([POSIX termios interface required])
 fi

-AC_CHECK_HEADERS(unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/proc.h sys/ioctl_compat.h usersec.h sys/select.h stropts.h sys/audit.h shadow.h sys/time.h crypt.h sysexits.h types.h sys/sockio.h)
+AC_CHECK_HEADERS(unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h sys/uio.h sys/ioctl_compat.h usersec.h sys/select.h stropts.h sys/audit.h shadow.h sys/time.h crypt.h sysexits.h types.h sys/sockio.h sys/param.h)
+dnl sys/proc.h needs sys/param.h on openbsd, apparently
+AC_CHECK_HEADERS(sys/proc.h, [], [],
+[#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+])
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_TYPE_MODE_T
@ -498,7 +504,7 @@ AC_CHECK_HEADERS(pty.h libutil.h util.h)
 AC_CHECK_LIB(util, openpty)
 AC_CHECK_FUNCS(openpty)

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

 #
-#  $Id: INSTALL,v 1.3 2003-07-04 11:21:21-07 bryan Exp $
+#  $Id: INSTALL,v 1.3 2003/07/04 18:21:21 bryan Exp $
 #
--- a/conserver.cf/conserver.cf
+++ b/conserver.cf/conserver.cf
@ -1,54 +1,67 @@
 #
-# $Id: conserver.cf,v 1.5 2003-07-04 11:05:04-07 bryan Exp $
+# Sample conserver.cf file, to give you ideas of what you can do with
+# the various configuration items.
 #
-# The character '&' in logfile names are substituted with the console
-# name.
-#
-default full {
-	rw *;
-}
+
+### set up global access
+default full	{ rw *; }
+
+### define some terminal server specifics
+# we set portbase and portinc so we can reference the ports in a
+# physical representation and let conserver do the math to figure
+# out the actual socket address
+default cisco	{ type host; portbase 2000; portinc 1; }
+default xyplex	{ type host; portbase 2000; portinc 100; }
+default iolan	{ type host; portbase 10000; portinc 1; }
+
+### set the defaults for all the consoles
+# these get applied before anything else
 default * {
+	# The '&' character is substituted with the console name
 	logfile /var/consoles/&;
-	timestamp "";
+	timestamp 1hab;
 	include full;
-}
-#
-# list of consoles we serve
-#
-console tweety {
 	master localhost;
-	type host;
-	host ts1;
-	port 2002;
 }
-console bambam {
-	master localhost;
-	type host;
-	host ts1;
-	port 2003;
+
+### define the first terminal server
+default ts1.conserver.com {
+	include xyplex;
+	host ts1.conserver.com;
+	initcmd /usr/local/sbin/login-xyplex;
 }
-console shell {
-	master localhost;
-	logfile /dev/null;
+
+# now define the consoles on ts1.conserver.com
+console web1.conserver.com { include ts1.conserver.com; port 2; }
+console ns1.conserver.com { include ts1.conserver.com; port 10; }
+console ns2.conserver.com { include ts1.conserver.com; port 8; }
+
+### define the second terminal server
+default ts2.conserver.com { include cisco; host ts2.conserver.com; }
+
+# and the consoles
+console ldap1.conserver.com { include ts2.conserver.com; port 7; }
+
+### and now some one-off consoles
+# a simple ssh invocation
+console ssh {
 	type exec;
-	exec "";
-}
-console telnet {
-	master localhost;
-	logfile /dev/null;
-	type exec;
-	exec telnet host;
+	exec ssh localhost;
+	motd "just a simple ssh to localhost";
 }
+
+# connect to /dev/ttya
 console ttya {
-	master localhost;
 	type device;
-	device /dev/ttya;
-	baud 9600;
-	parity none;
+	device /dev/ttya; parity none; baud 9600;
+	idlestring "#";
+	idletimeout 5m;		# send a '#' every 5 minutes of idle
+	timestamp "";		# no timestamps on this console
 }
-#
-# list of clients we allow
-#
+
+### list of clients we allow
 access * {
-	allowed 127.0.0.1 gnac.com;
+	allowed 10.0.0.0/8 192.168.0.0/16;
+	allowed cs1.conserver.com cs2.conserver.com cs3.conserver.com;
+	trusted 127.0.0.1;
 }
--- a/conserver.cf/conserver.cf.man
+++ b/conserver.cf/conserver.cf.man
@ -1,5 +1,5 @@
-.\" $Id: conserver.cf.man,v 1.43 2003-10-02 19:01:05-07 bryan Exp $
-.TH CONSERVER.CF 5 "2003-10-02" "conserver-8.0.4" "conserver"
+.\" $Id: conserver.cf.man,v 1.51 2003/11/15 20:00:11 bryan Exp $
+.TH CONSERVER.CF 5 "2003/11/15" "conserver-8.0.7" "conserver"
 .SH NAME
 conserver.cf \- console configuration file for
 .BR conserver (8)
@ -65,12 +65,12 @@ The parser has six characters that it considers special.
 These are: ``{'', ``}'', ``;'', ``#'', ``\e'', and ``"''.
 The first three (hereby called tokens) define the format of the
 configuration blocks and are used as word
-seperators, the next is the comment character, and the last two are
+separators, the next is the comment character, and the last two are
 quoting characters.
 .PP
-Word seperation occurs when the parser encounters an unquoted token
+Word separation occurs when the parser encounters an unquoted token
 and, in certain cases, whitespace.
-Whitespace is only used as a word seperator when the parser is
+Whitespace is only used as a word separator when the parser is
 looking for a block-type or keyword.
 When it's looking for a block-name or value, whitespace is like any
 other character, which allows you to embed whitespace in a block-name
@ -123,14 +123,16 @@ fashion (top down), so order is important.
 .RS
 .TP 15
 .B admin
-.RI [ " username" ,...
+.RI "[ [\fB!\fP]" username ,...
 | "" ]
 .br
 Define a list of users making up the admin list for the console server.
 If
 .I username
 matches a previously defined group name, all members of the previous
-group are added to the admin list.
+group are applied to the admin list (with access reversed if prefixed
+with a `!').
+Otherwise, users will be granted (or denied if prefixed with `!') access.
 If the null string (``""'') is used, any
 users previously defined for the console servers's admin list are removed.
 .TP
@ -202,7 +204,9 @@ alert
 backspace
 .TP
 .B \ed
-0.33 second delay
+delay specified by the
+.B delay
+option.
 .TP
 .B \ef
 form-feed
@ -316,6 +320,16 @@ Set the base port number used by child processes (see the
 .B \-b
 command-line flag).
 .TP
+.B setproctitle
+.RB [ " yes " | " true " | " on " | " no " | " false " | " off " ]
+.br
+Set whether or not the process title shows master/group functionality
+as well as the port number the process is listening on and how many
+consoles it is managing.
+The operating system must support the
+.BR setproctitle ()
+call.
+.TP
 .B sslcredentials
 .I filename
 .br
@ -331,6 +345,15 @@ command-line flag).
 Set whether or not encryption is required when talking to clients (see the
 .B \-E
 command-line flag).
+.TP
+.B unifiedlog
+.I filename
+.br
+Set the location of the unified log to
+.IR filename .
+See the
+.B \-U
+command-line flag for details.
 .RE
 .TP 8
 .B console
@ -360,7 +383,7 @@ Define a block of defaults identified as
 If 
 .I name
 is ``*'', the automatically applied default block is defined (basically
-all consoles have an implicit ``include "*";'' at the begining
+all consoles have an implicit ``include "*";'' at the beginning
 of their definition).
 .RS
 .TP 15
@ -387,6 +410,36 @@ Assign the serial device
 as the access to the console.
 Only consoles of type ``device'' will use this value.
 .TP
+.B devicesubst
+.RI [ " hp" [ n ] "f "
+| "" ]
+.br
+Perform string substitutions on the
+.B device
+value.
+.I h
+is the character in
+.B device
+to replace with the
+.B host
+value and
+.I p
+is the character to replace with the
+.B port
+value.
+The
+.B port
+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' or `x' or `X', specifying a decimal, lower-case
+hexdecimal, or uppercase hexdecimal representation of
+.BR port .
+If the null string (``""'') is used, no replacements will be done.
+.TP
 .B exec
 .RI [ " command "
 | "" ]
@ -399,7 +452,37 @@ invoking ``/bin/sh -ce "\fIcommand\fP"''.
 If the null string (``""'') is used or no
 .B exec
 keyword is specified, conserver will use the command ``/bin/sh -i''.
-Only consoles of type ``device'' will use this value.
+Only consoles of type ``exec'' will use this value.
+.TP
+.B execsubst
+.RI [ " hp" [ n ] "f "
+| "" ]
+.br
+Perform string substitutions on the
+.B exec
+value.
+.I h
+is the character in
+.B exec
+to replace with the
+.B host
+value and
+.I p
+is the character to replace with the
+.B port
+value.
+The
+.B port
+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' or `x' or `X', specifying a decimal, lower-case
+hexdecimal, or uppercase hexdecimal representation of
+.BR port .
+If the null string (``""'') is used, no replacements will be done.
 .TP
 .B host
 .I hostname
@ -412,6 +495,35 @@ You must also set the
 option as well.
 Only consoles of type ``host'' will use this value.
 .TP
+.B idlestring
+.RI [ " string "
+| "" ]
+.br
+Assign the
+.I string
+that is sent to the console once the console is idle for an
+.I idletimeout
+amount of time.
+If the null string (``""'') is used, the string is unset and
+the default is used.
+The string is interpreted just as a
+.B break
+string is interpreted (see the
+.B break
+configuration items for details) where all delays specified (via ``\ed'')
+use the default delay time.
+The default string is ``\en''.
+.TP
+.B idletimeout
+.BR \fInumber\fP [ s | m | h ]
+.br
+Set the idle timeout of the console to
+.I number
+seconds.  If an `s', `m', or `h' is used after
+.IR number ,
+the specified time is interpreted as seconds, minutes, or hours.
+Set the timeout to zero to disable the idle timeout (the default).
+.TP
 .B include
 .I default
 .br
@ -441,7 +553,7 @@ nothing is invoked.
 .br
 Assign the logfile specified by
 .I filename
-to the console.  Any occurance of ``&'' in
+to the console.  Any occurrence of ``&'' in
 .I filename
 will be replaced with the name of the console.
 If the null string (``""'') is used, the logfile name is unset and
@ -596,17 +708,50 @@ Set the port used to access the console.
 The port may be specified as a
 .I number
 or a
-.IR name ,
-in which case it will use
+.IR name .
+A
+.I name
+will cause a
 .BR getservbyname (3)
-to look up a port number.
+call to look up the port number.
+The
+.BR port ,
+.BR portbase ,
+and
+.B portinc
+values are all used to calculate the final port number to connect to.
+The formula used is
+.IR finalport " = "
+.BR portbase " + "
+.BR portinc " * " port .
+By using proper values in the formula, you can reference ports on a
+terminal server by their physical numbering of 1 through
+.IR n .
 You must also set the
 .B host
 option as well.
 Only consoles of type ``host'' will use this value.
 .TP
+.B portbase
+.I number
+.br
+Set the base value for the port calculation formula.
+The default is zero.
+See
+.B port
+for the details of the formula.
+.TP
+.B portinc
+.I number
+.br
+Set the increment value for the port calculation formula.
+The default is one.
+See
+.B port
+for the details of the formula.
+.TP
 .B ro
-.RI [ " username" ,...
+.RI "[ [\fB!\fP]" username ,...
 | "" ]
 .br
 Define a list of users making up the read-only access list
@ -614,12 +759,15 @@ for the console.
 If
 .I username
 matches a previously defined group name, all members of the previous
-group are added to the read-only access list.
+group are applied to the read-only access list (with access reversed
+if prefixed with a `!').
+Otherwise, users will be granted (or denied if prefixed with `!')
+read-only access.
 If the null string (``""'') is used, any
 users previously defined for the console's read-only list are removed.
 .TP
 .B rw
-.RI [ " username" ,...
+.RI "[ [\fB!\fP]" username ,...
 | "" ]
 .br
 Define a list of users making up the read-write access list
@ -627,7 +775,10 @@ for the console.
 If
 .I username
 matches a previously defined group name, all members of the previous
-group are added to the read-write access list.
+group are applied to the read-write access list (with access reversed
+if prefixed with a `!').
+Otherwise, users will be granted (or denied if prefixed with `!')
+read-write access.
 If the null string (``""'') is used, any
 users previously defined for the console's read-write list are removed.
 .TP
@ -692,7 +843,7 @@ Define a user group identified as
 .RS
 .TP 15
 .B users
-.RI [ " username" ,...
+.RI "[ [\fB!\fP]" username ,...
 | "" ]
 .br
 Define a list of users making up the group
@ -700,7 +851,10 @@ Define a list of users making up the group
 If
 .I username
 matches a previously defined group name, all members of the previous
-group are added to the current group.
+group are applied to the current group (with access reversed
+if prefixed with a `!').
+Otherwise, users will be recorded with (or without if prefixed with `!')
+access.
 If the null string (``""'') is used, any
 users previously defined for this group are removed.
 .RE
--- a/conserver.cf/conserver.passwd.man
+++ b/conserver.cf/conserver.passwd.man
@ -1,5 +1,5 @@
-.\" $Id: conserver.passwd.man,v 1.9 2003-07-04 13:20:52-07 bryan Exp $
-.TH CONSERVER.PASSWD 5 "2003-07-04" "conserver-8.0.4" "conserver"
+.\" $Id: conserver.passwd.man,v 1.9 2003/07/04 20:20:52 bryan Exp $
+.TH CONSERVER.PASSWD 5 "2003/07/04" "conserver-8.0.7" "conserver"
 .SH NAME
 conserver.passwd \- user access information for
 .BR conserver (8)
--- a/conserver.cf/label.ps
+++ b/conserver.cf/label.ps
@ -1,5 +1,5 @@
 %!PS-Adobe-2.0 EPSF-1.2
-%%$Id: label.ps,v 1.8 94/01/21 09:37:42 ksb Exp $
+%%$Id: label.ps,v 1.1 2003/11/04 02:36:26 bryan Exp $
 %%Title: RJ-11
 %%Creator: A Braunsdorf
 %%CreationDate: 
--- a/conserver.cf/test.cf
+++ b/conserver.cf/test.cf
@ -1,6 +1,6 @@
 # dummy conserver config file
 #
-# $Id: test.cf,v 1.2 2003-07-04 11:04:05-07 bryan Exp $
+# $Id: test.cf,v 1.2 2003/07/04 18:04:05 bryan Exp $
 #
 default full {
 	rw *;
--- a/conserver.html
+++ b/conserver.html
@ -183,11 +183,11 @@

          <H3>Downloading</H3>

-          <P>The current version, released on Oct 10, 2003, is <A
-          href="8.0.4.tar.gz">8.0.4.tar.gz</A>. You can get it via
+          <P>The current version, released on Nov 20, 2003, is <A
+          href="8.0.7.tar.gz">8.0.7.tar.gz</A>. You can get it via
          <A href=
-          "ftp://ftp.conserver.com/conserver/8.0.4.tar.gz">FTP</A>
-          or <A href="8.0.4.tar.gz">HTTP</A>. See the <A href=
+          "ftp://ftp.conserver.com/conserver/8.0.7.tar.gz">FTP</A>
+          or <A href="8.0.7.tar.gz">HTTP</A>. See the <A href=
          "CHANGES">CHANGES</A> file for information on the latest
          updates.</P>

--- a/conserver/Makefile.in
+++ b/conserver/Makefile.in
@ -27,7 +27,7 @@ LIBS	= @LIBS@ @CONSLIBS@
 ### Makefile rules - no user-servicable parts below

 CONSERVER_OBJS = access.o client.o consent.o group.o main.o master.o \
-		 readcfg.o fallback.o util.o
+		 readcfg.o fallback.o cutil.o
 CONSERVER_HDRS = ../config.h $(top_srcdir)/compat.h $(srcdir)/access.h \
 		 $(srcdir)/client.h $(srcdir)/consent.h $(srcdir)/group.h \
 		 $(srcdir)/main.h $(srcdir)/master.h $(srcdir)/readcfg.h \
@ -40,8 +40,8 @@ all: $(ALL)
 conserver: $(CONSERVER_OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o conserver $(CONSERVER_OBJS) $(LIBS)

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

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

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

 #include <compat.h>

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

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

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

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

 void
--- a/conserver/access.h
+++ b/conserver/access.h
@ -1,5 +1,5 @@
 /*
- *  $Id: access.h,v 5.26 2003-08-10 11:11:20-07 bryan Exp $
+ *  $Id: access.h,v 5.26 2003/08/10 18:11:20 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
--- a/conserver/client.c
+++ b/conserver/client.c
@ -1,5 +1,5 @@
 /*
- *  $Id: client.c,v 5.72 2003-10-02 18:49:13-07 bryan Exp $
+ *  $Id: client.c,v 5.76 2003/11/20 13:56:38 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -36,7 +36,7 @@

 #include <compat.h>

-#include <util.h>
+#include <cutil.h>
 #include <consent.h>
 #include <access.h>
 #include <client.h>
@ -246,8 +246,9 @@ Replay(fdLog, fdOut, iBack)
 			InitString(lines[ln].line);
 		    } else {
 			BuildString((char *)0, lines[ln - 1].line);
-			BuildString(lines[ln].line->string,
-				    lines[ln - 1].line);
+			BuildStringN(lines[ln].line->string,
+				     lines[ln].line->used - 1,
+				     lines[ln - 1].line);
 			BuildString((char *)0, lines[ln].line);
 		    }
 		    ln--;
@ -313,8 +314,9 @@ Replay(fdLog, fdOut, iBack)
 	    if ((char *)0 != s) {
 		*s = '\000';
 	    }
-	    FileWrite(fdOut, FLAGTRUE, lines[i].line->string, -1);
-	    FileWrite(fdOut, FLAGTRUE, " .. ", -1);
+	    FileWrite(fdOut, FLAGTRUE, lines[i].line->string,
+		      lines[i].line->used - 1);
+	    FileWrite(fdOut, FLAGTRUE, " .. ", 4);

 	    /* build the end string by removing the leading "[-- MARK -- "
 	     * and replacing "]\r\n" on the end with " -- MARK --]\r\n"
@ -331,7 +333,8 @@ Replay(fdLog, fdOut, iBack)
 	    u = lines[i].mark_end->used;
 	    s = lines[i].mark_end->string;
 	} else
-	    FileWrite(fdOut, FLAGFALSE, lines[i].line->string, -1);
+	    FileWrite(fdOut, FLAGFALSE, lines[i].line->string,
+		      lines[i].line->used - 1);
    }

  common_exit:
@ -399,7 +402,6 @@ static HELP aHLTable[] = {
    {WHEN_ALWAYS, "^R   replay the last line"},
    {WHEN_ATTACH, "\\ooo send character by octal code"},
    {WHEN_EXPERT, "^I   toggle tab expansion"},
-    {WHEN_EXPERT, ";    change to another console"},
    {WHEN_EXPERT, "+(-) do (not) drop line"},
    {WHEN_VT100, "PF1  print this message"},
    {WHEN_VT100, "PF2  disconnect"},
@ -449,12 +451,14 @@ HelpUser(pCL)
 		}
 		BuildString(aHLTable[i].actext, acLine);
 		BuildString(acEoln, acLine);
-		FileWrite(pCL->fd, FLAGTRUE, acLine->string, -1);
+		FileWrite(pCL->fd, FLAGTRUE, acLine->string,
+			  acLine->used - 1);
 		BuildString((char *)0, acLine);
 		continue;
 	    } else {
 		BuildString(acEoln, acLine);
-		FileWrite(pCL->fd, FLAGTRUE, acLine->string, -1);
+		FileWrite(pCL->fd, FLAGTRUE, acLine->string,
+			  acLine->used - 1);
 		BuildString((char *)0, acLine);
 	    }
 	}
@ -463,14 +467,15 @@ HelpUser(pCL)
 	    BuildString(aHLTable[i].actext, acLine);
 	    if (acLine->used > HALFLINE) {
 		BuildString(acEoln, acLine);
-		FileWrite(pCL->fd, FLAGTRUE, acLine->string, -1);
+		FileWrite(pCL->fd, FLAGTRUE, acLine->string,
+			  acLine->used - 1);
 		BuildString((char *)0, acLine);
 	    }
 	}
    }
    if (acLine->used != 0) {
 	BuildString(acEoln, acLine);
-	FileWrite(pCL->fd, FLAGTRUE, acLine->string, -1);
+	FileWrite(pCL->fd, FLAGTRUE, acLine->string, acLine->used - 1);
    }
    FileWrite(pCL->fd, FLAGFALSE, (char *)0, 0);
 }
@ -530,5 +535,7 @@ ClientAccessOk(pCL)
 	else
 	    BuildString("<unknown>", pCL->peername);
    }
+    if (peername != (char *)0)
+	free(peername);
    return retval;
 }
--- a/conserver/client.h
+++ b/conserver/client.h
@ -1,5 +1,5 @@
 /*
- *  $Id: client.h,v 5.33 2003-10-10 03:28:49-07 bryan Exp $
+ *  $Id: client.h,v 5.33 2003/10/10 10:28:49 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
--- a/conserver/consent.c
+++ b/conserver/consent.c
@ -1,5 +1,5 @@
 /*
- *  $Id: consent.c,v 5.128 2003-09-30 13:14:04-07 bryan Exp $
+ *  $Id: consent.c,v 5.131 2003/11/20 13:56:38 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -42,7 +42,7 @@

 #include <pwd.h>

-#include <util.h>
+#include <cutil.h>
 #include <consent.h>
 #include <client.h>
 #include <group.h>
@ -792,6 +792,9 @@ ConsInit(pCE)
 	    } else {
 		pCE->ioState = INCONNECT;
 		pCE->stateTimer = time((time_t *)0) + CONNECTTIMEOUT;
+		if (timers[T_STATE] == (time_t)0 ||
+		    timers[T_STATE] > pCE->stateTimer)
+		    timers[T_STATE] = pCE->stateTimer;
 		pCE->fup = 1;
 	    }
 	    break;
@ -843,9 +846,18 @@ ConsInit(pCE)
    if (maxfd < cofile + 1)
 	maxfd = cofile + 1;

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

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

--- a/conserver/consent.h
+++ b/conserver/consent.h
@ -1,5 +1,5 @@
 /*
- *  $Id: consent.h,v 5.48 2003-10-02 18:49:03-07 bryan Exp $
+ *  $Id: consent.h,v 5.52 2003/11/15 20:00:08 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -65,6 +65,7 @@ typedef struct names {

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

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

    /*** state information ***/
    char acline[132 * 2 + 2];	/* max chars we will call a line        */
--- a/conserver/conserver.man
+++ b/conserver/conserver.man
@ -1,6 +1,6 @@
 .\" @(#)conserver.8 01/06/91 OSU CIS; Thomas A. Fine
-.\" $Id: conserver.man,v 1.38 2003-09-22 08:33:41-07 bryan Exp $
-.TH CONSERVER 8 "2003-09-22" "conserver-8.0.4" "conserver"
+.\" $Id: conserver.man,v 1.40 2003/11/10 15:37:24 bryan Exp $
+.TH CONSERVER 8 "2003/11/10" "conserver-8.0.7" "conserver"
 .SH NAME
 conserver \- console server daemon
 .SH SYNOPSIS
@ -26,6 +26,8 @@ conserver \- console server daemon
 .IR logfile ]
 .RB [ \-O
 .IR min ]
+.RB [ \-U
+.IR logfile ]
 .SH DESCRIPTION
 .B Conserver
 is the daemon that manages
@ -93,7 +95,7 @@ Close all connections and exit.
 .TP
 SIGHUP
 Reread the configuration file.
-New consoles are managed by forking off new childen, deleted
+New consoles are managed by forking off new children, deleted
 consoles (and their clients) are dropped,
 and changes to consoles are done "in place", resetting the console
 port (bringing it down and up) only when necessary.
@ -147,7 +149,7 @@ the signing certificate must be properly trusted, which usually means
 the public portion is in
 .IB OPENSSL_ROOT /ssl/certs
 (on both the client and server sides).
-See the sample self-signing certficate making script
+See the sample self-signing certificate making script
 .B contrib/maketestcerts
 for further clues.
 To allow
@ -332,6 +334,17 @@ independent of whether logging of individual consoles is enabled via
 .B conserver.cf
 entries.
 .TP
+.BI \-U logfile
+Copy all console data to the ``unified''
+.IR logfile .
+The output is the same as the
+.B \-u
+output, but all consoles, not
+just those without a user, are logged.
+Each line of output is prefixed with the console name.
+If a user is attached read/write, a `*' is appended to the console name,
+to allow log watching utilites to ignore potential user-introduced alarms.
+.TP
 .B \-v
 Echo the configuration as it is being read (be verbose).
 .TP
--- a/conserver/conserver.passwd
+++ b/conserver/conserver.passwd
@ -1,4 +0,0 @@
-bryan:r71mXjfALB5Ak:any
-djs:r71mXjfALB5Ak:login
-chogan:*passwd*:foobar,login,shell
-hogan:*passwd*:any
--- a/conserver/convert.c
+++ b/conserver/convert.c
@ -1,5 +1,5 @@
 /*
- *  $Id: convert.c,v 1.7 2003-08-15 14:24:39-07 bryan Exp $
+ *  $Id: convert.c,v 1.8 2003/11/20 13:56:38 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -32,7 +32,7 @@

 #include <compat.h>

-#include <util.h>
+#include <cutil.h>
 #include <consent.h>
 #include <client.h>
 #include <group.h>
--- a/conserver/cutil.c
+++ b/conserver/cutil.c
@ -1,5 +1,5 @@
 /*
- *  $Id: util.c,v 1.102 2003-10-03 06:32:34-07 bryan Exp $
+ *  $Id: cutil.c,v 1.107 2003/11/20 13:59:55 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -8,7 +8,7 @@

 #include <compat.h>

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

 #if HAVE_OPENSSL
 #include <openssl/ssl.h>
@ -143,7 +143,10 @@ BuildString(str, msg)
 	CONDDEBUG((3, "BuildString(): 0x%lx reset", (void *)msg));
 	return msg->string;
    }
-    len = strlen(str) + 1;
+    if (msg->used)		/* string or string + null? */
+	len = strlen(str);
+    else
+	len = strlen(str) + 1;
    if (msg->used + len >= msg->allocated) {
 	if (0 == msg->allocated) {
 	    msg->allocated =
@ -161,13 +164,19 @@ BuildString(str, msg)
 	if (msg->string == (char *)0)
 	    OutOfMem();
    }
+    /* if msg->used, then len = strlen(), so we need to copy len + 1 to
+     * get the NULL which we overwrote with the copy */
 #if HAVE_MEMCPY
-    memcpy(msg->string + (msg->used ? msg->used - 1 : 0), str, len);
-#else
-    bcopy(str, msg->string + (msg->used ? msg->used - 1 : 0), len);
-#endif
    if (msg->used)
-	len--;
+	memcpy(msg->string + msg->used - 1, str, len + 1);
+    else
+	memcpy(msg->string, str, len);
+#else
+    if (msg->used)
+	bcopy(str, msg->string + msg->used - 1, len + 1);
+    else
+	bcopy(str, msg->string, len);
+#endif
    msg->used += len;
    CONDDEBUG((3, "BuildString(): 0x%lx added %d chars (%d/%d now)",
 	       (void *)msg, len, msg->used, msg->allocated));
@ -195,12 +204,10 @@ BuildStringN(str, n, msg)
    }
    if (n <= 0)
 	return msg->string;
-    len = strlen(str) + 1;
-    if (len > n) {		/* if we're a substring */
+    if (msg->used)
 	len = n;
-	if (str[n - 1] != '\000')	/* if we aren't copying a '\000', */
-	    len++;		/* we need to add one at the end */
-    }
+    else
+	len = n + 1;
    if (msg->used + len >= msg->allocated) {
 	if (0 == msg->allocated) {
 	    msg->allocated =
@ -219,14 +226,12 @@ BuildStringN(str, n, msg)
 	    OutOfMem();
    }
 #if HAVE_MEMCPY
-    memcpy(msg->string + (msg->used ? msg->used - 1 : 0), str, len);
+    memcpy(msg->string + (msg->used ? msg->used - 1 : 0), str, n);
 #else
-    bcopy(str, msg->string + (msg->used ? msg->used - 1 : 0), len);
+    bcopy(str, msg->string + (msg->used ? msg->used - 1 : 0), n);
 #endif
-    if (len > n)		/* we need to terminate the string */
-	msg->string[(msg->used ? msg->used - 1 : 0) + len - 1] = '\000';
-    if (msg->used)
-	len--;
+    /* add a NULL */
+    msg->string[(msg->used ? msg->used - 1 : 0) + n] = '\000';
    msg->used += len;
    CONDDEBUG((3, "BuildStringN(): 0x%lx added %d chars (%d/%d now)",
 	       (void *)msg, len, msg->used, msg->allocated));
@ -874,15 +879,15 @@ FileClose(pcfp)
 	    /* flush out the client socket - set it to blocking,
 	     * then write to it
 	     */
-	    SetFlags(cfp->fd, 0, O_NONBLOCK)
+	    SetFlags(cfp->fd, 0, O_NONBLOCK);

-		/* sent it a byte - guaranteed to block - ensure delivery
-		 * of prior data yeah - this is a bit paranoid - try
-		 * without this at first
-		 */
-		/* write(cfp->fd, "\n", 1); */
-		/* this is the guts of the workaround for Winsock close bug */
-		shutdown(cfp->fd, 1);
+	    /* sent it a byte - guaranteed to block - ensure delivery
+	     * of prior data yeah - this is a bit paranoid - try
+	     * without this at first
+	     */
+	    /* write(cfp->fd, "\n", 1); */
+	    /* this is the guts of the workaround for Winsock close bug */
+	    shutdown(cfp->fd, 1);

 	    /* enable lingering */
 	    lingeropt.l_onoff = 1;
@ -1281,9 +1286,13 @@ VWrite(cfp, bufferonly, str, fmt, ap)
 {
    int s, l, e;
    char c;
+    int fmtlen = 0;
+    int fmtpre = 0;
+    short padzero = 0;
+    short sawdot = 0;
    static STRING *msg = (STRING *)0;
    static STRING *output = (STRING *)0;
-    static short flong, fneg;
+    short flong = 0, fneg = 0, fminus = 0;

    if (fmt == (char *)0 || (cfp == (CONSFILE *)0 && str == (STRING *)0))
 	return;
@ -1295,18 +1304,12 @@ VWrite(cfp, bufferonly, str, fmt, ap)

    BuildString((char *)0, output);

-    fneg = flong = 0;
    for (e = s = l = 0; (c = fmt[s + l]) != '\000'; l++) {
-	if (c == '%') {
-	    if (e) {
-		e = 0;
-		BuildStringChar('%', output);
-	    } else {
-		e = 1;
-		BuildStringN(fmt + s, l, output);
-		s += l;
-		l = 0;
-	    }
+	if (e == 0 && c == '%') {
+	    e = 1;
+	    BuildStringN(fmt + s, l, output);
+	    s += l;
+	    l = 0;
 	    continue;
 	}
 	if (e) {
@ -1314,64 +1317,170 @@ VWrite(cfp, bufferonly, str, fmt, ap)
 	    int u;
 	    char *p;
 	    char cc;
-	    switch (c) {
-		case 'h':
-		    /* noop since shorts are promoted to int in va_arg */
-		    continue;
-		case 'l':
-		    flong = 1;
-		    continue;
-		case 'c':
-		    cc = (char)va_arg(ap, int);
-		    BuildStringChar(cc, output);
-		    break;
-		case 's':
-		    p = va_arg(ap, char *);
-		    BuildString(p, output);
-		    break;
-		case 'd':
-		    i = (flong ? va_arg(ap, long) : (long)va_arg(ap, int));
-		    if ((long)i < 0) {
-			fneg = 1;
-			i = -i;
-		    }
-		    goto number;
-		case 'u':
-		    i = (flong ? va_arg(ap, unsigned long)
-			 : (unsigned long)va_arg(ap, unsigned int));
-		  number:
-		    BuildString((char *)0, msg);
-		    while (i >= 10) {
-			BuildStringChar((i % 10) + '0', msg);
-			i /= 10;
-		    }
-		    BuildStringChar(i + '0', msg);
-		    /* reverse the text to put it in forward order
-		     */
-		    u = msg->used - 1;
-		    for (i = 0; i < u / 2; i++) {
-			char temp;
+	    if (c >= '0' && c <= '9') {
+		if (sawdot == 0) {
+		    if (c == '0' && fmtlen == 0)
+			padzero = 1;
+		    fmtlen = fmtlen * 10 + (c - '0');
+		} else {
+		    fmtpre = fmtpre * 10 + (c - '0');
+		}
+	    } else {
+		switch (c) {
+		    case '.':
+			sawdot = 1;
+			continue;
+		    case '-':
+			fminus = 1;
+			continue;
+		    case 'h':
+			/* noop since shorts are promoted to int in va_arg */
+			continue;
+		    case 'l':
+			flong = 1;
+			continue;
+		    case '%':
+			BuildStringChar('%', output);
+			break;
+		    case 'c':
+			cc = (char)va_arg(ap, int);
+			BuildStringChar(cc, output);
+			break;
+		    case 's':
+			p = va_arg(ap, char *);
+			{
+			    int l = strlen(p);
+			    int c;
+			    if (fmtpre > 0 && fmtpre < l)
+				l = fmtpre;
+			    if (fminus != 0)
+				BuildStringN(p, l, output);
+			    for (c = l; c < fmtlen; c++)
+				BuildStringChar(' ', output);
+			    if (fminus == 0)
+				BuildStringN(p, l, output);
+			}
+			break;
+		    case 'd':
+			i = (flong ? va_arg(ap, long) : (long)
+			     va_arg(ap, int));
+			if ((long)i < 0) {
+			    fneg = 1;
+			    i = -i;
+			}
+			goto number;
+		    case 'u':
+			i = (flong ? va_arg(ap, unsigned long)
+			     : (unsigned long)va_arg(ap, unsigned int));
+		      number:
+			BuildString((char *)0, msg);
+			while (i >= 10) {
+			    BuildStringChar((i % 10) + '0', msg);
+			    i /= 10;
+			}
+			BuildStringChar(i + '0', msg);
+			if (fneg)
+			    BuildStringChar('-', msg);

-			temp = msg->string[i];
-			msg->string[i]
-			    = msg->string[u - i - 1];
-			msg->string[u - i - 1] = temp;
-		    }
-		    if (fneg) {
-			BuildStringChar('-', output);
-			fneg = 0;
-		    }
-		    BuildString(msg->string, output);
-		    break;
-		default:
-		    Error
-			("VWrite(): unknown conversion character `%c' in `%s'",
-			 c, fmt);
-		    break;
+			if (fmtpre > 0) {
+			    padzero = 0;
+			    if (fmtpre > fmtlen)
+				fmtlen = fmtpre;
+			    while (msg->used - 1 < fmtpre)
+				BuildStringChar('0', msg);
+			}
+
+			/* reverse the text to put it in forward order
+			 */
+			u = msg->used - 1;
+			for (i = 0; i < u / 2; i++) {
+			    char temp;
+
+			    temp = msg->string[i];
+			    msg->string[i]
+				= msg->string[u - i - 1];
+			    msg->string[u - i - 1] = temp;
+			}
+
+			{
+			    int l = msg->used - 1;
+			    if (fminus != 0)
+				BuildString(msg->string, output);
+			    for (; l < fmtlen; l++) {
+				if (padzero == 0 || fminus != 0)
+				    BuildStringChar(' ', output);
+				else
+				    BuildStringChar('0', output);
+			    }
+			    if (fminus == 0)
+				BuildString(msg->string, output);
+			}
+			break;
+		    case 'X':
+		    case 'x':
+			i = (flong ? va_arg(ap, unsigned long)
+			     : (unsigned long)va_arg(ap, unsigned int));
+			BuildString((char *)0, msg);
+			while (i >= 16) {
+			    if (i % 16 >= 10)
+				BuildStringChar((i % 16) - 10 +
+						(c == 'x' ? 'a' : 'A'),
+						msg);
+			    else
+				BuildStringChar((i % 16) + '0', msg);
+			    i /= 16;
+			}
+			if (i >= 10)
+			    BuildStringChar(i - 10 +
+					    (c == 'x' ? 'a' : 'A'), msg);
+			else
+			    BuildStringChar(i + '0', msg);
+
+			if (fmtpre > 0) {
+			    padzero = 0;
+			    if (fmtpre > fmtlen)
+				fmtlen = fmtpre;
+			    while (msg->used - 1 < fmtpre)
+				BuildStringChar('0', msg);
+			}
+
+			/* reverse the text to put it in forward order
+			 */
+			u = msg->used - 1;
+			for (i = 0; i < u / 2; i++) {
+			    char temp;
+
+			    temp = msg->string[i];
+			    msg->string[i]
+				= msg->string[u - i - 1];
+			    msg->string[u - i - 1] = temp;
+			}
+
+			{
+			    int l = msg->used - 1;
+			    if (fminus != 0)
+				BuildString(msg->string, output);
+			    for (; l < fmtlen; l++) {
+				if (padzero == 0 || fminus != 0)
+				    BuildStringChar(' ', output);
+				else
+				    BuildStringChar('0', output);
+			    }
+			    if (fminus == 0)
+				BuildString(msg->string, output);
+			}
+			break;
+		    default:
+			Error
+			    ("VWrite(): unknown conversion character `%c' in `%s'",
+			     c, fmt);
+			break;
+		}
+		s += l + 1;
+		l = -1;
+		e = flong = fneg = fminus = 0;
+		fmtlen = fmtpre = sawdot = padzero = 0;
 	    }
-	    s += l + 1;
-	    l = -1;
-	    e = flong = 0;
 	}
    }
    if (l)
@ -1412,6 +1521,28 @@ BuildStringPrint(str, fmt, va_alist)
 	return str->string;
 }

+char *
+#if PROTOTYPES
+BuildTmpStringPrint(char *fmt, ...)
+#else
+BuildTmpStringPrint(fmt, va_alist)
+    char *fmt;
+    va_dcl
+#endif
+{
+    va_list ap;
+#if PROTOTYPES
+    va_start(ap, fmt);
+#else
+    va_start(ap);
+#endif
+    if (mymsg == (STRING *)0)
+	mymsg = AllocString();
+    VWrite((CONSFILE *)0, FLAGFALSE, mymsg, fmt, ap);
+    va_end(ap);
+    return mymsg->string;
+}
+
 void
 #if PROTOTYPES
 FileVWrite(CONSFILE *cfp, FLAG bufferonly, char *fmt, va_list ap)
--- a/conserver/cutil.h
+++ b/conserver/cutil.h
@ -1,5 +1,5 @@
 /*
- *  $Id: util.h,v 1.55 2003-10-03 06:32:34-07 bryan Exp $
+ *  $Id: cutil.h,v 1.56 2003/11/10 20:38:25 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -114,6 +114,7 @@ extern int FileUnopen PARAMS((CONSFILE *));
 extern void OutOfMem PARAMS(());
 extern char *BuildTmpString PARAMS((const char *));
 extern char *BuildTmpStringChar PARAMS((const char));
+extern char *BuildTmpStringPrint PARAMS((char *, ...));
 extern char *BuildString PARAMS((const char *, STRING *));
 extern char *BuildStringChar PARAMS((const char, STRING *));
 extern char *BuildStringPrint PARAMS((STRING *, char *, ...));
--- a/conserver/fallback.c
+++ b/conserver/fallback.c
@ -1,5 +1,5 @@
 /*
- *  $Id: fallback.c,v 5.59 2003-10-03 06:32:34-07 bryan Exp $
+ *  $Id: fallback.c,v 5.60 2003/11/20 13:56:38 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -16,7 +16,7 @@

 #include <compat.h>

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

 /*
 * get a pty for the user
--- a/conserver/group.c
+++ b/conserver/group.c
--- a/conserver/group.h
+++ b/conserver/group.h
@ -1,5 +1,5 @@
 /*
- *  $Id: group.h,v 5.38 2003-09-19 08:58:18-07 bryan Exp $
+ *  $Id: group.h,v 5.41 2003/11/15 20:00:09 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -34,6 +34,14 @@
 * 4. This notice may not be removed or altered.
 */

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

+extern time_t timers[];
+
 extern void Spawn PARAMS((GRPENT *));
 extern int CheckPass PARAMS((char *, char *));
 extern void TagLogfile PARAMS((const CONSENT *, char *, ...));
 extern void TagLogfileAct PARAMS((const CONSENT *, char *, ...));
-extern void CleanupBreak PARAMS((short));
 extern void DestroyGroup PARAMS((GRPENT *));
 extern void DestroyConsent PARAMS((GRPENT *, CONSENT *));
 extern void SendClientsMsg PARAMS((CONSENT *, char *));
 extern void ResetMark PARAMS((void));
 extern void DestroyConsentUsers PARAMS((CONSENTUSERS **));
 extern CONSENTUSERS *ConsentFindUser PARAMS((CONSENTUSERS *, char *));
+extern int ConsentUserOk PARAMS((CONSENTUSERS *, char *));
 extern void DisconnectClient
 PARAMS((GRPENT *, CONSCLIENT *, char *, FLAG));
 extern int ClientAccess PARAMS((CONSENT *, char *));
 extern void DestroyClient PARAMS((CONSCLIENT *));
 extern int CheckPasswd PARAMS((CONSCLIENT *, char *));
+extern void ExpandString PARAMS((char *, CONSENT *, short));
 #if HAVE_OPENSSL
 extern int AttemptSSL PARAMS((CONSCLIENT *));
 #endif
--- a/conserver/main.c
+++ b/conserver/main.c
@ -1,5 +1,5 @@
 /*
- *  $Id: main.c,v 5.161 2003-10-03 06:32:34-07 bryan Exp $
+ *  $Id: main.c,v 5.172 2003/11/20 13:56:39 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -31,7 +31,7 @@

 #include <pwd.h>

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


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

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

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

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

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

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

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

    BuildString((char *)0, acA1);
    if (optionlist[0] == (char *)0)
@ -704,6 +757,10 @@ SummarizeDataStructures()
 		size += strlen(pCE->initcmd);
 	    if (pCE->execSlave != (char *)0)
 		size += strlen(pCE->execSlave);
+	    if (pCE->motd != (char *)0)
+		size += strlen(pCE->motd);
+	    if (pCE->idlestring != (char *)0)
+		size += strlen(pCE->idlestring);
 	    if (pCE->fdlog != (CONSFILE *)0)
 		size += sizeof(CONSFILE);
 	    if (pCE->cofile != (CONSFILE *)0)
@ -880,18 +937,22 @@ DumpDataStructures()
 		       "DumpDataStructures():  initpid=%lu, initcmd=%s, initfile=%d",
 		       (unsigned long)pCE->initpid, EMPTYSTR(pCE->initcmd),
 		       FileFDNum(pCE->initfile)));
+	    CONDDEBUG((1,
+		       "DumpDataStructures():  motd=%s, idletimeout=%d, idlestring=%s",
+		       EMPTYSTR(pCE->motd), pCE->idletimeout,
+		       EMPTYSTR(pCE->idlestring)));
 	    if (pCE->ro) {
 		CONSENTUSERS *u;
 		for (u = pCE->ro; u != (CONSENTUSERS *)0; u = u->next) {
-		    CONDDEBUG((1, "DumpDataStructures():  ro=%s",
-			       u->user->name));
+		    CONDDEBUG((1, "DumpDataStructures():  ro=%s%s",
+			       (u->not ? "!" : ""), u->user->name));
 		}
 	    }
 	    if (pCE->rw) {
 		CONSENTUSERS *u;
 		for (u = pCE->rw; u != (CONSENTUSERS *)0; u = u->next) {
-		    CONDDEBUG((1, "DumpDataStructures():  rw=%s",
-			       u->user->name));
+		    CONDDEBUG((1, "DumpDataStructures():  rw=%s%s",
+			       (u->not ? "!" : ""), u->user->name));
 		}
 	    }
 	    CONDDEBUG((1, "DumpDataStructures():  ------"));
@ -1110,7 +1171,7 @@ main(argc, argv)
 {
    int i;
    FILE *fpConfig = (FILE *)0;
-    static char acOpts[] = "7a:b:c:C:dDEFhiL:m:M:noO:p:P:RSuVv";
+    static char acOpts[] = "7a:b:c:C:dDEFhiL:m:M:noO:p:P:RSuU:Vv";
    extern int optopt;
    extern char *optarg;
    struct passwd *pwd;
@ -1126,9 +1187,9 @@ main(argc, argv)

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

    setpwent();
@ -1190,10 +1251,10 @@ main(argc, argv)
 #endif
 		break;
 	    case 'C':
-		pcConfig = optarg;
+		pcConfig = StrDup(optarg);
 		break;
 	    case 'd':
-		fDaemon = 1;
+		optConf->daemonmode = FLAGTRUE;
 		break;
 	    case 'D':
 		fDebug++;
@ -1225,7 +1286,7 @@ main(argc, argv)
 		}
 		break;
 	    case 'M':
-		interface = optarg;
+		interface = StrDup(optarg);
 		break;
 	    case 'n':
 		/* noop now */
@ -1255,6 +1316,10 @@ main(argc, argv)
 	    case 'u':
 		fAll = 1;
 		break;
+	    case 'U':
+		if ((optConf->unifiedlog = StrDup(optarg)) == (char *)0)
+		    OutOfMem();
+		break;
 	    case 'V':
 		fVersion = 1;
 		break;
@ -1345,6 +1410,9 @@ main(argc, argv)
    }
    ProbeInterfaces();

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

    /* read the config file */
    if ((FILE *)0 == (fpConfig = fopen(pcConfig, "r"))) {
@ -1360,7 +1428,7 @@ main(argc, argv)
    else if (pConfig->primaryport != (char *)0)
 	config->primaryport = StrDup(pConfig->primaryport);
    else
-	config->primaryport = StrDup(DEFPORT);
+	config->primaryport = StrDup(defConfig.primaryport);
    if (config->primaryport == (char *)0)
 	OutOfMem();

@ -1377,8 +1445,7 @@ main(argc, argv)
 	struct servent *pSE;
 	if ((struct servent *)0 ==
 	    (pSE = getservbyname(config->primaryport, "tcp"))) {
-	    Error("getservbyname(%s): %s", config->primaryport,
-		  strerror(errno));
+	    Error("getservbyname(%s) failed", config->primaryport);
 	    Bye(EX_OSERR);
 	} else {
 	    bindPort = ntohs((unsigned short)pSE->s_port);
@ -1391,7 +1458,7 @@ main(argc, argv)
    else if (pConfig->secondaryport != (char *)0)
 	config->secondaryport = StrDup(pConfig->secondaryport);
    else
-	config->secondaryport = StrDup(DEFBASEPORT);
+	config->secondaryport = StrDup(defConfig.secondaryport);
    if (config->secondaryport == (char *)0)
 	OutOfMem();

@ -1408,8 +1475,7 @@ main(argc, argv)
 	struct servent *pSE;
 	if ((struct servent *)0 ==
 	    (pSE = getservbyname(config->secondaryport, "tcp"))) {
-	    Error("getservbyname(%s): %s", config->secondaryport,
-		  strerror(errno));
+	    Error("getservbyname(%s) failed", config->secondaryport);
 	    Bye(EX_OSERR);
 	} else {
 	    bindBasePort = ntohs((unsigned short)pSE->s_port);
@ -1421,7 +1487,7 @@ main(argc, argv)
    else if (pConfig->passwdfile != (char *)0)
 	config->passwdfile = StrDup(pConfig->passwdfile);
    else
-	config->passwdfile = StrDup(PASSWDFILE);
+	config->passwdfile = StrDup(defConfig.passwdfile);
    if (config->passwdfile == (char *)0)
 	OutOfMem();

@ -1430,7 +1496,7 @@ main(argc, argv)
    else if (pConfig->logfile != (char *)0)
 	config->logfile = StrDup(pConfig->logfile);
    else
-	config->logfile = StrDup(LOGFILEPATH);
+	config->logfile = StrDup(defConfig.logfile);
    if (config->logfile == (char *)0)
 	OutOfMem();

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

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

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

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

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

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

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

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

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

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

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

 #include <compat.h>

-#include <util.h>
+#include <cutil.h>
 #include <consent.h>
 #include <client.h>
 #include <group.h>
@ -466,7 +466,7 @@ DoNormalRead(pCLServing)
 		return;
 	    }
 	    Verbose("<master> login %s", pCLServing->acid->string);
-	    FileWrite(pCLServing->fd, FLAGFALSE, "ok\r\n", -1);
+	    FileWrite(pCLServing->fd, FLAGFALSE, "ok\r\n", 4);
 	    pCLServing->iState = S_NORMAL;
 	    BuildString((char *)0, pCLServing->accmd);
 	    continue;
@ -549,7 +549,7 @@ DoNormalRead(pCLServing)
 			pCLServing->iState = S_NORMAL;
 			Verbose("<master> login %s",
 				pCLServing->acid->string);
-			FileWrite(pCLServing->fd, FLAGFALSE, "ok\r\n", -1);
+			FileWrite(pCLServing->fd, FLAGFALSE, "ok\r\n", 4);
 		    } else {
 			FilePrint(pCLServing->fd, FLAGFALSE,
 				  "passwd? %s\r\n", myHostname);
@ -599,9 +599,7 @@ DoNormalRead(pCLServing)
 		      THIS_VERSION);
 	} else if (pCLServing->iState == S_NORMAL &&
 		   strcmp(pcCmd, "quit") == 0) {
-	    if (ConsentFindUser(pADList, pCLServing->username->string) !=
-		(CONSENTUSERS *)0 ||
-		ConsentFindUser(pADList, "*") != (CONSENTUSERS *)0) {
+	    if (ConsentUserOk(pADList, pCLServing->username->string) == 1) {
 		Verbose("quit command by %s", pCLServing->acid->string);
 		FileWrite(pCLServing->fd, FLAGFALSE,
 			  "ok -- terminated\r\n", -1);
@ -613,9 +611,7 @@ DoNormalRead(pCLServing)
 			  "unauthorized command\r\n", -1);
 	} else if (pCLServing->iState == S_NORMAL &&
 		   strcmp(pcCmd, "restart") == 0) {
-	    if (ConsentFindUser(pADList, pCLServing->username->string) !=
-		(CONSENTUSERS *)0 ||
-		ConsentFindUser(pADList, "*") != (CONSENTUSERS *)0) {
+	    if (ConsentUserOk(pADList, pCLServing->username->string) == 1) {
 		FileWrite(pCLServing->fd, FLAGFALSE,
 			  "ok -- restarting\r\n", -1);
 		Verbose("restart command by %s", pCLServing->acid->string);
@ -635,7 +631,7 @@ DoNormalRead(pCLServing)
 			  pGE->port);
 		iSep = 0;
 	    }
-	    FileWrite(pCLServing->fd, FLAGFALSE, "\r\n", -1);
+	    FileWrite(pCLServing->fd, FLAGFALSE, "\r\n", 2);
 	} else if (pCLServing->iState == S_NORMAL &&
 		   strcmp(pcCmd, "call") == 0) {
 	    if (pcArgs == (char *)0)
@ -762,6 +758,7 @@ Master()
 	    fSawHUP = 0;
 	    Msg("processing SIGHUP");
 	    ReopenLogfile();
+	    ReopenUnifiedlog();
 	    SignalKids(SIGHUP);
 	    ReReadCfg(msfd);
 	    /* fix up the client descriptors since ReReadCfg() doesn't
@ -783,6 +780,7 @@ Master()
 	    fSawUSR2 = 0;
 	    Msg("processing SIGUSR2");
 	    ReopenLogfile();
+	    ReopenUnifiedlog();
 	    SignalKids(SIGUSR2);
 	}
 	if (fSawQuit) {		/* Something above set the quit flag */
@ -925,11 +923,13 @@ Master()
 	if (ClientAccessOk(pCL)) {
 	    pCL->ioState = ISNORMAL;
 	    /* say hi to start */
-	    FileWrite(pCL->fd, FLAGFALSE, "ok\r\n", -1);
+	    FileWrite(pCL->fd, FLAGFALSE, "ok\r\n", 4);
 	} else
 	    DropMasterClient(pCL, FLAGFALSE);
    }

+    close(msfd);
+
    /* clean up the free list */
    while (pCLmfree != (CONSCLIENT *)0) {
 	pCL = pCLmfree->pCLnext;
--- a/conserver/master.h
+++ b/conserver/master.h
@ -1,5 +1,5 @@
 /*
- *  $Id: master.h,v 5.17 2003-10-03 07:23:37-07 bryan Exp $
+ *  $Id: master.h,v 5.17 2003/10/03 14:23:37 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
--- a/conserver/readcfg.c
+++ b/conserver/readcfg.c
--- a/conserver/readcfg.h
+++ b/conserver/readcfg.h
@ -1,22 +1,28 @@
 /*
- *  $Id: readcfg.h,v 5.34 2003-10-10 08:57:17-07 bryan Exp $
+ *  $Id: readcfg.h,v 5.38 2003/11/10 15:37:24 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
 *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
 */

+#define BREAKDELAYDEFAULT 250
+
 typedef struct config {
    STRING *name;
    char defaultaccess;
    FLAG daemonmode;
    char *logfile;
-    char *initcmd;
    char *passwdfile;
    char *primaryport;
    FLAG redirect;
+    FLAG loghostnames;
    int reinitcheck;
    char *secondaryport;
+    char *unifiedlog;
+#if HAVE_SETPROCTITLE
+    FLAG setproctitle;
+#endif
 #if HAVE_OPENSSL
    char *sslcredentials;
    FLAG sslrequired;
--- a/conserver/version.h
+++ b/conserver/version.h
@ -1,5 +1,5 @@
 /*
- *  $Id: version.h,v 1.50 2003-10-10 09:02:08-07 bryan Exp $
+ *  $Id: version.h,v 1.53 2003/11/20 14:15:39 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -14,4 +14,4 @@
@(#) Copyright 2000 conserver.com.\n\
 All rights reserved.\n"

-#define THIS_VERSION "conserver.com version 8.0.4"
+#define THIS_VERSION "conserver.com version 8.0.7"
--- a/console/Makefile.in
+++ b/console/Makefile.in
@ -25,7 +25,7 @@ LIBS	= @LIBS@

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

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

--- a/console/console.c
+++ b/console/console.c
@ -1,5 +1,5 @@
 /*
- *  $Id: console.c,v 5.147 2003-10-03 15:21:34-07 bryan Exp $
+ *  $Id: console.c,v 5.151 2003/11/20 13:56:41 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -32,7 +32,7 @@
 #include <pwd.h>

 #include <getpassword.h>
-#include <util.h>
+#include <cutil.h>
 #include <version.h>
 #if HAVE_OPENSSL
 #include <openssl/ssl.h>
@ -55,8 +55,6 @@ CONSFILE *cfstdout;
 char *pcUser = (char *)0;
 int disconnectCount = 0;

-static char acMesg[8192];	/* the buffer for startup negotiation   */
-
 #if HAVE_OPENSSL
 SSL_CTX *ctx = (SSL_CTX *)0;

@ -696,6 +694,7 @@ CallUp(pcf, pcMaster, pcMach, pcHow, result)
    int i;
    int justProcessedUrg = 0;
    char *r = (char *)0;
+    static char acMesg[8192];

    if (fVerbose) {
 	Msg("%s to %s (on %s)", pcHow, pcMach, pcMaster);
@ -770,8 +769,8 @@ CallUp(pcf, pcMaster, pcMach, pcHow, result)
 	/* tell the conserver to change escape sequences, assume OK
 	 * (we'll find out soon enough)
 	 */
-	sprintf(acMesg, "%c%ce%c%c", DEFATTN, DEFESC, chAttn, chEsc);
-	FileWrite(pcf, FLAGFALSE, acMesg, 5);
+	FilePrint(pcf, FLAGFALSE, "%c%ce%c%c", DEFATTN, DEFESC, chAttn,
+		  chEsc);
 	r = ReadReply(pcf, 0);
 	if (strncmp(r, "[redef:", 7) != 0) {
 	    Error("protocol botch on redef of escape sequence");
@ -806,15 +805,12 @@ CallUp(pcf, pcMaster, pcMach, pcHow, result)
 		Error("%s is read-only", pcMach);
 	    }
 	} else if (fIn != (*pcHow == 'f' ? 'a' : *pcHow)) {
-	    sprintf(acMesg, "%c%c%c", chAttn, chEsc, *pcHow);
-	    FileWrite(pcf, FLAGFALSE, acMesg, 3);
+	    FilePrint(pcf, FLAGFALSE, "%c%c%c", chAttn, chEsc, *pcHow);
 	}
 	if (fReplay) {
-	    sprintf(acMesg, "%c%cr", chAttn, chEsc);
-	    FileWrite(pcf, FLAGFALSE, acMesg, 3);
+	    FilePrint(pcf, FLAGFALSE, "%c%cr", chAttn, chEsc);
 	} else if (fVerbose) {
-	    sprintf(acMesg, "%c%c\022", chAttn, chEsc);
-	    FileWrite(pcf, FLAGFALSE, acMesg, 3);
+	    FilePrint(pcf, FLAGFALSE, "%c%c\022", chAttn, chEsc);
 	}
    }
    fflush(stdout);
@ -972,11 +968,7 @@ DoCmds(master, ports, cmdi)
 	}
 #endif

-	BuildTmpString((char *)0);
-	BuildTmpString("login ");
-	BuildTmpString(pcUser);
-	t = BuildTmpString("\r\n");
-	FileWrite(pcf, FLAGFALSE, t, -1);
+	FilePrint(pcf, FLAGFALSE, "login %s\r\n", pcUser);

 	t = ReadReply(pcf, 0);
 	if (strncmp(t, "passwd?", 7) == 0) {
@ -994,15 +986,16 @@ DoCmds(master, ports, cmdi)
 		tmpString = AllocString();
 	    if (tmpString->used <= 1) {
 		char *pass;
-		sprintf(acMesg, "Enter %s@%s's password: ", pcUser,
-			hostname);
-		pass = GetPassword(acMesg);
+		BuildStringPrint(tmpString, "Enter %s@%s's password: ",
+				 pcUser, hostname);
+		pass = GetPassword(tmpString->string);
 		if (pass == (char *)0) {
 		    Error("could not get password from tty for `%s'",
 			  server);
 		    FileClose(&pcf);
 		    continue;
 		}
+		BuildString((char *)0, tmpString);
 		BuildString(pass, tmpString);
 		BuildString("\r\n", tmpString);
 	    }
@ -1367,7 +1360,7 @@ main(argc, argv)
 	/* non-numeric only */
 	struct servent *pSE;
 	if ((pSE = getservbyname(pcPort, "tcp")) == (struct servent *)0) {
-	    Error("getservbyname(%s): %s", pcPort, strerror(errno));
+	    Error("getservbyname(%s) failed", pcPort);
 	    Bye(EX_UNAVAILABLE);
 	} else {
 	    bindPort = ntohs((u_short) pSE->s_port);
--- a/console/console.man
+++ b/console/console.man
@ -1,5 +1,5 @@
-.\" $Id: console.man,v 1.37 2003-10-02 19:00:45-07 bryan Exp $
-.TH CONSOLE 1 "2003-10-02" "conserver-8.0.4" "conserver"
+.\" $Id: console.man,v 1.40 2003/11/16 15:35:45 bryan Exp $
+.TH CONSOLE 1 "2003/11/16" "conserver-8.0.7" "conserver"
 .SH NAME
 console \- console server client program
 .SH SYNOPSIS
@ -302,7 +302,7 @@ were typed).
 .PP
 The
 .B \-i
-option outputs information regarding each console in 13 colon-separated fields.
+option outputs information regarding each console in 15 colon-separated fields.
 .TP
 .I name
 The name of the console.
@ -318,7 +318,7 @@ a command, or `!' for a remote port.
 .TP
 .I console-details
 The details regarding the console.
-The values here (all comma seperated) depend on the type of the console.
+The values here (all comma separated) depend on the type of the console.
 Local devices will have values of the device file, baud rate, and
 file descriptor for the device.
 Commands will have values of the command, the command's pid, the
@ -329,11 +329,11 @@ and file descriptor for the socket connection.
 .I users-list
 The details of each user connected to the console.
 The details for each
-user are an `@' seperated list of `w', `r', or `s' (for read-write, read-only,
+user are an `@' separated list of `w', `r', or `s' (for read-write, read-only,
 or suspended), username, hostname the user is on, the user's idle time,
 and (for `r' and `s' users only) ``rw'' or ``ro'' (if the user wants
 read-write mode or not).
-Each user bundle is seperated by commas.
+Each user bundle is separated by commas.
 .TP
 .I state
 The state of the console.
@ -347,7 +347,7 @@ that the server can open the file for read, but not write.
 .TP
 .I logfile-details
 The details regarding the logging for the console.
-The comma seperated
+The comma separated
 values will be the logfile, ``log'' or ``nolog'' (if logging is on
 or not - toggled via ^EcL), ``act'' or ``noact'' (if activity logging is
 enabled or not - the `a' timestamp option), the timestamp interval, and
@ -362,13 +362,19 @@ is at work, it will have the value of ``autoup'', otherwise it
 will be ``noautoup''.
 .TP
 .I aliases
-The console aliases are presented in a comma seperated list.
+The console aliases are presented in a comma separated list.
 .TP
 .I options
-The active options for the console are presented in a comma seperated list.
+The active options for the console are presented in a comma separated list.
 .TP
 .I initcmd
 The initcmd configuration option for the console.
+.TP
+.I idletimeout
+The idletimeout configuration option for the console.
+.TP
+.I idlestring
+The idlestring configuration option for the console.
 .SH "ESCAPE SEQUENCES"
 The connection can be controlled by a two-character escape sequence, followed
 by a command.
@ -402,6 +408,9 @@ forcibly attach read-write
 .B g
 group info
 .TP
+.B i
+information dump
+.TP
 .B L
 toggle logging on/off
 .TP
--- a/console/getpassword.c
+++ b/console/getpassword.c
@ -1,5 +1,5 @@
 /*
- *  $Id: getpassword.c,v 1.7 2003-09-28 12:29:17-07 bryan Exp $
+ *  $Id: getpassword.c,v 1.8 2003/11/20 13:56:41 bryan Exp $
 *
 *  Copyright conserver.com, 2000
 *
@ -12,7 +12,7 @@

 #include <pwd.h>

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


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

 #
-#  $Id: README,v 1.4 2003-09-29 07:29:37-07 bryan Exp $
+#  $Id: README,v 1.4 2003/09/29 14:29:37 bryan Exp $
 #
--- a/contrib/redhat-rpm/conserver.spec
+++ b/contrib/redhat-rpm/conserver.spec
@ -4,7 +4,7 @@
 #

 %define pkg  conserver
-%define ver  conserver-8.0.4
+%define ver  8.0.7

 # define the name of the machine on which the main conserver
 # daemon will be running if you don't want to use the default
@ -17,7 +17,7 @@
 Summary: Serial console server daemon/client
 Name: %{pkg}
 Version: %{ver}
-Release: 1.%{distver}x
+Release: 1.%{distver}
 Copyright: distributable
 Group: System Environment/Daemons
 URL: http://www.conserver.com/
@ -100,4 +100,6 @@ fi
 %{prefix}/share/man/man8/conserver.8.gz
 %{prefix}/share/man/man5/conserver.cf.5.gz
 %{prefix}/share/man/man5/conserver.passwd.5.gz
+%{prefix}/share/examples/conserver/conserver.cf
+%{prefix}/share/examples/conserver/conserver.passwd
 %{prefix}/sbin/conserver
--- a/contrib/solaris-package/pkginfo
+++ b/contrib/solaris-package/pkginfo
@ -1,7 +1,7 @@
 PKG="conserver"
 NAME="Console server and client"
 CATEGORY="system"
-VERSION="conserver-8.0.4"
+VERSION="8.0.7"
 DESC="Console server and client"
 CLASSES=none
 ARCH=sparc
--- a/test/dotest
+++ b/test/dotest
@ -33,7 +33,7 @@ dotest()
    else
 	if [ -f results/test$testnum ]; then
 	    if diff -i test.out results/test$testnum >test$testnum.diff 2>&1; then
-		echo "succeded"
+		echo "succeeded"
 		rm -f test$testnum.diff
 	    else
 		echo "failed (diffs in test$testnum.diff)"
Author	SHA1	Message	Date
Bryan Stansell	691c3102c9	Imported from conserver-8.0.7.tar.gz	2003-11-20 06:49:09 -08:00
Bryan Stansell	eafae7c27d	Imported from conserver-8.0.6.tar.gz	2003-11-16 11:33:39 -08:00
Bryan Stansell	92cf41a9f2	Imported from conserver-8.0.5.tar.gz	2003-10-31 10:15:09 -08:00