From 0da56f7d359475837008ea4b8d3764fe982ef512 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 29 Mar 2007 13:08:08 +1000 Subject: statd - use dnsname to ensure correct matching of NOTIFY requests. When lockd asks to monitor a host, we find the FQDN from the DNS and remember that, both internally and in the /var/lib/nfs/sm/* file. When we receive an SM_NOTIFY request, we compare both the mon_name and the source IP address against that DNS name to find a match. If a DNS name is not available, we fall back to the name provided by lockd, which at least is known to map to an IP address via gethostbyname. Signed-off-by: Neil Brown --- utils/statd/callback.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'utils/statd/callback.c') diff --git a/utils/statd/callback.c b/utils/statd/callback.c index bb8bf52..b19bb90 100644 --- a/utils/statd/callback.c +++ b/utils/statd/callback.c @@ -27,6 +27,8 @@ 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)); dprintf(N_DEBUG, "Received SM_NOTIFY from %s, state: %d", argp->mon_name, argp->state); @@ -45,14 +47,15 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp) * it. Lockd will want to continue monitoring the remote host * until it issues an SM_UNMON call. */ - while ((lp = nlist_gethost(lp, argp->mon_name, 0)) != NULL) { - if (NL_STATE(lp) != argp->state) { + 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))) { NL_STATE(lp) = argp->state; call = nlist_clone(lp); nlist_insert(¬ify, call); } - lp = NL_NEXT(lp); - } + return ((void *) &result); } -- cgit