From owner-svn-src-user@FreeBSD.ORG Fri Nov 7 10:46:15 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB7FB106568A; Fri, 7 Nov 2008 10:46:15 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9A0098FC0A; Fri, 7 Nov 2008 10:46:15 +0000 (UTC) (envelope-from dfr@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 mA7AkFQV081710; Fri, 7 Nov 2008 10:46:15 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA7AkFRG081706; Fri, 7 Nov 2008 10:46:15 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200811071046.mA7AkFRG081706@svn.freebsd.org> From: Doug Rabson Date: Fri, 7 Nov 2008 10:46:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184745 - in user/dfr/gssapi/7/sys: . modules/krpc modules/nfsserver nfsserver X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2008 10:46:15 -0000 Author: dfr Date: Fri Nov 7 10:46:15 2008 New Revision: 184745 URL: http://svn.freebsd.org/changeset/base/184745 Log: MFC: 184716,184719,184744 Modified: user/dfr/gssapi/7/sys/ (props changed) user/dfr/gssapi/7/sys/modules/krpc/Makefile user/dfr/gssapi/7/sys/modules/nfsserver/Makefile user/dfr/gssapi/7/sys/nfsserver/nfs_fha.c user/dfr/gssapi/7/sys/nfsserver/nfs_srvsubs.c Modified: user/dfr/gssapi/7/sys/modules/krpc/Makefile ============================================================================== --- user/dfr/gssapi/7/sys/modules/krpc/Makefile Fri Nov 7 10:43:01 2008 (r184744) +++ user/dfr/gssapi/7/sys/modules/krpc/Makefile Fri Nov 7 10:46:15 2008 (r184745) @@ -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: user/dfr/gssapi/7/sys/modules/nfsserver/Makefile ============================================================================== --- user/dfr/gssapi/7/sys/modules/nfsserver/Makefile Fri Nov 7 10:43:01 2008 (r184744) +++ user/dfr/gssapi/7/sys/modules/nfsserver/Makefile Fri Nov 7 10:46:15 2008 (r184745) @@ -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: user/dfr/gssapi/7/sys/nfsserver/nfs_fha.c ============================================================================== --- user/dfr/gssapi/7/sys/nfsserver/nfs_fha.c Fri Nov 7 10:43:01 2008 (r184744) +++ user/dfr/gssapi/7/sys/nfsserver/nfs_fha.c Fri Nov 7 10:46:15 2008 (r184745) @@ -180,11 +180,16 @@ fha_extract_info(struct svc_req *req, st i->locktype = LK_EXCLUSIVE; /* - * Extract the procnum and convert to v3 form if necessary. + * Extract the procnum and convert to v3 form if necessary, + * taking care to deal with out-of-range procnums. Caller will + * ensure that rq_vers is either 2 or 3. */ procnum = req->rq_proc; - if (!v3) + if (!v3) { + if (procnum > NFSV2PROC_STATFS) + goto out; procnum = nfsrv_nfsv3_procid[procnum]; + } /* * We do affinity for most. However, we divide a realm of affinity Modified: user/dfr/gssapi/7/sys/nfsserver/nfs_srvsubs.c ============================================================================== --- user/dfr/gssapi/7/sys/nfsserver/nfs_srvsubs.c Fri Nov 7 10:43:01 2008 (r184744) +++ user/dfr/gssapi/7/sys/nfsserver/nfs_srvsubs.c Fri Nov 7 10:46:15 2008 (r184745) @@ -596,6 +596,9 @@ DECLARE_MODULE(nfsserver, nfsserver_mod, /* So that loader and kldload(2) can find us, wherever we are.. */ MODULE_VERSION(nfsserver, 1); +#ifndef NFS_LEGACYRPC +MODULE_DEPEND(nfsserver, krpc, 1, 1, 1); +#endif /* * Set up nameidata for a lookup() call and do it.