3 files changed, 106 insertions, 10 deletions

diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index a5023c0d47de..0bb69379981e 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -21,6 +21,7 @@ CFLAGS+=-DARCH_REP=\"${MACHINE}\"
 CFLAGS+=-DOS_REP=\"${OS}\"
 CFLAGS+=-DOS_HDR=\"os-${OS}.h\"
 CFLAGS+=${CONFIG}
+CFLAGS+=-D_NEW_VFSCONF
 CLEANFILES+=vers.${PROG}.c vers.${PROG}.o version.amd
 
 vers.${PROG}.c: ${SRCS:.c=.o}
diff --git a/usr.sbin/amd/config/misc-bsd44l.h b/usr.sbin/amd/config/misc-bsd44l.h
new file mode 100644
index 000000000000..d252a97ccf27
--- /dev/null
+++ b/usr.sbin/amd/config/misc-bsd44l.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1995 Jan-Simon Pendry
+ * Copyright (c) 1995
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry.
+ *
+ * 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.
+ *
+ *	@(#)misc-bsd44l.h	8.1 (Berkeley) 5/10/95
+ *
+ */
+
+#define M_NEWTYPE	0
+#define NFS_NPROCS	26
+struct nfs_fattr;
+union nfsfh;
+typedef union nfsfh nfsfh_t;
+
+#include <sys/ucred.h>
+#define mount __kern_mount
+#include <sys/mount.h>
+#undef mount
+#include <nfs/rpcv2.h>
+#define KERNEL
+#define nfs_init __kern_nfs_init
+#include <nfs/nfs.h>
+#undef nfs_init
+#undef KERNEL
+
+#include <ufs/ufs/ufsmount.h>
diff --git a/usr.sbin/amd/config/os-bsd44.h b/usr.sbin/amd/config/os-bsd44.h
index b352b00e86cb..0701e9ee74a3 100644
--- a/usr.sbin/amd/config/os-bsd44.h
+++ b/usr.sbin/amd/config/os-bsd44.h
@@ -35,9 +35,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)os-bsd44.h	8.1 (Berkeley) 6/6/93
+ *	@(#)os-bsd44.h	8.2 (Berkeley) 5/10/95
  *
- * $Id$
+ * $Id: os-bsd44.h,v 5.2.2.1 1992/02/09 15:10:11 jsp beta $
  *
  * 4.4 BSD definitions for Amd (automounter)
  */
@@ -54,6 +54,12 @@
  */
 #define	RPC_4
 
+#include <sys/param.h>
+#if BSD >= 199506
+#define NFS_HDR "misc-bsd44l.h"
+#define UFS_HDR "misc-bsd44l.h"
+#endif
+
 /*
  * Which version of the NFS interface are we using.
  * This is the implementation release number, not
@@ -88,14 +94,6 @@
  */
 #undef	MNTENT_HDR
 
-/*
- * Name of filesystem types
- */
-#define	MOUNT_TYPE_NFS	MOUNT_NFS
-#define	MOUNT_TYPE_UFS	MOUNT_UFS
-#undef MTAB_TYPE_UFS
-#define	MTAB_TYPE_UFS	"ufs"
-#define	MTAB_TYPE_MFS	"mfs"
 
 /*
  * How to unmount filesystems
@@ -108,12 +106,31 @@
  * How to copy an address into an NFS filehandle
  */
 #undef NFS_SA_DREF
+#if BSD >= 199506
 #define	NFS_SA_DREF(dst, src) { \
 		(dst).addr = (struct sockaddr *) (src); \
 		(dst).addrlen = sizeof(*src); \
 		(dst).sotype = SOCK_DGRAM; \
 		(dst).proto = 0; \
+		(dst).fhsize = FHSIZE; \
+		(dst).wsize = NFS_WSIZE; \
+		(dst).rsize =  NFS_RSIZE; \
+		(dst).readdirsize =  NFS_READDIRSIZE; \
+		(dst).timeo = 10; \
+		(dst).retrans = NFS_RETRANS; \
+		(dst).maxgrouplist = NFS_MAXGRPS; \
+		(dst).readahead = NFS_DEFRAHEAD; \
+		(dst).leaseterm = 0; \
+		(dst).deadthresh = 0; \
 	}
+#else
+#define	NFS_SA_DREF(dst, src) { \
+		(dst).addr = (struct sockaddr *) (src); \
+		(dst).addrlen = sizeof(*src); \
+		(dst).sotype = SOCK_DGRAM; \
+		(dst).proto = 0; \
+	}
+#endif
 
 /*
  * Byte ordering
@@ -195,7 +212,27 @@ struct mntent {
  */
 #undef RE_HDR
 #define RE_HDR <regexp.h>
+
 /*
  * Need precise length links
  */
 #define PRECISE_SYMLINKS
+
+#if BSD >= 199506
+#undef MTYPE_TYPE
+#define MTYPE_TYPE	char *
+#endif
+
+struct mount;
+#define mount __kern_mount	/* fsinfo also uses "struct mount" */
+#include <sys/mount.h>
+#undef mount
+
+/*
+ * Name of filesystem types
+ */
+#define	MOUNT_TYPE_NFS	"nfs"
+#define	MOUNT_TYPE_UFS	"ufs"
+#undef MTAB_TYPE_UFS
+#define	MTAB_TYPE_UFS	"ufs"
+#define	MTAB_TYPE_MFS	"mfs"