statd: Replace note() with xlog() in rpc.statd

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

diff --git a/utils/statd/callback.c b/utils/statd/callback.c
index d5d036e9fc28357b3ef703f3da3005f7cee0ad06..2f98aeb2adb468ae6e6d79a38a11d2a4a8346f8c 100644 (file)
--- a/utils/statd/callback.c
+++ b/utils/statd/callback.c
@@ -9,10 +9,13 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
+#include <arpa/inet.h>
+
+#include "rpcmisc.h"
 #include "misc.h"
 #include "statd.h"
 #include "notlist.h"
-#include <arpa/inet.h>
 
 /* Callback notify list. */
 /* notify_list *cbnl = NULL; ... never used */
@@ -29,18 +32,16 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp)
 {
        notify_list    *lp, *call;
        static char    *result = NULL;
-       char *ip_addr = xstrdup(inet_ntoa(svc_getcaller(rqstp->rq_xprt)
-                                         ->sin_addr));
+       struct sockaddr_in *sin = nfs_getrpccaller_in(rqstp->rq_xprt);
+       char *ip_addr = xstrdup(inet_ntoa(sin->sin_addr));
 
-       dprintf(N_DEBUG, "Received SM_NOTIFY from %s, state: %d",
+       xlog(D_CALL, "Received SM_NOTIFY from %s, state: %d",
                                argp->mon_name, argp->state);
 
        /* quick check - don't bother if we're not monitoring anyone */
-       /* LH - this was != MULL, meaning that if anyone _was_ in our RTNL,
-        * we'd never pass this point. */
-       if (!(lp = rtnl)) {
-               note(N_WARNING, "SM_NOTIFY from %s while not monitoring any hosts.",
-                               argp->mon_name, argp->state);
+       if (rtnl == NULL) {
+               xlog_warn("SM_NOTIFY from %s while not monitoring any hosts",
+                               argp->mon_name);
                return ((void *) &result);
        }