Index: src/etc/defaults/rc.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.232
diff -u -r1.232 rc.conf
--- src/etc/defaults/rc.conf	23 Nov 2004 20:09:58 -0000	1.232
+++ src/etc/defaults/rc.conf	1 Dec 2004 21:52:35 -0000
@@ -61,7 +61,7 @@
 fsck_y_enable="NO"	# Set to YES to do fsck -y if the initial preen fails.
 background_fsck="YES"	# Attempt to run fsck in the background where possible.
 background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
-netfs_types="nfs:NFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems.
+netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems.
 extra_netfs_types="NO"	# List of network extra filesystem types for delayed
 			# mount at startup (or NO).
 
Index: src/sbin/Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/Makefile,v
retrieving revision 1.133
diff -u -r1.133 Makefile
--- src/sbin/Makefile	17 Jan 2004 00:31:38 -0000	1.133
+++ src/sbin/Makefile	1 Dec 2004 21:52:35 -0000
@@ -31,6 +31,7 @@
 	gbde \
 	${_gpt} \
 	growfs \
+	idmapd \
 	ifconfig \
 	init \
 	${_ip6fw} \
Index: src/sys/nfs4client/nfs4_vfs_subs.c
===================================================================
RCS file: /home/ncvs/src/sys/nfs4client/nfs4_vfs_subs.c,v
retrieving revision 1.1
diff -u -r1.1 nfs4_vfs_subs.c
--- src/sys/nfs4client/nfs4_vfs_subs.c	14 Nov 2003 20:54:08 -0000	1.1
+++ src/sys/nfs4client/nfs4_vfs_subs.c	1 Dec 2004 21:52:36 -0000
@@ -124,7 +124,6 @@
 {
 	struct nfsmount *nmp = VFSTONFS(mp);
 
-	sbp->f_flags = nmp->nm_flag;
 	sbp->f_iosize = nfs_iosize(nmp);
 	sbp->f_bsize = NFS_FABLKSIZE;
 
Index: src/sys/nfs4client/nfs4_vfsops.c
===================================================================
RCS file: /home/ncvs/src/sys/nfs4client/nfs4_vfsops.c,v
retrieving revision 1.11
diff -u -r1.11 nfs4_vfsops.c
--- src/sys/nfs4client/nfs4_vfsops.c	30 Jul 2004 22:08:52 -0000	1.11
+++ src/sys/nfs4client/nfs4_vfsops.c	1 Dec 2004 21:52:36 -0000
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/nfs4client/nfs4_vfsops.c,v 1.11 2004/07/30 22:08:52 phk Exp $ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vfsops.c,v 1.14 2004/11/09 22:21:10 phk Exp $ */
 /* $Id: nfs_vfsops.c,v 1.38 2003/11/05 14:59:01 rees Exp $ */
 
 /*
@@ -393,7 +393,7 @@
 	char hst[MNAMELEN];
 	size_t len;
 
-	if (path == NULL) {
+	if (mp->mnt_flag & MNT_ROOTFS) {
 		printf("NFSv4: nfs_mountroot not supported\n");
 		return EINVAL;
 	}
@@ -505,7 +505,7 @@
 			mtx_lock(&Giant);
 			nfs4_daemonproc = NULL;
 			mtx_unlock(&Giant);
-			printf("nfsv4 renewd exiting\n");
+			/*printf("nfsv4 renewd exiting\n");*/
 			kthread_exit(0);
 		}
 		tsleep(&nfs4_daemonproc, PVFS, "nfs4", 2 * hz);
Index: src/sys/nfs4client/nfs4_vnops.c
===================================================================
RCS file: /home/ncvs/src/sys/nfs4client/nfs4_vnops.c,v
retrieving revision 1.6
diff -u -r1.6 nfs4_vnops.c
--- src/sys/nfs4client/nfs4_vnops.c	28 Jul 2004 06:59:55 -0000	1.6
+++ src/sys/nfs4client/nfs4_vnops.c	1 Dec 2004 21:52:36 -0000
@@ -1576,7 +1576,7 @@
 	/* XXX */
 	/*FREE(cnp->cn_pnbuf, M_NAMEI);*/
 	if (error != 0 && newvp != NULL)
-		vrele(newvp);
+		vput(newvp);
 	else if (error == 0)
 		*vpp = newvp;