d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a merge conflict.

Browse Source 
r224086 added "goto out"-style error handling to nfssvc_nfsd(), in order
to reliably call NFSEXITCODE() before returning. Our Capsicum changes,
based on the old "return (error)" model, did not merge nicely.

Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
This commit is contained in:
Jonathan Anderson 2011-08-16 14:23:16 +00:00
parent d6f7248983
commit 985a88e2a6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=224911
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/fs/nfsserver/nfs_nfsdport.c
View File

@ -3036,7 +3036,6 @@ nfssvc_nfsd(struct thread *td, struct nfssvc_args *uap)
*/
if ((error = fget(td, sockarg.sock, CAP_SOCK_ALL, &fp)) != 0)
goto out;
return (error);
if (fp->f_type != DTYPE_SOCKET) {
fdrop(fp, td);
error = EPERM;