diff --git a/CHANGES b/CHANGES
index 59137d8..985517e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,14 @@
 				CHANGES
 				=======
 
+version 7.0.1 (May 3, 2001):
+	- 8bit on by default now (use --disable-8bit for old behavior)
+	- FreeBSD patches by Bill Fenner <fenner@research.att.com>
+	  (hopefully *BSD systems will compile cleaner now)
+	- Bad error reporting on getsockopt() found by Bill Fenner
+	  <fenner@research.att.com>
+	- PID file patch by Martin Andrews <mandrews@netgenics.com>
+
 version 7.0.0 (Feb 18, 2001):
 	- GNU configure-based packaging!!!
 	  All work done by Mark D. Roth <roth@feep.net>.
@@ -101,5 +109,5 @@ before version 6.05:
 	  and enhancements of various types were applied.
 
 #
-#  $Id: CHANGES,v 1.23 2001-02-18 22:36:45-08 bryan Exp $
+#  $Id: CHANGES,v 1.25 2001-05-03 06:44:01-07 bryan Exp $
 #
diff --git a/FAQ b/FAQ
index 8aab2f2..7aa34df 100644
--- a/FAQ
+++ b/FAQ
@@ -5,21 +5,40 @@
 This is the Conserver FAQ.  Any suggestions/corrections/etc should be
 directed to faq@conserver.com.  The FAQ answers the following questions:
 
-    1) Where can I find the software?
-    2) How do I deal with these serial ports?
-    3) How can I tell what compile-time defaults were used?
-    4) What does "conserver: getservbyname: conserver: No such file or
+    1) What is conserver?
+    2) Where can I find the software?
+    3) How do I deal with these serial ports?
+    4) How can I tell what compile-time defaults were used?
+    5) What does "conserver: getservbyname: conserver: No such file or
        directory" mean (or something close to that)?
-    5) What does "console: gethostbyname: console: host lookup error"
+    6) What does "console: gethostbyname: console: host lookup error"
        mean (or something close to that)?
-    6) How do I set up a serial port for no parity?
+    7) How do I set up a serial port for no parity?
 
 
- 1) Where can I find the software?
+ 1) What is conserver?
+
+    From an email I quickly wrote to a potential user (I'll try and
+    clean it up and make it a little clearer sometime soon):
+
+    Conserver is an application that allows multiple users to watch a
+    serial console at the same time.  It can log the data, allows users
+    to take write-access of a console (one at a time), and has a
+    variety of bells and whistles to accentuate that basic
+    functionality.  The idea is that conserver will log all your serial
+    traffic so you can go back and review why something crashed, look
+    at changes (if done on the console), or tie the console logs into a
+    monitoring system (just watch the logfiles it creates).  With
+    multi-user capabilities you can work on equipment with others,
+    mentor, train, etc.  It also does all that client-server stuff so
+    that, assuming you have a network connection, you can interact with
+    any of the equipment from home or wherever.
+
+ 2) Where can I find the software?
 
     The latest version can be found at http://www.conserver.com/
 
- 2) How do I wire/hook up serial ports?
+ 3) How do I wire/hook up serial ports?
 
     David "Zonker" Harris has a wonderful set of pages that talk about
     hooking up many types of terminal servers, equipment, etc.  It also
@@ -30,12 +49,12 @@ directed to faq@conserver.com.  The FAQ answers the following questions:
     http://www.stokely.com/.  Just look around and be amazed at what
     you'll find!
 
- 3) How can I tell what compile-time defaults were used?
+ 4) How can I tell what compile-time defaults were used?
 
     The compile-time defaults can be found by running conserver and
     console with the -V flag.  Simple as that.
 
- 4) What does "conserver: getservbyname: conserver: No such file or
+ 5) What does "conserver: getservbyname: conserver: No such file or
     directory" mean (or something close to that)?
 
     When conserver was compiled, it was told to use the /etc/services
@@ -44,7 +63,7 @@ directed to faq@conserver.com.  The FAQ answers the following questions:
     PORT instead of SERVICE in conserver/cons.h) or enter "conserver"
     in /etc/services.
 
- 5) What does "console: gethostbyname: console: host lookup error"
+ 6) What does "console: gethostbyname: console: host lookup error"
     mean (or something close to that)?
 
     When the console command was compiled, it was told to use the
@@ -53,12 +72,12 @@ directed to faq@conserver.com.  The FAQ answers the following questions:
     appropriate name of your conserver host or add an alias of "console".
     In most cases, adding an alias is my suggestion.
 
- 6) How do I set up a local serial port for no parity?
+ 7) How do I set up a local serial port for no parity?
 
     The conserver.cf man page will have this in the 6.17 release,
     but the answer is to use a 'p' after the baud rate.  So, '9600p'
     is 9600 baud, no parity.
 
 #
-#  $Id: FAQ,v 1.2 2000-12-13 12:20:03-08 bryan Exp $
+#  $Id: FAQ,v 1.3 2001-04-04 16:58:49-07 bryan Exp $
 #
diff --git a/README b/README
index 1d85f34..ab61659 100644
--- a/README
+++ b/README
@@ -43,8 +43,8 @@ Mailing Lists
     informing of new versions, major developments, etc.
     [4]users@conserver.com is for general Q&A, discussions, ideas, etc
     for conserver users. You can sign up my sending a message to
-    list-request@conserver.com with a subject of "subscribe" or head
-    over to the online [5]web pages.
+    listname-request@conserver.com with a subject of "subscribe" or
+    head over to the online [5]web pages.
 
 
 Origin
@@ -100,5 +100,5 @@ References
    6. http://www.certaintysolutions.com/
 
 #
-#  $Id: README,v 1.14 2001-02-18 22:49:41-08 bryan Exp $
+#  $Id: README,v 1.15 2001-03-05 02:41:56-08 bryan Exp $
 #
diff --git a/compat.h b/compat.h
index e8bfb75..cf8aa44 100644
--- a/compat.h
+++ b/compat.h
@@ -183,3 +183,32 @@ extern char *h_errlist[];
 # define setgroups(x, y)	0
 #endif
 
+/*
+ * IUCLC, OLCUC and XCASE were removed from IEEE Std 1003.1-200x
+ *  as legacy definitions.
+ */
+#ifndef IUCLC
+#define IUCLC 0
+#endif
+#ifndef OLCUC
+#define OLCUC 0
+#endif
+#ifndef XCASE
+#define XCASE 0
+#endif
+/* Some systems don't have OFILL or *DLY. */
+#ifndef OFILL
+#define OFILL 0
+#endif
+#ifndef NLDLY
+#define NLDLY 0
+#endif
+#ifndef CRDLY
+#define CRDLY 0
+#endif
+#ifndef TABDLY
+#define TABDLY 0
+#endif
+#ifndef BSDLY
+#define BSDLY 0
+#endif
diff --git a/config.h.in b/config.h.in
index ed6a8c9..e7773cb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -50,6 +50,11 @@
  */
 #undef PASSWDFILE
 
+/*
+ * Process ID file path
+ */
+#undef PIDFILE
+
 /*
  * Number of consoles per child process
  */
diff --git a/configure b/configure
index 4f31596..f5c57dd 100755
--- a/configure
+++ b/configure
@@ -19,12 +19,14 @@ ac_help="$ac_help
   --with-cffile=CFFILE    Specify config filename [conserver.cf] "
 ac_help="$ac_help
   --with-pwdfile=PWDFILE  Specify password filename [conserver.passwd] "
+ac_help="$ac_help
+  --with-pidfile=PIDFILE  Specify PID filepath [/var/run/conserver.pid] "
 ac_help="$ac_help
   --with-maxmemb=MAXMEMB  Specify maximum consoles per process [16]"
 ac_help="$ac_help
   --with-maxgrp=MAXGRP    Specify maximum number of processes [32]"
 ac_help="$ac_help
-  --enable-8bit           Enable 8bit data path "
+  --disable-8bit          Disable 8bit data path "
 ac_help="$ac_help
   --with-timeout=TIMEOUT  Specify connect() timeout in seconds [10]"
 
@@ -548,7 +550,7 @@ MKDIR="mkdir -p -m 755"
 
 
 echo $ac_n "checking for port number specification""... $ac_c" 1>&6
-echo "configure:552: checking for port number specification" >&5
+echo "configure:554: checking for port number specification" >&5
 # Check whether --with-port or --without-port was given.
 if test "${with_port+set}" = set; then
   withval="$with_port"
@@ -583,7 +585,7 @@ fi
 
 
 echo $ac_n "checking for master conserver hostname""... $ac_c" 1>&6
-echo "configure:587: checking for master conserver hostname" >&5
+echo "configure:589: checking for master conserver hostname" >&5
 # Check whether --with-master or --without-master was given.
 if test "${with_master+set}" = set; then
   withval="$with_master"
@@ -610,7 +612,7 @@ fi
 
 
 echo $ac_n "checking for configuration filename""... $ac_c" 1>&6
-echo "configure:614: checking for configuration filename" >&5
+echo "configure:616: checking for configuration filename" >&5
 # Check whether --with-cffile or --without-cffile was given.
 if test "${with_cffile+set}" = set; then
   withval="$with_cffile"
@@ -637,7 +639,7 @@ fi
 
 
 echo $ac_n "checking for password filename""... $ac_c" 1>&6
-echo "configure:641: checking for password filename" >&5
+echo "configure:643: checking for password filename" >&5
 # Check whether --with-pwdfile or --without-pwdfile was given.
 if test "${with_pwdfile+set}" = set; then
   withval="$with_pwdfile"
@@ -663,8 +665,35 @@ EOF
 fi
 
 
+echo $ac_n "checking for PID filename""... $ac_c" 1>&6
+echo "configure:670: checking for PID filename" >&5
+# Check whether --with-pidfile or --without-pidfile was given.
+if test "${with_pidfile+set}" = set; then
+  withval="$with_pidfile"
+  if test "$withval" != yes; then
+		cat >> confdefs.h <<EOF
+#define PIDFILE "$withval"
+EOF
+
+		echo "$ac_t""'$withval'" 1>&6
+	else
+		cat >> confdefs.h <<EOF
+#define PIDFILE "/var/run/conserver.pid"
+EOF
+
+		echo "$ac_t""'/var/run/conserver.pid'" 1>&6
+	fi
+else
+  cat >> confdefs.h <<EOF
+#define PIDFILE "/var/run/conserver.pid"
+EOF
+
+	echo "$ac_t""'/var/run/conserver.pid'" 1>&6
+fi
+
+
 echo $ac_n "checking for MAXMEMB setting""... $ac_c" 1>&6
-echo "configure:668: checking for MAXMEMB setting" >&5
+echo "configure:697: checking for MAXMEMB setting" >&5
 # Check whether --with-maxmemb or --without-maxmemb was given.
 if test "${with_maxmemb+set}" = set; then
   withval="$with_maxmemb"
@@ -691,7 +720,7 @@ fi
 
 
 echo $ac_n "checking for MAXGRP setting""... $ac_c" 1>&6
-echo "configure:695: checking for MAXGRP setting" >&5
+echo "configure:724: checking for MAXGRP setting" >&5
 # Check whether --with-maxgrp or --without-maxgrp was given.
 if test "${with_maxgrp+set}" = set; then
   withval="$with_maxgrp"
@@ -718,26 +747,34 @@ fi
 
 
 echo $ac_n "checking for 8bit setting""... $ac_c" 1>&6
-echo "configure:722: checking for 8bit setting" >&5
+echo "configure:751: checking for 8bit setting" >&5
 # Check whether --enable-8bit or --disable-8bit was given.
 if test "${enable_8bit+set}" = set; then
   enableval="$enable_8bit"
+  if test "$enableval" != yes; then
+		cat >> confdefs.h <<EOF
+#define CPARITY 1
+EOF
+
+		echo "$ac_t""no" 1>&6
+	else
+		cat >> confdefs.h <<EOF
+#define CPARITY 0
+EOF
+
+		echo "$ac_t""yes" 1>&6
+	fi
+else
   cat >> confdefs.h <<EOF
 #define CPARITY 0
 EOF
 
 	echo "$ac_t""yes" 1>&6
-else
-  cat >> confdefs.h <<EOF
-#define CPARITY 1
-EOF
-
-	echo "$ac_t""no" 1>&6
 fi
 
 
 echo $ac_n "checking for connect() timeout""... $ac_c" 1>&6
-echo "configure:741: checking for connect() timeout" >&5
+echo "configure:778: checking for connect() timeout" >&5
 # Check whether --with-timeout or --without-timeout was given.
 if test "${with_timeout+set}" = set; then
   withval="$with_timeout"
@@ -766,7 +803,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:770: checking for $ac_word" >&5
+echo "configure:807: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -796,7 +833,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:800: checking for $ac_word" >&5
+echo "configure:837: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -847,7 +884,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:851: checking for $ac_word" >&5
+echo "configure:888: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -879,7 +916,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:883: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:920: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -890,12 +927,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 894 "configure"
+#line 931 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -921,12 +958,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:925: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:962: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:930: checking whether we are using GNU C" >&5
+echo "configure:967: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -935,7 +972,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -954,7 +991,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:958: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:995: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1016,7 +1053,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1020: checking for a BSD compatible install" >&5
+echo "configure:1057: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1069,7 +1106,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1073: checking whether ln -s works" >&5
+echo "configure:1110: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1090,7 +1127,7 @@ else
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1094: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1131: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1119,7 +1156,7 @@ fi
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1123: checking how to run the C preprocessor" >&5
+echo "configure:1160: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1134,13 +1171,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1138 "configure"
+#line 1175 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1151,13 +1188,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1155 "configure"
+#line 1192 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1168,13 +1205,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1172 "configure"
+#line 1209 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1199,9 +1236,9 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1203: checking for AIX" >&5
+echo "configure:1240: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1205 "configure"
+#line 1242 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1223,12 +1260,12 @@ rm -f conftest*
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1227: checking for working const" >&5
+echo "configure:1264: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1232 "configure"
+#line 1269 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1277,7 +1314,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1300,12 +1337,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1304: checking for ANSI C header files" >&5
+echo "configure:1341: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1309 "configure"
+#line 1346 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1313,7 +1350,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1330,7 +1367,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1334 "configure"
+#line 1371 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1348,7 +1385,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1352 "configure"
+#line 1389 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1369,7 +1406,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1373 "configure"
+#line 1410 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1380,7 +1417,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1407,17 +1444,17 @@ for ac_hdr in sys/ioctl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1411: checking for $ac_hdr" >&5
+echo "configure:1448: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1416 "configure"
+#line 1453 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1448,17 +1485,17 @@ for ac_hdr in termios.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1452: checking for $ac_hdr" >&5
+echo "configure:1489: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1457 "configure"
+#line 1494 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1489,17 +1526,17 @@ if test "$ac_cv_header_termios_h" != "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1493: checking for $ac_hdr" >&5
+echo "configure:1530: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1498 "configure"
+#line 1535 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1530,17 +1567,17 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1534: checking for $ac_hdr" >&5
+echo "configure:1571: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1539 "configure"
+#line 1576 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1576,17 +1613,17 @@ for ac_hdr in unistd.h getopt.h sys/vlimit.h sys/resource.h ttyent.h sys/ttold.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1580: checking for $ac_hdr" >&5
+echo "configure:1617: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1585 "configure"
+#line 1622 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1613,12 +1650,12 @@ fi
 done
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1617: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1654: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1622 "configure"
+#line 1659 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1627,7 +1664,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1648,12 +1685,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1652: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:1689: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1657 "configure"
+#line 1694 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -1669,7 +1706,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -1690,12 +1727,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:1694: checking for mode_t" >&5
+echo "configure:1731: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1699 "configure"
+#line 1736 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1723,12 +1760,12 @@ EOF
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:1727: checking return type of signal handlers" >&5
+echo "configure:1764: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1732 "configure"
+#line 1769 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -1745,7 +1782,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:1749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -1765,12 +1802,12 @@ EOF
 
 
 echo $ac_n "checking if sig_atomic_t is defined""... $ac_c" 1>&6
-echo "configure:1769: checking if sig_atomic_t is defined" >&5
+echo "configure:1806: checking if sig_atomic_t is defined" >&5
 if eval "test \"`echo '$''{'ac_cv_type_sig_atomic_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1774 "configure"
+#line 1811 "configure"
 #include "confdefs.h"
 
     #include <signal.h>
@@ -1782,7 +1819,7 @@ int main() {
   
 ; return 0; }
 EOF
-if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_type_sig_atomic_t=yes
 else
@@ -1805,14 +1842,15 @@ EOF
 fi
 
 echo $ac_n "checking if socklen_t is defined""... $ac_c" 1>&6
-echo "configure:1809: checking if socklen_t is defined" >&5
+echo "configure:1846: checking if socklen_t is defined" >&5
 if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1814 "configure"
+#line 1851 "configure"
 #include "confdefs.h"
 
+    #include <sys/types.h>
     #include <sys/socket.h>
   
 int main() {
@@ -1822,7 +1860,7 @@ int main() {
   
 ; return 0; }
 EOF
-if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_type_socklen_t=yes
 else
@@ -1849,12 +1887,12 @@ fi
 for ac_func in getopt strerror getrlimit getsid setsid getuserattr setgroups tcgetpgrp tcsetpgrp tcgetattr tcsetattr tcsendbreak setpgrp getutent setttyent wait3 getspnam setlinebuf setvbuf getpseudo ptsname flock sigaction setsockopt getdtablesize putenv memset memcpy memcmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1853: checking for $ac_func" >&5
+echo "configure:1891: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1858 "configure"
+#line 1896 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1877,7 +1915,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1902,7 +1940,7 @@ fi
 done
 
 echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:1906: checking whether setpgrp takes no argument" >&5
+echo "configure:1944: checking whether setpgrp takes no argument" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1910,7 +1948,7 @@ else
   { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1914 "configure"
+#line 1952 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_UNISTD_H
@@ -1930,7 +1968,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_setpgrp_void=no
 else
@@ -1956,7 +1994,7 @@ fi
 
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:1960: checking for socket in -lsocket" >&5
+echo "configure:1998: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1964,7 +2002,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1968 "configure"
+#line 2006 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1975,7 +2013,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:1979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2003,7 +2041,7 @@ else
 fi
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2007: checking for gethostbyname in -lnsl" >&5
+echo "configure:2045: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2011,7 +2049,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2015 "configure"
+#line 2053 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2022,7 +2060,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2050,7 +2088,7 @@ else
 fi
 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:2054: checking for crypt in -lcrypt" >&5
+echo "configure:2092: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2058,7 +2096,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2062 "configure"
+#line 2100 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2069,7 +2107,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
diff --git a/configure.in b/configure.in
index 8c2abef..55927f6 100644
--- a/configure.in
+++ b/configure.in
@@ -69,6 +69,19 @@ AC_ARG_WITH(pwdfile,
 	[AC_DEFINE_UNQUOTED(PASSWDFILE, "conserver.passwd")
 	AC_MSG_RESULT('conserver.passwd')])
 
+AC_MSG_CHECKING(for PID filename)
+AC_ARG_WITH(pidfile,
+	[  --with-pidfile=PIDFILE  Specify PID filepath [/var/run/conserver.pid] ],
+	[if test "$withval" != yes; then
+		AC_DEFINE_UNQUOTED(PIDFILE, "$withval")
+		AC_MSG_RESULT('$withval')
+	else
+		AC_DEFINE_UNQUOTED(PIDFILE, "/var/run/conserver.pid")
+		AC_MSG_RESULT('/var/run/conserver.pid')
+	fi],
+	[AC_DEFINE_UNQUOTED(PIDFILE, "/var/run/conserver.pid")
+	AC_MSG_RESULT('/var/run/conserver.pid')])
+
 AC_MSG_CHECKING(for MAXMEMB setting)
 AC_ARG_WITH(maxmemb,
 	[  --with-maxmemb=MAXMEMB  Specify maximum consoles per process [16]],
@@ -97,11 +110,16 @@ AC_ARG_WITH(maxgrp,
 
 AC_MSG_CHECKING(for 8bit setting)
 AC_ARG_ENABLE(8bit,
-	[  --enable-8bit           Enable 8bit data path ],
+	[  --disable-8bit          Disable 8bit data path ],
+	[if test "$enableval" != yes; then
+		AC_DEFINE_UNQUOTED(CPARITY, 1)
+		AC_MSG_RESULT(no)
+	else
+		AC_DEFINE_UNQUOTED(CPARITY, 0)
+		AC_MSG_RESULT(yes)
+	fi],
 	[AC_DEFINE_UNQUOTED(CPARITY, 0)
-	AC_MSG_RESULT(yes)],
-	[AC_DEFINE_UNQUOTED(CPARITY, 1)
-	AC_MSG_RESULT(no)])
+	AC_MSG_RESULT(yes)])
 
 AC_MSG_CHECKING(for connect() timeout)
 AC_ARG_WITH(timeout,
@@ -169,6 +187,7 @@ fi
 
 AC_CACHE_CHECK([if socklen_t is defined], ac_cv_type_socklen_t,
   AC_TRY_LINK([
+    #include <sys/types.h>
     #include <sys/socket.h>
   ], [
     socklen_t len = 0;
diff --git a/conserver/access.c b/conserver/access.c
index edf6176..b77ad4c 100644
--- a/conserver/access.c
+++ b/conserver/access.c
@@ -1,7 +1,7 @@
 /*
- *  $Id: access.c,v 5.17 2001-02-08 15:31:07-08 bryan Exp $
+ *  $Id: access.c,v 5.18 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/access.h b/conserver/access.h
index 459ba6c..e0a11f3 100644
--- a/conserver/access.h
+++ b/conserver/access.h
@@ -1,7 +1,7 @@
 /*
- *  $Id: access.h,v 5.9 2000-12-13 12:31:07-08 bryan Exp $
+ *  $Id: access.h,v 5.10 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/client.c b/conserver/client.c
index 007ca6e..6b72d3d 100644
--- a/conserver/client.c
+++ b/conserver/client.c
@@ -1,7 +1,7 @@
 /*
- *  $Id: client.c,v 5.24 2001-02-08 15:31:40-08 bryan Exp $
+ *  $Id: client.c,v 5.25 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/client.h b/conserver/client.h
index eec178b..e891860 100644
--- a/conserver/client.h
+++ b/conserver/client.h
@@ -1,7 +1,7 @@
 /*
- *  $Id: client.h,v 5.15 2001-02-03 20:17:02-08 bryan Exp $
+ *  $Id: client.h,v 5.16 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/consent.c b/conserver/consent.c
index a2dbfc7..d16aa11 100644
--- a/conserver/consent.c
+++ b/conserver/consent.c
@@ -1,7 +1,7 @@
 /*
- *  $Id: consent.c,v 5.39 2001-02-17 08:36:13-08 bryan Exp $
+ *  $Id: consent.c,v 5.41 2001-05-03 06:31:33-07 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
@@ -779,7 +779,7 @@ int useHostCache;
 		{
 		    fprintf(stderr, "%s: connect: %s (%d@%s): %s: forcing down\n",
 			    progname, pCE->server, ntohs(port.sin_port),
-			    pCE->networkConsoleHost, strerror(errno));
+			    pCE->networkConsoleHost, strerror(flags));
 		    ConsDown(pCE, pfdSet);
 		    return;
 		}
diff --git a/conserver/consent.h b/conserver/consent.h
index 814eb25..e2e5572 100644
--- a/conserver/consent.h
+++ b/conserver/consent.h
@@ -1,7 +1,7 @@
 /*
- *  $Id: consent.h,v 5.16 2001-02-03 20:19:14-08 bryan Exp $
+ *  $Id: consent.h,v 5.17 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/fallback.c b/conserver/fallback.c
index 921892e..642086b 100644
--- a/conserver/fallback.c
+++ b/conserver/fallback.c
@@ -1,7 +1,7 @@
 /*
- *  $Id: fallback.c,v 5.24 2001-02-08 15:31:58-08 bryan Exp $
+ *  $Id: fallback.c,v 5.25 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/group.c b/conserver/group.c
index 553429c..9cab92b 100644
--- a/conserver/group.c
+++ b/conserver/group.c
@@ -1,7 +1,7 @@
 /*
- *  $Id: group.c,v 5.65 2001-02-08 15:31:40-08 bryan Exp $
+ *  $Id: group.c,v 5.66 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/group.h b/conserver/group.h
index 1fc7642..d222a02 100644
--- a/conserver/group.h
+++ b/conserver/group.h
@@ -1,7 +1,7 @@
 /*
- *  $Id: group.h,v 5.12 2001-02-03 20:21:00-08 bryan Exp $
+ *  $Id: group.h,v 5.13 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/main.c b/conserver/main.c
index e685a6e..88b7b8b 100644
--- a/conserver/main.c
+++ b/conserver/main.c
@@ -1,7 +1,7 @@
 /*
- *  $Id: main.c,v 5.39 2001-02-08 15:31:58-08 bryan Exp $
+ *  $Id: main.c,v 5.42 2001-05-03 06:39:43-07 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
@@ -54,7 +54,7 @@
 #include <version.h>
 
 char rcsid[] =
-	"$Id: main.c,v 5.39 2001-02-08 15:31:58-08 bryan Exp $";
+	"$Id: main.c,v 5.42 2001-05-03 06:39:43-07 bryan Exp $";
 char *progname =
 	rcsid;
 int fAll = 1, fVerbose = 0, fSoftcar = 0, fNoinit = 0, fDebug = 0, fVersion = 0;
@@ -82,6 +82,7 @@ static void
 daemonize()
 {
 	int res, td;
+	FILE *fp;
 
 	(void) signal(SIGQUIT, SIG_IGN);
 	(void) signal(SIGINT,  SIG_IGN);
@@ -127,6 +128,14 @@ daemonize()
 		close(td);
 	}
 #endif
+
+	fp = fopen(PIDFILE, "w");
+	if ( fp ) {
+		fprintf(fp, "%d\n", (int) getpid());
+		fclose(fp);
+	} else {
+		fprintf(stderr,"%s: can't write pid to %s\n", progname, PIDFILE);
+	}
 }
 
 
@@ -167,6 +176,7 @@ Version()
 	printf("%s: default escape sequence `%s%s\'\n", progname, FmtCtl(DEFATTN, acA1), FmtCtl(DEFESC, acA2));
 	printf("%s: configuration in `%s\'\n", progname, pcConfig);
 	printf("%s: password in `%s\'\n", progname, pcPasswd);
+	printf("%s: pidfile in `%s\'\n", progname, PIDFILE);
 	printf("%s: limited to %d group%s with %d member%s\n", progname, MAXGRP, MAXGRP == 1 ? "" : "s", MAXMEMB, MAXMEMB == 1 ? "" : "s");
 #if CPARITY
 	printf("%s: high-bit of data stripped (7-bit clean)\n", progname);
diff --git a/conserver/main.h b/conserver/main.h
index 251fac4..91684a4 100644
--- a/conserver/main.h
+++ b/conserver/main.h
@@ -1,7 +1,7 @@
 /*
- *  $Id: main.h,v 5.16 2001-02-08 15:31:58-08 bryan Exp $
+ *  $Id: main.h,v 5.17 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/master.c b/conserver/master.c
index 02384de..4c93253 100644
--- a/conserver/master.c
+++ b/conserver/master.c
@@ -1,7 +1,7 @@
 /*
- *  $Id: master.c,v 5.29 2001-02-08 15:32:28-08 bryan Exp $
+ *  $Id: master.c,v 5.30 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/master.h b/conserver/master.h
index 9567392..6903683 100644
--- a/conserver/master.h
+++ b/conserver/master.h
@@ -1,7 +1,7 @@
 /*
- *  $Id: master.h,v 5.9 2000-12-13 12:31:07-08 bryan Exp $
+ *  $Id: master.h,v 5.10 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/port.h b/conserver/port.h
index 1f37832..8a3e7e6 100644
--- a/conserver/port.h
+++ b/conserver/port.h
@@ -1,7 +1,7 @@
 /*
- *  $Id: port.h,v 1.20 2001-02-08 15:32:49-08 bryan Exp $
+ *  $Id: port.h,v 1.21 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/readcfg.c b/conserver/readcfg.c
index 1e51dab..8d064f0 100644
--- a/conserver/readcfg.c
+++ b/conserver/readcfg.c
@@ -1,7 +1,7 @@
 /*
- *  $Id: readcfg.c,v 5.30 2001-02-08 15:32:28-08 bryan Exp $
+ *  $Id: readcfg.c,v 5.31 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/readcfg.h b/conserver/readcfg.h
index fd6ed64..52b7f69 100644
--- a/conserver/readcfg.h
+++ b/conserver/readcfg.h
@@ -1,7 +1,7 @@
 /*
- *  $Id: readcfg.h,v 5.9 2000-12-13 12:31:07-08 bryan Exp $
+ *  $Id: readcfg.h,v 5.10 2001-02-21 17:26:06-08 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
diff --git a/conserver/version.h b/conserver/version.h
index 75ef5b7..3761e82 100644
--- a/conserver/version.h
+++ b/conserver/version.h
@@ -1,11 +1,11 @@
 /*
- *  $Id: version.h,v 1.20 2001-02-17 08:37:24-08 bryan Exp $
+ *  $Id: version.h,v 1.22 2001-05-03 06:32:16-07 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
  *  Copyright GNAC, Inc., 1998
  */
 
-#define THIS_VERSION "conserver.com version 7.0.0"
+#define THIS_VERSION "conserver.com version 7.0.1"
diff --git a/console/Makefile.in b/console/Makefile.in
index e443e39..03ef5fc 100644
--- a/console/Makefile.in
+++ b/console/Makefile.in
@@ -50,5 +50,5 @@ install:
 	$(MKDIR) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) console $(DESTDIR)$(bindir)
 	$(MKDIR) $(DESTDIR)$(mandir)/man1
-	$(INSTALL) console.man $(DESTDIR)$(mandir)/man8/console.1
+	$(INSTALL) console.man $(DESTDIR)$(mandir)/man1/console.1
 
diff --git a/console/console.c b/console/console.c
index f1de0a7..a74effa 100644
--- a/console/console.c
+++ b/console/console.c
@@ -1,7 +1,7 @@
 /*
- *  $Id: console.c,v 5.35 2001-02-18 22:00:47-08 bryan Exp $
+ *  $Id: console.c,v 5.37 2001-05-03 06:04:11-07 bryan Exp $
  *
- *  Copyright conserver.com, 2000
+ *  Copyright conserver.com, 2000-2001
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
  *
@@ -30,6 +30,7 @@
 #include <config.h>
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <fcntl.h>
@@ -46,7 +47,7 @@
 
 
 static char rcsid[] =
-	"$Id: console.c,v 5.35 2001-02-18 22:00:47-08 bryan Exp $";
+	"$Id: console.c,v 5.37 2001-05-03 06:04:11-07 bryan Exp $";
 static char *progname =
 	rcsid;
 int fVerbose = 0, fReplay = 0, fRaw = 0;