From owner-svn-src-head@FreeBSD.ORG  Fri May 22 13:56:16 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8FB86106566B;
	Fri, 22 May 2009 13:56:16 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7EB8F8FC12;
	Fri, 22 May 2009 13:56:16 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4MDuG8i008184;
	Fri, 22 May 2009 13:56:16 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4MDuG4i008182;
	Fri, 22 May 2009 13:56:16 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200905221356.n4MDuG4i008182@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 22 May 2009 13:56:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192579 - in head/etc: defaults rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 May 2009 13:56:17 -0000

Author: rwatson
Date: Fri May 22 13:56:16 2009
New Revision: 192579
URL: http://svn.freebsd.org/changeset/base/192579

Log:
  Further idmapd garbage collection -- remove rc.d Makefile reference and
  default settings.
  
  Submitted by:	Pawel Worach <pawel.worach at gmail.com>

Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/Makefile

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Fri May 22 12:35:12 2009	(r192578)
+++ head/etc/defaults/rc.conf	Fri May 22 13:56:16 2009	(r192579)
@@ -300,8 +300,6 @@ nfs_client_enable="NO"		# This host is a
 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).
-idmapd_flags=""			# Additional flags for idmapd.
 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.

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Fri May 22 12:35:12 2009	(r192578)
+++ head/etc/rc.d/Makefile	Fri May 22 13:56:16 2009	(r192579)
@@ -14,7 +14,7 @@ FILES=	DAEMON FILESYSTEMS LOGIN NETWORKI
 	gbde geli geli2 gssd \
 	hcsecd \
 	hostapd hostid hostname \
-	idmapd inetd initrandom \
+	inetd initrandom \
 	ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \
 	ipnat ipsec ipxrouted \
 	jail \