head	1.35;
access;
symbols
	RELENG_8_4:1.33.0.2
	RELENG_9_1_0_RELEASE:1.32.2.1.4.2
	RELENG_9_1:1.32.2.1.0.4
	RELENG_9_1_BP:1.32.2.1
	RELENG_8_3_0_RELEASE:1.31.2.2.6.1
	RELENG_8_3:1.31.2.2.0.6
	RELENG_8_3_BP:1.31.2.2
	RELENG_9_0_0_RELEASE:1.32.2.1.2.1
	RELENG_9_0:1.32.2.1.0.2
	RELENG_9_0_BP:1.32.2.1
	RELENG_9:1.32.0.2
	RELENG_9_BP:1.32
	RELENG_7_4_0_RELEASE:1.26.12.1
	RELENG_8_2_0_RELEASE:1.31.2.2.4.1
	RELENG_7_4:1.26.0.12
	RELENG_7_4_BP:1.26
	RELENG_8_2:1.31.2.2.0.4
	RELENG_8_2_BP:1.31.2.2
	RELENG_8_1_0_RELEASE:1.31.2.2.2.1
	RELENG_8_1:1.31.2.2.0.2
	RELENG_8_1_BP:1.31.2.2
	RELENG_7_3_0_RELEASE:1.26.10.1
	RELENG_7_3:1.26.0.10
	RELENG_7_3_BP:1.26
	RELENG_8_0_0_RELEASE:1.31.2.1.2.1
	RELENG_8_0:1.31.2.1.0.2
	RELENG_8_0_BP:1.31.2.1
	RELENG_8:1.31.0.2
	RELENG_8_BP:1.31
	RELENG_7_2_0_RELEASE:1.26.8.1
	RELENG_7_2:1.26.0.8
	RELENG_7_2_BP:1.26
	RELENG_7_1_0_RELEASE:1.26.6.1
	RELENG_6_4_0_RELEASE:1.25.14.1.8.1
	RELENG_7_1:1.26.0.6
	RELENG_7_1_BP:1.26
	RELENG_6_4:1.25.14.1.0.8
	RELENG_6_4_BP:1.25.14.1
	RELENG_7_0_0_RELEASE:1.26
	RELENG_6_3_0_RELEASE:1.25.14.1
	RELENG_7_0:1.26.0.4
	RELENG_7_0_BP:1.26
	RELENG_6_3:1.25.14.1.0.6
	RELENG_6_3_BP:1.25.14.1
	RELENG_7:1.26.0.2
	RELENG_7_BP:1.26
	RELENG_6_2_0_RELEASE:1.25.14.1
	RELENG_6_2:1.25.14.1.0.4
	RELENG_6_2_BP:1.25.14.1
	RELENG_5_5_0_RELEASE:1.25
	RELENG_5_5:1.25.0.18
	RELENG_5_5_BP:1.25
	RELENG_6_1_0_RELEASE:1.25.14.1
	RELENG_6_1:1.25.14.1.0.2
	RELENG_6_1_BP:1.25.14.1
	RELENG_6_0_0_RELEASE:1.25
	RELENG_6_0:1.25.0.16
	RELENG_6_0_BP:1.25
	RELENG_6:1.25.0.14
	RELENG_6_BP:1.25
	RELENG_5_4_0_RELEASE:1.25
	RELENG_5_4:1.25.0.12
	RELENG_5_4_BP:1.25
	RELENG_5_3_0_RELEASE:1.25
	RELENG_5_3:1.25.0.10
	RELENG_5_3_BP:1.25
	RELENG_5:1.25.0.8
	RELENG_5_BP:1.25
	RELENG_5_2_1_RELEASE:1.25
	RELENG_5_2_0_RELEASE:1.25
	RELENG_5_2:1.25.0.6
	RELENG_5_2_BP:1.25
	RELENG_5_1_0_RELEASE:1.25
	RELENG_5_1:1.25.0.4
	RELENG_5_1_BP:1.25
	RELENG_5_0_0_RELEASE:1.25
	RELENG_5_0:1.25.0.2
	RELENG_5_0_BP:1.25
	KSE_MILESTONE_2:1.21
	KSE_PRE_MILESTONE_2:1.21
	old_RELENG_4_3_0_RELEASE:1.16
	old_RELENG_4_3:1.16.0.4
	old_RELENG_4_3_BP:1.16
	old_RELENG_4_2_0_RELEASE:1.16
	old_RELENG_4_1_1_RELEASE:1.16
	old_PRE_SMPNG:1.18
	old_RELENG_4_1_0_RELEASE:1.16
	old_RELENG_3_5_0_RELEASE:1.11.2.1
	old_RELENG_4_0_0_RELEASE:1.16
	old_RELENG_4:1.16.0.2
	old_RELENG_4_BP:1.16
	old_RELENG_3_4_0_RELEASE:1.11.2.1
	old_RELENG_3_3_0_RELEASE:1.11.2.1
	old_RELENG_3_2_PAO:1.11.0.4
	old_RELENG_3_2_PAO_BP:1.11
	old_RELENG_3_2_0_RELEASE:1.11
	old_POST_VFS_BIO_NFS_PATCH:1.11
	old_PRE_VFS_BIO_NFS_PATCH:1.11
	old_POST_SMP_VMSHARE:1.11
	old_PRE_SMP_VMSHARE:1.11
	old_POST_NEWBUS:1.11
	old_PRE_NEWBUS:1.11
	old_RELENG_3_1_0_RELEASE:1.11
	old_RELENG_3:1.11.0.2
	old_RELENG_3_BP:1.11
	old_RELENG_3_0_0_RELEASE:1.11
	old_old_RELENG_2_2_7_RELEASE:1.1
	old_old_RELENG_2_2_6_RELEASE:1.1
	old_old_RELENG_2_2_5_RELEASE:1.1
	old_old_RELENG_2_2_2_RELEASE:1.1
	old_old_RELENG_2_2_1_RELEASE:1.1
	old_old_RELENG_2_2_0_RELEASE:1.1
	old_old_RELENG_2_1_7_RELEASE:1.1
	old_old_RELENG_2_1_6_1_RELEASE:1.1
	old_old_RELENG_2_1_6_RELEASE:1.1
	old_old_RELENG_2_2:1.1.0.8
	old_old_RELENG_2_2_BP:1.1
	old_old_RELENG_2_1_5_RELEASE:1.1
	old_old_RELENG_2_1_0_RELEASE:1.1
	old_old_RELENG_2_1_0:1.1.0.6
	old_old_RELENG_2_1_0_BP:1.1
	old_old_RELENG_2_0_5_RELEASE:1.1
	old_old_RELENG_2_0_5:1.1.0.4
	old_old_RELENG_2_0_5_BP:1.1
	old_old_RELENG_2_0_5_ALPHA:1.1
	old_old_RELEASE_2_0:1.1
	old_old_BETA_2_0:1.1
	old_old_ALPHA_2_0:1.1.0.2;
locks; strict;
comment	@# @;


1.35
date	2013.04.18.00.43.20;	author svnexp;	state Exp;
branches;
next	1.34;

1.34
date	2013.04.18.00.40.25;	author svnexp;	state Exp;
branches;
next	1.33;

1.33
date	2012.11.17.01.52.59;	author svnexp;	state Exp;
branches
	1.33.2.1;
next	1.32;

1.32
date	2010.02.16.20.00.21;	author marius;	state Exp;
branches
	1.32.2.1;
next	1.31;

1.31
date	2009.06.30.19.03.27;	author dfr;	state Exp;
branches
	1.31.2.1;
next	1.30;

1.30
date	2009.06.06.17.01.44;	author rwatson;	state Exp;
branches;
next	1.29;

1.29
date	2008.11.25.16.11.41;	author dfr;	state Exp;
branches;
next	1.28;

1.28
date	2008.11.06.10.53.35;	author des;	state Exp;
branches;
next	1.27;

1.27
date	2008.11.03.10.38.00;	author dfr;	state Exp;
branches;
next	1.26;

1.26
date	2005.10.14.23.30.13;	author yar;	state Exp;
branches
	1.26.2.1
	1.26.6.1
	1.26.8.1
	1.26.10.1
	1.26.12.1;
next	1.25;

1.25
date	2002.11.04.15.13.35;	author rwatson;	state Exp;
branches
	1.25.14.1;
next	1.24;

1.24
date	2002.07.15.19.40.19;	author alfred;	state Exp;
branches;
next	1.23;

1.23
date	2002.01.11.15.48.55;	author ru;	state Exp;
branches;
next	1.22;

1.22
date	2001.09.18.23.31.38;	author peter;	state Exp;
branches;
next	1.21;

1.21
date	2001.04.18.08.33.52;	author alfred;	state Exp;
branches;
next	1.20;

1.20
date	2001.02.04.08.23.12;	author peter;	state Exp;
branches;
next	1.19;

1.19
date	2001.01.06.14.00.04;	author obrien;	state Exp;
branches;
next	1.18;

1.18
date	2000.05.27.01.14.06;	author peter;	state Exp;
branches;
next	1.17;

1.17
date	2000.05.04.12.08.04;	author peter;	state Exp;
branches;
next	1.16;

1.16
date	99.12.12.20.34.06;	author peter;	state Exp;
branches;
next	1.15;

1.15
date	99.12.12.16.47.28;	author peter;	state Exp;
branches;
next	1.14;

1.14
date	99.11.28.18.53.08;	author bde;	state Exp;
branches;
next	1.13;

1.13
date	99.11.02.04.16.17;	author green;	state Exp;
branches;
next	1.12;

1.12
date	99.08.28.00.47.29;	author peter;	state Exp;
branches;
next	1.11;

1.11
date	98.10.16.04.30.48;	author peter;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	98.07.07.02.27.09;	author bde;	state Exp;
branches;
next	1.9;

1.9
date	98.07.02.14.09.44;	author sos;	state Exp;
branches;
next	1.8;

1.8
date	98.06.30.11.29.01;	author jmg;	state Exp;
branches;
next	1.7;

1.7
date	98.06.30.11.19.20;	author jmg;	state Exp;
branches;
next	1.6;

1.6
date	98.02.06.23.54.23;	author eivind;	state Exp;
branches;
next	1.5;

1.5
date	98.02.04.21.56.37;	author eivind;	state Exp;
branches;
next	1.4;

1.4
date	98.01.09.01.01.21;	author eivind;	state Exp;
branches;
next	1.3;

1.3
date	97.02.22.12.48.40;	author peter;	state Exp;
branches;
next	1.2;

1.2
date	97.01.14.06.22.13;	author jkh;	state Exp;
branches;
next	1.1;

1.1
date	94.09.22.22.12.59;	author wollman;	state Exp;
branches;
next	;

1.33.2.1
date	2012.11.17.01.52.59;	author svnexp;	state dead;
branches;
next	1.33.2.2;

1.33.2.2
date	2013.03.28.13.05.22;	author svnexp;	state Exp;
branches;
next	;

1.32.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.32.2.1.2.1
	1.32.2.1.4.1;
next	1.32.2.2;

1.32.2.2
date	2012.11.17.11.37.18;	author svnexp;	state Exp;
branches;
next	1.32.2.3;

1.32.2.3
date	2013.06.12.00.01.46;	author svnexp;	state Exp;
branches;
next	;

1.32.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.32.2.1.2.2;

1.32.2.1.2.2
date	2012.11.17.08.37.14;	author svnexp;	state Exp;
branches;
next	;

1.32.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.32.2.1.4.2;

1.32.2.1.4.2
date	2012.11.17.08.48.05;	author svnexp;	state Exp;
branches;
next	;

1.31.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.31.2.1.2.1;
next	1.31.2.2;

1.31.2.2
date	2010.02.22.21.45.20;	author marius;	state Exp;
branches
	1.31.2.2.2.1
	1.31.2.2.4.1
	1.31.2.2.6.1;
next	1.31.2.3;

1.31.2.3
date	2012.11.17.10.36.57;	author svnexp;	state Exp;
branches;
next	;

1.31.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.31.2.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.31.2.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.31.2.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.31.2.2.6.2;

1.31.2.2.6.2
date	2012.11.17.08.25.33;	author svnexp;	state Exp;
branches;
next	;

1.26.2.1
date	2012.11.17.08.06.54;	author svnexp;	state Exp;
branches;
next	;

1.26.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.26.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.26.10.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.26.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.26.12.2;

1.26.12.2
date	2012.11.17.08.17.27;	author svnexp;	state Exp;
branches;
next	;

1.25.14.1
date	2006.02.10.00.38.05;	author yar;	state Exp;
branches
	1.25.14.1.8.1;
next	1.25.14.2;

1.25.14.2
date	2012.11.17.07.44.23;	author svnexp;	state Exp;
branches;
next	;

1.25.14.1.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.11.2.1
date	99.08.29.16.27.30;	author peter;	state Exp;
branches;
next	;


desc
@@


1.35
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249596
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/sys/modules/nfsserver/Makefile 249596 2013-04-17 22:42:43Z ken $

.PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs
KMOD=	nfsserver
SRCS=	vnode_if.h \
	nfs_fha.c nfs_fha_old.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c \
	opt_mac.h \
	opt_kgssapi.h \
	opt_nfs.h
SRCS+=	opt_inet6.h

.if !defined(KERNBUILDDIR)
NFS_INET6?=	1	# 0/1 - requires INET6 to be configured in kernel

.if ${NFS_INET6} > 0
opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}
.endif
.endif

.include <bsd.kmod.mk>
@


1.34
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249592
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: head/sys/modules/nfsserver/Makefile 249592 2013-04-17 21:00:22Z ken $
d3 1
a3 1
.PATH: ${.CURDIR}/../../nfsserver
@


1.33
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/sys/modules/nfsserver/Makefile 203968 2010-02-16 20:00:21Z marius $
d6 1
a6 1
	nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c \
@


1.33.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:22 +0000
@
text
@d1 21
@


1.33.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 21
# $FreeBSD: releng/8.4/sys/modules/nfsserver/Makefile 204224 2010-02-22 21:45:20Z marius $

.PATH: ${.CURDIR}/../../nfsserver
KMOD=	nfsserver
SRCS=	vnode_if.h \
	nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c \
	opt_mac.h \
	opt_kgssapi.h \
	opt_nfs.h
SRCS+=	opt_inet6.h

.if !defined(KERNBUILDDIR)
NFS_INET6?=	1	# 0/1 - requires INET6 to be configured in kernel

.if ${NFS_INET6} > 0
opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}
.endif
.endif

.include <bsd.kmod.mk>
@


1.32
log
@SVN rev 203968 on 2010-02-16 20:00:21Z by marius

Factor out the code shared between NFS client and server into its own
module. With r203732 it became apparent that creating the sysctl nodes
twice causes at least a warning, however the whole code shouldn't be
present twice in the first place.

Discussed with:	rmacklem
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.32.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.32.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/nfsserver/Makefile 203968 2010-02-16 20:00:21Z marius $
@


1.32.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251641
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/nfsserver/Makefile 251641 2013-06-11 23:19:02Z ken $
d3 1
a3 1
.PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs
d6 1
a6 1
	nfs_fha.c nfs_fha_old.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c \
@


1.32.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.32.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/nfsserver/Makefile 203968 2010-02-16 20:00:21Z marius $
@


1.32.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.32.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/nfsserver/Makefile 203968 2010-02-16 20:00:21Z marius $
@


1.31
log
@SVN rev 195202 on 2009-06-30 19:03:27Z by dfr

Remove the old kernel RPC implementation and the NFS_LEGACYRPC option.

Approved by: re
@
text
@d3 1
a3 1
.PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs
d6 1
a6 1
	nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c nfs_common.c \
@


1.31.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.31.2.2
log
@SVN rev 204224 on 2010-02-22 21:45:20Z by marius

- Factor out the code shared between NFS client and server into its own
  module so it's not present twice.
- Move nfs_realign() from the NFS client to the shared NFS code and
  remove the NFS server version in order to reduce code duplication.
  The shared version now uses a second parameter how, which is passed
  on to m_get(9) and m_getcl(9) as the server used M_WAIT while the
  client requires M_DONTWAIT, and replaces the the previously unused
  parameter hsiz.
- Change nfs_realign() to use nfsm_aligned() so as with other NFS code
  the alignment check isn't actually performed on platforms without
  strict alignment requirements for performance reasons because as the
  comment suggests unaligned data only occasionally occurs with TCP.
- Change fha_extract_info() to use nfs_realign() with M_DONTWAIT rather
  than M_WAIT because it's called with the RPC sp_lock held.
@
text
@d3 1
a3 1
.PATH: ${.CURDIR}/../../nfsserver
d6 1
a6 1
	nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c \
@


1.31.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/nfsserver/Makefile 204224 2010-02-22 21:45:20Z marius $
@


1.31.2.2.6.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.31.2.2.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/nfsserver/Makefile 204224 2010-02-22 21:45:20Z marius $
@


1.31.2.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.31.2.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.31.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.30
log
@SVN rev 193588 on 2009-06-06 17:01:44Z by rwatson

Remove opt_mac.h generation for various kernel modules that no longer
require it.

Submitted by:	pjd
@
text
@d6 2
a7 2
	nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsock.c nfs_srvcache.c \
	nfs_srvsubs.c nfs_syscalls.c nfs_common.c \
@


1.29
log
@SVN rev 185299 on 2008-11-25 16:11:41Z by dfr

Fix standalone module build by generating opt_kgssapi.h.

Submitted by:	n_hibma
@
text
@a7 1
	opt_mac.h \
@


1.28
log
@SVN rev 184716 on 2008-11-06 10:53:35Z by des

Unbreak NFS.

Pointy hat to:	dfr
@
text
@d9 1
@


1.27
log
@SVN rev 184588 on 2008-11-03 10:38:00Z by dfr

Implement support for RPCSEC_GSS authentication to both the NFS client
and server. This replaces the RPC implementation of the NFS client and
server with the newer RPC implementation originally developed
(actually ported from the userland sunrpc code) to support the NFS
Lock Manager.  I have tested this code extensively and I believe it is
stable and that performance is at least equal to the legacy RPC
implementation.

The NFS code currently contains support for both the new RPC
implementation and the older legacy implementation inherited from the
original NFS codebase. The default is to use the new implementation -
add the NFS_LEGACYRPC option to fall back to the old code. When I
merge this support back to RELENG_7, I will probably change this so
that users have to 'opt in' to get the new code.

To use RPCSEC_GSS on either client or server, you must build a kernel
which includes the KGSSAPI option and the crypto device. On the
userland side, you must build at least a new libc, mountd, mount_nfs
and gssd. You must install new versions of /etc/rc.d/gssd and
/etc/rc.d/nfsd and add 'gssd_enable=YES' to /etc/rc.conf.

As long as gssd is running, you should be able to mount an NFS
filesystem from a server that requires RPCSEC_GSS authentication. The
mount itself can happen without any kerberos credentials but all
access to the filesystem will be denied unless the accessing user has
a valid ticket file in the standard place (/tmp/krb5cc_<uid>). There
is currently no support for situations where the ticket file is in a
different place, such as when the user logged in via SSH and has
delegated credentials from that login. This restriction is also
present in Solaris and Linux. In theory, we could improve this in
future, possibly using Brooks Davis' implementation of variant
symlinks.

Supporting RPCSEC_GSS on a server is nearly as simple. You must create
service creds for the server in the form 'nfs/<fqdn>@@<REALM>' and
install them in /etc/krb5.keytab. The standard heimdal utility ktutil
makes this fairly easy. After the service creds have been created, you
can add a '-sec=krb5' option to /etc/exports and restart both mountd
and nfsd.

The only other difference an administrator should notice is that nfsd
doesn't fork to create service threads any more. In normal operation,
there will be two nfsd processes, one in userland waiting for TCP
connections and one in the kernel handling requests. The latter
process will create as many kthreads as required - these should be
visible via 'top -H'. The code has some support for varying the number
of service threads according to load but initially at least, nfsd uses
a fixed number of threads according to the value supplied to its '-n'
option.

Sponsored by:	Isilon Systems
MFC after:	1 month
@
text
@d6 2
a7 2
	nfs_serv.c nfs_srvkrpc.c nfs_srvsock.c nfs_srvcache.c nfs_srvsubs.c \
	nfs_syscalls.c nfs_common.c \
@


1.26
log
@Let modules use the kernel's opt_*.h files if built along with
the kernel by wrapping all targets for fake opt_*.h files in
.if defined(KERNBUILDDIR).  Thus, such fake files won't be
created at all if modules are built with the kernel.

Some modules undergo cleanup like removing unused or unneeded
options or .h files, without which they wouldn't build this way
or the other.

Reviewed by:	ru
Tested by:	no binary changes in modules built alone
Tested on:	i386 sparc64 amd64
@
text
@d6 2
a7 2
	nfs_serv.c nfs_srvsock.c nfs_srvcache.c nfs_srvsubs.c nfs_syscalls.c \
	nfs_common.c \
@


1.26.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/nfsserver/Makefile 151350 2005-10-14 23:30:17Z yar $
@


1.26.12.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.26.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/nfsserver/Makefile 151350 2005-10-14 23:30:17Z yar $
@


1.26.10.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.26.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.26.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.25
log
@Permit MAC policies to instrument the access control decisions for
system accounting configuration and for nfsd server thread attach.
Policies might use this to protect the integrity or confidentiality
of accounting data, limit the ability to turn on or off accounting,
as well as to prevent inappropriately labeled threads from becoming nfs
server threads.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories
@
text
@d11 2
d19 1
@


1.25.14.1
log
@MFC:
Avoid creating (and subsequently using) fake opt_*.h files
when the modules are built with the kernel and hence actual
opt_*.h files are available in ${KERNBUILDDIR}.  Fix a few
small bugs that would prevent this from working.

At last the build options of the modules become consistent
with those of the kernel unless the MODULES_WITH_WORLD way
still is used.

Approved by:	re (kensmith, scottl)
Requested by:	ru
Tested on:	amd64 i386 sparc64
Tested by:	md5
@
text
@a10 2

.if !defined(KERNBUILDDIR)
a16 1
.endif
@


1.25.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/modules/nfsserver/Makefile 155500 2006-02-10 00:38:08Z yar $
@


1.25.14.1.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.24
log
@Add IPv6 support.

Submitted by: Jean-Luc Richier <Jean-Luc.Richier@@imag.fr>
@
text
@d8 1
@


1.23
log
@Drop <bsd.man.mk> support from <bsd.kmod.mk>.

Not objected to by:	-current
@
text
@d9 7
@


1.22
log
@Cleanup and split of nfs client and server code.
This builds on the top of several repo-copies.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/nfsserver/Makefile,v 1.21 2001/04/18 08:33:52 alfred Exp $
a8 2

NOMAN=
@


1.21
log
@NFS module now requires nfs_lock.c
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/nfs/Makefile,v 1.20 2001/02/04 08:23:12 peter Exp $
d3 6
a8 1
.PATH: ${.CURDIR}/../../nfs
a9 6
KMOD=	nfs
SRCS=	vnode_if.h \
	nfs_bio.c nfs_lock.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
	nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
	nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h opt_bootp.h
NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
a10 5

.if ${NFS_INET} > 0
opt_inet.h:
	echo "#define INET 1" > ${.TARGET}
.endif
@


1.20
log
@Zap some bad examples:
opt_foo.h:
	touch opt_foo.h
.. is unnecessary - kmod.mk does this for us.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/nfs/Makefile,v 1.19 2001/01/06 14:00:04 obrien Exp $
d7 1
a7 1
	nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
@


1.19
log
@Use a consistent style and one much closer to the rest of /usr/src
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/nfs/Makefile,v 1.18 2000/05/27 01:14:06 peter Exp $
d13 1
a14 2
	touch ${.TARGET}
.if ${NFS_INET} > 0
@


1.18
log
@Use .include <bsd.kmod.mk> to get to ../../*/conf/kmod.mk instead of
encoding the relative path.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/nfs/Makefile,v 1.17 2000/05/04 12:08:04 peter Exp $
d4 1
@


1.17
log
@Pull in sys/conf/kmod.mk, rather than /usr/share/mk/bsd.kmod.mk.
This means that the kernel can be totally self contained now and is not
dependent on the last buildworld to update /usr/share/mk.  This might
also make it easier to build 5.x kernels on 4.0 boxes etc, assuming
gensetdefs and config(8) are updated.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/nfs/Makefile,v 1.16 1999/12/12 20:34:06 peter Exp $
d18 1
a18 1
.include "${.CURDIR}/../../conf/kmod.mk"
@


1.16
log
@Remove a whole bunch of "CFLAGS+= -DFSNAME" cruft.  It hasn't been
needed for ages, but keeps getting cut/pasted into new Makefiles.
(Once apon a time it was used to activate mount arguments in
 <sys/mount.h>, but that was killed with extreme prejudice long ago)
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/nfs/Makefile,v 1.15 1999/12/12 16:47:28 peter Exp $
d18 1
a18 1
.include <bsd.kmod.mk>
@


1.15
log
@Bring these more into line with other modules that have .h files generated
on the fly.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/nfs/Makefile,v 1.14 1999/11/28 18:53:08 bde Exp $
a10 1
CFLAGS+= -DNFS
@


1.14
log
@Removed special rules for building and cleaning device interface files
and empty options files.  The rules are now generated automatically in
bsd.kmod.mk.  Cleaned up related things ($S and ${CLEANFILES}).
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/nfs/Makefile,v 1.13 1999/11/02 04:16:17 green Exp $
d5 2
a6 1
SRCS=	nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
a10 1
VFS_KLD=
@


1.13
log
@Unbreak this build.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/nfs/Makefile,v 1.12 1999/08/28 00:47:29 peter Exp $
a11 1
CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_posix.h opt_bootp.h
a17 3

opt_nfs.h opt_vmpage.h opt_posix.h opt_bootp.h:
	touch ${.TARGET}
@


1.12
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d7 1
a7 1
	nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h
d12 1
a12 1
CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_posix.h
d20 1
a20 1
opt_nfs.h opt_vmpage.h opt_posix.h:
@


1.11
log
@Sample initial set of kld-ified modules.  Not all have been completely
converted yet.  These are more of a starting point.  This is NOT connected
to the parent Makefile.

OK'ed by jkh (who is ever so patiently waiting)
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.10 1998/07/07 02:27:09 bde Exp $
@


1.11.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.10
log
@Finished previous fix - don't forget to add one dummy options header
to CLEANFILES.

Fixed lots of style bugs.
@
text
@d1 1
a1 1
#	$Id$
d3 2
a4 2
.PATH: ${.CURDIR}/../../sys/nfs
KMOD=	nfs_mod
d10 1
a10 1
VFS_LKM=
d12 1
a12 1
CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h
d20 1
a20 1
opt_nfs.h opt_vmpage.h:
@


1.9
log
@Fix the N'th occurance of missed bits due to opt_???? mucking.

Doesn't anybody TEST code before committing....

This is the N+1'th time these laste couble of days...
@
text
@d1 1
a1 1
#       $Id: Makefile,v 1.8 1998/06/30 11:29:01 jmg Exp $
d3 4
a6 4
.PATH:  ${.CURDIR}/../../sys/nfs
KMOD=   nfs_mod
SRCS=   nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
        nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
a10 1

d12 1
a12 1
CLEANFILES+=	opt_inet.h opt_nfs.h
d15 1
a15 1
	touch opt_inet.h
d17 1
a17 1
	echo "#define INET 1" > opt_inet.h
a18 2
opt_nfs.h:
	touch opt_nfs.h
d20 2
a21 2
opt_vmpage.h:
	touch opt_vmpage.h
@


1.8
log
@add new opt_nfs.h to cleanfiles...
@
text
@d1 1
a1 1
#       $Id: Makefile,v 1.7 1998/06/30 11:19:20 jmg Exp $
d7 1
a7 1
	nfs_vnops.c opt_inet.h
d22 3
@


1.7
log
@fix buildworld hopefully be3fore anyone complains...

NFS_*TIMO should possibly be converted to sysctl vars (jkh's suggestion),
but in some cases it looks like nfs keeps a copy of the value in a struct

hash sizes are already ifdef'd KERNEL, so there aren't userland inpact
from them...
@
text
@d1 1
a1 1
#       $Id: Makefile,v 1.6 1998/02/06 23:54:23 eivind Exp $
d13 1
a13 1
CLEANFILES+=	opt_inet.h
@


1.6
log
@Back out opt_diagnostic.h changes.
@
text
@d1 1
a1 1
#       $Id: Makefile,v 1.5 1998/02/04 21:56:37 eivind Exp $
d20 2
@


1.5
log
@Make the LKMs handle DIAGNOSTIC as a new-style option.
@
text
@d1 1
a1 1
#       $Id: Makefile,v 1.4 1998/01/09 01:01:21 eivind Exp $
d7 1
a7 1
	nfs_vnops.c opt_diagnostic.h opt_inet.h
d13 1
a13 4
CLEANFILES+=opt_diagnostic.h opt_inet.h

opt_diagnostic.h:
	touch opt_diagnostic.h
@


1.4
log
@Minor fixups after INET option change.
@
text
@d1 1
a1 1
#       $Id: Makefile,v 1.3 1997/02/22 12:48:40 peter Exp $
d7 1
a7 1
	nfs_vnops.c opt_inet.h
d13 4
a16 1
CLEANFILES+=	opt_inet.h
@


1.3
log
@Revert $FreeBSD$ back to $Id$
@
text
@d1 1
a1 1
#       $Id$
d6 3
a8 1
        nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c nfs_vnops.c
d11 9
a19 1
CFLAGS+= -DNFS -DINET
@


1.2
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d1 1
a1 1
#       $FreeBSD$
@


1.1
log
@Create NFS LKM.
@
text
@d1 1
a1 1
#       $Id: Makefile,v 1.1 1994/09/21 23:27:07 wollman Exp $
@
