Index: etc/defaults/rc.conf
===================================================================
RCS file: /usr/home/ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.298
diff -u -r1.298 rc.conf
--- etc/defaults/rc.conf	6 Oct 2006 23:22:12 -0000	1.298
+++ etc/defaults/rc.conf	13 Oct 2006 13:55:00 -0000
@@ -242,6 +242,7 @@
 nfs_access_cache="60"		# Client cache timeout in seconds
 nfs_server_enable="NO"		# This host is an NFS server (or NO).
 nfs_server_flags="-u -t -n 4"	# Flags to nfsd (if enabled).
+idmapd_enable="NO"		# Run the NFS4 id mapper (YES/NO).
 mountd_enable="NO"		# Run mountd (or NO).
 mountd_flags="-r"		# Flags to mountd (if NFS server enabled).
 weak_mountd_authentication="NO"	# Allow non-root mount requests to be served.
Index: etc/rc.d/Makefile
===================================================================
RCS file: /usr/home/ncvs/src/etc/rc.d/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- etc/rc.d/Makefile	7 Oct 2006 15:45:56 -0000	1.77
+++ etc/rc.d/Makefile	13 Oct 2006 12:24:26 -0000
@@ -15,7 +15,7 @@
 	gbde geli geli2 \
 	hcsecd \
 	hostapd hostname \
-	inetd initrandom \
+	idmapd inetd initrandom \
 	ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \
 	ipnat ipsec ipxrouted isdnd \
 	jail \
Index: etc/rc.d/idmapd
===================================================================
RCS file: etc/rc.d/idmapd
diff -N etc/rc.d/idmapd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ etc/rc.d/idmapd	13 Oct 2006 13:30:53 -0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: idmapd
+# REQUIRE: rpcbind
+# KEYWORD: nojail
+
+. /etc/rc.subr
+
+name="idmapd"
+
+load_rc_config $name
+rcvar="idmapd_enable"
+command="${idmapd:-/sbin/${name}}"
+eval ${name}_flags=\"${idmapd_flags}\"
+run_rc_command "$1"
Index: sbin/Makefile
===================================================================
RCS file: /usr/home/ncvs/src/sbin/Makefile,v
retrieving revision 1.162
diff -u -r1.162 Makefile
--- sbin/Makefile	27 Jul 2006 17:50:05 -0000	1.162
+++ sbin/Makefile	13 Oct 2006 12:19:34 -0000
@@ -36,6 +36,7 @@
 	gpt \
 	growfs \
 	gvinum \
+	idmapd \
 	ifconfig \
 	init \
 	${_ipf} \
Index: sbin/idmapd/Makefile
===================================================================
RCS file: /usr/home/ncvs/src/sbin/idmapd/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sbin/idmapd/Makefile	28 Jan 2005 16:08:06 -0000	1.3
+++ sbin/idmapd/Makefile	13 Oct 2006 12:20:00 -0000
@@ -5,9 +5,7 @@
 PROG=	idmapd
 MAN=	idmapd.8
 
-CFLAGS+= -DNFS -I/usr/src/sys
+CFLAGS+= -DNFS -I${.CURDIR}/../../sys
 WARNS?=	2
 
-.PATH:
-
 .include <bsd.prog.mk>
Index: sbin/idmapd/idmapd.8
===================================================================
RCS file: /usr/home/ncvs/src/sbin/idmapd/idmapd.8,v
retrieving revision 1.4
diff -u -r1.4 idmapd.8
--- sbin/idmapd/idmapd.8	21 Jan 2005 10:27:44 -0000	1.4
+++ sbin/idmapd/idmapd.8	13 Oct 2006 12:20:31 -0000
@@ -22,7 +22,7 @@
 .\"
 .\" $FreeBSD: src/sbin/idmapd/idmapd.8,v 1.4 2005/01/21 10:27:44 ru Exp $
 .\"
-.Dd November 14, 2003
+.Dd October 13, 2006
 .Dt IDMAPD 8
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm
 daemon normally runs in the background and services UID/GID-to-name and
 name-to-UID/GID mapping
-requests from the NFSv4 client.
+requests from the NFSv4 client kernel threads.
 .Pp
 The options are:
 .Bl -tag -width indent
@@ -60,4 +60,4 @@
 .Sh SEE ALSO
 .Xr getpwnam 3 ,
 .Xr getpwuid 3 ,
-.Xr mount_nfs 8
+.Xr mount_nfs4 8