diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-25 08:56:15 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-25 08:56:15 -0200 |
| commit | eb84e0723f3b4bc5e40024f66fe21c14b09e9ec4 (patch) | |
| tree | fec6b99d018e13f1fccbe31478aaf29a28a55642 /lib/libc/rpc | |
| parent | c50df8e1b90c4f9b8bbffa592477c129854776ce (diff) | |
| parent | 94b1bbbd44bd88b6db1c00d795cdf7675b3ae254 (diff) | |
| download | FreeBSD-src-eb84e0723f3b4bc5e40024f66fe21c14b09e9ec4.zip FreeBSD-src-eb84e0723f3b4bc5e40024f66fe21c14b09e9ec4.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'lib/libc/rpc')
| -rw-r--r-- | lib/libc/rpc/rpc_soc.c | 2 | ||||
| -rw-r--r-- | lib/libc/rpc/rpcb_clnt.c | 4 | ||||
| -rw-r--r-- | lib/libc/rpc/rpcb_prot.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c index 8d0f34e..ff7a289 100644 --- a/lib/libc/rpc/rpc_soc.c +++ b/lib/libc/rpc/rpc_soc.c @@ -525,7 +525,7 @@ svcunix_create(sock, sendsize, recvsize, path) break; } if (nconf == NULL) - return(xprt); + goto done; if ((sock = __rpc_nconf2fd(nconf)) < 0) goto done; diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c index 943d7c8..117ee0f 100644 --- a/lib/libc/rpc/rpcb_clnt.c +++ b/lib/libc/rpc/rpcb_clnt.c @@ -675,11 +675,11 @@ __rpcbind_is_up() strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0) break; } + endnetconfig(localhandle); + if (nconf == NULL) return (FALSE); - endnetconfig(localhandle); - memset(&sun, 0, sizeof sun); sock = _socket(AF_LOCAL, SOCK_STREAM, 0); if (sock < 0) diff --git a/lib/libc/rpc/rpcb_prot.c b/lib/libc/rpc/rpcb_prot.c index f543aaf..92463c0 100644 --- a/lib/libc/rpc/rpcb_prot.c +++ b/lib/libc/rpc/rpcb_prot.c @@ -217,14 +217,14 @@ xdr_rpcb_entry_list_ptr(xdrs, rp) * the case of freeing we must remember the next object * before we free the current object ... */ - if (freeing) + if (freeing && *rp) next = (*rp)->rpcb_entry_next; if (! xdr_reference(xdrs, (caddr_t *)rp, (u_int)sizeof (rpcb_entry_list), (xdrproc_t)xdr_rpcb_entry)) { return (FALSE); } - if (freeing && *rp) { + if (freeing) { next_copy = next; rp = &next_copy; /* |
