nfs-utils.git
10 years agomount.nfs: Assume v2/v3 if mount-related options are present
Chuck Lever [Tue, 3 Nov 2009 16:16:30 +0000 (11:16 -0500)]
mount.nfs: Assume v2/v3 if mount-related options are present

Don't try NFSv4 if any MNT protocol related options were presented by
the user.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
10 years agoMade some aesthetic changes to the code that sets
Steve Dickson [Tue, 3 Nov 2009 15:37:36 +0000 (10:37 -0500)]
Made some aesthetic changes to the code that sets
the defaults that were a result of the code review.

Signed-off-by: Steve Dickson <steved@redhat.com>
10 years agoRetry v4 mounts with a v3 mount when the version
Steve Dickson [Tue, 3 Nov 2009 14:49:03 +0000 (09:49 -0500)]
Retry v4 mounts with a v3 mount when the version
is not explicitly specified and the mount fails
with ENOENT. The will help deal with Linux servers
that do not automatically export a pseudo root

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoAdded wrappers around the setting of default values
Steve Dickson [Tue, 27 Oct 2009 19:47:27 +0000 (15:47 -0400)]
Added wrappers around the setting of default values
from the config file which will be compiled out
when the config file is not enabled.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoAdded the defaultproto and defaultvers variable to the mount nfs-utils-1-2-1-rc7
Steve Dickson [Thu, 22 Oct 2009 19:35:54 +0000 (15:35 -0400)]
Added the defaultproto and defaultvers variable to the mount
configuration file.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoUse the default protocol and version values, when they
Steve Dickson [Sat, 17 Oct 2009 13:26:18 +0000 (09:26 -0400)]
Use the default protocol and version values, when they
are set in the configuration file, to start the negation
with the server

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoIntroducing the parsing of both 'defaultvers' and 'defaultproto'
Steve Dickson [Sat, 17 Oct 2009 13:16:18 +0000 (09:16 -0400)]
Introducing the parsing of both 'defaultvers' and 'defaultproto'
config variables which will be used to set the the default
version and network protocol.

A global variable will be set for each option with the
corresponding value. The value will be used as the
initial value in the server negation.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoMake sure all protocol version options are checked in check_vers()
Steve Dickson [Fri, 9 Oct 2009 17:22:27 +0000 (13:22 -0400)]
Make sure all protocol version options are checked in check_vers()

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoMake the network transports value in the mount
Steve Dickson [Fri, 9 Oct 2009 17:14:52 +0000 (13:14 -0400)]
Make the network transports value in the mount
config file case sensitive, since they are in the
mount command's parsing code.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoThere are a number of different mount options that can be
Steve Dickson [Fri, 9 Oct 2009 13:19:39 +0000 (09:19 -0400)]
There are a number of different mount options that can be
used to set the protocol version on the command line. The
config file code needs to know about each option so the
command line value will override the config file value.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount: Support negotiation between v4, v3, and v2 nfs-utils-1-2-1-rc6
Chuck Lever [Tue, 29 Sep 2009 14:38:52 +0000 (10:38 -0400)]
mount: Support negotiation between v4, v3, and v2

When negotiating between v3 and v2, mount.nfs first tries v3, then v2.
Take the same approach for v4: try v4 first, then v3, then v2, in
order to get the highest NFS version both the client and server
support.

No MNT request is needed for v4.  Since we want to avoid an rpcbind
query for the v4 attempt, just go straight for mount(2) without a MNT
request or rpcbind negotiation first.  If the server reports that v4
is not supported, try lower versions.

The decisions made by the fg/bg retry loop have nothing to do with
version negotation.  To avoid a layering violation, mount.nfs's
multi-version negotiation strategy is wholly encapsulated within
nfs_try_mount().  Thus, code duplication between nfsmount_fg(),
nfsmount_parent(), and nfsmount_child() is avoided.

For now, negotiating version 4 is supported only on kernels that can
handle the vers=4 option on type "nfs" file systems.  At some point
we could also allow mount.nfs to switch to an "nfs4" file system in
this case.

Since mi->version == 0 can now mean v2, v3, or v4, limit the versions
tried for RDMA mounts.  Today, only version 3 supports RDMA.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoThe user's mount options and the set of versions to try should not
Chuck Lever [Tue, 29 Sep 2009 14:38:05 +0000 (10:38 -0400)]
The user's mount options and the set of versions to try should not
change over the course of mount retries.

With this patch, each version-specific mount attempt is compartment-
alized, and starts from the user's original mount options each time.
Thus these attempts can now be safely performed in any order,
depending on what the user has requested, what the server advertises,
and what is up and running at any given point.

Don't regress the fix in commit 23c1a452.  For v2/v3 negotation, only
the user's mount options are written to /etc/mtab, and not any options
that were negotiated by mount.nfs.  There's no way to guarantee that
the server configuration will be the same at umount time as it was at
mount time.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Keep server's address in nfsmount_info
Chuck Lever [Tue, 29 Sep 2009 14:37:12 +0000 (10:37 -0400)]
mount.nfs: Keep server's address in nfsmount_info

We want to pass the server's address around.  Put it in the mount
context structure.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Add API to duplicate a mount option list
Chuck Lever [Tue, 29 Sep 2009 14:36:19 +0000 (10:36 -0400)]
mount.nfs: Add API to duplicate a mount option list

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: nfs-iostat.py autofs cleanup and option to sort by ops/s nfs-utils-1-2-1-rc5
Lans Carstensen [Tue, 15 Sep 2009 18:42:47 +0000 (14:42 -0400)]
nfs-utils: nfs-iostat.py autofs cleanup and option to sort by ops/s

Adds --sort option to display mount point stats sorted by ops/s
Adds --list=<n> option to only display stats for first <n> mount points
E.g. the use of "--sort --list=1" should be useful in seeing stats for
only the mountpoint with the highest ops/s.

Signed-off-by: Lans Carstensen <Lans.Carstensen@dreamworks.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: nfs-iostat.py autofs cleanup and option to sort by ops/s
Lans Carstensen [Tue, 15 Sep 2009 18:41:46 +0000 (14:41 -0400)]
nfs-utils: nfs-iostat.py autofs cleanup and option to sort by ops/s

Introduce optparse for managing command usage/help and the statistics
options. This change helps more cleanly add new options such as --sort
while preserving the iostat-like interval, count, and mount point
positional arguments.

Signed-off-by: Lans Carstensen <Lans.Carstensen@dreamworks.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: nfs-iostat.py autofs cleanup and option to sort by ops/s
Lans Carstensen [Tue, 15 Sep 2009 18:31:35 +0000 (14:31 -0400)]
nfs-utils: nfs-iostat.py autofs cleanup and option to sort by ops/s

Update list of mount points at each interval and check for differences
when producing comparative stats.  This ensures proper stats collection
for autofs mountpoints.

Signed-off-by: Lans Carstensen <Lans.Carstensen@dreamworks.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: nfs-iostat.py autofs cleanup and option to sort by ops/s
Lans Carstensen [Tue, 15 Sep 2009 18:30:50 +0000 (14:30 -0400)]
nfs-utils: nfs-iostat.py autofs cleanup and option to sort by ops/s

Conforms Python path to the LSB 3.2+ standard of /usr/bin/python
http://refspecs.freestandards.org/LSB_3.2.0/LSB-Languages/LSB-Languages/pylocation.html
Per SteveD this is also required for proper rpm dep resolution during
builds

Signed-off-by: Lans Carstensen <Lans.Carstensen@dreamworks.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoidmapd: rearm event handler after error in nfsdcb()
Jeff Layton [Mon, 14 Sep 2009 18:06:53 +0000 (14:06 -0400)]
idmapd: rearm event handler after error in nfsdcb()

A couple of years ago, Bruce committed a patch to make knfsd send
unsigned uid's and gid's to idmapd, rather than signed values. Part
of that earlier discussion is here:

http://linux-nfs.org/pipermail/nfsv4/2007-December/007321.html

While this fixed the immediate problem, it doesn't appear that anything
was ever done to make idmapd continue working when it gets a bogus
upcall.

idmapd uses libevent for its main event handling loop. When idmapd gets
an upcall from knfsd it will service the request and then rearm the
event by calling event_add on the event structure again.

When it hits an error though, it returns in most cases w/o rearming the
event. That prevents idmapd from servicing any further requests from
knfsd.

I've made another change too. If an error is encountered while reading
the channel file, this patch has it close and reopen the file prior to
rearming the event.

I've not been able to test this patch directly, but I have tested a
backport of it to earlier idmapd code and verified that it did prevent
idmapd from hanging when it got a badly formatted upcall from knfsd.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Support "-t nfs,vers=4" mounts in the kernel
Chuck Lever [Mon, 14 Sep 2009 17:55:36 +0000 (13:55 -0400)]
mount.nfs: Support "-t nfs,vers=4" mounts in the kernel
    Support "vers=4" in nfs_nfs_version()

    Skip UMNT call for "-t nfs -o vers=4" mounts

For "-t nfs -o vers=4" mounts, we want to skip v2/v3
version/transport negotiation, but be sure to append
the "clientaddr" option.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Tested-by: Steve Dickson <steved@redhat.com>
11 years agoIPv6 support for nfsd was finished before some of the other daemons
Jeff Layton [Mon, 14 Sep 2009 17:24:00 +0000 (13:24 -0400)]
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.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoGssd blindly caches machine credentials
Lukas Hejtmanek [Thu, 27 Aug 2009 15:42:24 +0000 (11:42 -0400)]
Gssd blindly caches machine credentials

We have a problem with rpc.gssd which blindly caches machine credentials.
E.g., if someone deletes /tmp/krb5cc_machine_REALM, rpc.gss does not create
new one until the old one expires. Also, it has problems with clock skew, if
time goes back and gssd thinks that machine credentials are not expired yet.

The following patch tries to use cache but in case of failure, it tries it
again without cache. Any comments?

Signed-off-by: Lukas Hejtmanek <xhejtman@ics.muni.cz>
Acked-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoCleaned up some warnings in the mount config file code.
Steve Dickson [Thu, 27 Aug 2009 15:31:08 +0000 (11:31 -0400)]
Cleaned up some warnings in the mount config file code.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoDon't give client an empty flavor list
J. Bruce Fields [Mon, 24 Aug 2009 12:20:10 +0000 (08:20 -0400)]
Don't give client an empty flavor list

In the absence of an explicit sec= option on an export, rpc.mountd
is returning a zero-length flavor list to clients in the MOUNT results.

The linux client doesn't seem to mind, but the Solaris client
(reasonably enough) is giving up; the symptom is a "security mode
does not match" error on mount.

We could modify the export-parsing code to ensure the secinfo array
is nonzero.  But I think it's slightly simpler to handle this default
case in the implementation of the MOUNT call.  This is more-or-less the
same thing the kernel does when mountd passes it an export without any
security flavors specified.

Thanks to Tom Haynes for bug report and diagnosis.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoCleaned up parsing errors to hopeful be more precise nfs-utils-1-2-1-rc4
Steve Dickson [Mon, 17 Aug 2009 12:50:04 +0000 (08:50 -0400)]
Cleaned up parsing errors to hopeful be more precise

Also had mount_config_init() call xlog_open() so
the program name is set on xlog() calls.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoAdded support for line comments parsing which should
Benny Halevy [Mon, 17 Aug 2009 11:12:03 +0000 (07:12 -0400)]
Added support for line comments parsing which should
help with readability with in the configuration file.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoNow that only the Section names are case-insensitive
Steve Dickson [Fri, 7 Aug 2009 18:34:42 +0000 (14:34 -0400)]
Now that only the Section names are case-insensitive
the mount code has to make sure the the mount options
given to the kernel are in the correct case.

Fixed a couple of warnings on #ifndefs

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoThe example nfsmount.conf file
Steve Dickson [Wed, 5 Aug 2009 21:07:21 +0000 (17:07 -0400)]
The example nfsmount.conf file

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoThe new nfsmount.conf(5) man page and the update to
Steve Dickson [Sun, 16 Aug 2009 21:05:56 +0000 (17:05 -0400)]
The new nfsmount.conf(5) man page and the update to
the nfs(5) man page

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoAdded hooks to the mount command that allow
Steve Dickson [Fri, 7 Aug 2009 18:29:07 +0000 (14:29 -0400)]
Added hooks to the mount command that allow
mount options to be set in a configuration file

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoSupport routines used to read sections from the configuration file
Steve Dickson [Wed, 5 Aug 2009 20:17:38 +0000 (16:17 -0400)]
Support routines used to read sections from the configuration file
and parse them into comma separated mount options.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoAdds '--enable-mountconfig' configuration flag that will
Steve Dickson [Wed, 5 Aug 2009 20:10:01 +0000 (16:10 -0400)]
Adds '--enable-mountconfig' configuration flag that will
enabled mount to read from a configuration file.
The default value is disabled (or no)

Adds '--with-mountfile' configuration flag that is used when
mountconf is enabled to define the configuration file name.
The default is /etc/nfsmount.conf.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoAdded an conditional argument to the Section names
Steve Dickson [Wed, 5 Aug 2009 20:02:33 +0000 (16:02 -0400)]
Added an conditional argument to the Section names
with the format being:
   [ Section <"argument"> ]
This will help group similar functioning Section
together. The argument is conditional but must be
surrounded by the '"' characters.

The new conf_get_section() interface can used
to locate a Section by its Section name and/or
argument.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoMake Section names case-insensitive which should
Steve Dickson [Wed, 5 Aug 2009 19:53:36 +0000 (15:53 -0400)]
Make Section names case-insensitive which should
help in locating them resulting in make the config
files a bit less error prone

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoTaught conf_parse_line() to ignore spaces in the
Steve Dickson [Mon, 9 Mar 2009 17:55:25 +0000 (13:55 -0400)]
Taught conf_parse_line() to ignore spaces in the
 '[section]' parsing and before the assignment statements

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoMove idmapd's configuration file parsing routines into
Steve Dickson [Wed, 5 Aug 2009 19:47:05 +0000 (15:47 -0400)]
Move idmapd's configuration file parsing routines into
the shared libnfs.a library, making them available to\
other daemons and programs.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoAugment nfs4 stats to cover new nfs41 client and
Benny Halevy [Sun, 16 Aug 2009 20:39:07 +0000 (16:39 -0400)]
Augment nfs4 stats to cover new nfs41 client and
server operations' stats.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs(5): Remove trailing blanks
Chuck Lever [Sun, 16 Aug 2009 20:31:31 +0000 (16:31 -0400)]
nfs(5): Remove trailing blanks

Clean up: eliminate trailing blanks in utils/mount/nfs.man.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs(5): Add description of lookupcache mount option
Chuck Lever [Sun, 16 Aug 2009 20:23:36 +0000 (16:23 -0400)]
nfs(5): Add description of lookupcache mount option

See kernel commit 7973c1f1.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoSince
J. Bruce Fields [Sun, 16 Aug 2009 20:18:17 +0000 (16:18 -0400)]
Since

2d77e3a27b7b211f303f.. "Fix bug when both crossmnt and fsid are set"

Subexports automatically created by "crossmnt" get the NFSEXP_FSID flag
cleared.  That flag should also be cleared in the
security-flavor-specific flag fields.  Otherwise the kernel detects the
inconsistent flags and rejects the export.

The symptoms are clients hanging the first time they export a filesystem
mounted under a filesystem that was exported with something like:

/exports *(crossmnt,fsid=0,sec=krb5)

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoAdd some clarification about the purpose of the program, info about the nfs-utils-1-2-1-rc3
Jeff Layton [Fri, 14 Aug 2009 17:42:22 +0000 (13:42 -0400)]
Add some clarification about the purpose of the program, info about the
--debug and --syslog options, and a note about how it behaves when
TI-RPC support is built in.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: add IPv6 support to nfsd
Jeff Layton [Fri, 14 Aug 2009 17:37:12 +0000 (13:37 -0400)]
nfs-utils: add IPv6 support to nfsd

Add support for handing off IPv6 sockets to the kernel for nfsd. One of
the main goals here is to not change the behavior of options and not to
add any new ones, so this patch attempts to do that.

We also don't want to break anything in the event that someone has an
rpc.nfsd program built with IPv6 capability, but the knfsd doesn't
support IPv6. Ditto for the cases where IPv6 is either not compiled in
or is compiled in and blacklisted.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoAllow nfssvc_setfds to properly deal with AF_INET6.
Jeff Layton [Fri, 14 Aug 2009 17:33:02 +0000 (13:33 -0400)]
Allow nfssvc_setfds to properly deal with AF_INET6.

IPv6 sockets for knfsd can't be allowed to accept IPv4 packets. Set the
correct option to prevent that from occurring on IPv6 sockets.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: convert nfssvc_setfds to use getaddrinfo
Jeff Layton [Fri, 14 Aug 2009 17:30:04 +0000 (13:30 -0400)]
nfs-utils: convert nfssvc_setfds to use getaddrinfo

Convert nfssvc_setfds to use getaddrinfo. Change the args that it takes
and fix up nfssvc function to pass in the proper args. The things that
nfssvc has to do to call the new nfssvc_setfds is a little cumbersome
for now, but that will eventually be cleaned up in a later patch.

nfs-utils: break up the nfssvc interface

Currently, the only public interface to the routines in nfssvc.c is
nfssvc(). This means that we do an awful lot of work after closing
stderr that could be done while it's still available.

Add prototypes to the header so that more functions in nfssvc.c can be
called individually, and change the nfsd program to call those routines
individually.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: move check for active knfsd to helper function
Jeff Layton [Sat, 1 Aug 2009 11:31:36 +0000 (07:31 -0400)]
nfs-utils: move check for active knfsd to helper function

nfssvc_setfds checks to see if knfsd is already running. Move this
check to a helper function. Eventually the nfsd code will call this
directly.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: declare a static common buffer for nfssvc.c routines
Jeff Layton [Sat, 1 Aug 2009 11:21:26 +0000 (07:21 -0400)]
nfs-utils: declare a static common buffer for nfssvc.c routines

Several of the routines in nfssvc.c declare a buffer for strings. Use a
shared static buffer instead to keep it off of the stack. Also, the
buffer allocated in some places is *really* large. BUFSIZ is generally
8k. These routines don't need nearly that much.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: clean up NFSCTL_* macros for handling protocol bits
Jeff Layton [Sat, 1 Aug 2009 11:20:38 +0000 (07:20 -0400)]
nfs-utils: clean up NFSCTL_* macros for handling protocol bits

They are a little hard to follow currently. Clean them up and add new
macros that can set these bits in addition to the ones that unset them.

Also add a new macro that reports when any valid protocol bit is set.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: convert rpc.nfsd to use xlog()
Jeff Layton [Sat, 1 Aug 2009 10:27:40 +0000 (06:27 -0400)]
nfs-utils: convert rpc.nfsd to use xlog()

...and add --debug and --syslog options.

With the switch to xlog(), it becomes trivial to add debug messages, so
add an option to turn them on when requested.

Also, rpc.nfsd isn't a proper daemon per-se, so it makes more sense to
log errors to stderr where possible. Usually init scripts take care of
redirecting stderr output to syslog anyway.

For those that don't, add a --syslog option that forces all output to go
to syslog instead. Note that even with this option, errors encountered
during option processing will still go to stderr.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: clean up option parsing in nfsd.c
Jeff Layton [Sat, 1 Aug 2009 10:26:40 +0000 (06:26 -0400)]
nfs-utils: clean up option parsing in nfsd.c

Minor formatting nits.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: move nfssvc.c to nfsd dir and clean up linking of nfsd
Jeff Layton [Sat, 1 Aug 2009 10:26:15 +0000 (06:26 -0400)]
nfs-utils: move nfssvc.c to nfsd dir and clean up linking of nfsd

rpc.nfsd is the only user of nfssvc.c, so we might as well move it
out of libnfs.a.

Also, don't link in libexport.a and libmisc.a, they aren't needed.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoerrno not be set on RPC errors nfs-utils-1-2-1-rc2
Steve Dickson [Wed, 15 Jul 2009 11:58:22 +0000 (07:58 -0400)]
errno not be set on RPC errors

Changed both nfs_advise_umount() and nfs_gp_ping() to
set the errno by calling CLNT_GETERR() after a CLNT_CALL()
error. Also added code to rpc_strerror() that will log
the errno value, when set, via strerror().

These changes added essential information to the error message
making it much easier to detect errorsuch as "Connection refused"

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoDon't use initialized garbage for address lengths
Steve Dickson [Wed, 15 Jul 2009 10:21:54 +0000 (06:21 -0400)]
Don't use initialized garbage for address lengths

Make sure address lengths are initialized before
call calling nfs_extract_server_addresses() from
nfs_rewrite_pmap_mount_options(). Otherwise the
length check in nfs_string_to_sockaddr() can fail
since its will be using garbage from the stack.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Squelch compiler warnings in nfs_strerror()
Chuck Lever [Tue, 14 Jul 2009 21:00:47 +0000 (17:00 -0400)]
mount.nfs: Squelch compiler warnings in nfs_strerror()

Address compiler warnings:

    error.c: In function nfs_strerror:
    error.c:341: warning: comparison between signed and unsigned
    error.c:342: warning: comparison between signed and unsigned

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Squelch unused parameter warnings on empty functions
Chuck Lever [Tue, 14 Jul 2009 20:59:31 +0000 (16:59 -0400)]
mount.nfs: Squelch unused parameter warnings on empty functions

Address compiler warnings:

    fstab.c:288: warning: unused parameter sig

    parse_dev.c:186: warning: unused parameter dev
    parse_dev.c:187: warning: unused parameter hostname
    parse_dev.c:187: warning: unused parameter pathname

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Fix compiler warning in stropts.c
Chuck Lever [Tue, 14 Jul 2009 20:58:38 +0000 (16:58 -0400)]
mount.nfs: Fix compiler warning in stropts.c

Address compiler warning:

    stropts.c: In function ¿nfs_append_generic_address_option¿:
    stropts.c:138: warning: comparison between signed and unsigned

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoumount.nfs: Use correct data type in nfsumount()
Chuck Lever [Tue, 14 Jul 2009 20:57:07 +0000 (16:57 -0400)]
umount.nfs: Use correct data type in nfsumount()

Address compiler warning:

    nfsumount.c: In function nfsumount:
    nfsumount.c:347: warning: comparison between signed and unsigned

The result type of pointer arithmetic and the return type of strlen(3)
are both size_t.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: remove unused @addrlen argument from nfs_string_to_sockaddr()
Chuck Lever [Tue, 14 Jul 2009 20:56:01 +0000 (16:56 -0400)]
mount.nfs: remove unused @addrlen argument from nfs_string_to_sockaddr()

Address compiler warning:

    network.c: In function nfs_string_to_sockaddr:
    network.c:272: warning: unused parameter addrlen

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Remove unused @salen parameter from nfs_ca_gai()
Chuck Lever [Tue, 14 Jul 2009 20:53:29 +0000 (16:53 -0400)]
mount.nfs: Remove unused @salen parameter from nfs_ca_gai()

Address compiler warning:

    network.c:1124: warning: unused parameter salen

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Fix some nfs_error() nits in network.c
Chuck Lever [Tue, 14 Jul 2009 20:51:27 +0000 (16:51 -0400)]
mount.nfs: Fix some nfs_error() nits in network.c

Fix a couple of nfs_error() call sites in utils/mount/network.c.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Remove unused parameter in try_mount()
Chuck Lever [Tue, 14 Jul 2009 20:50:00 +0000 (16:50 -0400)]
mount.nfs: Remove unused parameter in try_mount()

Address compiler warning:

    mount.c: At top level:
    mount.c:420: warning: unused parameter nomtab

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Use correct data type in discover_nfs_mount_data_version()
Chuck Lever [Tue, 14 Jul 2009 20:48:50 +0000 (16:48 -0400)]
mount.nfs: Use correct data type in discover_nfs_mount_data_version()

Address compiler warning:

    mount.c: In function discover_nfs_mount_data_version¿:
    mount.c:162: warning: comparison between signed and unsigned
    mount.c:164: warning: comparison between signed and unsigned
    mount.c:166: warning: comparison between signed and unsigned
    mount.c:168: warning: comparison between signed and unsigned
    mount.c:170: warning: comparison between signed and unsigned
    mount.c:178: warning: comparison between signed and unsigned

linux_version_code() and MAKE_VERSION() both return an unsigned int.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agosupport: Introduce sockaddr helpers to get and set IP port numbers
Chuck Lever [Tue, 14 Jul 2009 20:47:09 +0000 (16:47 -0400)]
support: Introduce sockaddr helpers to get and set IP port numbers

Introduce address family-agnostic functions that get and set IP port
numbers in socket addresses.  We can already replace a few similar
functions in the mount command, and a few more will come up with
statd and sm-notify.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Don't update extra_opts after text-based negotiation
Chuck Lever [Tue, 14 Jul 2009 20:45:07 +0000 (16:45 -0400)]
mount.nfs: Don't update extra_opts after text-based negotiation

The umount.nfs command will negotiate the mount options again, so all
that is needed in /etc/mnttab is the original set of options used for
the mount, plus the additional mandatory options like addr=''.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Clean up after restructuring version/protocol negotiation
Chuck Lever [Tue, 14 Jul 2009 20:39:17 +0000 (16:39 -0400)]
mount.nfs: Clean up after restructuring version/protocol negotiation

Fix up comments and function names to reflect the new version/protocol
negotiation scheme.  We can now remove a bunch of mount processing
that is specific to v2/v3, removing about 100 lines of logic from
stropts.c.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Clean up nfs_is_permanent_error()
Chuck Lever [Tue, 14 Jul 2009 20:37:02 +0000 (16:37 -0400)]
mount.nfs: Clean up nfs_is_permanent_error()

Clean up: Move nfs_is_permanent_error() closer to the functions that
call it, and update a documenting comment to reflect recent
restructuring in this area.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: rearchitect mount version/protocol negotiation logic
Chuck Lever [Tue, 14 Jul 2009 20:35:26 +0000 (16:35 -0400)]
mount.nfs: rearchitect mount version/protocol negotiation logic

Text-based mounts try a mount operation first with default settings,
then negotiate via rpcbind queries and retry the mount, if the default
settings don't work.  This method introduces long delays in certain
common scenarios, and makes it difficult to tell when it is
appropriate to fail immediately or negotiate and retry.

To address these behavioral regressions, make text-based mounts
operate the same way that legacy mounts work.  Perform rpcbind queries
with short timeouts first, then use the results to determine
transport, version, and port number settings for the mount.

This allows the mount.nfs command to detect server settings, or
whether negotiation is even possible, quickly.  It also makes it
simple to determine when to fail vs. when to retry.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: make nfs_options2pmap return errors
Chuck Lever [Tue, 14 Jul 2009 20:34:20 +0000 (16:34 -0400)]
mount.nfs: make nfs_options2pmap return errors

Up until now, nfs_options2pmap() has been passed mount options that
have already gone through the kernel's parser successfully.  So, it
never had to check for invalid mount option values.

However, we are about to pass it options that come right from the
user.  So nfs_options2pmap() will now need to report an error and
fail if it encounters a bogus value for any of the options it cares
about.

 =====

Note that nfs_options2pmap() will allow a bogus value for an option
if the same option is specified farther to the right with a useable
value.

For example, if a user specifies "proto=foo,...,tcp" then
nfs_options2pmap() uses "tcp" and ignores "proto=foo".

However, if the options are specified in the other order:
"tcp,...,proto=foo" then nfs_options2pmap() will fail.  This is a simple
and unambiguous extension of the "rightmost wins" rule.

Since mount.nfs strips out these options out and replaces them with
the rpcbind-negotiated options before invoking mount(2), the kernel
should never receive bogus values for these options from mount.nfs in
such cases.

This is probably slightly more flexible behavior than the legacy
mount implementation, but should be harmless.  All mount options
unrelated to pmap are ignored by nfs_options2pmap().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: force rpcbind queries if options aren't specified
Chuck Lever [Tue, 14 Jul 2009 20:31:15 +0000 (16:31 -0400)]
mount.nfs: force rpcbind queries if options aren't specified

nfs_options2pmap() fills in default values if the passed-in mount
options don't specify values.  This short-circuits the version, port,
and transport negotiation logic in nfs_probe_bothports().

Instead, nfs_options2pmap() should plant zeros in these pmap fields
to force nfs_probe_bothports() and nfs_advise_mount() to discover, via
rpcbind queries, what the server supports.

This fixes some scenarios where umount.nfs fails to connect to servers
that don't have all rpcbind ports open, in addition to fixing other
corner cases during mount.nfs version/protocol negotiation.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: If port= specifies an unregistered port, retry, then fail
Chuck Lever [Tue, 14 Jul 2009 20:29:11 +0000 (16:29 -0400)]
mount.nfs: If port= specifies an unregistered port, retry, then fail

Suppose a port= option is specified on the mount command line, but not
enough other mount options are specified to avoid an rpcbind query to
discover the NFS service.

If the NFS service isn't registered on [100003, 3, "tcp", port] (even
if the server is listening on the specified port), the legacy mount.nfs
command fails immediately with:

 mount.nfs: mount to NFS server 'server' failed: RPC Error: Success

What's more, this mount request should succeeded if an NFS service is
registered on the specified port for another version and/or protocol.

So instead, let's retry the rpcbind query with the other versions and
transport protocols to be absolutely sure that port won't work with
either version or transport.  Then, if all fails, report:

 mount.nfs: mount to NFS server 'server' failed:
RPC Error: Program not registered

This change also affects text-based mounts that require negotiation
by the mount.nfs command.

Note that if the mount options specify all four pmap parameters for
NFS, the rpcbind query for the NFS service is skipped entirely.  The
mount command then hangs and times out later if NFS service is not
listening on the requested tuple.  This is unchanged from previous
behavior.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agogetport: Convert TCP connection refused to RPC_CANTRECV
Chuck Lever [Tue, 14 Jul 2009 20:27:54 +0000 (16:27 -0400)]
getport: Convert TCP connection refused to RPC_CANTRECV

In a similar vein to the timeout logic we just restored, a refused
TCP connection should be mapped to an equivalent UDP error code:
RPC_CANTRECV.

This is new behavior for TCP connections; the legacy mount command
appears to have simply failed immediately if a TCP connection was
refused during an rpcbind query.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agogetport: Restore historical TCP connect timeout error code
Chuck Lever [Tue, 14 Jul 2009 20:26:42 +0000 (16:26 -0400)]
getport: Restore historical TCP connect timeout error code

The latest versions of mount.nfs appear not to fall back to
UDP if TCP isn't available on the server.

Our new nfs_getport() implementation is missing a bit of logic
from the original mount getport() implementation.  Without it,
nfs_probe_port() sees a TCP connect timeout as a permanent error,
so it fails immediately instead of attempting to try again with
UDP.

Similar changes for our new ping API (see the old clnt_ping()
function, which is still in utils/mount/network.c).

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount.nfs: Add more debugging output around nfs_getport()
Chuck Lever [Tue, 14 Jul 2009 20:25:43 +0000 (16:25 -0400)]
mount.nfs: Add more debugging output around nfs_getport()

So we can see how rpcbind queries are failing during mount processing,
add some debugging messages (enabled with "mount.nfs -v") around the
nfs_getport() calls.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agogetport: Clear shared error fields before trying rpcbind queries
Chuck Lever [Tue, 14 Jul 2009 20:24:11 +0000 (16:24 -0400)]
getport: Clear shared error fields before trying rpcbind queries

Some RPC errors set fields in rpc_createerr.cf_error in addition
to cf_stat.  Be sure to clear _all_ error fields in rpc_createerr
each time through the rpcbind API.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agogetport: RPC_PROGNOTREGISTERED is a permanent error
Chuck Lever [Tue, 14 Jul 2009 20:21:01 +0000 (16:21 -0400)]
getport: RPC_PROGNOTREGISTERED is a permanent error

rpcbind returns RPC_PROGNOTREGISTERED if it knows for certain that an
RPC program is not supported for a given transport.  This is a
permanent and authoritative error, so the library's rpcbind query API
should never retry the query -- it will only get the same answer.

A similar change was submitted for libtirpc.  Unlike rpcb_getaddr(3t),
mount.nfs's rpcbind client only retries once (with RPCB3PROC_GETADDR),
but an extra TCP socket in this case would leave another port in
TIME_WAIT.  It's infrequent enough, but might as well get rid of it.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agosupport: Set proper retransmit timeout for datagram transports
Chuck Lever [Tue, 14 Jul 2009 20:18:37 +0000 (16:18 -0400)]
support: Set proper retransmit timeout for datagram transports

Instead of setting the total timeout and the retransmit timeout to the
same value for datagram transports, use a 1 second retransmit timeout,
so we actually get a retransmit or two before failing.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agosupport: Don't return RPC_UNKNOWNHOST from rpc_socket.c
Chuck Lever [Tue, 14 Jul 2009 20:17:28 +0000 (16:17 -0400)]
support: Don't return RPC_UNKNOWNHOST from rpc_socket.c

RPC_UNKNOWNHOST means a hostname isn't known -- basically it's
EAI_NONAME from getaddrinfo(3).  Since the functions in rpc_socket.c
don't take a hostname argument, RPC_UNKNOWNHOST is not an appropriate
return code from these functions.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agosupport: Use HAVE_LIBTIRPC to switch in bindresvport_sa(3t)
Chuck Lever [Tue, 14 Jul 2009 20:16:46 +0000 (16:16 -0400)]
support: Use HAVE_LIBTIRPC to switch in bindresvport_sa(3t)

commit 383a026d99624c88c0e802103ef4c4865db8eb71, which fixed an
earlier commit, is still not quite correct.

bindresvport_sa(3t) is available whenever libtirpc is linked.
There's no need to use IPV6_SUPPORTED here.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoNew versions of libtool add extra aclocal scripts
Chuck Lever [Tue, 14 Jul 2009 20:14:19 +0000 (16:14 -0400)]
New versions of libtool add extra aclocal scripts

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agogetport: Remove unneeded @salen arguments
Chuck Lever [Tue, 14 Jul 2009 20:13:39 +0000 (16:13 -0400)]
getport: Remove unneeded @salen arguments

Clean up: Now that getnameinfo(3) is no longer used, the @salen
argument to nfs_sockaddr2universal() is no longer needed.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agogetport: replace getnameinfo(NI_NUMERICHOST) with inet_ntop(3)
Chuck Lever [Tue, 14 Jul 2009 20:12:23 +0000 (16:12 -0400)]
getport: replace getnameinfo(NI_NUMERICHOST) with inet_ntop(3)

getnameinfo(3) with the NI_NUMERICHOST flag is used in
support/nfs/getport.c to convert socket addresses to universal address
strings.

Older versions of glibc do not have getnameinfo(3), however.  In order
for nfs-utils to build on older systems we switch in legacy code via
HAVE_GETNAMEINFO and use inet_ntoa(3).

A problem with this is that we have to double our test matrix to be
sure that both versions of these routines build and operate correctly.
Another minor problem is that inet_ntoa(3) is officially deprecated.

So let's always use a single implementation based on inet_ntop(3).
Universal address strings do not support link-local / scope IDs, so we
don't lose any functionality by using inet_ntop(3) here.

This means we open code a bit of logic that is available in most
modern versions of glibc, but in return we can use exactly the same
code for all builds (on systems with getnameinfo(3) and without).

An additional benefit is we can avoid using NI_MAXHOST for character
buffers that live on the stack: it's 1025 bytes.  Instead,
INET6_ADDRSTRLEN is used, which is just 46 bytes, plus an additional
eight bytes for the port information.  We add beefier buffer overflow
detection logic as well.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agogetport: Remove AI_ADDRCONFIG from nfs_gp_loopback_address()
Chuck Lever [Tue, 14 Jul 2009 20:11:08 +0000 (16:11 -0400)]
getport: Remove AI_ADDRCONFIG from nfs_gp_loopback_address()

AI_ADDRCONFIG was used ostensibly to figure out if the local system
had IPv6 available when generating a loopback address.

A legacy version of nfs_gp_loopback_address() was created to handle
ANYADDR address generation for old versions of glibc where
AI_ADDRCONFIG doesn't exist.  This means we have to be careful to
test both the normal and legacy versions when committing changes in
this area.

But it turns out that even contemporary versions of glibc ignore
AI_ADDRCONFIG when the hostname string is NULL.  getaddrinfo(3)
always returns an AF_INET and an AF_INET6 loopback address in this
case, no matter how the system is configured.

Change nfs_gp_loopback_address() to have one version that simply looks
up "localhost" instead of doing anything fancy.  If "localhost" is an
IPv6 address, we'll use that.  Otherwise, it should nearly always be
an AF_INET loopback address.

This eliminates the need for AI_ADDRCONFIG, and removes the duplicate
version of nfs_gp_loopback_address().  Note that callers never used
the port number in the returned socket address, so get rid of the
"sunrpc" service string too.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agogetport: RPCB_GETADDR's r_addr should contain rpcbind port, not zero
Chuck Lever [Tue, 14 Jul 2009 20:09:03 +0000 (16:09 -0400)]
getport: RPCB_GETADDR's r_addr should contain rpcbind port, not zero

Similar to a change made to the kernel's rpcbind client.  See
kernel commit 143b6c4008a7928de7e139c3a77a90e4cad8db2c.

The r_addr argument of RPCB_GETADDR procedures contains the
rpcbind server's address and port number.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agogetport: RPCB_GETADDR r_owner should be an empty string
Chuck Lever [Tue, 14 Jul 2009 20:07:35 +0000 (16:07 -0400)]
getport: RPCB_GETADDR r_owner should be an empty string

Some servers reject RPCB_GETADDR requests with a non-empty r_owner
field.  "RPC: Server can't decode arguments"

An empty string is already used by libtirpc and the kernel
for RPCB_GETADDR requests.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomydaemon: remove closeall() calls from mydaemon()
Steve Dickson [Mon, 29 Jun 2009 14:44:20 +0000 (10:44 -0400)]
mydaemon: remove closeall() calls from mydaemon()

idmapd and svcgssd have a mydaemon() routine that uses closeall() to
close file descriptors. Unfortunately, they aren't using it correctly
and it ends up closing the pipe that the child process uses to talk to
its parent.

Fix this by not using closeall() in this routine and instead, just close
the file descriptors that we know need to be closed. If /dev/null can't
be opened for some reason, then just have the child exit with a non-zero
error.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoThe closeall function is broken in such a way that it almost never nfs-utils-1-2-1-rc1
Steve Dickson [Mon, 22 Jun 2009 14:05:44 +0000 (10:05 -0400)]
The closeall function is broken in such a way that it almost never
closes any file descriptors. It's calling strtol on the text
representation of the file descriptor, and then checking to see if the
value of *endptr is not '\0' before trying to close the file. This check
is wrong.

When strtol returns an endptr that points to a NULL byte, that indicates
that the conversion was completely successful. I believe this check
should instead be requiring that endptr is pointing to '\0' before
closing the fd.

Also, fix up the function to check for conversion errors from strtol. If
one occurs, just skip the close on that entry.

Finally, as Trond pointed out, it's unlikely that readdir will return a
blank string in d_name but that situation wouldn't be detected by the
current code. This patch adds such a check and skips the close if it
occurs.

Reported-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoMake --enable-tirpc the default. If --enable-tirpc wasn't explicitly
Steve Dickson [Mon, 22 Jun 2009 13:49:17 +0000 (09:49 -0400)]
Make --enable-tirpc the default. If --enable-tirpc wasn't explicitly
specified, but TIRPC libs or headers aren't present then just throw a
warning and disable it. If it was explicitly specified, then throw an
error and exit if they aren't present.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoSet the verbosity level in both the librpcsecgss and
Steve Dickson [Mon, 22 Jun 2009 13:17:27 +0000 (09:17 -0400)]
Set the verbosity level in both the librpcsecgss and
libnfsidmapd libraries when verbosity level is set
by the '-v' flag it on either daemon.

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoRetry export if getfh fails.
NeilBrown [Wed, 3 Jun 2009 19:48:08 +0000 (15:48 -0400)]
Retry export if getfh fails.

mountd tries to avoid telling the kernel to export something
when the kernel already knows to do that.
However sometimes (exportfs -r) the kernel can be told
to forget something without mountd realising.
So if mountd finds that it cannot get a  valid filehandle,
make sure it really has been exported to the kernel.

This only applies if the nfsd filesystem is not mounted.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoRelease 1.2.0
Steve Dickson [Tue, 2 Jun 2009 15:20:50 +0000 (11:20 -0400)]
Release 1.2.0

Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoReplace the Sun RPC license with the BSD license, nfs-utils-1-2-0
Tom spot Callaway [Tue, 2 Jun 2009 14:43:05 +0000 (10:43 -0400)]
Replace the Sun RPC license with the BSD license,
with the explicit permission of Sun Microsystems

Signed-off-by: Tom "spot" Callaway <tcallawa@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoumount.nfs: Harden umount.nfs error reporting nfs-utils-1-1-7-rc1
Chuck Lever [Mon, 18 May 2009 17:29:38 +0000 (13:29 -0400)]
umount.nfs: Harden umount.nfs error reporting

Add additional error reporting to nfs_advise_umount().
These messages can be displayed if the "-v" option
is specified with umount.nfs.  Normally these
messages do not appear.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agonfs-utils: Fix IPv6 support in support/nfs/rpc_socket.c
Chuck Lever [Mon, 18 May 2009 17:27:25 +0000 (13:27 -0400)]
nfs-utils: Fix IPv6 support in support/nfs/rpc_socket.c

Use the correct #ifdef variable to enable IPv6 support for privileged
RPC clients.  Without this fix, unmounting an IPv6 NFSv2/v3 server
fails.

Introduced by commit 8c94296bc84f3a204f2061c0391a1d2350e4f37e.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoWhen compiling nfs-utils-1.1.6, I get this error:
Robert Schwebel [Mon, 18 May 2009 15:36:14 +0000 (11:36 -0400)]
When compiling nfs-utils-1.1.6, I get this error:

arm-iwmmx-linux-gnueabi-gcc -DHAVE_CONFIG_H -I. -I../../support/include
-isystem
/home/rsc/svn/oselas/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270.PCM990/sysroot-target/include
-isystem
/home/rsc/svn/oselas/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270.PCM990/sysroot-target/usr/include
-D_GNU_SOURCE -Wall -Wstrict-prototypes  -pipe -g -O2 -MT sm_inter_svc.o
-MD -MP -MF .deps/sm_inter_svc.Tpo -c -o sm_inter_svc.o sm_inter_svc.c
sm_inter_svc.c:10:39: error: sys/ttycom.h: No such file or directory

Use sys/ioctl.h instead.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agomount: remove legacy version of nfs_name_to_address()
Chuck Lever [Mon, 18 May 2009 15:17:49 +0000 (11:17 -0400)]
mount: remove legacy version of nfs_name_to_address()

Currently we have two separate copies of nfs_name_to_address() since
some older glibc's don't define AI_ADDRCONFIG.  This means extra
work to build- and run-test both functions when code is changed in
this area.

It is also the case that gethostbyname(3) is deprecated, and should
not be used in new code.

Remove the legacy code in favor of always using getaddrinfo(3).

We can also get rid of nfs_name_to_address()'s @family argument as
well.

Note also this addresses a bug in nfsumount.c -- it was calling
nfs_name_to_address() with AF_UNSPEC unconditionally, even if the
legacy version of nfs_name_to_address(), which doesn't support
AF_UNSPEC, was in use.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agosm-notify: Failed DNS lookups should be retried
Chuck Lever [Mon, 18 May 2009 15:08:53 +0000 (11:08 -0400)]
sm-notify: Failed DNS lookups should be retried

Currently, if getaddrinfo(3) fails when trying to resolve a hostname,
sm-notify gives up immediately on that host.  If sm-notify is started
before network service is available on a system, that means it quits
without notifying anyone.  Or, if DNS service isn't available due to
a network partition or because the DNS server crashed, sm-notify will
simply remove all of its callback files and exit.

Really, sm-notify should try harder.  We know that the hostnames
passed in to notify_host() have already been vetted by statd, which
won't monitor a hostname that it can't resolve.  So it's likely that
any DNS failure we meet here is a temporary condition.  If it isn't,
then sm-notify will stop trying to notify that host in 15 minutes
anyway.

[ The host's file is left in /var/lib/nfs/sm.bak in this case, but
  sm.bak is not read again until the next time sm-notify runs. ]

sm-notify already has retry logic for handling RPC timeouts.  We can
co-opt that to drive DNS resolution retries.

We also add AI_ADDRCONFIG because on systems whose network startup is
handled by NetworkManager, there appears to be a bug that causes
processes that started calling getaddinfo(3) before the network came
up to continue getting EAI_AGAIN even after the network is fully
operating.

As I understand it, legacy glibc (before AI_ADDRCONFIG was exposed in
headers) sets AI_ADDRCONFIG by default, although I haven't checked
this.  In any event, pre-glibc-2.2 systems probably won't run
NetworkManager anyway, so this may not be much of a problem for them.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agosm-notify: Don't orphan addrinfo structs
Chuck Lever [Mon, 18 May 2009 15:03:54 +0000 (11:03 -0400)]
sm-notify: Don't orphan addrinfo structs

sm-notify orphans an addrinfo struct in its address list rotation
logic if only a single result was returned from getaddrinfo(3).

For each host, the first time through notify_host(), we want to
send a PMAP_GETPORT request.  ->ai is NULL, and retries is set to 100,
forcing a DNS lookup and an address rotation.  If only a single
addrinfo struct is returned, the rotation logic causes a NULL to be
planted in ->ai, copied from the ai_next field of the returned result.

This means that the second time through notify_host() (to perform the
actual SM_NOTIFY call) we do a second DNS lookup, since ->ai is NULL.
The result of the first lookup has been orphaned, and extra network
traffic is generated.

This scenario is actually fairly common.  Since we pass

  .ai_protocol = IPPROTO_UDP,

  to getaddrinfo(3), for most hosts, which have a single forward and
  reverse pointer in the DNS database, we get back a single addrinfo
  struct as a result.

  To address this problem, only perform the address list rotation if
  there is more than one element on the list returned by getaddrinfo(3).

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoutils/nfsd: enable nfs minorvers4 by default
Benny Halevy [Mon, 18 May 2009 14:50:11 +0000 (10:50 -0400)]
utils/nfsd: enable nfs minorvers4 by default

Enable support for the maximum minor version (4.1 at the moment)
by default.  It can be disabled using the -N command line
option.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoExtend -N command line option syntax to accept
Benny Halevy [Mon, 18 May 2009 14:47:51 +0000 (10:47 -0400)]
Extend -N command line option syntax to accept
<version>.<minorversion> to disable support
for <minorversion>. Only 4.1 is currently supported.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoutils/nfsd: add support for minorvers4
Benny Halevy [Mon, 4 May 2009 15:44:49 +0000 (11:44 -0400)]
utils/nfsd: add support for minorvers4

minorvers4 can be used to either enable or disable nfsv4.x.

If minorvers4 is a positive integer n, in the allowed range (only
minorversion 1 is supported for now), the string "+4.n" is appended
to the versions string written onto /proc/fs/nfsd/versions.

Correspondingly, if minorver4 is a negative integer -n, the string
"-4.n" is written.

With the default value, minorvers4==0, the minor version
setting is not changed.

Note that unlike the protocol versions 2, 3, or 4.  The minor version
setting controls the *maximum* minor version nfsd supports.  Particular
minor version cannot be controlled on their own.  With only minor
version 1 supported at the moment the difference doesn't matter,
but for future minor versions greater than 1, enabling minor
version X will enable support for all minor versions 1 through X.
Disabling minor version X will disable support for minor
versions X and up, enabling 1 through X-1.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
11 years agoHost aliases need to be checked when netgroups is used in exports.
Steve Dickson [Wed, 29 Apr 2009 16:38:02 +0000 (12:38 -0400)]
Host aliases need to be checked when netgroups is used in exports.

Signed-off-by: Steve Dickson <steved@redhat.com>