Fix spurious error message: erroneous SM_UNMON if RESTRICTED_STATD

diff --git a/ChangeLog b/ChangeLog
index 63cebc25584183457725b5a4a67e3df4b313126b..63b2cd00a722ab9e7766ca32592173a6ecfbbba0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-15 Neil Brown <neilb@cse.unsw.edu.au>
+
+       * utils/statd/monitor.c(sm_unmon_1_svc): is RESTRICTED_STATD, then
+       check IP address and force my_name to 127.0.0.1 to match 
+       what happens in sm_mon_1_svc.  This avoid spurious "erroneous
+       SM_UNMON" messages.
+       * utils/statd.monitor.c(sm_unmon_all_1_svc): likewise
+       
 2004-09-15 "J. Bruce Fields" <bfields@fieldses.org>    
 
        * Assorted changes to support "gss/*" style authentication

diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c
index 3b81bdd4af1a6cc829cc9efc0d6a2c8e5ddd3d11..88b33db0ab478ac22a4bd33384a4cb204a244665 100644 (file)
--- a/utils/statd/monitor.c
+++ b/utils/statd/monitor.c
@@ -210,9 +210,27 @@ sm_unmon_1_svc(struct mon_id *argp, struct svc_req *rqstp)
        char            *mon_name = argp->mon_name,
                        *my_name  = argp->my_id.my_name;
        struct my_id    *id = &argp->my_id;
+#ifdef RESTRICTED_STATD
+       struct in_addr  caller;
+#endif
 
        result.state = MY_STATE;
 
+#ifdef RESTRICTED_STATD
+       /* 1.   Reject anyone not calling from 127.0.0.1.
+        *      Ignore the my_name specified by the caller, and
+        *      use "127.0.0.1" instead.
+        */
+       caller = svc_getcaller(rqstp->rq_xprt)->sin_addr;
+       if (caller.s_addr != htonl(INADDR_LOOPBACK)) {
+               note(N_WARNING,
+                       "Call to statd from non-local host %s",
+                       inet_ntoa(caller));
+               goto failure;
+       }
+       my_name = "127.0.0.1";
+#endif
+
        /* Check if we're monitoring anyone. */
        if (!(clnt = rtnl)) {
                note(N_WARNING,
@@ -247,6 +265,7 @@ sm_unmon_1_svc(struct mon_id *argp, struct svc_req *rqstp)
                        clnt = NL_NEXT(clnt);
        }
 
+ failure:
        note(N_WARNING, "Received erroneous SM_UNMON request from %s for %s",
                my_name, mon_name);
        return (&result);
@@ -259,16 +278,33 @@ sm_unmon_all_1_svc(struct my_id *argp, struct svc_req *rqstp)
        short int       count = 0;
        static sm_stat  result;
        notify_list     *clnt;
+       char            *my_name = argp->my_name;
+#ifdef RESTRICTED_STATD
+       struct in_addr  caller;
+
+       /* 1.   Reject anyone not calling from 127.0.0.1.
+        *      Ignore the my_name specified by the caller, and
+        *      use "127.0.0.1" instead.
+        */
+       caller = svc_getcaller(rqstp->rq_xprt)->sin_addr;
+       if (caller.s_addr != htonl(INADDR_LOOPBACK)) {
+               note(N_WARNING,
+                       "Call to statd from non-local host %s",
+                       inet_ntoa(caller));
+               goto failure;
+       }
+       my_name = "127.0.0.1";
+#endif
 
        result.state = MY_STATE;
 
        if (!(clnt = rtnl)) {
                note(N_WARNING, "Received SM_UNMON_ALL request from %s "
-                       "while not monitoring any hosts", argp->my_name);
+                       "while not monitoring any hosts", my_name);
                return (&result);
        }
 
-       while ((clnt = nlist_gethost(clnt, argp->my_name, 1))) {
+       while ((clnt = nlist_gethost(clnt, my_name, 1))) {
                if (NL_MY_PROC(clnt) == argp->my_proc &&
                        NL_MY_PROG(clnt) == argp->my_prog &&
                        NL_MY_VERS(clnt) == argp->my_vers) {
@@ -284,7 +320,7 @@ sm_unmon_all_1_svc(struct my_id *argp, struct svc_req *rqstp)
                        mon_name[sizeof (mon_name) - 1] = '\0';
                        temp = NL_NEXT(clnt);
                        /* PRC: do the HA callout: */
-                       ha_callout("del-client", mon_name, argp->my_name, -1);
+                       ha_callout("del-client", mon_name, my_name, -1);
                        nlist_free(&rtnl, clnt);
                        xunlink(SM_DIR, mon_name, 1);
                        ++count;
@@ -295,8 +331,8 @@ sm_unmon_all_1_svc(struct my_id *argp, struct svc_req *rqstp)
 
        if (!count) {
                dprintf(N_DEBUG, "SM_UNMON_ALL request from %s with no "
-                       "SM_MON requests from it.", argp->my_name);
+                       "SM_MON requests from it.", my_name);
        }
-
+ failure:
        return (&result);
 }