diff options
| -rw-r--r-- | sys/nfs/nfs.h | 9 | ||||
| -rw-r--r-- | sys/nfs/nfs_subs.c | 4 | ||||
| -rw-r--r-- | sys/nfs/nfs_syscalls.c | 3 | ||||
| -rw-r--r-- | sys/nfs/nfs_vfsops.c | 6 |
4 files changed, 7 insertions, 15 deletions
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h index 56840a40208..c793b7fede8 100644 --- a/sys/nfs/nfs.h +++ b/sys/nfs/nfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs.h,v 1.16 2002/01/11 01:20:56 nate Exp $ */ +/* $OpenBSD: nfs.h,v 1.17 2002/02/10 22:02:05 nate Exp $ */ /* $NetBSD: nfs.h,v 1.10.4.1 1996/05/27 11:23:56 fvdl Exp $ */ /* @@ -225,14 +225,12 @@ struct nfsstats { */ #define NFS_NFSSTATS 1 /* struct: struct nfsstats */ #define NFS_NIOTHREADS 2 /* number of i/o threads */ -#define NFS_NORSVPORT 3 /* if > 0, don't require reserved port */ -#define NFS_MAXID 4 +#define NFS_MAXID 3 #define FS_NFS_NAMES { \ { 0, 0 }, \ { "nfsstats", CTLTYPE_STRUCT }, \ - { "iothreads", CTLTYPE_INT }, \ - { "norsvport", CTLTYPE_INT } \ + { "iothreads", CTLTYPE_INT } \ } /* @@ -245,7 +243,6 @@ struct nfsstats { */ #ifdef _KERNEL extern int nfs_niothreads; -extern int nfs_norsvport; struct uio; struct buf; struct vattr; struct nameidata; /* XXX */ diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index c317cb7781d..21b56212f66 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_subs.c,v 1.40 2002/01/16 21:51:16 ericj Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.41 2002/02/10 22:02:05 nate Exp $ */ /* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */ /* @@ -1654,7 +1654,7 @@ nfsrv_fhtovp(fhp, lockflag, vpp, cred, slp, nam, rdonlyp, kerbflag) saddr = mtod(nam, struct sockaddr_in *); if (saddr->sin_family == AF_INET && - ((ntohs(saddr->sin_port) >= IPPORT_RESERVED && !nfs_norsvport) || + (ntohs(saddr->sin_port) >= IPPORT_RESERVED || (slp->ns_so->so_type == SOCK_STREAM && ntohs(saddr->sin_port) == 20))) { vput(*vpp); return (NFSERR_AUTHERR | AUTH_TOOWEAK); diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index 5f0e1bb6207..1ea7a994fe1 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_syscalls.c,v 1.27 2002/02/08 13:53:28 art Exp $ */ +/* $OpenBSD: nfs_syscalls.c,v 1.28 2002/02/10 22:02:05 nate Exp $ */ /* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */ /* @@ -93,7 +93,6 @@ extern int nfsrvw_procrastinate; struct nfssvc_sock *nfs_udpsock, *nfs_cltpsock; int nuidhash_max = NFS_MAXUIDHASH; int nfsd_waiting = 0; -int nfs_norsvport = 0; #ifdef NFSSERVER static int nfs_numnfsd = 0; static struct nfsdrt nfsdrt; diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index a9c2791843b..439cf624d34 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vfsops.c,v 1.44 2002/01/16 21:51:16 ericj Exp $ */ +/* $OpenBSD: nfs_vfsops.c,v 1.45 2002/02/10 22:02:05 nate Exp $ */ /* $NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $ */ /* @@ -930,10 +930,6 @@ nfs_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, return rv; - case NFS_NORSVPORT: - rv = sysctl_int(oldp, oldlenp, newp, newlen, &nfs_norsvport); - return rv; - default: return EOPNOTSUPP; } |