rpms/nfs-utils/devel nfs-utils-1.2.1-cel-ipv6.patch, NONE, 1.1.2.1 nfs-utils-1.2.1-relax-insecure-option.patch, NONE, 1.1.2.1 nfs-utils.spec, 1.253, 1.253.2.1
Jeff Layton
jlayton at fedoraproject.org
Thu Dec 3 20:18:40 UTC 2009
Author: jlayton
Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv883
Modified Files:
Tag: private-jlayton-ipv6-3
nfs-utils.spec
Added Files:
Tag: private-jlayton-ipv6-3
nfs-utils-1.2.1-cel-ipv6.patch
nfs-utils-1.2.1-relax-insecure-option.patch
Log Message:
Add support for IPv6 to nfs-utils
nfs-utils-1.2.1-cel-ipv6.patch:
b/.gitignore | 9
b/aclocal/ipv6.m4 | 4
b/aclocal/libcap.m4 | 15
b/configure.ac | 1
b/support/Makefile.am | 2
b/support/export/client.c | 22
b/support/export/export.c | 3
b/support/export/hostname.c | 284 ++++++++++
b/support/export/nfsctl.c | 17
b/support/export/rmtab.c | 46 -
b/support/export/xtab.c | 4
b/support/include/Makefile.am | 1
b/support/include/compaddr.h | 109 ++++
b/support/include/exportfs.h | 4
b/support/include/ha-callout.h | 4
b/support/include/misc.h | 2
b/support/include/nfslib.h | 9
b/support/include/nfsrpc.h | 12
b/support/include/nsm.h | 62 ++
b/support/include/rpcmisc.h | 7
b/support/include/tcpwrapper.h | 2
b/support/misc/from_local.c | 20
b/support/misc/tcpwrapper.c | 4
b/support/nfs/Makefile.am | 3
b/support/nfs/cacheio.c | 5
b/support/nfs/exports.c | 2
b/support/nfs/getfh.c | 48 +
b/support/nfs/getport.c | 91 +++
b/support/nfs/svc_create.c | 252 +++++++++
b/support/nsm/Makefile.am | 45 +
b/support/nsm/file.c | 772 +++++++++++++++++++++++++++++
b/support/nsm/rpc.c | 507 +++++++++++++++++++
b/support/nsm/sm_inter.x | 131 ++++
b/utils/exportfs/exportfs.c | 11
b/utils/exportfs/exportfs.man | 281 +++++-----
b/utils/exportfs/exports.man | 70 +-
b/utils/mount/network.c | 30 -
b/utils/mount/network.h | 4
b/utils/mount/nfs.man | 86 +--
b/utils/mount/nfsumount.c | 9
b/utils/mount/stropts.c | 53 --
b/utils/mountd/auth.c | 2
b/utils/mountd/cache.c | 23
b/utils/mountd/fsloc.c | 5
b/utils/mountd/mount_dispatch.c | 2
b/utils/mountd/mountd.c | 26
b/utils/mountd/mountd.h | 5
b/utils/mountd/mountd.man | 242 +++++----
b/utils/mountd/rmtab.c | 21
b/utils/nfsd/nfsd.c | 9
b/utils/nfsd/nfssvc.c | 9
b/utils/statd/Makefile.am | 4
b/utils/statd/callback.c | 4
b/utils/statd/hostname.c | 122 ++++
b/utils/statd/misc.c | 12
b/utils/statd/monitor.c | 47 -
b/utils/statd/notlist.c | 4
b/utils/statd/rmtcall.c | 36 -
b/utils/statd/simu.c | 10
b/utils/statd/simulate.c | 52 -
b/utils/statd/sm-notify.c | 163 ++----
b/utils/statd/sm-notify.man | 8
b/utils/statd/stat.c | 8
b/utils/statd/statd.c | 57 --
b/utils/statd/statd.h | 9
b/utils/statd/statd.man | 510 +++++++++++++------
b/utils/statd/svc_run.c | 7
configure.ac | 5
support/export/client.c | 1053 ++++++++++++++++++++++++----------------
support/export/export.c | 189 ++++---
support/export/hostname.c | 352 +------------
support/export/rmtab.c | 8
support/include/exportfs.h | 82 ++-
support/include/misc.h | 7
support/include/nfslib.h | 3
support/include/nsm.h | 25
support/include/tcpwrapper.h | 7
support/misc/from_local.c | 87 +++
support/misc/tcpwrapper.c | 170 +++---
support/nsm/Makefile.am | 4
support/nsm/file.c | 50 +
utils/exportfs/exportfs.c | 213 ++++----
utils/mount/network.c | 100 ++-
utils/mount/network.h | 7
utils/mount/nfs.man | 6
utils/mount/stropts.c | 40 +
utils/mountd/auth.c | 103 ++-
utils/mountd/cache.c | 80 +--
utils/mountd/mount_dispatch.c | 6
utils/mountd/mountd.c | 131 ++--
utils/mountd/mountd.h | 2
utils/mountd/rmtab.c | 90 +--
utils/statd/Makefile.am | 30 -
utils/statd/callback.c | 74 ++
utils/statd/hostname.c | 95 +++
utils/statd/log.c | 95 ---
utils/statd/log.h | 42 -
utils/statd/misc.c | 24
utils/statd/monitor.c | 201 +++----
utils/statd/rmtcall.c | 145 -----
utils/statd/simu.c | 38 -
utils/statd/sm-notify.c | 873 +++++++++++++++------------------
utils/statd/sm-notify.man | 435 +++++++++++-----
utils/statd/sm_inter.x | 133 -----
utils/statd/stat.c | 10
utils/statd/statd.c | 165 +-----
utils/statd/statd.h | 37 -
utils/statd/statd.man | 21
utils/statd/version.h | 9
109 files changed, 6137 insertions(+), 3550 deletions(-)
--- NEW FILE nfs-utils-1.2.1-cel-ipv6.patch ---
-------------------------------------------------------------------------------
statd-replace-note-with-xlog-i
-------------------------------------------------------------------------------
statd: Replace note() with xlog() in rpc.statd
From: Chuck Lever <chuck.lever at oracle.com>
To facilitate code sharing between statd and sm-notify (and with other
components of nfs-utils), replace rpc.statd's note() with xlog().
Bonus: add debugging xlog() messages to report incoming RPC requests.
These additional messages are enabled when "-d" is specified on the
statd command line.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---
support/include/ha-callout.h | 4 --
utils/statd/Makefile.am | 4 +-
utils/statd/callback.c | 4 +-
utils/statd/log.c | 95 ------------------------------------------
utils/statd/log.h | 42 -------------------
utils/statd/misc.c | 12 ++---
utils/statd/monitor.c | 47 +++++++++++----------
utils/statd/rmtcall.c | 36 ++++++++--------
utils/statd/simu.c | 10 +++-
utils/statd/simulate.c | 52 +++++++++++------------
utils/statd/stat.c | 8 ++--
utils/statd/statd.c | 57 +++++++++++--------------
utils/statd/statd.h | 9 ----
utils/statd/svc_run.c | 7 +--
utils/statd/version.h | 7 ---
15 files changed, 118 insertions(+), 276 deletions(-)
delete mode 100644 utils/statd/log.c
delete mode 100644 utils/statd/log.h
delete mode 100644 utils/statd/version.h
diff --git a/support/include/ha-callout.h b/support/include/ha-callout.h
index efb70fb..1164336 100644
--- a/support/include/ha-callout.h
+++ b/support/include/ha-callout.h
@@ -53,11 +53,7 @@ ha_callout(char *event, char *arg1, char *arg2, int arg3)
default: pid = waitpid(pid, &ret, 0);
}
sigaction(SIGCHLD, &oldact, &newact);
-#ifdef dprintf
- dprintf(N_DEBUG, "ha callout returned %d\n", WEXITSTATUS(ret));
-#else
xlog(D_GENERAL, "ha callout returned %d\n", WEXITSTATUS(ret));
-#endif
}
#endif
diff --git a/utils/statd/Makefile.am b/utils/statd/Makefile.am
index 8a3ba4e..19ba7b4 100644
--- a/utils/statd/Makefile.am
+++ b/utils/statd/Makefile.am
@@ -13,9 +13,9 @@ RPCPREFIX = rpc.
KPREFIX = @kprefix@
sbin_PROGRAMS = statd sm-notify
dist_sbin_SCRIPTS = start-statd
-statd_SOURCES = callback.c notlist.c log.c misc.c monitor.c \
+statd_SOURCES = callback.c notlist.c misc.c monitor.c \
simu.c stat.c statd.c svc_run.c rmtcall.c \
- sm_inter_clnt.c sm_inter_svc.c sm_inter_xdr.c log.h \
+ sm_inter_clnt.c sm_inter_svc.c sm_inter_xdr.c \
notlist.h statd.h system.h version.h sm_inter.h
sm_notify_SOURCES = sm-notify.c
diff --git a/utils/statd/callback.c b/utils/statd/callback.c
index 8885238..2f98aeb 100644
--- a/utils/statd/callback.c
+++ b/utils/statd/callback.c
@@ -35,12 +35,12 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp)
struct sockaddr_in *sin = nfs_getrpccaller_in(rqstp->rq_xprt);
char *ip_addr = xstrdup(inet_ntoa(sin->sin_addr));
- dprintf(N_DEBUG, "Received SM_NOTIFY from %s, state: %d",
+ xlog(D_CALL, "Received SM_NOTIFY from %s, state: %d",
argp->mon_name, argp->state);
/* quick check - don't bother if we're not monitoring anyone */
if (rtnl == NULL) {
- note(N_WARNING, "SM_NOTIFY from %s while not monitoring any hosts.",
+ xlog_warn("SM_NOTIFY from %s while not monitoring any hosts",
argp->mon_name);
return ((void *) &result);
}
diff --git a/utils/statd/log.c b/utils/statd/log.c
deleted file mode 100644
index a6ca996..0000000
--- a/utils/statd/log.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 1995 Olaf Kirch
- * Modified by Jeffrey A. Uphoff, 1995, 1997, 1999.
- * Modified by H.J. Lu, 1998.
- * Modified by Lon Hohberger, Oct. 2000
- *
- * NSM for Linux.
- */
-
-/*
- * log.c - logging functions for lockd/statd
- * 260295 okir started with simply syslog logging.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <syslog.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
-#include <sys/types.h>
-#include "log.h"
-#include "statd.h"
-
-static pid_t mypid;
- /* Turns on logging to console/stderr. */
-#if 0
-static int opt_debug = 0; /* Will be command-line option, eventually */
-#endif
-
-void log_init(void)
-{
- if (!(run_mode & MODE_LOG_STDERR))
- openlog(name_p, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
- mypid = getpid();
-
- note(N_WARNING,"Version %s Starting",version_p);
-}
-
-void log_background(void)
-{
- /* NOP */
-}
-
-void die(char *fmt, ...)
-{
- char buffer[1024];
- va_list ap;
-
- va_start(ap, fmt);
- vsnprintf (buffer, 1024, fmt, ap);
- va_end(ap);
- buffer[1023]=0;
-
- note(N_FATAL, "%s", buffer);
-
-#ifndef DEBUG
- exit (2);
-#else
- abort(); /* make a core */
-#endif
-}
-
-void note(int level, char *fmt, ...)
-{
- char buffer[1024];
- va_list ap;
-
- va_start(ap, fmt);
- vsnprintf (buffer, 1024, fmt, ap);
- va_end(ap);
- buffer[1023]=0;
-
- if ((!(run_mode & MODE_LOG_STDERR)) && (level < N_DEBUG)) {
- syslog(level, "%s", buffer);
- } else if (run_mode & MODE_LOG_STDERR) {
- /* Log everything, including dprintf() stuff to stderr */
- time_t now;
- struct tm * tm;
-
- time(&now);
- tm = localtime(&now);
- fprintf (stderr, "%02d/%02d/%04d %02d:%02d:%02d %s[%d]: %s\n",
- tm->tm_mon + 1, tm->tm_mday, tm->tm_year + 1900,
- tm->tm_hour, tm->tm_min, tm->tm_sec,
- name_p, mypid,
- buffer);
- }
-}
diff --git a/utils/statd/log.h b/utils/statd/log.h
deleted file mode 100644
index fc55d3c..0000000
--- a/utils/statd/log.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 1995 Olaf Kirch
- * Modified by Jeffrey A. Uphoff, 1996, 1997, 1999.
[...17418 lines suppressed...]
+Specify a high availability callout program.
+This program receives callouts for all MOUNT and UNMOUNT requests.
+This allows
+.B rpc.mountd
+to be used in a High Availability NFS (HA-NFS) environment.
+.IP
+The callout program is run with 4 arguments.
+The first is
.B mount
or
.B unmount
@@ -118,19 +146,30 @@ The second will be the name of the client performing the mount.
The third will be the path that the client is mounting.
The last is the number of concurrent mounts that we believe the client
has of that path.
+.IP
+This callout is not needed with 2.6 and later kernels.
+Instead, mount the nfsd filesystem on
+.IR /proc/fs/nfsd .
.TP
.BI "\-s," "" " \-\-state\-directory\-path " directory
-specify a directory in which to place statd state information.
+Specify a directory in which to place statd state information.
If this option is not specified the default of
-.BR /var/lib/nfs
+.I /var/lib/nfs
is used.
.TP
.BI "\-r," "" " \-\-reverse\-lookup"
-mountd tracks IP addresses in the rmtab, and when a DUMP request is made (by
-someone running showmount -a, for instance), it returns IP addresses instead
-of hostnames by default. This option causes mountd to do a reverse
-lookup on each IP address and return that hostname instead. Enabling this can
-have a substantial negative effect on performance in some situations.
+.B rpc.mountd
+tracks IP addresses in the
+.I rmtab
+file. When a DUMP request is made (by
+someone running
+.BR "showmount -a" ,
+for instance), it returns IP addresses instead
+of hostnames by default. This option causes
+.B rpc.mountd
+to perform a reverse lookup on each IP address and return that hostname instead.
+Enabling this can have a substantial negative effect on performance
+in some situations.
.TP
.BR "\-t N" " or " "\-\-num\-threads=N"
This option specifies the number of worker threads that rpc.mountd
@@ -162,41 +201,70 @@ If you use the
flag, then the list of group ids received from the client will be
replaced by a list of group ids determined by an appropriate lookup on
the server. Note that the 'primary' group id is not affected so a
-.I newgroup
+.B newgroup
command on the client will still be effective. This function requires
a Linux Kernel with version at least 2.6.21.
-
.SH TCP_WRAPPERS SUPPORT
-This
+You can protect your
.B rpc.mountd
-version is protected by the
+listeners using the
+.B tcp_wrapper
+library or
+.BR iptables (8).
+.PP
+Note that the
.B tcp_wrapper
-library. You have to give the clients access to
-.B rpc.mountd
-if they should be allowed to use it. To allow connects from clients of
-the .bar.com domain you could use the following line in /etc/hosts.allow:
-
-mountd: .bar.com
-
-You have to use the daemon name
+library supports only IPv4 networking.
+.PP
+Add the hostnames of NFS peers that are allowed to access
+.B rpc.mountd
+to
+.IR /etc/hosts.allow .
+Use the daemon name
.B mountd
-for the daemon name (even if the binary has a different name).
-.B Note:
-hostnames used in either access file will be ignored when
+even if the
+.B rpc.mountd
+binary has a different name.
+.PP
+Hostnames used in either access file will be ignored when
they can not be resolved into IP addresses.
-
-For further information please have a look at the
+For further information see the
.BR tcpd (8)
and
.BR hosts_access (5)
-manual pages.
+man pages.
+.SS IPv6 and TI-RPC support
+TI-RPC is a pre-requisite for supporting NFS on IPv6.
+If TI-RPC support is built into
+.BR rpc.mountd ,
+it attempts to start listeners on network transports marked 'visible' in
+.IR /etc/netconfig .
+As long as at least one network transport listener starts successfully,
+.B rpc.mountd
+will operate.
+.SH FILES
+.TP 2.5i
+.I /etc/exports
+input file for
+.BR exportfs ,
+listing exports, export options, and access control lists
+.TP 2.5i
+.I /var/lib/nfs/rmtab
+table of clients accessing server's exports
.SH SEE ALSO
-.BR rpc.nfsd (8),
.BR exportfs (8),
.BR exports (5),
-.BR rpc.rquotad (8).
-.SH FILES
-.BR /etc/exports ,
-.BR /var/lib/nfs/xtab .
+.BR showmount (8),
+.BR rpc.nfsd (8),
+.BR rpc.rquotad (8),
+.BR nfs (5),
+.BR tcpd (8),
+.BR hosts_access (5),
+.BR iptables (8),
+.BR netconfig (5)
+.sp
+RFC 1094 - "NFS: Network File System Protocol Specification"
+.br
+RFC 1813 - "NFS Version 3 Protocol Specification"
.SH AUTHOR
Olaf Kirch, H. J. Lu, G. Allan Morris III, and a host of others.
-------------------------------------------------------------------------------
nfsd-revert-commit-b2a3cd59
-------------------------------------------------------------------------------
nfsd: Revert commit b2a3cd59
From: Chuck Lever <chuck.lever at oracle.com>
Enable IPv6 support in rpc.nfsd again.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---
utils/nfsd/nfsd.c | 9 ---------
utils/nfsd/nfssvc.c | 9 ---------
2 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index 1cda1e5..650c593 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -27,15 +27,6 @@
#include "nfssvc.h"
#include "xlog.h"
-/*
- * IPv6 support for nfsd was finished before some of the other daemons (mountd
- * and statd in particular). That could be a problem in the future if someone
- * were to boot a kernel that supports IPv6 serving with an older nfs-utils. For
- * now, hardcode the IPv6 switch into the off position until the other daemons
- * are functional.
- */
-#undef IPV6_SUPPORTED
-
static void usage(const char *);
static struct option longopts[] =
diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
index b8028bb..119135e 100644
--- a/utils/nfsd/nfssvc.c
+++ b/utils/nfsd/nfssvc.c
@@ -22,15 +22,6 @@
#include "nfslib.h"
#include "xlog.h"
-/*
- * IPv6 support for nfsd was finished before some of the other daemons (mountd
- * and statd in particular). That could be a problem in the future if someone
- * were to boot a kernel that supports IPv6 serving with an older nfs-utils. For
- * now, hardcode the IPv6 switch into the off position until the other daemons
- * are functional.
- */
-#undef IPV6_SUPPORTED
-
#define NFSD_PORTS_FILE "/proc/fs/nfsd/portlist"
#define NFSD_VERS_FILE "/proc/fs/nfsd/versions"
#define NFSD_THREAD_FILE "/proc/fs/nfsd/threads"
nfs-utils-1.2.1-relax-insecure-option.patch:
auth.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE nfs-utils-1.2.1-relax-insecure-option.patch ---
>From fa42ac173d1d7e37a4052471dfc15520a09f102e Mon Sep 17 00:00:00 2001
From: Robert Gordon <rbg at openrbg.com>
Date: Mon, 16 Nov 2009 13:25:02 -0500
Subject: [PATCH] relax insecure option on mountd
In nfs-utils 1.2.0, I noticed that the insecure option validates that
the client port is a
subset of IPPORT_RESERVED as opposed to just validating it is a valid
reserved port. The following proposed patch would correct that issue.
Acked-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Robert Gordon <rbg at openrbg.com>
Signed-off-by: Steve Dickson <steved at redhat.com>
---
utils/mountd/auth.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 575f207..5a7ff8c 100644
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -169,8 +169,7 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
}
}
if (!(exp->m_export.e_flags & NFSEXP_INSECURE_PORT) &&
- (ntohs(caller->sin_port) < IPPORT_RESERVED/2 ||
- ntohs(caller->sin_port) >= IPPORT_RESERVED)) {
+ ntohs(caller->sin_port) >= IPPORT_RESERVED) {
*error = illegal_port;
return NULL;
}
--
1.6.5.2
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.253
retrieving revision 1.253.2.1
diff -u -p -r1.253 -r1.253.2.1
--- nfs-utils.spec 12 Nov 2009 19:50:55 -0000 1.253
+++ nfs-utils.spec 3 Dec 2009 20:18:40 -0000 1.253.2.1
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.2.1
-Release: 3%{?dist}
+Release: 3.ipv6.1%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -18,12 +18,14 @@ Source13: rpcgssd.init
Source14: rpcsvcgssd.init
Source15: nfs.sysconfig
-Patch00: nfs-utils-1.0.5-statdpath.patch
-Patch01: nfs-utils-1.1.0-smnotify-path.patch
+#Patch00: nfs-utils-1.0.5-statdpath.patch
+#Patch01: nfs-utils-1.1.0-smnotify-path.patch
Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
Patch200: nfs-utils-1.2.0-v4root-rel8.patch
Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
+Patch300: nfs-utils-1.2.1-relax-insecure-option.patch
+Patch301: nfs-utils-1.2.1-cel-ipv6.patch
Group: System Environment/Daemons
Provides: exportfs = %{epoch}:%{version}-%{release}
@@ -71,13 +73,16 @@ This package also contains the mount.nfs
%prep
%setup -q
-%patch00 -p1
-%patch01 -p1
+#%patch00 -p1
+#%patch01 -p1
%patch02 -p1
%patch200 -p1
%patch201 -p1
+%patch300 -p1
+%patch301 -p1
+
# Remove .orig files
find . -name "*.orig" | xargs rm -f
@@ -98,7 +103,8 @@ CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_F
CPPFLAGS="$DEFINES" \
LDFLAGS="-pie" \
--enable-mount \
- --enable-mountconfig
+ --enable-mountconfig \
+ --enable-ipv6
make all
@@ -248,6 +254,14 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Thu Dec 3 2009 Jeff Layton <jlayton at redhat.com> 1.2.1-3.ipv6.1
+- remove patches to fix statd/sm-notify paths in old statd
+- add patch to relax "insecure" export option (so that later patches apply
+ cleanly)
+- add patches from Chuck Lever's tree to support IPv6 in statd, mountd and
+ exportfs
+- enable IPv6 during configuration
+
* Thu Nov 12 2009 Steve Dickson <steved at redhat.com> 1.2.1-3
- Stop rpc.nfsd from failing to startup when the network
is down (bz 532270)
More information about the fedora-extras-commits
mailing list