This commit was manufactured by cvs2svn to create tag

'RELENG_2_1_0_RELEASE'.
*really* shut this thing up. Debugging output was permanantly stapled
2026-10-28 11:25:21 +01:00 · 1996-01-01 11:01:15 +00:00 · 1995-11-18 10:02:10 +00:00 · 1995-11-17 23:53:37 +00:00 · 1995-11-17 23:49:45 +00:00 · 1995-11-17 23:04:04 +00:00
4109 changed files with 118939 additions and 871780 deletions
@@ -13,13 +13,24 @@ committing code that was written by someone else, I decided to use the

 The template looks like this:

-Reviewed by:
-Submitted by:
+Reviewed by:    
+Submitted by:   
+Obtained from:
 CVS: ----------------------------------------------------------------------
-CVS: Delete the ``Reviewed by'' line if this is somebody else's work
-CVS: (you are the reviewer).
-CVS: Delete the ``Submitted by'' line if this is NOT somebody else's
-CVS: work (you are the author).
+CVS: Obtained from:
+CVS:   If this change has been taken from another system, such as NetBSD,
+CVS:   then name the system in this line, otherwise delete it.
+CVS: Reviewed by:
+CVS:   Before committing changes please have someone check your work and
+CVS:   include their name here. If the change is trivial and you have not
+CVS:   had it reviewed then delete this line.
+CVS: Submitted by:
+CVS:   If this code has been contributed to FreeBSD by someone else; i.e.,
+CVS:   they sent us a patch or a new module, then include their name/email
+CVS:   address here. If this is your work then delete this line.
+
+(Note that these lines will also automatically removed now if the tags
+are empty.)

 If you are making substantial or possibly controversial changes to the
 code, please talk to someone else who either has commit authority, or
@@ -42,3 +53,13 @@ so that the logs look cleaner.

 -GAWollman

+
+Importing new stuff is somewhat error-prone since it's easy to create
+unwanted directories or even whole subtrees without noticing it.  The
+script ``easy-import'' has been created to make first-time imports
+easier to handle (vendor-branch imports are not yet supported), and to
+help people avoiding the most common errors.  It is available as
+/usr/local/bin/easy-import on freefall, or in the source tree as
+src/gnu/usr.bin/cvs/contrib/easy-import.pl.
+
+Jörg Wunsch
@@ -1,49 +0,0 @@
-$Id$
-
-This file lists hardware, which doesn't do what it should do.
-
-Due to the nature of FreeBSD, we do not have the resources to test all
-possible kinds of hardware.  We do however every now and then find, buy
-or hear about hardware which doesn't work with FreeBSD or in general.
-
-This is that list.
-
-To be added to this list, a piece of hardware has to:
-	A: not do what it claims.
-or
-	B: not do what common sense would expect it to.
-
-Only if performance claims are wildly of the mark will it be listed here.
-
-All entries must have a date and a mail-address associated with them, to
-reflect when and by whom they were added.
-For multifunctional devices, please indicate if other parts of the device
-work OK, or are untested.
-For mutual incompabilities, list both devices.
-For SCSI and IDE-devices, list the string seen on boot of FreeBSD, if 
-possible, and trade name.
-Infer format from other entries, Keep sorted by first line.
-
-Thankyou.
-
---
-Controller, Data Technology DTC2280, "PC/AT Super I/O Card"
-IDE interface can be set to secondary address, but doesn't work there.  Suspect
-Interrupt isn't moved along.  Works fine on primary address.  Other parts of
-card not tested.
-19940828 [email protected]
---
-IDE-disk, <Maxtor 7345 AT>, "Maxtor 7345"
-Cannot coexist on the same IDE-controller with a <WDC AC2540H>, "Western 
-Digital Caviar 2540" disk.  Jumpers not exhaustively experimented with, as
-neither of the companies make sufficient information available.  Disk works
-fine when alone on IDE-controller.
-19940828 [email protected]
---
-IDE-disk, <WDC AC2540H>, "Western Digital Caviar 2540"
-Cannot coexist on the same IDE-controller with a <Maxtor 7345 AT>, "Maxtor
-7345" disk.  Jumpers not exhaustively experimented with, as neither of the 
-companies make sufficient information available.  Disk works fine when alone
-on IDE-controller.
-19940828 [email protected]
---
@@ -1,5 +1,4 @@
-#
-#	$Id: Makefile,v 1.56 1995/05/13 03:34:23 rgrimes Exp $
+#	$Id: Makefile,v 1.57.4.7 1995/11/09 10:57:04 jkh Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include and MOST of /usr/lib
@@ -112,6 +111,12 @@ update:
 	@echo "Running sup"
 	@echo "--------------------------------------------------------------"
 	@sup -v ${SUPFILE}
+.if defined(SUPFILE1)
+	@sup -v ${SUPFILE1}
+.endif
+.if defined(SUPFILE2)
+	@sup -v ${SUPFILE2}
+.endif
 .endif
 .if defined(CVS_UPDATE)
 	@echo "--------------------------------------------------------------"
@@ -208,6 +213,8 @@ includes:
 	cd ${.CURDIR}/gnu/lib/libdialog &&      ${MAKE} beforeinstall
 .if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
 	cd ${.CURDIR}/eBones/include &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/eBones/lib/libkrb &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/eBones/lib/libkadm &&	${MAKE} beforeinstall
 .endif
 	cd ${.CURDIR}/lib/libc &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcurses &&		${MAKE} beforeinstall
@@ -226,7 +233,6 @@ includes:
 	cd ${.CURDIR}/lib/libss &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libforms &&		${MAKE}	beforeinstall
 	cd ${.CURDIR}/lib/libscsi &&		${MAKE}	beforeinstall
-	cd ${.CURDIR}/lib/libftp &&		${MAKE}	beforeinstall

 lib-tools:
 	@echo "--------------------------------------------------------------"
@@ -291,11 +297,7 @@ libraries:
 .if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
 	cd ${.CURDIR}/eBones/des && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/eBones/acl && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/eBones/kdb && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/eBones/krb && \
+	cd ${.CURDIR}/eBones/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(usr.sbin/pcvt/keycap)
@@ -305,12 +307,18 @@ libraries:

 tools:
 	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding ${DESTDIR} Compiler and Make"
+	@echo " Rebuilding ${DESTDIR} C compiler, make, sgmlfmt, and zic(8)"
 	@echo "--------------------------------------------------------------"
 	@echo
 	cd ${.CURDIR}/gnu/usr.bin/cc && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/usr.bin/make && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+	cd ${.CURDIR}/usr.bin/sgmlfmt && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR} 
+	cd ${.CURDIR}/share/sgml && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR} 
+	cd ${.CURDIR}/usr.sbin/zic && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}

 .include <bsd.subdir.mk>
@@ -1,69 +0,0 @@
-   -----------------------------------------
-       FreeBSD 2.0  ---  ALPHA Release                 ,        ,
-   -----------------------------------------          /(        )`
-                                                      \ \___   / |
-Welcome to the ALPHA release of FreeBSD 2.0 - the     /- _  `-/  '
-first public snapshot of our new 4.4BSD Lite based   (/\/ \ \   /\
-operating system environment.  This install proce-   / /   | `    \
-dure is also at the ALPHA stage, and contains only   O O   ) /    |
-the minimum functionality required by an             `-^--'`<     '
-*EXPERIENCED* person to install the system.         (_.)  _  )   /
-It is our hope, of course, that the feedback         `.___/`    /
-provided from this snapshot will                       `-----' /
-greatly assist us in making the release   <----.     __ / __   \
-of 2.0 much more user friendly.  Your     <----|====O)))==) \) /====
-comments and criticisms are very          <----'    `--' `.__,' \
-valuable to us, so please don't hesitate               |        |
-in contacting us!  Full details on where and            \       /	/\
-how to provide feedback are given below.           ______( (_  / \______/
-                                                 ,'  ,-----'   |
-This install procedure is ALPHA code, and        `--{__________)
-may very possibly *DESTROY* the contents of your
-ENTIRE DISK!  Please do not proceed with this installation
-unless you've adequately backed up your data first!
-
-If any errors occur during this installation, you can see them
-by toggling over to the alternate screen - type ALT-F2 to switch
-over, ALT-F1 to switch back to the install screen.  The debugging
-output on the second screen may be very valuable to us in understanding
-your bug report, so please be sure to take note of it when reporting
-any failures in the installation!  Thanks!
-
-Menus and scrolling output windows may be traversed with the arrow
-and Page Up/Page Down keys.  To suspend the installation at any point,
-hit ESC twice.  Hitting TAB will move the focus to different controls.
-If you've ever dealt with a DOS installation, you'll know how to deal
-with this.
-
-For a more complete description of what's new in this release, please
-see the release notes.
-
-For more documentation on this system, it is recommended that you purchase
-the 4.4BSD Document Set from O'Reilly Associates and the USENIX Association.
-ISBN 1-56592-082-1  We have no connection with O'Reilly, we're just
-satisfied customers!
-
-Have fun, and please let us know of any problems you encounter with
-this release!
-
-Comments should be sent to:
-
-	[email protected]
-
-Bug reports should be sent using the `send-pr' utility, if you
-were able to get the system installed, otherwise to:
-
-	[email protected]
-
-And general questions to:
-
-	[email protected]
-
-
-Please have patience if your questions are not answered right away -
-this is an especially busy time for us, and our volunteer resources
-are often strained to the limit (if not somewhat past!).
-
-Thanks!
-
-				The FreeBSD Project
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id$
+ *	$Id: cat.c,v 1.3 1995/10/03 12:46:37 bde Exp $
 */

 #ifndef lint
@@ -128,6 +128,7 @@ cook_args(argv)
 				fp = stdin;
 			else if ((fp = fopen(*argv, "r")) == NULL) {
 				warn("%s", *argv);
+				rval = 1;
 				++argv;
 				continue;
 			}
@@ -196,6 +197,7 @@ cook_buf(fp)
 	}
 	if (ferror(fp)) {
 		warn("%s", filename);
+		rval = 1;
 		clearerr(fp);
 	}
 	if (ferror(stdout))
@@ -216,6 +218,7 @@ raw_args(argv)
 				fd = fileno(stdin);
 			else if ((fd = open(*argv, O_RDONLY, 0)) < 0) {
 				warn("%s", *argv);
+				rval = 1;
 				++argv;
 				continue;
 			}
@@ -248,6 +251,8 @@ raw_cat(rfd)
 		for (off = 0; nr; nr -= nw, off += nw)
 			if ((nw = write(wfd, buf + off, nr)) < 0)
 				err(1, "stdout");
-	if (nr < 0)
+	if (nr < 0) {
 		warn("%s", filename);
+		rval = 1;
+	}
 }
@@ -1,7 +0,0 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
-
-PROG=	chflags
-SRCS=	chflags.c stat_flags.c
-.PATH:	${.CURDIR}/../../bin/ls
-
-.include <bsd.prog.mk>
@@ -1,125 +0,0 @@
-.\" Copyright (c) 1989, 1990, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Institute of Electrical and Electronics Engineers, Inc.
-.\"
-.\" 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.
-.\"
-.\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\"
-.Dd March 31, 1994
-.Dt CHFLAGS 1
-.Os
-.Sh NAME
-.Nm chflags
-.Nd change file flags
-.Sh SYNOPSIS
-.Nm chflags
-.Oo
-.Fl R
-.Op Fl H | Fl L | Fl P
-.Oc
-.Ar flags
-.Ar file ...
-.Sh DESCRIPTION
-The
-.Nm chflags
-utility modifies the file flags of the listed files
-as specified by the
-.Ar flags
-operand.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl H
-If the
-.Fl R
-option is specified, symbolic links on the command line are followed.
-(Symbolic links encountered in the tree traversal are not followed.)
-.It Fl L
-If the
-.Fl R
-option is specified, all symbolic links are followed.
-.It Fl P
-If the
-.Fl R
-option is specified, no symbolic links are followed.
-.It Fl R
-Change the file flags for the file hierarchies rooted
-in the files instead of just the files themselves.
-.El
-.Pp
-Flags are a comma separated list of keywords.
-The following keywords are currently defined:
-.Bd -literal -offset indent compact
-arch	set the archived flag (super-user only)
-dump	set the dump flag
-sappnd	set the system append-only flag (super-user only)
-schg	set the system immutable flag (super-user only)
-uappnd	set the user append-only flag (owner or super-user only)
-uchg	set the user immutable flag (owner or super-user only)
-archived, sappend, schange, simmutable, uappend, uchange, uimmutable
-	aliases for the above
-.Ed
-.Pp
-Putting the letters
-.Dq no
-before an option causes the flag to be turned off.
-For example:
-.Bd -literal -offset indent compact
-nodump	the file should never be dumped
-.Ed
-.Pp
-Symbolic links do not have flags, so unless the
-.Fl H
-or
-.Fl L
-option is set,
-.Nm chflags
-on a symbolic link always succeeds and has no effect.
-The
-.Fl H ,
-.Fl L
-and
-.Fl P
-options are ignored unless the
-.Fl R
-option is specified.
-In addition, these options override each other and the
-command's actions are determined by the last one specified.
-.Pp
-The
-.Nm chflags
-utility exits 0 on success, and >0 if an error occurs.
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr stat 2 ,
-.Xr fts 3 ,
-.Xr symlink 7
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <err.h>
-#include <errno.h>
-#include <fts.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-u_long	string_to_flags __P((char **, u_long *, u_long *));
-void	usage __P((void));
-
-int
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	FTS *ftsp;
-	FTSENT *p;
-	u_long clear, set;
-	long val;
-	int Hflag, Lflag, Pflag, Rflag, ch, fts_options, oct, rval;
-	char *flags, *ep;
-
-	Hflag = Lflag = Pflag = Rflag = 0;
-	while ((ch = getopt(argc, argv, "HLPR")) != EOF)
-		switch (ch) {
-		case 'H':
-			Hflag = 1;
-			Lflag = Pflag = 0;
-			break;
-		case 'L':
-			Lflag = 1;
-			Hflag = Pflag = 0;
-			break;
-		case 'P':
-			Pflag = 1;
-			Hflag = Lflag = 0;
-			break;
-		case 'R':
-			Rflag = 1;
-			break;
-		case '?':
-		default:
-			usage();
-		}
-	argv += optind;
-	argc -= optind;
-
-	if (argc < 2)
-		usage();
-
-	fts_options = FTS_PHYSICAL;
-	if (Rflag) {
-		if (Hflag)
-			fts_options |= FTS_COMFOLLOW;
-		if (Lflag) {
-			fts_options &= ~FTS_PHYSICAL;
-			fts_options |= FTS_LOGICAL;
-		}
-	}
-
-	flags = *argv;
-	if (*flags >= '0' && *flags <= '7') {
-		errno = 0;
-		val = strtol(flags, &ep, 8);
-		if (val < 0)
-			errno = ERANGE;
-		if (errno)
-                        err(1, "invalid flags: %s", flags);
-                if (*ep)
-                        errx(1, "invalid flags: %s", flags);
-		set = val;
-                oct = 1;
-	} else {
-		if (string_to_flags(&flags, &set, &clear))
-                        errx(1, "invalid flag: %s", flags);
-		clear = ~clear;
-		oct = 0;
-	}
-
-	if ((ftsp = fts_open(++argv, fts_options , 0)) == NULL)
-		err(1, NULL);
-
-	for (rval = 0; (p = fts_read(ftsp)) != NULL;) {
-		switch (p->fts_info) {
-		case FTS_D:
-			if (Rflag)		/* Change it at FTS_DP. */
-				continue;
-			fts_set(ftsp, p, FTS_SKIP);
-			break;
-		case FTS_DNR:			/* Warn, chflag, continue. */
-			warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
-			rval = 1;
-			break;
-		case FTS_ERR:			/* Warn, continue. */
-		case FTS_NS:
-			warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
-			rval = 1;
-			continue;
-		case FTS_SL:			/* Ignore. */
-		case FTS_SLNONE:
-			/*
-			 * The only symlinks that end up here are ones that
-			 * don't point to anything and ones that we found
-			 * doing a physical walk.
-			 */
-			continue;
-		default:
-			break;
-		}
-		if (oct) {
-			if (!chflags(p->fts_accpath, set))
-				continue;
-		} else {
-			p->fts_statp->st_flags |= set;
-			p->fts_statp->st_flags &= clear;
-			if (!chflags(p->fts_accpath, p->fts_statp->st_flags))
-				continue;
-		}
-		warn("%s", p->fts_path);
-		rval = 1;
-	}
-	if (errno)
-		err(1, "fts_read");
-	exit(rval);
-}
-
-void
-usage()
-{
-	(void)fprintf(stderr,
-	    "usage: chflags [-R [-H | -L | -P]] flags file ...\n");
-	exit(1);
-}
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: utils.c,v 1.2 1994/09/24 02:53:42 davidg Exp $
+ *	$Id: utils.c,v 1.5 1995/10/03 12:55:01 bde Exp $
 */

 #ifndef lint
@@ -143,13 +143,12 @@ copy_file(entp, dne)
 		}
 	}

-	/* If the copy went bad, lose the file. */
-	if (rval == 1) {
-		(void)unlink(to.p_path);
-		(void)close(from_fd);
-		(void)close(to_fd);
-		return (1);
-	}
+	/*
+	 * Don't remove the target even after an error.  The target might
+	 * not be a regular file, or its attributes might be important,
+	 * or its contents might be irreplacable.  It would only be safe
+	 * to remove it if we created it and its length is 0.
+	 */

 	if (pflag && setfile(fs, to_fd))
 		rval = 1;
@@ -242,7 +241,8 @@ setfile(fs, fd)
 	int rval;

 	rval = 0;
-	fs->st_mode &= S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
+	fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
+		       S_IRWXU | S_IRWXG | S_IRWXO;

 	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
 	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: csh.c,v 1.2 1994/09/24 02:53:51 davidg Exp $
+ *	$Id: csh.c,v 1.3 1995/05/30 00:06:30 rgrimes Exp $
 */

 #ifndef lint
@@ -248,14 +248,6 @@ main(argc, argv)
    if ((tcp = getenv("TERM")) != NULL)
 	set(STRterm, SAVE(tcp));

-    /*
-     * Re-initialize path if set in environment
-     */
-    if ((tcp = getenv("PATH")) == NULL)
-	set1(STRpath, defaultpath(), &shvhed);
-    else
-	importpath(SAVE(tcp));
-
    set(STRshell, Strsave(STR_SHELLPATH));

    doldol = putn((int) getpid());	/* For $$ */
@@ -417,6 +409,16 @@ main(argc, argv)
 	    stderror(ERR_SYSTEM, "csh", strerror(errno));
 	}
    }
+
+    /*
+     * Re-initialize path if set in environment
+     * importpath uses intty and intact
+     */
+    if ((tcp = getenv("PATH")) == NULL)
+	set1(STRpath, defaultpath(), &shvhed);
+    else
+	importpath(SAVE(tcp));
+
    /*
     * Decide whether we should play with signals or not. If we are explicitly
     * told (via -i, or -) or we are a login shell (arg0 starts with -) or the
@@ -618,7 +620,8 @@ importpath(cp)
 	for (;;) {
 	    if ((c = *dp) == ':' || c == 0) {
 		*dp = 0;
-		if ((*cp != '/' || *cp == '\0') && (euid == 0 || uid == 0))
+		if (*cp != '/' && (euid == 0 || uid == 0) &&
+		    (intact || intty && isatty(SHOUT)))
 		    (void) fprintf(csherr,
 	    "Warning: imported path contains relative components\n");
 		pv[i++] = Strsave(*cp ? cp : STRdot);
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: dir.c,v 1.2 1994/09/24 02:53:54 davidg Exp $
+ *	$Id: dir.c,v 1.3 1995/05/30 00:06:30 rgrimes Exp $
 */

 #ifndef lint
@@ -84,7 +84,7 @@ dinit(hp)
    /* Don't believe the login shell home, because it may be a symlink */
    tcp = getwd(path);		/* see ngetwd.c for System V version */
    if (tcp == NULL || *tcp == '\0') {
-	(void) fprintf(csherr, "csh: %s\n", path);
+	(void) fprintf(csherr, "csh: %s: %s\n", path, strerror(errno));
 	if (hp && *hp) {
 	    tcp = short2str(hp);
 	    if (chdir(tcp) == -1)
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: exec.c,v 1.2 1994/09/24 02:53:59 davidg Exp $
+ *	$Id: exec.c,v 1.3 1995/05/30 00:06:32 rgrimes Exp $
 */

 #ifndef lint
@@ -656,7 +656,7 @@ tellmewhat(lex)
    register struct biltins *bptr;
    register struct wordent *sp = lex->next;
    bool    aliased = 0;
-    Char   *s0, *s1, *s2;
+    Char   *s0, *s1, *s2, *cmd;
    Char    qc;

    if (adrof1(sp->word, &aliases)) {
@@ -703,6 +703,8 @@ tellmewhat(lex)
 	}
    }

+    sp->word = cmd = globone(sp->word, G_IGNORE);
+
    if ((i = iscommand(strip(sp->word))) != 0) {
 	register Char **pv;
 	register struct varent *v;
@@ -717,10 +719,14 @@ tellmewhat(lex)
 	while (--i)
 	    pv++;
 	if (pv[0][0] == 0 || eq(pv[0], STRdot)) {
-	    sp->word = Strspl(STRdotsl, sp->word);
-	    prlex(cshout, lex);
-	    xfree((ptr_t) sp->word);
+	    if (!slash) {
+		sp->word = Strspl(STRdotsl, sp->word);
+		prlex(cshout, lex);
+		xfree((ptr_t) sp->word);
+	    } else
+		prlex(cshout, lex);
 	    sp->word = s0;	/* we save and then restore this */
+	    xfree((ptr_t) cmd);
 	    return;
 	}
 	s1 = Strspl(*pv, STRslash);
@@ -734,5 +740,6 @@ tellmewhat(lex)
 	    prlex(cshout, lex);
 	(void) fprintf(csherr, "%s: Command not found.\n", vis_str(sp->word));
    }
+    xfree((ptr_t) cmd);
    sp->word = s0;		/* we save and then restore this */
 }
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: file.c,v 1.2 1994/09/24 02:54:03 davidg Exp $
+ *	$Id: file.c,v 1.3 1995/05/30 00:06:33 rgrimes Exp $
 */

 #ifndef lint
@@ -112,14 +112,14 @@ static void
 setup_tty(on)
    int     on;
 {
-    static struct termios tchars;
+    struct termios tchars;

    (void) tcgetattr(SHIN, &tchars);

    if (on) {
 	tchars.c_cc[VEOL] = ESC;
 	if (tchars.c_lflag & ICANON)
-	    on = TCSANOW;
+	    on = TCSADRAIN;
 	else {
 	    on = TCSAFLUSH;
 	    tchars.c_lflag |= ICANON;
@@ -127,10 +127,10 @@ setup_tty(on)
    }
    else {
 	tchars.c_cc[VEOL] = _POSIX_VDISABLE;
-	on = TCSANOW;
+	on = TCSADRAIN;
    }

-    (void) tcsetattr(SHIN, TCSANOW, &tchars);
+    (void) tcsetattr(SHIN, on, &tchars);
 }

 /*
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: lex.c,v 1.2 1994/09/24 02:54:09 davidg Exp $
+ *	$Id: lex.c,v 1.3 1995/05/30 00:06:35 rgrimes Exp $
 */

 #ifndef lint
@@ -1187,7 +1187,7 @@ gethent(sc)
 	    }
 	    np = lhsb;
 	    event = 0;
-	    while (!cmap(c, _ESC | _META | _QF | _QB) && !any("${}:", c)) {
+	    while (!cmap(c, _ESC | _META | _QF | _QB) && !any("^$*-%{}:", c)) {
 		if (event != -1 && Isdigit(c))
 		    event = event * 10 + c - '0';
 		else
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: set.c,v 1.2 1994/09/24 02:54:16 davidg Exp $
+ *	$Id: set.c,v 1.3 1995/05/30 00:06:38 rgrimes Exp $
 */

 #ifndef lint
@@ -664,7 +664,8 @@ exportpath(val)
 			       "Warning: ridiculously long PATH truncated\n");
 		break;
 	    }
-	    if ((**val != '/' || **val == '\0') && (euid == 0 || uid == 0))
+	    if (**val != '/' && (euid == 0 || uid == 0) &&
+		    (intact || intty && isatty(SHOUT)))
 		    (void) fprintf(csherr,
 		    "Warning: exported path contains relative components.\n");
 	    (void) Strcat(exppath, *val++);
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\"	$Id: date.1,v 1.4 1994/09/24 02:54:34 davidg Exp $
+.\"	$Id: date.1,v 1.5 1995/04/03 20:08:32 joerg Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -107,7 +107,7 @@ in the
 manual page, as well as any arbitrary text.
 The format string for the default display is:
 .Bd -literal -offset indent
-``%a %b %e %H:%M:%S %Z %Y''.
+``%+''.
 .Ed
 .Pp
 If an operand does not have a leading plus sign, it is interpreted as
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: date.c,v 1.3 1994/12/26 12:59:28 bde Exp $
+ *	$Id: date.c,v 1.4 1995/04/03 20:08:33 joerg Exp $
 */

 #ifndef lint
@@ -123,7 +123,7 @@ main(argc, argv)
 	if (!rflag && time(&tval) == -1)
 		err(1, "time");

-	format = "%a %b %e %H:%M:%S %Z %Y";
+	format = "%+";

 	/* allow the operands in any order */
 	if (*argv && **argv == '+') {
@@ -4,7 +4,7 @@
 *
 * Largely rewritten by J.T. Conklin ([email protected])
 *
- * $Id: expr.y,v 1.8 1994/09/24 02:55:37 davidg Exp $
+ * $Id: expr.y,v 1.9 1995/03/19 13:28:41 joerg Exp $
 */

 #include <stdio.h>
@@ -107,13 +107,25 @@ make_str (s)
 char *s;
 {
 	struct val *vp;
+	int i, isint;

 	vp = (struct val *) malloc (sizeof (*vp));
 	if (vp == NULL || ((vp->u.s = strdup (s)) == NULL)) {
 		err (2, NULL);
 	}

+	for(i = 1, isint = isdigit(s[0]) || s[0] == '-';
+	    isint && i < strlen(s);
+	    i++)
+	{
+		if(!isdigit(s[i]))
+			 isint = 0;
+	}
+
 	vp->type = string;
+	if(isint)
+		to_integer(vp);
+
 	return vp;
 }

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.6 (Berkeley) 4/18/94
-.\"	$Id$
+.\"	$Id: ls.1,v 1.4 1995/09/26 08:48:09 mpp Exp $
 .\"
 .Dd April 18, 1994
 .Dt LS 1
@@ -82,9 +82,10 @@ Force multi-column output; this is the default when output is to a terminal.
 Display a slash (/) immediately after each pathname
 that is a directory, an asterisk (*) after each that is
 executable,
-and an at sign (@) after each symbolic link.
-.\" and a vertical bar (|) after each that is a
-.\" .Tn FIFO . 
+an at sign (@) after each symbolic link,
+an equals sign (=) after each socket,
+and a vertical bar (|) after each that is a
+.Tn FIFO . 
 .It Fl L
 If argument is a symbolic link, list the file or directory the link references
 rather than the link itself.
@@ -215,8 +216,8 @@ Directory.
 Symbolic link.
 .It Sy s
 Socket link.
-.\" .It Sy p
-.\" .Tn FIFO .
+.It Sy p
+.Tn FIFO .
 .It Sy \-
 Regular file.
 .El
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: print.c,v 1.3 1995/03/19 13:28:46 joerg Exp $
+ *	$Id: print.c,v 1.4 1995/05/30 00:06:50 rgrimes Exp $
 */

 #ifndef lint
@@ -52,7 +52,6 @@ static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <tzfile.h>
 #include <unistd.h>
 #include <utmp.h>

@@ -228,13 +227,13 @@ printtime(ftime)
 	time_t ftime;
 {
 	int i;
-	char *longstring;
+	char longstring[80];

-	longstring = ctime(&ftime);
+	strftime(longstring, sizeof(longstring), "%c", localtime(&ftime));
 	for (i = 4; i < 11; ++i)
 		(void)putchar(longstring[i]);

-#define	SIXMONTHS	((DAYSPERNYEAR / 2) * SECSPERDAY)
+#define	SIXMONTHS	((365 / 2) * 86400)
 	if (f_sectime)
 		for (i = 11; i < 24; i++)
 			(void)putchar(longstring[i]);
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: mv.1,v 1.2 1994/09/24 02:56:06 davidg Exp $
 .\"
 .Dd May 31, 1993
 .Dt MV 1
@@ -112,7 +112,7 @@ to accomplish the move.
 The effect is equivalent to:
 .Bd -literal -offset indent
 rm -f destination_path && \e
-\tcp -pr source_file destination && \e
+\tcp -pRP source_file destination && \e
 \trm -rf source_file
 .Ed
 .Pp
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id$
+ *	$Id: mv.c,v 1.3 1995/10/07 10:42:48 bde Exp $
 */

 #ifndef lint
@@ -116,10 +116,16 @@ endarg:	argc -= optind;
 	*endp++ = '/';
 	++baselen;
 	for (rval = 0; --argc; ++argv) {
-		if ((p = strrchr(*argv, '/')) == NULL)
-			p = *argv;
-		else
-			++p;
+		/*
+		 * Find the last component of the source pathname.  It
+		 * may have trailing slashes.
+		 */
+		p = *argv + strlen(*argv);
+		while (p != *argv && p[-1] == '/')
+			--p;
+		while (p != *argv && p[-1] != '/')
+			--p;
+
 		if ((baselen + (len = strlen(p))) >= MAXPATHLEN) {
 			warnx("%s: destination pathname too long", *argv);
 			rval = 1;
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: gen_subs.c,v 1.3 1995/03/19 13:28:49 joerg Exp $
+ *	$Id: gen_subs.c,v 1.5 1995/08/07 19:17:36 wollman Exp $
 */

 #ifndef lint
@@ -47,7 +47,6 @@ static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #include <sys/param.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <tzfile.h>
 #include <utmp.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -64,7 +63,7 @@ static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 */
 #define MODELEN 20
 #define DATELEN 64
-#define SIXMONTHS	 ((DAYSPERNYEAR / 2) * SECSPERDAY)
+#define SIXMONTHS	 ((365 / 2) * 86400)
 #define CURFRMT		"%b %e %H:%M"
 #define OLDFRMT		"%b %e  %Y"
 #ifndef UT_NAMESIZE
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\"	$Id$
+.\"	$Id: pax.1,v 1.3 1995/08/16 23:12:25 nate Exp $
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
@@ -1048,7 +1048,7 @@ copies the contents of the current directory to the device
 .Pa /dev/rst0 .
 .Pp
 The command:
-.Dl pax -r -v -f filename
+.Dl pax -v -f filename
 gives the verbose table of contents for an archive stored in
 .Pa filename .
 .Pp
@@ -35,7 +35,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)pax.h	8.2 (Berkeley) 4/18/94
- *	$Id: pax.h,v 1.2 1994/09/24 02:56:28 davidg Exp $
+ *	$Id: pax.h,v 1.3 1995/05/30 00:07:01 rgrimes Exp $
 */

 /*
@@ -227,9 +227,9 @@ typedef struct oplist {
 #ifndef MIN
 #define        MIN(a,b) (((a)<(b))?(a):(b))
 #endif
-#define MAJOR(x)        (((unsigned)(x) >> 8) & 0xff)
-#define MINOR(x)        ((x) & 0xff)
-#define TODEV(x, y)	(((unsigned)(x) << 8) | ((unsigned)(y)))
+#define MAJOR(x)	major(x)
+#define MINOR(x)	minor(x)
+#define TODEV(x, y)	makedev((x), (y))

 /*
 * General Defines
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: keyword.c,v 1.4 1994/10/02 08:19:10 davidg Exp $
+ *	$Id: keyword.c,v 1.7 1995/09/26 17:48:58 peter Exp $
 */

 #ifndef lint
@@ -161,7 +161,7 @@ VAR var[] = {
 	{"tpgid", "TPGID", NULL, 0, evar, 4, EOFF(e_tpgid), ULONG, PIDFMT},
 	{"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"},
 	{"tsiz", "TSIZ", NULL, 0, tsize, 4},
-	{"tt", "TT", NULL, LJUST, tname, 3},
+	{"tt", "TT ", NULL, 0, tname, 4},
 	{"tty", "TTY", NULL, LJUST, longtname, 8},
 	{"ucomm", "UCOMM", NULL, LJUST, ucomm, MAXCOMLEN},
 	{"uid", "UID", NULL, 0, evar, UIDLEN, EOFF(e_ucred.cr_uid),
@@ -248,7 +248,7 @@ VAR var[] = {
 	{"trs", "TRS", NULL, 0, trss, 3},
 	{"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"},
 	{"tsiz", "TSIZ", NULL, 0, tsize, 4},
-	{"tt", "TT", NULL, LJUST, tname, 3},
+	{"tt", "TT", NULL, LJUST, tname, 4},
 	{"tty", "TTY", NULL, LJUST, longtname, 8},
 	{"ucomm", "UCOMM", NULL, LJUST, ucomm, MAXCOMLEN},
 	{"uid", "UID", NULL, 0, pvar, UIDLEN, POFF(p_uid),USHORT, UIDFMT},
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: print.c,v 1.6 1995/03/19 13:29:01 joerg Exp $
+ *	$Id: print.c,v 1.10 1995/09/26 17:48:59 peter Exp $
 */

 #ifndef lint
@@ -65,7 +65,6 @@ static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #include <stdlib.h>
 #include <string.h>
 #include <vis.h>
-#include <tzfile.h>

 #include "ps.h"

@@ -323,7 +322,7 @@ tname(k, ve)
 	v = ve->var;
 	dev = KI_EPROC(k)->e_tdev;
 	if (dev == NODEV || (ttname = devname(dev, S_IFCHR)) == NULL)
-		(void)printf("%-*s", v->width, "??");
+		(void)printf("%*s ", v->width-1, "??");
 	else {
 		if (strncmp(ttname, "tty", 3) == 0 ||
 		    strncmp(ttname, "cua", 3) == 0)
@@ -369,11 +368,11 @@ started(k, ve)
 	tp = localtime(&k->ki_u.u_start.tv_sec);
 	if (!now)
 		(void)time(&now);
-	if (now - k->ki_u.u_start.tv_sec < 24 * SECSPERHOUR) {
+	if (now - k->ki_u.u_start.tv_sec < 24 * 3600) {
 		/* I *hate* SCCS... */
 		static char fmt[] = __CONCAT("%l:%", "M%p");
 		(void)strftime(buf, sizeof(buf) - 1, fmt, tp);
-	} else if (now - k->ki_u.u_start.tv_sec < 7 * SECSPERDAY) {
+	} else if (now - k->ki_u.u_start.tv_sec < 7 * 86400) {
 		/* I *hate* SCCS... */
 		static char fmt[] = __CONCAT("%a%", "I%p");
 		(void)strftime(buf, sizeof(buf) - 1, fmt, tp);
@@ -34,13 +34,16 @@
 * SUCH DAMAGE.
 *
 *	@(#)echo.c	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: echo.c,v 1.2 1994/09/24 02:58:29 davidg Exp $
 */

 /*
 * Echo command.
 */

+#ifdef main
+#undef main
+#endif
 #define main echocmd

 #include "bltin.h"
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: eval.c,v 1.2 1994/09/24 02:57:29 davidg Exp $
+ *	$Id: eval.c,v 1.3 1995/05/30 00:07:11 rgrimes Exp $
 */

 #ifndef lint
@@ -851,7 +851,8 @@ prehash(n)
 	{
 	struct cmdentry entry;

-	if (n->type == NCMD && goodname(n->ncmd.args->narg.text))
+	if (n->type == NCMD && n->ncmd.args &&
+	    goodname(n->ncmd.args->narg.text))
 		find_command(n->ncmd.args->narg.text, &entry, 0);
 }

@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: jobs.c,v 1.2 1994/09/24 02:57:41 davidg Exp $
+ *	$Id: jobs.c,v 1.4 1995/09/21 13:24:20 bde Exp $
 */

 #ifndef lint
@@ -459,7 +459,14 @@ makejob(node, nprocs)
 			if (njobs == 0) {
 				jobtab = ckmalloc(4 * sizeof jobtab[0]);
 			} else {
+				struct job *ojp;
+
 				jp = ckmalloc((njobs + 4) * sizeof jobtab[0]);
+				for (i = njobs, ojp = jobtab; --i >= 0;
+				     jp++, ojp++)
+					if (ojp->ps == &ojp->ps0)
+						ojp->ps = &jp->ps0;
+				jp -= njobs;
 				bcopy(jobtab, jp, njobs * sizeof jp[0]);
 				ckfree(jobtab);
 				jobtab = jp;
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: mkinit.c,v 1.3 1994/11/06 06:27:04 pst Exp $
+ *	$Id: mkinit.c,v 1.5 1995/10/01 15:13:31 joerg Exp $
 */

 #ifndef lint
@@ -198,7 +198,7 @@ readfile(fname)
 	char *fname;
 	{
 	FILE *fp;
-	char line[1024];
+	char line[1024], line2[1024];
 	struct event *ep;

 	fp = ckfopen(fname, "r");
@@ -217,8 +217,20 @@ readfile(fname)
 			doinclude(line);
 		if (line[0] == 'M' && match("MKINIT", line))
 			dodecl(line, fp);
-		if (line[0] == '#' && gooddefine(line))
+		if (line[0] == '#' && gooddefine(line)) {
+			char *cp;
+
+			strcpy(line2, line);
+			memcpy(line2, "#undef ", strlen("#undef "));
+			cp = line2 + strlen("#undef ");
+			while(*cp && (*cp == ' ' || *cp == '\t'))
+				cp++;
+			while(*cp && *cp != ' ' && *cp != '\t' && *cp != '\n')
+				cp++;
+			*cp++ = '\n'; *cp = '\0';
+			addstr(line2, &defines);
 			addstr(line, &defines);
+		}
 	}
 	fclose(fp);
 }
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: options.c,v 1.2 1994/09/24 02:58:04 davidg Exp $
+ *	$Id: options.c,v 1.3.4.2 1995/10/02 07:55:18 davidg Exp $
 */

 #ifndef lint
@@ -106,6 +106,9 @@ procargs(argc, argv)
 		commandname = arg0 = *argptr++;
 		setinputfile(commandname, 0);
 	}
+	if (*argptr && minusc)
+		/* Posix.2: first arg after -c cmd is $0, remainder $1... */
+		arg0 = *argptr++;
 	shellparam.p = argptr;
 	/* assert(shellparam.malloc == 0 && shellparam.nparam == 0); */
 	while (*argptr) {
@@ -374,12 +377,11 @@ atend:
 			q++;
 	}
 	if (*++q == ':') {
-		if (*p == '\0' && (p = *shellparam.optnext) == NULL) {
+		if (*p == '\0' && (p = *shellparam.optnext++) == NULL) {
 			out1fmt("No arg for -%c option\n", c);
 			c = '?';
 			goto out;
 		}
-		shellparam.optnext++;
 		setvar("OPTARG", p, 0);
 		p = NULL;
 	}
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: parser.c,v 1.5 1995/01/11 07:07:00 paul Exp $
+ *	$Id: parser.c,v 1.6.4.1 1995/08/25 03:21:06 davidg Exp $
 */

 #ifndef lint
@@ -442,7 +442,12 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
 		checkkwd = 1;
 		break;
 	/* Handle an empty command like other simple commands.  */
+	case TAND:
+	case TOR:
 	case TNL:
+	case TSEMI:
+	/* Handle EOF as an empty command, too */
+	case TEOF:
 	case TWORD:
 		tokpushback++;
 		return simplecmd(rpp, redir);
@@ -1179,6 +1184,10 @@ parsebackq: {

                STARTSTACKSTR(out);
                while ((c = pgetc ()) != '`') {
+                       if (c == PEOF) {
+                                startlinno = plinno;
+                                synerror("EOF in backquote substitution");
+                       }
                       if (c == '\\') {
                                c = pgetc ();
                                if ( c != '\\' && c != '`' && c != '$'
@@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)shell.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: shell.h,v 1.2 1994/09/24 02:58:15 davidg Exp $
 */

 /*
@@ -57,7 +57,7 @@
 #ifndef BSD
 #define BSD 1
 #endif
-#define DEBUG 1
+/* #define DEBUG 1 */

 #ifdef __STDC__
 typedef void *pointer;
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: stty.c,v 1.3 1995/04/29 15:00:34 bde Exp $
+ *	$Id: stty.c,v 1.4 1995/05/30 00:07:28 rgrimes Exp $
 */

 #ifndef lint
@@ -95,10 +95,10 @@ main(argc, argv)
 args:	argc -= optind;
 	argv += optind;

+	if (tcgetattr(i.fd, &i.t) < 0)
+		errx(1, "stdin isn't a terminal");
 	if (ioctl(i.fd, TIOCGETD, &i.ldisc) < 0)
 		err(1, "TIOCGETD");
-	if (tcgetattr(i.fd, &i.t) < 0)
-		err(1, "tcgetattr");
 	if (ioctl(i.fd, TIOCGWINSZ, &i.win) < 0)
 		warn("TIOCGWINSZ: %s\n", strerror(errno));

@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id$
+ *	$Id: util.c,v 1.2 1994/09/24 02:59:05 davidg Exp $
 */

 #ifndef lint
@@ -62,5 +62,5 @@ checkredirect()
 	if (isatty(STDOUT_FILENO) && isatty(STDERR_FILENO) &&
 	    !fstat(STDOUT_FILENO, &sb1) && !fstat(STDERR_FILENO, &sb2) &&
 	    (sb1.st_rdev != sb2.st_rdev))
-warn("stdout appears redirected, but stdin is the control descriptor");
+warnx("stdout appears redirected, but stdin is the control descriptor");
 }
@@ -1,4 +1,4 @@
-#	$Id: Copyright.MIT,v 1.2 1994/07/19 19:21:03 g89r4222 Exp $
+#	$Id: Copyright.MIT,v 1.3 1995/07/18 16:34:16 mark Exp $

 The following Copyright notice applies to the original Bones package.

@@ -1,4 +1,4 @@
-#	$Id: Copyright.SIPB,v 1.2 1994/07/19 19:21:05 g89r4222 Exp $
+#	$Id: Copyright.SIPB,v 1.3 1995/07/18 16:34:18 mark Exp $

 The following Copyright notice applies to parts of the Bones package.
 See source code for exact references.
@@ -1,14 +1,7 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.11.2.1 1995/06/07 05:49:26 jkh Exp $
+#	$Id$

-SUBDIR=	include des acl kdb krb libkadm
-
-SUBDIR+= ext_srvtab kdb_destroy kdb_edit \
-	 kdb_init kdb_util kdestroy kerberos kinit klist ksrvtgt \
-	 kstash kadmin kadmind ksrvutil man
-#
-# MISSING AND PROBABLY BOGUS: register registerd make_keypair
-#
+SUBDIR=	des include lib libexec usr.bin usr.sbin

 SDIR= ${.CURDIR}/..

@@ -34,13 +27,10 @@ kprog:
 	cd ${SDIR}/usr.bin/su; ${CODAI}

 bootstrap:
-	cd include; ${MAKE} ${MFLAGS} install
+	( cd include; ${MAKE} ${MFLAGS} install )
+	( cd des; ${MAKE} ${MFLAGS} depend all install )
 	${MAKE} ${MFLAGS} cleandir
 	${MAKE} ${MFLAGS} obj
-	@echo removing old 1.1.5 Kerberos libraries
-	rm -f /usr/lib/libkrb.so.4.0
-	rm -f /usr/lib/libdes.so.4.0
-	rm -f /usr/lib/libkdb.so.4.0
 	${MAKE} ${MFLAGS} depend all install kprog

 help-distribute:	distribute
@@ -56,4 +46,3 @@ help-distribute:	distribute
 	cd ${SDIR}/usr.bin/su; ${CODAD}

 .include <bsd.subdir.mk>
-
@@ -1,40 +1,65 @@
 #	From: @(#)Makefile.inc	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile.inc,v 1.3 1995/01/14 20:50:37 wollman Exp $
+#	$Id: Makefile.inc,v 1.8 1995/09/14 18:16:08 gibbs Exp $

-BINDIR?=	/usr/sbin
-SHLIB_MAJOR?=	2
-SHLIB_MINOR?=	0
 DISTRIBUTION=	krb

-.if exists(${.CURDIR}/../des/obj)
-DESOBJDIR=	${.CURDIR}/../des/obj
+INCLUDEDIR=	${.CURDIR}/../../include
+
+.if exists(${.CURDIR}/../../des/obj)
+DESOBJDIR=	${.CURDIR}/../../des/obj
 .else
-DESOBJDIR=	${.CURDIR}/../des
+DESOBJDIR=	${.CURDIR}/../../des
 .endif

-.if exists(${.CURDIR}/../krb/obj)
-KRBOBJDIR=	${.CURDIR}/../krb/obj
+.if exists(${.CURDIR}/../../lib/libkrb/obj)
+KRBOBJDIR=	${.CURDIR}/../../lib/libkrb/obj
 .else
-KRBOBJDIR=	${.CURDIR}/../krb
+KRBOBJDIR=	${.CURDIR}/../../lib/libkrb
 .endif

-.if exists(${.CURDIR}/../kdb/obj)
-KDBOBJDIR=	${.CURDIR}/../kdb/obj
+.if exists(${.CURDIR}/../../lib/libkdb/obj)
+KDBOBJDIR=	${.CURDIR}/../../lib/libkdb/obj
 .else
-KDBOBJDIR=	${.CURDIR}/../kdb
+KDBOBJDIR=	${.CURDIR}/../../lib/libkdb
 .endif

-.if exists(${.CURDIR}/../acl/obj)
-ACLOBJDIR=	${.CURDIR}/../acl/obj
+.if exists(${.CURDIR}/../../lib/libacl/obj)
+ACLOBJDIR=	${.CURDIR}/../../lib/libacl/obj
 .else
-ACLOBJDIR=	${.CURDIR}/../acl
+ACLOBJDIR=	${.CURDIR}/../../lib/libacl
 .endif

-.if exists(${.CURDIR}/../libkadm/obj)
-KADMOBJDIR=	${.CURDIR}/../libkadm/obj
+.if exists(${.CURDIR}/../../lib/libkadm/obj)
+KADMOBJDIR=	${.CURDIR}/../../lib/libkadm/obj
 .else
-KADMOBJDIR=	${.CURDIR}/../libkadm
+KADMOBJDIR=	${.CURDIR}/../../lib/libkadm
 .endif

+.if exists(${.CURDIR}/../../lib/librkinit/obj)
+RKINITOBJDIR= ${.CURDIR}/../../lib/librkinit/obj
+.else
+RKINITOBJDIR= ${.CURDIR}/../../lib/librkinit
+.endif
+
+CFLAGS+= -I${INCLUDEDIR} -Wall
+
 COMPILE_ET=     compile_et

+${KRBOBJDIR}/krb_err.h: ${.CURDIR}/../../lib/libkrb/krb_err.et          
+	test -e ${KRBOBJDIR}/krb_err.et || ln -s ${.ALLSRC} ${KRBOBJDIR}
+	cd ${KRBOBJDIR}; compile_et krb_err.et
+
+CLEANFILES+=${KRBOBJDIR}/krb_err.h ${KRBOBJDIR}/krb_err.c
+
+${KADMOBJDIR}/kadm_err.h: ${.CURDIR}/../../lib/libkadm/kadm_err.et          
+	test -e ${KADMOBJDIR}/kadm_err.et || ln -s ${.ALLSRC} ${KADMOBJDIR}
+	cd ${KADMOBJDIR}; compile_et kadm_err.et
+
+CLEANFILES+=${KADMOBJDIR}/kadm_err.h ${KADMOBJDIR}/kadm_err.c
+
+${RKINITOBJDIR}/rkinit_err.h: ${.CURDIR}/../../lib/librkinit/rkinit_err.et
+	test -e ${RKINITOBJDIR}/rkinit_err.et || \
+		ln -s ${.ALLSRC} ${RKINITOBJDIR}
+	cd ${RKINITOBJDIR}; compile_et rkinit_err.et
+
+CLEANFILES+=${RKINITOBJDIR}/rkinit_err.h ${RKINITOBJDIR}/rkinit_err.c
@@ -6,7 +6,7 @@

    This program is free software; you can redistribute it and/or modify
    it under the terms of either:
-    
+
 	a) the GNU General Public License as published by the Free
 	Software Foundation; either version 1, or (at your option) any
 	later version, or
@@ -1,10 +0,0 @@
-#	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1994/09/09 21:43:17 g89r4222 Exp $
-
-LIB=	acl
-SHLIB_MAJOR= 2
-SHLIB_MINOR= 0
-CFLAGS+=-DDEBUG -DKERBEROS -I${.CURDIR}/../include
-SRCS=	acl_files.c
-
-.include <bsd.lib.mk>
@@ -1,183 +0,0 @@
-.\" from: acl_check.3,v 4.1 89/01/23 11:06:54 jtkohl Exp $
-.\" $Id: acl_check.3,v 1.1.1.1 1994/09/30 14:50:05 csgr Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <Copyright.MIT>.
-.\"
-.TH ACL_CHECK 3 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-acl_canonicalize_principal, acl_check, acl_exact_match, acl_add,
-acl_delete, acl_initialize \- Access control list routines
-.SH SYNOPSIS
-.nf
-.nj
-.ft B
-cc <files> \-lacl \-lkrb
-.PP
-.ft B
-#include <kerberosIV/krb.h>
-.PP
-.ft B
-acl_canonicalize_principal(principal, buf)
-char *principal;
-char *buf;
-.PP
-.ft B
-acl_check(acl, principal)
-char *acl;
-char *principal;
-.PP
-.ft B
-acl_exact_match(acl, principal)
-char *acl;
-char *principal;
-.PP
-.ft B
-acl_add(acl, principal)
-char *acl;
-char *principal;
-.PP
-.ft B
-acl_delete(acl, principal)
-char *acl;
-char *principal;
-.PP
-.ft B
-acl_initialize(acl_file, mode)
-char *acl_file;
-int mode;
-.fi
-.ft R
-.SH DESCRIPTION
-.SS Introduction
-.PP
-An access control list (ACL) is a list of principals, where each
-principal is represented by a text string which cannot contain
-whitespace.  The library allows application programs to refer to named
-access control lists to test membership and to atomically add and
-delete principals using a natural and intuitive interface.  At
-present, the names of access control lists are required to be Unix
-filenames, and refer to human-readable Unix files; in the future, when
-a networked ACL server is implemented, the names may refer to a
-different namespace specific to the ACL service.
-.PP
-.SS Principal Names
-.PP
-Principal names have the form
-.nf
-.in +5n
-<name>[.<instance>][@<realm>]
-.in -5n
-e.g.:
-.in +5n
-asp
-asp.root
-[email protected]
-[email protected]
-[email protected]
-.in -5n
-.fi
-It is possible for principals to be underspecified.  If an instance is
-missing, it is assumed to be "".  If realm is missing, it is assumed
-to be the local realm as determined by
-.IR krb_get_lrealm (3).
-The canonical form contains all of name, instance,
-and realm; the acl_add and acl_delete routines will always
-leave the file in that form.  Note that the canonical form of
-[email protected] is actually [email protected].
-.SS Routines
-.PP
-.I acl_canonicalize_principal
-stores the canonical form of 
-.I principal
-in 
-.IR buf .
-.I Buf
-must contain enough
-space to store a principal, given the limits on the sizes of name,
-instance, and realm specified as ANAME_SZ, INST_SZ, and REALM_SZ,
-respectively, in
-.IR /usr/include/kerberosIV/krb.h .
-.PP
-.I acl_check
-returns nonzero if
-.I principal
-appears in 
-.IR acl .
-Returns 0 if principal
-does not appear in acl, or if an error occurs.  Canonicalizes
-principal before checking, and allows the ACL to contain wildcards.  The
-only supported wildcards are entries of the form
-name.*@realm, *.*@realm, and *.*@*.  An asterisk matches any value for the
-its component field.  For example, "jtkohl.*@*" would match principal
-jtkohl, with any instance and any realm.
-.PP
-.I acl_exact_match
-performs like 
-.IR acl_check ,
-but does no canonicalization or wildcard matching.
-.PP
-.I acl_add
-atomically adds 
-.I principal
-to 
-.IR acl .
-Returns 0 if successful, nonzero otherwise.  It is considered a failure
-if
-.I principal
-is already in 
-.IR acl .
-This routine will canonicalize
-.IR principal ,
-but will treat wildcards literally.
-.PP
-.I acl_delete
-atomically deletes 
-.I principal
-from 
-.IR acl .
-Returns 0 if successful,
-nonzero otherwise.  It is considered a failure if 
-.I principal
-is not
-already in 
-.IR acl .
-This routine will canonicalize 
-.IR principal ,
-but will treat wildcards literally.
-.PP
-.I acl_initialize
-initializes
-.IR acl_file .
-If the file 
-.I acl_file
-does not exist,
-.I acl_initialize
-creates it with mode
-.IR mode .
-If the file
-.I acl_file
-exists,
-.I acl_initialize
-removes all members.  Returns 0 if successful,
-nonzero otherwise.  WARNING: Mode argument is likely to change with
-the eventual introduction of an ACL service.  
-.SH NOTES
-In the presence of concurrency, there is a very small chance that
-.I acl_add
-or
-.I acl_delete
-could report success even though it would have
-had no effect.  This is a necessary side effect of using lock files
-for concurrency control rather than flock(2), which is not supported
-by NFS.
-.PP
-The current implementation caches ACLs in memory in a hash-table
-format for increased efficiency in checking membership; one effect of
-the caching scheme is that one file descriptor will be kept open for
-each ACL cached, up to a maximum of 8.
-.SH SEE ALSO
-kerberos(3), krb_get_lrealm(3)
-.SH AUTHOR
-James Aspnes (MIT Project Athena)
@@ -1,541 +0,0 @@
-/*
- *
- * Copyright 1987,1989 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- *	from: acl_files.c,v 4.4 89/12/19 13:30:53 jtkohl Exp $
- *	$Id: acl_files.c,v 1.1.1.1 1994/09/30 14:49:48 csgr Exp $
- */
-
-#ifndef lint
-static char rcsid[] =
-"$Id: acl_files.c,v 1.1.1.1 1994/09/30 14:49:48 csgr Exp $";
-#endif lint
-
-
-/*** Routines for manipulating access control list files ***/
-
-#include <stdio.h>
-#include <strings.h>
-#include <sys/file.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/errno.h>
-#include <ctype.h>
-#include "krb.h"
-
-__BEGIN_DECLS
-static int	acl_abort __P((char *, FILE *));
-__END_DECLS
-
-#ifndef KRB_REALM
-#define KRB_REALM	"ATHENA.MIT.EDU"
-#endif
-
-/* "aname.inst@realm" */
-#define MAX_PRINCIPAL_SIZE  (ANAME_SZ + INST_SZ + REALM_SZ + 3)
-#define INST_SEP '.'
-#define REALM_SEP '@'
-
-#define LINESIZE 2048		/* Maximum line length in an acl file */
-
-#define NEW_FILE "%s.~NEWACL~"	/* Format for name of altered acl file */
-#define WAIT_TIME 300		/* Maximum time allowed write acl file */
-
-#define CACHED_ACLS 8		/* How many acls to cache */
-				/* Each acl costs 1 open file descriptor */
-#define ACL_LEN 16		/* Twice a reasonable acl length */
-
-#define MAX(a,b) (((a)>(b))?(a):(b))
-#define MIN(a,b) (((a)<(b))?(a):(b))
-
-#define COR(a,b) ((a!=NULL)?(a):(b))
-
-extern int errno;
-
-extern char *malloc(), *calloc();
-extern time_t time();
-
-/* Canonicalize a principal name */
-/* If instance is missing, it becomes "" */
-/* If realm is missing, it becomes the local realm */
-/* Canonicalized form is put in canon, which must be big enough to hold
-   MAX_PRINCIPAL_SIZE characters */
-acl_canonicalize_principal(principal, canon)
-char *principal;
-char *canon;
-{
-    char *dot, *atsign, *end;
-    int len;
-
-    dot = index(principal, INST_SEP);
-    atsign = index(principal, REALM_SEP);
-
-    /* Maybe we're done already */
-    if(dot != NULL && atsign != NULL) {
-	if(dot < atsign) {
-	    /* It's for real */
-	    /* Copy into canon */
-	    strncpy(canon, principal, MAX_PRINCIPAL_SIZE);
-	    canon[MAX_PRINCIPAL_SIZE-1] = '\0';
-	    return;
-	} else {
-	    /* Nope, it's part of the realm */
-	    dot = NULL;
-	}
-    }
-
-    /* No such luck */
-    end = principal + strlen(principal);
-
-    /* Get the principal name */
-    len = MIN(ANAME_SZ, COR(dot, COR(atsign, end)) - principal);
-    strncpy(canon, principal, len);
-    canon += len;
-
-    /* Add INST_SEP */
-    *canon++ = INST_SEP;
-
-    /* Get the instance, if it exists */
-    if(dot != NULL) {
-	++dot;
-	len = MIN(INST_SZ, COR(atsign, end) - dot);
-	strncpy(canon, dot, len);
-	canon += len;
-    }
-
-    /* Add REALM_SEP */
-    *canon++ = REALM_SEP;
-
-    /* Get the realm, if it exists */
-    /* Otherwise, default to local realm */
-    if(atsign != NULL) {
-	++atsign;
-	len = MIN(REALM_SZ, end - atsign);
-	strncpy(canon, atsign, len);
-	canon += len;
-	*canon++ = '\0';
-    } else if(krb_get_lrealm(canon, 1) != KSUCCESS) {
-	strcpy(canon, KRB_REALM);
-    }
-}
-
-/* Get a lock to modify acl_file */
-/* Return new FILE pointer */
-/* or NULL if file cannot be modified */
-/* REQUIRES WRITE PERMISSION TO CONTAINING DIRECTORY */
-static FILE *acl_lock_file(acl_file)
-char *acl_file;
-{
-    struct stat s;
-    char new[LINESIZE];
-    int nfd;
-    FILE *nf;
-    int mode;
-
-    if(stat(acl_file, &s) < 0) return(NULL);
-    mode = s.st_mode;
-    sprintf(new, NEW_FILE, acl_file);
-    for(;;) {
-	/* Open the new file */
-	if((nfd = open(new, O_WRONLY|O_CREAT|O_EXCL, mode)) < 0) {
-	    if(errno == EEXIST) {
-		/* Maybe somebody got here already, maybe it's just old */
-		if(stat(new, &s) < 0) return(NULL);
-		if(time(0) - s.st_ctime > WAIT_TIME) {
-		    /* File is stale, kill it */
-		    unlink(new);
-		    continue;
-		} else {
-		    /* Wait and try again */
-		    sleep(1);
-		    continue;
-		}
-	    } else {
-		/* Some other error, we lose */
-		return(NULL);
-	    }
-	}
-
-	/* If we got to here, the lock file is ours and ok */
-	/* Reopen it under stdio */
-	if((nf = fdopen(nfd, "w")) == NULL) {
-	    /* Oops, clean up */
-	    unlink(new);
-	}
-	return(nf);
-    }
-}
-
-/* Commit changes to acl_file written onto FILE *f */
-/* Returns zero if successful */
-/* Returns > 0 if lock was broken */
-/* Returns < 0 if some other error occurs */
-/* Closes f */
-static int acl_commit(acl_file, f)
-char *acl_file;
-FILE *f;
-{
-    char new[LINESIZE];
-    int ret;
-    struct stat s;
-
-    sprintf(new, NEW_FILE, acl_file);
-    if(fflush(f) < 0
-       || fstat(fileno(f), &s) < 0
-       || s.st_nlink == 0) {
-	acl_abort(acl_file, f);
-	return(-1);
-    }
-
-    ret = rename(new, acl_file);
-    fclose(f);
-    return(ret);
-}
-
-/*
- * Abort changes to acl_file written onto FILE *f
- * Returns 0 if successful, < 0 otherwise
- * Closes f
- */
-static int
-acl_abort(acl_file, f)
-char	*acl_file;
-FILE	*f;
-{
-	char		new[LINESIZE];
-	int		ret;
-	struct stat	s;
-
-	/* make sure we aren't nuking someone else's file */
-	if(fstat(fileno(f), &s) < 0 || s.st_nlink == 0) {
-		fclose(f);
-		return(-1);
-	} else {
-		sprintf(new, NEW_FILE, acl_file);
-		ret = unlink(new);
-		fclose(f);
-		return(ret);
-       }
-}
-
-/* Initialize an acl_file */
-/* Creates the file with permissions perm if it does not exist */
-/* Erases it if it does */
-/* Returns return value of acl_commit */
-int acl_initialize(acl_file, perm)
-char *acl_file;
-int perm;
-{
-    FILE *new;
-    int fd;
-
-    /* Check if the file exists already */
-    if((new = acl_lock_file(acl_file)) != NULL) {
-	return(acl_commit(acl_file, new));
-    } else {
-	/* File must be readable and writable by owner */
-	if((fd = open(acl_file, O_CREAT|O_EXCL, perm|0600)) < 0) {
-	    return(-1);
-	} else {
-	    close(fd);
-	    return(0);
-	}
-    }
-}
-
-/* Eliminate all whitespace character in buf */
-/* Modifies its argument */
-static nuke_whitespace(buf)
-char *buf;
-{
-    register char *pin, *pout;
-
-    for(pin = pout = buf; *pin != '\0'; pin++)
-	if(!isspace(*pin)) *pout++ = *pin;
-    *pout = '\0';		/* Terminate the string */
-}
-
-/* Hash table stuff */
-
-struct hashtbl {
-    int size;			/* Max number of entries */
-    int entries;		/* Actual number of entries */
-    char **tbl;			/* Pointer to start of table */
-};
-
-/* Make an empty hash table of size s */
-static struct hashtbl *make_hash(size)
-int size;
-{
-    struct hashtbl *h;
-
-    if(size < 1) size = 1;
-    h = (struct hashtbl *) malloc(sizeof(struct hashtbl));
-    h->size = size;
-    h->entries = 0;
-    h->tbl = (char **) calloc(size, sizeof(char *));
-    return(h);
-}
-
-/* Destroy a hash table */
-static destroy_hash(h)
-struct hashtbl *h;
-{
-    int i;
-
-    for(i = 0; i < h->size; i++) {
-	if(h->tbl[i] != NULL) free(h->tbl[i]);
-    }
-    free(h->tbl);
-    free(h);
-}
-
-/* Compute hash value for a string */
-static unsigned hashval(s)
-register char *s;
-{
-    register unsigned hv;
-
-    for(hv = 0; *s != '\0'; s++) {
-	hv ^= ((hv << 3) ^ *s);
-    }
-    return(hv);
-}
-
-/* Add an element to a hash table */
-static add_hash(h, el)
-struct hashtbl *h;
-char *el;
-{
-    unsigned hv;
-    char *s;
-    char **old;
-    int i;
-
-    /* Make space if it isn't there already */
-    if(h->entries + 1 > (h->size >> 1)) {
-	old = h->tbl;
-	h->tbl = (char **) calloc(h->size << 1, sizeof(char *));
-	for(i = 0; i < h->size; i++) {
-	    if(old[i] != NULL) {
-		hv = hashval(old[i]) % (h->size << 1);
-		while(h->tbl[hv] != NULL) hv = (hv+1) % (h->size << 1);
-		h->tbl[hv] = old[i];
-	    }
-	}
-	h->size = h->size << 1;
-	free(old);
-    }
-
-    hv = hashval(el) % h->size;
-    while(h->tbl[hv] != NULL && strcmp(h->tbl[hv], el)) hv = (hv+1) % h->size;
-    s = malloc(strlen(el)+1);
-    strcpy(s, el);
-    h->tbl[hv] = s;
-    h->entries++;
-}
-
-/* Returns nonzero if el is in h */
-static check_hash(h, el)
-struct hashtbl *h;
-char *el;
-{
-    unsigned hv;
-
-    for(hv = hashval(el) % h->size;
-	h->tbl[hv] != NULL;
-	hv = (hv + 1) % h->size) {
-	    if(!strcmp(h->tbl[hv], el)) return(1);
-	}
-    return(0);
-}
-
-struct acl {
-    char filename[LINESIZE];	/* Name of acl file */
-    int fd;			/* File descriptor for acl file */
-    struct stat status;		/* File status at last read */
-    struct hashtbl *acl;	/* Acl entries */
-};
-
-static struct acl acl_cache[CACHED_ACLS];
-
-static int acl_cache_count = 0;
-static int acl_cache_next = 0;
-
-/* Returns < 0 if unsuccessful in loading acl */
-/* Returns index into acl_cache otherwise */
-/* Note that if acl is already loaded, this is just a lookup */
-static int acl_load(name)
-char *name;
-{
-    int i;
-    FILE *f;
-    struct stat s;
-    char buf[MAX_PRINCIPAL_SIZE];
-    char canon[MAX_PRINCIPAL_SIZE];
-
-    /* See if it's there already */
-    for(i = 0; i < acl_cache_count; i++) {
-	if(!strcmp(acl_cache[i].filename, name)
-	   && acl_cache[i].fd >= 0) goto got_it;
-    }
-
-    /* It isn't, load it in */
-    /* maybe there's still room */
-    if(acl_cache_count < CACHED_ACLS) {
-	i = acl_cache_count++;
-    } else {
-	/* No room, clean one out */
-	i = acl_cache_next;
-	acl_cache_next = (acl_cache_next + 1) % CACHED_ACLS;
-	close(acl_cache[i].fd);
-	if(acl_cache[i].acl) {
-	    destroy_hash(acl_cache[i].acl);
-	    acl_cache[i].acl = (struct hashtbl *) 0;
-	}
-    }
-
-    /* Set up the acl */
-    strcpy(acl_cache[i].filename, name);
-    if((acl_cache[i].fd = open(name, O_RDONLY, 0)) < 0) return(-1);
-    /* Force reload */
-    acl_cache[i].acl = (struct hashtbl *) 0;
-
- got_it:
-    /*
-     * See if the stat matches
-     *
-     * Use stat(), not fstat(), as the file may have been re-created by
-     * acl_add or acl_delete.  If this happens, the old inode will have
-     * no changes in the mod-time and the following test will fail.
-     */
-    if(stat(acl_cache[i].filename, &s) < 0) return(-1);
-    if(acl_cache[i].acl == (struct hashtbl *) 0
-       || s.st_nlink != acl_cache[i].status.st_nlink
-       || s.st_mtime != acl_cache[i].status.st_mtime
-       || s.st_ctime != acl_cache[i].status.st_ctime) {
-	   /* Gotta reload */
-	   if(acl_cache[i].fd >= 0) close(acl_cache[i].fd);
-	   if((acl_cache[i].fd = open(name, O_RDONLY, 0)) < 0) return(-1);
-	   if((f = fdopen(acl_cache[i].fd, "r")) == NULL) return(-1);
-	   if(acl_cache[i].acl) destroy_hash(acl_cache[i].acl);
-	   acl_cache[i].acl = make_hash(ACL_LEN);
-	   while(fgets(buf, sizeof(buf), f) != NULL) {
-	       nuke_whitespace(buf);
-	       acl_canonicalize_principal(buf, canon);
-	       add_hash(acl_cache[i].acl, canon);
-	   }
-	   fclose(f);
-	   acl_cache[i].status = s;
-       }
-    return(i);
-}
-
-/* Returns nonzero if it can be determined that acl contains principal */
-/* Principal is not canonicalized, and no wildcarding is done */
-acl_exact_match(acl, principal)
-char *acl;
-char *principal;
-{
-    int idx;
-
-    return((idx = acl_load(acl)) >= 0
-	   && check_hash(acl_cache[idx].acl, principal));
-}
-
-/* Returns nonzero if it can be determined that acl contains principal */
-/* Recognizes wildcards in acl of the form
-   name.*@realm, *.*@realm, and *.*@* */
-acl_check(acl, principal)
-char *acl;
-char *principal;
-{
-    char buf[MAX_PRINCIPAL_SIZE];
-    char canon[MAX_PRINCIPAL_SIZE];
-    char *realm;
-
-    acl_canonicalize_principal(principal, canon);
-
-    /* Is it there? */
-    if(acl_exact_match(acl, canon)) return(1);
-
-    /* Try the wildcards */
-    realm = index(canon, REALM_SEP);
-    *index(canon, INST_SEP) = '\0';	/* Chuck the instance */
-
-    sprintf(buf, "%s.*%s", canon, realm);
-    if(acl_exact_match(acl, buf)) return(1);
-
-    sprintf(buf, "*.*%s", realm);
-    if(acl_exact_match(acl, buf) || acl_exact_match(acl, "*.*@*")) return(1);
-
-    return(0);
-}
-
-/* Adds principal to acl */
-/* Wildcards are interpreted literally */
-acl_add(acl, principal)
-char *acl;
-char *principal;
-{
-    int idx;
-    int i;
-    FILE *new;
-    char canon[MAX_PRINCIPAL_SIZE];
-
-    acl_canonicalize_principal(principal, canon);
-
-    if((new = acl_lock_file(acl)) == NULL) return(-1);
-    if((acl_exact_match(acl, canon))
-       || (idx = acl_load(acl)) < 0) {
-	   acl_abort(acl, new);
-	   return(-1);
-       }
-    /* It isn't there yet, copy the file and put it in */
-    for(i = 0; i < acl_cache[idx].acl->size; i++) {
-	if(acl_cache[idx].acl->tbl[i] != NULL) {
-	    if(fputs(acl_cache[idx].acl->tbl[i], new) == NULL
-	       || putc('\n', new) != '\n') {
-		   acl_abort(acl, new);
-		   return(-1);
-	       }
-	}
-    }
-    fputs(canon, new);
-    putc('\n', new);
-    return(acl_commit(acl, new));
-}
-
-/* Removes principal from acl */
-/* Wildcards are interpreted literally */
-acl_delete(acl, principal)
-char *acl;
-char *principal;
-{
-    int idx;
-    int i;
-    FILE *new;
-    char canon[MAX_PRINCIPAL_SIZE];
-
-    acl_canonicalize_principal(principal, canon);
-
-    if((new = acl_lock_file(acl)) == NULL) return(-1);
-    if((!acl_exact_match(acl, canon))
-       || (idx = acl_load(acl)) < 0) {
-	   acl_abort(acl, new);
-	   return(-1);
-       }
-    /* It isn't there yet, copy the file and put it in */
-    for(i = 0; i < acl_cache[idx].acl->size; i++) {
-	if(acl_cache[idx].acl->tbl[i] != NULL
-	   && strcmp(acl_cache[idx].acl->tbl[i], canon)) {
-	       fputs(acl_cache[idx].acl->tbl[i], new);
-	       putc('\n', new);
-	}
-    }
-    return(acl_commit(acl, new));
-}
-
@@ -1,107 +0,0 @@
-PROTOTYPE ACL LIBRARY
-
-Introduction
-	
-An access control list (ACL) is a list of principals, where each
-principal is is represented by a text string which cannot contain
-whitespace.  The library allows application programs to refer to named
-access control lists to test membership and to atomically add and
-delete principals using a natural and intuitive interface.  At
-present, the names of access control lists are required to be Unix
-filenames, and refer to human-readable Unix files; in the future, when
-a networked ACL server is implemented, the names may refer to a
-different namespace specific to the ACL service.
-
-
-Usage
-
-cc <files> -lacl -lkrb.
-
-
-
-Principal Names
-
-Principal names have the form
-
-<name>[.<instance>][@<realm>]
-
-e.g.
-
-asp
-asp.root
-[email protected]
-[email protected]
-[email protected]
-
-It is possible for principals to be underspecified.  If instance is
-missing, it is assumed to be "".  If realm is missing, it is assumed
-to be local_realm.  The canonical form contains all of name, instance,
-and realm; the acl_add and acl_delete routines will always
-leave the file in that form.  Note that the canonical form of
-[email protected] is actually [email protected].
-
-
-Routines
-
-acl_canonicalize_principal(principal, buf)
-char *principal;
-char *buf;  	/*RETVAL*/
-
-Store the canonical form of principal in buf.  Buf must contain enough
-space to store a principal, given the limits on the sizes of name,
-instance, and realm specified in /usr/include/krb.h.
-
-acl_check(acl, principal)
-char *acl;
-char *principal;
-
-Returns nonzero if principal appears in acl.  Returns 0 if principal
-does not appear in acl, or if an error occurs.  Canonicalizes
-principal before checking, and allows the ACL to contain wildcards.
-
-acl_exact_match(acl, principal)
-char *acl;
-char *principal;
-
-Like acl_check, but does no canonicalization or wildcarding.
-
-acl_add(acl, principal)
-char *acl;
-char *principal;
-
-Atomically adds principal to acl.  Returns 0 if successful, nonzero
-otherwise.  It is considered a failure if principal is already in acl.
-This routine will canonicalize principal, but will treat wildcards
-literally.
-
-acl_delete(acl, principal)
-char *acl;
-char *principal;
-
-Atomically deletes principal from acl.  Returns 0 if successful,
-nonzero otherwise.  It is consider a failure if principal is not
-already in acl.  This routine will canonicalize principal, but will
-treat wildcards literally.
-
-acl_initialize(acl, mode)
-char *acl;
-int mode;
-
-Initialize acl.  If acl file does not exist, creates it with mode
-mode.  If acl exists, removes all members.  Returns 0 if successful,
-nonzero otherwise.  WARNING: Mode argument is likely to change with
-the eventual introduction of an ACL service.  
-
-
-Known problems
-
-In the presence of concurrency, there is a very small chance that
-acl_add or acl_delete could report success even though it would have
-had no effect.  This is a necessary side effect of using lock files
-for concurrency control rather than flock(2), which is not supported
-by NFS.
-
-The current implementation caches ACLs in memory in a hash-table
-format for increased efficiency in checking membership; one effect of
-the caching scheme is that one file descriptor will be kept open for
-each ACL cached, up to a maximum of 8.
@@ -1,15 +0,0 @@
-#	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.2 1994/07/19 19:21:23 g89r4222 Exp $
-
-PROG=	compile_et
-CFLAGS+=-I. -I${.CURDIR}
-SRCS=	compile_et.c error_message.c et_name.c init_et.c perror.c
-OBJS+=	error_table.o
-DPADD=	${LIBL}
-LDADD=	-ll
-CLEANFILES=et_lex.lex.c y.tab.c y.tab.h error_table.c
-NOMAN=	noman
-
-error_table.c: et_lex.lex.c
-
-.include <bsd.prog.mk>
@@ -1,172 +0,0 @@
-/*
- *
- * Copyright 1986, 1987 by MIT Student Information Processing Board
- * For copyright info, see "Copyright.SIPB".
- *
- *	$Id: compile_et.c,v 1.2 1994/07/19 19:21:24 g89r4222 Exp $
- */
-
-#include <stdio.h>
-#include <sys/file.h>
-#include <strings.h>
-#include <sys/param.h>
-
-static char copyright[] = "Copyright 1987 by MIT Student Information Processing Board";
-
-extern char *gensym();
-extern char *current_token;
-extern int table_number, current;
-char buffer[BUFSIZ];
-char *table_name = (char *)NULL;
-FILE *hfile, *cfile;
-     
-/* C library */
-extern char *malloc();
-extern int errno;
-     
-/* lex stuff */
-extern FILE *yyin;
-extern int yylineno;
-     
-/* pathnames */
-char c_file[MAXPATHLEN];	/* temporary file */
-char h_file[MAXPATHLEN];	/* output */
-char o_file[MAXPATHLEN];	/* output */
-char et_file[MAXPATHLEN];	/* input */
-
-main(argc, argv)
-     int argc;
-     char **argv;
-{
-     register char *p;
-     int n_flag = 0, debug = 0;
-     
-     while (argc > 2) {
-	  register char *arg, ch;
-	  arg = argv[--argc];
-	  if (strlen(arg) != 2 || arg[0] != '-')
-	       goto usage;
-	  ch = arg[1];
-	  if (ch == 'n')
-	       n_flag++;
-	  else if (ch == 'd')
-	       debug++;
-	  else
-	       goto usage;
-     }
-
-     if (argc != 2) {
-     usage:
-	  fprintf(stderr, "Usage:  %s et_file [-n]\n", argv[0]);
-	  exit(1);
-     }
-     
-     strcpy(et_file, argv[1]);
-     p = rindex(et_file, '/');
-     if (p == (char *)NULL)
-	  p = et_file;
-     else
-	  p++;
-     p = rindex(p, '.');
-     if (!strcmp(p, ".et"))
-	  *++p = '\0';
-     else {
-	  if (!p)
-	       p = et_file;
-	  while (*p)
-	       p++;
-	  *p++ = '.';
-	  *p = '\0';
-     }
-     /* p points at null where suffix should be */
-     strcpy(p, "et.c");
-     strcpy(c_file, et_file);
-     p[0] = 'h';
-     p[1] = '\0';
-     strcpy(h_file, et_file);
-     p[0] = 'o';
-     strcpy(o_file, et_file);
-     p[0] = 'e';
-     p[1] = 't';
-     p[2] = '\0';
-
-     yyin = fopen(et_file, "r");
-     if (!yyin) {
-	  perror(et_file);
-	  exit(1);
-     }
-     
-     hfile = fopen(h_file, "w");
-     if (hfile == (FILE *)NULL) {
-	  perror(h_file);
-	  exit(1);
-     }
-     
-     cfile = fopen(c_file, "w");
-     if (cfile == (FILE *)NULL) {
-	  perror("Can't open temp file");
-	  exit(1);
-     }
-     
-     /* parse it */
-     fputs("#define NULL 0\n", cfile);
-     fputs("static char *_et[] = {\n", cfile);
-     
-     yyparse();
-     fclose(yyin);		/* bye bye input file */
-     
-     fputs("\t(char *)0\n};\n", cfile);
-     fputs("extern int init_error_table();\n\n", cfile);
-     fprintf(cfile, "int %s_err_base = %d;\n\n", table_name, table_number);
-     fprintf(cfile, "int\ninit_%s_err_tbl()\n", table_name);
-     fprintf(cfile, "{\n\treturn(init_error_table(_et, %d, %d));\n}\n",
-	     table_number, current);
-     fclose(cfile);
-     
-     fputs("extern int init_", hfile);
-     fputs(table_name, hfile);
-     fputs("_err_tbl();\nextern int ", hfile);
-     fputs(table_name, hfile);
-     fputs("_err_base;\n", hfile);
-     fclose(hfile);		/* bye bye hfile */
-     
-     if (n_flag)
-	  exit(0);
-
-     if (!fork()) {
-	  p = rindex(c_file, '/');
-	  if (p) {
-	       *p++ = '\0';
-	       chdir(c_file);
-	  }
-	  else
-	       p = c_file;
-	  execlp("cc", "cc", "-c", "-R", "-O", p, 0);
-	  perror("cc");
-	  exit(1);
-     }
-     else wait(0);
-
-     if (!debug)
-	  (void) unlink(c_file);
-     /* make it .o file name */
-     c_file[strlen(c_file)-1] = 'o';
-     if (!fork()) {
-	  execlp("cp", "cp", c_file, o_file, 0);
-	  perror("cp");
-	  exit(1);
-     }
-     else wait(0);
-     if (!debug)
-	  (void) unlink(c_file);
-
-     exit(0);
-}
-
-yyerror(s)
-     char *s;
-{
-     fputs(s, stderr);
-     fprintf(stderr, "\nLine number %d; last token was '%s'\n",
-	     yylineno, current_token);
-}
@@ -1,77 +0,0 @@
-/*
- * Copyright 1987 by the Student Information Processing Board
- * of the Massachusetts Institute of Technology
- * For copyright info, see "Copyright.SIPB".
- *
- *	from: error_message.c,v 1.1 86/11/10 21:34:34 spook Exp $
- *	$Id: error_message.c,v 1.3 1994/09/09 21:43:22 g89r4222 Exp $
- */
-
-#include <stdio.h>
-#include "error_table.h"
-extern int sys_nerr;
-
-static char buffer[25];
-
-char *
-error_message(code)
-     int code;
-{
-     register int offset;
-     register error_table **et;
-     register int table_num;
-     register int div;
-     register char *cp;
-
-     offset = code & ((1<<ERRCODE_RANGE)-1);
-     table_num = code - offset;
-     if ((_et_list == (error_table **)NULL) && table_num)
-	  goto oops;
-     if (!table_num) {
-	  if (offset < sys_nerr)
-	       return(sys_errlist[offset]);
-	  else
-	       goto oops;
-     }
-     for (et = _et_list; *et != (error_table *)NULL; et++) {
-	  if ((*et)->base == table_num) {
-	       /* This is the right table */
-	       if ((*et)->n_msgs <= offset)
-		    goto oops;
-	       return((*et)->msgs[offset]);
-	  }
-     }
- oops:
-     cp = buffer;
-     {
-	  register char *cp1;
-	  for (cp1 = "Unknown code "; *cp1; cp1++, cp++)
-	       *cp = *cp1;
-	  if (table_num) {
-	       for (cp1 = error_table_name(table_num); *cp1; cp1++, cp++)
-		    *cp = *cp1;
-	       *cp++ = ' ';
-	       *cp = '\0';
-	  }
-     }
-     div = 1000000000;
-     if (offset == 0) {
-	  *cp++ = '0';
-	  *cp = '\0';
-	  return(buffer);
-     }
-     while (div > offset)
-	  div /= 10;
-     do {
-	  register int n = offset / div;
-	  *cp++ = '0' + n;
-	  offset -= n * div;
-	  div /= 10;
-     } while (offset && div);
-     while (div) {
-	  *cp++ = '0';
-	  div /= 10;
-     }
-     *cp = '\0';
-     return(buffer);
-}
@@ -1,17 +0,0 @@
-#ifndef _ET
-extern int errno;
-typedef struct {
-	char	**msgs;
-	int	base;
-	int	n_msgs;
-} error_table;
-extern error_table **_et_list;
-
-#define	ERROR_CODE	"int"	/* type used for error codes */
-
-#define	ERRCODE_RANGE	8	/* # of bits to shift table number */
-#define	BITS_PER_CHAR	6	/* # bits to shift per character in name */
-
-extern char *error_table_name();
-#define _ET
-#endif
@@ -1,205 +0,0 @@
-%{
-#include <stdio.h>
-char *str_concat(), *ds(), *quote(), *malloc(), *realloc();
-char *current_token = (char *)NULL;
-extern char *table_name;
-%}
-%union {
-	char *dynstr;
-}
-
-%token ERROR_TABLE ERROR_CODE_ENTRY END
-%token <dynstr> STRING QUOTED_STRING
-%type <dynstr> ec_name description table_id
-%{
-%}
-%start error_table
-%%
-
-error_table	:	ERROR_TABLE table_id error_codes END
-			{ table_name = ds($2);
-			  current_token = table_name;
-			  put_ecs(); }
-		;
-
-table_id	:	STRING
-			{ current_token = $1;
-			  set_table_num($1);
-			  $$ = $1; }
-		;
-
-error_codes	:	error_codes ec_entry
-		|	ec_entry
-		;
-
-ec_entry	:	ERROR_CODE_ENTRY ec_name ',' description
-			{ add_ec($2, $4);
-			  free($2);
-			  free($4); }
-		|	ERROR_CODE_ENTRY ec_name '=' STRING ',' description
-			{ add_ec_val($2, $4, $6);
-			  free($2);
-			  free($4);
-			  free($6);
-			}
-		;
-
-ec_name		:	STRING
-			{ $$ = ds($1);
-			  current_token = $$; }
-		;
-
-description	:	QUOTED_STRING
-			{ $$ = ds($1);
-			  current_token = $$; }
-		;
-
-%%
-/*
- * Copyright 1986, 1987 by the MIT Student Information Processing Board
- * For copyright info, see Copyright.SIPB.
- */
-
-#include <stdlib.h>
-#include <strings.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include "error_table.h"
-
-extern FILE *hfile, *cfile;
-
-static long gensym_n = 0;
-char *
-gensym(x)
-	char *x;
-{
-	char *symbol;
-	if (!gensym_n) {
-		struct timeval tv;
-		struct timezone tzp;
-		gettimeofday(&tv, &tzp);
-		gensym_n = (tv.tv_sec%10000)*100 + tv.tv_usec/10000;
-	}
-	symbol = malloc(32 * sizeof(char));
-	gensym_n++;
-	sprintf(symbol, "et%ld", gensym_n);
-	return(symbol);
-}
-
-char *
-ds(string)
-	char *string;
-{
-	char *rv;
-	rv = malloc(strlen(string)+1);
-	strcpy(rv, string);
-	return(rv);
-}
-
-char *
-quote(string)
-	char *string;
-{
-	char *rv;
-	rv = malloc(strlen(string)+3);
-	strcpy(rv, "\"");
-	strcat(rv, string);
-	strcat(rv, "\"");
-	return(rv);
-}
-
-int table_number;
-int current = 0;
-char **error_codes = (char **)NULL;
-
-add_ec(name, description)
-	char *name, *description;
-{
-	fprintf(cfile, "\t\"%s\",\n", description);
-	if (error_codes == (char **)NULL) {
-		error_codes = (char **)malloc(sizeof(char *));
-		*error_codes = (char *)NULL;
-	}
-	error_codes = (char **)realloc((char *)error_codes,
-				       (current + 2)*sizeof(char *));
-	error_codes[current++] = ds(name);
-	error_codes[current] = (char *)NULL;
-}
-
-add_ec_val(name, val, description)
-	char *name, *val, *description;
-{
-	int ncurrent = atoi(val);
-	if (ncurrent < current) {
-		printf("Error code %s (%d) out of order", name,
-		       current);
-		return;
-	}
-      
-	while (ncurrent > current)
-	     fputs("\t(char *)NULL,\n", cfile), current++;
-	
-	fprintf(cfile, "\t\"%s\",\n", description);
-	if (error_codes == (char **)NULL) {
-		error_codes = (char **)malloc(sizeof(char *));
-		*error_codes = (char *)NULL;
-	}
-	error_codes = (char **)realloc((char *)error_codes,
-				       (current + 2)*sizeof(char *));
-	error_codes[current++] = ds(name);
-	error_codes[current] = (char *)NULL;
-} 
-
-put_ecs()
-{
-	int i;
-	for (i = 0; i < current; i++) {
-	     if (error_codes[i] != (char *)NULL)
-		  fprintf(hfile, "#define %-40s ((%s)%d)\n",
-			  error_codes[i], ERROR_CODE, table_number + i);
-	}
-}
-
-/*
- * char_to_num -- maps letters and numbers into a small numbering space
- * 	uppercase ->  1-26
- *	lowercase -> 27-52
- *	digits    -> 53-62
- *	underscore-> 63
- */
-int
-char_to_num(c)
-	char c;
-{
-	if (isupper(c))
-		return(c-'A'+1);
-	else if (islower(c))
-		return(c-'a'+27);
-	else if (isdigit(c))
-		return(c-'0'+53);
-	else {
-		fprintf(stderr, "Illegal character in name: %c\n", c);
-		exit(1);
-		/*NOTREACHED*/
-	}
-}
-
-set_table_num(string)
-	char *string;
-{
-	if (strlen(string) > 4) {
-		fprintf(stderr, "Table name %s too long, truncated ",
-			string);
-		string[4] = '\0';
-		fprintf(stderr, "to %s\n", string);
-	}
-	while (*string != '\0') {
-		table_number = (table_number << BITS_PER_CHAR)
-			+ char_to_num(*string);
-		string++;
-	}
-	table_number = table_number << ERRCODE_RANGE;
-}
-
-#include "et_lex.lex.c"
@@ -1,29 +0,0 @@
-%{
-extern int yylineno;
-int yylineno = 1;
-%}
-
-PC	[^\"\n]
-AN	[A-Z_a-z0-9]
-%%
-
-error_table	return ERROR_TABLE;
-et		return ERROR_TABLE;
-error_code	return ERROR_CODE_ENTRY;
-ec		return ERROR_CODE_ENTRY;
-end		return END;
-
-[\t ]+			;
-\n		++yylineno;
-
-\"{PC}*\"	{ register char *p; yylval.dynstr = ds(yytext+1);
-		  if (p=rindex(yylval.dynstr, '"')) *p='\0';
-		  return QUOTED_STRING;
-		}
-
-{AN}*	{ yylval.dynstr = ds(yytext); return STRING; }
-
-#.*\n		++yylineno;
-
-.		{ return (*yytext); }
-%%
@@ -1,44 +0,0 @@
-/*
- * Copyright 1987 by MIT Student Information Processing Board
- * For copyright info, see Copyright.SIPB.
- *
- *	$Id: et_name.c,v 1.2 1994/07/19 19:21:27 g89r4222 Exp $
- */
-
-#include "error_table.h"
-
-static char copyright[] = "Copyright 1987 by MIT Student Information Processing Board";
-
-char *malloc();
-
-char *
-error_table_name(num)
-	int num;
-{
-	register int ch;
-	register int i;
-	register char *buf, *p;
-
-	/* num = aa aaa abb bbb bcc ccc cdd ddd d?? ??? ??? */
-	buf = malloc(5);
-	p = buf;
-	num >>= ERRCODE_RANGE;
-	/* num = ?? ??? ??? aaa aaa bbb bbb ccc ccc ddd ddd */
-	num &= 077777777;
-	/* num = 00 000 000 aaa aaa bbb bbb ccc ccc ddd ddd */
-	for (i = 0; i < 5; i++) {
-		ch = (num >> 24-6*i) & 077;
-		if (ch == 0)
-			continue;
-		else if (ch < 27)
-			*p++ = ch - 1 + 'A';
-		else if (ch < 53)
-			*p++ = ch - 27 + 'a';
-		else if (ch < 63)
-			*p++ = ch - 53 + '0';
-		else		/* ch == 63 */
-			*p++ = '_';
-	}
-	return(buf);
-}
-
@@ -1,67 +0,0 @@
-/*
- * Copyright 1986 by MIT Information Systems and
- *	MIT Student Information Processing Board
- * For copyright info, see Copyright.SIPB.
- *
- *	form: init_et.c,v 1.1 86/11/10 21:42:26 spook Exp $
- *	$Id: init_et.c,v 1.2 1994/07/19 19:21:28 g89r4222 Exp $
- */
-
-#include <stdio.h>
-#include "error_table.h"
-
-static char copyright[] = "Copyright 1987 by MIT Student Information Processing Board";
-
-extern char *malloc(), *realloc();
-
-/* useful */
-typedef error_table *etp;
-typedef etp *etpp;
-
-etpp _et_list = (etpp)NULL;
-static int n_allocated = 0, n_used = 0;
-
-int
-init_error_table(msgs, base, count)
-	char **msgs;
-	register int base;
-	int count;
-{
-	register int i;
-	register etp new_et;
-	register etpp list;
-
-	if (!base || !count || !msgs)
-		return;
-
-	new_et = (etp)malloc(sizeof(error_table));
-	new_et->msgs = msgs;
-	new_et->base = base;
-	new_et->n_msgs= count;
-
-	list = _et_list;
-	if (list == (etpp)NULL) {
-		_et_list = (etpp) malloc(10*sizeof(etp));
-		list = _et_list;
-		if (list == (etpp)NULL)
-			return;	/* oops */
-		list[0] = new_et;
-		list[1] = (etp)NULL;
-		n_allocated = 10;
-		n_used = 1;
-		return;
-	}
-	for (i = 0; i < n_used; i++)
-		if (list[i]->base == base)
-			return;	/* avoid duplicates */
-	if (n_used+2 > n_allocated) {
-		n_allocated += 10; /* don't re-allocate too often */
-		list = (etpp) realloc((char *)list,
-				      (unsigned)n_allocated * sizeof(etp));
-		_et_list = list;
-		if (list == (etpp)NULL)
-			return;	/* oops */
-	}
-	list[n_used++] = new_et;
-	list[n_used] = (etp)NULL;
-}
@@ -1,76 +0,0 @@
-/*
- * Copyright 1987 by MIT Student Information Processing Board
- * For copyright info, see Copyright.SIPB
- *
- *	$Id: perror.c,v 1.2 1994/07/19 19:21:30 g89r4222 Exp $
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include "error_table.h"
-
-typedef int (*int_func)();
-
-#if defined(mips) && defined(ultrix)
-int errno;		/* this is needed to keep the loader from complaining */
-#endif
-
-int_func com_err_hook = (int_func) NULL;
-char *error_message();
-
-void
-com_err(whoami, code, message)
-	char *whoami;
-	int code;
-	char *message;
-{
-	struct iovec strings[6];
-
-	if (com_err_hook) {
-		(*com_err_hook)(whoami, code, message);
-		return;
-	}
-
-	strings[0].iov_base = whoami;
-	strings[0].iov_len = strlen(whoami);
-	if (whoami) {
-		strings[1].iov_base = ": ";
-		strings[1].iov_len = 2;
-	} else
-		strings[1].iov_len = 0;
-	if (code) {
-		register char *errmsg = error_message(code);
-		strings[2].iov_base = errmsg;
-		strings[2].iov_len = strlen(errmsg);
-	} else
-		strings[2].iov_len = 0;
-	strings[3].iov_base = " ";
-	strings[3].iov_len = 1;
-	strings[4].iov_base = message;
-	strings[4].iov_len = strlen(message);
-	strings[5].iov_base = "\n";
-	strings[5].iov_len = 1;
-	(void) writev(2, strings, 6);
-}
-
-int_func
-set_com_err_hook(new_proc)
-	int_func new_proc;
-{
-	register int_func x = com_err_hook;
-	com_err_hook = new_proc;
-	return (x);
-}
-
-reset_com_err_hook()
-{
-	com_err_hook = (int_func) NULL;
-}
-
-void
-perror(msg)
-	register const char *msg;
-{
-	com_err(msg, errno, (char *)NULL);
-}
@@ -1,43 +0,0 @@
-#include <stdio.h>
-#include <errno.h>
-#include "test1.h"
-#include "test2.h"
-char *error_message();
-extern int sys_nerr, errno;
-
-main()
-{
-	printf("\nBefore initiating error table:\n\n");
-	printf("Table name '%s'\n", error_table_name(KRB_MK_AP_TGTEXP));
-	printf("UNIX  name '%s'\n", error_table_name(EPERM));
-	printf("Msg TGT-expired is '%s'\n", error_message(KRB_MK_AP_TGTEXP));
-	printf("Msg EPERM is '%s'\n", error_message(EPERM));
-	printf("Msg FOO_ERR is '%s'\n", error_message(FOO_ERR));
-	printf("Msg {sys_nerr-1} is '%s'\n", error_message(sys_nerr-1));
-	printf("Msg {sys_nerr} is '%s'\n", error_message(sys_nerr));
-
-	init_error_table(0, 0, 0);
-	printf("With 0: tgt-expired -> %s\n", error_message(KRB_MK_AP_TGTEXP));
-
-	init_krb_err_tbl();
-	printf("KRB error table initialized:  base %d (%s), name %s\n",
-	       krb_err_base, error_message(krb_err_base),
-	       error_table_name(krb_err_base));
-	printf("With krb: tgt-expired -> %s\n",
-	       error_message(KRB_MK_AP_TGTEXP));
-
-	init_quux_err_tbl();
-	printf("QUUX error table initialized: base %d (%s), name %s\n",
-	       quux_err_base, error_message(quux_err_base),
-	       error_table_name(quux_err_base));
-
-	printf("Msg for TGT-expired is '%s'\n",
-	       error_message(KRB_MK_AP_TGTEXP));
-	printf("Msg {sys_nerr-1} is '%s'\n", error_message(sys_nerr-1));
-	printf("Msg FOO_ERR is '%s'\n", error_message(FOO_ERR));
-	printf("Msg KRB_SKDC_CANT is '%s'\n",
-		    error_message(KRB_SKDC_CANT));
-	printf("Msg 1e6 is '%s'\n", error_message(1000000));
-	errno = FOO_ERR;
-	perror("FOO_ERR");
-}
@@ -1,69 +0,0 @@
-	error_table	krb
-
-	error_code	KRB_MK_AP_TKFIL,
-			"Can't read ticket file"
-
-	ec		KRB_MK_AP_NOTKT,
-			"Can't find ticket or TGT"
-
-	ec		KRB_MK_AP_TGTEXP,
-			"TGT expired"
-
-	ec		KRB_RD_AP_UNDEC,
-			"Can't decode authenticator"
-
-	ec		KRB_RD_AP_EXP,
-			"Ticket expired"
-
-	ec		KRB_RD_AP_REPEAT,
-			"Repeated request"
-
-	ec		KRB_RD_AP_NOT_US,
-			"The ticket isn't for us"
-
-	ec		KRB_RD_AP_INCON,
-			"Request is inconsistent"
-
-	ec		KRB_RD_AP_TIME,
-			"Delta-T too big"
-
-	ec		KRB_RD_AP_BADD,
-			"Incorrect net address"
-
-	ec		KRB_RD_AP_VERSION,
-			"Protocol version mismatch"
-
-	ec		KRB_RD_AP_MSG_TYPE,
-			"Invalid message type"
-
-	ec		KRB_RD_AP_MODIFIED,
-			"Message stream modified"
-
-	ec		KRB_RD_AP_ORDER,
-			"Message out of order"
-
-	ec		KRB_RD_AP_UNAUTHOR,
-			"Unauthorized request"
-
-	ec		KRB_GT_PW_NULL,
-			"Current password is null"
-
-	ec		KRB_GT_PW_BADPW,
-			"Incorrect current password"
-
-	ec		KRB_GT_PW_PROT,
-			"Protocol error"
-
-	ec		KRB_GT_PW_KDCERR,
-			"Error returned by KDC"
-
-	ec		KRB_GT_PW_NULLTKT,
-			"Null ticket returned by KDC"
-
-	ec		KRB_SKDC_RETRY,
-			"Retry count exceeded"
-
-	ec		KRB_SKDC_CANT,
-			"Can't send request"
-
-	end
@@ -1,9 +0,0 @@
-	error_table	quux
-
-	ec	FOO_ERR, "foo"
-
-	ec	BAR_ERR, "bar"
-
-	ec	BAZ_ERR, "meow"
-
-	end
@@ -2,11 +2,16 @@
 /* Copyright (C) 1993 Eric Young - see README for more details */

 /*-
- *	$Id: 3cbc_enc.c,v 1.2 1994/07/19 19:21:37 g89r4222 Exp $
+ *	$Id: 3cbc_enc.c,v 1.1.1.1 1994/09/30 14:49:50 csgr Exp $
 */

 #include "des_locl.h"

+void
+xp(a)
+unsigned char *a;
+{ int i; for(i=0; i<8; i++) printf("%02X",a[i]);printf("\n");}
+
 int des_3cbc_encrypt(input,output,length,ks1,ks2,iv1,iv2,encrypt)
 des_cblock *input;
 des_cblock *output;
@@ -53,6 +58,3 @@ xp(output);
 	return(0);
 	}

-xp(a)
-unsigned char *a;
-{ int i; for(i=0; i<8; i++) printf("%02X",a[i]);printf("\n");}
@@ -2,7 +2,7 @@
 /* Copyright (C) 1993 Eric Young - see README for more details */

 /*-
- *	$Id: 3ecb_enc.c,v 1.2 1994/07/19 19:21:38 g89r4222 Exp $
+ *	$Id: 3ecb_enc.c,v 1.1.1.1 1994/09/30 14:49:50 csgr Exp $
 */

 #include "des_locl.h"
@@ -13,7 +13,7 @@ des_cblock *output;
 des_key_schedule ks1,ks2;
 int encrypt;
 	{
-	register unsigned long l0,l1,t;
+	register unsigned long l0,l1;
 	register unsigned char *in,*out;
 	unsigned long ll[2];

@@ -1,17 +0,0 @@
-#	$Id: MISSING,v 1.2 1994/07/19 19:21:40 g89r4222 Exp $
-
-The following symbols (you can find in the USA libdes) are still missing
-in this source.
-
-_des_cblock_print_file
-_des_generate_random_block
-_des_init_random_number_generator
-_des_new_random_key
-_des_set_random_generator_seed
-_des_set_sequence_number
-_des_check_key_parity
-_des_fixup_key_parity
-_des_debug
-
-# END
-
@@ -1,10 +1,10 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/7/91
-#	$Id: Makefile,v 1.1.1.1 1994/09/30 14:49:50 csgr Exp $
+#	$Id: Makefile,v 1.4 1995/09/14 18:16:11 gibbs Exp $

 LIB=	des
 SRCS=	cbc_cksm.c cbc_enc.c ecb_enc.c enc_read.c enc_writ.c pcbc_enc.c \
 	qud_cksm.c rand_key.c read_pwd.c set_key.c str2key.c \
-	cfb_enc.c 3ecb_enc.c ofb_enc.c 3cbc_enc.c
+	cfb_enc.c 3ecb_enc.c ofb_enc.c 3cbc_enc.c new_rnd_key.c
 #MAN1=	des.1
 #MAN3=	des.3

@@ -19,7 +19,7 @@ CFLAGS+= -DDES_ENCRYPT -DKRBDES_ENCRYPT
 #CFLAGS+= -DKRB5
 #SRCS+=	kerberos5.c

-CFLAGS+= -I${.CURDIR}/include -DAUTHENTICATE
+CFLAGS+= -I${.CURDIR}/include -I${.CURDIR}/../include -DAUTHENTICATE
 SHLIB_MAJOR?= 2
 SHLIB_MINOR?= 0

@@ -2,9 +2,12 @@
 /* Copyright (C) 1993 Eric Young - see README for more details */

 /*-
- *	$Id: enc_read.c,v 1.1.1.1 1994/09/30 14:49:50 csgr Exp $
+ *	$Id: enc_read.c,v 1.2 1995/05/30 06:40:11 rgrimes Exp $
 */

+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
 #include <errno.h>
 #include "des_locl.h"

@@ -2,9 +2,14 @@
 /* Copyright (C) 1993 Eric Young - see README for more details */

 /*-
- *	$Id: enc_writ.c,v 1.1.1.1 1994/09/30 14:49:50 csgr Exp $
+ *	$Id: enc_writ.c,v 1.2 1995/05/30 06:40:12 rgrimes Exp $
 */

+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <time.h>
 #include <errno.h>
 #include "des_locl.h"

@@ -1,121 +0,0 @@
-/* des.h */
-/* Copyright (C) 1993 Eric Young - see README for more details */
-
-/*-
- *	$Id: des.h,v 1.2 1994/07/19 19:22:17 g89r4222 Exp $
- */
-
-#ifndef DES_DEFS
-#define DES_DEFS
-
-typedef unsigned char des_cblock[8];
-typedef struct des_ks_struct
-	{
-	union	{
-		des_cblock _;
-		/* make sure things are correct size on machines with
-		 * 8 byte longs */
-		unsigned long pad[2];
-		} ks;
-#define _	ks._
-	} des_key_schedule[16];
-
-#define DES_KEY_SZ 	(sizeof(des_cblock))
-#define DES_ENCRYPT	1
-#define DES_DECRYPT	0
-
-#define DES_CBC_MODE	0
-#define DES_PCBC_MODE	1
-
-#define C_Block des_cblock
-#define Key_schedule des_key_schedule
-#define ENCRYPT DES_ENCRYPT
-#define DECRYPT DES_DECRYPT
-#define KEY_SZ DES_KEY_SZ
-#define string_to_key des_string_to_key
-#define read_pw_string des_read_pw_string
-#define random_key des_random_key
-#define pcbc_encrypt des_pcbc_encrypt
-#define set_key des_set__key
-#define key_sched des_key_sched
-#define ecb_encrypt des_ecb_encrypt
-#define cbc_encrypt des_cbc_encrypt
-#define cbc_cksum des_cbc_cksum
-#define quad_cksum des_quad_cksum
-
-/* For compatibility with the MIT lib - eay 20/05/92 */
-typedef struct des_ks_struct bit_64;
-
-extern int des_check_key;	/* defaults to false */
-extern int des_rw_mode;		/* defaults to DES_PCBC_MODE */
-
-/* The next line is used to disable full ANSI prototypes, if your
- * compiler has problems with the prototypes, make sure this line always
- * evaluates to true :-) */
-#if !defined(MSDOS) && !defined(__STDC__)
-#ifndef KERBEROS
-int des_3ecb_encrypt();
-int des_cbc_encrypt();
-int des_3cbc_encrypt();
-int des_cfb_encrypt();
-int des_ecb_encrypt();
-int des_encrypt();
-int des_enc_read();
-int des_enc_write();
-int des_ofb_encrypt();
-int des_pcbc_encrypt();
-int des_random_key();
-int des_read_password();
-int des_read_2passwords();
-int des_read_pw_string();
-int des_is_weak_key();
-int des_set__key();
-int des_key_sched();
-int des_string_to_key();
-int des_string_to_2keys();
-#endif
-char *crypt();
-unsigned long des_cbc_cksum();
-unsigned long des_quad_cksum();
-unsigned long des_cbc_cksum();
-void des_set_odd_parity();
-#else /* PROTO */
-int des_3ecb_encrypt(des_cblock *input,des_cblock *output,\
-	des_key_schedule ks1,des_key_schedule ks2,int encrypt);
-unsigned long des_cbc_cksum(des_cblock *input,des_cblock *output,\
-	long length,des_key_schedule schedule,des_cblock *ivec);
-int des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,\
-	des_key_schedule schedule,des_cblock *ivec,int encrypt);
-int des_3cbc_encrypt(des_cblock *input,des_cblock *output,long length,\
-	des_key_schedule sk1,des_key_schedule sk2,\
-	des_cblock *ivec1,des_cblock *ivec2,int encrypt);
-int des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,\
-	long length,des_key_schedule schedule,des_cblock *ivec,int encrypt);
-int des_ecb_encrypt(des_cblock *input,des_cblock *output,\
-	des_key_schedule ks,int encrypt);
-int des_encrypt(unsigned long *input,unsigned long *output,
-	des_key_schedule ks, int encrypt);
-int des_enc_read(int fd,char *buf,int len,des_key_schedule sched,\
-	des_cblock *iv);
-int des_enc_write(int fd,char *buf,int len,des_key_schedule sched,\
-	des_cblock *iv);
-char *crypt(char *buf,char *salt);
-int des_ofb_encrypt(unsigned char *in,unsigned char *out,\
-	int numbits,long length,des_key_schedule schedule,des_cblock *ivec);
-int des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,\
-	des_key_schedule schedule,des_cblock *ivec,int encrypt);
-unsigned long des_quad_cksum(des_cblock *input,des_cblock *output,\
-	long length,int out_count,des_cblock *seed);
-int des_random_key(des_cblock ret);
-int des_read_password(des_cblock *key,char *prompt,int verify);
-int des_read_2passwords(des_cblock *key1,des_cblock *key2, \
-	char *prompt,int verify);
-int des_read_pw_string(char *buf,int length,char *prompt,int verify);
-void des_set_odd_parity(des_cblock *key);
-int des_is_weak_key(des_cblock *key);
-int des_set__key(des_cblock *key,des_key_schedule schedule);
-int des_key_sched(des_cblock *key,des_key_schedule schedule);
-int des_string_to_key(char *str,des_cblock *key);
-int des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2);
-#endif
-#endif
@@ -1,210 +1,154 @@
 /*
- * $Source: /usr/src/kerberosIV/des/RCS/new_rnd_key.c,v $
- * $Author: bostic $
+ * Copyright (c) 1995
+ *	Mark Murray.  All rights reserved.
 *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * 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 Mark Murray
+ *	and Eric Young
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
 *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * THIS SOFTWARE IS PROVIDED BY MARK MURRAY 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.
 *
- * New pseudo-random key generator, using DES encryption to make the
- * pseudo-random cycle as hard to break as DES.
- *
- * Written by Mark Lillibridge, MIT Project Athena
- *
- * Under U.S. law, this software may not be exported outside the US
- * without license from the U.S. Commerce department.
+ * $Id: new_rnd_key.c,v 1.3 1995/09/16 20:44:27 markm Exp $
 */

-#ifndef	lint
-static char rcsid_new_rnd_key_c[] =
-"$Header: /usr/src/kerberosIV/des/RCS/new_rnd_key.c,v 4.2 91/02/25 15:14:22 bostic Exp $";
-#endif	lint
-
-#include <mit-copyright.h>
-
-#include <des.h>
-#include "des_internal.h"
-
-extern void des_fixup_key_parity();
-extern int des_is_weak_key();
-
-void des_set_random_generator_seed(), des_set_sequence_number();
-void des_generate_random_block();
-
-/*
- * des_new_random_key: create a random des key
- *
- * Requires: des_set_random_number_generater_seed must be at called least
- *           once before this routine is called.
- *
- * Notes: the returned key has correct parity and is guarenteed not
- *        to be a weak des key.  Des_generate_random_block is used to
- *        provide the random bits.
- */
-int
-des_new_random_key(key)
-     des_cblock key;
-{
-    do {
-	des_generate_random_block(key);
-	des_fixup_key_parity(key);
-    } while (des_is_weak_key(key));
-
-    return(0);
-}
-
-/*
- * des_init_random_number_generator:
- *
- *    This routine takes a secret key possibly shared by a number
- * of servers and uses it to generate a random number stream that is
- * not shared by any of the other servers.  It does this by using the current
- * process id, host id, and the current time to the nearest second.  The
- * resulting stream seed is not useful information for cracking the secret
- * key.   Moreover, this routine keeps no copy of the secret key.
- * This routine is used for example, by the kerberos server(s) with the
- * key in question being the kerberos master key.
- *
- * Note: this routine calls des_set_random_generator_seed.
- */
-#ifndef BSDUNIX
-  you lose...   (aka, you get to implement an analog of this for your
-		 system...)
-#else
-
+#include <unistd.h>
+#include <string.h>
 #include <sys/time.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <machine/types.h>

-void des_init_random_number_generator(key)
-     des_cblock key;
-{
-    struct { /* This must be 64 bits exactly */
-	long process_id;
-	long host_id;
-    } seed;
-    struct timeval time; /* this must also be 64 bits exactly */
-    des_cblock new_key;
-    long gethostid();
+#include "des_locl.h"

-    /*
-     * use a host id and process id in generating the seed to ensure
-     * that different servers have different streams:
-     */
-    seed.host_id = gethostid();
-    seed.process_id = getpid();
+/* This counter keeps track of the pseudo-random sequence */
+static union {
+	u_int32_t ul0, ul1;
+	u_char uc[8];
+} counter;

-    /*
-     * Generate a tempory value that depends on the key, host_id, and
-     * process_id such that it gives no useful information about the key:
-     */
-    des_set_random_generator_seed(key);
-    des_set_sequence_number((unsigned char *)&seed);
-    des_new_random_key(new_key);
-
-    /*
-     * use it to select a random stream:
-     */      
-    des_set_random_generator_seed(new_key);
-
-    /*
-     * use a time stamp to ensure that a server started later does not reuse
-     * an old stream:
-     */
-    gettimeofday(&time, (struct timezone *)0);
-    des_set_sequence_number((unsigned char *)&time);
-
-    /*
-     * use the time stamp finally to select the final seed using the
-     * current random number stream:
-     */
-    des_new_random_key(new_key);
-    des_set_random_generator_seed(new_key);
-}
-
-#endif /* ifdef BSDUNIX */
+/* The current encryption schedule */
+static des_key_schedule current_key;

 /*
- * This module implements a random number generator faculty such that the next
- * number in any random number stream is very hard to predict without knowing
- * the seed for that stream even given the preceeding random numbers.
- */
-
-/*
- * The secret des key schedule for the current stream of random numbers:
- */
-static des_key_schedule random_sequence_key;
-
-/*
- * The sequence # in the current stream of random numbers:
- */
-static unsigned char sequence_number[8];
-
-/*
- * des_set_random_generator_seed: this routine is used to select a random
- *                                number stream.  The stream that results is
- *                                totally determined by the passed in key.
- *                                (I.e., calling this routine again with the
- *                                same key allows repeating a sequence of
- *                                random numbers)
- *
- * Requires: key is a valid des key.  I.e., has correct parity and is not a
- *           weak des key.
+ *   des_set_random_generator_seed: starts a new pseudorandom sequence
+ *                                  dependant on the supplied key
 */
 void
-des_set_random_generator_seed(key)
-     des_cblock key;
+des_set_random_generator_seed(new_key)
+	des_cblock *new_key;
 {
-    register int i;
+	des_key_sched(new_key, current_key);

-    /* select the new stream: (note errors are not possible here...) */
-    des_key_sched(key, random_sequence_key);
-
-    /* "seek" to the start of the stream: */
-    for (i=0; i<8; i++)
-      sequence_number[i] = 0;
+	/* reset the counter */
+	counter.ul0 = counter.ul1 = 0;
 }

 /*
- * des_set_sequence_number: this routine is used to set the sequence number
- *                          of the current random number stream.  This routine
- *                          may be used to "seek" within the current random
- *                          number stream.
- *
- * Note that des_set_random_generator_seed resets the sequence number to 0.
+ *   des_set_sequence_number: set the counter to a known value
 */
 void
-des_set_sequence_number(new_sequence_number)
-     des_cblock new_sequence_number;
+des_set_sequence_number(new_counter)
+	des_cblock new_counter;
 {
-    bcopy((char *)new_sequence_number, (char *)sequence_number,
-	  sizeof(sequence_number));
+	bcopy((void *)new_counter, (char *)counter.uc, sizeof(counter));
 }

 /*
- * des_generate_random_block: routine to return the next random number
- *                            from the current random number stream.
- *                            The returned number is 64 bits long.
- *
- * Requires: des_set_random_generator_seed must have been called at least once
- *           before this routine is called.
+ *   des_generate_random_block: returns the next 64 bit random number
 */
-void des_generate_random_block(block)
-     des_cblock block;
+
+void des_generate_random_block(random_block)
+	des_cblock *random_block;
 {
-    int i;
+	/* Encrypt the counter to get pseudo-random numbers */
+    	des_ecb_encrypt(&counter.uc, random_block, current_key, DES_ENCRYPT);

-    /*
-     * Encrypt the sequence number to get the new random block:
-     */
-    des_ecb_encrypt(sequence_number, block, random_sequence_key, 1);
-
-    /*
-     * Increment the sequence number as an 8 byte unsigned number with wrap:
-     * (using LSB here)
-     */
-    for (i=0; i<8; i++) {
-	sequence_number[i] = (sequence_number[i] + 1) & 0xff;
-	if (sequence_number[i])
-	  break;
-    }
+	/* increment the 64-bit counter */
+	counter.ul0++;
+	if (!counter.ul0) counter.ul1++;
+}
+
+/*
+ *   des_new_random_key: Invents a new, random strong key with odd parity.
+ */
+int 
+des_new_random_key(new_key)
+	des_cblock *new_key;
+{
+	do {
+		des_generate_random_block(new_key);
+		des_set_odd_parity(new_key);
+	} while (des_is_weak_key(new_key));
+	return(0);
+}
+
+/*
+ *   des_init_random_number_generator: intialises the random number generator
+ *                                     to a truly nasty sequence using system
+ *                                     supplied volatile variables.
+ */
+void
+des_init_random_number_generator(key)
+	des_cblock *key;
+{
+	/* 64-bit structures */
+	struct {
+		u_int32_t pid;
+		u_int32_t hostid;
+	} sysblock;
+	struct timeval timeblock;
+	struct {
+		u_int32_t tv_sec;
+		u_int32_t tv_usec;
+	} time64bit;
+	des_cblock new_key;
+	int mib[2];
+	size_t len;
+
+	/* Get host ID using official BSD 4.4 method */
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_HOSTID;
+	len = sizeof(sysblock.hostid);
+	sysctl(mib, 2, &sysblock.hostid, &len, NULL, 0);
+
+	/* Get Process ID */
+	sysblock.pid = getpid();
+
+	/* Generate a new key, and use it to seed the random generator */
+	des_set_random_generator_seed(key);
+	des_set_sequence_number((unsigned char *)&sysblock);
+	des_new_random_key(&new_key);
+	des_set_random_generator_seed(&new_key);
+
+	/* Try to confuse the sequence counter */
+	gettimeofday(&timeblock, NULL);
+	time64bit.tv_sec = (u_int32_t)timeblock.tv_sec;
+	time64bit.tv_usec = (u_int32_t)timeblock.tv_usec;
+	des_set_sequence_number((unsigned char *)&time64bit);
+
+	/* Do the work */
+	des_new_random_key(&new_key);
+	des_set_random_generator_seed(&new_key);
 }
@@ -2,9 +2,12 @@
 /* Copyright (C) 1993 Eric Young - see README for more details */

 /*-
- *	$Id: rand_key.c,v 1.1.1.1 1994/09/30 14:49:51 csgr Exp $
+ *	$Id: rand_key.c,v 1.2 1995/05/09 18:05:15 wollman Exp $
 */

+#include <sys/types.h>
+#include <sys/time.h>
+#include <unistd.h>
 #include "des_locl.h"

 int des_random_key(ret)
@@ -1,10 +0,0 @@
-#	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.2 1994/07/19 19:22:34 g89r4222 Exp $
-
-PROG=	ext_srvtab
-CFLAGS+=-DKERBEROS -I${.CURDIR}/../include
-DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD+=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
-NOMAN=	noman
-
-.include <bsd.prog.mk>
@@ -1,62 +0,0 @@
-.\" from: ext_srvtab.8,v 4.2 89/07/18 16:53:18 jtkohl Exp $
-.\" $Id: ext_srvtab.8,v 1.1.1.1 1994/09/30 14:50:05 csgr Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <Copyright.MIT>.
-.\"
-.TH EXT_SRVTAB 8 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-ext_srvtab \- extract service key files from Kerberos key distribution center database
-.SH SYNOPSIS
-ext_srvtab [
-.B \-n
-] [
-.B \-r realm
-] [
-.B hostname ...
-]
-.SH DESCRIPTION
-.I ext_srvtab
-extracts service key files from the Kerberos key distribution center
-(KDC) database.
-.PP
-Upon execution, it prompts the user to enter the master key string for
-the database.  If the
-.B \-n
-option is specified, the master key is instead fetched from the master
-key cache file.
-.PP
-For each
-.I hostname
-specified on the command line, 
-.I ext_srvtab
-creates the service key file
-.IR hostname -new-srvtab,
-containing all the entries in the database with an instance field of
-.I hostname.
-This new file contains all the keys registered for Kerberos-mediated
-service providing programs which use the 
-.IR krb_get_phost (3)
-principal and instance conventions to run on the host
-.IR hostname .
-If the
-.B \-r
-option is specified, the realm fields in the extracted file will
-match the given realm rather than the local realm.
-.SH DIAGNOSTICS
-.TP 20n
-"verify_master_key: Invalid master key, does not match database."
-The master key string entered was incorrect.
-.SH FILES
-.TP 20n
-/etc/kerberosIV/principal.db
-DBM file containing database
-.TP
-/etc/kerberosIV/principal.ok
-Semaphore indicating that the DBM database is not being modified.
-.TP
-/etc/kerberosIV/master_key
-Master key cache file.
-.SH SEE ALSO
-read_service_key(3), krb_get_phost(3)
@@ -1,164 +0,0 @@
-/*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
- *
- *	from: ext_srvtab.c,v 4.1 89/07/18 16:49:30 jtkohl Exp $
- *	$Id: ext_srvtab.c,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $
- */
-
-#ifndef	lint
-static char rcsid[] =
-"$Id: ext_srvtab.c,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $";
-#endif	lint
-
-#include <stdio.h>
-#include <sys/file.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <des.h>
-#include <krb.h>
-#include <krb_db.h>
-
-#define TRUE 1
-#define FALSE 0
-
-static C_Block master_key;
-static C_Block session_key;
-static Key_schedule master_key_schedule;
-char progname[] = "ext_srvtab";
-char realm[REALM_SZ];
-
-main(argc, argv)
-  int argc;
-  char *argv[];
-{
-    FILE *fout;
-    char fname[1024];
-    int fopen_errs = 0;
-    int arg;
-    Principal princs[40];
-    int more;
-    int prompt = TRUE;
-    register int n, i;
-
-    bzero(realm, sizeof(realm));
-
-    /* Parse commandline arguments */
-    if (argc < 2)
-	usage();
-    else {
-	for (i = 1; i < argc; i++) {
-	    if (strcmp(argv[i], "-n") == 0)
-		prompt = FALSE;
-	    else if (strcmp(argv[i], "-r") == 0) {
-		if (++i >= argc)
-		    usage();
-		else {
-		    strcpy(realm, argv[i]);
-		    /*
-		     * This is to humor the broken way commandline
-		     * argument parsing is done.  Later, this
-		     * program ignores everything that starts with -.
-		     */
-		    argv[i][0] = '-';
-		}
-	    }
-	    else if (argv[i][0] == '-')
-		usage();
-	    else
-		if (!k_isinst(argv[i])) {
-		fprintf(stderr, "%s: bad instance name: %s\n",
-			progname, argv[i]);
-		usage();
-	    }
-	}
-    }
-
-    if (kdb_get_master_key (prompt, master_key, master_key_schedule) != 0) {
-      fprintf (stderr, "Couldn't read master key.\n");
-      fflush (stderr);
-      exit(1);
-    }
-
-    if (kdb_verify_master_key (master_key, master_key_schedule, stderr) < 0) {
-      exit(1);
-    }
-
-    /* For each arg, search for instances of arg, and produce */
-    /* srvtab file */
-    if (!realm[0])
-	if (krb_get_lrealm(realm, 1) != KSUCCESS) {
-	    fprintf(stderr, "%s: couldn't get local realm\n", progname);
-	    exit(1);
-	}
-    (void) umask(077);
-
-    for (arg = 1; arg < argc; arg++) {
-	if (argv[arg][0] == '-')
-	    continue;
-	sprintf(fname, "%s-new-srvtab", argv[arg]);
-	if ((fout = fopen(fname, "w")) == NULL) {
-	    fprintf(stderr, "Couldn't create file '%s'.\n", fname);
-	    fopen_errs++;
-	    continue;
-	}
-	printf("Generating '%s'....\n", fname);
-	n = kerb_get_principal("*", argv[arg], &princs[0], 40, &more);
-	if (more)
-	    fprintf(stderr, "More than 40 found...\n");
-	for (i = 0; i < n; i++) {
-	    FWrite(princs[i].name, strlen(princs[i].name) + 1, 1, fout);
-	    FWrite(princs[i].instance, strlen(princs[i].instance) + 1,
-		   1, fout);
-	    FWrite(realm, strlen(realm) + 1, 1, fout);
-	    FWrite(&princs[i].key_version,
-		sizeof(princs[i].key_version), 1, fout);
-	    bcopy(&princs[i].key_low, session_key, sizeof(long));
-	    bcopy(&princs[i].key_high, session_key + sizeof(long),
-		  sizeof(long));
-	    kdb_encrypt_key (session_key, session_key,
-			     master_key, master_key_schedule, DES_DECRYPT);
-	    FWrite(session_key, sizeof session_key, 1, fout);
-	}
-	fclose(fout);
-    }
-
-    StampOutSecrets();
-
-    exit(fopen_errs);		/* 0 errors if successful */
-
-}
-
-Die()
-{
-    StampOutSecrets();
-    exit(1);
-}
-
-FWrite(p, size, n, f)
-  char   *p;
-  int     size;
-  int     n;
-  FILE   *f;
-{
-    if (fwrite(p, size, n, f) != n) {
-	printf("Error writing output file.  Terminating.\n");
-	Die();
-    }
-}
-
-StampOutSecrets()
-{
-    bzero(master_key, sizeof master_key);
-    bzero(session_key, sizeof session_key);
-    bzero(master_key_schedule, sizeof master_key_schedule);
-}
-
-usage()
-{
-    fprintf(stderr,
-	    "Usage: %s [-n] [-r realm] instance [instance ...]\n", progname);
-    exit(1);
-}
@@ -1,4 +1,4 @@
-#	$Id: ChangeLog,v 1.2 1994/07/19 19:22:41 g89r4222 Exp $
+#	$Id: ChangeLog,v 1.3 1995/07/18 16:35:58 mark Exp $

 Mon Mar 21 15:48:59 MET 1994	Piero Serini
 	* 1st port to FreeBSD
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:23:44 markm Exp $

-FILES=	des.h kparse.h krb.h krb_db.h
+FILES=	kparse.h krb.h krb_db.h des.h

 # mit-copyright.h kadm_err.h krb_err.h

@@ -6,7 +6,7 @@
 * Include file for address comparison macros.
 *
 *	from: addr_comp.h,v 4.0 89/01/23 09:57:44 jtkohl Exp $
- *	$Id: addr_comp.h,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $
+ *	$Id: addr_comp.h,v 1.3 1995/07/18 16:36:01 mark Exp $
 */

 #ifndef ADDR_COMP_DEFS
@@ -6,7 +6,7 @@
 * Include file for the Kerberos administration server.
 *
 *	from: admin_server.h,v 4.7 89/01/11 11:59:42 steiner Exp $
- *	$Id: admin_server.h,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $
+ *	$Id: admin_server.h,v 1.3 1995/07/18 16:36:03 mark Exp $
 */

 #ifndef ADMIN_SERVER_DEFS
@@ -6,7 +6,7 @@
 * Machine-type definitions: Sun 386i using SunOS (~BSD)
 *
 *	from: conf-bsd386i.h,v 4.0 89/12/19 13:26:55 jtkohl Exp $
- *	$Id: conf-bsd386i.h,v 1.2 1994/07/19 19:22:48 g89r4222 Exp $
+ *	$Id: conf-bsd386i.h,v 1.3 1995/07/18 16:36:05 mark Exp $
 */

 #define BITS32
@@ -4,7 +4,7 @@
 * <Copyright.MIT>.
 *
 *	from: conf-bsdapollo.h,v 4.1 89/01/24 14:26:22 jtkohl Exp $
- *	$Id: conf-bsdapollo.h,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $
+ *	$Id: conf-bsdapollo.h,v 1.3 1995/07/18 16:36:06 mark Exp $
 */

 #define BSDUNIX
@@ -6,7 +6,7 @@
 * Machine-type definitions: IBM 032 (RT/PC)
 *
 *	from: conf-bsdibm032.h,v 4.0 89/01/23 09:58:01 jtkohl Exp $
- *	$Id: conf-bsdibm032.h,v 1.2 1994/07/19 19:22:51 g89r4222 Exp $
+ *	$Id: conf-bsdibm032.h,v 1.3 1995/07/18 16:36:08 mark Exp $
 */

 #define BSDUNIX
@@ -6,7 +6,7 @@
 * Machine-type definitions: 68000 with BSD Unix, e.g. SUN
 *
 *	from: conf-bsdm68k.h,v 4.0 88/11/29 11:46:58 jtkohl Exp $
- *	$Id: conf-bsdm68k.h,v 1.2 1994/07/19 19:22:53 g89r4222 Exp $
+ *	$Id: conf-bsdm68k.h,v 1.3 1995/07/18 16:36:10 mark Exp $
 */

 #define BITS32
@@ -6,7 +6,7 @@
 * Machine-type definitions: SPARC with BSD Unix, e.g. SUN-4
 *
 *	from: conf-bsdsparc.h,v 4.0 89/06/02 13:04:06 jtkohl Exp $
- *	$Id: conf-bsdsparc.h,v 1.2 1994/07/19 19:22:54 g89r4222 Exp $
+ *	$Id: conf-bsdsparc.h,v 1.3 1995/07/18 16:36:12 mark Exp $
 */

 #define BITS32
@@ -4,7 +4,7 @@
 * Machine Description : TAHOE.
 *
 *	from: conf-bsdtahoe.h,v 4.0 89/08/30 11:06:53 jtkohl Exp $
- *	$Id: conf-bsdtahoe.h,v 1.2 1994/07/19 19:22:56 g89r4222 Exp $
+ *	$Id: conf-bsdtahoe.h,v 1.3 1995/07/18 16:36:14 mark Exp $
 */

 #define	TAHOE
@@ -6,7 +6,7 @@
 * Machine-type definitions: VAX
 *
 *	from: conf-bsdvax.h,v 4.0 89/01/23 09:58:12 jtkohl Exp $
- *	$Id: conf-bsdvax.h,v 1.2 1994/07/19 19:22:57 g89r4222 Exp $
+ *	$Id: conf-bsdvax.h,v 1.3 1995/07/18 16:36:15 mark Exp $
 */

 #define VAX
@@ -6,7 +6,7 @@
 * Machine-type definitions: IBM 370
 *
 *	from: conf-ibm370.h,v 4.0 89/01/23 09:58:19 jtkohl Exp $
- *	$Id: conf-ibm370.h,v 1.2 1994/07/19 19:22:59 g89r4222 Exp $
+ *	$Id: conf-ibm370.h,v 1.3 1995/07/18 16:36:17 mark Exp $
 */

 /* What else? */
@@ -6,7 +6,7 @@
 * Machine-type definitions: IBM PC 8086
 *
 *	from: conf-pc.h,v 4.0 89/01/23 09:58:26 jtkohl Exp $
- *	$Id: conf-pc.h,v 1.2 1994/07/19 19:23:00 g89r4222 Exp $
+ *	$Id: conf-pc.h,v 1.3 1995/07/18 16:36:19 mark Exp $
 *
 */

@@ -6,7 +6,7 @@
 * Machine-type definitions: Pyramid
 *
 *	from: conf-pyr.h,v 4.0 89/12/19 13:27:16 jtkohl Exp $
- *	$Id: conf-pyr.h,v 1.2 1994/07/19 19:23:02 g89r4222 Exp $
+ *	$Id: conf-pyr.h,v 1.3 1995/07/18 16:36:20 mark Exp $
 */

 #define BITS32
@@ -6,7 +6,7 @@
 * Machine-type definitions: DECstation 3100 (MIPS R2000)
 *
 *	from: conf-ultmips2.h,v 4.0 89/01/23 09:58:32 jtkohl Exp $
- *	$Id: conf-ultmips2.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
+ *	$Id: conf-ultmips2.h,v 1.3 1995/07/18 16:36:22 mark Exp $
 */

 #define MIPS2
@@ -12,7 +12,7 @@
 * /usr/include/krb.h?)
 *
 *	from: conf.h,v 4.0 89/01/23 09:58:40 jtkohl Exp $
- *	$Id: conf.h,v 1.2 1994/07/19 19:23:05 g89r4222 Exp $
+ *	$Id: conf.h,v 1.3 1995/07/18 16:36:24 mark Exp $
 */

 #ifndef _CONF_H_
@@ -1,27 +1,28 @@
-/*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
- * For copying and distribution information, please see the file
- * <Copyright.MIT>.
- *
- * Include file for the Data Encryption Standard library.
- *
- *	from: des.h,v 4.11 89/01/17 16:24:57 rfrench Exp $
- *	$Id: des.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
+/* des.h */
+/* Copyright (C) 1995 Eric Young ([email protected]).
+ * All rights reserved.
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * See the COPYRIGHT file in the libdes distribution for more details.
 */

-/* only do the whole thing once	 */
-#ifndef DES_DEFS
-#define DES_DEFS
+#ifndef HEADER_DES_H
+#define HEADER_DES_H

-typedef unsigned char des_cblock[8];	/* crypto-block size */
-/* Key schedule */
+#include <stdio.h>
+
+typedef unsigned char des_cblock[8];
 typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16];

 #define DES_KEY_SZ 	(sizeof(des_cblock))
+#define DES_SCHEDULE_SZ (sizeof(des_key_schedule))
+
 #define DES_ENCRYPT	1
 #define DES_DECRYPT	0

-#ifndef NCOMPAT
+#define DES_CBC_MODE	0
+#define DES_PCBC_MODE	1
+
 #define C_Block des_cblock
 #define Key_schedule des_key_schedule
 #define ENCRYPT DES_ENCRYPT
@@ -31,14 +32,150 @@ typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16];
 #define read_pw_string des_read_pw_string
 #define random_key des_random_key
 #define pcbc_encrypt des_pcbc_encrypt
+#define set_key des_set_key
 #define key_sched des_key_sched
+#define ecb_encrypt des_ecb_encrypt
 #define cbc_encrypt des_cbc_encrypt
+#define ncbc_encrypt des_ncbc_encrypt
 #define cbc_cksum des_cbc_cksum
-#define C_Block_print des_cblock_print
 #define quad_cksum des_quad_cksum
+
+/* For compatibility with the MIT lib - eay 20/05/92 */
 typedef struct des_ks_struct bit_64;
+#define des_fixup_key_parity des_set_odd_parity
+#define des_check_key_parity check_parity
+
+extern int des_check_key;	/* defaults to false */
+extern int des_rw_mode;		/* defaults to DES_PCBC_MODE */
+
+/* The next line is used to disable full ANSI prototypes, if your
+ * compiler has problems with the prototypes, make sure this line always
+ * evaluates to true :-) */
+#if defined(MSDOS) && defined(__STDC__)
+#undef PROTO
+#define PROTO
 #endif

-#define des_cblock_print(x) des_cblock_print_file(x, stdout)
+/* markm - dirty hack */
+#define PROTO

-#endif	DES_DEFS
+#ifdef PROTO
+int des_2ecb_encrypt(des_cblock *input,des_cblock *output,
+	des_key_schedule ks1,des_key_schedule ks2,int enc);
+int des_3ecb_encrypt(des_cblock *input,des_cblock *output,
+	des_key_schedule ks1,des_key_schedule ks2, int enc);
+unsigned long des_cbc_cksum(des_cblock *input,des_cblock *output,
+	long length,des_key_schedule schedule,des_cblock *ivec);
+int des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
+	des_key_schedule schedule,des_cblock *ivec,int enc);
+int des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
+	des_key_schedule schedule,des_cblock *ivec,int enc);
+int des_3cbc_encrypt(des_cblock *input,des_cblock *output,long length,
+	des_key_schedule sk1,des_key_schedule sk2,
+	des_cblock *ivec1,des_cblock *ivec2,int enc);
+int des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
+	long length,des_key_schedule schedule,des_cblock *ivec,int enc);
+int des_ecb_encrypt(des_cblock *input,des_cblock *output,
+	des_key_schedule ks,int enc);
+int des_encrypt(unsigned long *input,unsigned long *output, 
+	des_key_schedule ks, int enc);
+int des_encrypt2(unsigned long *input,unsigned long *output, 
+	des_key_schedule ks, int enc);
+int des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, 
+	long length, des_key_schedule ks1, des_key_schedule ks2, 
+	des_key_schedule ks3, des_cblock *ivec, int enc);
+int des_ede2_cbc_encrypt(des_cblock *input, des_cblock *output, 
+	long length, des_key_schedule ks1, des_key_schedule ks2, 
+	des_cblock *ivec, int enc);
+int des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
+	des_cblock *iv);
+int des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
+	des_cblock *iv);
+#if 0
+#ifdef PERL5
+char *des_crypt(const char *buf,const char *salt);
+#else
+/* some stupid compilers complain because I have declared char instead
+ * of const char */
+#ifdef HEADER_DES_LOCL_H
+char *crypt(const char *buf,const char *salt);
+#else
+char *crypt();
+#endif /* HEADER_DES_LOCL_H */
+#endif /* PERL5 */
+#endif /* 0 */
+
+int des_ofb_encrypt(unsigned char *in,unsigned char *out,
+	int numbits,long length,des_key_schedule schedule,des_cblock *ivec);
+int des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
+	des_key_schedule schedule,des_cblock *ivec,int enc);
+unsigned long des_quad_cksum(des_cblock *input,des_cblock *output,
+	long length,int out_count,des_cblock *seed);
+void des_random_seed(des_cblock key);
+int des_random_key(des_cblock ret);
+int des_read_password(des_cblock *key,char *prompt,int verify);
+int des_read_2passwords(des_cblock *key1,des_cblock *key2,
+	char *prompt,int verify);
+int des_read_pw_string(char *buf,int length,char *prompt,int verify);
+void des_set_odd_parity(des_cblock *key);
+int des_is_weak_key(des_cblock *key);
+int des_set_key(des_cblock *key,des_key_schedule schedule);
+int des_key_sched(des_cblock *key,des_key_schedule schedule);
+int des_string_to_key(char *str,des_cblock *key);
+int des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2);
+int des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
+	des_key_schedule schedule, des_cblock *ivec, int *num, int enc);
+int des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
+	des_key_schedule schedule, des_cblock *ivec, int *num);
+void des_cblock_print_file(des_cblock *cb, FILE *fp);
+int des_new_random_key(des_cblock *key);
+void des_init_random_number_generator(des_cblock *key);
+void des_set_random_generator_seed(des_cblock *key);
+void des_set_sequence_number(des_cblock new_sequence_number);
+void des_generate_random_block(des_cblock *block);
+
+#else
+
+int des_2ecb_encrypt();
+int des_3ecb_encrypt();
+unsigned long des_cbc_cksum();
+int des_cbc_encrypt();
+int des_ncbc_encrypt();
+int des_3cbc_encrypt();
+int des_cfb_encrypt();
+int des_ecb_encrypt();
+int des_encrypt();
+int des_encrypt2();
+int des_ede3_cbc_encrypt();
+int des_ede2_cbc_encrypt();
+int des_enc_read();
+int des_enc_write();
+#ifdef PERL5
+char *des_crypt();
+#else
+char *crypt();
+#endif
+int des_ofb_encrypt();
+int des_pcbc_encrypt();
+unsigned long des_quad_cksum();
+void des_random_seed();
+int des_random_key();
+int des_read_password();
+int des_read_2passwords();
+int des_read_pw_string();
+void des_set_odd_parity();
+int des_is_weak_key();
+int des_set_key();
+int des_key_sched();
+int des_string_to_key();
+int des_string_to_2keys();
+int des_cfb64_encrypt();
+int des_ofb64_encrypt();
+void des_cblock_print_file();
+int des_new_random_key();
+void des_init_random_number_generator();
+void des_set_random_generator_seed();
+void des_set_sequence_number();
+void des_generate_random_block();
+#endif
+#endif
@@ -7,7 +7,7 @@
 * we've got available....
 *
 *	from: highc.h,v 4.0 89/01/23 09:59:15 jtkohl Exp $
- *	$Id: highc.h,v 1.2 1994/07/19 19:23:08 g89r4222 Exp $
+ *	$Id: highc.h,v 1.3 1995/07/18 16:36:27 mark Exp $
 */

 #define const
@@ -1,138 +0,0 @@
-/*
- * Copyright 1988 by the Massachusetts Institute of Technology.
- * For copying and distribution information, please see the file
- * <Copyright.MIT>.
- *
- * Definitions for Kerberos administration server & client
- *
- *	from: kadm.h,v 4.2 89/09/26 09:15:20 jtkohl Exp $
- *	$Id: kadm.h,v 1.2 1994/07/19 19:23:09 g89r4222 Exp $
- */
-
-#ifndef KADM_DEFS
-#define KADM_DEFS
-
-/*
- * kadm.h
- * Header file for the fourth attempt at an admin server
- * Doug Church, December 28, 1989, MIT Project Athena
- */
-
-/* for those broken Unixes without this defined... should be in sys/param.h */
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 64
-#endif
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <krb.h>
-#include <des.h>
-
-/* The global structures for the client and server */
-typedef struct {
-  struct sockaddr_in admin_addr;
-  struct sockaddr_in my_addr;
-  int my_addr_len;
-  int admin_fd;			/* file descriptor for link to admin server */
-  char sname[ANAME_SZ];		/* the service name */
-  char sinst[INST_SZ];		/* the services instance */
-  char krbrlm[REALM_SZ];
-} Kadm_Client;
-
-typedef struct {		/* status of the server, i.e the parameters */
-   int inter;			/* Space for command line flags */
-   char *sysfile;		/* filename of server */
-} admin_params;			/* Well... it's the admin's parameters */
-
-/* Largest password length to be supported */
-#define MAX_KPW_LEN	128
-
-/* Largest packet the admin server will ever allow itself to return */
-#define KADM_RET_MAX 2048
-
-/* That's right, versions are 8 byte strings */
-#define KADM_VERSTR	"KADM0.0A"
-#define KADM_ULOSE	"KYOULOSE"	/* sent back when server can't
-					   decrypt client's msg */
-#define KADM_VERSIZE strlen(KADM_VERSTR)
-
-/* the lookups for the server instances */
-#define PWSERV_NAME  "changepw"
-#define KADM_SNAME   "kerberos_master"
-#define KADM_SINST   "kerberos"
-
-/* Attributes fields constants and macros */
-#define ALLOC        2
-#define RESERVED     3
-#define DEALLOC      4
-#define DEACTIVATED  5
-#define ACTIVE       6
-
-/* Kadm_vals structure for passing db fields into the server routines */
-#define FLDSZ        4
-
-typedef struct {
-    u_char         fields[FLDSZ];     /* The active fields in this struct */
-    char           name[ANAME_SZ];
-    char           instance[INST_SZ];
-    unsigned long  key_low;
-    unsigned long  key_high;
-    unsigned long  exp_date;
-    unsigned short attributes;
-    unsigned char  max_life;
-} Kadm_vals;                    /* The basic values structure in Kadm */
-
-/* Kadm_vals structure for passing db fields into the server routines */
-#define FLDSZ        4
-
-/* Need to define fields types here */
-#define KADM_NAME       31
-#define KADM_INST       30
-#define KADM_EXPDATE    29
-#define KADM_ATTR       28
-#define KADM_MAXLIFE    27
-#define KADM_DESKEY     26
-
-/* To set a field entry f in a fields structure d */
-#define SET_FIELD(f,d)  (d[3-(f/8)]|=(1<<(f%8)))
-
-/* To set a field entry f in a fields structure d */
-#define CLEAR_FIELD(f,d)  (d[3-(f/8)]&=(~(1<<(f%8))))
-
-/* Is field f in fields structure d */
-#define IS_FIELD(f,d)   (d[3-(f/8)]&(1<<(f%8)))
-
-/* Various return codes */
-#define KADM_SUCCESS    0
-
-#define WILDCARD_STR "*"
-
-enum acl_types {
-ADDACL,
-GETACL,
-MODACL
-};
-
-/* Various opcodes for the admin server's functions */
-#define CHANGE_PW    2
-#define ADD_ENT      3
-#define MOD_ENT      4
-#define GET_ENT      5
-
-extern long kdb_get_master_key();	/* XXX should be in krb_db.h */
-extern long kdb_verify_master_key();	/* XXX ditto */
-
-extern long krb_mk_priv(), krb_rd_priv(); /* XXX should be in krb.h */
-extern void krb_set_tkt_string();	/* XXX ditto */
-
-extern unsigned long quad_cksum();	/* XXX should be in des.h */
-
-/* XXX This doesn't belong here!!! */
-char *malloc(), *realloc();
-#ifdef POSIX
-typedef void sigtype;
-#else
-typedef int sigtype;
-#endif
-
-#endif KADM_DEFS
@@ -6,7 +6,7 @@
 * Include file for the Kerberos Key Distribution Center.
 *
 *	from: kdc.h,v 4.1 89/01/24 17:54:04 jon Exp $
- *	$Id: kdc.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
+ *	$Id: kdc.h,v 1.3 1995/07/18 16:36:29 mark Exp $
 */

 #ifndef KDC_DEFS
@@ -7,7 +7,7 @@
 * type of message may be selectively turned on or off.
 *
 *	from: klog.h,v 4.7 89/01/24 17:55:07 jon Exp $
- *	$Id: klog.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
+ *	$Id: klog.h,v 1.3 1995/07/18 16:36:30 mark Exp $
 */

 #ifndef KLOG_DEFS
@@ -6,7 +6,7 @@
 * Include file for kparse routines.
 *
 *	from: kparse.h,v 4.5 89/01/11 12:05:53 steiner Exp $
- *	$Id: kparse.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
+ *	$Id: kparse.h,v 1.4 1995/09/07 20:50:34 mark Exp $
 */

 #ifndef KPARSE_DEFS
@@ -81,7 +81,11 @@ extern char ErrorMsg[];		/*
 				 * fGetParameterSet
 				 */

-extern char *strsave();		/* defined in this module */
-extern char *strutol();		/* defined in this module */
+extern char *strsave(char *p);	/* defined in this module */
+extern char *strutol(char *p);		/* defined in this module */
+
+int fGetParameterSet(FILE *fp, parmtable parm[], int parmcount);
+int fGetKeywordValue(FILE *fp, char *keyword, int klen, char *value, int vlen);
+int fGetToken(FILE *fp, char *dest, int maxlen);

 #endif /* KPARSE_DEFS */
@@ -6,7 +6,7 @@
 * Include file for the Kerberos library.
 *
 *	from: krb.h,v 4.26 89/08/08 17:55:25 jtkohl Exp $
- *	$Id: krb.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
+ *	$Id: krb.h,v 1.7 1995/09/07 20:50:36 mark Exp $
 */

 /* Only one time, please */
@@ -14,7 +14,9 @@
 #define KRB_DEFS

 /* Need some defs from des.h	 */
+#include <stdio.h>
 #include <kerberosIV/des.h>
+#include <netinet/in.h>

 /* Text describing error codes */
 #define		MAX_KRB_ERRORS	256
@@ -373,4 +375,130 @@ char *tkt_string();
 #define	KOPT_DO_OLDSTYLE 0x00000008 /* use the old-style protocol */
 #endif ATHENA_COMPAT

+/* libacl */
+void acl_canonicalize_principal __P((char *principal, char *buf));
+int acl_check __P((char *acl, char *principal));
+int acl_exact_match __P((char *acl, char *principal));
+int acl_add __P((char *acl, char *principal));
+int acl_delete __P((char *acl, char *principal));
+int acl_initialize __P((char *acl_file, int mode));
+
+/* libkrb - krb.3 */
+int krb_mk_req __P((KTEXT authent, char *service, char *instance, char *realm,
+    long checksum);
+int krb_rd_req __P((KTEXT authent, char *service, char *instance,
+    long from_addr, AUTH_DAT *ad, char *fn));
+int krb_kntoln __P((AUTH_DAT *ad, char *lname));
+int krb_set_key __P((char *key, int cvt));
+int krb_get_cred __P((char *service, char *instance, char *realm,
+    CREDENTIALS *c));
+long krb_mk_priv __P((u_char *in, u_char *out, u_long in_length,
+    des_key_schedule schedule, des_cblock key, struct sockaddr_in *sender,
+    struct sockaddr_in *receiver));
+long krb_rd_priv __P((u_char *in, u_long in_length, Key_schedule schedule,
+    des_cblock key, struct sockaddr_in *sender, struct sockaddr_in *receiver,
+    MSG_DAT *msg_data));
+long krb_mk_safe __P((u_char *in, u_char *out, u_long in_length,
+    des_cblock *key, struct sockaddr_in *sender, struct sockaddr_in *receiver));
+long krb_rd_safe __P((u_char *in, u_long length, des_cblock *key,
+    struct sockaddr_in *sender, struct sockaddr_in *receiver,
+    MSG_DAT *msg_data));
+long krb_mk_err __P((u_char *out, long code, char *string));
+int krb_rd_err __P((u_char *in, u_long in_length, long *code, MSG_DAT *m_data));
+
+/* libkrb - krb_sendauth.3 */
+int krb_sendauth __P((long options, int fd, KTEXT ticket, char *service,
+    char *inst, char *realm, u_long checksum, MSG_DAT *msg_data,
+    CREDENTIALS *cred, Key_schedule schedule, struct sockaddr_in *laddr,
+    struct sockaddr_in *faddr, char *version));
+int krb_recvauth __P((long options, int fd, KTEXT ticket, char *service,
+    char *instance, struct sockaddr_in *faddr, struct sockaddr_in *laddr,
+    AUTH_DAT *kdata, char *filename, Key_schedule schedule, char *version));
+int krb_net_write __P((int fd, char *buf, int len));
+int krb_net_read __P((int fd, char *buf, int len));
+
+/* libkrb - krb_realmofhost.3 */
+char *krb_realmofhost __P((char *host));
+char *krb_get_phost __P((char *alias));
+int krb_get_krbhst __P((char *h, char *r, int n));
+int krb_get_admhst __P((char *h, char *r, int n));
+int krb_get_lrealm __P((char *r, int n));
+
+/* libkrb - krb_set_tkt_string.3 */
+void krb_set_tkt_string(char *val);
+
+/* libkrb - kuserok.3 */
+int kuserok __P((AUTH_DAT *authdata, char *localuser));
+
+/* libkrb - tf_util.3 */
+int tf_init __P((char *tf_name, int rw));
+int tf_get_pname __P((char *p));
+int tf_get_pinst __P((char *inst));
+int tf_get_cred __P((CREDENTIALS *c));
+void tf_close __P((void));
+
+/* Internal routines */
+int des_read __P((int fd, char *buf, int len));
+int des_write __P((int fd, char *buf, int len));
+int krb_get_tf_realm __P((char *ticket_file, char *realm));
+int krb_get_in_tkt __P((char *user, char *instance, char *realm, char *service,
+    char *sinstance, int life, int (*key_proc)(), int (*decrypt_proc)(),
+    char *arg));
+int krb_get_pw_in_tkt __P((char *user, char *instance, char *realm,
+    char *service, char *sinstance, int life, char *password));
+int krb_get_svc_in_tkt __P((char *user, char *instance, char *realm,
+    char *service, char *sinstance, int life, char *srvtab));
+int krb_get_tf_fullname __P((char *ticket_file, char *name, char *instance,
+    char *realm));
+int save_credentials __P((char *service, char *instance, char *realm,
+    des_cblock session, int lifetime, int kvno, KTEXT ticket, long issue_date));
+int read_service_key __P((char *service, char *instance, char *realm, int kvno,
+    char *file, char *key));
+int get_ad_tkt __P((char *service, char *sinstance, char *realm, int lifetime));
+int send_to_kdc __P((KTEXT pkt, KTEXT rpkt, char *realm));
+int krb_create_ticket __P((KTEXT tkt, unsigned char flags, char *pname,
+    char *pinstance, char *prealm, long paddress, char *session, short life,
+    long time_sec, char *sname, char *sinstance, C_Block key));
+int decomp_ticket __P((KTEXT tkt, unsigned char *flags, char *pname,
+    char *pinstance, char *prealm, unsigned long *paddress, des_cblock session,
+    int *life, unsigned long *time_sec, char *sname, char *sinstance,
+    des_cblock key, des_key_schedule key_s));
+int create_ciph __P((KTEXT c, C_Block session, char *service, char *instance,
+    char *realm, unsigned long life, int kvno, KTEXT tkt,
+    unsigned long kdc_time, C_Block key));
+int kname_parse __P((char *np, char *ip, char *rp, char *fullname));
+int tf_save_cred __P((char *service, char *instance, char *realm,
+    des_cblock session, int lifetime, int kvno, KTEXT ticket, long issue_date));
+int getst(int fd, char *s, int n));
+int pkt_clen __P((KTEXT pkt));
+int in_tkt __P((char *pname, char *pinst));
+int dest_tkt __P((void));
+char *month_sname __P((int n));
+void log __P(()); /* Actually VARARGS - markm */
+void kset_logfile __P((char *filename));
+void set_logfile __P((char *filename));
+int k_isinst __P((char *s));
+int k_isrealm __P((char *s));
+int k_isname __P((char *s));
+int k_gethostname __P((char *name, int namelen));
+int kerb_init __P((void));
+void kerb_fini __P((void));
+int kerb_db_set_name __P((char *name));
+int kerb_db_set_lockmode __P((int mode));
+int kerb_db_create __P((char *db_name));
+int kerb_db_iterate __P((int (*func)(), char *arg));
+int kerb_db_rename __P((char *from, char *to));
+long kerb_get_db_age __P((void));
+char * stime __P((long *t));
+
+long kdb_get_master_key __P((int prompt, C_Block master_key,
+    Key_schedule master_key_sched));
+long kdb_verify_master_key __P((C_Block master_key,
+    Key_schedule master_key_sched, FILE *out));
+void kdb_encrypt_key  __P((C_Block in, C_Block out, C_Block master_key,
+    Key_schedule master_key_sched, int e_d_flag));
+
+extern int krb_ap_req_debug;
+extern int krb_debug;
+
 #endif	KRB_DEFS
@@ -14,7 +14,7 @@
 * sources.
 *
 *	from: krb_conf.h,v 4.0 89/01/23 09:59:27 jtkohl Exp $
- *	$Id: krb_conf.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
+ *	$Id: krb_conf.h,v 1.3 1995/07/18 16:36:36 mark Exp $
 */

 #ifndef KRB_CONF_DEFS
@@ -11,7 +11,7 @@
 * They MUST correspond to those defined in *.rel
 *
 *	from: krb_db.h,v 4.9 89/01/24 17:55:39 jon Exp $
- *	$Id: krb_db.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
+ *	$Id: krb_db.h,v 1.4 1995/08/25 21:25:12 mark Exp $
 */

 #ifndef KRB_DB_DEFS
@@ -90,11 +90,21 @@ typedef struct {
 }
        Dba;

-extern int kerb_get_principal();
-extern int kerb_put_principal();
-extern int kerb_db_get_stat();
-extern int kerb_db_put_stat();
-extern int kerb_get_dba();
-extern int kerb_db_get_dba();
+extern int kerb_get_principal(char *name, char *inst, Principal *principal,
+    unsigned int max, int *more);
+extern int kerb_put_principal(Principal *principal, unsigned int n);
+extern void kerb_db_get_stat(DB_stat *s);
+extern void kerb_db_put_stat(DB_stat *s);
+extern int kerb_get_dba(char *name, char *inst, Dba *dba, unsigned int max,
+    int *more);
+extern int kerb_db_get_dba(char *dba_name, char *dba_inst, Dba *dba,
+    unsigned int max, int *more);
+
+extern void krb_print_principal(Principal *p);
+extern int kerb_db_get_principal(char *name, char *inst, Principal *principal,
+    unsigned int max, int *more);
+extern int kerb_db_put_principal(Principal *principal, unsigned int max);
+extern int kerb_db_init(void);
+extern void kerb_db_fini(void);

 #endif /* KRB_DB_DEFS */
@@ -7,7 +7,7 @@
 * byte-order quantities
 *
 *	from: lsb_addr_comp.h,v 4.0 89/01/23 15:44:46 jtkohl Exp $
- *	$Id: lsb_addr_comp.h,v 1.2 1994/07/19 19:23:21 g89r4222 Exp $
+ *	$Id: lsb_addr_comp.h,v 1.3 1995/07/18 16:36:39 mark Exp $
 */

 #ifndef LSB_ADDR_COMP_DEFS
@@ -1,20 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
@@ -6,7 +6,7 @@
 * Athena configuration.
 *
 *	from: osconf.h,v 4.4 89/12/19 13:26:27 jtkohl Exp $
- *	$Id: osconf.h,v 1.2 1994/07/19 19:23:22 g89r4222 Exp $
+ *	$Id: osconf.h,v 1.3 1995/07/18 16:36:41 mark Exp $
 */

 #ifdef tahoe
@@ -6,7 +6,7 @@
 * Include file for password server
 *
 *	from: passwd_server.h,v 4.6 89/01/11 15:12:22 steiner Exp $
- *	$Id: passwd_server.h,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
+ *	$Id: passwd_server.h,v 1.3 1995/07/18 16:36:43 mark Exp $
 */

 #ifndef PASSWD_SERVER_DEFS