Revert prior commit to restore the files mangled by my "fixing" merge

conflicts for a git rebase I tried to do.

2 files changed, 26 insertions, 33 deletions

diff --git a/release/picobsd/tinyware/passwd/extern.h b/release/picobsd/tinyware/passwd/extern.h
index 26de2fd4dd21..eae768c6e82a 100644
--- a/release/picobsd/tinyware/passwd/extern.h
+++ b/release/picobsd/tinyware/passwd/extern.h
@@ -1,6 +1,6 @@
-/*-
- * Copyright (c) 1982, 1986, 1988, 1993
- *      The Regents of the University of California.  All rights reserved.
+/*
+ * Copyright (c) 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
@@ -10,7 +10,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -26,17 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ *	From: @(#)extern.h	8.1 (Berkeley) 4/2/94
  * $FreeBSD$
  */
 
-#ifndef _NETINET_IP6_IPSEC_H_
-#define _NETINET_IP6_IPSEC_H_
-
-int	ip6_ipsec_filtertunnel(struct mbuf *);
-int	ip6_ipsec_fwd(struct mbuf *);
-int	ip6_ipsec_input(struct mbuf *, int);
-int	ip6_ipsec_output(struct mbuf **, struct inpcb *, int *);
-#if 0
-int	ip6_ipsec_mtu(struct mbuf *);
-#endif
-#endif
+int	krb_passwd(char *, char *, char *, char *);
+int	local_passwd(char *);
diff --git a/release/picobsd/tinyware/passwd/pw_util.h b/release/picobsd/tinyware/passwd/pw_util.h
index 45c70d4ac9db..1000a9abdc7f 100644
--- a/release/picobsd/tinyware/passwd/pw_util.h
+++ b/release/picobsd/tinyware/passwd/pw_util.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1987, 1988, 1993
+ * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -10,7 +10,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -26,22 +30,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
+ *	@(#)pw_util.h	8.2 (Berkeley) 4/1/94
+ *
  * $FreeBSD$
  */
 
-#ifndef _SYS_DISKPC98_H_
-#define	_SYS_DISKPC98_H_
-
-#include <sys/disk/pc98.h>
-#include <sys/ioccom.h>
-
-#define	DOSMID_386BSD		__DOSMID_386BSD
-#define	DOSSID_386BSD		__DOSSID_386BSD
-
-void pc98_partition_dec(void const *pp, struct pc98_partition *d);
-void pc98_partition_enc(void *pp, struct pc98_partition *d);
-
-#define DIOCSPC98	_IOW('M', 129, u_char[8192])
-
-#endif /* !_SYS_DISKPC98_H_ */
+void	pw_edit(int);
+void	pw_error(const char *, int, int);
+void	pw_init(void);
+int	pw_lock(void);
+int	pw_mkdb(const char *);
+void	pw_prompt(void);
+int	pw_tmp(void);