Author: trasz
Date: Wed Jul 19 09:59:32 2017
New Revision: 321196
URL: https://svnweb.freebsd.org/changeset/base/321196
Log:
Rename vfs.nfsd.enable_uidtostring to vfs.nfs.enable_uidtostring.
It applies to both NFS client and NFS server, and is useful for both.
This is different from vfs.nfsd.enable_stringtouid, which is specific
to server side.
Reviewed by: rmacklem@
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Modified:
head/sys/fs/nfs/nfs_commonsubs.c
head/sys/fs/nfsserver/nfs_nfsdport.c
Modified: head/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonsubs.c Wed Jul 19 07:03:16 2017
(r321195)
+++ head/sys/fs/nfs/nfs_commonsubs.c Wed Jul 19 09:59:32 2017
(r321196)
@@ -68,11 +68,15 @@ gid_t nfsrv_defaultgid = GID_NOGROUP;
int nfsrv_lease = NFSRV_LEASE;
int ncl_mbuf_mlen = MLEN;
int nfsd_enable_stringtouid = 0;
-int nfsd_enable_uidtostring = 0;
+static int nfs_enable_uidtostring = 0;
NFSNAMEIDMUTEX;
NFSSOCKMUTEX;
extern int nfsrv_lughashsize;
+SYSCTL_DECL(_vfs_nfs);
+SYSCTL_INT(_vfs_nfs, OID_AUTO, enable_uidtostring, CTLFLAG_RW,
+ &nfs_enable_uidtostring, 0, "Make nfs always send numeric owner_names");
+
/*
* This array of structures indicates, for V4:
* retfh - which of 3 types of calling args are used
@@ -2562,7 +2566,7 @@ nfsv4_uidtostr(uid_t uid, u_char **cpp, int *retlenp,
cnt = 0;
tryagain:
- if (nfsrv_dnsnamelen > 0 && !nfsd_enable_uidtostring) {
+ if (nfsrv_dnsnamelen > 0 && !nfs_enable_uidtostring) {
/*
* Always map nfsrv_defaultuid to "nobody".
*/
@@ -2824,7 +2828,7 @@ nfsv4_gidtostr(gid_t gid, u_char **cpp, int *retlenp,
cnt = 0;
tryagain:
- if (nfsrv_dnsnamelen > 0 && !nfsd_enable_uidtostring) {
+ if (nfsrv_dnsnamelen > 0 && !nfs_enable_uidtostring) {
/*
* Always map nfsrv_defaultgid to "nogroup".
*/
Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c Wed Jul 19 07:03:16 2017
(r321195)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c Wed Jul 19 09:59:32 2017
(r321196)
@@ -87,7 +87,6 @@ static int nfs_commit_miss;
extern int nfsrv_issuedelegs;
extern int nfsrv_dolocallocks;
extern int nfsd_enable_stringtouid;
-extern int nfsd_enable_uidtostring;
SYSCTL_NODE(_vfs, OID_AUTO, nfsd, CTLFLAG_RW, 0, "NFS server");
SYSCTL_INT(_vfs_nfsd, OID_AUTO, mirrormnt, CTLFLAG_RW,
@@ -104,8 +103,6 @@ SYSCTL_INT(_vfs_nfsd, OID_AUTO, debuglevel, CTLFLAG_RW
0, "Debug level for NFS server");
SYSCTL_INT(_vfs_nfsd, OID_AUTO, enable_stringtouid, CTLFLAG_RW,
&nfsd_enable_stringtouid, 0, "Enable nfsd to accept numeric owner_names");
-SYSCTL_INT(_vfs_nfsd, OID_AUTO, enable_uidtostring, CTLFLAG_RW,
- &nfsd_enable_uidtostring, 0, "Make nfsd always send numeric owner_names");
#define MAX_REORDERED_RPC 16
#define NUM_HEURISTIC 1031
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
