summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--utils/statd/callback.c6
-rw-r--r--utils/statd/monitor.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/utils/statd/callback.c b/utils/statd/callback.c
index d5d036e..505fdb3 100644
--- a/utils/statd/callback.c
+++ b/utils/statd/callback.c
@@ -36,11 +36,9 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp)
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)) {
+ if (rtnl == NULL) {
note(N_WARNING, "SM_NOTIFY from %s while not monitoring any hosts.",
- argp->mon_name, argp->state);
+ argp->mon_name);
return ((void *) &result);
}
diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c
index d300338..a6a1d9c 100644
--- a/utils/statd/monitor.c
+++ b/utils/statd/monitor.c
@@ -326,12 +326,13 @@ sm_unmon_1_svc(struct mon_id *argp, struct svc_req *rqstp)
/* Check if we're monitoring anyone. */
- if (!(clnt = rtnl)) {
+ if (rtnl == NULL) {
note(N_WARNING,
"Received SM_UNMON request from %s for %s while not "
"monitoring any hosts.", my_name, argp->mon_name);
return (&result);
}
+ clnt = rtnl;
/*
* OK, we are. Now look for appropriate entry in run-time list.
@@ -379,11 +380,12 @@ sm_unmon_all_1_svc(struct my_id *argp, struct svc_req *rqstp)
result.state = MY_STATE;
- if (!(clnt = rtnl)) {
+ if (rtnl == NULL) {
note(N_WARNING, "Received SM_UNMON_ALL request from %s "
"while not monitoring any hosts", my_name);
return (&result);
}
+ clnt = rtnl;
while ((clnt = nlist_gethost(clnt, my_name, 1))) {
if (NL_MY_PROC(clnt) == argp->my_proc &&