diff options
| author | dfr <dfr@FreeBSD.org> | 1997-06-03 17:22:47 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1997-06-03 17:22:47 +0000 |
| commit | 99eae7b7b1d0dfe2463f468406efaea5f7258df8 (patch) | |
| tree | ac6a203d84dfbdf93133d0f9bb62f4da2d4b8804 /sys/nfsclient/nfs_socket.c | |
| parent | a70561d506231c0740e4c09afc2f53bc95a62073 (diff) | |
| download | FreeBSD-src-99eae7b7b1d0dfe2463f468406efaea5f7258df8.zip FreeBSD-src-99eae7b7b1d0dfe2463f468406efaea5f7258df8.tar.gz | |
Various fixes from NetBSD:
Use u_int for rpc procedure numbers.
Some fixes to NQNFS.
A rare NULL pointer dereference.
Ignore NFSMNT_NOCONN for TCP mounts.
Obtained from: NetBSD
Diffstat (limited to 'sys/nfsclient/nfs_socket.c')
| -rw-r--r-- | sys/nfsclient/nfs_socket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index c3e88e5..0ea7f69 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95 - * $Id: nfs_socket.c,v 1.24 1997/04/27 20:01:21 wollman Exp $ + * $Id: nfs_socket.c,v 1.25 1997/05/13 17:25:44 dfr Exp $ */ /* @@ -1264,7 +1264,8 @@ nfs_rephead(siz, nd, slp, err, cache, frev, mrq, mbp, bposp) *tl = 0; } } - *mrq = mreq; + if (mrq != NULL) + *mrq = mreq; *mbp = mb; *bposp = bpos; if (err != 0 && err != NFSERR_RETVOID) |
