nfs-utils: Provide type-checked version of svc_getcaller()

[nfs-utils.git] / utils / statd / monitor.c

diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c
index a6a1d9c225a4443de7a8a21904e6a4cf75748949..169cd78ac82b17a99c5ce90850bb97f4d4fac901 100644 (file)
--- a/utils/statd/monitor.c
+++ b/utils/statd/monitor.c
@@ -20,6 +20,8 @@
 #include <errno.h>
 #include <arpa/inet.h>
 #include <dirent.h>
+
+#include "rpcmisc.h"
 #include "misc.h"
 #include "statd.h"
 #include "notlist.h"
@@ -36,9 +38,10 @@ notify_list *                rtnl = NULL;    /* Run-time notify list. */
 static int
 caller_is_localhost(struct svc_req *rqstp)
 {
+       struct sockaddr_in *sin = nfs_getrpccaller_in(rqstp->rq_xprt);
        struct in_addr  caller;
 
-       caller = svc_getcaller(rqstp->rq_xprt)->sin_addr;
+       caller = sin->sin_addr;
        if (caller.s_addr != htonl(INADDR_LOOPBACK)) {
                note(N_WARNING,
                        "Call to statd from non-local host %s",
@@ -352,7 +355,7 @@ sm_unmon_1_svc(struct mon_id *argp, struct svc_req *rqstp)
                        /* PRC: do the HA callout: */
                        ha_callout("del-client", mon_name, my_name, -1);
 
-                       xunlink(SM_DIR, clnt->dns_name, 1);
+                       xunlink(SM_DIR, clnt->dns_name);
                        nlist_free(&rtnl, clnt);
 
                        return (&result);
@@ -404,7 +407,7 @@ sm_unmon_all_1_svc(struct my_id *argp, struct svc_req *rqstp)
                        temp = NL_NEXT(clnt);
                        /* PRC: do the HA callout: */
                        ha_callout("del-client", mon_name, my_name, -1);
-                       xunlink(SM_DIR, clnt->dns_name, 1);
+                       xunlink(SM_DIR, clnt->dns_name);
                        nlist_free(&rtnl, clnt);
                        ++count;
                        clnt = temp;