static void
nfssvc_setfds(int port, unsigned int ctlbits, char *haddr)
{
- int fd, on=1;
+ int fd, n, on=1;
char buf[BUFSIZ];
int udpfd = -1, tcpfd = -1;
struct sockaddr_in sin;
+ fd = open(NFSD_PORTS_FILE, O_RDONLY);
+ if (fd < 0)
+ return;
+ n = read(fd, buf, BUFSIZ);
+ close(fd);
+ if (n != 0)
+ return;
+ /* there are no ports currently open, so it is safe to
+ * try to open some and pass them through.
+ * Note: If the user explicitly asked for 'udp', then
+ * we should probably check if that is open, and should
+ * open it if not. However we don't yet. All sockets
+ * have to be opened when the first daemon is started.
+ */
fd = open(NFSD_PORTS_FILE, O_WRONLY);
if (fd < 0)
return;
snprintf(buf, BUFSIZ,"%d\n", udpfd);
if (write(fd, buf, strlen(buf)) != strlen(buf)) {
syslog(LOG_ERR,
- "nfssvc: writting fds to kernel failed: errno %d (%s)",
+ "nfssvc: writing fds to kernel failed: errno %d (%s)",
errno, strerror(errno));
}
close(fd);
snprintf(buf, BUFSIZ,"%d\n", tcpfd);
if (write(fd, buf, strlen(buf)) != strlen(buf)) {
syslog(LOG_ERR,
- "nfssvc: writting fds to kernel failed: errno %d (%s)",
+ "nfssvc: writing fds to kernel failed: errno %d (%s)",
errno, strerror(errno));
}
}
return;
}
static void
-nfssvc_versbits(unsigned int ctlbits)
+nfssvc_versbits(unsigned int ctlbits, int minorvers4)
{
int fd, n, off;
char buf[BUFSIZ], *ptr;
else
off += snprintf(ptr+off, BUFSIZ - off, "-%d ", n);
}
+ n = minorvers4 >= 0 ? minorvers4 : -minorvers4;
+ if (n >= NFSD_MINMINORVERS4 && n <= NFSD_MAXMINORVERS4)
+ off += snprintf(ptr+off, BUFSIZ - off, "%c4.%d",
+ minorvers4 > 0 ? '+' : '-',
+ n);
snprintf(ptr+off, BUFSIZ - off, "\n");
if (write(fd, buf, strlen(buf)) != strlen(buf)) {
syslog(LOG_ERR, "nfssvc: Setting version failed: errno %d (%s)",
return;
}
int
-nfssvc(int port, int nrservs, unsigned int versbits, unsigned protobits,
- char *haddr)
+nfssvc(int port, int nrservs, unsigned int versbits, int minorvers4,
+ unsigned protobits, char *haddr)
{
struct nfsctl_arg arg;
int fd;
+ /* Note: must set versions before fds so that
+ * the ports get registered with portmap against correct
+ * versions
+ */
+ nfssvc_versbits(versbits, minorvers4);
nfssvc_setfds(port, protobits, haddr);
- nfssvc_versbits(versbits);
-
fd = open(NFSD_THREAD_FILE, O_WRONLY);
if (fd < 0)
fd = open("/proc/fs/nfs/threads", O_WRONLY);