* NSM for Linux.
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <fcntl.h>
#include <limits.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
+#include <errno.h>
#include <arpa/inet.h>
#include "misc.h"
#include "statd.h"
#include "notlist.h"
+#include "ha-callout.h"
notify_list * rtnl = NULL; /* Run-time notify list. */
*/
caller = svc_getcaller(rqstp->rq_xprt)->sin_addr;
if (caller.s_addr != htonl(INADDR_LOOPBACK)) {
- log(L_WARNING,
+ note(N_WARNING,
"Call to statd from non-local host %s",
inet_ntoa(caller));
goto failure;
* This is specific to the linux kernel lockd, which
* makes the callback procedure part of the lockd interface.
* It is also prone to break when lockd changes its callback
- * procedure number. XXX FIXME
+ * procedure number -- which, in fact, has now happened once.
+ * There must be a better way.... XXX FIXME
*/
- if (id->my_proc != 100021 && id->my_proc != 24) {
- log(L_WARNING,
- "Attempt to register callback to service %d",
- id->my_proc);
+ if (id->my_prog != 100021 ||
+ (id->my_proc != 16 && id->my_proc != 24))
+ {
+ note(N_WARNING,
+ "Attempt to register callback to %d/%d",
+ id->my_prog, id->my_proc);
goto failure;
}
* Again, specific to the linux kernel lockd.
*/
if (!inet_aton(mon_name, &mon_addr)) {
- log(L_WARNING,
+ note(N_WARNING,
"Attempt to register host %s (not a dotted quad)",
mon_name);
goto failure;
/* must check for /'s in hostname! See CERT's CA-96.09 for details. */
if (strchr(mon_name, '/')) {
- log(L_CRIT, "SM_MON request for hostname containing '/': %s",
+ note(N_CRIT, "SM_MON request for hostname containing '/': %s",
mon_name);
- log(L_CRIT, "POSSIBLE SPOOF/ATTACK ATTEMPT!");
+ note(N_CRIT, "POSSIBLE SPOOF/ATTACK ATTEMPT!");
goto failure;
} else if (gethostbyname(mon_name) == NULL) {
- log(L_WARNING, "gethostbyname error for %s", mon_name);
+ note(N_WARNING, "gethostbyname error for %s", mon_name);
goto failure;
} else if (!(hostinfo = gethostbyname(my_name))) {
- log(L_WARNING, "gethostbyname error for %s", my_name);
+ note(N_WARNING, "gethostbyname error for %s", my_name);
goto failure;
} else
my_addr = *(struct in_addr *) hostinfo->h_addr;
NL_MY_PROG(temp) == id->my_prog &&
NL_MY_VERS(temp) == id->my_vers) {
/* Hey! We already know you guys! */
- dprintf(L_DEBUG,
+ dprintf(N_DEBUG,
"Duplicate SM_MON request for %s "
"from procedure on %s",
mon_name, my_name);
* doesn't fail. (I should probably fix this assumption.)
*/
if (!(clnt = nlist_new(my_name, mon_name, 0))) {
- log(L_WARNING, "out of memory");
+ note(N_WARNING, "out of memory");
goto failure;
}
*/
path=xmalloc(strlen(SM_DIR)+strlen(mon_name)+2);
- sprintf(path, SM_DIR "/%s", mon_name);
+ sprintf(path, "%s/%s", SM_DIR, mon_name);
if ((fd = open(path, O_WRONLY|O_SYNC|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
/* Didn't fly. We won't monitor. */
- log(L_ERROR, "creat(%s) failed: %m", path);
+ note(N_ERROR, "creat(%s) failed: %s", path, strerror (errno));
nlist_free(NULL, clnt);
free(path);
goto failure;
}
free(path);
+ /* PRC: do the HA callout: */
+ ha_callout("add-client", mon_name, my_name, -1);
nlist_insert(&rtnl, clnt);
close(fd);
result.res_stat = STAT_SUCC;
result.state = MY_STATE;
- dprintf(L_DEBUG, "MONITORING %s for %s", mon_name, my_name);
+ dprintf(N_DEBUG, "MONITORING %s for %s", mon_name, my_name);
return (&result);
failure:
- log(L_WARNING, "STAT_FAIL to %s for SM_MON of %s", my_name, mon_name);
+ note(N_WARNING, "STAT_FAIL to %s for SM_MON of %s", my_name, mon_name);
return (&result);
}
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)) {
- log(L_WARNING,
+ note(N_WARNING,
"Received SM_UNMON request from %s for %s while not "
"monitoring any hosts.", my_name, argp->mon_name);
return (&result);
NL_MY_PROG(clnt) == id->my_prog &&
NL_MY_VERS(clnt) == id->my_vers) {
/* Match! */
- dprintf(L_DEBUG, "UNMONITORING %s for %s",
+ dprintf(N_DEBUG, "UNMONITORING %s for %s",
mon_name, my_name);
+
+ /* PRC: do the HA callout: */
+ ha_callout("del-client", mon_name, my_name, -1);
+
nlist_free(&rtnl, clnt);
xunlink(SM_DIR, mon_name, 1);
clnt = NL_NEXT(clnt);
}
- log(L_WARNING, "Received erroneous SM_UNMON request from %s for %s",
+#ifdef RESTRICTED_STATD
+ failure:
+#endif
+ note(N_WARNING, "Received erroneous SM_UNMON request from %s for %s",
my_name, mon_name);
return (&result);
}
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)) {
- log(L_WARNING, "Received SM_UNMON_ALL request from %s "
- "while not monitoring any hosts", argp->my_name);
+ note(N_WARNING, "Received SM_UNMON_ALL request from %s "
+ "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) {
char mon_name[SM_MAXSTRLEN + 1];
notify_list *temp;
- dprintf(L_DEBUG,
+ dprintf(N_DEBUG,
"UNMONITORING (SM_UNMON_ALL) %s for %s",
NL_MON_NAME(clnt), NL_MY_NAME(clnt));
strncpy(mon_name, NL_MON_NAME(clnt),
sizeof (mon_name) - 1);
mon_name[sizeof (mon_name) - 1] = '\0';
temp = NL_NEXT(clnt);
+ /* PRC: do the HA callout: */
+ ha_callout("del-client", mon_name, my_name, -1);
nlist_free(&rtnl, clnt);
xunlink(SM_DIR, mon_name, 1);
++count;
}
if (!count) {
- dprintf(L_DEBUG, "SM_UNMON_ALL request from %s with no "
- "SM_MON requests from it.", argp->my_name);
+ dprintf(N_DEBUG, "SM_UNMON_ALL request from %s with no "
+ "SM_MON requests from it.", my_name);
}
-
+#ifdef RESTRICTED_STATD
+ failure:
+#endif
return (&result);
}
projects / nfs-utils.git / blobdiff