From owner-svn-src-all@FreeBSD.ORG  Thu Nov  6 10:53:36 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 148E91065675;
	Thu,  6 Nov 2008 10:53:36 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 033E48FC25;
	Thu,  6 Nov 2008 10:53:36 +0000 (UTC) (envelope-from des@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 mA6ArZ9B053714;
	Thu, 6 Nov 2008 10:53:35 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA6ArZri053711;
	Thu, 6 Nov 2008 10:53:35 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200811061053.mA6ArZri053711@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 6 Nov 2008 10:53:35 +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: r184716 - in head/sys: modules/krpc modules/nfsserver
	nfsserver
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Nov 2008 10:53:36 -0000

Author: des
Date: Thu Nov  6 10:53:35 2008
New Revision: 184716
URL: http://svn.freebsd.org/changeset/base/184716

Log:
  Unbreak NFS.
  
  Pointy hat to:	dfr

Modified:
  head/sys/modules/krpc/Makefile
  head/sys/modules/nfsserver/Makefile
  head/sys/nfsserver/nfs_srvsubs.c

Modified: head/sys/modules/krpc/Makefile
==============================================================================
--- head/sys/modules/krpc/Makefile	Thu Nov  6 10:35:46 2008	(r184715)
+++ head/sys/modules/krpc/Makefile	Thu Nov  6 10:53:35 2008	(r184716)
@@ -16,6 +16,7 @@ SRCS=	auth_none.c \
 	rpc_prot.c \
 	rpcb_clnt.c \
 	rpcb_prot.c \
+	replay.c \
 	svc.c \
 	svc_auth.c \
 	svc_auth_unix.c \

Modified: head/sys/modules/nfsserver/Makefile
==============================================================================
--- head/sys/modules/nfsserver/Makefile	Thu Nov  6 10:35:46 2008	(r184715)
+++ head/sys/modules/nfsserver/Makefile	Thu Nov  6 10:53:35 2008	(r184716)
@@ -3,8 +3,8 @@
 .PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs
 KMOD=	nfsserver
 SRCS=	vnode_if.h \
-	nfs_serv.c nfs_srvkrpc.c nfs_srvsock.c nfs_srvcache.c nfs_srvsubs.c \
-	nfs_syscalls.c nfs_common.c \
+	nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsock.c nfs_srvcache.c \
+	nfs_srvsubs.c nfs_syscalls.c nfs_common.c \
 	opt_mac.h \
 	opt_nfs.h
 SRCS+=	opt_inet6.h

Modified: head/sys/nfsserver/nfs_srvsubs.c
==============================================================================
--- head/sys/nfsserver/nfs_srvsubs.c	Thu Nov  6 10:35:46 2008	(r184715)
+++ head/sys/nfsserver/nfs_srvsubs.c	Thu Nov  6 10:53:35 2008	(r184716)
@@ -596,6 +596,7 @@ DECLARE_MODULE(nfsserver, nfsserver_mod,
 
 /* So that loader and kldload(2) can find us, wherever we are.. */
 MODULE_VERSION(nfsserver, 1);
+MODULE_DEPEND(nfsserver, krpc, 1, 1, 1);
 
 /*
  * Set up nameidata for a lookup() call and do it.