diff options
| author | dfr <dfr@FreeBSD.org> | 2008-11-13 11:35:18 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 2008-11-13 11:35:18 +0000 |
| commit | f2543b22e03354cdbb01c7978baa01c707d45e1d (patch) | |
| tree | d0277643dcda098270ed926f5b5b7c094117a8a7 | |
| parent | a302d8e554eed06f355f75bee14651d8996dc09b (diff) | |
| download | FreeBSD-src-f2543b22e03354cdbb01c7978baa01c707d45e1d.zip FreeBSD-src-f2543b22e03354cdbb01c7978baa01c707d45e1d.tar.gz | |
Temporarily switch NFS back to the old RPC code while I try to diagnose and
fix the problems a few people have noticed with the new code. People who want
to continue testing the new code or who need RPCSEC_GSS support should use
the new option NFS_NEWRPC to select it.
| -rw-r--r-- | sys/conf/files | 8 | ||||
| -rw-r--r-- | sys/conf/options | 1 | ||||
| -rw-r--r-- | sys/nfsclient/nfs.h | 4 | ||||
| -rw-r--r-- | sys/nfsserver/nfs.h | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/sys/conf/files b/sys/conf/files index 2d9e5e4..a8f5e41 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2296,7 +2296,7 @@ nfsclient/krpc_subr.c optional bootp nfsclient nfsclient/nfs_bio.c optional nfsclient nfsclient/nfs_diskless.c optional nfsclient nfs_root nfsclient/nfs_node.c optional nfsclient -nfsclient/nfs_socket.c optional nfsclient nfs_legacyrpc +nfsclient/nfs_socket.c optional nfsclient nfsclient/nfs_krpc.c optional nfsclient nfsclient/nfs_subs.c optional nfsclient nfsclient/nfs_nfsiod.c optional nfsclient @@ -2306,10 +2306,10 @@ nfsclient/nfs_lock.c optional nfsclient nfsserver/nfs_fha.c optional nfsserver nfsserver/nfs_serv.c optional nfsserver nfsserver/nfs_srvkrpc.c optional nfsserver -nfsserver/nfs_srvsock.c optional nfsserver nfs_legacyrpc -nfsserver/nfs_srvcache.c optional nfsserver nfs_legacyrpc +nfsserver/nfs_srvsock.c optional nfsserver +nfsserver/nfs_srvcache.c optional nfsserver nfsserver/nfs_srvsubs.c optional nfsserver -nfsserver/nfs_syscalls.c optional nfsserver nfs_legacyrpc +nfsserver/nfs_syscalls.c optional nfsserver nlm/nlm_advlock.c optional nfslockd nfsclient nlm/nlm_prot_clnt.c optional nfslockd nlm/nlm_prot_impl.c optional nfslockd diff --git a/sys/conf/options b/sys/conf/options index f20547d..4b28c58 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -230,6 +230,7 @@ NFS4CLIENT opt_nfs.h # legacy RPC implementation instead of the newer KRPC system (which # supports modern features such as RPCSEC_GSS NFS_LEGACYRPC opt_nfs.h +NFS_NEWRPC opt_nfs.h # filesystems and libiconv bridge CD9660_ICONV opt_dontuse.h diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h index c5b1c51..8e9f121 100644 --- a/sys/nfsclient/nfs.h +++ b/sys/nfsclient/nfs.h @@ -40,6 +40,10 @@ #include "opt_nfs.h" #endif +#if !defined(NFS_NEWRPC) && !defined(NFS_LEGACYRPC) +#define NFS_LEGACYRPC +#endif + #include <nfsclient/nfsargs.h> /* diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h index 2709377..c9dec4c 100644 --- a/sys/nfsserver/nfs.h +++ b/sys/nfsserver/nfs.h @@ -40,6 +40,10 @@ #include "opt_nfs.h" #endif +#if !defined(NFS_NEWRPC) && !defined(NFS_LEGACYRPC) +#define NFS_LEGACYRPC +#endif + /* * Tunable constants for nfs */ |
