rpms/nfs-utils/FC-4 nfs-utils-1.0.7-nfsd-ctlbits.patch, NONE, 1.1 nfs-utils.spec, 1.56, 1.57
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jul 15 13:01:37 UTC 2005
Author: steved
Update of /cvs/dist/rpms/nfs-utils/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6155
Modified Files:
nfs-utils.spec
Added Files:
nfs-utils-1.0.7-nfsd-ctlbits.patch
Log Message:
- Add ctlbits patch that introduced the -N -T and -U
command line flags to rpc.nfsd.
nfs-utils-1.0.7-nfsd-ctlbits.patch:
support/include/nfs/nfs.h | 11 +++++++
support/include/nfslib.h | 2 -
support/nfs/nfssvc.c | 48 +++++++++++++++++++++++++++++++++
utils/nfsd/nfsd.c | 65 +++++++++++++++++++++++++++++++++++++++++-----
utils/nfsd/nfsd.man | 21 +++++++++++++-
5 files changed, 136 insertions(+), 11 deletions(-)
--- NEW FILE nfs-utils-1.0.7-nfsd-ctlbits.patch ---
This patch added the following aruments to rpc.nfsd:
-N or --no-nfs-version vers
This option can be used to request that rpc.nfsd does not offer
certain versions of NFS. The current version of rpc.nfsd can
support both NFS version 2,3 and the newer version 4.
-T or --no-tcp
Disable rpc.nfsd from accepting TCP connections from clients.
-U or --no-udp
Disable rpc.nfsd from accepting UDP connections from clients.
--- nfs-utils-1.0.7/support/include/nfs/nfs.h.orig 2003-07-02 22:09:31.000000000 -0400
+++ nfs-utils-1.0.7/support/include/nfs/nfs.h 2005-07-11 12:14:29.000000000 -0400
@@ -10,6 +10,9 @@
#define NFS3_FHSIZE 64
#define NFS_FHSIZE 32
+#define NFSD_MINVERS 2
+#define NFSD_MAXVERS 4
+
struct nfs_fh_len {
int fh_size;
u_int8_t fh_handle[NFS3_FHSIZE];
@@ -40,7 +43,15 @@ struct nfs_fh_old {
#define NFSCTL_LOCKD 0x10000
#define LOCKDCTL_SVC NFSCTL_LOCKD
+#define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << ((_v) - 1)))
+#define NFSCTL_UDPUNSET(_cltbits) ((_cltbits) &= ~(1 << (17 - 1)))
+#define NFSCTL_TCPUNSET(_cltbits) ((_cltbits) &= ~(1 << (18 - 1)))
+
+#define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << ((_v) - 1)))
+#define NFSCTL_UDPISSET(_cltbits) ((_cltbits) & (1 << (17 - 1)))
+#define NFSCTL_TCPISSET(_cltbits) ((_cltbits) & (1 << (18 - 1)))
+#define NFSCTL_ALLBITS (~0)
/* SVC */
struct nfsctl_svc {
--- nfs-utils-1.0.7/support/include/nfslib.h.orig 2004-09-14 21:58:40.000000000 -0400
+++ nfs-utils-1.0.7/support/include/nfslib.h 2005-07-11 12:29:25.000000000 -0400
@@ -118,7 +118,7 @@ int wildmat(char *text, char *pattern)
* nfsd library functions.
*/
int nfsctl(int, struct nfsctl_arg *, union nfsctl_res *);
-int nfssvc(int port, int nrservs);
+int nfssvc(int port, int nrservs, unsigned int versbits, unsigned int portbits);
int nfsaddclient(struct nfsctl_client *clp);
int nfsdelclient(struct nfsctl_client *clp);
int nfsexport(struct nfsctl_export *exp);
--- nfs-utils-1.0.7/support/nfs/nfssvc.c.orig 2003-08-04 00:26:06.000000000 -0400
+++ nfs-utils-1.0.7/support/nfs/nfssvc.c 2005-07-11 12:30:26.000000000 -0400
@@ -13,12 +13,58 @@
#include "nfslib.h"
+static void
+nfssvc_portbits(int port, unsigned int ctlbits)
+{
+ int fd, n;
+ char buf[BUFSIZ];
+
+ fd = open("/proc/fs/nfsd/ports", O_WRONLY);
+ if (fd < 0)
+ return;
+
+ if (NFSCTL_UDPISSET(ctlbits)) {
+ snprintf(buf, BUFSIZ,"ipv4 udp * %d", port);
+ n = write(fd, buf, strlen(buf));
+ }
+ if (NFSCTL_TCPISSET(ctlbits)) {
+ snprintf(buf, BUFSIZ,"ipv4 tcp * %d", port);
+ n = write(fd, buf, strlen(buf));
+ }
+ close(fd);
+
+ return;
+}
+static void
+nfssvc_versbits(unsigned int ctlbits)
+{
+ int fd, n, off;
+ char buf[BUFSIZ], *ptr;
+
+ ptr = buf;
+ off = 0;
+ fd = open("/proc/fs/nfsd/versions", O_WRONLY);
+ for (n = NFSD_MINVERS; n <= NFSD_MAXVERS; n++) {
+ if (NFSCTL_VERISSET(ctlbits, n))
+ off += snprintf(ptr+off, BUFSIZ - off, "+%d ", n);
+ else
+ off += snprintf(ptr+off, BUFSIZ - off, "-%d ", n);
+ }
+ if (fd < 0)
+ return;
+ close(fd);
+}
int
-nfssvc(int port, int nrservs)
+nfssvc(int port, int nrservs, unsigned int versbits, unsigned portbits)
{
struct nfsctl_arg arg;
int fd;
+ if (portbits != NFSCTL_ALLBITS)
+ nfssvc_portbits(port, portbits);
+ if (versbits != NFSCTL_ALLBITS)
+ nfssvc_versbits(versbits);
+
fd = open("/proc/fs/nfsd/threads", O_WRONLY);
if (fd < 0)
fd = open("/proc/fs/nfs/threads", O_WRONLY);
--- nfs-utils-1.0.7/utils/nfsd/nfsd.c.orig 2005-07-11 11:42:00.000000000 -0400
+++ nfs-utils-1.0.7/utils/nfsd/nfsd.c 2005-07-11 12:30:51.000000000 -0400
@@ -23,10 +23,23 @@
static void usage(const char *);
+static struct option longopts[] =
+{
+ { "help", 0, 0, 'h' },
+ { "no-nfs-version", 1, 0, 'N' },
+ { "no-tcp", 0, 0, 'T' },
+ { "no-udp", 0, 0, 'U' },
+ { "port", 1, 0, 'P' },
+ { "port", 1, 0, 'p' },
+ { NULL, 0, 0, 0 }
+};
+unsigned int portbits = NFSCTL_ALLBITS;
+unsigned int versbits = NFSCTL_ALLBITS;
+
int
main(int argc, char **argv)
{
- int count = 1, c, error, port, fd;
+ int count = 1, c, error, port, fd, found_one;
struct servent *ent;
DIR *dir;
@@ -36,7 +49,7 @@ main(int argc, char **argv)
else
port = 2049;
- while ((c = getopt(argc, argv, "hp:P:")) != EOF) {
+ while ((c = getopt_long(argc, argv, "hN:p:P:TU", longopts, NULL)) != EOF) {
switch(c) {
case 'P': /* XXX for nfs-server compatibility */
case 'p':
@@ -47,12 +60,50 @@ main(int argc, char **argv)
usage(argv [0]);
}
break;
+ case 'N':
+ switch((c = atoi(optarg))) {
+ case 2:
+ case 3:
+ case 4:
+ NFSCTL_VERUNSET(versbits, c);
+ break;
+ default:
+ fprintf(stderr, "%c: Unsupported version\n", c);
+ exit(1);
+ }
break;
- case 'h':
+ case 'T':
+ NFSCTL_TCPUNSET(portbits);
+ break;
+ case 'U':
+ NFSCTL_UDPUNSET(portbits);
+ break;
default:
+ fprintf(stderr, "Invalid argument: '%c'\n", c);
+ case 'h':
usage(argv[0]);
}
}
+ /*
+ * Do some sanity checking, if the ctlbits are set
+ */
+ if (!NFSCTL_UDPISSET(portbits) && !NFSCTL_TCPISSET(portbits)) {
+ fprintf(stderr, "invalid protocol specified\n");
+ exit(1);
+ }
+ found_one = 0;
+ for (c = NFSD_MINVERS; c <= NFSD_MAXVERS; c++) {
+ if (NFSCTL_VERISSET(versbits, c))
+ found_one = 1;
+ }
+ if (!found_one) {
+ fprintf(stderr, "no version specified\n");
+ exit(1);
+ }
+ if (NFSCTL_VERISSET(versbits, 4) && !NFSCTL_TCPISSET(versbits)) {
+ fprintf(stderr, "version 4 requires the TCP protocol\n");
+ exit(1);
+ }
if (chdir(NFS_STATEDIR)) {
fprintf(stderr, "%s: chdir(%s) failed: %s\n",
@@ -69,7 +120,6 @@ main(int argc, char **argv)
count = 1;
}
}
-
/* KLUDGE ALERT:
Some kernels let nfsd kernel threads inherit open files
from the program that spawns them (i.e. us). So close
@@ -99,7 +149,7 @@ main(int argc, char **argv)
(void) close(fd);
}
- if ((error = nfssvc(port, count)) < 0) {
+ if ((error = nfssvc(port, count, versbits, portbits)) < 0) {
int e = errno;
openlog("nfsd", LOG_PID, LOG_DAEMON);
syslog(LOG_ERR, "nfssvc: %s", strerror(e));
@@ -112,7 +162,8 @@ main(int argc, char **argv)
static void
usage(const char *prog)
{
- fprintf(stderr, "usage:\n"
- "%s nrservs\n", prog);
+ fprintf(stderr, "Usage:\n"
+ "%s [-p|-P|--port] [-N|no-nfs-version] [-T|--no-tcp] [-U|--no-udp] nrservs\n",
+ prog);
exit(2);
}
--- nfs-utils-1.0.7/utils/nfsd/nfsd.man.orig 2002-08-26 12:57:59.000000000 -0400
+++ nfs-utils-1.0.7/utils/nfsd/nfsd.man 2005-07-11 11:46:46.000000000 -0400
@@ -6,7 +6,7 @@
.SH NAME
rpc.nfsd \- NFS server process
.SH SYNOPSIS
-.BI "/usr/sbin/rpc.nfsd [-p " port "] " nproc
+.BI "/usr/sbin/rpc.nfsd [" options "]" " "nproc
.SH DESCRIPTION
The
.B rpc.nfsd
@@ -22,11 +22,28 @@ server provides an ancillary service nee
by NFS clients.
.SH OPTIONS
.TP
-.BI \-p " port"
+.B \-p " or " \-\-port port
specify a diferent port to listen on for NFS requests. By default,
.B rpc.nfsd
will listen on port 2049.
.TP
+.B \-N " or " \-\-no-nfs-version vers
+This option can be used to request that
+.B rpc.nfsd
+does not offer certain versions of NFS. The current version of
+.B rpc.nfsd
+can support both NFS version 2,3 and the newer version 4.
+.TP
+.B \-T " or " \-\-no-tcp
+Disable
+.B rpc.nfsd
+from accepting TCP connections from clients.
+.TP
+.B \-U " or " \-\-no-udp
+Disable
+.B rpc.nfsd
+from accepting UDP connections from clients.
+.TP
.I nproc
specify the number of NFS server threads. By default, just one
thread is started. However, for optimum performance several threads
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-4/nfs-utils.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- nfs-utils.spec 16 Jun 2005 12:49:41 -0000 1.56
+++ nfs-utils.spec 15 Jul 2005 13:01:23 -0000 1.57
@@ -1,7 +1,7 @@
Summary: NFS utlilities and supporting daemons for the kernel NFS server.
Name: nfs-utils
Version: 1.0.7
-Release: 9
+Release: 10
# group all 32bit related archs
%define all_32bit_archs i386 i686 athlon
@@ -42,6 +42,7 @@
Patch61: nfs-utils-1.0.7-xlog-loginfo.patch
Patch62: nfs-utils-1.0.7-svcgssd-bufover.patch
Patch63: nfs-utils-1.0.7-idmap-reopen.patch
+Patch64: nfs-utils-1.0.7-nfsd-ctlbits.patch
Patch100: nfs-utils-1.0.7-compile.patch
Patch150: nfs-utils-1.0.6-pie.patch
@@ -98,6 +99,7 @@
%patch61 -p1 -b .xlog
%patch62 -p1 -b .overflow
%patch63 -p1 -b .rename
+%patch64 -p1 -b .ctlbits
# Do the magic to get things to compile
@@ -247,6 +249,10 @@
%config /etc/rc.d/init.d/nfslock
%changelog
+* Fri Jul 15 2005 Steve Dickson <SteveD at RedHat.com> 1.0.7-9
+- Add ctlbits patch that introduced the -N -T and -U
+ command line flags to rpc.nfsd.
+
* Thu Jun 16 2005 Steve Dickson <SteveD at RedHat.com> 1.0.7-9
- Removed the chkconfig-ing of rpcsvcgssd since the
init script will bring the daemon up and down (bz 160570)
More information about the fedora-cvs-commits
mailing list