diff options
| -rw-r--r-- | sys/nlm/nlm_prot_impl.c | 4 | ||||
| -rw-r--r-- | sys/rpc/pmap_prot.h | 12 | ||||
| -rw-r--r-- | sys/rpc/rpcb_prot.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/nlm/nlm_prot_impl.c b/sys/nlm/nlm_prot_impl.c index ec6563a..831d330 100644 --- a/sys/nlm/nlm_prot_impl.c +++ b/sys/nlm/nlm_prot_impl.c @@ -294,7 +294,7 @@ nlm_get_rpc(struct sockaddr *sa, rpcprog_t prog, rpcvers_t vers) enum clnt_stat stat = RPC_SUCCESS; int rpcvers = RPCBVERS4; bool_t do_tcp = FALSE; - struct pmap mapping; + struct portmap mapping; u_short port = 0; /* @@ -392,7 +392,7 @@ again: mapping.pm_port = 0; stat = CLNT_CALL(rpcb, (rpcprog_t) PMAPPROC_GETPORT, - (xdrproc_t) xdr_pmap, &mapping, + (xdrproc_t) xdr_portmap, &mapping, (xdrproc_t) xdr_u_short, &port, timo); if (stat == RPC_SUCCESS) { diff --git a/sys/rpc/pmap_prot.h b/sys/rpc/pmap_prot.h index 366832a..42277e8 100644 --- a/sys/rpc/pmap_prot.h +++ b/sys/rpc/pmap_prot.h @@ -44,15 +44,15 @@ * PMAPPROC_NULL() returns () * takes nothing, returns nothing * - * PMAPPROC_SET(struct pmap) returns (bool_t) + * PMAPPROC_SET(struct portmap) returns (bool_t) * TRUE is success, FALSE is failure. Registers the tuple * [prog, vers, prot, port]. * - * PMAPPROC_UNSET(struct pmap) returns (bool_t) + * PMAPPROC_UNSET(struct portmap) returns (bool_t) * TRUE is success, FALSE is failure. Un-registers pair * [prog, vers]. prot and port are ignored. * - * PMAPPROC_GETPORT(struct pmap) returns (long unsigned). + * PMAPPROC_GETPORT(struct portmap) returns (long unsigned). * 0 is failure. Otherwise returns the port number where the pair * [prog, vers] is registered. It may lie! * @@ -86,7 +86,7 @@ #define PMAPPROC_DUMP ((u_long)4) #define PMAPPROC_CALLIT ((u_long)5) -struct pmap { +struct portmap { long unsigned pm_prog; long unsigned pm_vers; long unsigned pm_prot; @@ -94,12 +94,12 @@ struct pmap { }; struct pmaplist { - struct pmap pml_map; + struct portmap pml_map; struct pmaplist *pml_next; }; __BEGIN_DECLS -extern bool_t xdr_pmap(XDR *, struct pmap *); +extern bool_t xdr_portmap(XDR *, struct portmap *); extern bool_t xdr_pmaplist(XDR *, struct pmaplist **); extern bool_t xdr_pmaplist_ptr(XDR *, struct pmaplist *); __END_DECLS diff --git a/sys/rpc/rpcb_prot.c b/sys/rpc/rpcb_prot.c index 06a659e..be76571 100644 --- a/sys/rpc/rpcb_prot.c +++ b/sys/rpc/rpcb_prot.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include <rpc/rpcb_prot.h> bool_t -xdr_pmap(XDR *xdrs, struct pmap *regs) +xdr_portmap(XDR *xdrs, struct portmap *regs) { if (xdr_u_long(xdrs, ®s->pm_prog) && |
