statd: Introduce statd version of matchhostname()

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

diff --git a/utils/statd/callback.c b/utils/statd/callback.c
index 888523872931055c70e6bbac39d1778a4c31d1fd..b1acd15ae8ae025bb75bf63703bfd274f0a60619 100644 (file)
--- a/utils/statd/callback.c
+++ b/utils/statd/callback.c
@@ -13,7 +13,6 @@
 #include <arpa/inet.h>
 
 #include "rpcmisc.h"
-#include "misc.h"
 #include "statd.h"
 #include "notlist.h"
 
@@ -35,12 +34,12 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp)
        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 */
        if (rtnl == NULL) {
-               note(N_WARNING, "SM_NOTIFY from %s while not monitoring any hosts.",
+               xlog_warn("SM_NOTIFY from %s while not monitoring any hosts",
                                argp->mon_name);
                return ((void *) &result);
        }
@@ -52,8 +51,8 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp)
         */
        for (lp = rtnl ; lp ; lp = lp->next)
                if (NL_STATE(lp) != argp->state &&
-                   (matchhostname(argp->mon_name, lp->dns_name) ||
-                    matchhostname(ip_addr, lp->dns_name))) {
+                   (statd_matchhostname(argp->mon_name, lp->dns_name) ||
+                    statd_matchhostname(ip_addr, lp->dns_name))) {
                        NL_STATE(lp) = argp->state;
                        call = nlist_clone(lp);
                        nlist_insert(&notify, call);