Add support for the new "-manage-gids" option for the nfsuserd daemon

to the rc scripts. With these changes, setting nfs_server_managegids="YES"
in /etc/rc.conf will enable this capability.

Suggested by:	jpaetzel
Tested by:	jpaetzel
Reviewed by:	rc (pending)
MFC after:	2 weeks
This commit is contained in:
Rick Macklem 2015-11-30 22:29:11 +00:00
parent 3367fa32b1
commit b45c941c1c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=291536
3 changed files with 15 additions and 1 deletions

View File

@ -326,6 +326,7 @@ nfs_client_enable="NO" # This host is an NFS client (or NO).
nfs_access_cache="60" # Client cache timeout in seconds
nfs_server_enable="NO" # This host is an NFS server (or NO).
nfs_server_flags="-u -t" # Flags to nfsd (if enabled).
nfs_server_managegids="NO" # The NFS server maps gids for AUTH_SYS (or NO).
mountd_enable="NO" # Run mountd (or NO).
mountd_flags="-r" # Flags to mountd (if NFS server enabled).
weak_mountd_authentication="NO" # Allow non-root mount requests to be served.

View File

@ -32,9 +32,13 @@ nfsd_precmd()
sysctl vfs.nfsd.nfs_privport=0 > /dev/null
fi
if checkyesno nfsv4_server_enable || \
checkyesno nfs_server_managegids; then
force_depend nfsuserd || err 1 "Cannot run nfsuserd"
fi
if checkyesno nfsv4_server_enable; then
sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null
force_depend nfsuserd || err 1 "Cannot run nfsuserd"
else
echo 'NFSv4 is disabled'
sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null

View File

@ -15,5 +15,14 @@ command="/usr/sbin/${name}"
sig_stop="USR1"
load_rc_config $name
start_precmd="nfsuserd_precmd"
nfsuserd_precmd()
{
if checkyesno nfs_server_managegids; then
rc_flags="-manage-gids ${nfsuserd_flags}"
fi
return 0
}
run_rc_command "$1"