diff options
Diffstat (limited to 'sunrpc')
| -rw-r--r-- | sunrpc/etc.rpc | 8 | ||||
| -rw-r--r-- | sunrpc/key_call.c | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sunrpc/etc.rpc b/sunrpc/etc.rpc index 2987459da4..a80522f4db 100644 --- a/sunrpc/etc.rpc +++ b/sunrpc/etc.rpc @@ -2,8 +2,8 @@ # # rpc # -rpcbind 100000 portmap sunrpc rpcbind -rstatd 100001 rstat rup perfmeter +portmapper 100000 portmap sunrpc rpcbind +rstatd 100001 rstat rup perfmeter rstat_svc rusersd 100002 rusers nfs 100003 nfsprog ypserv 100004 ypprog @@ -26,9 +26,9 @@ nlockmgr 100021 x25.inr 100022 statmon 100023 status 100024 +bootparam 100026 ypupdated 100028 ypupdate keyserv 100029 keyserver -bootparam 100026 sunlink_mapper 100033 tfsd 100037 nsed 100038 @@ -62,7 +62,7 @@ sadmind 100232 nisd 100300 rpc.nisd nispasswd 100303 rpc.nispasswdd ufsd 100233 ufsd -pcnfsd 150001 +pcnfsd 150001 pcnfs amd 300019 amq bwnfsd 545580417 fypxfrd 600100069 freebsd-ypxfrd diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c index 5aef933cbf..2f4ca25d94 100644 --- a/sunrpc/key_call.c +++ b/sunrpc/key_call.c @@ -491,7 +491,7 @@ key_call_door (u_long proc, xdrproc_t xdr_arg, char *arg, xdrproc_t xdr_rslt, char *rslt) { XDR xdrs; - int fd; + int fd, ret; door_arg_t args; char *data_ptr; u_long data_len = 0; @@ -525,12 +525,13 @@ key_call_door (u_long proc, xdrproc_t xdr_arg, char *arg, args.rbuf = res; args.rsize = sizeof (res); - if (__door_call (fd, &args) < 0) - return 0; - + ret = __door_call (fd, &args); free (data_ptr); close (fd); + if (ret < 0) + return 0; + memcpy (&data_len, args.data_ptr, sizeof (u_long)); if (data_len != 0) return 0; |