This commit was manufactured by cvs2svn to create tag

'RELENG_3_1_0_RELEASE'.
MFC: add gnome category.
2026-10-31 21:06:18 +01:00 · 1999-02-16 01:59:46 +00:00 · 1999-02-15 04:57:40 +00:00 · 1999-02-15 04:48:32 +00:00 · 1999-02-15 04:04:12 +00:00 · 1999-02-15 03:39:26 +00:00
491 changed files with 18810 additions and 19332 deletions
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.221 1998/10/17 15:25:26 bde Exp $
+#	$Id: Makefile,v 1.222 1998/12/28 17:03:49 peter Exp $
 #
 # The user-driven targets are:
 #
@@ -63,25 +63,19 @@
 #           Upgrading an i386 system from a.out to elf format
 #
 #
-# The aout->elf transition build is performed by doing a `make aout-to-elf'
-# or a `make aout-to-elf-build' followed by a `make aout-to-elf-install'.
+# The aout->elf transition build is performed by doing a `make upgrade' (or
+# `make aout-to-elf') or in two steps by a `make aout-to-elf-build' followed
+# by a `make aout-to-elf-install', depending on user preference.
 # You need to have at least 320 Mb of free space for the object tree.
 #
 # The upgrade process checks the installed release. If this is 3.0-CURRENT,
 # it is assumed that your kernel contains all the syscalls required by the
 # current sources.
 #
-# For installed systems where `uname -r' reports something other than
-# 3.0-CURRENT, the upgrade process expects to build a kernel using the
-# kernel configuration file sys/i386/conf/GENERICupgrade. This file is
-# defaulted to the GENERIC kernel configuration file on the assumption that
-# it will be suitable for most systems. Before performing the upgrade,
-# replace sys/i386/conf/GENERICupgrade with your own version if your
-# hardware requires a different configuration.
-#
 # The upgrade procedure will stop and ask for confirmation to proceed
 # several times. On each occasion, you can type Ctrl-C to abort the
-# upgrade.
+# upgrade.  Optionally, you can also start it with NOCONFIRM=yes and skip
+# the confirmation steps.
 #
 # At the end of the upgrade procedure, /etc/objformat is created or
 # updated to contain OBJFORMAT=elf. From then on, you're elf by default.
@@ -134,6 +128,9 @@ UPGRADE =	aout-to-elf aout-to-elf-build aout-to-elf-install \
 #
 # Handle the upgrade targets, using the source relative mk files.
 #
+
+upgrade:	aout-to-elf
+
 ${UPGRADE} : upgrade_checks
 	@cd ${.CURDIR}; \
 		make -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET}
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc1,v 1.58 1999/01/07 13:09:15 eivind Exp $
+#	$Id: Makefile.inc1,v 1.59.2.1 1999/02/02 03:12:57 jkh Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -226,7 +226,7 @@ buildworld: check-objformat
 	@echo ">>> Cleaning up the temporary ${OBJFORMAT} build tree"
 	@echo "--------------------------------------------------------------"
 	mkdir -p ${WORLDTMP}
-	chflags -R noschg ${WORLDTMP}/
+	-chflags -R noschg ${WORLDTMP}/
 	rm -rf ${WORLDTMP}
 .endif
 .if !defined(NOTOOLS)
@@ -363,7 +363,7 @@ reinstall:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Re-scanning the shared libraries.."
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; /sbin/ldconfig -R
+	-cd ${.CURDIR}; /sbin/ldconfig -R
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1,10 +1,15 @@
 #
-#	$Id: Makefile.upgrade,v 1.8 1999/01/07 06:30:14 peter Exp $
+#	$Id: Makefile.upgrade,v 1.9.2.7 1999/02/02 03:12:57 jkh Exp $
 #
 # This makefile contains rules for preforming upgrades that are outside
 # the scope of the normal build world process.
 #

+#
+# Make sure the PATH is set correctly
+#
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 #
 # Build things relative to the user's preferred object directory,
 # defaulting to /usr/obj if not defined.
@@ -39,15 +44,23 @@ make	:
 # with them (in case the installed kernel is an older version), then 
 # install the elf world.
 #
-aout-to-elf aout-to-elf-install :				\
+aout-to-elf aout-to-elf-install :	/var/db/update.cfg	\
 		${MAKEOBJDIRPREFIX}/do_aout_buildworld		\
 		${MAKEOBJDIRPREFIX}/do_elf_buildworld		\
 		${MAKEOBJDIRPREFIX}/do_move_aout_libs		\
 		${MAKEOBJDIRPREFIX}/do_aout_installworld	\
-		${MAKEOBJDIRPREFIX}/do_aout_kernel		\
 		${MAKEOBJDIRPREFIX}/do_elf_installworld		\
+		${MAKEOBJDIRPREFIX}/do_elf_kernel		\
 		${MAKEOBJDIRPREFIX}/do_set_objformat		\
-		${MAKEOBJDIRPREFIX}/do_install_kernel_reboot
+		${MAKEOBJDIRPREFIX}/do_reboot
+
+# front-load all the information we're going to need.
+/var/db/update.cfg:
+	@if [ -f ${.CURDIR}/tools/tools/upgrade/doupgrade.sh ]; then \
+	    env MACHINE=${MACHINE} CURDIR=${.CURDIR} sh ${.CURDIR}/tools/tools/upgrade/doupgrade.sh 1 /var/db/update.cfg; \
+	else \
+	    echo "Your source tree must not be fully populated; unable to find upgrade script"; echo "in ${.CURDIR}/tools/tools/upgrade/doupgrade.sh."; exit 1; \
+	fi

 #
 # Just do the build parts of the transition build.
@@ -157,15 +170,6 @@ ${MAKEOBJDIRPREFIX}/do_move_aout_libs move-aout-libs :
 # elf world will be updated.
 #
 ${MAKEOBJDIRPREFIX}/do_aout_installworld :
-.if !defined(NOCONFIRM)
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " You are about to update the installed system (or the system"
-	@echo " that your DESTDIR points to). You can type Ctrl-C to abort"
-	@echo " now or press return to start the first phase of the update."
-	@echo "--------------------------------------------------------------"
-	@/bin/sh -c "read -p \"Return to continue or Ctrl-C to abort: \" _e"
-.endif
 .if	${INSTALLEDVERSION} < 300003
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -174,51 +178,18 @@ ${MAKEOBJDIRPREFIX}/do_aout_installworld :
 	@cp /bin/sh ${MAKEOBJDIRPREFIX}
 	@cp /sbin/reboot ${MAKEOBJDIRPREFIX}
 .endif
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Doing an aout installworld using the aout tools in the aout"
-	@echo " obj tree."
-	@echo "--------------------------------------------------------------"
-	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout \
-		PATH=${AOUTTMPPATH} OBJFORMAT=aout NOTOOLS=1 \
-		TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \
-		make -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld
 	@touch ${MAKEOBJDIRPREFIX}/do_aout_installworld

 #
-# The installed kernel may not match the world that is installed, so build
-# a generic kernel, but don't install it. The user can decide if the kernel
-# needs to be installed. Perhaps we should install it in the root
-# directory as an obscure name just in case a reboot is required?
+# Build and install a new kernel, as well as the boot blocks necessary to
+# boot it.
 #
-${MAKEOBJDIRPREFIX}/do_aout_kernel :
-.if	${INSTALLEDVERSION} >= 300003
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " You are already running 3.0, so a kernel build"
-	@echo " is probably not required."
-	@echo "--------------------------------------------------------------"
-.else
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Building a generic kernel using the new aout tools"
-	@echo "--------------------------------------------------------------"
-.if	exists(${.CURDIR}/sys/compile/GENERICupgrade)
-	@rm -rf ${.CURDIR}/sys/compile/GENERICupgrade
-.endif
-.if	!exists(${.CURDIR}/sys/${MACHINE}/conf/GENERICupgrade)
-	-cp ${.CURDIR}/sys/${MACHINE}/conf/GENERIC \
-		${.CURDIR}/sys/${MACHINE}/conf/GENERICupgrade
-.endif
-	@cd ${.CURDIR}/sys/${MACHINE}/conf; config GENERICupgrade
-	@-cd ${.CURDIR}/sys/compile/GENERICupgrade; \
-		OBJFORMAT=aout make KERNFORMAT=aout depend && \
-		OBJFORMAT=aout make KERNFORMAT=aout all
-	@cd ${.CURDIR}/sys/compile/GENERICupgrade; \
-		OBJFORMAT=aout make KERNFORMAT=aout depend && \
-		OBJFORMAT=aout make KERNFORMAT=aout all
-.endif
-	@touch ${MAKEOBJDIRPREFIX}/do_aout_kernel
+${MAKEOBJDIRPREFIX}/do_elf_kernel :
+	@if [ -f /var/db/update.cfg -a -f ${.CURDIR}/tools/tools/upgrade/doupgrade.sh ]; then \
+	     env MACHINE=${MACHINE} CURDIR=${.CURDIR} sh ${.CURDIR}/tools/tools/upgrade/doupgrade.sh 2 /var/db/update.cfg; \
+	fi
+	@touch ${MAKEOBJDIRPREFIX}/do_elf_kernel
+	@rm -f /var/db/update.cfg

 #
 # Install the elf world overwriting just about all the previously installed
@@ -246,6 +217,9 @@ ${MAKEOBJDIRPREFIX}/do_elf_installworld :
 		PATH=${AOUTTMPPATH} OBJFORMAT=elf NOTOOLS=1 \
 		TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \
 		make -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld
+	@if [ ! -f /etc/pam.conf ]; then cp ${.CURDIR}/etc/pam.conf /etc; fi
+	@if [ ! -f /etc/auth.conf ]; then cp ${.CURDIR}/etc/auth.conf /etc; fi
+	@if [ ! -f /etc/login.conf ]; then cp ${.CURDIR}/etc/login.conf /etc; fi
 	@touch ${MAKEOBJDIRPREFIX}/do_elf_installworld

 #
@@ -261,42 +235,20 @@ ${MAKEOBJDIRPREFIX}/do_set_objformat	:
 	@touch ${MAKEOBJDIRPREFIX}/do_set_objformat

 #
-# If not already running a current kernel, install the GENERICupgrade kernel
-# and reboot.
-#
-${MAKEOBJDIRPREFIX}/do_install_kernel_reboot	:
-.if	${INSTALLEDVERSION} >= 300003
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Your system has been updated to run elf by default!"
-	@echo
-	@echo " You should reboot your system now."
-	@echo "--------------------------------------------------------------"
-	@touch ${MAKEOBJDIRPREFIX}/do_install_kernel_reboot
-.else
+# Time to reboot!
+${MAKEOBJDIRPREFIX}/do_reboot	:
 .if !defined(NOCONFIRM)
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo " Your system has been updated to run elf by default!"
+	@echo " Your system has now been fully updated to elf!"
 	@echo
-	@echo " Since you are running ${INSTALLEDNAME}, the kernel must"
-	@echo " be installed before the system is rebooted. You can type"
-	@echo " Ctrl-C to abort the kernel installation (at your own risk),"
-	@echo " or press return for the kernel to be installed and the"
-	@echo " system rebooted."
+	@echo " It's now time to reboot from your new ELF kernel."
+	@echo " You can type Ctrl-C to abort this (at your own risk)"
+	@echo " or press return to reboot the system."
 	@echo "--------------------------------------------------------------"
 	@${MAKEOBJDIRPREFIX}/sh -c "read -p \"Return to continue or Ctrl-C to abort: \" _e"
 .endif
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Installing a new GENERICupgrade kernel"
-	@echo "--------------------------------------------------------------"
-	@cd ${.CURDIR}/sys/compile/GENERICupgrade; make install
-	@echo
-	@echo "--------------------------------------------------------------"
 	@echo " Rebooting......."
 	@echo "--------------------------------------------------------------"
-	@touch ${MAKEOBJDIRPREFIX}/do_install_kernel_reboot
+	@touch ${MAKEOBJDIRPREFIX}/do_reboot
 	@-${MAKEOBJDIRPREFIX}/reboot
-.endif
-
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id: keyword.c,v 1.21 1998/12/19 02:55:32 julian Exp $";
+	"$Id: keyword.c,v 1.22 1999/01/13 03:11:43 julian Exp $";
 #endif
 #endif /* not lint */

@@ -157,17 +157,10 @@ VAR var[] = {
 	{"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN},
 	{"sess", "SESS", NULL, 0, evar, NULL, 6, EOFF(e_sess), KPTR, "lx"},
 	{"sig", "PENDING", NULL, 0, pvar, NULL, 8, POFF(p_siglist), INT, "x"},
-#ifndef COMPAT_LINUX_THREADS
-	{"sigcatch", "CAUGHT",
-		NULL, 0, pvar, NULL, 8, POFF(p_sigcatch), UINT, "x"},
-	{"sigignore", "IGNORED",
-		NULL, 0, pvar, NULL, 8, POFF(p_sigignore), UINT, "x"},
-#else
 	{"sigcatch", "CAUGHT",
 		NULL, 0, evar, NULL, 8, EOFF(e_procsig.ps_sigcatch), UINT, "x"},
 	{"sigignore", "IGNORED",
 		NULL, 0, evar, NULL, 8, EOFF(e_procsig.ps_sigignore), UINT, "x"},
-#endif /* COMPAT_LINUX_THREADS */
 	{"sigmask", "BLOCKED",
 		NULL, 0, pvar, NULL, 8, POFF(p_sigmask), UINT, "x"},
 	{"sl", "SL", NULL, 0, pvar, NULL, 3, POFF(p_slptime), UINT, "d"},
@@ -38,7 +38,7 @@
 *
 *      %W% (Berkeley) %G%
 *
- * $Id: am_defs.h,v 1.3 1998/11/14 03:13:32 obrien Exp $
+ * $Id: am_defs.h,v 1.5 1999/02/13 11:06:20 obrien Exp $
 *
 */

@@ -1054,7 +1054,7 @@ extern char *nc_sperror(void);
 * Actions to take if <ufs/ufs_mount.h> exists.
 */
 #ifdef HAVE_UFS_UFS_MOUNT_H
-# include <ufs/ufs_mount.h>
+# include <ufs/ufs/ufsmount.h>
 #endif /* HAVE_UFS_UFS_MOUNT_H */

 /*
@@ -38,7 +38,7 @@
 *
 *      %W% (Berkeley) %G%
 *
- * $Id: mount_fs.c,v 1.1.1.1 1998/11/05 02:04:45 ezk Exp $
+ * $Id: mount_fs.c,v 1.1.1.2 1999/01/13 19:20:28 obrien Exp $
 *
 */

@@ -528,12 +528,16 @@ compute_nfs_args(nfs_args_t *nap, mntent_t *mntp, int genflags, struct sockaddr_
     * conf/nfs_prot/nfs_prot_*.h files.
     */
 # ifdef USE_UNCONNECTED_NFS_SOCKETS
-    nap->flags |= MNT2_NFS_OPT_NOCONN;
-    plog(XLOG_WARNING, "noconn option exists, and was turned ON! (May cause NFS hangs on some systems...)");
+    if (!(nap->flags & MNT2_NFS_OPT_NOCONN)) {
+      nap->flags |= MNT2_NFS_OPT_NOCONN;
+      plog(XLOG_WARNING, "noconn option not specified, and was just turned ON (OS override)! (May cause NFS hangs on some systems...)");
+    }
 # endif /* USE_UNCONNECTED_NFS_SOCKETS */
 # ifdef USE_CONNECTED_NFS_SOCKETS
-    nap->flags &= ~MNT2_NFS_OPT_NOCONN;
-    plog(XLOG_WARNING, "noconn option exists, and was turned OFF! (May cause NFS hangs on some systems...)");
+    if (nap->flags & MNT2_NFS_OPT_NOCONN) {
+      nap->flags &= ~MNT2_NFS_OPT_NOCONN;
+      plog(XLOG_WARNING, "noconn option specified, and was just turned OFF (OS override)! (May cause NFS hangs on some systems...)");
+    }
 # endif /* USE_CONNECTED_NFS_SOCKETS */
  }
 #endif /* MNT2_NFS_OPT_NOCONN */
@@ -477,7 +477,7 @@ do {									\
 #endif /* FREEBSD_NATIVE */

 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__FreeBSD_cc_version=300001 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__FreeBSD_cc_version=310001 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"

 #undef CPP_SPEC
 #if TARGET_CPU_DEFAULT == 2
@@ -477,7 +477,7 @@ do {									\
 #endif /* FREEBSD_NATIVE */

 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__FreeBSD_cc_version=300001 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__FreeBSD_cc_version=310001 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"

 #undef CPP_SPEC
 #if TARGET_CPU_DEFAULT == 2
@@ -240,8 +240,15 @@
 .	if "\\$2"2.1.6"  .ds oS FreeBSD 2.1.6
 .	if "\\$2"2.1.7"  .ds oS FreeBSD 2.1.7
 .	if "\\$2"2.2"    .ds oS FreeBSD 2.2
+.	if "\\$2"2.2.1"  .ds oS FreeBSD 2.2.1
+.	if "\\$2"2.2.2"  .ds oS FreeBSD 2.2.2
 .	if "\\$2"2.2.5"  .ds oS FreeBSD 2.2.5
+.	if "\\$2"2.2.6"  .ds oS FreeBSD 2.2.6
+.	if "\\$2"2.2.7"  .ds oS FreeBSD 2.2.7
+.	if "\\$2"2.2.8"  .ds oS FreeBSD 2.2.8
 .	if "\\$2"3.0"    .ds oS FreeBSD 3.0
+.	if "\\$2"3.1"    .ds oS FreeBSD 3.1
+.	if "\\$2"4.0"    .ds oS FreeBSD 4.0
 .\}
 .if "\\*(oS"Null" .ds oS \0\\$1
 .if "\\*(aa"Non-Null" .as oS \0\\$2
@@ -166,7 +166,11 @@
 .	if "\\$1"2.2.2"  \&\\*(tNFreeBSD\\*(aa 2.2.2\\*(aa\\$2
 .	if "\\$1"2.2.5"  \&\\*(tNFreeBSD\\*(aa 2.2.5\\*(aa\\$2
 .	if "\\$1"2.2.6"  \&\\*(tNFreeBSD\\*(aa 2.2.6\\*(aa\\$2
+.	if "\\$1"2.2.7"  \&\\*(tNFreeBSD\\*(aa 2.2.7\\*(aa\\$2
+.	if "\\$1"2.2.8"  \&\\*(tNFreeBSD\\*(aa 2.2.8\\*(aa\\$2
 .	if "\\$1"3.0"  \&\\*(tNFreeBSD\\*(aa 3.0\\*(aa\\$2
+.	if "\\$1"3.1"  \&\\*(tNFreeBSD\\*(aa 3.1\\*(aa\\$2
+.	if "\\$1"4.0"  \&\\*(tNFreeBSD\\*(aa 4.0\\*(aa\\$2
 .\}
 .if \\n(.$==1 \{\
 .	if "\\$1"1.0"  \&\\*(tNFreeBSD\\*(aa 1.0\\*(aa
@@ -180,9 +184,15 @@
 .	if "\\$1"2.1.6"  \&\\*(tNFreeBSD\\*(aa 2.1.6\\*(aa
 .	if "\\$1"2.1.7"  \&\\*(tNFreeBSD\\*(aa 2.1.7\\*(aa
 .	if "\\$1"2.2"  \&\\*(tNFreeBSD\\*(aa 2.2\\*(aa
+.	if "\\$1"2.2.1"  \&\\*(tNFreeBSD\\*(aa 2.2.1\\*(aa
+.	if "\\$1"2.2.2"  \&\\*(tNFreeBSD\\*(aa 2.2.2\\*(aa
 .	if "\\$1"2.2.5"  \&\\*(tNFreeBSD\\*(aa 2.2.5\\*(aa
 .	if "\\$1"2.2.6"  \&\\*(tNFreeBSD\\*(aa 2.2.6\\*(aa
+.	if "\\$1"2.2.7"  \&\\*(tNFreeBSD\\*(aa 2.2.7\\*(aa
+.	if "\\$1"2.2.8"  \&\\*(tNFreeBSD\\*(aa 2.2.8\\*(aa
 .	if "\\$1"3.0"  \&\\*(tNFreeBSD\\*(aa 3.0\\*(aa
+.	if "\\$1"3.1"  \&\\*(tNFreeBSD\\*(aa 3.1\\*(aa
+.	if "\\$1"4.0"  \&\\*(tNFreeBSD\\*(aa 4.0\\*(aa
 .\}
 ..
 .\" Ns Nx macro - NetBSD
@@ -478,6 +478,10 @@ ifdef(`confMAX_MIME_HEADER_LENGTH',
 `# Maximum MIME header length to protect MUAs
 O MaxMimeHeaderLength=confMAX_MIME_HEADER_LENGTH
 ')
+ifdef(`confMAX_HEADER_LINES',
+`# Maximum number of header lines and header line length limit
+O MaxHeaderLines=confMAX_HEADER_LINES
+')

 ###########################
 #   Message precedences   #
@@ -57,6 +57,7 @@ static EVENT	*CollectTimeout;
 #define MS_UFROM	0	/* reading Unix from line */
 #define MS_HEADER	1	/* reading message header */
 #define MS_BODY		2	/* reading message body */
+#define MS_DISCARD	3	/* discarding rest of message */

 void
 collect(fp, smtpmode, hdrp, e)
@@ -77,6 +78,8 @@ collect(fp, smtpmode, hdrp, e)
 	volatile int istate;
 	volatile int mstate;
 	u_char *volatile pbp;
+	int nhdrlines = 0;
+	int hdrlinelen = 0;
 	u_char peekbuf[8];
 	char dfname[MAXQFNAME];
 	char bufbuf[MAXLINE];
@@ -198,6 +201,7 @@ collect(fp, smtpmode, hdrp, e)
 			switch (istate)
 			{
 			  case IS_BOL:
+				hdrlinelen = 0;
 				if (c == '.')
 				{
 					istate = IS_DOT;
@@ -262,12 +266,17 @@ collect(fp, smtpmode, hdrp, e)
 bufferchar:
 			if (!headeronly)
 				e->e_msgsize++;
-			if (mstate == MS_BODY)
+			switch (mstate)
 			{
+			  case MS_BODY:
 				/* just put the character out */
 				if (MaxMessageSize <= 0 ||
 				    e->e_msgsize <= MaxMessageSize)
 					putc(c, tf);
+
+				/* fall through */
+
+			  case MS_DISCARD:
 				continue;
 			}

@@ -298,7 +307,23 @@ bufferchar:
 #endif
 			}
 			else if (c != '\0')
+			{
 				*bp++ = c;
+				if (MaxHeaderLineLength > 0 &&
+				    ++hdrlinelen > MaxHeaderLineLength)
+				{
+					sm_syslog(LOG_NOTICE, e->e_id,
+						  "header line too long (%d max) from %s during message collect",
+						  MaxHeaderLineLength,
+						  CurHostName != NULL ? CurHostName : "localhost");
+					errno = 0;
+					e->e_flags |= EF_CLRQUEUE;
+					e->e_status = "5.6.0";
+					usrerr("552 Header line too long (%d max)",
+						MaxHeaderLineLength);
+					mstate = MS_DISCARD;
+				}
+			}
 			if (istate == IS_BOL)
 				break;
 		}
@@ -331,6 +356,22 @@ nextstate:
 				goto nextstate;
 			}

+			if (MaxHeaderLines > 0 &&
+			    ++nhdrlines > MaxHeaderLines)
+			{
+				sm_syslog(LOG_NOTICE, e->e_id,
+					  "too many header lines (%d max) from %s during message collect",
+					  MaxHeaderLines,
+					  CurHostName != NULL ? CurHostName : "localhost");
+				errno = 0;
+				e->e_flags |= EF_CLRQUEUE;
+				e->e_status = "5.6.0";
+				usrerr("552 Too many header lines (%d max)",
+					MaxHeaderLines);
+				mstate = MS_DISCARD;
+				break;
+			}
+
 			/* check for possible continuation line */
 			do
 			{
@@ -350,6 +391,7 @@ nextstate:
 			if (*--bp != '\n' || *--bp != '\r')
 				bp++;
 			*bp = '\0';
+
 			if (bitset(H_EOH, chompheader(buf, FALSE, hdrp, e)))
 			{
 				mstate = MS_BODY;
@@ -284,6 +284,8 @@ setdefaults(e)
 	ColonOkInAddr = TRUE;
 	DontLockReadFiles = TRUE;
 	DoubleBounceAddr = "postmaster";
+	MaxHeaderLines = MAXHDRLINES;
+	MaxHeaderLineLength = MAXHDRLINELEN;
 	snprintf(buf, sizeof buf, "%s%sdead.letter",
 		_PATH_VARTMP,
 		_PATH_VARTMP[sizeof _PATH_VARTMP - 2] == '/' ? "" : "/");
@@ -69,6 +69,12 @@ struct rusage;	/* forward declaration to get gcc to shut up in wait.h */
 # else
 #  define MAXMACNAMELEN	20		/* max macro name length */
 # endif
+# ifndef MAXHDRLINES
+#  define MAXHDRLINES	1000		/* max lines in a message header */
+# endif
+# ifndef MAXHDRLINELEN
+#  define MAXHDRLINELEN	SMTPLINELIM	/* max length of a header line */
+# endif

 /**********************************************************************
 **  Compilation options.
@@ -1526,6 +1526,10 @@ struct optioninfo
 #if _FFR_CONTROL_SOCKET
 #define O_CONTROLSOCKET	0xa9
 	{ "ControlSocketName",		O_CONTROLSOCKET,	FALSE	},
+#endif
+#if _FFR_MAX_HEADER_LINES
+#define O_MAXHDRLINES	0xaa
+	{ "MaxHeaderLines",		O_MAXHDRLINES,	FALSE	},
 #endif
 	{ NULL,				'\0',		FALSE	}
 };
@@ -2466,6 +2470,25 @@ setoption(opt, val, safe, sticky, e)
 		break;
 #endif

+#if _FFR_MAX_HEADER_LINES
+	  case O_MAXHDRLINES:
+		p = strchr(val, '/');
+		if (p != NULL)
+			*p++ = '\0';
+		MaxHeaderLines = atoi(val);
+		if (p != NULL && *p != '\0')
+			MaxHeaderLineLength = atoi(p);
+
+		if (MaxHeaderLines > 0 &&
+		    MaxHeaderLines < 50)
+			printf("Warning: MaxHeaderLines: header line limit set lower than 50\n");
+
+		if (MaxHeaderLineLength > 0 &&
+		    MaxHeaderLineLength < MAXHDRLINELEN)
+			printf("Warning: MaxHeaderLines: header line length limit set lower than %d\n", MAXHDRLINELEN);
+		break;
+#endif
+
 	  default:
 		if (tTd(37, 1))
 		{
@@ -1258,6 +1258,8 @@ EXTERN gid_t	RunAsGid;	/* GID to become for bulk of run */
 EXTERN int	MaxRcptPerMsg;	/* max recipients per SMTP message */
 EXTERN bool	DoQueueRun;	/* non-interrupt time queue run needed */
 EXTERN u_long	ConnectOnlyTo;	/* override connection address (for testing) */
+EXTERN int	MaxHeaderLines;	/* max lines of headers per message */
+EXTERN int	MaxHeaderLineLength;	/* max length of a header line */
 #if _FFR_DSN_RRT_OPTION
 EXTERN bool	RrtImpliesDsn;	/* turn Return-Receipt-To: into DSN */
 #endif
@@ -54,7 +54,7 @@
 * SUCH DAMAGE.
 *
 *	from: @(#)ffs_softdep.c	9.28 (McKusick) 8/8/98
- *	$Id: ffs_softdep.c,v 1.19 1999/01/06 18:18:04 bde Exp $
+ *	$Id: ffs_softdep.c,v 1.20 1999/01/07 16:14:10 bde Exp $
 */

 /*
@@ -4178,43 +4178,8 @@ void
 softdep_deallocate_dependencies(bp)
 	struct buf *bp;
 {
-	struct worklist *wk;
-
-	if ((bp->b_flags & B_ERROR) == 0)
-		panic("softdep_deallocate_dependencies: dangling deps");
 	softdep_error(bp->b_vp->v_mount->mnt_stat.f_mntonname, bp->b_error);
-	ACQUIRE_LOCK(&lk);
-	while ((wk = LIST_FIRST(&bp->b_dep)) != NULL) {
-		WORKLIST_REMOVE(wk);
-		FREE_LOCK(&lk);
-		switch (wk->wk_type) {
-		/*
-		 * XXX - should really clean up, but for now we will
-		 * just leak memory and not worry about it. Also should
-		 * mark the filesystem permanently dirty so that it will
-		 * force fsck to be run (though this would best be done
-		 * in the mainline code).
-		 */
-		case D_PAGEDEP:
-		case D_INODEDEP:
-		case D_BMSAFEMAP:
-		case D_ALLOCDIRECT:
-		case D_INDIRDEP:
-		case D_ALLOCINDIR:
-		case D_MKDIR:
-#ifdef DEBUG
-			printf("Lost type %s\n", TYPENAME(wk->wk_type));
-#endif
-			break;
-		default:
-			panic("%s: Unexpected type %s",
-			    "softdep_deallocate_dependencies",
-			    TYPENAME(wk->wk_type));
-			/* NOTREACHED */
-		}
-		ACQUIRE_LOCK(&lk);
-	}
-	FREE_LOCK(&lk);
+	panic("softdep_deallocate_dependencies: dangling deps");
 }

 /*
@@ -4225,9 +4190,6 @@ softdep_error(func, error)
 	char *func;
 	int error;
 {
-
 	/* XXX should do something better! */
-	log(LOG_ERR, "%s: got error %d while accessing filesystem\n",
-	    func, error);
+	printf("%s: got error %d while accessing filesystem\n", func, error);
 }
-
@@ -24,7 +24,7 @@ static const char copyright[] =
    "@(#) Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#)$Header: /home/ncvs/src/contrib/traceroute/traceroute.c,v 1.5 1996/10/08 19:16:24 sef Exp $ (LBL)";
+    "@(#)$Header: /home/ncvs/src/contrib/traceroute/traceroute.c,v 1.7 1999/02/15 08:11:44 des Exp $ (LBL)";
 #endif

 /*
@@ -732,6 +732,8 @@ wait_for_reply(register int sock, register struct sockaddr_in *fromp,
 	wait.tv_sec = tp->tv_sec + waittime;
 	wait.tv_usec = tp->tv_usec;
 	(void)gettimeofday(&now, &tz);
+	if (wait.tv_sec < now.tv_sec + 1)
+		wait.tv_sec = now.tv_sec + 1;
 	tvsub(&wait, &now);

 	if (select(sock + 1, &fds, (fd_set *)0, (fd_set *)0, &wait) > 0)
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.186 1999/01/10 21:08:26 rnordier Exp $
+#	$Id: Makefile,v 1.187.2.1 1999/02/09 23:08:38 jkh Exp $

 SUBDIR=	sendmail

@@ -8,7 +8,7 @@ BIN1=   aliases amd.map crontab csh.cshrc csh.login csh.logout dm.conf \
 	inetd.conf auth.conf login.conf login.access motd modems networks \
 	newsyslog.conf pam.conf phones pccard.conf.sample \
 	printcap profile protocols \
-	rc rc.atm rc.conf rc.devfs rc.firewall rc.isdn rc.network rc.pccard \
+	rc rc.atm rc.devfs rc.firewall rc.isdn rc.network rc.pccard \
 	rc.serial rc.shutdown etc.${MACHINE_ARCH}/rc.${MACHINE_ARCH} \
 	remote security services shells syslog.conf \
 	etc.${MACHINE_ARCH}/ttys etc.${MACHINE_ARCH}/disktab rpc make.conf \
@@ -51,6 +51,7 @@ distribution:
 	(cd ${.CURDIR}; \
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc; \
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 ${BIN2} ${DESTDIR}/etc; \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/rc.conf ${DESTDIR}/etc/defaults/; \
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
 	    ${DESTDIR}/var/cron/log; \
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 \
@@ -1,4 +1,4 @@
-#	$Id: aliases,v 1.7 1998/11/03 08:14:38 phk Exp $
+#	$Id: aliases,v 1.9 1999/02/08 21:29:39 des Exp $
 #	@(#)aliases	5.3 (Berkeley) 5/24/90
 #
 #  Aliases in this file will NOT be expanded in the header from
@@ -30,6 +30,7 @@ man:	root
 news:	root
 nobody:	root
 operator: root
+pop:	root
 system:	root
 toor:	root
 usenet: news
@@ -1,2 +1,2 @@
 /defaults       type:=host;fs:=${autodir}/${rhost}/host;rhost:=${key}
-*               opts:=rw,grpid,resvport,vers=3,proto=tcp,nosuid,nodev
+*               opts:=rw,grpid,resvport,vers=2,proto=udp,nosuid,nodev
@@ -2,11 +2,14 @@
 #

 # This is rc.conf - a file full of useful variables that you can set 
-# to change the default startup behavior of your system.
+# to change the default startup behavior of your system.  You should
+# not edit this file!  Put any overrides into one of the ${rc_conf_files}
+# instead and you will be able to update these defaults later without
+# spamming your local configuration information.
 #
 # All arguments must be in double or single quotes.
 #
-#	$Id: rc.conf,v 1.75 1999/01/13 17:32:37 joerg Exp $
+#	$Id: rc.conf,v 1.83 1999/02/09 04:17:45 dillon Exp $

 ##############################################################
 ### Important initial Boot-time options  #####################
@@ -19,7 +22,7 @@ pccard_mem="DEFAULT"	# If pccard_enable=YES, this is card memory address.
 pccard_ifconfig="NO"	# Specialized pccard ethernet configuration (or NO).
 local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d"	# startup script dirs.
 local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic" # periodic script dirs
-
+rc_conf_files="/etc/rc.conf /etc/rc.conf.local"

 ##############################################################
 ###  Network configuration sub-section  ######################
@@ -185,6 +188,7 @@ check_quotas="NO"	# Check quotas (or NO).
 accounting_enable="NO"	# Turn on process accounting (or NO).
 ibcs2_enable="NO"	# Ibcs2 (SCO) emulation loaded at startup (or NO).
 linux_enable="NO"	# Linux emulation loaded at startup (or NO).
+svr4_enable="NO"	# SysVR4 emulation loaded at startup (or NO).
 rand_irqs="NO"		# Stir the entropy pool (like "5 11" or NO).
 clear_tmp_enable="NO"	# Clear /tmp at startup.
 ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib"
@@ -194,11 +198,17 @@ ldconfig_paths_aout="/usr/lib/compat/aout /usr/X11R6/lib/aout /usr/local/lib/aou
 kern_securelevel_enable="NO"	# kernel security level (see init(8)), 
 kern_securelevel="-1"	# range: -1..3 ; `-1' is the most insecure
 update_motd="YES"	# update version info in /etc/motd (or NO)
-vinum_slices=""		# put in names of vinum slices to enable vinum
+vinum_drives=""		# put in names of disks containing vinum drives

 ##############################################################
 ### Allow local configuration override at the very end here ##
 ##############################################################
-if [ -f /etc/rc.conf.local ]; then
-	. /etc/rc.conf.local
-fi
+#
+#
+
+for i in ${rc_conf_files}; do
+	if [ -f $i ]; then
+        	. $i
+	fi
+done
+
@@ -107,7 +107,7 @@
 #	pci	PCI configuration-space access from user mode
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #
-#	$Id: MAKEDEV,v 1.2 1998/08/31 08:57:56 dfr Exp $
+#	$Id: MAKEDEV,v 1.4 1999/02/04 20:35:07 mjacob Exp $
 #	from etc.i386 MAKEDEV,v 1.171 1998/09/15 10:21:35 gibbs Exp
 #

@@ -596,12 +596,20 @@ sa*)
 	chr=14

 	case $unit in
-	0|1|2|3|4|5|6)
+	[0-9]|[1-9][0-9]|[1-9][0-9][0-9])
+		if [ $unit -gt 15 ]; then
+			mult=65536
+		else
+			mult=16
+		fi
+		rm -f rsa${unit} nrsa${unit} ersa${unit} rsa${unit}.ctl
+		mknod rsa${unit}.ctl c $chr `expr $unit '*' $mult + 536870912`
 		for mode in 0 1 2 3
 		do
-			mknod rsa${unit}.${mode} c $chr `expr $unit '*' 16 + $mode '*' 4 + 0`
-			mknod nrsa${unit}.${mode} c $chr `expr $unit '*' 16 + $mode '*' 4 + 1`
-			mknod ersa${unit}.${mode} c $chr `expr $unit '*' 16 + $mode '*' 4 + 2`
+			rm -f rsa${unit}.${mode} nrsa${unit}.${mode} ersa${unit}.${mode}
+			mknod rsa${unit}.${mode} c $chr `expr $unit '*' $mult + $mode '*' 4 + 0`
+			mknod nrsa${unit}.${mode} c $chr `expr $unit '*' $mult + $mode '*' 4 + 1`
+			mknod ersa${unit}.${mode} c $chr `expr $unit '*' $mult + $mode '*' 4 + 2`
 			chgrp operator	rsa${unit}.${mode}\
 					nrsa${unit}.${mode} \
 					ersa${unit}.${mode}
@@ -1,9 +1,31 @@
 #
-#	$Id:$
+#	$Id: ttys,v 1.3 1998/09/02 01:34:56 brian Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # name	getty				type	status		comments
 #
+# This file specifies various information about terminals on the system.
+# It is used by several different programs.  Common entries for the
+# various columns includes:
+#
+# name  The name of the terminal device.
+#
+# getty The program to start running on the terminal.  Typically a
+#       getty program, as the name implies.  Other common entries
+#       include none, when no getty is needed, and xdm to start the
+#       X Window System.
+#
+# type The initial terminal type for this port.  For hardwired
+#       terminal lines, this will contain the type of terminal used.
+#       For virtual consoles, the correct type is cons25.  Other
+#       common values include network for network connections on
+#       pseudo-terminals, dialup for incoming modem ports, and unknown
+#       when the terminal type cannot be predetermined.
+#
+# status Must be on or off.  If on, init will run the getty program on
+#       the specified port.  If the word "secure" appears, this tty
+#       allows root login.
+#
 # This entry needed for asking password when init goes to single-user mode
 # If you want to be asked for password, change "secure" to "insecure" here
 console	none				unknown	off secure
@@ -44,7 +44,7 @@
 #	mcd*	"Mitsumi CD-ROM disks"
 #	scd*	"Sony CD-ROM disks"
 #	matcd*	"Matsushita (Panasonic) CD-ROM disks"
-#	wcd*	"IDE CD-ROM disks"
+#	acd*	"ATAPI CD-ROM disks"
 #	vn*	"vnode disks"
 #	od*	"optical disks"
 #	fla*	"M-Systems DiskOnChip"
@@ -121,7 +121,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-#	$Id: MAKEDEV,v 1.182 1999/01/11 00:03:58 n_hibma Exp $
+#	$Id: MAKEDEV,v 1.183.2.2 1999/02/05 10:50:29 markm Exp $
 #

 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
@@ -206,7 +206,7 @@ all)
 	sh MAKEDEV od0					# bdev, optical disk
 	sh MAKEDEV wfd0					# bdev, LS-120 floppy
 	sh MAKEDEV vn0					# bdev, virtual disk
-	sh MAKEDEV cd0 matcd0 mcd0 scd0 wcd0		# bdev, cdrom
+	sh MAKEDEV cd0 matcd0 mcd0 scd0 acd0		# bdev, cdrom
 	sh MAKEDEV ft0 sa0 wt0 wst0			# bdev, tape
 	sh MAKEDEV vty4					# cdev, virtual tty
 	sh MAKEDEV cuaa0 cuaa1 cuaa2 cuaa3		# cdev, serial tty
@@ -365,68 +365,68 @@ fd*)
 		# Fake BSD partitions
 		for i in a b c d e f g h
 		do
-			ln ${name}${unit} ${name}${unit}$i
-			ln r${name}${unit} r${name}${unit}$i
+			ln -f ${name}${unit} ${name}${unit}$i
+			ln -f r${name}${unit} r${name}${unit}$i
 		done
 		# User-readable and programmer-readable name sets

 		mknod ${name}${unit}.1720  b $blk `expr $unit '*' 64 + 1`
 		mknod r${name}${unit}.1720 c $chr `expr $unit '*' 64 + 1`
-		# ln ${name}${unit}.1720 ${name}${unit}135hs21
-		# ln r${name}${unit}.1720 r${name}${unit}135hs21
+		# ln -f ${name}${unit}.1720 ${name}${unit}135hs21
+		# ln -f r${name}${unit}.1720 r${name}${unit}135hs21

 		mknod ${name}${unit}.1480  b $blk `expr $unit '*' 64 + 2`
 		mknod r${name}${unit}.1480 c $chr `expr $unit '*' 64 + 2`
-		# ln ${name}${unit}.1480 ${name}${unit}135hs18
-		# ln r${name}${unit}.1480 r${name}${unit}135hs18
-		# ln ${name}${unit}.1480 ${name}${unit}96hs18
-		# ln r${name}${unit}.1480 r${name}${unit}96hs18
+		# ln -f ${name}${unit}.1480 ${name}${unit}135hs18
+		# ln -f r${name}${unit}.1480 r${name}${unit}135hs18
+		# ln -f ${name}${unit}.1480 ${name}${unit}96hs18
+		# ln -f r${name}${unit}.1480 r${name}${unit}96hs18

 		mknod ${name}${unit}.1440  b $blk `expr $unit '*' 64 + 3`
 		mknod r${name}${unit}.1440 c $chr `expr $unit '*' 64 + 3`
-		# ln ${name}${unit}.1440 ${name}${unit}135
-		# ln r${name}${unit}.1440 r${name}${unit}135
-		# ln ${name}${unit}.1440 ${name}${unit}135ds18
-		# ln r${name}${unit}.1440 r${name}${unit}135ds18
-		# ln ${name}${unit}.1440 ${name}${unit}96ds18
-		# ln r${name}${unit}.1440 r${name}${unit}96ds18
+		# ln -f ${name}${unit}.1440 ${name}${unit}135
+		# ln -f r${name}${unit}.1440 r${name}${unit}135
+		# ln -f ${name}${unit}.1440 ${name}${unit}135ds18
+		# ln -f r${name}${unit}.1440 r${name}${unit}135ds18
+		# ln -f ${name}${unit}.1440 ${name}${unit}96ds18
+		# ln -f r${name}${unit}.1440 r${name}${unit}96ds18

 		mknod ${name}${unit}.1200  b $blk `expr $unit '*' 64 + 4`
 		mknod r${name}${unit}.1200 c $chr `expr $unit '*' 64 + 4`
-		# ln ${name}${unit}.1200 ${name}${unit}96
-		# ln r${name}${unit}.1200 r${name}${unit}96
-		# ln ${name}${unit}.1200 ${name}${unit}96ds15
-		# ln r${name}${unit}.1200 r${name}${unit}96ds15
-		# ln ${name}${unit}.1200 ${name}${unit}135ds15
-		# ln r${name}${unit}.1200 r${name}${unit}135ds15
+		# ln -f ${name}${unit}.1200 ${name}${unit}96
+		# ln -f r${name}${unit}.1200 r${name}${unit}96
+		# ln -f ${name}${unit}.1200 ${name}${unit}96ds15
+		# ln -f r${name}${unit}.1200 r${name}${unit}96ds15
+		# ln -f ${name}${unit}.1200 ${name}${unit}135ds15
+		# ln -f r${name}${unit}.1200 r${name}${unit}135ds15

 		mknod ${name}${unit}.820  b $blk `expr $unit '*' 64 + 5`
 		mknod r${name}${unit}.820 c $chr `expr $unit '*' 64 + 5`
-		# ln ${name}${unit}.820 ${name}${unit}96hs10
-		# ln r${name}${unit}.820 r${name}${unit}96hs10
-		# ln ${name}${unit}.820 ${name}${unit}135hs10
-		# ln r${name}${unit}.820 r${name}${unit}135hs10
+		# ln -f ${name}${unit}.820 ${name}${unit}96hs10
+		# ln -f r${name}${unit}.820 r${name}${unit}96hs10
+		# ln -f ${name}${unit}.820 ${name}${unit}135hs10
+		# ln -f r${name}${unit}.820 r${name}${unit}135hs10

 		mknod ${name}${unit}.800  b $blk `expr $unit '*' 64 + 6`
 		mknod r${name}${unit}.800 c $chr `expr $unit '*' 64 + 6`
-		# ln ${name}${unit}.800 ${name}${unit}96ds10
-		# ln r${name}${unit}.800 r${name}${unit}96ds10
-		# ln ${name}${unit}.800 ${name}${unit}135ds10
-		# ln r${name}${unit}.800 r${name}${unit}135ds10
+		# ln -f ${name}${unit}.800 ${name}${unit}96ds10
+		# ln -f r${name}${unit}.800 r${name}${unit}96ds10
+		# ln -f ${name}${unit}.800 ${name}${unit}135ds10
+		# ln -f r${name}${unit}.800 r${name}${unit}135ds10

 		mknod ${name}${unit}.720  b $blk `expr $unit '*' 64 + 7`
 		mknod r${name}${unit}.720 c $chr `expr $unit '*' 64 + 7`
-		# ln ${name}${unit}.720 ${name}${unit}96ds9
-		# ln r${name}${unit}.720 r${name}${unit}96ds9
-		# ln ${name}${unit}.720 ${name}${unit}135ds9
-		# ln r${name}${unit}.720 r${name}${unit}135ds9
+		# ln -f ${name}${unit}.720 ${name}${unit}96ds9
+		# ln -f r${name}${unit}.720 r${name}${unit}96ds9
+		# ln -f ${name}${unit}.720 ${name}${unit}135ds9
+		# ln -f r${name}${unit}.720 r${name}${unit}135ds9

 		mknod ${name}${unit}.360  b $blk `expr $unit '*' 64 + 8`
 		mknod r${name}${unit}.360 c $chr `expr $unit '*' 64 + 8`
-		# ln ${name}${unit}.360 ${name}${unit}48
-		# ln r${name}${unit}.360 r${name}${unit}48
-		# ln ${name}${unit}.360 ${name}${unit}48ds9
-		# ln r${name}${unit}.360 r${name}${unit}48ds9
+		# ln -f ${name}${unit}.360 ${name}${unit}48
+		# ln -f r${name}${unit}.360 r${name}${unit}48
+		# ln -f ${name}${unit}.360 ${name}${unit}48ds9
+		# ln -f r${name}${unit}.360 r${name}${unit}48ds9

 		chgrp operator ${name}${unit}* r${name}${unit}*
 		;;
@@ -445,8 +445,8 @@ ft*)
 	0|1|2|3)
 		mknod ${name}${unit}   b $blk `expr $unit '*' 64 + 32`
 		mknod r${name}${unit}  c $chr `expr $unit '*' 64 + 32`
-		ln ${name}${unit} ${name}${unit}a
-		ln r${name}${unit} r${name}${unit}a
+		ln -f ${name}${unit} ${name}${unit}a
+		ln -f r${name}${unit} r${name}${unit}a
 		chgrp operator ${name}${unit}* r${name}${unit}*
 		;;
 	*)
@@ -614,20 +614,28 @@ sa*)
 	chr=14

 	case $unit in
-	0|1|2|3|4|5|6)
+	[0-9]|[1-9][0-9]|[1-9][0-9][0-9])
+		if [ $unit -gt 15 ]; then
+			mult=65536
+		else
+			mult=16
+		fi
+		rm -f rsa${unit} nrsa${unit} ersa${unit} rsa${unit}.ctl
+		mknod rsa${unit}.ctl c $chr `expr $unit '*' $mult + 536870912`
 		for mode in 0 1 2 3
 		do
-			mknod rsa${unit}.${mode} c $chr `expr $unit '*' 16 + $mode '*' 4 + 0`
-			mknod nrsa${unit}.${mode} c $chr `expr $unit '*' 16 + $mode '*' 4 + 1`
-			mknod ersa${unit}.${mode} c $chr `expr $unit '*' 16 + $mode '*' 4 + 2`
+			rm -f rsa${unit}.${mode} nrsa${unit}.${mode} ersa${unit}.${mode}
+			mknod rsa${unit}.${mode} c $chr `expr $unit '*' $mult + $mode '*' 4 + 0`
+			mknod nrsa${unit}.${mode} c $chr `expr $unit '*' $mult + $mode '*' 4 + 1`
+			mknod ersa${unit}.${mode} c $chr `expr $unit '*' $mult + $mode '*' 4 + 2`
 			chgrp operator	rsa${unit}.${mode}\
 					nrsa${unit}.${mode} \
 					ersa${unit}.${mode}
 		done

-		ln rsa${unit}.0 rsa${unit}
-		ln nrsa${unit}.0 nrsa${unit}
-		ln ersa${unit}.0 ersa${unit}
+		ln -f rsa${unit}.0 rsa${unit}
+		ln -f nrsa${unit}.0 nrsa${unit}
+		ln -f ersa${unit}.0 ersa${unit}
 		;;
 	*)
 		echo bad unit for tape in: $i
@@ -715,19 +723,23 @@ matcd*)
 	umask 77
 	;;

-wcd*)
+acd?|wcd?)
 	umask 2 ;
 	unit=`expr $i : '...\(.*\)'`
 	blk=19
 	chr=69
 	case $unit in
 	0|1|2|3|4|5|6|7)
-		mknod wcd${unit}a  b $blk `expr $unit '*' 8 + 0`
-		mknod rwcd${unit}a c $chr `expr $unit '*' 8 + 0`
-		mknod wcd${unit}c  b $blk `expr $unit '*' 8 + 2`
-		mknod rwcd${unit}c c $chr `expr $unit '*' 8 + 2`
-		chgrp operator wcd${unit}[a-h] rwcd${unit}[a-h]
-		chmod 640 wcd${unit}[a-h] rwcd${unit}[a-h]
+		mknod acd${unit}a  b $blk `expr $unit '*' 8 + 0`
+		ln -fs acd${unit}a wcd${unit}a 
+		mknod racd${unit}a c $chr `expr $unit '*' 8 + 0`
+		ln -fs racd${unit}a rwcd${unit}a
+		mknod acd${unit}c  b $blk `expr $unit '*' 8 + 2`
+		ln -fs acd${unit}c wcd${unit}c
+		mknod racd${unit}c c $chr `expr $unit '*' 8 + 2`
+		ln -fs racd${unit}c rwcd${unit}c
+		chgrp operator acd${unit}[a-h] racd${unit}[a-h]
+		chmod 640 acd${unit}[a-h] racd${unit}[a-h]
 		;;
 	*)
 		echo bad unit for disk in: $i
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.i386,v 1.36 1998/11/01 13:04:15 wosch Exp $
+#	$Id: rc.i386,v 1.38 1999/01/29 18:09:38 yokota Exp $
 #	Do i386 specific processing
 #

@@ -94,6 +94,9 @@ fi
 # screen saver
 if [ "X${saver}" != X"NO" ] ; then
 	echo -n ' screensaver'
+	for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do
+		kldunload $i
+	done
 	kldstat -v | grep -q _saver || kldload ${saver}_saver
 fi

@@ -1,9 +1,31 @@
 #
-#	$Id:$
+#	$Id: ttys,v 1.2 1998/09/02 01:34:57 brian Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # name	getty				type	status		comments
 #
+# This file specifies various information about terminals on the system.
+# It is used by several different programs.  Common entries for the
+# various columns includes:
+#
+# name  The name of the terminal device.
+#
+# getty The program to start running on the terminal.  Typically a
+#       getty program, as the name implies.  Other common entries
+#       include none, when no getty is needed, and xdm to start the
+#       X Window System.
+#
+# type The initial terminal type for this port.  For hardwired
+#       terminal lines, this will contain the type of terminal used.
+#       For virtual consoles, the correct type is cons25.  Other
+#       common values include network for network connections on
+#       pseudo-terminals, dialup for incoming modem ports, and unknown
+#       when the terminal type cannot be predetermined.
+#
+# status Must be on or off.  If on, init will run the getty program on
+#       the specified port.  If the word "secure" appears, this tty
+#       allows root login.
+#
 # This entry needed for asking password when init goes to single-user mode
 # If you want to be asked for password, change "secure" to "insecure" here
 console	none				unknown	off secure
@@ -9,7 +9,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$Id: login.conf,v 1.25 1999/01/11 09:07:38 asami Exp $
+#	$Id: login.conf,v 1.26 1999/01/12 14:09:19 asami Exp $
 #

 # Default settings effectively disable resource limits, see the
@@ -22,7 +22,7 @@
 default:\
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/etc/motd:\
-	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
+	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
 	:path=~/bin /bin /usr/bin /usr/local/bin:\
 	:nologin=/var/run/nologin:\
 	:cputime=unlimited:\
@@ -122,7 +122,7 @@ russian:Russian Users Accounts:\
 #standard:\
 #	:copyright=/etc/COPYRIGHT:\
 #	:welcome=/etc/motd:\
-#	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
+#	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
 #	:path=~/bin /bin /usr/bin /usr/local/bin:\
 #	:manpath=/usr/share/man /usr/local/man:\
 #	:nologin=/var/run/nologin:\
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.72 1999/01/11 15:06:57 peter Exp $
+# $Id: make.conf,v 1.73 1999/01/20 01:58:39 asami Exp $
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
@@ -109,11 +109,6 @@
 #MOTIFLIB=	-L${X11BASE}/lib -lXm
 #
 #
-# If you are running behind a firewall, uncomment the following to leave a
-# hint for various make-spawned utilities that they should use passive FTP.
-#
-#FTP_PASSIVE_MODE=	YES
-#
 # If you're resident in the USA, this will help various ports to determine
 # whether or not they should attempt to comply with the various U.S.
 # export regulations on certain types of software which do not apply to
@@ -1,4 +1,4 @@
-#	$Id: BSD.root.dist,v 1.36 1999/01/10 14:30:53 hm Exp $
+#	$Id: BSD.root.dist,v 1.37 1999/01/11 16:13:16 hm Exp $
 #

 /set type=dir uname=root gname=wheel mode=0755
@@ -14,6 +14,8 @@
    ..
 /set type=dir uname=root gname=wheel mode=0755
    etc
+	defaults
+	..
 	periodic
 		daily
 		..
@@ -1,4 +1,4 @@
-#	$Id: BSD.usr.dist,v 1.145 1999/01/09 21:47:01 jdp Exp $
+#	$Id: BSD.usr.dist,v 1.146 1999/01/18 13:58:47 hm Exp $
 #

 /set type=dir uname=root gname=wheel mode=0755
@@ -293,6 +293,10 @@
                31.trek
                ..
            ..
+            zh
+                FAQ
+                ..
+            ..
        ..
        examples
            FreeBSD_version
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: netstart,v 1.51 1997/05/18 20:11:44 jkh Exp $
+#	$Id: netstart,v 1.52 1997/07/05 19:35:45 pst Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91

 # This file is NOT called by any of the other scripts - it has been
@@ -10,7 +10,9 @@
 #

 # If there is a global system configuration file, suck it in.
-if [ -f /etc/rc.conf ]; then
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi

@@ -8,7 +8,7 @@
 # IRQ == 0 means "allocate free IRQ from IRQ pool"
 # IRQ == 16 means "do not use IRQ (e.g. PIO mode)"
 #
-# $Id: pccard.conf.sample,v 1.23 1998/09/25 22:08:53 brian Exp $
+# $Id$

 # Generally available IO ports
 io	0x240-0x360
@@ -80,7 +80,7 @@ card "E-CARD" "E-CARD"

 # Linksys Combo PCMCIA EthernetCard (model EC2T on box) 
 card "Linksys" "Combo PCMCIA EthernetCard (EC" 
-	config 0x1 "ed0" ? 
+	config 0x1 "ed0" 10 
 	insert echo Linksys Ethernet inserted 
 	insert /etc/pccard_ether ed0 
 	remove echo Linksys Ethernet removed 
@@ -346,6 +346,12 @@ card "Psion Dacom" "Gold Card Global 56K+Fax"
 	insert	echo "Psion Dacom modem card inserted"
 	remove	echo "Psion Dacom modem card removed"

+# Actiontec Datalink with v.90 upgrade
+card "PCMCIA  " "56K V.90 Fax Modem (LK)  "
+	config	0x1f "sio2" 10
+	insert	echo "Actiontec Datalink modem card inserted"
+	remove	echo "Actiontec Datalink modem card removed"
+
 # Panasonic FM-RADIO card
 #card "Panasonic" "CF-JVR101"
 #	config  0x22 "sio3" 16
@@ -393,3 +399,7 @@ card "New Media" "SCSI"
 #	config	0x3a "spc0" 11
 #	insert	echo REX-5535 SCSI card inserted
 #	remove	echo REX-5535 SCSI card removed
+
+# Libretto Floppy disk
+card "Y-E DATA" "External FDD"
+	config  0x4 "fdc0" 10
@@ -1,14 +1,16 @@
 #!/bin/sh -
 #
-#	$Id:$
+#	$Id: pccard_ether,v 1.9 1998/09/02 01:34:56 brian Exp $
 #
 # pccard_ether interfacename [ifconfig option]
 #
 # example: pccard_ether ep0 -link0
 #

-# Suck in the /etc/rc.conf variables
-if [ -f /etc/rc.conf ]; then
+# Suck in the configuration variables
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi

@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.168 1999/01/18 03:25:10 grog Exp $
+#	$Id: rc,v 1.169.2.4 1999/02/11 23:05:00 jkh Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91

 # System startup script run by init on autoboot
@@ -8,7 +8,7 @@
 # and the console is the controlling terminal.

 # Note that almost all the user-configurable behavior is no longer in
-# this file, but rather in /etc/rc.conf.  Please check this file
+# this file, but rather in /etc/defaults/rc.conf.  Please check this file
 # first before contemplating any changes here.

 stty status '^T'
@@ -22,23 +22,40 @@ HOME=/; export HOME
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
 export PATH

-# Configure ccd devices.
-if [ -f /etc/ccd.conf ]; then
-	ccdconfig -C
-fi
-
-if [ -n "$vinum_slices" ]; then
-	if [ -r /modules/vinum.ko ]; then	# jkh paranoia
-		kldload vinum
-		vinum read $vinum_slices
-	else
-		echo "Can't find /modules/vinum.ko"
+# BOOTP diskless boot.  We have to run the rc file early in order to
+# handle read-only NFS mounts, where the various config files
+# in /etc often don't apply.   rc.diskless typically sets skip_diskconf=YES
+# on return.
+#
+if [ -f /etc/rc.diskless ]; then
+	dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
+	if [ ${dlv:=0} != 0 ]; then
+		. /etc/rc.diskless
 	fi
 fi

-swapon -a
+# If there is a global system configuration file, suck it in.
+#
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
+	. /etc/rc.conf
+fi

-if [ $1x = autobootx ]; then
+# Configure ccd devices.
+if [ "X$skip_diskconf" != "XYES" -a -f /etc/ccd.conf ]; then
+	ccdconfig -C
+fi
+
+if [ "X$skip_diskconf" != "XYES" -a -n "$vinum_drives" ]; then
+	vinum read $vinum_drives
+fi
+
+if [ "X$skip_diskconf" != "XYES" ]; then
+	swapon -a
+fi
+
+if [ "X$skip_diskconf" != "XYES" -a $1x = autobootx ]; then
 	echo Automatic reboot in progress...
 	fsck -p
 	case $? in
@@ -75,31 +92,34 @@ fi

 trap "echo 'Reboot interrupted'; exit 1" 3

-# root must be read/write for NFS diskless before proceeding any further.
-mount -u -o rw /
-if [ $? != 0 ]; then
-	echo "Filesystem mount failed, startup aborted"
-	exit 1
+# root normally must be read/write, but if this is a BOOTP NFS
+# diskless boot it does not have to be.
+#
+
+if [ "X$skip_diskconf" != "XYES" ]; then
+	mount -u -o rw /
+
+	if [ $? != 0 ]; then
+		echo "Filesystem mount failed, startup aborted"
+		exit 1
+	fi
+
+	umount -a >/dev/null 2>&1
+
+	mount -a -t nonfs
+	if [ $? != 0 ]; then
+		echo "Filesystem mount failed, startup aborted"
+		exit 1
+	fi
 fi

-umount -a >/dev/null 2>&1
+# Run custom disk mounting function here
+#

-mount -a -t nonfs
-if [ $? != 0 ]; then
-	echo "Filesystem mount failed, startup aborted"
-	exit 1
+if [ "X$diskless_mount_func" != "X" ]; then
+        $diskless_mount_func
 fi

-# If there is a global system configuration file, suck it in.
-if [ -f /etc/rc.conf ]; then
-	. /etc/rc.conf
-fi
-
-# If old file exists, whine until they fix it.
-if [ -f /etc/sysconfig ]; then
-	echo "Warning: /etc/sysconfig has been replaced by /etc/rc.conf."
-	echo "You should switch to /etc/rc.conf ASAP to eliminate this warning."
-fi

 adjkerntz -i

@@ -259,8 +279,7 @@ if [ -x /sbin/ldconfig ]; then

 	# Legacy aout support for i386 only
 	if [ X"`sysctl -n hw.machine`" = X"i386" ]; then
-		# Default the a.out ldconfig path, in case the system's
-		# /etc/rc.conf hasn't been updated.
+		# Default the a.out ldconfig path.
 		: ${ldconfig_paths_aout=${ldconfig_paths}}
 		_LDC=/usr/lib/aout
 		for i in $ldconfig_paths_aout; do
@@ -375,24 +394,23 @@ fi
 [ -f /etc/rc.devfs ] && sh /etc/rc.devfs

 # Do traditional (but rather obsolete) rc.local file if it exists.  If you
-# use this file and want to make it programmatic, source /etc/rc.conf in
-# /etc/rc.local and add your custom variables to /etc/rc.conf.local, as
+# use this file and want to make it programmatic, source /etc/defaults/rc.conf
+# in /etc/rc.local and add your custom variables to /etc/rc.conf, as
 # shown below.  Please do not put local extensions into /etc/rc itself. 
 # Use /etc/rc.local
 #
 # ---- rc.local  ----
-#     if [ -f /etc/rc.conf ]; then
-#             . /etc/rc.conf
+#     if [ -f /etc/defaults/rc.conf ]; then
+#             . /etc/defaults/rc.conf
 #     fi
 #
 #     ... additional startup conditionals ...
 # ---- rc.local  ----
 #
-
 if [ -f /etc/rc.local ]; then
-    echo -n 'starting local daemons:'
-    sh /etc/rc.local
-    echo '.'
+	echo -n 'starting local daemons:'
+        sh /etc/rc.local
+	echo '.'
 fi

 # Raise kernel security level.  This should be done only after `fsck' has
@@ -1,8 +1,10 @@
 #
-# $Id: rc.devfs,v 1.2 1998/09/20 18:49:04 sos Exp $
+# $Id: rc.devfs,v 1.3 1998/10/13 08:25:09 jkh Exp $
 #
 # If there is a global system configuration file, suck it in.
-if [ -f /etc/rc.conf ]; then
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi

@@ -1,8 +1,11 @@
 ############
 # Setup system for firewall service.
-# $Id: rc.firewall,v 1.18 1998/04/18 10:27:05 brian Exp $
+# $Id: rc.firewall,v 1.19 1998/04/25 00:40:55 alex Exp $

-if [ -f /etc/rc.conf ]; then
+# Suck in the configuration variables.
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi

@@ -7,6 +7,9 @@
 #

 if [ "X$pccard_enable" = X"YES" ] ; then
+	if kldload pcic; then
+		echo "Kernel pcic module loaded."
+	fi
 	if [ "x$pccard_mem" != "xDEFAULT" ] ; then
 		pccardc pccardmem $pccard_mem
 	else
@@ -1,24 +0,0 @@
-*** hsuser.texinfo	Fri May  1 23:48:48 1998
--- inc-hist.texi	Mon Jun 30 22:57:58 1997
-***************
-*** 34,42 ****
-  @end ifset
-  @ifclear BashFeatures
-  This chapter describes how to use the GNU History Library interactively,
-! from a user's standpoint.  It should be considered a user's guide.  For
-! information on using the GNU History Library in your own programs,
-! @pxref{Programming with GNU History}.
-  @end ifclear
-  
-  @ifset BashFeatures
--- 34,43 ----
-  @end ifset
-  @ifclear BashFeatures
-  This chapter describes how to use the GNU History Library interactively,
-! from a user's standpoint.
-! @c It should be considered a user's guide.  For
-! @c information on using the GNU History Library in your own programs,
-! @c @pxref{Programming with GNU History}.
-  @end ifclear
-  
-  @ifset BashFeatures
@@ -1,385 +0,0 @@
-.\" Copyright (c) 1991 Free Software Foundation
-.\" See section COPYING for conditions for redistribution
-.\" $Id: gdb.1,v 1.3 1991/12/13 22:22:58 pesch Exp $
-.TH gdb 1 "4nov1991" "GNU Tools" "GNU Tools"
-.SH NAME
-gdb \- The GNU Debugger
-.SH SYNOPSIS
-.na
-.TP
-.B gdb
-.RB "[\|" \-help "\|]"
-.RB "[\|" \-nx "\|]"
-.RB "[\|" \-q "\|]"
-.RB "[\|" \-batch "\|]"
-.RB "[\|" \-cd=\c
-.I dir\c
-\|]
-.RB "[\|" \-f "\|]"
-.RB "[\|" \-k "\|]"
-.RB "[\|" \-wcore "\|]"
-.RB "[\|" "\-b\ "\c
-.IR bps "\|]"
-.RB "[\|" "\-tty="\c
-.IR dev "\|]"
-.RB "[\|" "\-s "\c
-.I symfile\c
-\&\|]
-.RB "[\|" "\-e "\c
-.I prog\c
-\&\|]  
-.RB "[\|" "\-se "\c
-.I prog\c
-\&\|]
-.RB "[\|" "\-c "\c
-.I core\c
-\&\|]
-.RB "[\|" "\-x "\c
-.I cmds\c
-\&\|]
-.RB "[\|" "\-d "\c
-.I dir\c
-\&\|]
-.RB "[\|" \c
-.I prog\c
-.RB "[\|" \c
-.IR core \||\| procID\c
-\&\|]\&\|]
-.ad b
-.SH DESCRIPTION
-The purpose of a debugger such as GDB is to allow you to see what is
-going on ``inside'' another program while it executes\(em\&or what another
-program was doing at the moment it crashed.
-
-GDB can do four main kinds of things (plus other things in support of
-these) to help you catch bugs in the act:
-
-.TP
-\ \ \ \(bu
-Start your program, specifying anything that might affect its behavior.
-
-.TP
-\ \ \ \(bu
-Make your program stop on specified conditions.
-
-.TP
-\ \ \ \(bu
-Examine what has happened, when your program has stopped.
-
-.TP
-\ \ \ \(bu
-Change things in your program, so you can experiment with correcting the
-effects of one bug and go on to learn about another.
-.PP
-
-You can use GDB to debug programs written in C, C++, and Modula-2.
-Fortran support will be added when a GNU Fortran compiler is ready.
-
-GDB is invoked with the shell command \c
-.B gdb\c
-\&.  Once started, it reads
-commands from the terminal until you tell it to exit with the GDB
-command \c
-.B quit\c
-\&.  You can get online help from \c
-.B gdb\c
-\& itself
-by using the command \c
-.B help\c
-\&.
-
-You can run \c
-.B gdb\c
-\& with no arguments or options; but the most
-usual way to start GDB is with one argument or two, specifying an
-executable program as the argument:
-.sp
-.br
-gdb\ program
-.br
-.sp
-
-You can also start with both an executable program and a core file specified:
-.sp
-.br
-gdb\ program\ core
-.br
-.sp
-
-You can, instead, specify a process ID as a second argument, if you want
-to debug a running process:
-.sp
-.br
-gdb\ program\ 1234
-.br
-.sp
-
-would attach GDB to process \c
-.B 1234\c
-\& (unless you also have a file
-named `\|\c
-.B 1234\c
-\&\|'; GDB does check for a core file first).
-
-Here are some of the most frequently needed GDB commands:
-.TP
-.B break \fR[\|\fIfile\fB:\fR\|]\fIfunction
-\&
-Set a breakpoint at \c
-.I function\c
-\& (in \c
-.I file\c
-\&).
-.TP
-.B run \fR[\|\fIarglist\fR\|]
-Start your program (with \c
-.I arglist\c
-\&, if specified).
-.TP
-.B bt
-Backtrace: display the program stack.
-.TP
-.BI print " expr"\c
-\&
-Display the value of an expression.
-.TP
-.B c
-Continue running your program (after stopping, e.g. at a breakpoint).
-.TP
-.B next
-Execute next program line (after stopping); step \c
-.I over\c
-\& any
-function calls in the line.
-.TP
-.B step
-Execute next program line (after stopping); step \c
-.I into\c
-\& any
-function calls in the line.
-.TP
-.B help \fR[\|\fIname\fR\|]
-Show information about GDB command \c
-.I name\c
-\&, or general information
-about using GDB.
-.TP
-.B quit
-Exit from GDB.
-.PP
-For full details on GDB, see \c
-.I 
-Using GDB: A Guide to the GNU Source-Level Debugger\c
-\&, by Richard M. Stallman and Roland H. Pesch.  The same text is available online
-as the \c
-.B gdb\c
-\& entry in the \c
-.B info\c
-\& program.
-.SH OPTIONS
-Any arguments other than options specify an executable
-file and core file (or process ID); that is, the first argument
-encountered with no 
-associated option flag is equivalent to a `\|\c
-.B \-se\c
-\&\|' option, and the
-second, if any, is equivalent to a `\|\c
-.B \-c\c
-\&\|' option if it's the name of a file.  Many options have
-both long and short forms; both are shown here.  The long forms are also
-recognized if you truncate them, so long as enough of the option is
-present to be unambiguous.  (If you prefer, you can flag option
-arguments with `\|\c
-.B +\c
-\&\|' rather than `\|\c
-.B \-\c
-\&\|', though we illustrate the
-more usual convention.)
-
-All the options and command line arguments you give are processed
-in sequential order.  The order makes a difference when the
-`\|\c
-.B \-x\c
-\&\|' option is used.
-
-.TP
-.B \-help
-.TP
-.B \-h
-List all options, with brief explanations.
-
-.TP
-.BI "\-symbols=" "file"\c
-.TP
-.BI "\-s " "file"\c
-\&
-Read symbol table from file \c
-.I file\c
-\&.
-
-.TP
-.BI "\-exec=" "file"\c
-.TP
-.BI "\-e " "file"\c
-\&
-Use file \c
-.I file\c
-\& as the executable file to execute when
-appropriate, and for examining pure data in conjunction with a core
-dump.
-
-.TP
-.BI "\-se=" "file"\c
-\&
-Read symbol table from file \c
-.I file\c
-\& and use it as the executable
-file.
-
-.TP
-.BI "\-core=" "file"\c
-.TP
-.BI "\-c " "file"\c
-\&
-Use file \c
-.I file\c
-\& as a core dump to examine.
-
-.TP
-.BI "\-command=" "file"\c
-.TP
-.BI "\-x " "file"\c
-\&
-Execute GDB commands from file \c
-.I file\c
-\&.  
-
-.TP
-.BI "\-directory=" "directory"\c
-.TP
-.BI "\-d " "directory"\c
-\&
-Add \c
-.I directory\c
-\& to the path to search for source files.
-.PP
-
-.TP
-.B \-nx
-.TP
-.B \-n
-Do not execute commands from any `\|\c
-.B .gdbinit\c
-\&\|' initialization files.
-Normally, the commands in these files are executed after all the
-command options and arguments have been processed.
-
-
-.TP
-.B \-quiet
-.TP
-.B \-q
-``Quiet''.  Do not print the introductory and copyright messages.  These
-messages are also suppressed in batch mode.
-
-.TP
-.B \-batch
-Run in batch mode.  Exit with status \c
-.B 0\c
-\& after processing all the command
-files specified with `\|\c
-.B \-x\c
-\&\|' (and `\|\c
-.B .gdbinit\c
-\&\|', if not inhibited).
-Exit with nonzero status if an error occurs in executing the GDB
-commands in the command files.
-
-Batch mode may be useful for running GDB as a filter, for example to
-download and run a program on another computer; in order to make this
-more useful, the message
-.sp
-.br
-Program\ exited\ normally.
-.br
-.sp
-
-(which is ordinarily issued whenever a program running under GDB control
-terminates) is not issued when running in batch mode.
-
-.TP
-.BI "\-cd=" "directory"\c
-\&
-Run GDB using \c
-.I directory\c
-\& as its working directory,
-instead of the current directory.
-
-.TP
-.B \-fullname
-.TP
-.B \-f
-Emacs sets this option when it runs GDB as a subprocess.  It tells GDB
-to output the full file name and line number in a standard,
-recognizable fashion each time a stack frame is displayed (which
-includes each time the program stops).  This recognizable format looks
-like two `\|\c
-.B \032\c
-\&\|' characters, followed by the file name, line number
-and character position separated by colons, and a newline.  The
-Emacs-to-GDB interface program uses the two `\|\c
-.B \032\c
-\&\|' characters as
-a signal to display the source code for the frame.
-
-.TP
-.B \-kernel
-.TP
-.B \-k
-Use gdb in kernel debugging mode. The prompt is set to ``(kgdb)''.
-
-.TP
-.B \-wcore
-This option may only be used in kernel debugging mode while
-debugging a ``live'' kernel and makes the corefile (/dev/mem)
-writable.
-
-.TP
-.BI "\-b " "bps"\c
-\&
-Set the line speed (baud rate or bits per second) of any serial
-interface used by GDB for remote debugging.
-
-.TP
-.BI "\-tty=" "device"\c
-\&
-Run using \c
-.I device\c
-\& for your program's standard input and output.
-.PP
-
-.SH "SEE ALSO"
-.RB "`\|" gdb "\|'"
-entry in
-.B info\c
-\&;
-.I 
-Using GDB: A Guide to the GNU Source-Level Debugger\c
-, Richard M. Stallman and Roland H. Pesch, July 1991.
-.SH COPYING
-Copyright (c) 1991 Free Software Foundation, Inc.
-.PP
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-.PP
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-.PP
-Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for modified
-versions, except that this permission notice may be included in
-translations approved by the Free Software Foundation instead of in
-the original English.
@@ -1,23 +0,0 @@
-/* Host-dependent definitions for Intel 386 running BSD Unix, for GDB.
-   Copyright 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
-
-This file is part of GDB.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define HOST_BYTE_ORDER LITTLE_ENDIAN
-
-#include <machine/limits.h>		/* for INT_MIN, to avoid "INT_MIN
-					   redefined" warnings from defs.h */
@@ -12,7 +12,7 @@ letter of the choice as a hot key, or the \n\
 number keys 1-9 to choose an option.\n\
 Try it now!\n\n\
 	  Choose the OS you like:" -1 -1 4 \
-	"FreeBSD 2.0" "A Real Operating System for Real Users" \
+	"FreeBSD" "A Real Operating System for Real Users" \
 	"Linux"  "Another free Unix Clone for 386/486" \
        "OS/2" "IBM OS/2" \
        "WIN NT" "Microsoft Windows NT" \
@@ -1,4 +1,4 @@
-#	$Id: manpath.config,v 1.7 1998/10/02 01:06:30 ache Exp $
+#	$Id$
 #
 # This file is read by manpath to configure the mandatory manpath, to
 # map each path element to a manpath element and to determine where the
@@ -17,7 +17,7 @@
 MANDATORY_MANPATH	/usr/share/man
 MANDATORY_MANPATH	/usr/share/perl/man
 MANDATORY_MANPATH	/usr/local/man
-#MANDATORY_MANPATH	/usr/X386/man
+MANDATORY_MANPATH	/usr/local/lib/perl5/5.00502/man
 MANDATORY_MANPATH	/usr/X11R6/man
 #
 # set up PATH to MANPATH mapping
@@ -25,5 +25,4 @@ MANDATORY_MANPATH	/usr/X11R6/man
 MANPATH_MAP	/bin			/usr/share/man
 MANPATH_MAP	/usr/bin		/usr/share/man
 MANPATH_MAP	/usr/local/bin		/usr/local/man
-#MANPATH_MAP	/usr/X386/bin		/usr/X386/man
 MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
@@ -4,12 +4,16 @@ SUBDIR=	include lib libexec usr.bin usr.sbin

 SDIR= ${.CURDIR}/..

-CODAI=	${MAKE} ${MFLAGS} cleandir; \
-	${MAKE} ${MFLAGS} obj; \
+CODAI=	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir && \
+	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj && \
+	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes depend all install
+
+CODAIN=	${MAKE} ${MFLAGS} cleandir && \
+	${MAKE} ${MFLAGS} obj && \
 	${MAKE} ${MFLAGS} depend all install

-CODAD=	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir; \
-	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj; \
+CODAD=	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir && \
+	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj && \
 	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes depend all distribute

 # These are the programs which depend on kerberos
@@ -26,10 +30,26 @@ kprog:
 	cd ${SDIR}/sbin/dump; ${CODAI}
 	cd ${SDIR}/sbin/restore; ${CODAI}

+# These are the programs which depend on kerberos
+# This target us used to rebuild these programs WITHOUT kerberos
+dekerberise:
+	cd ${SDIR}/bin/rcp; ${CODAIN}
+	cd ${SDIR}/gnu/usr.bin/cvs; ${CODAIN}
+	cd ${SDIR}/libexec/rlogind; ${CODAIN}
+	cd ${SDIR}/libexec/rshd; ${CODAIN}
+	cd ${SDIR}/usr.bin/login; ${CODAIN}
+	cd ${SDIR}/usr.bin/passwd; ${CODAIN}
+	cd ${SDIR}/usr.bin/rlogin; ${CODAIN}
+	cd ${SDIR}/usr.bin/rsh; ${CODAIN}
+	cd ${SDIR}/usr.bin/su; ${CODAIN}
+	cd ${SDIR}/sbin/dump; ${CODAIN}
+	cd ${SDIR}/sbin/restore; ${CODAIN}
+
 bootstrap: cleandir obj depend all install kprog

 help-distribute:	distribute
 	cd ${SDIR}/bin/rcp; ${CODAD}
+	cd ${SDIR}/gnu/usr.bin/cvs; ${CODAD}
 	cd ${SDIR}/libexec/rlogind; ${CODAD}
 	cd ${SDIR}/libexec/rshd; ${CODAD}
 	cd ${SDIR}/usr.bin/login; ${CODAD}
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1.1.1 1997/09/24 20:37:13 markm Exp $

 PROG=		kauthd
 MAN8=		${KRB4DIR}/man/kauthd.8
@@ -8,8 +8,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/kafs \
 		-I${KRB4DIR}/lib/krb \
 		-I${KRB4DIR}/appl/kauth
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES}
+LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1.1.1 1997/09/24 20:37:13 markm Exp $

 PROG=		kipd
 NOMAN=		yes
@@ -7,8 +7,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/roken \
 		-I${KRB4DIR}/lib/krb \
 		-I${KRB4DIR}/appl/kip
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES}
+LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -10,8 +10,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/slave \
 		-I${INCLOBJDIR} \
 		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES}
+LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -13,9 +13,10 @@ CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
 SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
 		termstat.c utility.c authenc.c

-DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB}
+DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \
+		${LIBCRYPT}
 LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
-		-L${KRBOBJDIR} -lkrb
+		-L${KRBOBJDIR} -lkrb -lcrypt

 .include <bsd.prog.mk>

@@ -11,8 +11,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/krb \
 		-I${KRB4DIR}/kuser
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES}
+		-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -11,8 +11,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/krb \
 		-I${KRB4DIR}/kuser
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES}
+		-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -9,8 +9,9 @@ CFLAGS+=	-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
 SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 		telnet.c terminal.c tn3270.c utilities.c

-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB}
-LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -ldes -L${KRBOBJDIR} -lkrb
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT}
+LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
+		-L${KRBOBJDIR} -lkrb -lcrypt

 .include <bsd.prog.mk>

@@ -11,9 +11,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/krb \
 		-I${.CURDIR}/../include
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} \
-		${LIBDES}
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -18,9 +18,9 @@ CFLAGS+=	-I${KRB4DIR}/include \
 LDADD=		-L${ROKENOBJDIR} -lroken -L${SLOBJDIR} -lsl \
 		-L${ACLOBJDIR} -lacl -L${KADMOBJDIR} -lkadm \
 		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
-		-ldes -lcom_err
+		-ldes -lcom_err -lcrypt
 DPADD=		${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
-		${LIBDES} ${LIBCOM_ERR}
+		${LIBDES} ${LIBCOM_ERR} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -11,9 +11,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/admin \
 		-I${.CURDIR}/../include
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} \
-		${LIBDES}
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${CRYPT}

 .include <bsd.prog.mk>

@@ -11,9 +11,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/admin \
 		-I${.CURDIR}/../include
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} \
-		${LIBDES}
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -11,9 +11,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/admin \
 		-I${.CURDIR}/../include
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} \
-		${LIBDES}
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -11,9 +11,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/admin \
 		-I${.CURDIR}/../include
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} \
-		${LIBDES}
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -15,9 +15,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRBOBJDIR} \
 		-I${.CURDIR}/../include
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
-		-ldes
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES}
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -9,8 +9,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/kadmin \
 		-I${KRBOBJDIR} \
 		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES}
+LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -10,8 +10,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/slave \
 		-I${INCLOBJDIR} \
 		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES}
+LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -11,9 +11,8 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/kdb \
 		-I${.CURDIR}/../include
 LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} \
-		${LIBDES}
+		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
+DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}

 .include <bsd.prog.mk>

@@ -133,6 +133,8 @@ points outside the process's allocated address space.
 An
 .Tn I/O
 error occurred while reading from or writing to the file system.
+.It Bq Er EOPNOTSUPP
+The underlying file system does not support file flags.
 .El
 .Pp
 .Fn Fchflags
@@ -130,6 +130,25 @@ system calls.
 Modifications are private.
 .It Dv MAP_SHARED
 Modifications are shared.
+.It Dv MAP_STACK
+This option is only available if your system has been compiled with
+VM_STACK defined when compiling the kernel. This is the default for
+i386 only. Consider adding -DVM_STACK to COPTFLAGS in your /etc/make.conf
+to enable this option for other architechures. MAP_STACK implies
+MAP_ANON, and
+.Fa offset 
+of 0.   
+.Fa fd 
+must be -1 and 
+.Fa prot 
+must include at least PROT_READ and PROT_WRITE.  This option creates
+a memory region that grows to at most 
+.Fa len 
+bytes in size, starting from the stack top and growing down.  The
+stack top is the starting address returned by the call, plus 
+.Fa len 
+bytes.  The bottom of the stack at maximum growth is the starting
+address returned by the call.
 .El
 .Pp
 The 
@@ -65,8 +65,10 @@ is called as if all open references to the file had been closed.
 Access to a file may be revoked only by its owner or the super user.
 The
 .Fn revoke
-function is normally used to prepare a terminal device for a new 
-login session, preventing any access by a previous user of the terminal.
+function is currently supported only for block and character special
+device files.
+It is normally used to prepare a terminal device for a new login session,
+preventing any access by a previous user of the terminal.
 .Sh RETURN VALUES
 A 0 value indicated that the call succeeded.  A \-1 return value
 indicates an error occurred and
@@ -90,9 +92,9 @@ Too many symbolic links were encountered in translating the pathname.
 .Fa Path
 points outside the process's allocated address space.
 .It Bq Er EINVAL
-The named file does not support the
+The implementation does not support the
 .Fn revoke
-operation.
+operation on the named file.
 .It Bq Er EPERM
 The caller is neither the owner of the file nor the super user.
 .El
@@ -56,6 +56,12 @@ types will be unaffected.  Subsequent forks by the parent will then
 propagate the shared data and bss between children.  The stack segment
 is always split.  May be set only with
 .Dv RFPROC .
+.It RFSIGSHARE
+If set, the kernel will force sharing the sigacts structure between the
+child and the parent.
+.It RFLINUXTHPN
+If set, the kernel will return SIGUSR1 instead of SIGCHILD upon thread 
+exit for the child.  This is intended to mimic certain Linux clone behaviour.
 .El
 .Pp
 File descriptors in a shared file descriptor table are kept
@@ -32,14 +32,14 @@ MODOBJDIR=	../modules
 LIB=		pam
 CFLAGS+=	-I${PAMDIR}/libpam/include -I.
 CFLAGS+=	-DDEFAULT_MODULE_PATH=\"${SHLIBDIR}/\"
-NOPROFILE=	true
+NOPROFILE=	yes
 CLEANFILES+=	security

 # Files from ${PAMDIR}/libpam:
 SRCS=		pam_account.c pam_auth.c pam_data.c pam_delay.c \
 		pam_dispatch.c pam_end.c pam_env.c pam_handlers.c \
 		pam_item.c pam_log.c pam_misc.c pam_password.c \
-		pam_second.c pam_session.c pam_start.c pam_static.c \
+		pam_second.c pam_session.c pam_start.c \
 		pam_strerror.c
 HDRS1=		_pam_compat.h _pam_macros.h _pam_types.h \
 		pam_appl.h pam_malloc.h pam_modules.h
@@ -70,12 +70,18 @@ STATIC_MODULES+= ${MODOBJDIR}/pam_tacplus/libpam_tacplus.a
 STATIC_MODULES+= ${MODOBJDIR}/pam_unix/libpam_unix.a

 STATICOBJS+=	pam_static_modules.o
+CLEANFILES+=	pam_static.o
+
+_EXTRADEPEND:	pam_static.c
+	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
+	    ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \
+	    ${.ALLSRC}

 .if ${OBJFORMAT} == elf
 CLEANFILES+=	setdef0.o _pam_static_modules.o setdef1.o \
 		setdef0.c setdef1.c setdefs.h

-pam_static_modules.o:	setdef0.o _pam_static_modules.o setdef1.o
+pam_static_modules.o:	setdef0.o pam_static.o _pam_static_modules.o setdef1.o
 	${LD} -o ${.TARGET} -r ${.ALLSRC}

 setdef0.o:	setdef0.c setdefs.h
@@ -87,7 +93,7 @@ setdef0.c setdef1.c setdefs.h:	_pam_static_modules.o
 _pam_static_modules.o:	${STATIC_MODULES}
 	${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC}
 .else
-pam_static_modules.o:	${STATIC_MODULES}
+pam_static_modules.o:	pam_static.o ${STATIC_MODULES}
 	${LD} -o ${.TARGET} -r -Bforcearchive ${.ALLSRC}
 .endif

@@ -52,9 +52,8 @@ static const char sccsid[] = "@(#)klogin.c	8.3 (Berkeley) 4/2/94";
 #define	INITIAL_TICKET	"krbtgt"
 #define	VERIFY_SERVICE	"rcmd"

-extern int _pam_notickets;
-extern char *_pam_krbtkfile_env;
-extern int _pam_noticketsdontcomplain;
+extern int notickets;
+extern char *krbtkfile_env;

 /*
 * Attempt to log the user in using Kerberos authentication
@@ -63,7 +62,7 @@ extern int _pam_noticketsdontcomplain;
 *	  1 if Kerberos failed (try local password in login)
 */
 int
-_pam_klogin(pw, instance, localhost, password)
+klogin(pw, instance, localhost, password)
 	struct passwd *pw;
 	char *instance, *localhost, *password;
 {
@@ -71,6 +70,7 @@ _pam_klogin(pw, instance, localhost, password)
 	char realm[REALM_SZ], savehost[MAXHOSTNAMELEN];
 	char tkt_location[MAXPATHLEN];
 	char *krb_get_phost();
+	extern int noticketsdontcomplain;

 #ifdef	KLOGIN_PARANOID
 	AUTH_DAT authdata;
@@ -78,7 +78,7 @@ _pam_klogin(pw, instance, localhost, password)
 	struct hostent *hp;
 	unsigned long faddr;

-	_pam_noticketsdontcomplain = 0; /* enable warning message */
+	noticketsdontcomplain = 0; /* enable warning message */
 #endif

 	/*
@@ -93,7 +93,7 @@ _pam_klogin(pw, instance, localhost, password)
 	    krb_get_lrealm(realm, 0) != KSUCCESS)
 		return (1);

-	_pam_noticketsdontcomplain = 0; /* enable warning message */
+	noticketsdontcomplain = 0; /* enable warning message */

 	/*
 	 * get TGT for local realm
@@ -105,7 +105,7 @@ _pam_klogin(pw, instance, localhost, password)
 		(void)sprintf(tkt_location, "%s%d", TKT_ROOT, pw->pw_uid);
 	else {
 		(void)sprintf(tkt_location, "%s_root_%d", TKT_ROOT, pw->pw_uid);
-		_pam_krbtkfile_env = tkt_location;
+		krbtkfile_env = tkt_location;
 	}
 	(void)krb_set_tkt_string(tkt_location);

@@ -155,7 +155,7 @@ _pam_klogin(pw, instance, localhost, password)
 		syslog(LOG_NOTICE,
    		    "warning: TGT not verified (%s); %s.%s not registered, or srvtab is wrong?",
 		    krb_err_txt[kerror], VERIFY_SERVICE, savehost);
-		_pam_notickets = 0;
+		notickets = 0;
 		return (0);
 	}

@@ -179,7 +179,7 @@ _pam_klogin(pw, instance, localhost, password)
 	    &authdata, "");

 	if (kerror == KSUCCESS) {
-		_pam_notickets = 0;
+		notickets = 0;
 		return (0);
 	}

@@ -197,7 +197,7 @@ _pam_klogin(pw, instance, localhost, password)
 	dest_tkt();
 	return (1);
 #else
-	_pam_notickets = 0;
+	notickets = 0;
 	return (0);
 #endif
 }
@@ -39,12 +39,12 @@

 #define PASSWORD_PROMPT	"Password:"

-extern int _pam_klogin(struct passwd *, char *, char *, char *);
+extern int klogin(struct passwd *, char *, char *, char *);

-/* Globals used by _pam_klogin.c */
-int	_pam_notickets = 1;
-int	_pam_noticketsdontcomplain = 1;
-char	*_pam_krbtkfile_env;
+/* Globals used by klogin.c */
+int	notickets = 1;
+int	noticketsdontcomplain = 1;
+char	*krbtkfile_env;

 PAM_EXTERN int
 pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
@@ -77,17 +77,17 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
 	else
 		instance = "";
 	if ((pwd = getpwnam(user)) != NULL &&
-	    _pam_klogin(pwd, instance, localhost, (char *)password) == 0) {
-		if (!(flags & PAM_SILENT) && _pam_notickets &&
-		    !_pam_noticketsdontcomplain)
+	    klogin(pwd, instance, localhost, (char *)password) == 0) {
+		if (!(flags & PAM_SILENT) && notickets &&
+		    !noticketsdontcomplain)
 			pam_prompt(pamh, PAM_ERROR_MSG,
 			    "Warning: no Kerberos tickets issued", NULL);
 		/*
 		 * XXX - I think the ticket file really isn't supposed to
 		 * be even created until pam_sm_setcred() is called.
 		 */
-		if (_pam_krbtkfile_env != NULL)
-			setenv("KRBTKFILE", _pam_krbtkfile_env, 1);
+		if (krbtkfile_env != NULL)
+			setenv("KRBTKFILE", krbtkfile_env, 1);
 		retval = PAM_SUCCESS;
 	} else
 		retval = PAM_AUTH_ERR;
@@ -35,7 +35,7 @@ MAN3+=		libradius.3
 MAN5+=		radius.conf.5

 beforeinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${.CURDIR}/radlib.h ${DESTDIR}/usr/include

 .include <bsd.lib.mk>
@@ -39,6 +39,8 @@
 .Ft int
 .Fn rad_config "struct rad_handle *h" "const char *file"
 .Ft int
+.Fn rad_continue_send_request "struct rad_handle *h" "int selected" "int *fd" "struct timeval *tv"
+.Ft int
 .Fn rad_create_request "struct rad_handle *h" "int code"
 .Ft struct in_addr
 .Fn rad_cvt_addr "const void *data"
@@ -48,6 +50,8 @@
 .Fn rad_cvt_string "const void *data" "size_t len"
 .Ft int
 .Fn rad_get_attr "struct rad_handle *h" "const void **data" "size_t *len"
+.Ft int
+.Fn rad_init_send_request "struct rad_handle *h" "int *fd" "struct timeval *tv"
 .Ft struct rad_handle *
 .Fn rad_open "void"
 .Ft int
@@ -155,7 +159,7 @@ will be
 returns 0 on success, or -1 on if an error occurs.
 .Pp
 After the request has been created with
-.Fn rad_create request ,
+.Fn rad_create_request ,
 attributes can be attached to it.  This is done through calls to
 .Fn rad_put_addr ,
 .Fn rad_put_int ,
@@ -179,10 +183,16 @@ The
 .Fn rad_put_X
 functions return 0 on success, or -1 if an error occurs.
 .Sh SENDING THE REQUEST AND RECEIVING THE RESPONSE
-After the RADIUS request has been constructed, it is sent by means
-of
-.Fn rad_send_request .
-This function sends the request and waits for a valid reply,
+After the RADIUS request has been constructed, it is sent either by means of
+.Fn rad_send_request
+or by a combination of calls to
+.Fn rad_init_send_request
+and
+.Fn rad_continue_send_request .
+.Pp
+The
+.Fn rad_send_request
+function sends the request and waits for a valid reply,
 retrying the defined servers in round-robin fashion as necessary.
 If a valid response is received,
 .Fn rad_send_request
@@ -196,9 +206,43 @@ If no valid response is received,
 .Fn rad_send_request
 returns -1.
 .Pp
+As an alternative, if you do not wish to block waiting for a response,
+.Fn rad_init_send_request
+and
+.Fn rad_continue_send_request
+may be used instead.  If a reply is received from the RADIUS server or a
+timeout occurs, these functions return a value as described for
+.Fn rad_send_request .
+Otherwise, a value of zero is returned and the values pointed to by
+.Ar fd
+and
+.Ar tv
+are set to the descriptor and timeout that should be passed to
+.Xr select 2 .
+.Pp
+.Fn rad_init_send_request
+must be called first, followed by repeated calls to
+.Fn rad_continue_send_request
+as long as a return value of zero is given.
+Between each call, the application should call
+.Xr select 2 ,
+passing
+.Ar *fd
+as a read descriptor and timing out after the interval specified by
+.Ar tv .
+When select returns,
+.Fn rad_continue_send_request
+should be called with
+.Ar selected
+set to a non-zero value if
+.Xr select 2
+indicated that the descriptor is readable.
+.Pp
 Like RADIUS requests, each response may contain zero or more
 attributes.  After a response has been received successfully by
-.Fn rad_send_request ,
+.Fn rad_send_request
+or
+.Fn rad_continue_send_request ,
 its attributes can be extracted one by one using
 .Fn rad_get_attr .
 Each time
@@ -286,6 +330,10 @@ which can be retrieved using
 .It
 .Fn rad_put_string
 .It
+.Fn rad_init_send_request
+.It
+.Fn rad_continue_send_request
+.It
 .Fn rad_send_request
 .El
 .Pp
@@ -362,8 +362,6 @@ rad_config(struct rad_handle *h, const char *path)

 		if (rad_add_server(h, host, port, secret, timeout, maxtries) ==
 		    -1) {
-			char msg[ERRSIZE];
-
 			strcpy(msg, h->errmsg);
 			generr(h, "%s:%d: %s", path, linenum, msg);
 			retval = -1;
@@ -376,6 +374,78 @@ rad_config(struct rad_handle *h, const char *path)
 	return retval;
 }

+/*
+ * rad_init_send_request() must have previously been called.
+ * Returns:
+ *   0     The application should select on *fd with a timeout of tv before
+ *         calling rad_continue_send_request again.
+ *   < 0   Failure
+ *   > 0   Success
+ */
+int
+rad_continue_send_request(struct rad_handle *h, int selected, int *fd,
+                          struct timeval *tv)
+{
+	int n;
+
+	if (selected) {
+		struct sockaddr_in from;
+		int fromlen;
+
+		fromlen = sizeof from;
+		h->resp_len = recvfrom(h->fd, h->response,
+		    MSGSIZE, MSG_WAITALL, (struct sockaddr *)&from, &fromlen);
+		if (h->resp_len == -1) {
+			generr(h, "recvfrom: %s", strerror(errno));
+			return -1;
+		}
+		if (is_valid_response(h, h->srv, &from)) {
+			h->resp_len = h->response[POS_LENGTH] << 8 |
+			    h->response[POS_LENGTH+1];
+			h->resp_pos = POS_ATTRS;
+			return h->response[POS_CODE];
+		}
+	}
+
+	if (h->try == h->total_tries) {
+		generr(h, "No valid RADIUS responses received");
+		return -1;
+	}
+
+	/*
+         * Scan round-robin to the next server that has some
+         * tries left.  There is guaranteed to be one, or we
+         * would have exited this loop by now.
+	 */
+	while (h->servers[h->srv].num_tries >= h->servers[h->srv].max_tries)
+		if (++h->srv >= h->num_servers)
+			h->srv = 0;
+
+	/* Insert the scrambled password into the request */
+	if (h->pass_pos != 0)
+		insert_scrambled_password(h, h->srv);
+
+	/* Send the request */
+	n = sendto(h->fd, h->request, h->req_len, 0,
+	    (const struct sockaddr *)&h->servers[h->srv].addr,
+	    sizeof h->servers[h->srv].addr);
+	if (n != h->req_len) {
+		if (n == -1)
+			generr(h, "sendto: %s", strerror(errno));
+		else
+			generr(h, "sendto: short write");
+		return -1;
+	}
+
+	h->try++;
+	h->servers[h->srv].num_tries++;
+	tv->tv_sec = h->servers[h->srv].timeout;
+	tv->tv_usec = 0;
+	*fd = h->fd;
+
+	return 0;
+}
+
 int
 rad_create_request(struct rad_handle *h, int code)
 {
@@ -453,69 +523,12 @@ rad_get_attr(struct rad_handle *h, const void **value, size_t *len)
 }

 /*
- * Create and initialize a rad_handle structure, and return it to the
- * caller.  Can fail only if the necessary memory cannot be allocated.
- * In that case, it returns NULL.
- */
-struct rad_handle *
-rad_open(void)
-{
-	struct rad_handle *h;
-
-	h = (struct rad_handle *)malloc(sizeof(struct rad_handle));
-	if (h != NULL) {
-		srandomdev();
-		h->fd = -1;
-		h->num_servers = 0;
-		h->ident = random();
-		h->errmsg[0] = '\0';
-		memset(h->pass, 0, sizeof h->pass);
-		h->pass_len = 0;
-		h->pass_pos = 0;
-	}
-	return h;
-}
-
-int
-rad_put_addr(struct rad_handle *h, int type, struct in_addr addr)
-{
-	return rad_put_attr(h, type, &addr.s_addr, sizeof addr.s_addr);
-}
-
-int
-rad_put_attr(struct rad_handle *h, int type, const void *value, size_t len)
-{
-	return type == RAD_USER_PASSWORD ?
-	    put_password_attr(h, type, value, len) :
-	    put_raw_attr(h, type, value, len);
-}
-
-int
-rad_put_int(struct rad_handle *h, int type, u_int32_t value)
-{
-	u_int32_t nvalue;
-
-	nvalue = htonl(value);
-	return rad_put_attr(h, type, &nvalue, sizeof nvalue);
-}
-
-int
-rad_put_string(struct rad_handle *h, int type, const char *str)
-{
-	return rad_put_attr(h, type, str, strlen(str));
-}
-
-/*
- * Returns the response type code on success, or -1 on failure.
+ * Returns -1 on error, 0 to indicate no event and >0 for success
 */
 int
-rad_send_request(struct rad_handle *h)
+rad_init_send_request(struct rad_handle *h, int *fd, struct timeval *tv)
 {
-	int total_tries;
-	int try;
 	int srv;
-	int n;
-	int got_valid_response;

 	/* Make sure we have a socket to use */
 	if (h->fd == -1) {
@@ -540,8 +553,12 @@ rad_send_request(struct rad_handle *h)
 	}

 	/* Make sure the user gave us a password */
-	if (h->pass_pos == 0) {
-		generr(h, "No User-Password attribute given");
+	if (h->pass_pos == 0 && !h->chap_pass) {
+		generr(h, "No User or Chap Password attributes given");
+		return -1;
+	}
+	if (h->pass_pos != 0 && h->chap_pass) {
+		generr(h, "Both User and Chap Password attributes given");
 		return -1;
 	}

@@ -553,103 +570,132 @@ rad_send_request(struct rad_handle *h)
 	 * Count the total number of tries we will make, and zero the
 	 * counter for each server.
 	 */
-	total_tries = 0;
+	h->total_tries = 0;
 	for (srv = 0;  srv < h->num_servers;  srv++) {
-		total_tries += h->servers[srv].max_tries;
+		h->total_tries += h->servers[srv].max_tries;
 		h->servers[srv].num_tries = 0;
 	}
-	if (total_tries == 0) {
+	if (h->total_tries == 0) {
 		generr(h, "No RADIUS servers specified");
 		return -1;
 	}

-	srv = 0;
-	got_valid_response = 0;
-	for (try = 0;  try < total_tries;  try++) {
-		struct timeval timelimit;
-		struct timeval tv;
+	h->try = h->srv = 0;

-		/*
-                 * Scan round-robin to the next server that has some
-                 * tries left.  There is guaranteed to be one, or we
-                 * would have exited this loop by now.
-		 */
-		while (h->servers[srv].num_tries >=
-		    h->servers[srv].max_tries)
-			if (++srv >= h->num_servers)
-				srv = 0;
+	return rad_continue_send_request(h, 0, fd, tv);
+}

-		/* Insert the scrambled password into the request */
-		insert_scrambled_password(h, srv);
+/*
+ * Create and initialize a rad_handle structure, and return it to the
+ * caller.  Can fail only if the necessary memory cannot be allocated.
+ * In that case, it returns NULL.
+ */
+struct rad_handle *
+rad_open(void)
+{
+	struct rad_handle *h;

-		/* Send the request */
-		n = sendto(h->fd, h->request, h->req_len, 0,
-		    (const struct sockaddr *)&h->servers[srv].addr,
-		    sizeof h->servers[srv].addr);
-		if (n != h->req_len) {
-			if (n == -1)
-				generr(h, "sendto: %s", strerror(errno));
-			else
-				generr(h, "sendto: short write");
+	h = (struct rad_handle *)malloc(sizeof(struct rad_handle));
+	if (h != NULL) {
+		srandomdev();
+		h->fd = -1;
+		h->num_servers = 0;
+		h->ident = random();
+		h->errmsg[0] = '\0';
+		memset(h->pass, 0, sizeof h->pass);
+		h->pass_len = 0;
+		h->pass_pos = 0;
+		h->chap_pass = 0;
+	}
+	return h;
+}
+
+int
+rad_put_addr(struct rad_handle *h, int type, struct in_addr addr)
+{
+	return rad_put_attr(h, type, &addr.s_addr, sizeof addr.s_addr);
+}
+
+int
+rad_put_attr(struct rad_handle *h, int type, const void *value, size_t len)
+{
+	int result;
+
+	if (type == RAD_USER_PASSWORD)
+		result = put_password_attr(h, type, value, len);
+	else {
+		result = put_raw_attr(h, type, value, len);
+		if (result == 0 && type == RAD_CHAP_PASSWORD)
+			h->chap_pass = 1;
+	}
+
+	return result;
+}
+
+int
+rad_put_int(struct rad_handle *h, int type, u_int32_t value)
+{
+	u_int32_t nvalue;
+
+	nvalue = htonl(value);
+	return rad_put_attr(h, type, &nvalue, sizeof nvalue);
+}
+
+int
+rad_put_string(struct rad_handle *h, int type, const char *str)
+{
+	return rad_put_attr(h, type, str, strlen(str));
+}
+
+/*
+ * Returns the response type code on success, or -1 on failure.
+ */
+int
+rad_send_request(struct rad_handle *h)
+{
+	struct timeval timelimit;
+	struct timeval tv;
+	int fd;
+	int n;
+
+	n = rad_init_send_request(h, &fd, &tv);
+
+	if (n != 0)
+		return n;
+
+	gettimeofday(&timelimit, NULL);
+	timeradd(&tv, &timelimit, &timelimit);
+
+	for ( ; ; ) {
+		fd_set readfds;
+
+		FD_ZERO(&readfds);
+		FD_SET(fd, &readfds);
+
+		n = select(fd + 1, &readfds, NULL, NULL, &tv);
+
+		if (n == -1) {
+			generr(h, "select: %s", strerror(errno));
 			return -1;
 		}
-		h->servers[srv].num_tries++;

-		/* Wait for a valid response */
-		gettimeofday(&timelimit, NULL);
-		timelimit.tv_sec += h->servers[srv].timeout;
-
-		tv.tv_sec = h->servers[srv].timeout;
-		tv.tv_usec = 0;
-		for ( ; ; ) {
-			fd_set readfds;
-
-			FD_ZERO(&readfds);
-			FD_SET(h->fd, &readfds);
-			n = select(h->fd + 1, &readfds, NULL, NULL, &tv);
-			if (n == -1) {
-				generr(h, "select: %s", strerror(errno));
-				return -1;
-			}
-			if (n == 0)	/* Timed out */
-				break;
-			if (FD_ISSET(h->fd, &readfds)) {
-				struct sockaddr_in from;
-				int fromlen;
-
-				fromlen = sizeof from;
-				h->resp_len = recvfrom(h->fd, h->response,
-				    MSGSIZE, MSG_WAITALL,
-				    (struct sockaddr *)&from, &fromlen);
-				if (h->resp_len == -1) {
-					generr(h, "recvfrom: %s",
-					    strerror(errno));
-					return -1;
-				}
-				if (is_valid_response(h, srv, &from)) {
-					got_valid_response = 1;
-					break;
-				}
-			}
+		if (!FD_ISSET(fd, &readfds)) {
 			/* Compute a new timeout */
 			gettimeofday(&tv, NULL);
 			timersub(&timelimit, &tv, &tv);
-			if (tv.tv_sec < 0)	/* Still poll once more */
-				timerclear(&tv);
+			if (tv.tv_sec > 0 || (tv.tv_sec == 0 && tv.tv_usec > 0))
+				/* Continue the select */
+				continue;
 		}
-		if (got_valid_response)
-			break;
-		/* Advance to the next server */
-		if (++srv >= h->num_servers)
-			srv = 0;
+
+		n = rad_continue_send_request(h, n, &fd, &tv);
+
+		if (n != 0)
+			return n;
+
+		gettimeofday(&timelimit, NULL);
+		timeradd(&tv, &timelimit, &timelimit);
 	}
-	if (!got_valid_response) {
-		generr(h, "No valid RADIUS responses received");
-		return -1;
-	}
-	h->resp_len = h->response[POS_LENGTH] << 8 | h->response[POS_LENGTH+1];
-	h->resp_pos = POS_ATTRS;
-	return h->response[POS_CODE];
 }

 const char *
@@ -99,18 +99,23 @@
 #define RAD_LOGIN_LAT_PORT		63	/* Integer */

 struct rad_handle;
+struct timeval;

 __BEGIN_DECLS
 int			 rad_add_server(struct rad_handle *,
 			    const char *, int, const char *, int, int);
 void			 rad_close(struct rad_handle *);
 int			 rad_config(struct rad_handle *, const char *);
+int			 rad_continue_send_request(struct rad_handle *, int,
+			    int *, struct timeval *);
 int			 rad_create_request(struct rad_handle *, int);
 struct in_addr		 rad_cvt_addr(const void *);
 u_int32_t		 rad_cvt_int(const void *);
 char			*rad_cvt_string(const void *, size_t);
 int			 rad_get_attr(struct rad_handle *, const void **,
 			    size_t *);
+int			 rad_init_send_request(struct rad_handle *, int *,
+			    struct timeval *);
 struct rad_handle	*rad_open(void);
 int			 rad_put_addr(struct rad_handle *, int, struct in_addr);
 int			 rad_put_attr(struct rad_handle *, int,
@@ -74,9 +74,13 @@ struct rad_handle {
 	char		 pass[PASSSIZE];	/* Cleartext password */
 	int		 pass_len;	/* Length of cleartext password */
 	int		 pass_pos;	/* Position of scrambled password */
+	char	 	 chap_pass;	/* Have we got a CHAP_PASSWORD ? */
 	unsigned char	 response[MSGSIZE];	/* Response received */
 	int		 resp_len;	/* Length of response */
 	int		 resp_pos;	/* Current position scanning attrs */
+	int		 total_tries;	/* How many requests we'll send */
+	int		 try;		/* How many requests we've sent */
+	int		 srv;		/* Server number we did last */
 };

 #endif
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.10 1998/11/04 07:39:53 msmith Exp $
+# $Id: Makefile,v 1.12 1999/02/12 17:20:10 dcs Exp $
 #
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
@@ -91,7 +91,7 @@ __reml.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
 SRCS+=	inet_ntoa.c inet_addr.c

 # _setjmp/_longjmp
-.PATH:	${.CURDIR}/../libc/${MACHINE_ARCH}/gen
+.PATH:	${.CURDIR}/${MACHINE_ARCH}
 SRCS+=	_setjmp.S
 # really only required for i386
 CFLAGS+=-I${.CURDIR}/../libc/${MACHINE_ARCH}
@@ -0,0 +1,123 @@
+/*	$NetBSD: _setjmp.S,v 1.2 1996/10/17 03:08:03 cgd Exp $	*/
+
+/*
+ * Copyright (c) 1994, 1995 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ * 
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+#include <machine/asm.h>
+
+/*
+ * C library -- _setjmp, _longjmp
+ *
+ *	_longjmp(a,v)
+ * will generate a "return(v)" from
+ * the last call to
+ *	_setjmp(a)
+ * by restoring registers from the stack,
+ * The previous signal state is NOT restored.
+ */
+
+	.set	noreorder
+
+LEAF(_setjmp, 1)
+	LDGP(pv)
+	stq	ra, (2 * 8)(a0)			/* sc_pc = return address */
+	stq	s0, (( 9 + 4) * 8)(a0)		/* saved bits of sc_regs */
+	stq	s1, ((10 + 4) * 8)(a0)
+	stq	s2, ((11 + 4) * 8)(a0)
+	stq	s3, ((12 + 4) * 8)(a0)
+	stq	s4, ((13 + 4) * 8)(a0)
+	stq	s5, ((14 + 4) * 8)(a0)
+	stq	s6, ((15 + 4) * 8)(a0)
+	stq	ra, ((26 + 4) * 8)(a0)
+	stq	sp, ((30 + 4) * 8)(a0)
+	ldiq	t0, 0xacedbadd			/* sigcontext magic number */
+	stq	t0, ((31 + 4) * 8)(a0)		/* magic in sc_regs[31] */
+	/* Too bad we can't check if we actually used FP */
+	ldiq	t0, 1
+	stq	t0, (36 * 8)(a0)		/* say we've used FP.  */
+	stt	fs0, ((2 + 37) * 8)(a0)		/* saved bits of sc_fpregs */
+	stt	fs1, ((3 + 37) * 8)(a0)
+	stt	fs2, ((4 + 37) * 8)(a0)
+	stt	fs3, ((5 + 37) * 8)(a0)
+	stt	fs4, ((6 + 37) * 8)(a0)
+	stt	fs5, ((7 + 37) * 8)(a0)
+	stt	fs6, ((8 + 37) * 8)(a0)
+	stt	fs7, ((9 + 37) * 8)(a0)
+	mf_fpcr ft0				/* get FP control reg */
+	stt	ft0, (69 * 8)(a0)		/* and store it in sc_fpcr */
+	stq	zero, (70 * 8)(a0)		/* FP software control XXX */
+	stq	zero, (71 * 8)(a0)		/* sc_reserved[0] */
+	stq	zero, (72 * 8)(a0)		/* sc_reserved[1] */
+	stq	zero, (73 * 8)(a0)		/* sc_xxx[0] */
+	stq	zero, (74 * 8)(a0)		/* sc_xxx[1] */
+	stq	zero, (75 * 8)(a0)		/* sc_xxx[2] */
+	stq	zero, (76 * 8)(a0)		/* sc_xxx[3] */
+	stq	zero, (77 * 8)(a0)		/* sc_xxx[4] */
+	stq	zero, (78 * 8)(a0)		/* sc_xxx[5] */
+	stq	zero, (79 * 8)(a0)		/* sc_xxx[6] */
+	stq	zero, (80 * 8)(a0)		/* sc_xxx[7] */
+
+	mov	zero, v0			/* return zero */
+	RET
+END(_setjmp)
+
+LEAF(_longjmp, 2)
+	LDGP(pv)
+	ldq	t0, ((31 + 4) * 8)(a0)		/* magic in sc_regs[31] */
+	ldiq	t1, 0xacedbadd
+	cmpeq	t0, t1, t0
+	beq	t0, botch			/* If the magic was bad, punt */
+
+	ldq	ra, (2 * 8)(a0)			/* sc_pc = return address */
+	ldq	s0, (( 9 + 4) * 8)(a0)		/* saved bits of sc_regs */
+	ldq	s1, ((10 + 4) * 8)(a0)
+	ldq	s2, ((11 + 4) * 8)(a0)
+	ldq	s3, ((12 + 4) * 8)(a0)
+	ldq	s4, ((13 + 4) * 8)(a0)
+	ldq	s5, ((14 + 4) * 8)(a0)
+	ldq	s6, ((15 + 4) * 8)(a0)
+	/* ldq	ra, ((26 + 4) * 8)(a0)		set above */
+	ldq	sp, ((30 + 4) * 8)(a0)
+	ldt	fs0, ((2 + 37) * 8)(a0)		/* saved bits of sc_fpregs */
+	ldt	fs1, ((3 + 37) * 8)(a0)
+	ldt	fs2, ((4 + 37) * 8)(a0)
+	ldt	fs3, ((5 + 37) * 8)(a0)
+	ldt	fs4, ((6 + 37) * 8)(a0)
+	ldt	fs5, ((7 + 37) * 8)(a0)
+	ldt	fs6, ((8 + 37) * 8)(a0)
+	ldt	fs7, ((9 + 37) * 8)(a0)
+	ldt	ft0, (69 * 8)(a0)		/* get sc_fpcr */
+	mt_fpcr	ft0				/* and restore it. */
+
+	mov	a1, v0				/* return second arg */
+	RET
+
+botch:
+	CALL(longjmperror)
+	CALL(abort)
+	RET					/* "can't" get here... */
+END(_longjmp)
@@ -0,0 +1,81 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University 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 THE REGENTS 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 THE REGENTS 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.
+ *
+ *	$Id: _setjmp.S,v 1.2 1999/02/12 17:22:30 dcs Exp $
+ */
+
+#if defined(LIBC_RCS) && !defined(lint)
+	.text
+	.asciz "$Id: _setjmp.S,v 1.2 1999/02/12 17:22:30 dcs Exp $"
+#endif /* LIBC_RCS and not lint */
+
+/*
+ * C library -- _setjmp, _longjmp
+ *
+ *	_longjmp(a,v)
+ * will generate a "return(v)" from the last call to
+ *	_setjmp(a)
+ * by restoring registers from the environment 'a'.
+ * The previous signal state is NOT restored.
+ */
+
+#include "DEFS.h"
+
+ENTRY(_setjmp)
+	movl	4(%esp),%eax
+	movl	0(%esp),%edx
+	movl	%edx, 0(%eax)		/* rta */
+	movl	%ebx, 4(%eax)
+	movl	%esp, 8(%eax)
+	movl	%ebp,12(%eax)
+	movl	%esi,16(%eax)
+	movl	%edi,20(%eax)
+	xorl	%eax,%eax
+	ret
+
+ENTRY(_longjmp)
+	movl	4(%esp),%edx
+	movl	8(%esp),%eax
+	movl	0(%edx),%ecx
+	movl	4(%edx),%ebx
+	movl	8(%edx),%esp
+	movl	12(%edx),%ebp
+	movl	16(%edx),%esi
+	movl	20(%edx),%edi
+	testl	%eax,%eax
+	jnz	1f
+	incl	%eax
+1:	movl	%ecx,0(%esp)
+	ret
@@ -23,7 +23,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: pager.c,v 1.1.1.1 1998/08/20 08:19:55 msmith Exp $
+ *	$Id: pager.c,v 1.3 1999/02/01 12:32:37 jkh Exp $
 */
 /*
 * Simple paged-output and paged-viewing functions
@@ -139,7 +139,6 @@ pager_file(const char *fname)
 	return(-1);
    }

-    pager_open();
    for (;;) {
 	hmuch = read(fd, buf, sizeof(buf) - 1);
 	if (hmuch == -1) {
@@ -156,7 +155,6 @@ pager_file(const char *fname)
 	    break;
 	}
    }
-    pager_close();
    close(fd);
    return(result);
 }
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.459 1999/01/16 22:42:24 jkh Exp $
+#	$Id: Makefile,v 1.460.2.7 1999/02/10 09:34:23 jkh Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
 #
@@ -64,7 +64,7 @@ KERNELS?=	GENERIC
 # (another "s" for "source" will be prepended).
 EXTRA_SRC+=	usr.sbin/sendmail/cf smailcf

-BOOT1=	etc/protocols etc/rc.conf
+BOOT1=	etc/protocols etc/defaults/rc.conf

 # mountpoint for filesystems.
 MNT=			/mnt
@@ -72,14 +72,16 @@ MNT=			/mnt
 # Various floppy image parameters.
 #
 BOOTSIZE=		1440
-BOOTMFSSIZE=		1440
 FIXITSIZE=		1440
+MFSSIZE=		2880
+BIGBOOTSIZE=		2880
 BOOTINODE=		80000
 MFSINODE=		8000
 FIXITINODE=		2000
 BOOTLABEL=		fd1440
-BOOTMFSLABEL=		minimum2
 FIXITLABEL=		fd1440
+BIGBOOTLABEL=		minimum2
+MFSLABEL=		minimum2

 # overrides.
 .if ${MACHINE_ARCH} == "alpha"
@@ -435,7 +437,7 @@ release.8: write_mfs_in_kernel dumpnlist
 	echo "domain          53/tcp          nameserver" >> ${RD}/mfsfd/stand/etc/services
 	echo "domain          53/udp          nameserver" >> ${RD}/mfsfd/stand/etc/services
 	echo "cmd             514/tcp    shell" >> ${RD}/mfsfd/stand/etc/services
-	gzip -c ${.CURDIR}/../COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
+	gzip -9c ${.CURDIR}/../COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
 	for i in README.TXT RELNOTES.TXT INSTALL.TXT UPGRADE.TXT HARDWARE.TXT; do \
 	   gzip -9c ${.CURDIR}/texts/$${i} > ${RD}/mfsfd/stand/help/$${i}.gz; done
 	-test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd
@@ -446,13 +448,13 @@ release.8: write_mfs_in_kernel dumpnlist
 		tar xf - -C ${RD}/mfsfd/stand
 	@echo "Compressing doc files..."
 	@gzip -9 ${RD}/mfsfd/stand/help/*.hlp
-	@sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \
-		${BOOTMFSSIZE} ${RD}/mfsfd ${MFSINODE} ${BOOTMFSLABEL}
-	@gzip -vc mfsroot > mfsroot.gz
+	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \
+		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
+	@gzip -9vc mfsroot > mfsroot.gz
 	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
 		${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
 	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
-	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot _MFSKERN=YES
+	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot BIGBOOT=YES
 	@rm mfsroot mfsroot.gz mfsroot.size
 	@echo "Regular and MFS boot floppies made."
 	touch release.8
@@ -514,7 +516,7 @@ cdrom.1:
 	@for i in ${DISTRIBUTIONS} ; \
 	do \
 		if [ -d ${RD}/trees/$${i} ] ; then \
-			chflags -R noschg ${RD}/trees/$${i} ; \
+			chflags -R noschg ${RD}/trees/$${i} || true ; \
 			( cd ${RD}/trees/$${i} && \
 			find . -depth -print | cpio -dumpl ${CD_DISC2} ) ; \
 		fi \
@@ -642,11 +644,11 @@ doMFSKERN:
 	@echo "Running doMFSKERN for ${FSIMAGE}"
 	@rm -f ${RD}/kernels/BOOTMFS.${FSIMAGE}
 	@cd ${.CURDIR}/../sys/${MACHINE_ARCH}/conf && \
-	  sh ${.CURDIR}/scripts/dokern.sh ${_MFSKERN} < GENERIC > BOOTMFS
+	  sh ${.CURDIR}/scripts/dokern.sh ${BIGBOOT} < GENERIC > BOOTMFS
 .if ${MACHINE_ARCH} == "i386"
 	@echo "options  INTRO_USERCONFIG" >> ${.CURDIR}/../sys/i386/conf/BOOTMFS
 .endif
-.if defined(_MFSKERN)
+.if defined(BIGBOOT)
 	@echo "options \"MFS_ROOT_SIZE=`cat mfsroot.size`\"" >> \
 	  ${.CURDIR}/../sys/${MACHINE_ARCH}/conf/BOOTMFS
 .endif
@@ -655,41 +657,31 @@ doMFSKERN:
 	@mkdir  ${RD}/image.${FSIMAGE}
 	@cp ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE}
 	mv ${RD}/kernels/BOOTMFS ${RD}/image.${FSIMAGE}/kernel
-.if !defined(_MFSKERN) || ${MACHINE_ARCH} == "alpha"
 	@echo "Setting up /boot directory for ${FSIMAGE} floppy"
 	@mkdir -p ${RD}/image.${FSIMAGE}/boot
-	@cp /boot/* ${RD}/image.${FSIMAGE}/boot
-	@rm -f ${RD}/image.${FSIMAGE}/boot/netboot
-
-	@echo "@load /kernel" > ${RD}/image.${FSIMAGE}/boot/loader.rc
-	@echo "@echo Please insert MFS root floppy and press enter:" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
-	@echo "@read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
-	@echo "@load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
-	@echo "@boot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
+	@cp /boot/boot[12] /boot/loader ${RD}/image.${FSIMAGE}/boot
+.if !defined(BIGBOOT) || ${MACHINE_ARCH} == "alpha"
+	@echo "load /kernel" > ${RD}/image.${FSIMAGE}/boot/loader.rc
+	@echo "echo Please insert MFS root floppy and press enter:" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
+	@echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
+	@echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
+	@echo "boot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
 	@touch ${RD}/image.${FSIMAGE}/boot/loader.config
 .endif
-.if defined(_MFSKERN)
-	@echo "Getting symbols from ${RD}/image.${FSIMAGE}/kernel for mfsroot"
-	@vnconfig /dev/${VNDEVICE} mfsroot
-	@mkdir -p /tmp/mnt_xx
-	@mount /dev/${VNDEVICE} /tmp/mnt_xx
-	@./dumpnlist ${RD}/image.${FSIMAGE}/kernel > /tmp/mnt_xx/stand/symbols
-	@umount /tmp/mnt_xx
-	@vnconfig -u /dev/${VNDEVICE}
-	@rmdir /tmp/mnt_xx
+.if defined(BIGBOOT)
 	@echo "Writing MFS image into kernel for ${FSIMAGE} floppy"
 	@./write_mfs_in_kernel ${RD}/image.${FSIMAGE}/kernel mfsroot
 	@cp ${RD}/image.${FSIMAGE}/kernel ${RD}/kernels/MFSKERNEL.${FSIMAGE}
 .endif
-	@gzip -v ${RD}/image.${FSIMAGE}/kernel
+	@gzip -9v ${RD}/image.${FSIMAGE}/kernel
 	@touch ${RD}/image.${FSIMAGE}/kernel.config
 	@rm -f ${RD}/floppies/${FSIMAGE}.flp
-.if defined(_MFSKERN)
-	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
-		${RD} ${MNT} ${BOOTMFSSIZE} ${RD}/image.${FSIMAGE} \
-		${BOOTINODE} ${BOOTMFSLABEL}
+.if defined(BIGBOOT)
+	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
+		${RD} ${MNT} ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \
+		${BOOTINODE} ${BIGBOOTLABEL}
 .else
-	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
+	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
 		${RD} ${MNT} ${BOOTSIZE} ${RD}/image.${FSIMAGE} \
 		${BOOTINODE} ${BOOTLABEL}
 .endif
@@ -1,7 +1,7 @@
 #! /bin/sh -

 #
-#	$Id: clean,v 1.6 1998/09/29 11:58:54 abial Exp $
+#	$Id: clean,v 1.7 1998/10/15 21:39:58 abial Exp $
 #
 set -e

@@ -30,7 +30,7 @@ rm -f kernel kernel.kz fs.PICOBSD *.o *core *.db
 cd ..
 rm -rf help/tmp_hlp
 echo "===================== $0 tools started ===================="
-for i in `ls -d tinyware/[a-z]*` tools/write_mfs_in_kernel tools/dumpnlist
+for i in `ls -d tinyware/[a-z]*` tools/write_mfs_in_kernel
 do
 	(cd ${i}; \
 	if [ -f Makefile ]; \
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$Id: populate,v 1.7 1999/01/14 23:14:46 abial Exp $
+#	$Id: populate,v 1.8.2.1 1999/02/05 12:15:00 abial Exp $
 #

 . ../Version
@@ -30,8 +30,6 @@ else
 		sed -e "s/@VER@/${VER}/g" > \
 		/mnt/etc/rc
 	cp login.conf /mnt/etc/login.conf
-	cp ../lang/reboot.${LANGUAGE} /mnt/stand/reboot
-	ln -f /mnt/stand/reboot /mnt/stand/shutdown
 	cat ../lang/README.${LANGUAGE} | \
 		sed -e "s/@VER@/${VER}/g" > \
 		/mnt/README
@@ -39,6 +37,8 @@ fi
 cp ../lang/update.${LANGUAGE} /mnt/stand/update
 if [ "${TYPE}" = "dial" ]
 then
+	cp ../lang/reboot.${LANGUAGE} /mnt/stand/reboot
+	ln -f /mnt/stand/reboot /mnt/stand/shutdown
 	cp ../lang/login.${LANGUAGE} /mnt/stand/login
 	cp ../lang/dialup.${LANGUAGE} /mnt/stand/dialup
 	(cd ../../help;\
@@ -51,10 +51,6 @@ then
 	cd tmp_hlp;\
 	ar -cru help.a *;\
 	cp help.a /mnt/help.a)
-elif [ "${TYPE}" != "router" ]
-then
-	#cp ../../build/kvm_kernel.db /mnt/var/db/kvm_kernel.db
-	#rm ../../build/kvm_kernel.db
 fi

 echo "-> Making and installing crunch1..."
@@ -69,9 +65,4 @@ fi

 cd ${pwd}

-echo "-> Preparing kernel symbols list..."
-if [ ! -f ../tools/dumpnlist/dumpnlist ]
-then
-	(cd ../tools/dumpnlist; make)
-fi
 (echo "-> Fixing permissions"; cd /mnt; chown -R root *)
@@ -1,5 +1,5 @@
 #
-# $Id: PICOBSD,v 1.4 1998/11/14 20:10:15 abial Exp $
+# $Id: PICOBSD,v 1.5 1999/01/14 23:15:39 abial Exp $
 #
 machine		"i386"
 cpu		"I386_CPU"
@@ -46,7 +46,7 @@ disk		wd3	at wdc1 drive 1

 options		ATAPI		#Enable ATAPI support for IDE bus
 options		ATAPI_STATIC	#Don't do it as an LKM
-device		wcd0	#IDE CD-ROM
+device		acd0	#IDE CD-ROM

 # syscons is the default console driver, resembling an SCO console

@@ -4,7 +4,7 @@ PicoBSD @VER@ (DIALUP)                      [31m([37m[1mo,o[m[31m)[37m
                                        [32m__  [31m\~/[37m
 Welcome to PicoBSD!                     [32m-->=[41m===[40m[31m\[37m
                                        [32m~~[37m  [31md d[37m
-You can find a short description of the   [35mpico[37m
+You can find a short description of the   [35mpicoBSD[37m
 system in file /README. You can view it using
 "ee /README" or "more /README". There is also 'help'
 command which gives short description of each program.
@@ -4,7 +4,7 @@ PicoBSD @VER@ (DIALUP)                           [31m([37m[1mo,o[m[31m)[37
                                             [32m__  [31m\~/[37m
 Witamy w PicoBSD!                            [32m-->=[41m===[40m[31m\[37m
                                             [32m~~[37m  [31md d[37m
-W glownym katalogu w pliku README znajdziesz   [35mpico[37m
+W glownym katalogu w pliku README znajdziesz   [35mpicoBSD[37m
 krotki opis systemu. Mozesz go obejrzec przy pomocy
 "more /README" lub "ee /README". Mozesz tez uzyskac
 krotki opis kazdego polecenia podajac 'help polecenie'.
@@ -1,5 +1,5 @@
 #
-# $Id: PICOBSD,v 1.7 1999/01/14 23:20:09 abial Exp $
+# $Id: PICOBSD,v 1.8.2.1 1999/02/07 22:19:57 abial Exp $
 #

 machine		"i386"
@@ -54,7 +54,7 @@ disk		wd3	at wdc1 drive 1

 options		ATAPI		#Enable ATAPI support for IDE bus
 options		ATAPI_STATIC	#Don't do it as an LKM
-device		wcd0	#IDE CD-ROM
+device		acd0	#IDE CD-ROM

 # syscons is the default console driver, resembling an SCO console

@@ -104,7 +104,11 @@ device	rp1	at isa? port 0x180 tty
 device cy0	at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000
 device cy1	at isa? tty irq 11 iomem 0xd6000 iosiz 0x2000

-device		lpt0	at isa? port? tty irq 7
+device ppc0	at isa? port? net irq 7
+controller	ppbus0
+device		nlpt0	at ppbus?
+device		plip0	at ppbus?
+device		ppi0	at ppbus?

 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
@@ -1,5 +1,5 @@
 #
-# $Id: crunch.conf,v 1.4 1998/09/15 11:12:18 abial Exp $
+# $Id: crunch.conf,v 1.5 1999/01/19 23:10:34 abial Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
@@ -27,7 +27,7 @@ srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec

 progs ash test echo hostname ln login getty
-progs inetd telnetd stty w msg kget natd
+progs inetd telnetd stty w msg kget natd reboot
 progs init fsck ifconfig df ps ns vm cat
 progs cp rm mkdir ls chmod chown
 progs sysctl route swapon pwd_mkdb dev_mkdb
@@ -1,33 +0,0 @@
-*** Makefile.orig	Sat Aug  1 20:35:53 1998
--- Makefile	Sat Aug  1 20:36:50 1998
-***************
-*** 9,22 ****
-  #Uncomment to activate login_auth
-  #Warning: requires src/libexec/login_* auth modules
-  #LC_AUTH=-DLOGIN_CAP_AUTH
-! CFLAGS+=-Wall -DSKEY -DLOGIN_ACCESS -DLOGALL -DLOGIN_CAP $(LC_AUTH)
-  
-  .if defined(KLOGIN_PARANOID)
-  CFLAGS+=-DKLOGIN_PARANOID
-  .endif
-  
-! DPADD=	${LIBUTIL} ${LIBSKEY} ${LIBMD} ${LIBCRYPT}
-! LDADD=	-lutil -lskey -lmd -lcrypt
-  
-  .if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(LC_AUTH)
-  CFLAGS+=-DKERBEROS
--- 9,22 ----
-  #Uncomment to activate login_auth
-  #Warning: requires src/libexec/login_* auth modules
-  #LC_AUTH=-DLOGIN_CAP_AUTH
-! CFLAGS+=-Wall $(LC_AUTH)
-  
-  .if defined(KLOGIN_PARANOID)
-  CFLAGS+=-DKLOGIN_PARANOID
-  .endif
-  
-! DPADD=	${LIBUTIL} ${LIBMD} ${LIBCRYPT}
-! LDADD=	-lutil -lmd -lcrypt
-  
-  .if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(LC_AUTH)
-  CFLAGS+=-DKERBEROS
@@ -1,10 +0,0 @@
--- Makefile.orig	Tue Sep  8 14:40:17 1998
-+++ Makefile	Tue Sep  8 14:40:53 1998
-@@ -13,6 +13,7 @@
- BINOWN=	root
- BINGRP=	network
- MAN8=	ppp.8
-+NOSECURE=yes
- LDADD+=	-lmd -lcrypt
- DPADD+= ${LIBMD} ${LIBCRYPT}
- 
@@ -1,4 +1,4 @@
-proc				/proc			procfs	rw 0 0
+#proc				/proc			procfs	rw 0 0
 #/dev/fd0c			/start_floppy		ufs	rw 1 1
 #/dev/wd0s1			/dos		msdos	rw 0 0
 #/dev/wcd0c			/cdrom		cd9660	ro,noauto 0 0
@@ -1,80 +0,0 @@
-#!/bin/sh -
-# $Id: rc.network.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
-network_pass1() {
-    echo -n 'Wstepna konfiguracja sieci:'
-    # Set the host name if it is not already set
-    if [ -z "`hostname -s`" ] ; then
-	    hostname $hostname
-	    echo ' hostname'
-    fi
-    # Set up all the network interfaces, calling startup scripts if needed
-    for ifn in ${network_interfaces}; do
-	    if [ -e /etc/start_if.${ifn} ]; then
-		    . /etc/start_if.${ifn}
-	    fi
-	    # Do the primary ifconfig if specified
-	    eval ifconfig_args=\$ifconfig_${ifn}
-	    if [ -n "${ifconfig_args}" ] ; then
-		    ifconfig ${ifn} ${ifconfig_args}
-	    fi
-	    # Check to see if aliases need to be added
-	    alias=0
-	    while :
-	    do
-		    eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
-		    if [ -n "${ifconfig_args}" ]; then
-			    ifconfig ${ifn} ${ifconfig_args} alias
-			    alias=`expr ${alias} + 1`
-		    else
-			    break;
-		    fi
-	    done
-	    ifconfig ${ifn}
-    done
-    # Load the filters if required
-    if [ -n "$firewall_enable" -a -f /etc/rc.firewall -a \
-    	"x$firewall_enable" = "xYES" ] ; then
-    		. /etc/rc.firewall
-    		echo "Zaladowano reguly filtrujace do firewalla."
-    else
-	    echo "UWAGA: system posiada wbudowany modul firewalla, ale zadne reguly"
-	    echo "       filtrujace nie zostaly zaladowane."
-	    echo "       Wszystkie rodzaje ruchu IP sa dozwolone."
-    fi
-    # Configure routing
-    if [ "x$defaultrouter" != "xNO" ] ; then
-	    static_routes="default ${static_routes}"
-	    route_default="default ${defaultrouter}"
-    fi
-    # Set up any static routes.  This should be done before router discovery.
-    if [ "x${static_routes}" != "x" ]; then
-	    for i in ${static_routes}; do
-		    eval route_args=\$route_${i}
-		    route add ${route_args}
-	    done
-    fi
-    echo -n 'Dodatkowe opcje routingu:'
-    if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
-	    echo -n ' tcp_extensions=NO'
-	    sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1
-	    sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1
-    fi
-    if [ "X$gateway_enable" = X"YES" ]; then
-	    echo -n ' IP_gateway=YES'
-	    sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1
-    fi
-    if [ "X$arpproxy_all" = X"YES" ]; then
-	    echo -n ' wlaczam ARP_PROXY_ALL: '
-	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
-    fi
-    echo '.'
-    network_pass1_done=YES	# Let future generations know we made it.
-}
-
-network_pass2() {
-    network_pass2_done=YES
-}
-
-network_pass3() {
-    network_pass3_done=YES
-}
@@ -4,7 +4,7 @@ PicoBSD @VER@ (ISP-alpha)                   [31m([37m[1mo,o[m[31m)[37m
                                        [32m__  [31m\~/[37m
 Welcome to PicoBSD!                     [32m-->=[41m===[40m[31m\[37m
                                        [32m~~[37m  [31md d[37m
-You can find a short description of the   [35mpico[37m
+You can find a short description of the   [35mpicoBSD[37m
 system in file /README. You can view it using
 "more /README".

@@ -4,7 +4,7 @@ PicoBSD @VER@ (ISP-alpha)                        [31m([37m[1mo,o[m[31m)[37
                                             [32m__  [31m\~/[37m
 Witamy w PicoBSD!                            [32m-->=[41m===[40m[31m\[37m
                                             [32m~~[37m  [31md d[37m
-W glownym katalogu w pliku README znajdziesz   [35mpico[37m
+W glownym katalogu w pliku README znajdziesz   [35mpicoBSD[37m
 krotki opis systemu. Mozesz go obejrzec przy pomocy
 "more /README".

@@ -1,5 +1,5 @@
 #
-#	$Id: PICOBSD,v 1.7 1999/01/18 10:17:33 abial Exp $
+#	$Id: PICOBSD,v 1.8.2.1 1999/02/07 22:19:57 abial Exp $
 #

 machine		"i386"
@@ -52,7 +52,7 @@ disk		wd3	at wdc1 drive 1

 options		ATAPI		#Enable ATAPI support for IDE bus
 options		ATAPI_STATIC	#Don't do it as an LKM
-device		wcd0	#IDE CD-ROM
+device		acd0	#IDE CD-ROM

 # syscons is the default console driver, resembling an SCO console

@@ -68,7 +68,11 @@ device		sio1	at isa? port "IO_COM2" tty irq 3
 device		sio2	at isa? disable port "IO_COM3" tty irq 5
 device		sio3	at isa? disable port "IO_COM4" tty irq 9

-device		lpt0	at isa? port? tty irq 7
+device		ppc0	at isa? port? net irq 7
+controller	ppbus0
+device		nlpt0	at ppbus?
+device		plip0	at ppbus?       
+device		ppi0	at ppbus?       

 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
@@ -1,5 +1,5 @@
 #
-# $Id: crunch.conf,v 1.4 1998/09/15 11:12:25 abial Exp $
+# $Id: crunch.conf,v 1.5 1999/01/19 23:12:50 abial Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
@@ -27,7 +27,7 @@ srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec

 progs ash test echo hostname ln login getty stty
-progs inetd telnetd w msg kget
+progs inetd telnetd w msg kget reboot
 progs init ifconfig df sps ns vm cat
 progs cp rm mknod chmod chown mkdir ls syslogd
 progs sysctl route pwd_mkdb dev_mkdb
@@ -1,33 +0,0 @@
-*** Makefile.orig	Sat Aug  1 20:35:53 1998
--- Makefile	Sat Aug  1 20:36:50 1998
-***************
-*** 9,22 ****
-  #Uncomment to activate login_auth
-  #Warning: requires src/libexec/login_* auth modules
-  #LC_AUTH=-DLOGIN_CAP_AUTH
-! CFLAGS+=-Wall -DSKEY -DLOGIN_ACCESS -DLOGALL -DLOGIN_CAP $(LC_AUTH)
-  
-  .if defined(KLOGIN_PARANOID)
-  CFLAGS+=-DKLOGIN_PARANOID
-  .endif
-  
-! DPADD=	${LIBUTIL} ${LIBSKEY} ${LIBMD} ${LIBCRYPT}
-! LDADD=	-lutil -lskey -lmd -lcrypt
-  
-  .if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(LC_AUTH)
-  CFLAGS+=-DKERBEROS
--- 9,22 ----
-  #Uncomment to activate login_auth
-  #Warning: requires src/libexec/login_* auth modules
-  #LC_AUTH=-DLOGIN_CAP_AUTH
-! CFLAGS+=-Wall $(LC_AUTH)
-  
-  .if defined(KLOGIN_PARANOID)
-  CFLAGS+=-DKLOGIN_PARANOID
-  .endif
-  
-! DPADD=	${LIBUTIL} ${LIBMD} ${LIBCRYPT}
-! LDADD=	-lutil -lmd -lcrypt
-  
-  .if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(LC_AUTH)
-  CFLAGS+=-DKERBEROS
@@ -1,10 +0,0 @@
--- Makefile.orig	Tue Sep  8 14:40:17 1998
-+++ Makefile	Tue Sep  8 14:40:53 1998
-@@ -13,6 +13,7 @@
- BINOWN=	root
- BINGRP=	network
- MAN8=	ppp.8
-+NOSECURE=yes
- LDADD+=	-lmd -lcrypt
- DPADD+= ${LIBMD} ${LIBCRYPT}
- 
@@ -1,4 +1,4 @@
-proc				/proc			procfs	rw 0 0
+#proc				/proc			procfs	rw 0 0
 #/dev/fd0c			/start_floppy		ufs	rw 1 1
 #/dev/wd0s1			/dos		msdos	rw 0 0
 #/dev/wcd0c			/cdrom		cd9660	ro,noauto 0 0
@@ -4,7 +4,7 @@ PicoBSD @VER@ (NET)                         [31m([37m[1mo,o[m[31m)[37m
                                        [32m__  [31m\~/[37m
 Welcome to PicoBSD!                     [32m-->=[41m===[40m[31m\[37m
                                        [32m~~[37m  [31md d[37m
-You can find a short description of the   [35mpico[37m
+You can find a short description of the   [35mpicoBSD[37m
 system in file /README. You can view it using
 "more /README".

@@ -4,7 +4,7 @@ PicoBSD @VER@ (NET)                              [31m([37m[1mo,o[m[31m)[37
                                             [32m__  [31m\~/[37m
 Witamy w PicoBSD!                            [32m-->=[41m===[40m[31m\[37m
                                             [32m~~[37m  [31md d[37m
-W glownym katalogu w pliku README znajdziesz   [35mpico[37m
+W glownym katalogu w pliku README znajdziesz   [35mpicoBSD[37m
 krotki opis systemu. Mozesz go obejrzec przy pomocy
 "more /README".