*my_name = argp->mon_id.my_id.my_name;
struct my_id *id = &argp->mon_id.my_id;
char *path;
+ char *cp;
int fd;
notify_list *clnt;
struct in_addr my_addr;
+ char *dnsname;
#ifdef RESTRICTED_STATD
struct in_addr caller;
-#else
- struct hostent *hostinfo = NULL;
#endif
+ struct hostent *hostinfo = NULL;
/* Assume that we'll fail. */
result.res_stat = STAT_FAIL;
goto failure;
}
my_addr.s_addr = htonl(INADDR_LOOPBACK);
- my_name = "127.0.0.1";
/* 2. Reject any registrations for non-lockd services.
*
goto failure;
}
#endif
+#else
+ if (!(hostinfo = gethostbyname(my_name))) {
+ note(N_WARNING, "gethostbyname error for %s", my_name);
+ goto failure;
+ } else
+ my_addr = *(struct in_addr *) hostinfo->h_addr;
#endif
/*
* Check hostnames. If I can't look them up, I won't monitor. This
"or starting '.': %s", mon_name);
note(N_CRIT, "POSSIBLE SPOOF/ATTACK ATTEMPT!");
goto failure;
- } else if (gethostbyname(mon_name) == NULL) {
+ } else if ((hostinfo = gethostbyname(mon_name)) == NULL) {
note(N_WARNING, "gethostbyname error for %s", mon_name);
goto failure;
}
-#ifndef RESTRICTED_STATD
- if (!(hostinfo = gethostbyname(my_name))) {
- note(N_WARNING, "gethostbyname error for %s", my_name);
- goto failure;
- } else
- my_addr = *(struct in_addr *) hostinfo->h_addr;
-#endif
+
+ /* my_name must not have white space */
+ for (cp=my_name ; *cp ; cp++)
+ if (*cp == ' ' || *cp == '\t' || *cp == '\r' || *cp == '\n')
+ *cp = '_';
/*
* Hostnames checked OK.
- * Now check to see if this is a duplicate, and warn if so.
+ * Now choose a hostname to use for matching. We cannot
+ * really trust much in the incoming NOTIFY, so to make
+ * sure that multi-homed hosts work nicely, we get an
+ * FQDN now, and use that for matching
+ */
+ hostinfo = gethostbyaddr(hostinfo->h_addr,
+ hostinfo->h_length,
+ hostinfo->h_addrtype);
+ if (hostinfo)
+ dnsname = xstrdup(hostinfo->h_name);
+ else
+ dnsname = xstrdup(my_name);
+
+ /* Now check to see if this is a duplicate, and warn if so.
* I will also return STAT_FAIL. (I *think* this is how I should
* handle it.)
*
if (matchhostname(NL_MY_NAME(clnt), my_name) &&
NL_MY_PROC(clnt) == id->my_proc &&
NL_MY_PROG(clnt) == id->my_prog &&
- NL_MY_VERS(clnt) == id->my_vers) {
+ NL_MY_VERS(clnt) == id->my_vers &&
+ memcmp(NL_PRIV(clnt), argp->priv, SM_PRIV_SIZE) == 0) {
/* Hey! We already know you guys! */
dprintf(N_DEBUG,
"Duplicate SM_MON request for %s "
mon_name, my_name);
/* But we'll let you pass anyway. */
- result.res_stat = STAT_SUCC;
- result.state = MY_STATE;
- return (&result);
+ goto success;
}
clnt = NL_NEXT(clnt);
}
NL_MY_VERS(clnt) = id->my_vers;
NL_MY_PROC(clnt) = id->my_proc;
memcpy(NL_PRIV(clnt), argp->priv, SM_PRIV_SIZE);
+ clnt->dns_name = dnsname;
/*
* Now, Create file on stable storage for host.
*/
- path=xmalloc(strlen(SM_DIR)+strlen(mon_name)+2);
- sprintf(path, "%s/%s", SM_DIR, mon_name);
+ path=xmalloc(strlen(SM_DIR)+strlen(dnsname)+2);
+ sprintf(path, "%s/%s", SM_DIR, dnsname);
if ((fd = open(path, O_WRONLY|O_SYNC|O_CREAT|O_APPEND,
S_IRUSR|S_IWUSR)) < 0) {
/* Didn't fly. We won't monitor. */
goto failure;
}
{
- char buf[LINELEN + 1 + SM_MAXSTRLEN + 2];
+ char buf[LINELEN + 1 + SM_MAXSTRLEN*2 + 4];
char *e;
int i;
e = buf + sprintf(buf, "%08x %08x %08x %08x ",
for (i=0; i<SM_PRIV_SIZE; i++)
e += sprintf(e, "%02x", 0xff & (argp->priv[i]));
if (e+1-buf != LINELEN) abort();
- e += sprintf(e, " %s\n", mon_name);
+ e += sprintf(e, " %s %s\n", mon_name, my_name);
write(fd, buf, e-buf);
}
ha_callout("add-client", mon_name, my_name, -1);
nlist_insert(&rtnl, clnt);
close(fd);
-
+ dprintf(N_DEBUG, "MONITORING %s for %s", mon_name, my_name);
+ success:
result.res_stat = STAT_SUCC;
+ /* SUN's sm_inter.x says this should be "state number of local site".
+ * X/Open says '"state" will be contain the state of the remote NSM.'
+ * href=http://www.opengroup.org/onlinepubs/9629799/SM_MON.htm
+ * Linux lockd currently (2.6.21 and prior) ignores whatever is
+ * returned, and given the above contraction, it probably always will..
+ * So we just return what we always returned. If possible, we
+ * have already told lockd about our state number via a sysctl.
+ * If lockd wants the remote state, it will need to
+ * use SM_STAT (and prayer).
+ */
result.state = MY_STATE;
- dprintf(N_DEBUG, "MONITORING %s for %s", mon_name, my_name);
return (&result);
failure:
while (fgets(buf, sizeof(buf), f) != NULL) {
int addr, proc, prog, vers;
char priv[SM_PRIV_SIZE];
+ char *monname, *myname;
char *b;
int i;
notify_list *clnt;
b += 2;
}
b++;
- clnt = nlist_new("127.0.0.1", b, 0);
+ monname = b;
+ while (*b && *b != ' ') b++;
+ if (*b) *b++ = '\0';
+ while (*b == ' ') b++;
+ myname = b;
+ clnt = nlist_new(myname, monname, 0);
if (!clnt)
break;
NL_ADDR(clnt).s_addr = addr;
NL_MY_PROG(clnt) = prog;
NL_MY_VERS(clnt) = vers;
NL_MY_PROC(clnt) = proc;
+ clnt->dns_name = xstrdup(de->d_name);
memcpy(NL_PRIV(clnt), priv, SM_PRIV_SIZE);
nlist_insert(&rtnl, clnt);
}
char *mon_name = argp->mon_name,
*my_name = argp->my_id.my_name;
struct my_id *id = &argp->my_id;
+ char *cp;
#ifdef RESTRICTED_STATD
struct in_addr caller;
#endif
inet_ntoa(caller));
goto failure;
}
- my_name = "127.0.0.1";
#endif
+ /* my_name must not have white space */
+ for (cp=my_name ; *cp ; cp++)
+ if (*cp == ' ' || *cp == '\t' || *cp == '\r' || *cp == '\n')
+ *cp = '_';
+
/* Check if we're monitoring anyone. */
if (!(clnt = rtnl)) {
/* PRC: do the HA callout: */
ha_callout("del-client", mon_name, my_name, -1);
+ xunlink(SM_DIR, clnt->dns_name, 1);
nlist_free(&rtnl, clnt);
- xunlink(SM_DIR, mon_name, 1);
return (&result);
} else
inet_ntoa(caller));
goto failure;
}
- my_name = "127.0.0.1";
#endif
result.state = MY_STATE;
temp = NL_NEXT(clnt);
/* PRC: do the HA callout: */
ha_callout("del-client", mon_name, my_name, -1);
+ xunlink(SM_DIR, clnt->dns_name, 1);
nlist_free(&rtnl, clnt);
- xunlink(SM_DIR, mon_name, 1);
++count;
clnt = temp;
} else
projects / nfs-utils.git / blobdiff