diff --git a/ChangeLog b/ChangeLog
index 54f77f37..cb2598b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4236,18 +4236,24 @@ v0.33.19        26-Oct-2001
 		Fill in the right IP addresses in fields 11 and 12 of your
 		ISP's nameservers. If you don't have internet, fill these
 		with 192.168.1.1 and 192.168.1.2 as dummy addresses.
+		Change the startup program in /etc/inetd.conf for telnet if
+		you previously used mbsebbs to mblogin.
+		Change the default login program in mgetty's login.config to
+		* - - /opt/mbse/bin/mblogin @
 
 	general:
 		Made the Makefile system more simple. The bbs programs now
-		don't run setuid anymore! This makes the system more secure
-		but you can't login with Fidonet style names anymore. You
-		can't start the bbs from telnet anymore! With a later release
-		this may change by adding a login wrapper, for now this is how
-		it works now. Take it or leave it.
+		don't run setuid anymore! This makes the system more secure.
+		A new program, mblogin, is written to allow logins with
+		Fidonet style names. This is a login replacement for bbs use
+		only.
 		On FreeBSD the installed files are not removed anymore from
 		the source tree.
 		Added German language file made by Harald Wuensch.
 		The mbtask daemon now handles the calling of Fidonet nodes.
+		The sourcetree has now a new subdirectory called unix. Here
+		are all the system specific programs such as mbpasswd,
+		mblogin and mbuseradd.
 
 	SETUP.sh
 		Better grep to check for excisting usernames like bbs, mbse.
@@ -4365,6 +4371,7 @@ v0.33.19        26-Oct-2001
 	mbpasswd:
 		Added more checks to see if it's legal invoked.
 		Password change on FreeBSD finally works.
+		Moved to new sourcetree.
 
 	mblogin:
 		New program. Replaces standard login, allows Fidonet style
diff --git a/configure b/configure
index f695a6d2..a5a82afc 100755
--- a/configure
+++ b/configure
@@ -937,7 +937,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 ac_config_commands="$ac_config_commands default-1"
 
-SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbtask mbsetup import lang examples html script"
+SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbtask mbsetup unix import lang examples html script"
 
 PACKAGE="mbsebbs"
 VERSION="0.33.19"
@@ -945,6 +945,8 @@ COPYRIGHT="Copyright (C) 1997-2002 Michiel Broek, All Rights Reserved"
 SHORTRIGHT="Copyright (C) 1997-2002 M. Broek"
 GROUP="bbs"
 OWNER="mbse"
+ROOT="`id -un`"
+RGROUP="`id -gn`"
 
 cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
@@ -966,7 +968,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:969: checking for $ac_word" >&5
+echo "$as_me:971: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -981,7 +983,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:984: found $ac_dir/$ac_word" >&5
+echo "$as_me:986: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -989,10 +991,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:992: result: $CC" >&5
+  echo "$as_me:994: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:995: result: no" >&5
+  echo "$as_me:997: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1001,7 +1003,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1004: checking for $ac_word" >&5
+echo "$as_me:1006: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1016,7 +1018,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1019: found $ac_dir/$ac_word" >&5
+echo "$as_me:1021: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1024,10 +1026,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1027: result: $ac_ct_CC" >&5
+  echo "$as_me:1029: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1030: result: no" >&5
+  echo "$as_me:1032: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1040,7 +1042,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1043: checking for $ac_word" >&5
+echo "$as_me:1045: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1055,7 +1057,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1058: found $ac_dir/$ac_word" >&5
+echo "$as_me:1060: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1063,10 +1065,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1066: result: $CC" >&5
+  echo "$as_me:1068: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1069: result: no" >&5
+  echo "$as_me:1071: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1075,7 +1077,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1078: checking for $ac_word" >&5
+echo "$as_me:1080: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1090,7 +1092,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1093: found $ac_dir/$ac_word" >&5
+echo "$as_me:1095: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1098,10 +1100,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1101: result: $ac_ct_CC" >&5
+  echo "$as_me:1103: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1104: result: no" >&5
+  echo "$as_me:1106: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1114,7 +1116,7 @@ fi
 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 "$as_me:1117: checking for $ac_word" >&5
+echo "$as_me:1119: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1134,7 +1136,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1137: found $ac_dir/$ac_word" >&5
+echo "$as_me:1139: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1156,10 +1158,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1159: result: $CC" >&5
+  echo "$as_me:1161: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1162: result: no" >&5
+  echo "$as_me:1164: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1170,7 +1172,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1173: checking for $ac_word" >&5
+echo "$as_me:1175: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1185,7 +1187,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1188: found $ac_dir/$ac_word" >&5
+echo "$as_me:1190: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1193,10 +1195,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1196: result: $CC" >&5
+  echo "$as_me:1198: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1199: result: no" >&5
+  echo "$as_me:1201: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1209,7 +1211,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1212: checking for $ac_word" >&5
+echo "$as_me:1214: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1224,7 +1226,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1227: found $ac_dir/$ac_word" >&5
+echo "$as_me:1229: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1232,10 +1234,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1235: result: $ac_ct_CC" >&5
+  echo "$as_me:1237: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1238: result: no" >&5
+  echo "$as_me:1240: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1247,12 +1249,12 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1250: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1252: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1255 "configure"
+#line 1257 "configure"
 #include "confdefs.h"
 
 int
@@ -1268,13 +1270,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compiler, and finding out an intuition
 # of exeext.
-echo "$as_me:1271: checking for C compiler default output" >&5
+echo "$as_me:1273: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1274: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1276: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1277: \$? = $ac_status" >&5
+  echo "$as_me:1279: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do
   case $ac_file in
@@ -1291,34 +1293,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1294: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1296: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1300: result: $ac_file" >&5
+echo "$as_me:1302: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1305: checking whether the C compiler works" >&5
+echo "$as_me:1307: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1314: \$? = $ac_status" >&5
+  echo "$as_me:1316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1321: error: cannot run C compiled programs.
+	{ { echo "$as_me:1323: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1326,24 +1328,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1329: result: yes" >&5
+echo "$as_me:1331: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1336: checking whether we are cross compiling" >&5
+echo "$as_me:1338: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1338: result: $cross_compiling" >&5
+echo "$as_me:1340: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1341: checking for executable suffix" >&5
+echo "$as_me:1343: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1346: \$? = $ac_status" >&5
+  echo "$as_me:1348: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1359,25 +1361,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1362: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1364: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1368: result: $ac_cv_exeext" >&5
+echo "$as_me:1370: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1374: checking for object suffix" >&5
+echo "$as_me:1376: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1380 "configure"
+#line 1382 "configure"
 #include "confdefs.h"
 
 int
@@ -1389,10 +1391,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1394: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1395: \$? = $ac_status" >&5
+  echo "$as_me:1397: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1404,24 +1406,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1407: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1409: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1414: result: $ac_cv_objext" >&5
+echo "$as_me:1416: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1418: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1420: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1424 "configure"
+#line 1426 "configure"
 #include "confdefs.h"
 
 int
@@ -1436,16 +1438,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1439: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1442: \$? = $ac_status" >&5
+  echo "$as_me:1444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1448: \$? = $ac_status" >&5
+  echo "$as_me:1450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1457,19 +1459,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1460: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1462: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1466: checking whether $CC accepts -g" >&5
+echo "$as_me:1468: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1472 "configure"
+#line 1474 "configure"
 #include "confdefs.h"
 
 int
@@ -1481,16 +1483,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1487: \$? = $ac_status" >&5
+  echo "$as_me:1489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1493: \$? = $ac_status" >&5
+  echo "$as_me:1495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1500,7 +1502,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1503: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1505: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1527,16 +1529,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1533: \$? = $ac_status" >&5
+  echo "$as_me:1535: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1539: \$? = $ac_status" >&5
+  echo "$as_me:1541: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1548,7 +1550,7 @@ if { (eval echo "$as_me:1530: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1551 "configure"
+#line 1553 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1561,16 +1563,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1567: \$? = $ac_status" >&5
+  echo "$as_me:1569: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1573: \$? = $ac_status" >&5
+  echo "$as_me:1575: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1580,7 +1582,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1583 "configure"
+#line 1585 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1592,16 +1594,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1595: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1597: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1598: \$? = $ac_status" >&5
+  echo "$as_me:1600: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1604: \$? = $ac_status" >&5
+  echo "$as_me:1606: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1627,7 +1629,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Extract the first word of "gawk", so it can be a program name with args.
 set dummy gawk; ac_word=$2
-echo "$as_me:1630: checking for $ac_word" >&5
+echo "$as_me:1632: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1642,7 +1644,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="gawk"
-echo "$as_me:1645: found $ac_dir/$ac_word" >&5
+echo "$as_me:1647: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1650,16 +1652,16 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1653: result: $AWK" >&5
+  echo "$as_me:1655: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1656: result: no" >&5
+  echo "$as_me:1658: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "nawk", so it can be a program name with args.
 set dummy nawk; ac_word=$2
-echo "$as_me:1662: checking for $ac_word" >&5
+echo "$as_me:1664: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1674,7 +1676,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="nawk"
-echo "$as_me:1677: found $ac_dir/$ac_word" >&5
+echo "$as_me:1679: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1682,16 +1684,16 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1685: result: $AWK" >&5
+  echo "$as_me:1687: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1688: result: no" >&5
+  echo "$as_me:1690: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "awk", so it can be a program name with args.
 set dummy awk; ac_word=$2
-echo "$as_me:1694: checking for $ac_word" >&5
+echo "$as_me:1696: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1706,7 +1708,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="awk"
-echo "$as_me:1709: found $ac_dir/$ac_word" >&5
+echo "$as_me:1711: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1714,16 +1716,16 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1717: result: $AWK" >&5
+  echo "$as_me:1719: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1720: result: no" >&5
+  echo "$as_me:1722: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "ginstall", so it can be a program name with args.
 set dummy ginstall; ac_word=$2
-echo "$as_me:1726: checking for $ac_word" >&5
+echo "$as_me:1728: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INSTALL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1738,7 +1740,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INSTALL="ginstall"
-echo "$as_me:1741: found $ac_dir/$ac_word" >&5
+echo "$as_me:1743: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1746,16 +1748,16 @@ fi
 fi
 INSTALL=$ac_cv_prog_INSTALL
 if test -n "$INSTALL"; then
-  echo "$as_me:1749: result: $INSTALL" >&5
+  echo "$as_me:1751: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:1752: result: no" >&5
+  echo "$as_me:1754: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "install", so it can be a program name with args.
 set dummy install; ac_word=$2
-echo "$as_me:1758: checking for $ac_word" >&5
+echo "$as_me:1760: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INSTALL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1770,7 +1772,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INSTALL="install"
-echo "$as_me:1773: found $ac_dir/$ac_word" >&5
+echo "$as_me:1775: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1778,14 +1780,14 @@ fi
 fi
 INSTALL=$ac_cv_prog_INSTALL
 if test -n "$INSTALL"; then
-  echo "$as_me:1781: result: $INSTALL" >&5
+  echo "$as_me:1783: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:1784: result: no" >&5
+  echo "$as_me:1786: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:1788: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1790: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -1805,11 +1807,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1808: result: yes" >&5
+  echo "$as_me:1810: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1812: result: no" >&5
+  echo "$as_me:1814: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1817,7 +1819,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:1820: checking for $ac_word" >&5
+echo "$as_me:1822: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1832,7 +1834,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:1835: found $ac_dir/$ac_word" >&5
+echo "$as_me:1837: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1840,10 +1842,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:1843: result: $RANLIB" >&5
+  echo "$as_me:1845: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:1846: result: no" >&5
+  echo "$as_me:1848: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1852,7 +1854,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:1855: checking for $ac_word" >&5
+echo "$as_me:1857: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1867,7 +1869,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:1870: found $ac_dir/$ac_word" >&5
+echo "$as_me:1872: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1876,10 +1878,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:1879: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:1881: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:1882: result: no" >&5
+  echo "$as_me:1884: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1892,7 +1894,7 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1895: checking for $ac_word" >&5
+echo "$as_me:1897: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1907,7 +1909,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_YACC="$ac_prog"
-echo "$as_me:1910: found $ac_dir/$ac_word" >&5
+echo "$as_me:1912: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1915,10 +1917,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:1918: result: $YACC" >&5
+  echo "$as_me:1920: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:1921: result: no" >&5
+  echo "$as_me:1923: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1928,7 +1930,7 @@ test -n "$YACC" || YACC="yacc"
 
 # Extract the first word of "tar", so it can be a program name with args.
 set dummy tar; ac_word=$2
-echo "$as_me:1931: checking for $ac_word" >&5
+echo "$as_me:1933: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TAR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1943,7 +1945,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TAR="tar"
-echo "$as_me:1946: found $ac_dir/$ac_word" >&5
+echo "$as_me:1948: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1951,16 +1953,16 @@ fi
 fi
 TAR=$ac_cv_prog_TAR
 if test -n "$TAR"; then
-  echo "$as_me:1954: result: $TAR" >&5
+  echo "$as_me:1956: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:1957: result: no" >&5
+  echo "$as_me:1959: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "zip", so it can be a program name with args.
 set dummy zip; ac_word=$2
-echo "$as_me:1963: checking for $ac_word" >&5
+echo "$as_me:1965: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1975,7 +1977,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ZIP="zip"
-echo "$as_me:1978: found $ac_dir/$ac_word" >&5
+echo "$as_me:1980: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1983,16 +1985,16 @@ fi
 fi
 ZIP=$ac_cv_prog_ZIP
 if test -n "$ZIP"; then
-  echo "$as_me:1986: result: $ZIP" >&5
+  echo "$as_me:1988: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:1989: result: no" >&5
+  echo "$as_me:1991: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "chown", so it can be a program name with args.
 set dummy chown; ac_word=$2
-echo "$as_me:1995: checking for $ac_word" >&5
+echo "$as_me:1997: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_CHOWN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2009,7 +2011,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CHOWN="$ac_dir/$ac_word"
-   echo "$as_me:2012: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2014: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2021,10 +2023,10 @@ fi
 CHOWN=$ac_cv_path_CHOWN
 
 if test -n "$CHOWN"; then
-  echo "$as_me:2024: result: $CHOWN" >&5
+  echo "$as_me:2026: result: $CHOWN" >&5
 echo "${ECHO_T}$CHOWN" >&6
 else
-  echo "$as_me:2027: result: no" >&5
+  echo "$as_me:2029: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2053,7 +2055,7 @@ cat >>confdefs.h <<\EOF
 #define RESTAMP_FUTURE_POSTINGS 1
 EOF
 
-echo "$as_me:2056: checking for re_comp in -lcompat" >&5
+echo "$as_me:2058: checking for re_comp in -lcompat" >&5
 echo $ECHO_N "checking for re_comp in -lcompat... $ECHO_C" >&6
 if test "${ac_cv_lib_compat_re_comp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2061,7 +2063,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcompat  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2064 "configure"
+#line 2066 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2080,16 +2082,16 @@ re_comp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2086: \$? = $ac_status" >&5
+  echo "$as_me:2088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2092: \$? = $ac_status" >&5
+  echo "$as_me:2094: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_compat_re_comp=yes
 else
@@ -2100,7 +2102,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2103: result: $ac_cv_lib_compat_re_comp" >&5
+echo "$as_me:2105: result: $ac_cv_lib_compat_re_comp" >&5
 echo "${ECHO_T}$ac_cv_lib_compat_re_comp" >&6
 if test $ac_cv_lib_compat_re_comp = yes; then
   result=yes
@@ -2112,13 +2114,13 @@ if test "$result" = "yes"; then
   LIBS="$LIBS -lcompat"
 fi
 
-echo "$as_me:2115: checking for pw_age in struct passwd" >&5
+echo "$as_me:2117: checking for pw_age in struct passwd" >&5
 echo $ECHO_N "checking for pw_age in struct passwd... $ECHO_C" >&6
 if test "${ac_cv_struct_passwd_pw_age+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2121 "configure"
+#line 2123 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 int
@@ -2130,16 +2132,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2135: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2136: \$? = $ac_status" >&5
+  echo "$as_me:2138: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2142: \$? = $ac_status" >&5
+  echo "$as_me:2144: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_passwd_pw_age=yes
 else
@@ -2149,7 +2151,7 @@ ac_cv_struct_passwd_pw_age=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2152: result: $ac_cv_struct_passwd_pw_age" >&5
+echo "$as_me:2154: result: $ac_cv_struct_passwd_pw_age" >&5
 echo "${ECHO_T}$ac_cv_struct_passwd_pw_age" >&6
 if test "$ac_cv_struct_passwd_pw_age" = "yes"; then
         cat >>confdefs.h <<\EOF
@@ -2158,13 +2160,13 @@ EOF
 
 fi
 
-echo "$as_me:2161: checking for pw_comment in struct passwd" >&5
+echo "$as_me:2163: checking for pw_comment in struct passwd" >&5
 echo $ECHO_N "checking for pw_comment in struct passwd... $ECHO_C" >&6
 if test "${ac_cv_struct_passwd_pw_comment+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2167 "configure"
+#line 2169 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 int
@@ -2176,16 +2178,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2181: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2182: \$? = $ac_status" >&5
+  echo "$as_me:2184: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2188: \$? = $ac_status" >&5
+  echo "$as_me:2190: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_passwd_pw_comment=yes
 else
@@ -2195,7 +2197,7 @@ ac_cv_struct_passwd_pw_comment=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2198: result: $ac_cv_struct_passwd_pw_comment" >&5
+echo "$as_me:2200: result: $ac_cv_struct_passwd_pw_comment" >&5
 echo "${ECHO_T}$ac_cv_struct_passwd_pw_comment" >&6
 if test "$ac_cv_struct_passwd_pw_comment" = "yes"; then
         cat >>confdefs.h <<\EOF
@@ -2204,7 +2206,7 @@ EOF
 
 fi
 
-echo "$as_me:2207: checking for setspent in -lshadow" >&5
+echo "$as_me:2209: checking for setspent in -lshadow" >&5
 echo $ECHO_N "checking for setspent in -lshadow... $ECHO_C" >&6
 if test "${ac_cv_lib_shadow_setspent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2212,7 +2214,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lshadow  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2215 "configure"
+#line 2217 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2231,16 +2233,16 @@ setspent ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2237: \$? = $ac_status" >&5
+  echo "$as_me:2239: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2243: \$? = $ac_status" >&5
+  echo "$as_me:2245: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_shadow_setspent=yes
 else
@@ -2251,7 +2253,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2254: result: $ac_cv_lib_shadow_setspent" >&5
+echo "$as_me:2256: result: $ac_cv_lib_shadow_setspent" >&5
 echo "${ECHO_T}$ac_cv_lib_shadow_setspent" >&6
 if test $ac_cv_lib_shadow_setspent = yes; then
   result=yes
@@ -2264,7 +2266,7 @@ if test "$result" = "yes"; then
   SHADOW_PASSWORD=1
   LIBSHADOW=1
 else
-  echo "$as_me:2267: checking for getspnam in -lshadow" >&5
+  echo "$as_me:2269: checking for getspnam in -lshadow" >&5
 echo $ECHO_N "checking for getspnam in -lshadow... $ECHO_C" >&6
 if test "${ac_cv_lib_shadow_getspnam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2272,7 +2274,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lshadow  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2275 "configure"
+#line 2277 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2291,16 +2293,16 @@ getspnam ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2296: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2297: \$? = $ac_status" >&5
+  echo "$as_me:2299: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2303: \$? = $ac_status" >&5
+  echo "$as_me:2305: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_shadow_getspnam=yes
 else
@@ -2311,7 +2313,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2314: result: $ac_cv_lib_shadow_getspnam" >&5
+echo "$as_me:2316: result: $ac_cv_lib_shadow_getspnam" >&5
 echo "${ECHO_T}$ac_cv_lib_shadow_getspnam" >&6
 if test $ac_cv_lib_shadow_getspnam = yes; then
   result=yes
@@ -2324,7 +2326,7 @@ fi
     SHADOW_PASSWORD=1
     LIBSHADOW=1
   else
-        echo "$as_me:2327: checking for setspent in -lc" >&5
+        echo "$as_me:2329: checking for setspent in -lc" >&5
 echo $ECHO_N "checking for setspent in -lc... $ECHO_C" >&6
 if test "${ac_cv_lib_c_setspent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2332,7 +2334,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2335 "configure"
+#line 2337 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2351,16 +2353,16 @@ setspent ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2357: \$? = $ac_status" >&5
+  echo "$as_me:2359: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2363: \$? = $ac_status" >&5
+  echo "$as_me:2365: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_setspent=yes
 else
@@ -2371,7 +2373,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2374: result: $ac_cv_lib_c_setspent" >&5
+echo "$as_me:2376: result: $ac_cv_lib_c_setspent" >&5
 echo "${ECHO_T}$ac_cv_lib_c_setspent" >&6
 if test $ac_cv_lib_c_setspent = yes; then
   result=yes
@@ -2389,7 +2391,7 @@ fi
 
 if test "$SHADOW_PASSWORD" = "1"; then
   if test "$ac_cv_func_fgetspent" != "yes"; then
-    echo "$as_me:2392: checking for fgetspent in -lshadow" >&5
+    echo "$as_me:2394: checking for fgetspent in -lshadow" >&5
 echo $ECHO_N "checking for fgetspent in -lshadow... $ECHO_C" >&6
 if test "${ac_cv_lib_shadow_fgetspent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2397,7 +2399,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lshadow  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2400 "configure"
+#line 2402 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2416,16 +2418,16 @@ fgetspent ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2422: \$? = $ac_status" >&5
+  echo "$as_me:2424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2428: \$? = $ac_status" >&5
+  echo "$as_me:2430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_shadow_fgetspent=yes
 else
@@ -2436,7 +2438,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2439: result: $ac_cv_lib_shadow_fgetspent" >&5
+echo "$as_me:2441: result: $ac_cv_lib_shadow_fgetspent" >&5
 echo "${ECHO_T}$ac_cv_lib_shadow_fgetspent" >&6
 if test $ac_cv_lib_shadow_fgetspent = yes; then
   result=yes
@@ -2456,7 +2458,7 @@ EOF
 
 fi
 
-echo "$as_me:2459: checking for crypt in -lcrypt" >&5
+echo "$as_me:2461: checking for crypt in -lcrypt" >&5
 echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
 if test "${ac_cv_lib_crypt_crypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2464,7 +2466,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2467 "configure"
+#line 2469 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2483,16 +2485,16 @@ crypt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2489: \$? = $ac_status" >&5
+  echo "$as_me:2491: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2495: \$? = $ac_status" >&5
+  echo "$as_me:2497: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_crypt_crypt=yes
 else
@@ -2503,7 +2505,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2506: result: $ac_cv_lib_crypt_crypt" >&5
+echo "$as_me:2508: result: $ac_cv_lib_crypt_crypt" >&5
 echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
 if test $ac_cv_lib_crypt_crypt = yes; then
   result=yes
@@ -2518,7 +2520,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2521: checking how to run the C preprocessor" >&5
+echo "$as_me:2523: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2540,18 +2542,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2543 "configure"
+#line 2545 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2548: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2550: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2554: \$? = $ac_status" >&5
+  echo "$as_me:2556: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2574,17 +2576,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2577 "configure"
+#line 2579 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2581: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2583: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2587: \$? = $ac_status" >&5
+  echo "$as_me:2589: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2621,7 +2623,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2624: result: $CPP" >&5
+echo "$as_me:2626: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2631,18 +2633,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2634 "configure"
+#line 2636 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2639: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2641: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2645: \$? = $ac_status" >&5
+  echo "$as_me:2647: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2665,17 +2667,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2668 "configure"
+#line 2670 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2672: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2674: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2678: \$? = $ac_status" >&5
+  echo "$as_me:2680: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2703,7 +2705,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2706: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2708: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2717,23 +2719,23 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 for ac_header in crypt.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:2720: checking for $ac_header" >&5
+echo "$as_me:2722: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2726 "configure"
+#line 2728 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:2730: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2732: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2736: \$? = $ac_status" >&5
+  echo "$as_me:2738: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2752,7 +2754,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2755: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:2757: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2764,13 +2766,13 @@ done
 
 fi
 
-echo "$as_me:2767: checking for ANSI C header files" >&5
+echo "$as_me:2769: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2773 "configure"
+#line 2775 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2778,13 +2780,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:2781: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2783: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2787: \$? = $ac_status" >&5
+  echo "$as_me:2789: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2806,7 +2808,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2809 "configure"
+#line 2811 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -2824,7 +2826,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 <<_ACEOF
-#line 2827 "configure"
+#line 2829 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -2845,7 +2847,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2848 "configure"
+#line 2850 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -2871,15 +2873,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:2874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2877: \$? = $ac_status" >&5
+  echo "$as_me:2879: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:2879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2882: \$? = $ac_status" >&5
+  echo "$as_me:2884: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2892,7 +2894,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:2895: result: $ac_cv_header_stdc" >&5
+echo "$as_me:2897: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -2905,13 +2907,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   ac_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $ac_tr_sh`
-echo "$as_me:2908: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:2910: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2914 "configure"
+#line 2916 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -2925,16 +2927,16 @@ DIR *dirp = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2928: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2931: \$? = $ac_status" >&5
+  echo "$as_me:2933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2937: \$? = $ac_status" >&5
+  echo "$as_me:2939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_Header=yes"
 else
@@ -2944,7 +2946,7 @@ eval "$ac_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2947: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:2949: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2957,7 +2959,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:2960: checking for opendir in -ldir" >&5
+  echo "$as_me:2962: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2965,7 +2967,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2968 "configure"
+#line 2970 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2984,16 +2986,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2987: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2989: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2990: \$? = $ac_status" >&5
+  echo "$as_me:2992: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2996: \$? = $ac_status" >&5
+  echo "$as_me:2998: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -3004,14 +3006,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3007: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:3009: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:3014: checking for opendir in -lx" >&5
+  echo "$as_me:3016: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3019,7 +3021,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3022 "configure"
+#line 3024 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3038,16 +3040,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3043: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3044: \$? = $ac_status" >&5
+  echo "$as_me:3046: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3050: \$? = $ac_status" >&5
+  echo "$as_me:3052: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -3058,7 +3060,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3061: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:3063: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -3066,13 +3068,13 @@ fi
 
 fi
 
-echo "$as_me:3069: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:3071: 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
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3075 "configure"
+#line 3077 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3087,16 +3089,16 @@ struct tm *tp;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3093: \$? = $ac_status" >&5
+  echo "$as_me:3095: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3099: \$? = $ac_status" >&5
+  echo "$as_me:3101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -3106,7 +3108,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3109: result: $ac_cv_header_time" >&5
+echo "$as_me:3111: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -3116,13 +3118,13 @@ EOF
 
 fi
 
-echo "$as_me:3119: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "$as_me:3121: checking for sys/wait.h that is POSIX.1 compatible" >&5
 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
 if test "${ac_cv_header_sys_wait_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3125 "configure"
+#line 3127 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3144,16 +3146,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3149: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3150: \$? = $ac_status" >&5
+  echo "$as_me:3152: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3156: \$? = $ac_status" >&5
+  echo "$as_me:3158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_sys_wait_h=yes
 else
@@ -3163,7 +3165,7 @@ ac_cv_header_sys_wait_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3166: result: $ac_cv_header_sys_wait_h" >&5
+echo "$as_me:3168: result: $ac_cv_header_sys_wait_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
 if test $ac_cv_header_sys_wait_h = yes; then
 
@@ -3176,23 +3178,23 @@ fi
 for ac_header in fcntl.h malloc.h sys/file.h sys/ioctl.h sys/time.h termios.h syslog.h sys/vfs.h unistd.h netinet/in.h regex.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:3179: checking for $ac_header" >&5
+echo "$as_me:3181: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3185 "configure"
+#line 3187 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3189: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3191: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3195: \$? = $ac_status" >&5
+  echo "$as_me:3197: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3211,7 +3213,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3214: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:3216: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3224,23 +3226,23 @@ done
 for ac_header in sys/resource.h usersec.h utime.h ulimit.h gshadow.h shadow.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:3227: checking for $ac_header" >&5
+echo "$as_me:3229: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3233 "configure"
+#line 3235 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3237: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3239: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3243: \$? = $ac_status" >&5
+  echo "$as_me:3245: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3259,7 +3261,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3262: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:3264: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3272,23 +3274,23 @@ done
 for ac_header in limits.h utmp.h utmpx.h lastlog.h rpc/key_prot.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:3275: checking for $ac_header" >&5
+echo "$as_me:3277: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3281 "configure"
+#line 3283 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3285: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3287: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3291: \$? = $ac_status" >&5
+  echo "$as_me:3293: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3307,7 +3309,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3310: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:3312: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3317,13 +3319,13 @@ EOF
 fi
 done
 
-echo "$as_me:3320: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:3322: checking whether struct tm is in sys/time.h or time.h" >&5
 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
 if test "${ac_cv_struct_tm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3326 "configure"
+#line 3328 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -3337,16 +3339,16 @@ struct tm *tp; tp->tm_sec;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3340: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3343: \$? = $ac_status" >&5
+  echo "$as_me:3345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3349: \$? = $ac_status" >&5
+  echo "$as_me:3351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
@@ -3356,7 +3358,7 @@ ac_cv_struct_tm=sys/time.h
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3359: result: $ac_cv_struct_tm" >&5
+echo "$as_me:3361: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -3366,13 +3368,13 @@ EOF
 
 fi
 
-echo "$as_me:3369: checking for struct tm.tm_zone" >&5
+echo "$as_me:3371: checking for struct tm.tm_zone" >&5
 echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
 if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3375 "configure"
+#line 3377 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -3387,16 +3389,16 @@ foo.tm_zone;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3392: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3393: \$? = $ac_status" >&5
+  echo "$as_me:3395: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3399: \$? = $ac_status" >&5
+  echo "$as_me:3401: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
@@ -3406,7 +3408,7 @@ ac_cv_member_struct_tm_tm_zone=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3409: result: $ac_cv_member_struct_tm_tm_zone" >&5
+echo "$as_me:3411: result: $ac_cv_member_struct_tm_tm_zone" >&5
 echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
 if test $ac_cv_member_struct_tm_tm_zone = yes; then
 
@@ -3423,13 +3425,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-  echo "$as_me:3426: checking for tzname" >&5
+  echo "$as_me:3428: checking for tzname" >&5
 echo $ECHO_N "checking for tzname... $ECHO_C" >&6
 if test "${ac_cv_var_tzname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3432 "configure"
+#line 3434 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -3445,16 +3447,16 @@ atoi(*tzname);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3450: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3451: \$? = $ac_status" >&5
+  echo "$as_me:3453: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3457: \$? = $ac_status" >&5
+  echo "$as_me:3459: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_var_tzname=yes
 else
@@ -3464,7 +3466,7 @@ ac_cv_var_tzname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3467: result: $ac_cv_var_tzname" >&5
+echo "$as_me:3469: result: $ac_cv_var_tzname" >&5
 echo "${ECHO_T}$ac_cv_var_tzname" >&6
   if test $ac_cv_var_tzname = yes; then
 
@@ -3475,7 +3477,7 @@ EOF
   fi
 fi
 
-echo "$as_me:3478: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:3480: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3483,7 +3485,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 3486 "configure"
+#line 3488 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3532,16 +3534,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3535: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3538: \$? = $ac_status" >&5
+  echo "$as_me:3540: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3544: \$? = $ac_status" >&5
+  echo "$as_me:3546: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -3558,21 +3560,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:3561: result: none needed" >&5
+    echo "$as_me:3563: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:3564: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:3566: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:3569: checking for an ANSI C-conforming const" >&5
+echo "$as_me:3571: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3575 "configure"
+#line 3577 "configure"
 #include "confdefs.h"
 
 int
@@ -3630,16 +3632,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3633: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3635: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3636: \$? = $ac_status" >&5
+  echo "$as_me:3638: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3642: \$? = $ac_status" >&5
+  echo "$as_me:3644: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -3649,7 +3651,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3652: result: $ac_cv_c_const" >&5
+echo "$as_me:3654: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -3659,13 +3661,13 @@ EOF
 
 fi
 
-echo "$as_me:3662: checking for uid_t in sys/types.h" >&5
+echo "$as_me:3664: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3668 "configure"
+#line 3670 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -3679,7 +3681,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:3682: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:3684: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -3696,23 +3698,23 @@ fi
 for ac_header in stdlib.h string.h memory.h strings.h inttypes.h unistd.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:3699: checking for $ac_header" >&5
+echo "$as_me:3701: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3705 "configure"
+#line 3707 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3709: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3711: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3715: \$? = $ac_status" >&5
+  echo "$as_me:3717: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3731,7 +3733,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3734: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:3736: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3741,13 +3743,13 @@ EOF
 fi
 done
 
-echo "$as_me:3744: checking for off_t" >&5
+echo "$as_me:3746: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3750 "configure"
+#line 3752 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3762,16 +3764,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3768: \$? = $ac_status" >&5
+  echo "$as_me:3770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3774: \$? = $ac_status" >&5
+  echo "$as_me:3776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -3781,7 +3783,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3784: result: $ac_cv_type_off_t" >&5
+echo "$as_me:3786: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -3793,13 +3795,13 @@ EOF
 
 fi
 
-echo "$as_me:3796: checking for pid_t" >&5
+echo "$as_me:3798: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3802 "configure"
+#line 3804 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3814,16 +3816,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3819: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3820: \$? = $ac_status" >&5
+  echo "$as_me:3822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3826: \$? = $ac_status" >&5
+  echo "$as_me:3828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -3833,7 +3835,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3836: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:3838: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -3845,13 +3847,13 @@ EOF
 
 fi
 
-echo "$as_me:3848: checking for mode_t" >&5
+echo "$as_me:3850: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3854 "configure"
+#line 3856 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3866,16 +3868,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3869: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3871: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3872: \$? = $ac_status" >&5
+  echo "$as_me:3874: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3878: \$? = $ac_status" >&5
+  echo "$as_me:3880: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -3885,7 +3887,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3888: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:3890: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
   :
@@ -3897,13 +3899,13 @@ EOF
 
 fi
 
-echo "$as_me:3900: checking for size_t" >&5
+echo "$as_me:3902: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3906 "configure"
+#line 3908 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3918,16 +3920,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3921: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3924: \$? = $ac_status" >&5
+  echo "$as_me:3926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3930: \$? = $ac_status" >&5
+  echo "$as_me:3932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -3937,7 +3939,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3940: result: $ac_cv_type_size_t" >&5
+echo "$as_me:3942: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -3949,13 +3951,13 @@ EOF
 
 fi
 
-echo "$as_me:3952: checking for struct stat.st_blksize" >&5
+echo "$as_me:3954: checking for struct stat.st_blksize" >&5
 echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3958 "configure"
+#line 3960 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3968,16 +3970,16 @@ foo.st_blksize;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3971: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3974: \$? = $ac_status" >&5
+  echo "$as_me:3976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3980: \$? = $ac_status" >&5
+  echo "$as_me:3982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blksize=yes
 else
@@ -3987,7 +3989,7 @@ ac_cv_member_struct_stat_st_blksize=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3990: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "$as_me:3992: result: $ac_cv_member_struct_stat_st_blksize" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
 if test $ac_cv_member_struct_stat_st_blksize = yes; then
 
@@ -4001,13 +4003,13 @@ EOF
 
 fi
 
-echo "$as_me:4004: checking whether stat file-mode macros are broken" >&5
+echo "$as_me:4006: checking whether stat file-mode macros are broken" >&5
 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
 if test "${ac_cv_header_stat_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4010 "configure"
+#line 4012 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4046,7 +4048,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:4049: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:4051: result: $ac_cv_header_stat_broken" >&5
 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
 if test $ac_cv_header_stat_broken = yes; then
 
@@ -4056,13 +4058,13 @@ EOF
 
 fi
 
-echo "$as_me:4059: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:4061: checking whether struct tm is in sys/time.h or time.h" >&5
 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
 if test "${ac_cv_struct_tm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4065 "configure"
+#line 4067 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4076,16 +4078,16 @@ struct tm *tp; tp->tm_sec;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4081: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4082: \$? = $ac_status" >&5
+  echo "$as_me:4084: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4088: \$? = $ac_status" >&5
+  echo "$as_me:4090: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
@@ -4095,7 +4097,7 @@ ac_cv_struct_tm=sys/time.h
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4098: result: $ac_cv_struct_tm" >&5
+echo "$as_me:4100: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -4108,13 +4110,13 @@ fi
 for ac_func in c64i a64l fchmod fchown fdatasync fsync lckpwdf strcasestr mkstemp putpwent
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:4111: checking for $ac_func" >&5
+echo "$as_me:4113: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4117 "configure"
+#line 4119 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4145,16 +4147,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4150: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4151: \$? = $ac_status" >&5
+  echo "$as_me:4153: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4157: \$? = $ac_status" >&5
+  echo "$as_me:4159: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -4164,7 +4166,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4167: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:4169: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4174,7 +4176,7 @@ EOF
 fi
 done
 
-echo "$as_me:4177: checking for working GNU-style fnmatch" >&5
+echo "$as_me:4179: checking for working GNU-style fnmatch" >&5
 echo $ECHO_N "checking for working GNU-style fnmatch... $ECHO_C" >&6
 if test "${ac_cv_func_fnmatch_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4187,7 +4189,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_func_fnmatch_works=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4190 "configure"
+#line 4192 "configure"
 #include "confdefs.h"
 #include <fnmatch.h>
 int
@@ -4203,15 +4205,15 @@ exit (fnmatch ("a*", "abc", 0) != 0
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4209: \$? = $ac_status" >&5
+  echo "$as_me:4211: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4214: \$? = $ac_status" >&5
+  echo "$as_me:4216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fnmatch_works=yes
 else
@@ -4223,7 +4225,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4226: result: $ac_cv_func_fnmatch_works" >&5
+echo "$as_me:4228: result: $ac_cv_func_fnmatch_works" >&5
 echo "${ECHO_T}$ac_cv_func_fnmatch_works" >&6
 if test $ac_cv_func_fnmatch_works = yes; then
 
@@ -4234,14 +4236,14 @@ EOF
 fi
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:4237: checking whether $CC needs -traditional" >&5
+    echo "$as_me:4239: checking whether $CC needs -traditional" >&5
 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF
-#line 4244 "configure"
+#line 4246 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -4256,7 +4258,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 4259 "configure"
+#line 4261 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -4269,14 +4271,14 @@ rm -f conftest*
 
   fi
 fi
-echo "$as_me:4272: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:4274: result: $ac_cv_prog_gcc_traditional" >&5
 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
-echo "$as_me:4279: checking for working memcmp" >&5
+echo "$as_me:4281: checking for working memcmp" >&5
 echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
 if test "${ac_cv_func_memcmp_working+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4285,7 +4287,7 @@ else
   ac_cv_func_memcmp_working=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4288 "configure"
+#line 4290 "configure"
 #include "confdefs.h"
 
 int
@@ -4321,15 +4323,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4327: \$? = $ac_status" >&5
+  echo "$as_me:4329: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4332: \$? = $ac_status" >&5
+  echo "$as_me:4334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_memcmp_working=yes
 else
@@ -4341,22 +4343,22 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4344: result: $ac_cv_func_memcmp_working" >&5
+echo "$as_me:4346: result: $ac_cv_func_memcmp_working" >&5
 echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
 test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
 
-echo "$as_me:4348: checking whether setpgrp takes no argument" >&5
+echo "$as_me:4350: checking whether setpgrp takes no argument" >&5
 echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6
 if test "${ac_cv_func_setpgrp_void+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:4354: error: cannot check setpgrp if cross compiling" >&5
+  { { echo "$as_me:4356: error: cannot check setpgrp if cross compiling" >&5
 echo "$as_me: error: cannot check setpgrp if cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4359 "configure"
+#line 4361 "configure"
 #include "confdefs.h"
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -4373,15 +4375,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4379: \$? = $ac_status" >&5
+  echo "$as_me:4381: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4384: \$? = $ac_status" >&5
+  echo "$as_me:4386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setpgrp_void=no
 else
@@ -4393,7 +4395,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4396: result: $ac_cv_func_setpgrp_void" >&5
+echo "$as_me:4398: result: $ac_cv_func_setpgrp_void" >&5
 echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6
 if test $ac_cv_func_setpgrp_void = yes; then
 
@@ -4403,13 +4405,13 @@ EOF
 
 fi
 
-echo "$as_me:4406: checking return type of signal handlers" >&5
+echo "$as_me:4408: checking return type of signal handlers" >&5
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4412 "configure"
+#line 4414 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4431,16 +4433,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4436: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4437: \$? = $ac_status" >&5
+  echo "$as_me:4439: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4443: \$? = $ac_status" >&5
+  echo "$as_me:4445: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -4450,7 +4452,7 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4453: result: $ac_cv_type_signal" >&5
+echo "$as_me:4455: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -4460,13 +4462,13 @@ EOF
 for ac_func in strftime
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:4463: checking for $ac_func" >&5
+echo "$as_me:4465: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4469 "configure"
+#line 4471 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4497,16 +4499,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4502: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4503: \$? = $ac_status" >&5
+  echo "$as_me:4505: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4509: \$? = $ac_status" >&5
+  echo "$as_me:4511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -4516,7 +4518,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4519: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:4521: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4525,7 +4527,7 @@ EOF
 
 else
   # strftime is in -lintl on SCO UNIX.
-echo "$as_me:4528: checking for strftime in -lintl" >&5
+echo "$as_me:4530: checking for strftime in -lintl" >&5
 echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_strftime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4533,7 +4535,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4536 "configure"
+#line 4538 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4552,16 +4554,16 @@ strftime ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4558: \$? = $ac_status" >&5
+  echo "$as_me:4560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4564: \$? = $ac_status" >&5
+  echo "$as_me:4566: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_intl_strftime=yes
 else
@@ -4572,7 +4574,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4575: result: $ac_cv_lib_intl_strftime" >&5
+echo "$as_me:4577: result: $ac_cv_lib_intl_strftime" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6
 if test $ac_cv_lib_intl_strftime = yes; then
   cat >>confdefs.h <<\EOF
@@ -4585,7 +4587,7 @@ fi
 fi
 done
 
-echo "$as_me:4588: checking whether utime accepts a null argument" >&5
+echo "$as_me:4590: checking whether utime accepts a null argument" >&5
 echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6
 if test "${ac_cv_func_utime_null+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4596,7 +4598,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_func_utime_null=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4599 "configure"
+#line 4601 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4612,15 +4614,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4617: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4618: \$? = $ac_status" >&5
+  echo "$as_me:4620: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4623: \$? = $ac_status" >&5
+  echo "$as_me:4625: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_utime_null=yes
 else
@@ -4633,7 +4635,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f core core.* *.core
 fi
-echo "$as_me:4636: result: $ac_cv_func_utime_null" >&5
+echo "$as_me:4638: result: $ac_cv_func_utime_null" >&5
 echo "${ECHO_T}$ac_cv_func_utime_null" >&6
 if test $ac_cv_func_utime_null = yes; then
 
@@ -4647,23 +4649,23 @@ rm -f conftest.data
 for ac_header in unistd.h vfork.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:4650: checking for $ac_header" >&5
+echo "$as_me:4652: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4656 "configure"
+#line 4658 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4660: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4662: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4666: \$? = $ac_status" >&5
+  echo "$as_me:4668: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4682,7 +4684,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4685: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:4687: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4692,19 +4694,19 @@ EOF
 fi
 done
 
-echo "$as_me:4695: checking for working vfork" >&5
+echo "$as_me:4697: checking for working vfork" >&5
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-  echo "$as_me:4701: checking for vfork" >&5
+  echo "$as_me:4703: checking for vfork" >&5
 echo $ECHO_N "checking for vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4707 "configure"
+#line 4709 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork (); below.  */
@@ -4735,16 +4737,16 @@ f = vfork;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4741: \$? = $ac_status" >&5
+  echo "$as_me:4743: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4747: \$? = $ac_status" >&5
+  echo "$as_me:4749: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork=yes
 else
@@ -4754,13 +4756,13 @@ ac_cv_func_vfork=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4757: result: $ac_cv_func_vfork" >&5
+echo "$as_me:4759: result: $ac_cv_func_vfork" >&5
 echo "${ECHO_T}$ac_cv_func_vfork" >&6
 
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4763 "configure"
+#line 4765 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -4857,15 +4859,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4860: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4863: \$? = $ac_status" >&5
+  echo "$as_me:4865: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4868: \$? = $ac_status" >&5
+  echo "$as_me:4870: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -4877,7 +4879,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4880: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:4882: result: $ac_cv_func_vfork_works" >&5
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 if test "x$ac_cv_func_vfork_works" = xno; then
 
@@ -4890,13 +4892,13 @@ fi
 for ac_func in vprintf
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:4893: checking for $ac_func" >&5
+echo "$as_me:4895: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4899 "configure"
+#line 4901 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4927,16 +4929,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4933: \$? = $ac_status" >&5
+  echo "$as_me:4935: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4939: \$? = $ac_status" >&5
+  echo "$as_me:4941: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -4946,20 +4948,20 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4949: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:4951: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
 EOF
 
-echo "$as_me:4956: checking for _doprnt" >&5
+echo "$as_me:4958: checking for _doprnt" >&5
 echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
 if test "${ac_cv_func__doprnt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4962 "configure"
+#line 4964 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt (); below.  */
@@ -4990,16 +4992,16 @@ f = _doprnt;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4996: \$? = $ac_status" >&5
+  echo "$as_me:4998: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5002: \$? = $ac_status" >&5
+  echo "$as_me:5004: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func__doprnt=yes
 else
@@ -5009,7 +5011,7 @@ ac_cv_func__doprnt=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5012: result: $ac_cv_func__doprnt" >&5
+echo "$as_me:5014: result: $ac_cv_func__doprnt" >&5
 echo "${ECHO_T}$ac_cv_func__doprnt" >&6
 if test $ac_cv_func__doprnt = yes; then
 
@@ -5025,13 +5027,13 @@ done
 for ac_func in getcwd gethostname gettimeofday getwd mkdir mktime putenv re_comp regcmp regcomp rmdir select socket strcspn strdup strerror strspn strstr strtol strtoul uname
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:5028: checking for $ac_func" >&5
+echo "$as_me:5030: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5034 "configure"
+#line 5036 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5062,16 +5064,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5067: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5068: \$? = $ac_status" >&5
+  echo "$as_me:5070: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5074: \$? = $ac_status" >&5
+  echo "$as_me:5076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -5081,7 +5083,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5084: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:5086: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5094,13 +5096,13 @@ done
 for ac_func in getspnam getutent initgroups updwtmp updwtmpx
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:5097: checking for $ac_func" >&5
+echo "$as_me:5099: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5103 "configure"
+#line 5105 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5131,16 +5133,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5137: \$? = $ac_status" >&5
+  echo "$as_me:5139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5143: \$? = $ac_status" >&5
+  echo "$as_me:5145: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -5150,7 +5152,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5153: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:5155: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5162,7 +5164,7 @@ done
 
 # Extract the first word of "compress", so it can be a program name with args.
 set dummy compress; ac_word=$2
-echo "$as_me:5165: checking for $ac_word" >&5
+echo "$as_me:5167: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_COMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5179,7 +5181,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_COMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:5182: found $ac_dir/$ac_word" >&5
+   echo "$as_me:5184: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -5191,10 +5193,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:5194: result: $COMPRESS" >&5
+  echo "$as_me:5196: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:5197: result: no" >&5
+  echo "$as_me:5199: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5202,7 +5204,7 @@ for ac_prog in gzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5205: checking for $ac_word" >&5
+echo "$as_me:5207: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5219,7 +5221,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GZIP="$ac_dir/$ac_word"
-   echo "$as_me:5222: found $ac_dir/$ac_word" >&5
+   echo "$as_me:5224: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -5230,10 +5232,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:5233: result: $GZIP" >&5
+  echo "$as_me:5235: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:5236: result: no" >&5
+  echo "$as_me:5238: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5260,24 +5262,24 @@ compress)
         LOG_COMPRESSEXT=".unknown" ;;
 esac
 
-echo "$as_me:5263: checking location of utmp" >&5
+echo "$as_me:5265: checking location of utmp" >&5
 echo $ECHO_N "checking location of utmp... $ECHO_C" >&6
 for utmpdir in /var/run /var/adm /usr/adm /etc NONE; do
         if test "$utmpdir" = "NONE"; then
-                { echo "$as_me:5267: WARNING: utmp file not found" >&5
+                { echo "$as_me:5269: WARNING: utmp file not found" >&5
 echo "$as_me: WARNING: utmp file not found" >&2;}
         elif test -f $utmpdir/utmp; then
                 cat >>confdefs.h <<EOF
 #define _UTMP_FILE "$utmpdir/utmp"
 EOF
 
-                echo "$as_me:5274: result: $utmpdir" >&5
+                echo "$as_me:5276: result: $utmpdir" >&5
 echo "${ECHO_T}$utmpdir" >&6
                 break
         fi
 done
 
-echo "$as_me:5280: checking location of lastlog/wtmp" >&5
+echo "$as_me:5282: checking location of lastlog/wtmp" >&5
 echo $ECHO_N "checking location of lastlog/wtmp... $ECHO_C" >&6
 for logdir in /var/log /var/adm /usr/adm /etc; do
         if test -d $logdir; then
@@ -5289,13 +5291,13 @@ EOF
 #define LASTLOG_FILE "$logdir/lastlog"
 EOF
 
-                echo "$as_me:5292: result: $logdir" >&5
+                echo "$as_me:5294: result: $logdir" >&5
 echo "${ECHO_T}$logdir" >&6
                 break
         fi
 done
 
-ac_config_files="$ac_config_files Makefile.global mbfido/paths.h INSTALL FILE_ID.DIZ"
+ac_config_files="$ac_config_files Makefile.global mbfido/paths.h unix/login.defs INSTALL FILE_ID.DIZ"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -5375,7 +5377,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:5378: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:5380: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -5550,7 +5552,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:5553: error: ambiguous option: $1
+    { { echo "$as_me:5555: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -5571,18 +5573,19 @@ Try \`$0 --help' for more information." >&2;}
   # Handling of arguments.
   'Makefile.global' ) CONFIG_FILES="$CONFIG_FILES Makefile.global" ;;
   'mbfido/paths.h' ) CONFIG_FILES="$CONFIG_FILES mbfido/paths.h" ;;
+  'unix/login.defs' ) CONFIG_FILES="$CONFIG_FILES unix/login.defs" ;;
   'INSTALL' ) CONFIG_FILES="$CONFIG_FILES INSTALL" ;;
   'FILE_ID.DIZ' ) CONFIG_FILES="$CONFIG_FILES FILE_ID.DIZ" ;;
   'default-1' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   'config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 
   # This is an error.
-  -*) { { echo "$as_me:5580: error: unrecognized option: $1
+  -*) { { echo "$as_me:5583: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
    { (exit 1); exit 1; }; } ;;
-  *) { { echo "$as_me:5585: error: invalid argument: $1" >&5
+  *) { { echo "$as_me:5588: error: invalid argument: $1" >&5
 echo "$as_me: error: invalid argument: $1" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -5690,6 +5693,8 @@ s,@VERSION@,$VERSION,;t t
 s,@COPYRIGHT@,$COPYRIGHT,;t t
 s,@GROUP@,$GROUP,;t t
 s,@OWNER@,$OWNER,;t t
+s,@ROOT@,$ROOT,;t t
+s,@RGROUP@,$RGROUP,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
@@ -5821,7 +5826,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:5824: creating $ac_file" >&5
+    { echo "$as_me:5829: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -5839,7 +5844,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:5842: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:5847: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -5852,7 +5857,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:5855: error: cannot find input file: $f" >&5
+           { { echo "$as_me:5860: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -5912,7 +5917,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:5915: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:5920: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -5923,7 +5928,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:5926: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:5931: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -5936,7 +5941,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:5939: error: cannot find input file: $f" >&5
+           { { echo "$as_me:5944: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -6053,7 +6058,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:6056: $ac_file is unchanged" >&5
+      { echo "$as_me:6061: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index 4525d61c..392254ed 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl $Id$
 
 AC_INIT(lib/libs.h)
 AM_CONFIG_HEADER(config.h)
-SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbtask mbsetup import lang examples html script"
+SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbtask mbsetup unix import lang examples html script"
 AC_SUBST(SUBDIRS)
 
 dnl General settings for MBSE BBS
@@ -14,6 +14,8 @@ COPYRIGHT="Copyright (C) 1997-2002 Michiel Broek, All Rights Reserved"
 SHORTRIGHT="Copyright (C) 1997-2002 M. Broek"
 GROUP="bbs"
 OWNER="mbse"
+ROOT="root"
+RGROUP="`id -gn`"
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(COPYRIGHT)
@@ -193,6 +195,7 @@ done
 AC_OUTPUT(
 	Makefile.global
 	mbfido/paths.h
+	unix/login.defs
 	INSTALL 
 	FILE_ID.DIZ
 )
diff --git a/mbsebbs/Makefile b/mbsebbs/Makefile
index fdfab94b..659f0de4 100644
--- a/mbsebbs/Makefile
+++ b/mbsebbs/Makefile
@@ -4,29 +4,23 @@
 
 include ../Makefile.global
 
-SRCS		= bank.c commonio.c filesub.c language.c mbtoberep.c \
-		  msgutil.c oneline.c sgetpwent.c xmalloc.c bbslist.c morefile.c \
-		  email.c fsedit.c lineedit.c mblang.c mbuser.c myname.c page.c \
-		  pwio.c shadowio.c bye.c encrypt.c funcs.c mail.c mbpasswd.c \
-		  mbuseradd.c newuser.c pinfo.c rad64.c timecheck.c change.c \
+SRCS		= bank.c filesub.c language.c mbtoberep.c \
+		  msgutil.c oneline.c bbslist.c morefile.c \
+		  email.c fsedit.c lineedit.c mblang.c mbuser.c page.c \
+		  bye.c funcs.c mail.c \
+		  newuser.c pinfo.c timecheck.c change.c \
 		  exitinfo.c mball.c mbsebbs.c menu.c nextuser.c pop3.c lastcallers.c \
-		  safe.c timeout.c chat.c file.c getdef.c mbchat.c mbstat.c misc.c \
-		  offline.c putpwent.c salt.c user.c mbnewusr.c input.c whoson.c \
-		  door.c dispfile.c userlist.c timestats.c logentry.c pw_util.c \
-		  mblogin.c env.c chowntty.c shell.c basename.c \
-		  pwdcheck.c pwauth.c loginprompt.c utmp.c limits.c \
-		  setupenv.c sub.c log.c setugid.c utent.c
-HDRS		= bank.h commonio.h filesub.h language.h mbsebbs.h misc.h offline.h \
-		  putpwent.h salt.h timeout.h bbslist.h email.h fsedit.h lineedit.h \
-		  mbstat.h msgutil.h oneline.h sgetpwent.h user.h bye.h morefile.h \
-		  encrypt.h funcs.h mail.h mbuser.h myname.h page.h pwio.h shadowio.h \
-		  xmalloc.h change.h exitinfo.h mball.h mbuseradd.h newuser.h \
-		  pinfo.h rad64.h chat.h file.h getdef.h mbpasswd.h menu.h \
+		  safe.c timeout.c chat.c file.c mbchat.c mbstat.c misc.c \
+		  offline.c user.c mbnewusr.c input.c whoson.c \
+		  door.c dispfile.c userlist.c timestats.c logentry.c
+HDRS		= bank.h filesub.h language.h mbsebbs.h misc.h offline.h \
+		  timeout.h bbslist.h email.h fsedit.h lineedit.h \
+		  mbstat.h msgutil.h oneline.h user.h bye.h morefile.h \
+		  funcs.h mail.h mbuser.h page.h \
+		  change.h exitinfo.h mball.h newuser.h \
+		  pinfo.h chat.h file.h menu.h \
 		  nextuser.h pop3.h safe.h timecheck.h mbnewusr.h input.h whoson.h \
-		  door.h dispfile.h userlist.h timestats.h logentry.h lastcallers.h pw_util.h \
-		  mblogin.h env.h chowntty.h shell.h basename.h \
-		  pwdcheck.h pwauth.h loginprompt.h utmp.h limits.h \
-		  setupenv.h sub.h log.h setugid.h utent.h
+		  door.h dispfile.h userlist.h timestats.h logentry.h lastcallers.h
 MBSEBBS_OBJS	= bank.o bbslist.o chat.o file.o funcs.o mail.o menu.o \
 		  misc.o pinfo.o nextuser.o oneline.o page.o fsedit.o \
 		  bye.o change.o mbsebbs.o safe.o timeout.o user.o timecheck.o \
@@ -52,14 +46,8 @@ MBTOBEREP_OBJS	= mbtoberep.o
 MBTOBEREP_LIBS	= ../lib/libmemwatch.a ../lib/libclcomm.a ../lib/libcommon.a ../lib/libdbase.a
 MBUSER_OBJS	= mbuser.o
 MBUSER_LIBS	= ../lib/libmemwatch.a ../lib/libclcomm.a ../lib/libcommon.a ../lib/libdbase.a
-MBUSERADD_OBJS	= mbuseradd.o
-MBPASSWD_OBJS	= mbpasswd.o commonio.o pwio.o shadowio.o sgetpwent.o \
-		  xmalloc.o myname.o rad64.o salt.o getdef.o encrypt.o putpwent.o pw_util.o
-MBLOGIN_OBJS	= getdef.o env.o chowntty.o shell.o basename.o \
-		  pwdcheck.o pwauth.o encrypt.o loginprompt.o utmp.o limits.o setupenv.o sub.o \
-		  xmalloc.o log.o setugid.o utent.o mblogin.o
 OTHER		= Makefile
-TARGET		= mbsebbs mbnewusr mball mblang mbchat mbstat mbtoberep mbuser mbuseradd mbpasswd mblogin
+TARGET		= mbsebbs mbnewusr mball mblang mbchat mbstat mbtoberep mbuser
 
 #############################################################################################################
 
@@ -103,18 +91,6 @@ mbuser:		${MBUSER_OBJS} ${MBUSER_LIBS}
 		${CC} -o mbuser ${MBUSER_OBJS} ${LIBS} ${MBUSER_LIBS}
 		strip mbuser
 
-mbuseradd:	${MBUSERADD_OBJS}
-		${CC} -o mbuseradd ${MBUSERADD_OBJS} ${LIBS}
-		strip mbuseradd
-
-mbpasswd:	${MBPASSWD_OBJS}
-		${CC} -o mbpasswd ${MBPASSWD_OBJS} ${LIBS}
-		strip mbpasswd
-
-mblogin:	${MBLOGIN_OBJS}
-		${CC} -o mblogin ${MBLOGIN_OBJS} ${LIBS}
-		strip mblogin
-
 install:	all
 		@if [ "`id -un`" != "root" ] ; then \
 			echo; echo " Must be root to install!"; echo; exit 3; \
@@ -127,10 +103,8 @@ install:	all
 		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbstat    ${BINDIR}
 		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbtoberep ${BINDIR}
 		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbuser    ${BINDIR}
-		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbuseradd ${BINDIR}
-		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbpasswd  ${BINDIR}
-		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 0755 mblogin   ${BINDIR}
 		@rm -f ${BINDIR}/mbfbgen
+		@rm -f mbuseradd mbpasswd mblogin
 
 filelist:	Makefile
 		BASE=`pwd`; \
@@ -162,14 +136,11 @@ depend:
 # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
 # Dependencies generated by make depend
 bank.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/clcomm.h ../lib/common.h bank.h input.h language.h dispfile.h timeout.h timecheck.h whoson.h exitinfo.h
-commonio.o: ../config.h commonio.h
 filesub.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h filesub.h funcs.h language.h input.h misc.h timeout.h exitinfo.h change.h
 language.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h input.h language.h
 mbtoberep.o: ../lib/libs.h ../lib/structs.h
 msgutil.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msgtext.h ../lib/msg.h oneline.h msgutil.h
 oneline.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h oneline.h funcs.h input.h language.h
-sgetpwent.o: ../config.h sgetpwent.h
-xmalloc.o: ../config.h xmalloc.h
 bbslist.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/clcomm.h ../lib/common.h bbslist.h funcs.h input.h language.h
 morefile.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/clcomm.h ../lib/common.h input.h language.h morefile.h timeout.h
 email.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/msgtext.h ../lib/msg.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h exitinfo.h language.h mail.h timeout.h msgutil.h input.h email.h whoson.h
@@ -177,19 +148,12 @@ fsedit.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/a
 lineedit.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h mail.h input.h language.h timeout.h lineedit.h
 mblang.o: ../lib/libs.h ../lib/structs.h ../lib/records.h
 mbuser.o: ../lib/libs.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbuser.h
-myname.o: ../config.h
 page.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h dispfile.h input.h chat.h page.h timeout.h mail.h language.h
-pwio.o: ../config.h sgetpwent.h commonio.h putpwent.h pwio.h
-shadowio.o: ../config.h commonio.h shadowio.h
 bye.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/clcomm.h ../lib/common.h dispfile.h misc.h language.h bye.h
-encrypt.o: ../config.h encrypt.h
 funcs.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/msgtext.h ../lib/msg.h ../lib/clcomm.h funcs.h
 mail.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/msgtext.h ../lib/clcomm.h ../lib/msg.h mail.h funcs.h input.h language.h misc.h timeout.h oneline.h exitinfo.h lineedit.h fsedit.h filesub.h msgutil.h pop3.h email.h whoson.h
-mbpasswd.o: ../config.h encrypt.h rad64.h myname.h xmalloc.h pwio.h shadowio.h pw_util.h mbpasswd.h
-mbuseradd.o: ../config.h mbuseradd.h
 newuser.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/clcomm.h ../lib/common.h funcs.h input.h newuser.h language.h timeout.h change.h dispfile.h
 pinfo.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h pinfo.h input.h
-rad64.o: ../config.h rad64.h
 timecheck.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/clcomm.h ../lib/common.h timecheck.h funcs.h bye.h exitinfo.h language.h input.h
 change.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h change.h dispfile.h funcs.h input.h language.h misc.h timeout.h exitinfo.h bye.h
 exitinfo.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h funcs.h input.h language.h oneline.h misc.h bye.h timeout.h timecheck.h exitinfo.h
@@ -203,13 +167,10 @@ safe.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/clc
 timeout.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h timeout.h funcs.h bye.h filesub.h language.h
 chat.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h chat.h funcs.h input.h language.h misc.h whoson.h
 file.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h filesub.h file.h funcs.h input.h language.h misc.h timeout.h exitinfo.h whoson.h change.h
-getdef.o: ../config.h getdef.h
 mbchat.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h
 mbstat.o: ../lib/libs.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbstat.h
 misc.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/clcomm.h ../lib/common.h funcs.h input.h language.h misc.h timeout.h exitinfo.h
 offline.o: ../lib/libs.h ../lib/structs.h ../lib/mbse.h ../lib/records.h ../lib/bluewave.h ../lib/common.h ../lib/clcomm.h ../lib/msgtext.h ../lib/msg.h mail.h funcs.h input.h language.h file.h filesub.h exitinfo.h timeout.h msgutil.h pop3.h offline.h whoson.h
-putpwent.o: ../config.h putpwent.h
-salt.o: ../config.h rad64.h getdef.h
 user.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h timeout.h user.h dispfile.h funcs.h input.h misc.h bye.h file.h mail.h change.h menu.h exitinfo.h language.h offline.h email.h
 mbnewusr.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h mbnewusr.h funcs.h input.h language.h misc.h timeout.h newuser.h
 input.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/clcomm.h ../lib/common.h input.h timeout.h language.h
@@ -219,20 +180,4 @@ dispfile.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib
 userlist.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h userlist.h language.h input.h timeout.h
 timestats.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h timestats.h funcs.h language.h input.h exitinfo.h
 logentry.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib/common.h ../lib/clcomm.h logentry.h
-pw_util.o: pw_util.h
-mblogin.o: ../config.h mblogin.h getdef.h env.h chowntty.h basename.h shell.h pwdcheck.h pwauth.h loginprompt.h utmp.h limits.h setupenv.h sub.h log.h setugid.h
-env.o: ../config.h mblogin.h xmalloc.h
-chowntty.o: ../config.h mblogin.h getdef.h chowntty.h
-shell.o: ../config.h mblogin.h basename.h shell.h
-basename.o: ../config.h mblogin.h basename.h
-pwdcheck.o: ../config.h mblogin.h pwauth.h pwdcheck.h
-pwauth.o: ../config.h mblogin.h pwauth.h getdef.h encrypt.h
-loginprompt.o: ../config.h mblogin.h getdef.h xmalloc.h env.h loginprompt.h
-utmp.o: ../config.h mblogin.h utmp.h
-limits.o: ../config.h mblogin.h getdef.h utmp.h limits.h
-setupenv.o: ../config.h mblogin.h getdef.h xmalloc.h env.h setupenv.h
-sub.o: ../config.h mblogin.h sub.h
-log.o: ../config.h mblogin.h log.h
-setugid.o: ../config.h mblogin.h getdef.h setugid.h
-utent.o: ../config.h mblogin.h
 # End of generated dependencies
diff --git a/unix/Makefile b/unix/Makefile
new file mode 100644
index 00000000..48427748
--- /dev/null
+++ b/unix/Makefile
@@ -0,0 +1,116 @@
+# Makefile for MBSE BBS under Linux
+# Copyright (c) 1998, 2001 by M. Broek.
+# $Id$
+
+include ../Makefile.global
+
+SRCS		= commonio.c putpwent.c salt.c sgetpwent.c xmalloc.c myname.c encrypt.c \
+		  pwio.c shadowio.c mbpasswd.c mbuseradd.c rad64.c getdef.c pw_util.c \
+		  mblogin.c env.c chowntty.c shell.c basename.c pwdcheck.c pwauth.c \
+		  loginprompt.c utmp.c limits.c setupenv.c sub.c log.c setugid.c utent.c
+HDRS		= commonio.h putpwent.h salt.h sgetpwent.h xmalloc.h myname.h encrypt.h \
+		  pwio.h shadowio.h mbpasswd.h mbuseradd.h rad64.h getdef.h pw_util.h \
+		  mblogin.h env.h chowntty.h shell.h basename.h pwdcheck.h pwauth.h \
+		  loginprompt.h utmp.h limits.h setupenv.h sub.h log.h setugid.h utent.h
+MBUSERADD_OBJS	= mbuseradd.o
+MBPASSWD_OBJS	= mbpasswd.o commonio.o pwio.o shadowio.o sgetpwent.o \
+		  xmalloc.o myname.o rad64.o salt.o getdef.o encrypt.o putpwent.o pw_util.o
+MBLOGIN_OBJS	= getdef.o env.o chowntty.o shell.o basename.o pwdcheck.o pwauth.o encrypt.o \
+		  loginprompt.o utmp.o limits.o setupenv.o sub.o xmalloc.o log.o setugid.o \
+		  utent.o mblogin.o
+OTHER		= Makefile login.defs.in
+TARGET		= mbuseradd mbpasswd mblogin
+
+#############################################################################################################
+
+.c.o:
+		${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -c $<
+
+all:		${TARGET}
+
+clean: 
+		rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak
+
+mbuseradd:	${MBUSERADD_OBJS}
+		${CC} -o mbuseradd ${MBUSERADD_OBJS} ${LIBS}
+		strip mbuseradd
+
+mbpasswd:	${MBPASSWD_OBJS}
+		${CC} -o mbpasswd ${MBPASSWD_OBJS} ${LIBS}
+		strip mbpasswd
+
+mblogin:	${MBLOGIN_OBJS}
+		${CC} -o mblogin ${MBLOGIN_OBJS} ${LIBS}
+		strip mblogin
+
+install:	all
+		@if [ "`id -un`" != "root" ] ; then \
+			echo; echo " Must be root to install!"; echo; exit 3; \
+		fi
+		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbuseradd ${BINDIR}
+		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbpasswd  ${BINDIR}
+		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 0755 mblogin   ${BINDIR}
+		@if [ ! -f ${ETCDIR}/login.defs ] ; then \
+			${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 login.defs ${ETCDIR} ; \
+			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 login.defs ${ETCDIR}" ; \
+		fi
+
+filelist:	Makefile
+		BASE=`pwd`; \
+		BASE=`basename $${BASE}`; \
+		(for f in ${SRCS} ${HDRS} ${OTHER} ; do echo ${PACKAGE}-${VERSION}/$${BASE}/$$f; done) >filelist
+
+depend:
+		@rm -f Makefile.bak; \
+		mv Makefile Makefile.bak; \
+		sed -e '/^# DO NOT DELETE/,$$d' Makefile.bak >Makefile; \
+		${ECHO} '# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT' \
+		>>Makefile; \
+		${ECHO} '# Dependencies generated by make depend' >>Makefile; \
+		for f in ${SRCS}; \
+		do \
+		${ECHO} "Dependencies for $$f:\c"; \
+		${ECHO} "`basename $$f .c`.o:\c" >>Makefile; \
+		for h in `sed -n -e \
+			's/^#[ 	]*include[ 	]*"\([^"]*\)".*/\1/p' $$f`; \
+		do \
+			${ECHO} " $$h\c"; \
+			${ECHO} " $$h\c" >>Makefile; \
+		done; \
+		${ECHO} " done."; \
+		${ECHO} "" >>Makefile; \
+		done; \
+		${ECHO} '# End of generated dependencies' >>Makefile
+
+# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
+# Dependencies generated by make depend
+commonio.o: ../config.h commonio.h
+putpwent.o: ../config.h putpwent.h
+salt.o: ../config.h rad64.h getdef.h
+sgetpwent.o: ../config.h sgetpwent.h
+xmalloc.o: ../config.h xmalloc.h
+myname.o: ../config.h
+encrypt.o: ../config.h encrypt.h
+pwio.o: ../config.h sgetpwent.h commonio.h putpwent.h pwio.h
+shadowio.o: ../config.h commonio.h shadowio.h
+mbpasswd.o: ../config.h encrypt.h rad64.h myname.h xmalloc.h pwio.h shadowio.h pw_util.h mbpasswd.h
+mbuseradd.o: ../config.h mbuseradd.h
+rad64.o: ../config.h rad64.h
+getdef.o: ../config.h getdef.h
+pw_util.o: pw_util.h
+mblogin.o: ../config.h mblogin.h getdef.h env.h chowntty.h basename.h shell.h pwdcheck.h pwauth.h loginprompt.h utmp.h limits.h setupenv.h sub.h log.h setugid.h
+env.o: ../config.h mblogin.h xmalloc.h
+chowntty.o: ../config.h mblogin.h getdef.h chowntty.h
+shell.o: ../config.h mblogin.h basename.h shell.h
+basename.o: ../config.h mblogin.h basename.h
+pwdcheck.o: ../config.h mblogin.h pwauth.h pwdcheck.h
+pwauth.o: ../config.h mblogin.h pwauth.h getdef.h encrypt.h
+loginprompt.o: ../config.h mblogin.h getdef.h xmalloc.h env.h loginprompt.h
+utmp.o: ../config.h mblogin.h utmp.h
+limits.o: ../config.h mblogin.h limits.h
+setupenv.o: ../config.h mblogin.h getdef.h xmalloc.h env.h setupenv.h
+sub.o: ../config.h mblogin.h sub.h
+log.o: ../config.h mblogin.h log.h
+setugid.o: ../config.h mblogin.h getdef.h setugid.h
+utent.o: ../config.h mblogin.h
+# End of generated dependencies
diff --git a/mbsebbs/basename.c b/unix/basename.c
similarity index 100%
rename from mbsebbs/basename.c
rename to unix/basename.c
diff --git a/mbsebbs/basename.h b/unix/basename.h
similarity index 100%
rename from mbsebbs/basename.h
rename to unix/basename.h
diff --git a/mbsebbs/chowntty.c b/unix/chowntty.c
similarity index 84%
rename from mbsebbs/chowntty.c
rename to unix/chowntty.c
index 50d815e8..7a205ec9 100644
--- a/mbsebbs/chowntty.c
+++ b/unix/chowntty.c
@@ -67,10 +67,25 @@ int is_my_tty(const char *tty)
  */
 void chown_tty(const char *tty, const struct passwd *info)
 {
-	char	buf[200], full_tty[200];
-	gid_t	gid;
+	char		buf[200], full_tty[200];
+	char		*group;	    /* TTY group name or number */
+	struct group	*grent;
+	gid_t		gid;
+
+	/*
+	 *          * See if login.defs has some value configured for the port group
+	 *                   * ID.  Otherwise, use the user's primary group ID.
+	 *                            */
+
+	if (! (group = getdef_str ("TTYGROUP")))
+		gid = info->pw_gid;
+	else if (group[0] >= '0' && group[0] <= '9')
+		gid = atoi (group);
+	else if ((grent = getgrnam (group)))
+		gid = grent->gr_gid;
+	else
+		gid = info->pw_gid;
 
-	gid = info->pw_gid;
 
 	/*
 	 * Change the permissions on the TTY to be owned by the user with
diff --git a/mbsebbs/chowntty.h b/unix/chowntty.h
similarity index 100%
rename from mbsebbs/chowntty.h
rename to unix/chowntty.h
diff --git a/mbsebbs/commonio.c b/unix/commonio.c
similarity index 100%
rename from mbsebbs/commonio.c
rename to unix/commonio.c
diff --git a/mbsebbs/commonio.h b/unix/commonio.h
similarity index 100%
rename from mbsebbs/commonio.h
rename to unix/commonio.h
diff --git a/mbsebbs/encrypt.c b/unix/encrypt.c
similarity index 100%
rename from mbsebbs/encrypt.c
rename to unix/encrypt.c
diff --git a/mbsebbs/encrypt.h b/unix/encrypt.h
similarity index 100%
rename from mbsebbs/encrypt.h
rename to unix/encrypt.h
diff --git a/mbsebbs/env.c b/unix/env.c
similarity index 100%
rename from mbsebbs/env.c
rename to unix/env.c
diff --git a/mbsebbs/env.h b/unix/env.h
similarity index 100%
rename from mbsebbs/env.h
rename to unix/env.h
diff --git a/mbsebbs/getdef.c b/unix/getdef.c
similarity index 66%
rename from mbsebbs/getdef.c
rename to unix/getdef.c
index 9e72e0c2..3ef67a3d 100644
--- a/mbsebbs/getdef.c
+++ b/unix/getdef.c
@@ -30,34 +30,6 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
-/*
- * Copyright 1991 - 1994, Julianne Frances Haugh and Chip Rosenthal
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Julianne F. Haugh nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
 
 #include "../config.h"
 #include <stdio.h>
@@ -65,15 +37,15 @@
 #include <ctype.h>
 #include <string.h>
 #include <syslog.h>
+#include <sys/param.h>
+#include <pwd.h>
 #include "getdef.h"
 
 
-#ifndef	__FreeBSD__
 
 /*
  * A configuration item definition.
  */
-
 struct itemdef {
 	const char *name;	/* name of the item			*/
 	char *value;		/* value given, or NULL if no value	*/
@@ -88,80 +60,34 @@ struct itemdef {
  *  on. Missing entries here gives a nasty message to
  *  new bbs users.
  */
-
 #define NUMDEFS	(sizeof(def_table)/sizeof(def_table[0]))
 static struct itemdef def_table[] = {
-	{ "CHFN_AUTH",			NULL },
-	{ "CHFN_RESTRICT",		NULL },
-	{ "CLOSE_SESSIONS",		NULL },
-	{ "CONSOLE",			NULL },
-	{ "CONSOLE_GROUPS",		NULL },
-	{ "CRACKLIB_DICTPATH",		NULL },
-	{ "CREATE_HOME",		NULL },
+	{ "ALLOW_MBSE",			NULL },
+	{ "ASK_NEWUSER",		NULL },
 	{ "DEFAULT_HOME",		NULL },
-	{ "DIALUPS_CHECK_ENAB",		NULL },
-	{ "ENVIRON_FILE",		NULL },
 	{ "ENV_HZ",			NULL },
 	{ "ENV_PATH" ,			NULL },
-	{ "ENV_ROOTPATH",		NULL },
-	{ "ENV_SUPATH",			NULL },
 	{ "ENV_TZ",			NULL },
 	{ "ERASECHAR",			NULL },
-	{ "FAILLOG_ENAB",		NULL },
 	{ "FAIL_DELAY",			NULL },
-	{ "FAKE_SHELL",			NULL },
-	{ "FTMP_FILE",			NULL },
-	{ "GID_MAX",			NULL },
-	{ "GID_MIN",			NULL },
-	{ "HUSHLOGIN_FILE",		NULL },
 	{ "ISSUE_FILE",			NULL },
 	{ "KILLCHAR",			NULL },
 	{ "LASTLOG_ENAB",		NULL },
 	{ "LOGIN_RETRIES",		NULL },
-	{ "LOGIN_STRING",		NULL },
 	{ "LOGIN_TIMEOUT",		NULL },
 	{ "LOG_OK_LOGINS",		NULL },
 	{ "LOG_UNKFAIL_ENAB",		NULL },
-	{ "MAIL_CHECK_ENAB",		NULL },
-	{ "MAIL_DIR",			NULL },
-	{ "MAIL_FILE",			NULL },
 	{ "MD5_CRYPT_ENAB",		NULL },
-	{ "MOTD_FILE",			NULL },
+	{ "NEWUSER_ACCOUNT",		NULL },
 	{ "NOLOGINS_FILE",		NULL },
-	{ "NOLOGIN_STR",		NULL },
-	{ "NO_PASSWORD_CONSOLE",	NULL },
-	{ "OBSCURE_CHECKS_ENAB",	NULL },
-	{ "PASS_ALWAYS_WARN",		NULL },
-	{ "PASS_CHANGE_TRIES",		NULL },
-	{ "PASS_MAX_DAYS",		NULL },
-	{ "PASS_MAX_LEN",		NULL },
-	{ "PASS_MIN_DAYS",		NULL },
-	{ "PASS_MIN_LEN",		NULL },
-	{ "PASS_WARN_AGE",		NULL },
-	{ "PORTTIME_CHECKS_ENAB",	NULL },
-	{ "QMAIL_DIR",			NULL },
-	{ "QUOTAS_ENAB",		NULL },
-	{ "SULOG_FILE",			NULL },
-	{ "SU_NAME",			NULL },
-	{ "SU_WHEEL_ONLY",		NULL },
-	{ "SYSLOG_SG_ENAB",		NULL },
-	{ "SYSLOG_SU_ENAB",		NULL },
 	{ "TTYGROUP",			NULL },
 	{ "TTYPERM",			NULL },
-	{ "TTYTYPE_FILE",		NULL },
-	{ "UID_MAX",			NULL },
-	{ "UID_MIN",			NULL },
 	{ "ULIMIT",			NULL },
 	{ "UMASK",			NULL },
-	{ "USERDEL_CMD",		NULL },
 	{ "USERGROUPS_ENAB",		NULL },
 };
 
-#ifndef LOGINDEFS
-#define LOGINDEFS "/etc/login.defs"
-#endif
 
-static char def_fname[] = LOGINDEFS;	/* login config defs file	*/
 static int def_loaded = 0;		/* are defs already loaded?	*/
 
 
@@ -170,13 +96,13 @@ static struct itemdef *def_find (const char *);
 static void def_load (void);
 
 
+
 /*
  * getdef_str - get string value from table of definitions.
  *
  * Return point to static data for specified item, or NULL if item is not
  * defined.  First time invoked, will load definitions from the file.
  */
-
 char *getdef_str(const char *item)
 {
 	struct itemdef *d;
@@ -188,12 +114,12 @@ char *getdef_str(const char *item)
 }
 
 
+
 /*
  * getdef_bool - get boolean value from table of definitions.
  *
  * Return TRUE if specified item is defined as "yes", else FALSE.
  */
-
 int getdef_bool(const char *item)
 {
 	struct itemdef *d;
@@ -208,6 +134,7 @@ int getdef_bool(const char *item)
 }
 
 
+
 /*
  * getdef_num - get numerical value from table of definitions
  *
@@ -215,7 +142,6 @@ int getdef_bool(const char *item)
  * the item is not defined.  Octal (leading "0") and hex (leading "0x")
  * values are handled.
  */
-
 int getdef_num(const char *item, int dflt)
 {
 	struct itemdef *d;
@@ -230,6 +156,7 @@ int getdef_num(const char *item, int dflt)
 }
 
 
+
 /*
  * getdef_long - get long integer value from table of definitions
  *
@@ -237,7 +164,6 @@ int getdef_num(const char *item, int dflt)
  * the item is not defined.  Octal (leading "0") and hex (leading "0x")
  * values are handled.
  */
-
 long getdef_long(const char *item, long dflt)
 {
 	struct itemdef *d;
@@ -251,13 +177,14 @@ long getdef_long(const char *item, long dflt)
 	return strtol(d->value, (char **)NULL, 0);
 }
 
+
+
 /*
  * def_find - locate named item in table
  *
  * Search through a sorted table of configurable items to locate the
  * specified configuration option.
  */
-
 static struct itemdef *def_find(const char *name)
 {
 	int min, max, curr, n;
@@ -290,28 +217,38 @@ static struct itemdef *def_find(const char *name)
 	 * Item was never found.
 	 */
 
-	fprintf(stderr, "mbpasswd: configuration error - unknown item '%s' (notify administrator)\r\n", name);
-	syslog(LOG_CRIT, "unknown configuration item `%s'", name);
+	fprintf(stderr, "getdef(): configuration error - unknown item '%s' (notify administrator)\r\n", name);
+	syslog(LOG_CRIT, "getdef(): unknown configuration item `%s'", name);
 	return (struct itemdef *) NULL;
 }
 
+
+
 /*
  * def_load - load configuration table
  *
  * Loads the user-configured options from the default configuration file
  */
-
 static void def_load(void)
 {
-	int i;
-	FILE *fp;
-	struct itemdef *d;
-	char buf[BUFSIZ], *name, *value, *s;
+	int		i;
+	FILE		*fp;
+	struct itemdef	*d;
+	char		buf[BUFSIZ], def_fname[PATH_MAX], *name, *value, *s;
+	struct passwd	*pw;
+
+	/*
+	 * Get MBSE BBS root directory
+	 */
+	if ((pw = getpwnam("mbse")) == NULL) {
+		syslog(LOG_CRIT, "cannot find user `mbse' in password file");
+		return;
+	}
+	sprintf(def_fname, "%s/etc/login.defs", pw->pw_dir);
 
 	/*
 	 * Open the configuration definitions file.
 	 */
-
 	if ((fp = fopen(def_fname, "r")) == NULL) {
 		syslog(LOG_CRIT, "cannot open login definitions %s [%m]", def_fname);
 		return;
@@ -320,7 +257,6 @@ static void def_load(void)
 	/*
 	 * Go through all of the lines in the file.
 	 */
-
 	while (fgets(buf, sizeof(buf), fp) != NULL) {
 
 		/*
@@ -362,8 +298,8 @@ static void def_load(void)
 		 */
 
 		if ((d->value = strdup(value)) == NULL) {
-			fprintf(stderr, "mbpasswd: Could not allocate space for config info.\n");
-			syslog(LOG_ERR, "could not allocate space for config info");
+			fprintf(stderr, "getdef: Could not allocate space for config info.\n");
+			syslog(LOG_ERR, "getdef: could not allocate space for config info");
 			break;
 		}
 	}
@@ -372,10 +308,11 @@ static void def_load(void)
 	/*
 	 * Set the initialized flag.
 	 */
-
 	++def_loaded;
 }
 
+
+
 #ifdef CKDEFS
 int main(int argc, char **argv)
 {
@@ -401,4 +338,3 @@ int main(int argc, char **argv)
 }
 #endif
 
-#endif /* ifndef __FreeBSD__ */
diff --git a/mbsebbs/getdef.h b/unix/getdef.h
similarity index 88%
rename from mbsebbs/getdef.h
rename to unix/getdef.h
index 6774b85d..641a4371 100644
--- a/mbsebbs/getdef.h
+++ b/unix/getdef.h
@@ -3,13 +3,11 @@
 #ifndef _GETDEF_H
 #define _GETDEF_H
 
-#ifndef __FreeBSD__
 
 int getdef_bool(const char *);
 long getdef_long(const char *, long);
 int getdef_num(const char *, int);
 char *getdef_str(const char *);
 
-#endif
 
 #endif /* _GETDEF_H */
diff --git a/mbsebbs/limits.c b/unix/limits.c
similarity index 100%
rename from mbsebbs/limits.c
rename to unix/limits.c
diff --git a/mbsebbs/limits.h b/unix/limits.h
similarity index 100%
rename from mbsebbs/limits.h
rename to unix/limits.h
diff --git a/mbsebbs/log.c b/unix/log.c
similarity index 100%
rename from mbsebbs/log.c
rename to unix/log.c
diff --git a/mbsebbs/log.h b/unix/log.h
similarity index 100%
rename from mbsebbs/log.h
rename to unix/log.h
diff --git a/unix/login.defs.in b/unix/login.defs.in
new file mode 100644
index 00000000..8469527d
--- /dev/null
+++ b/unix/login.defs.in
@@ -0,0 +1,145 @@
+#
+# $MBSE_ROOT/etc/login.defs - Configuration control definitions for mblogin.
+#
+#   $Id$
+
+# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
+# If unspecified, some arbitrary (and possibly incorrect) value will
+# be assumed.  All other items are optional - if not specified then
+# the described action or option will be inhibited.
+#
+# Comment lines (lines beginning with "#") and blank lines are ignored.
+#
+
+#
+# Allow user "mbse" to login and get a shell.
+#
+ALLOW_MBSE		no
+
+#
+# Ask a user when his username is not found if he wants to register as new
+# user. If not, the user has to use the special account to start mbnewusr.
+# If no, it is not bbs user friendly,
+# If yes, usernames may be easy guessed, but most bbses do it like this.
+#
+ASK_NEWUSER		yes
+
+#
+# The newuser account name, defaults to "bbs". If you change this change it
+# in the password files, change it in mbsetup and in this file. Better
+# leave this unchanged.
+#
+NEWUSER_ACCOUNT		bbs
+
+#
+# Delay in seconds before being allowed another attempt after a login failure
+#
+FAIL_DELAY		3
+
+#
+# Enable display of unknown usernames when login failures are recorded.
+#
+LOG_UNKFAIL_ENAB	no
+
+#
+# Enable logging of successful logins
+#
+LOG_OK_LOGINS		no
+
+#
+# Enable logging and display of /var/log/lastlog login time info.
+#
+LASTLOG_ENAB		yes
+
+#
+# If defined, this file will be output before each login prompt.
+# Should not be needed, mgetty and getty will do this already.
+#
+#ISSUE_FILE	@prefix@/etc/issue
+
+#
+# If defined, name of file whose presence which will inhibit non-root
+# logins.  The contents of this file should be a message indicating
+# why logins are inhibited.
+#
+NOLOGINS_FILE	/etc/nologin
+
+#
+# If defined, an HZ environment parameter spec.
+#
+# for Linux/x86
+ENV_HZ		HZ=100
+# For Linux/Alpha...
+#ENV_HZ		HZ=1024
+
+#
+# *REQUIRED*  The default PATH settings, for superuser and normal users.
+#
+# (they are minimal, add the rest in the shell startup files)
+ENV_PATH	PATH=/usr/local/bin:/bin:/usr/bin:@prefix@/bin
+
+#
+# Terminal permissions
+#
+#	TTYGROUP	Login tty will be assigned this group ownership.
+#	TTYPERM		Login tty will be set to this permission.
+#
+# If you have a "write" program which is "setgid" to a special group
+# which owns the terminals, define TTYGROUP to the group number and
+# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
+# TTYPERM to either 622 or 600.
+#
+TTYGROUP	tty
+TTYPERM		0620
+
+#
+# Login configuration initializations:
+#
+#	ERASECHAR	Terminal ERASE character ('\010' = backspace).
+#	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
+#	UMASK		Default "umask" value.
+#	ULIMIT		Default "ulimit" value.
+#
+# The ERASECHAR and KILLCHAR are used only on System V machines.
+# The ULIMIT is used only if the system supports it.
+# (now it works with setrlimit too; ulimit is in 512-byte units)
+#
+# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
+#
+ERASECHAR	0177
+KILLCHAR	025
+UMASK		007
+
+#
+# Max number of login retries if password is bad
+#
+LOGIN_RETRIES		5
+
+#
+# Max time in seconds for login
+#
+LOGIN_TIMEOUT		60
+
+#
+# Only works if compiled with MD5_CRYPT defined:
+# If set to "yes", new passwords will be encrypted using the MD5-based
+# algorithm compatible with the one used by recent releases of FreeBSD.
+# It supports passwords of unlimited length and longer salt strings.
+# Set to "no" if you need to copy encrypted passwords to other systems
+# which don't understand the new algorithm.  Default is "no".
+#
+MD5_CRYPT_ENAB	yes
+
+#
+# Should login be allowed if we can't cd to the home directory?
+# Default in no.
+#
+DEFAULT_HOME	no
+
+#
+# Enable setting of the umask group bits to be the same as owner bits
+# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
+# the same as gid, and username is the same as the primary group name.
+#
+USERGROUPS_ENAB yes
+
diff --git a/mbsebbs/loginprompt.c b/unix/loginprompt.c
similarity index 98%
rename from mbsebbs/loginprompt.c
rename to unix/loginprompt.c
index b03ec285..d3ebf1b7 100644
--- a/mbsebbs/loginprompt.c
+++ b/unix/loginprompt.c
@@ -86,8 +86,7 @@ void login_prompt(const char *prompt, char *name, int namesize)
 	 */
 
 	if (prompt) {
-//		cp = getdef_str("ISSUE_FILE");
-		cp = NULL;
+		cp = getdef_str("ISSUE_FILE");
 		if (cp && (fp = fopen(cp, "r"))) {
 			while ((i = getc(fp)) != EOF)
 				putc(i, stdout);
diff --git a/mbsebbs/loginprompt.h b/unix/loginprompt.h
similarity index 100%
rename from mbsebbs/loginprompt.h
rename to unix/loginprompt.h
diff --git a/mbsebbs/mblogin.c b/unix/mblogin.c
similarity index 95%
rename from mbsebbs/mblogin.c
rename to unix/mblogin.c
index 190d6bd9..e2f50e35 100644
--- a/mbsebbs/mblogin.c
+++ b/unix/mblogin.c
@@ -149,7 +149,7 @@ extern	char	**environ;
 static void usage(void);
 static void setup_tty(void);
 static void check_flags(int, char * const *);
-static void check_nologin(char *);
+static void check_nologin(void);
 static void init_env(void);
 static RETSIGTYPE alarm_handler(int);
 int main(int, char **);
@@ -214,11 +214,9 @@ static void setup_tty(void)
 	termio.c_oflag |= (XTABS|OPOST|ONLCR);
 #endif
 
-#ifndef __FreeBSD__
 	/* leave these values unchanged if not specified in login.defs */
 	termio.c_cc[VERASE] = getdef_num("ERASECHAR", termio.c_cc[VERASE]);
 	termio.c_cc[VKILL] = getdef_num("KILLCHAR", termio.c_cc[VKILL]);
-#endif
 
 	/*
 	 * ttymon invocation prefers this, but these settings won't come into
@@ -248,10 +246,7 @@ static void check_flags(int argc, char * const *argv)
 
 
 
-/*
- * nologin file is $MBSE_ROOT/etc/nologin
- */
-static void check_nologin(char *path)
+static void check_nologin(void)
 {
 	char *fname;
 
@@ -263,8 +258,7 @@ static void check_nologin(char *path)
 	 * forgotten about it ...
 	 */
 
-	fname = calloc(PATH_MAX, sizeof(char));
-	sprintf(fname, "%s/etc/nologin", path);
+	fname = getdef_str("NOLOGINS_FILE");
 	if (access(fname, F_OK) == 0) {
 		FILE	*nlfp;
 		int	c;
@@ -298,10 +292,7 @@ static void check_nologin(char *path)
 
 static void init_env(void)
 {
-#ifndef	__FreeBSD__
-	char 	*cp;
-#endif
-	char	*tmp;
+	char 	*cp, *tmp;
 
 	if ((tmp = getenv("LANG"))) {
 		addenv("LANG", tmp);
@@ -314,7 +305,7 @@ static void init_env(void)
 
 	if ((tmp = getenv("TZ"))) {
 		addenv("TZ", tmp);
-	}
+	} 
 
 	/* 
 	 * Add the clock frequency so that profiling commands work
@@ -323,12 +314,9 @@ static void init_env(void)
 
 	if ((tmp = getenv("HZ"))) {
 		addenv("HZ", tmp);
-#ifndef __FreeBSD__
-	} else if ((cp = getdef_str("ENV_HZ")))
+	} else if ((cp = getdef_str("ENV_HZ"))) {
 		addenv(cp, NULL);
-#else
 	}
-#endif
 }
 
 
@@ -488,7 +476,7 @@ int main(int argc, char **argv)
 
 	openlog("mblogin", LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_AUTH);
 	setup_tty();
-	umask(007);
+	umask(getdef_num("UMASK", 007));
 
 	if (pflg)
 	    while (*envp)           /* add inherited environment, */
@@ -509,7 +497,7 @@ int main(int argc, char **argv)
 	addenv("MBSE_ROOT", pw->pw_dir);
 	sprintf(userfile, "%s/etc/users.data",  pw->pw_dir);
 
-	check_nologin(pw->pw_dir);
+	check_nologin();
 
 	init_env();
 
@@ -574,13 +562,13 @@ int main(int argc, char **argv)
 top:
 	/* only allow ALARM sec. for login */
 	signal(SIGALRM, alarm_handler);
-	timeout = LOGIN_TIMEOUT;
+	timeout = getdef_num("LOGIN_TIMEOUT", ALARM);
 	if (timeout > 0)
 		alarm(timeout);
 
 	environ = newenvp;		/* make new environment active */
-	delay   = LOGIN_DELAY;
-	retries = LOGIN_RETRIES;
+	delay   = getdef_num("FAIL_DELAY", 1);
+	retries = getdef_num("LOGIN_RETRIES", RETRIES);
 
 	while (1) {			/* repeatedly get login/password pairs */
 		failed = 0;		/* haven't failed authentication yet */
@@ -663,7 +651,7 @@ top:
 		 * username at least once...  Should probably use LOG_AUTHPRIV
 		 * for those who really want to log them.  --marekm
 		 */
-		syslog(LOG_WARNING, BAD_PASSWD, "UNKNOWN", fromhost);
+		syslog(LOG_WARNING, BAD_PASSWD, (pwd || getdef_bool("LOG_UNKFAIL_ENAB")) ? username : "UNKNOWN", fromhost);
 		failed = 1;
 
 auth_ok:
@@ -722,20 +710,6 @@ auth_ok:
 
 	}  /* while (1) */
 	(void) alarm (0);		/* turn off alarm clock */
-#if 1
-	/*
-	 * porttime checks moved here, after the user has been
-	 * authenticated.  now prints a message, as suggested
-	 * by Ivan Nejgebauer <ian@unsux.ns.ac.yu>.  --marekm
-	 */
-//	if (getdef_bool("PORTTIME_CHECKS_ENAB") &&
-//	    !isttytime(pwent.pw_name, tty, time ((time_t *) 0))) {
-//		SYSLOG((LOG_WARN, BAD_TIME, username, fromhost));
-//		closelog();
-//		bad_time_notify();
-//		exit(1);
-//	}
-#endif
 
 	if (getenv("IFS"))		/* don't export user IFS ... */
 		addenv("IFS= \t\n", NULL);  /* ... instead, set a safe IFS */
@@ -759,7 +733,8 @@ auth_ok:
 		goto top;		/* go do all this all over again */
 	}
 
-	dolastlog(&lastlog, &pwent, utent.ut_line, hostname);
+	if (getdef_bool("LASTLOG_ENAB")) /* give last login and log this one */
+		dolastlog(&lastlog, &pwent, utent.ut_line, hostname);
 
 #ifdef SVR4_SI86_EUA
 	sysi86(SI86LIMUSER, EUA_ADD_USER);	/* how do we test for fail? */
diff --git a/mbsebbs/mblogin.h b/unix/mblogin.h
similarity index 100%
rename from mbsebbs/mblogin.h
rename to unix/mblogin.h
diff --git a/mbsebbs/mbpasswd.c b/unix/mbpasswd.c
similarity index 100%
rename from mbsebbs/mbpasswd.c
rename to unix/mbpasswd.c
diff --git a/mbsebbs/mbpasswd.h b/unix/mbpasswd.h
similarity index 100%
rename from mbsebbs/mbpasswd.h
rename to unix/mbpasswd.h
diff --git a/mbsebbs/mbuseradd.c b/unix/mbuseradd.c
similarity index 100%
rename from mbsebbs/mbuseradd.c
rename to unix/mbuseradd.c
diff --git a/mbsebbs/mbuseradd.h b/unix/mbuseradd.h
similarity index 100%
rename from mbsebbs/mbuseradd.h
rename to unix/mbuseradd.h
diff --git a/mbsebbs/myname.c b/unix/myname.c
similarity index 100%
rename from mbsebbs/myname.c
rename to unix/myname.c
diff --git a/mbsebbs/myname.h b/unix/myname.h
similarity index 100%
rename from mbsebbs/myname.h
rename to unix/myname.h
diff --git a/mbsebbs/putpwent.c b/unix/putpwent.c
similarity index 100%
rename from mbsebbs/putpwent.c
rename to unix/putpwent.c
diff --git a/mbsebbs/putpwent.h b/unix/putpwent.h
similarity index 100%
rename from mbsebbs/putpwent.h
rename to unix/putpwent.h
diff --git a/mbsebbs/pw_util.c b/unix/pw_util.c
similarity index 100%
rename from mbsebbs/pw_util.c
rename to unix/pw_util.c
diff --git a/mbsebbs/pw_util.h b/unix/pw_util.h
similarity index 100%
rename from mbsebbs/pw_util.h
rename to unix/pw_util.h
diff --git a/mbsebbs/pwauth.c b/unix/pwauth.c
similarity index 100%
rename from mbsebbs/pwauth.c
rename to unix/pwauth.c
diff --git a/mbsebbs/pwauth.h b/unix/pwauth.h
similarity index 100%
rename from mbsebbs/pwauth.h
rename to unix/pwauth.h
diff --git a/mbsebbs/pwdcheck.c b/unix/pwdcheck.c
similarity index 100%
rename from mbsebbs/pwdcheck.c
rename to unix/pwdcheck.c
diff --git a/mbsebbs/pwdcheck.h b/unix/pwdcheck.h
similarity index 100%
rename from mbsebbs/pwdcheck.h
rename to unix/pwdcheck.h
diff --git a/mbsebbs/pwio.c b/unix/pwio.c
similarity index 100%
rename from mbsebbs/pwio.c
rename to unix/pwio.c
diff --git a/mbsebbs/pwio.h b/unix/pwio.h
similarity index 100%
rename from mbsebbs/pwio.h
rename to unix/pwio.h
diff --git a/mbsebbs/rad64.c b/unix/rad64.c
similarity index 100%
rename from mbsebbs/rad64.c
rename to unix/rad64.c
diff --git a/mbsebbs/rad64.h b/unix/rad64.h
similarity index 100%
rename from mbsebbs/rad64.h
rename to unix/rad64.h
diff --git a/mbsebbs/salt.c b/unix/salt.c
similarity index 99%
rename from mbsebbs/salt.c
rename to unix/salt.c
index 2fdf6440..c32f5c19 100644
--- a/mbsebbs/salt.c
+++ b/unix/salt.c
@@ -64,11 +64,9 @@ char *crypt_make_salt(void)
 
 	result[0] = '\0';
 
-#ifndef __FreeBSD__
 	if (getdef_bool("MD5_CRYPT_ENAB")) {
 		strcpy(result, "$1$");  /* magic for the new MD5 crypt() */
 	}
-#endif
 
 	/*
 	 * Generate 8 chars of salt, the old crypt() will use only first 2.
diff --git a/mbsebbs/salt.h b/unix/salt.h
similarity index 100%
rename from mbsebbs/salt.h
rename to unix/salt.h
diff --git a/mbsebbs/setugid.c b/unix/setugid.c
similarity index 100%
rename from mbsebbs/setugid.c
rename to unix/setugid.c
diff --git a/mbsebbs/setugid.h b/unix/setugid.h
similarity index 100%
rename from mbsebbs/setugid.h
rename to unix/setugid.h
diff --git a/mbsebbs/setupenv.c b/unix/setupenv.c
similarity index 74%
rename from mbsebbs/setupenv.c
rename to unix/setupenv.c
index c3ea5ab9..7e98ee47 100644
--- a/mbsebbs/setupenv.c
+++ b/unix/setupenv.c
@@ -49,59 +49,6 @@
 
 
 
-void addenv_path(const char *varname, const char *dirname, const char *filename)
-{
-	char *buf;
-
-	buf = xmalloc(strlen(dirname) + strlen(filename) + 2);
-	sprintf(buf, "%s/%s", dirname, filename);
-	addenv(varname, buf);
-	free(buf);
-}
-
-
-
-void read_env_file(const char *filename)
-{
-	FILE *fp;
-	char buf[1024];
-	char *cp, *name, *val;
-
-	fp = fopen(filename, "r");
-	if (!fp)
-		return;
-	while (fgets(buf, sizeof buf, fp) == buf) {
-		cp = strrchr(buf, '\n');
-		if (!cp)
-			break;
-		*cp = '\0';
-
-		cp = buf;
-		/* ignore whitespace and comments */
-		while (*cp && isspace(*cp))
-			cp++;
-		if (*cp == '\0' || *cp == '#')
-			continue;
-		/*
-		 * ignore lines which don't follow the name=value format
-		 * (for example, the "export NAME" shell commands)
-		 */
-		name = cp;
-		while (*cp && !isspace(*cp) && *cp != '=')
-			cp++;
-		if (*cp != '=')
-			continue;
-		/* NUL-terminate the name */
-		*cp++ = '\0';
-		val = cp;
-		addenv(name, val);
-	}
-	fclose(fp);
-}
-
-
-
-
 /*
  *	change to the user's home directory
  *	set the HOME, SHELL, MAIL, PATH, and LOGNAME or USER environmental
@@ -109,6 +56,8 @@ void read_env_file(const char *filename)
  */
 void setup_env(struct passwd *info)
 {
+	char	*cp;
+
 	/*
 	 * Change the current working directory to be the home directory
 	 * of the user.  It is a fatal error for this process to be unable
@@ -119,10 +68,15 @@ void setup_env(struct passwd *info)
 	 * home directories.
 	 */
 	if (chdir(info->pw_dir) == -1) {
+	    static char temp_pw_dir[] = "/";
+	    if (!getdef_bool("DEFAULT_HOME") || chdir("/") == -1) {
 		fprintf(stderr, _("Unable to cd to \"%s\"\n"), info->pw_dir);
 		syslog(LOG_WARNING, "unable to cd to `%s' for user `%s'\n", info->pw_dir, info->pw_name);
 		closelog();
 		exit (1);
+	    }
+	    puts(_("No directory, logging in with HOME=/"));
+	    info->pw_dir = temp_pw_dir;
 	}
 
 	/*
@@ -143,7 +97,8 @@ void setup_env(struct passwd *info)
 	/*
 	 * Create the PATH environmental variable and export it.
 	 */
-	addenv("PATH=/bin:/usr/bin", NULL);
+	cp = getdef_str("ENV_PATH");
+	addenv(cp ? cp : "PATH=/bin:/usr/bin", NULL);
 
 	/*
 	 * Export the user name.  For BSD derived systems, it's "USER", for
diff --git a/mbsebbs/setupenv.h b/unix/setupenv.h
similarity index 50%
rename from mbsebbs/setupenv.h
rename to unix/setupenv.h
index b4214c54..38f033d1 100644
--- a/mbsebbs/setupenv.h
+++ b/unix/setupenv.h
@@ -3,8 +3,6 @@
 #ifndef	_SETUPENV_H
 #define	_SETUPENV_H
 
-void addenv_path(const char *, const char *, const char *);
-void read_env_file(const char *);
 void setup_env(struct passwd *);
 
 #endif
diff --git a/mbsebbs/sgetpwent.c b/unix/sgetpwent.c
similarity index 100%
rename from mbsebbs/sgetpwent.c
rename to unix/sgetpwent.c
diff --git a/mbsebbs/sgetpwent.h b/unix/sgetpwent.h
similarity index 100%
rename from mbsebbs/sgetpwent.h
rename to unix/sgetpwent.h
diff --git a/mbsebbs/shadowio.c b/unix/shadowio.c
similarity index 100%
rename from mbsebbs/shadowio.c
rename to unix/shadowio.c
diff --git a/mbsebbs/shadowio.h b/unix/shadowio.h
similarity index 100%
rename from mbsebbs/shadowio.h
rename to unix/shadowio.h
diff --git a/mbsebbs/shell.c b/unix/shell.c
similarity index 100%
rename from mbsebbs/shell.c
rename to unix/shell.c
diff --git a/mbsebbs/shell.h b/unix/shell.h
similarity index 100%
rename from mbsebbs/shell.h
rename to unix/shell.h
diff --git a/mbsebbs/sub.c b/unix/sub.c
similarity index 100%
rename from mbsebbs/sub.c
rename to unix/sub.c
diff --git a/mbsebbs/sub.h b/unix/sub.h
similarity index 100%
rename from mbsebbs/sub.h
rename to unix/sub.h
diff --git a/mbsebbs/utent.c b/unix/utent.c
similarity index 100%
rename from mbsebbs/utent.c
rename to unix/utent.c
diff --git a/mbsebbs/utent.h b/unix/utent.h
similarity index 100%
rename from mbsebbs/utent.h
rename to unix/utent.h
diff --git a/mbsebbs/utmp.c b/unix/utmp.c
similarity index 100%
rename from mbsebbs/utmp.c
rename to unix/utmp.c
diff --git a/mbsebbs/utmp.h b/unix/utmp.h
similarity index 100%
rename from mbsebbs/utmp.h
rename to unix/utmp.h
diff --git a/mbsebbs/xmalloc.c b/unix/xmalloc.c
similarity index 100%
rename from mbsebbs/xmalloc.c
rename to unix/xmalloc.c
diff --git a/mbsebbs/xmalloc.h b/unix/xmalloc.h
similarity index 100%
rename from mbsebbs/xmalloc.h
rename to unix/xmalloc.h