nfs-utils.git
9 years agoRemove warnings from nfs_mntent.c
Steve Dickson [Mon, 19 Jul 2010 16:34:14 +0000 (12:34 -0400)]
Remove warnings from nfs_mntent.c

nfs_mntent.c: In function 'mangle':
nfs_mntent.c:36: warning: comparison between signed and unsigned integer expressions

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoemove warnings from cacheio.c
Steve Dickson [Mon, 19 Jul 2010 16:31:48 +0000 (12:31 -0400)]
emove warnings from cacheio.c

cacheio.c: In function 'cache_flush':
cacheio.c:352: warning: comparison between signed and unsigned integer expressions

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoRemove warnings from svc_socket.c
Steve Dickson [Mon, 19 Jul 2010 16:28:09 +0000 (12:28 -0400)]
Remove warnings from svc_socket.c

svc_socket.c: In function 'svcudp_socket':
svc_socket.c:160: warning: unused parameter 'reuse'

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoRemoved warnings from rpcdispatch.c
Steve Dickson [Mon, 19 Jul 2010 16:17:24 +0000 (12:17 -0400)]
Removed warnings from rpcdispatch.c

rpcdispatch.c: In function 'rpc_dispatch':
rpcdispatch.c:30: warning: comparison between signed and unsigned
     integer expressions
rpcdispatch.c:35: warning: comparison between signed and unsigned
     integer expressions

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoEnable extra compile warnings (-Wextra) by default.
Steve Dickson [Mon, 19 Jul 2010 16:05:51 +0000 (12:05 -0400)]
Enable extra compile warnings (-Wextra) by default.

Added -Wextra to the CFLAGS which enables more checking
during compilation, which in turn, will hopefully flag
potential problems before they occur.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agogssd: picking wrong creds
Doug Nazar [Mon, 19 Jul 2010 15:08:46 +0000 (11:08 -0400)]
gssd: picking wrong creds

When not using machine credentials for root, if the machine
credential cache file is newer than the root credential file
the wrong file will get picked. Ignore the machine file in
this case.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomountd: Fix memcmp result comparison error for uuid match.
Doug Nazar [Mon, 19 Jul 2010 14:58:47 +0000 (10:58 -0400)]
mountd: Fix memcmp result comparison error for uuid match.

Fixed Small typo in the new fs uuid comparison code

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agogssd: Fix endtime issue
Doug Nazar [Mon, 19 Jul 2010 14:48:34 +0000 (10:48 -0400)]
gssd: Fix endtime issue

Commit 4c5ff6d4 removed the setting of endtime for a few contexts by
accident.

Now to figure out why I get stale handles on submounts.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agonfs-utils: Fix C aliasing rules violation in nfs_getrpccaller()
Chuck Lever [Mon, 19 Jul 2010 14:09:12 +0000 (10:09 -0400)]
nfs-utils: Fix C aliasing rules violation in nfs_getrpccaller()

Squelch compiler warnings reported with -Wextra:

In file included from statd.c:24:
../../support/include/rpcmisc.h: In function nfs_getrpccaller_in:
../../support/include/rpcmisc.h:58: warning: dereferencing type-punned
pointer might break strict-aliasing rules
../../support/include/rpcmisc.h: In function nfs_getrpccaller:
../../support/include/rpcmisc.h:63: warning: dereferencing type-punned
pointer might break strict-aliasing rules

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agonfs-iostat.py: divide by zero with fresh mount nfs-utils-1-2-3-rc4
Kevin Constantine [Tue, 22 Jun 2010 21:43:19 +0000 (17:43 -0400)]
nfs-iostat.py: divide by zero with fresh mount

When an export is freshly mounted, /proc/self/mountstats displays age = 0.
This causes nfs-iostat.py to divide by zero throwing an error.  When we
have age = 0, other stats are greater than 0, so we'll set age = 1 and
print the relevant stats.

Signed-off-by: Kevin Constantine <kevin.constantine@disneyanimation.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Remove unused hostent-based DNS helper functions
Chuck Lever [Tue, 22 Jun 2010 17:31:38 +0000 (13:31 -0400)]
libexport.a: Remove unused hostent-based DNS helper functions

Clean up:  Get rid of hostent-based DNS helper functions in
libexport.a that have been replaced by addrinfo-based DNS helpers.

None of the original code remains, so replace the copyright notice as
well.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Replace matchhostname()
Chuck Lever [Tue, 22 Jun 2010 17:06:40 +0000 (13:06 -0400)]
libexport.a: Replace matchhostname()

So that exportfs can eventually support IPv6 addresses, copy statd's
getaddrinfo(3)-based matchhostname to exportfs, with adjustments for
dealing with export wildcards and netgroups.  Until exportfs has full
IPv6 support, however, we want to ensure that IPv6 addresses continue
to remain blocked in the address comparison code used by exportfs.  At
a later point we'll replace much of this with the generic functions
in sockaddr.h.

Since it contains special logic for handling wildcard and netgroups,
this function is specialized for exportfs, and does not belong in
one of the shared libraries.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Add documenting comments
Chuck Lever [Tue, 22 Jun 2010 16:51:42 +0000 (12:51 -0400)]
libexport.a: Add documenting comments

Clean up.  Add a few additional documenting comments for globally
visible functions.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Make export_add() static
Chuck Lever [Tue, 22 Jun 2010 16:44:44 +0000 (12:44 -0400)]
libexport.a: Make export_add() static

Clean up: export_add() is not called from outside of export.c, so make
it a static helper.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Make export_read() return void
Chuck Lever [Tue, 22 Jun 2010 16:43:55 +0000 (12:43 -0400)]
libexport.a: Make export_read() return void

Clean up: export_read()'s return value is always zero, and its only
caller never checks it.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomountd: Replace "struct hostent" with "struct addrinfo"
Chuck Lever [Tue, 22 Jun 2010 16:43:01 +0000 (12:43 -0400)]
mountd: Replace "struct hostent" with "struct addrinfo"

struct hostent can store either IPv4 or IPv6 addresses, but it can't
store both address families concurrently for the same host.  Neither
can hostent deal with parts of socket addresses that are outside of
the sin{,6}_addr field.

Replace the use of "struct hostent" everywhere in libexport.a, mountd,
and exportfs with "struct addrinfo".  This is a large change, but
there are so many strong dependencies on struct hostent that this
can't easily be broken into smaller pieces.

One benefit of this change is that hostent_dup() is no longer
required, since the results of getaddrinfo(3) are already dynamically
allocated.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoexportfs: Add a common exit label in exportfs()
Chuck Lever [Tue, 22 Jun 2010 16:40:27 +0000 (12:40 -0400)]
exportfs: Add a common exit label in exportfs()

Clean up: Reduce code duplication by introducing a goto label for
freeing hp and exiting.  This will make replacing "struct hostent *"
with "struct addrinfo *" more straightforward in this code.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Add helpers to manage DNS lookups
Chuck Lever [Tue, 22 Jun 2010 14:41:03 +0000 (10:41 -0400)]
libexport.a: Add helpers to manage DNS lookups

Introduce DNS query helpers based on getaddrinfo(3) and
getnameinfo(3).  These will eventually replace the existing
hostent-based functions in support/export/hostname.c.

Put some of these new helpers to immediate use, where convenient.

As they are part of libexport.a, I've added the forward declarations
for these new functions in exportfs.h rather than misc.h, where the
hostent-based forward declarations are currently.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoImprove support for exporting btrfs subvolumes
NeilBrown [Tue, 22 Jun 2010 14:37:25 +0000 (10:37 -0400)]
Improve support for exporting btrfs subvolumes

If you export two subvolumes of a btrfs filesystem, they will both be
given the same uuid so lookups will be confused.
blkid cannot differentiate the two, so we must use the fsid from
statfs64 to identify the filesystem.

We cannot tell if blkid or statfs is best without knowing internal
details of the filesystem in question, so we need to encode specific
knowledge of btrfs in mountd.  This is unfortunate.

To ensure smooth handling of this and possible future changes in uuid
generation, we add infrastructure for multiple different uuids to be
recognised on old filehandles, but only the preferred on is used on
new filehandles.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomount.nfs: silently fails when the network protocol is not found
Steve Dickson [Thu, 3 Jun 2010 12:53:22 +0000 (08:53 -0400)]
mount.nfs: silently fails when the network protocol is not found

mount.nfs should display some type of error diagnostics when
the network protocol can not be determined.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomount: silently fails when bad option values are given
Steve Dickson [Thu, 3 Jun 2010 12:32:56 +0000 (08:32 -0400)]
mount: silently fails when bad option values are given

mount.nfs should not only fail when an invalid option values
are supplied (as it does), it should also print a diagnostic
message identifying the problem

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agonfsiostat.man: Add linebreak before --version option
Kevin Constantine [Wed, 2 Jun 2010 12:34:14 +0000 (08:34 -0400)]
nfsiostat.man: Add linebreak before --version option

The nfsiostat man file was missing a linebreak before the --verbose option

Signed-off-by: Kevin Constantine <kevin.constantine@disneyanimation.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomountd: Convert colons in IPv6 presentation addresses tosemicolons
Chuck Lever [Mon, 24 May 2010 10:02:22 +0000 (06:02 -0400)]
mountd: Convert colons in IPv6 presentation addresses tosemicolons

The /var/lib/nfs/rmtab file delineates fields in each of its lines
with a ":".  The first field contains the IP address of a client, in
presentation format.  IPv6 presentation format addresses contain
colons, which screws up the field delineation of rmtab.

Use a simple simple scheme to convert the colons in incoming client
names to some other character, and then convert them back when the
rmtab file is read.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Refactor rmtab_read()
Chuck Lever [Mon, 24 May 2010 10:01:22 +0000 (06:01 -0400)]
libexport.a: Refactor rmtab_read()

Clean up: Make it easier to add IPv6 support by refactoring part of
rmtab_read() into a helper function.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoMountd listens on 2 different versions for NFSv2 (MOUNTv1 and MOUNTv2)
NeilBrown [Mon, 24 May 2010 09:55:26 +0000 (05:55 -0400)]
Mountd listens on 2 different versions for NFSv2 (MOUNTv1 and MOUNTv2)
and one for NFSv3 (MOUNTv3)

When --no-nfs-version requests an NFS version to be disabled, the
code actually disabled the MOUNT version. This works is several cases,
but requires --no-nfs-version 1 to completely disable NFSv2, which
is wrong.

So if we do disable 1, 2, and 3. mountd complain and won't run, it
is not possible to run just v4 - i.e. not listening for MOUNT requests
at all (as v4 doesn't need them).

So change the handling of "--no-nfs-version 2" it disable MOUNTv1 as
well as
MOUNTv2, and allow mountd to continue running as long as one of
NFSv2 NFSv3 NFSv4 is enabled.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomountd/exportfs: Make m_addrlist field a nfs_sockaddr nfs-utils-1-2-3-rc3
Chuck Lever [Wed, 5 May 2010 19:41:07 +0000 (15:41 -0400)]
mountd/exportfs: Make m_addrlist field a nfs_sockaddr

To store non-AF_INET addresses in the nfs_client structure, we need to
use more than in_addr for the m_addrlist field.  Make m_addrlist
larger, then add a few helper functions to handle type casting and
array indexing cleanly.

We could treat the nfs_client address list as if all the addresses
in the list were the same family.  This might work for MCL_SUBNETWORK
type nfs_clients.  However, during the transition to IPv6, most hosts
will have at least one IPv4 and one IPv6 address.  For MCL_FQDN, I
think we need to have the ability to store addresses from both
families in one nfs_client.

Additionally, IPv6 scope IDs are not part of struct sin6_addr.  To
support link-local IPv6 addresses and the like, a scope ID must be
stored.

Thus, each slot in the address list needs to be capable of storing an
entire socket address, and not simply the network address part.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Clean up client_add()
Chuck Lever [Wed, 5 May 2010 18:42:01 +0000 (14:42 -0400)]
libexport.a: Clean up client_add()

Clean up: client_add()'s current callers never set unknown m_type
values, so the m_type check is unnecessary.

All of client_add()'s callers are in the same source file where it is
defined, so make it a static helper function.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Refactor client_init()
Chuck Lever [Wed, 5 May 2010 18:37:13 +0000 (14:37 -0400)]
libexport.a: Refactor client_init()

Clean up:  Move subnet hostname parsing logic out of client_init() to
make it simpler to introduce IPv6 support.

Make client_init() a helper, since it's already static.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoMake capabilities support optional
Mike Frysinger [Fri, 23 Apr 2010 16:22:53 +0000 (12:22 -0400)]
Make capabilities support optional

The new code using libcap is quite minor, so rather than always reqiure
libcap support, make it a normal --enable type flag.  Current default
behavior is retained -- if libcap is found, it is enabled, else it is
disabled like every nfs-utils version in the past.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoset +x on autogen.sh
Mike Frysinger [Fri, 23 Apr 2010 16:18:27 +0000 (12:18 -0400)]
set +x on autogen.sh

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Allow malloc(3) failures in client_lookup() and friends
Chuck Lever [Fri, 23 Apr 2010 16:09:35 +0000 (12:09 -0400)]
libexport.a: Allow malloc(3) failures in client_lookup() and friends

Clean up: Use malloc(3) instead of xmalloc() in client_lookup() and
client_dup(), ensuring that a failed memory allocation here doesn't
cause our process to exit suddenly.

Allocation of nfs_client records and the m_hostname string are now
consistently handled with malloc(3), calloc(3), strdup(3), and
free(3).

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Allow m_hostname allocation to fail instead of exit
Chuck Lever [Fri, 23 Apr 2010 16:08:49 +0000 (12:08 -0400)]
libexport.a: Allow m_hostname allocation to fail instead of exit

Clean up: Replace xstrdup() with strdup(3) in client_init(), to
prevent the process from exiting if the memory allocation fails.

Note that both of client_init()'s callers set m_hostname equal to NULL
before calling, thus the extra free(3) at the top of client_init() is
unneeded.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Allow client_init() to fail instead of exit
Chuck Lever [Fri, 23 Apr 2010 16:02:34 +0000 (12:02 -0400)]
libexport.a: Allow client_init() to fail instead of exit

client_init()'s current callers can now deal correctly with a failure.
Get rid of code that can cause our process to exit in client_init(),
if address mask parsing or memory allocation fails.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Add client_free()
Chuck Lever [Fri, 23 Apr 2010 16:00:28 +0000 (12:00 -0400)]
libexport.a: Add client_free()

Clean up: Introduce a helper to free a nfs_client record.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoAdd in autoconf support for mountstats and nfsiostats nfs-utils-1-2-3-rc2
Steve Dickson [Fri, 16 Apr 2010 14:56:29 +0000 (10:56 -0400)]
Add in autoconf support for mountstats and nfsiostats

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoIntroduce man page for the nfsiostats command
Steve Dickson [Fri, 16 Apr 2010 14:49:10 +0000 (10:49 -0400)]
Introduce man page for the nfsiostats command

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoIntroduce man page for the mountstats command
Steve Dickson [Fri, 16 Apr 2010 14:46:41 +0000 (10:46 -0400)]
Introduce man page for the mountstats command

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoRemoved some miscellaneous warnings in the new gssd code.
Steve Dickson [Fri, 16 Apr 2010 17:31:57 +0000 (13:31 -0400)]
Removed some miscellaneous warnings in the new gssd code.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoAdd support for non-DES encryption types.
Kevin Coffman [Mon, 12 Apr 2010 21:13:25 +0000 (17:13 -0400)]
Add support for non-DES encryption types.

Sends a new format of context information to the kernel.
(Requires kernel support to do anything useful.)

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoTry to use kernel function to determine supported Kerberos enctypes.
Kevin Coffman [Thu, 15 Apr 2010 12:32:20 +0000 (08:32 -0400)]
Try to use kernel function to determine supported Kerberos enctypes.

This patch replaces a hard-coded list with a function to obtain
the Kerberos encryption types that the kernel's rpcsec_gss code
can support.  Defaults to old behavior if kernel does not supply
information.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agogssd: move function limit_krb5_enctypes into the exported functions area
Kevin Coffman [Mon, 12 Apr 2010 21:06:30 +0000 (17:06 -0400)]
gssd: move function limit_krb5_enctypes into the exported functions area

cleanup: Move function limit_krb5_enctypes() from the section
containing static functions into the section containing
externally visible functions.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: export_find() should handle address parsing errors
Chuck Lever [Fri, 16 Apr 2010 17:03:20 +0000 (13:03 -0400)]
libexport.a: export_find() should handle address parsing errors

An address mask parsing error can cause client_init(), and therefore
client_dup(), to make our process exit suddenly.  Soon we want to add
more complex address parsing in client_init(), so we need this
interface to be a little more robust.

Since export_find() can return NULL in some cases, it can handle NULL
returns from its subroutines if an address parsing error occurs, or if
memory is exhausted.  Allow for client_dup() to return NULL instead of
exiting sideways.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Add export_free()
Chuck Lever [Fri, 16 Apr 2010 17:02:15 +0000 (13:02 -0400)]
libexport.a: Add export_free()

Clean up: Introduce a helper to free an nfs_export record.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Add helper for populating m_addrlist[]
Chuck Lever [Thu, 15 Apr 2010 12:59:18 +0000 (08:59 -0400)]
libexport.a: Add helper for populating m_addrlist[]

Clean up: Move common code that populates an nfs_client record's
m_addrlist to a helper function.  This eliminates a little code
duplication, and makes it simpler to add IPv6 support later.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Reduce code duplication in client_init()
Chuck Lever [Thu, 15 Apr 2010 12:57:29 +0000 (08:57 -0400)]
libexport.a: Reduce code duplication in client_init()

Clean up:  Most cases in client_init() set clp->m_naddr to zero.  Move
it to the common part of the function, and simplify the logic.  This
will make adding IPv6 support here more straightforward.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoset +x on t0001-statd-basic-mon-unmon.sh
Mike Frysinger [Thu, 15 Apr 2010 12:49:28 +0000 (08:49 -0400)]
set +x on t0001-statd-basic-mon-unmon.sh

The test framework tries to exec this script, but it fails because it
lacks the +x bit.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: replace xlog(L_FATAL) in client_check()
Chuck Lever [Thu, 8 Apr 2010 15:01:14 +0000 (11:01 -0400)]
libexport.a: replace xlog(L_FATAL) in client_check()

Clean up: Prevent the process from exiting in client_check().  Report
bad m_type values, but return 0.

This removes another site where a mountd or exportfs process can exit
sideways.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Refactor wildcard checking in client_check()
Chuck Lever [Thu, 8 Apr 2010 14:55:02 +0000 (10:55 -0400)]
libexport.a: Refactor wildcard checking in client_check()

Clean up: refactor wildcard logic out of client_check() to make it
easier to introduce IPv6 support.

Match the style used for client_check_{fqdn,subnetwork,netgroup}.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Refactor netgroup checking in client_check()
Chuck Lever [Thu, 8 Apr 2010 14:54:01 +0000 (10:54 -0400)]
libexport.a: Refactor netgroup checking in client_check()

Clean up: refactor netgroup logic out of client_check() to make it
easier to introduce IPv6 support.

 +  Use preferred style of keeping #ifdef out of the middle of
    function definitions.  Squelch compiler warnings for "#ifndef
    HAVE_INNETGR" by using __attribute__((unused)).

 +  Use preferred style of not using curly braces around switch cases.

 +  Match style used for check_{fqdn,subnetwork}.

 +  Clarify comment documenting use of h_aliases

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Remove unused function client_checkaddr()
Chuck Lever [Thu, 8 Apr 2010 14:52:33 +0000 (10:52 -0400)]
libexport.a: Remove unused function client_checkaddr()

Clean up.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Factor SUBNETWORK checking out of check_client()
Chuck Lever [Thu, 8 Apr 2010 14:51:54 +0000 (10:51 -0400)]
libexport.a: Factor SUBNETWORK checking out of check_client()

Clean up:  Factor the MCL_SUBNETWORK case out of check_client() and
client_checkaddr().  This will make it easier to add IPv6 support
eventually.

The logic in the new helper function will get a little more tangled
once IPv6 support is introduced.  Each slot in the clp address list
eventually may contain an address from either address family.

Note that the switch statement in client_checkaddr() is redundant,
since clp->cl_mtype is loop invariant.  This change makes SUBNETWORK
client checking more computationally efficient, at the cost of a few
extra lines of code.

This commit should not change code behavior in any way.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Factor FQDN checking out of check_client()
Chuck Lever [Thu, 8 Apr 2010 14:50:41 +0000 (10:50 -0400)]
libexport.a: Factor FQDN checking out of check_client()

Clean up:  Factor the MCL_FQDN case out of check_client() and
client_checkaddr().  This will make it easier to add IPv6 support
eventually.

The logic in the new helper function will get a little more tangled
once IPv6 support is introduced.  Each slot in the clp address list
eventually may contain an address from either address family.

Note that the switch statement in client_checkaddr() is redundant,
since clp->cl_mtype is loop invariant.  This change makes FQDN client
checking more computationally efficient, at the cost of a few extra
lines of code.

This commit should not change code behavior in any way.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoRemove some warnings that were introduced by commit 6ca440c
Steve Dickson [Thu, 8 Apr 2010 14:43:49 +0000 (10:43 -0400)]
Remove some warnings that were introduced by commit 6ca440c

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: e_fslocdata should be freed with free(3) nfs-utils-1-2-3-rc1
Chuck Lever [Mon, 22 Mar 2010 14:18:00 +0000 (10:18 -0400)]
libexport.a: e_fslocdata should be freed with free(3)

Clean up: Since e_fslocdata is allocated with strdup(3), and not
xstrdup(), it should be freed with free(3), and not xfree().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Fix whitespace damage in support/export/export.c
Chuck Lever [Mon, 22 Mar 2010 14:16:04 +0000 (10:16 -0400)]
libexport.a: Fix whitespace damage in support/export/export.c

Clean up whitespace damage introduced by commit 4cacc965.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Clean up client_compose() and client_member()
Chuck Lever [Mon, 22 Mar 2010 14:13:15 +0000 (10:13 -0400)]
libexport.a: Clean up client_compose() and client_member()

Clean up:  Replace outdated comments, and fix some function
declarations.  Use proper type for a couple of automatic variables.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agolibexport.a: Remove dead code
Chuck Lever [Mon, 22 Mar 2010 14:10:59 +0000 (10:10 -0400)]
libexport.a: Remove dead code

Clean up:  I can't find any call sites for client_find() or
client_match().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomount: Mount should retry unreachable hosts
Chuck Lever [Fri, 19 Mar 2010 20:14:26 +0000 (16:14 -0400)]
mount: Mount should retry unreachable hosts

Currently if a server is up but not responding (ie, it answers ARP
requests, but not NFS or RPC requests), mount retries or backgrounds
itself waiting for the server.

If the server is not responding on the network at all, mount fails
the mount request immediately.

Users might find it more useful if mount retried in both cases.

Note that this change means attempting to mount using a misspelled
server name will "hang" for the retry amount.  I suppose the error
message isn't very helpful whether it fails immediately or waits
a couple of minutes, though I imagine that an unreachable server is a
much more common occurrence than a misspelling.

Reported-by: Daniel Goering <g_daniel@gmx.net>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agosm-notify: Send fully-qualified and unqualified mon_names
Chuck Lever [Fri, 19 Mar 2010 20:03:45 +0000 (16:03 -0400)]
sm-notify: Send fully-qualified and unqualified mon_names

During any file locking interaction between an NFS client and server,
the client tells the server what hostname it will use as the mon_name
argument of the SM_NOTIFY request sent by the client when it reboots.
This is the "caller_name" argument of an NLMPROC_LOCK request.

The server, however, never tells the client what mon_name argument
it will use when sending an SM_NOTIFY request.  In order to recognize
the server, clients usually guess what mon_name the server might
send, by using the server hostname provided by the user on the mount
command line.

Frequently, the user provides an unqualified server name on the mount
command.  The server might then call the client back with a fully
qualified domain name, which might not match in some cases.

Solaris, and perhaps other implementations, attempt to mitigate this
problem by sending two SM_NOTIFY requests to each peer: one with an
unqualified mon_name argument, and one with a fully qualified mon_name.

Implement such a scheme for sm-notify.

Since my_name is almost always the fully-qualified hostname associated
with the local system, just wiping the left-most '.' in the my_name
argument and sending another SM_NOTIFY is nearly always sufficient.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agosm-notify: Use my_name when sending SM_NOTIFY requests
Chuck Lever [Wed, 17 Mar 2010 10:15:08 +0000 (06:15 -0400)]
sm-notify: Use my_name when sending SM_NOTIFY requests

The mon_name argument of an SM_NOTIFY request is a string that
identifies the rebooting host.

sm-notify should send the my_name provided by the local lockd at the
time the remote was monitored, rather than cocking up a mon_name
argument based on the present return value of gethostname(3).  If the
local system's hostname happened to change after the last reboot, then
the string returned by gethostname(3) will not be recognized by the
remote.  Thus the remote will never initiate lock recovery for the
original named host, possibly leaving stale locks.

The existing behavior of using the -v command line option as the
mon_name argument is preserved, but we now prevent sending an IP
presentation address, as some non-Linux implementations don't
recognize addresses as valid mon_names.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomountd: trivial: name parameters for clarity
J. Bruce Fields [Mon, 8 Mar 2010 20:02:26 +0000 (15:02 -0500)]
mountd: trivial: name parameters for clarity

Part of the reason for the previous bug was confusion between "subpath"
and "path"; which is the shorter path, and which the longer?

"child" and "parent" seem less ambiguous.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomountd: fix path comparison for v4 crossmnt
J. Bruce Fields [Mon, 8 Mar 2010 19:59:01 +0000 (14:59 -0500)]
mountd: fix path comparison for v4 crossmnt

This was obviously wrong, since path[strlen(path)] == '\0'
should always be true.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomountd: fix --manage-gids hang due to int/uint bug
Steve Dickson [Mon, 8 Mar 2010 16:22:46 +0000 (11:22 -0500)]
mountd: fix --manage-gids hang due to int/uint bug

A uid or gid should be represented as unsigned, not signed.

The conversion to signed here could cause a hang on access by an unknown
user to a server running mountd with --manage-gids; such a user is
likely to be mapped to 232-1, which may be converted to 231-1 when
represented as an int, resulting in a downcall for uid 231-1, hence the
original rpc hanging forever waiting for a cache downcall for 232-1.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoUse authunix_create() instead of authsys_create() to fix regression.
Steve Dickson [Mon, 8 Mar 2010 15:24:44 +0000 (10:24 -0500)]
Use authunix_create() instead of authsys_create() to fix regression.

Commit 409b8 introduced a regression when the --disable-tirpc
configuration flag is set. The authsys_create() interface, which
was introduced, does not exist in the legacy glibc library.

Since the authsys_create() interface is a redefined of the
authunix_create() interface, which is defined in glibc, using
authunix_create() resolves the regression,

Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agonfs-utils: add and use nfs_authsys_create
Jeff Layton [Mon, 1 Mar 2010 13:07:34 +0000 (08:07 -0500)]
nfs-utils: add and use nfs_authsys_create

The current mount, umount and showmount code uses
authunix_create_default to get an auth handle. The one provided by glibc
returned a truncated list of groups when there were more than 16 groups.
libtirpc however currently does an abort() in this case, which causes
the program to crash and dump core.

nfs-utils just uses these auth handles for the MNT protocol, so the
group list doesn't make a lot of difference here. Add a new function
that creates an auth handle with a supplemental gids list that consists
only of the primary gid. Have nfs-utils use that function anywhere that
it currently uses authunix_create_default. Also, have the caller
properly check for a NULL return from that function.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoFix a typo in commit 6d5ac3fa (nfsd: Disble NFS 4.1 functionality by
Trond Myklebust [Mon, 1 Mar 2010 12:37:49 +0000 (07:37 -0500)]
Fix a typo in commit 6d5ac3fa (nfsd: Disble NFS 4.1 functionality by
default).

We did not really intend to make NFSv4.0 support conditional on NFSv4.1
being enabled.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoRelease 1.2.2 nfs-utils-1-2-2
Steve Dickson [Thu, 18 Feb 2010 12:35:00 +0000 (07:35 -0500)]
Release 1.2.2

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomount: Set protocol family properly for "udp" and "tcp"
Chuck Lever [Thu, 18 Feb 2010 11:41:11 +0000 (06:41 -0500)]
mount: Set protocol family properly for "udp" and "tcp"

In nfs_nfs_proto_family(), *family is never set if the legacy
"udp" or "tcp" mount options are specified.  The result is an error
message at umount time, for example:

umount.nfs: DNS resolution failed for
  2001:5c0:1101:2f00:250:8dff:fe95:5c61: ai_family not supported

even if mount was built with IPv6 support.

The man page says that "udp" is a synonym for "proto=udp", and
likewise for "tcp".  Thus, we don't look at config_default_family
here, but always use AF_INET explicitly, to be consistent with the
meaning of proto=.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agonfsd: Disble NFS 4.1 functionality by default
Steve Dickson [Wed, 17 Feb 2010 19:38:19 +0000 (14:38 -0500)]
nfsd: Disble NFS 4.1 functionality by default

Due to the fact the current kernel code do not completely
conform to the NFS 4.1 RFC, this patch disable the 4.1 support
on the server.

To control this 41 functionality, the NFS41_SUPPORTED
configuration variable now exist that will allow us to
re enable the functionality  without any code changes.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomount.nfs: make nfs_{nfs,mount}_proto set errno on error
Jeff Layton [Fri, 12 Feb 2010 19:35:31 +0000 (14:35 -0500)]
mount.nfs: make nfs_{nfs,mount}_proto set errno on error

Have nfs_nfs_proto and nfs_mount_proto set errno to EPROTONOSUPPORT on
error. This helps default_value to display sane warning messages.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomount.nfs: return error if proto= option specified IPv6 when IPv6 isn't supported
Jeff Layton [Fri, 12 Feb 2010 19:33:34 +0000 (14:33 -0500)]
mount.nfs: return error if proto= option specified IPv6 when IPv6 isn't supported

Right now, there's nothing that expressly forbids someone from
specifying proto=tcp6 for instance, even when nfs-utils it built without
IPv6 support. This may not work well if (for instance) they are using
NFSv3, since statd won't support IPv6. Explicitly return an error if
someone specifies an IPv6 proto= or mountproto= option and IPv6 isn't
supported.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agostatd: Remove SIMU_CRASH warning
Chuck Lever [Fri, 12 Feb 2010 19:26:46 +0000 (14:26 -0500)]
statd: Remove SIMU_CRASH warning

SM_SIMU_CRASH isn't used, so this warning is never seen today.
However, if we ever wanted to use SM_SIMU_CRASH, this warning
is unnecessarily alarming, and serves no real purpose.

At some point in the near future I'd like us to consider using
SM_SIMU_CRASH, so let's get rid of this message now.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoThis is the second iteration of this patch. The only difference here
Jeff Layton [Fri, 12 Feb 2010 19:23:16 +0000 (14:23 -0500)]
This is the second iteration of this patch. The only difference here
is that this one has default_value call nfs_nfs_proto_family regardless
of whether IPV6_SUPPORTED is set.

When IPv6 is enabled, the Proto= config file option is treated as a
netid, and the address family for lookups is selected based on that
setting. The Defaultproto= option however still only affects the
protocol setting for the sockets (IPPROTO_*) and not the address family.

This patch makes it so that if someone sets the "Defaultproto=" option
in the nfsmount.conf, it's used to determine the default address family
for lookups as well as the protocol type.

This gives users a way to force a particular address family to be used
universally for mounts and brings the behavior of the Defaultproto=
option in line with the Proto= option.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agonfs-utils: don't fdatasync the rmtab
Ben Myers [Fri, 12 Feb 2010 19:02:21 +0000 (14:02 -0500)]
nfs-utils: don't fdatasync the rmtab

If we're using the new caching interface the rmtab will be ignored by
exportfs so there is no need to fdatasync. This improves mountd performance.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agonfs-utils: dont leak fd in mountlist_list
Ben Myers [Fri, 12 Feb 2010 19:00:52 +0000 (14:00 -0500)]
nfs-utils: dont leak fd in mountlist_list

Don't leak this file descriptor if stat should fail.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agonfs-utils: remove xflock timeout
Ben Myers [Fri, 12 Feb 2010 18:58:57 +0000 (13:58 -0500)]
nfs-utils: remove xflock timeout

Remove this 10 second timeout which can cause unexpected behavior and
corruption in the rmtab when hit.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agotext-based mount: Support protocol family negotiation
Chuck Lever [Fri, 12 Feb 2010 18:38:59 +0000 (13:38 -0500)]
text-based mount: Support protocol family negotiation

Jeff Layton pointed out that the current negotiation logic in
stropts.c simply doesn't handle the case where a server may have an
IPv6 address and an IPv4 address, but only NFS/IPv4 is supported.
This is typical of all currently deployed Linux servers.

Add support for trying all addresses returned from DNS when
"proto=" is not specified on the command line.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agotext-based mount: Set addr= option in nfs_try_mount_foo()
Chuck Lever [Fri, 12 Feb 2010 18:36:17 +0000 (13:36 -0500)]
text-based mount: Set addr= option in nfs_try_mount_foo()

When retrying a mount request with a different server address, the
addr= option may change each time through the fg/bg loop.

Instead of setting the addr= option in nfs_validate_options(), set it
in nfs_try_mount_v2v3() and nfs_try_mount_v4().  This is much the
same thing we did recently with the version-specific mount options
which might change each time through the fg/bg retry loop.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agotext-based mount: Replace nfs_lookup() with getaddrinfo(3)
Chuck Lever [Fri, 12 Feb 2010 18:10:03 +0000 (13:10 -0500)]
text-based mount: Replace nfs_lookup() with getaddrinfo(3)

Originally I thought it would be best to share the DNS query code
between the legacy mount code and the new text-based code, hence
the introduction of nfs_lookup().  However, it now appears we want
the text-based code to do a little more than take the first address
returned by the query.

So, let's invoke getaddrinfo(3) directly in stropts.c, and save
the returned addrinfo struct until the end of processing.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agotext-based mount: Retry when server can't be reached
Chuck Lever [Fri, 12 Feb 2010 18:04:14 +0000 (13:04 -0500)]
text-based mount: Retry when server can't be reached

We want new default behavior from mount.nfs when the server refuses a
connection.  Since connection refusal can be spurious (for example,
if the server is rebooting), mount.nfs should retry.

NFS shares that are automatically mounted by /etc/fstab at boot
time may be problematic.  The new behavior can be disabled by
specifying the "retry=0" mount option, or these mounts can be changed
to background mounts by specifying the "bg" option.

A kernel code change is still required for the mount(2) system call to
return ECONNREFUSED for NFSv4 mounts (see 2.6.33).  For v2/v3, the
version and transport negotiation logic in mount.nfs should drive a
retry if the server's rpcbind can't be reached.

Note that if a v2/v3 mount request encounters an unregistered NFS
service, it will still fail immediately.  That wouldn't be too hard
to change as well, but there are many more corner cases there where
failing immediately is appropriate.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agonfsstat: use symbolic constants for operation array sizes
Benny Halevy [Mon, 8 Feb 2010 15:36:23 +0000 (10:36 -0500)]
nfsstat: use symbolic constants for operation array sizes

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoAdd recalim_complete to client stats.
Benny Halevy [Mon, 8 Feb 2010 15:34:19 +0000 (10:34 -0500)]
Add recalim_complete to client stats.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agonfsd: fix version-setting regression on old kernels
J. Bruce Fields [Thu, 4 Feb 2010 22:03:53 +0000 (17:03 -0500)]
nfsd: fix version-setting regression on old kernels

/proc/fs/nfsd/versions was extended to allow turning on/off minor
versions by echoing "+4.1" or "-4.1" to /proc/fs/nsfd/versions.

Unfortunately, pre-2.6.30 kernels just stop parsing at first non-digit,
so "-4.1" is interpreted as "-4".  If new nfs-utils (on old kernel)
writes "+2", "+3", "+4", then "-4.1", result therefore is to turn off
4.1.

Given that historical behavior, it may have been a mistake to extend the
interface the way we did; but at this point we're probably stuck with
it.  So, just reverse the order we write versions in.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoTeach nfs_compare_sockaddr() to handle NULL arguments.
Steve Dickson [Mon, 25 Jan 2010 18:09:04 +0000 (13:09 -0500)]
Teach nfs_compare_sockaddr() to handle NULL arguments.

Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoAdded the sys/stat.h header file to a number of nfs-utils-1-2-2-rc9
Steve Dickson [Fri, 22 Jan 2010 17:30:58 +0000 (12:30 -0500)]
Added the sys/stat.h header file to a number of
files which ensure the S_ISDIR() macro is defined.

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agoRemove the idmapd.conf man. It now lives in the
Steve Dickson [Fri, 22 Jan 2010 17:24:05 +0000 (12:24 -0500)]
Remove the idmapd.conf man. It now lives in the
libnfsidmap library git tree

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agomount.nfs: Configuration file parser ignoring options
Steve Dickson [Wed, 20 Jan 2010 20:05:46 +0000 (15:05 -0500)]
mount.nfs: Configuration file parser ignoring options

When the protocol version is set on the command line,
none of the variables set in the configuration file
are passed down to the kernel due to a bug in the
parsing routine.

Tested-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agotcpwrapper: Add support for IPv6 nfs-utils-1-2-2-rc8
Chuck Lever [Fri, 15 Jan 2010 21:02:49 +0000 (16:02 -0500)]
tcpwrapper: Add support for IPv6

Assuming the tcp_wrappers library can actually support IPv6 addresses,
here's a crack at IPv6 support in nfs-utils' TCP wrapper shim.

Some reorganization is done to limit the number of times that @sap
is converted to a presentation address string.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
9 years agotcpwrapper: Eliminated shadowed declaration warnings
Chuck Lever [Sun, 17 Jan 2010 21:53:02 +0000 (16:53 -0500)]
tcpwrapper: Eliminated shadowed declaration warnings

Clean up: the use of identifiers called "access" and "daemon" shadow
function declarations in unistd.h.  Seen with "-Wextra -pedantic".

tcpwrapper.c: In function haccess_add:
tcpwrapper.c:112: warning: declaration of access shadows a global
declaration /usr/include/unistd.h:288: warning: shadowed declaration is here
tcpwrapper.c: In function good_client:
tcpwrapper.c:161: warning: declaration of daemon shadows a global declaration
/usr/include/unistd.h:953: warning: shadowed declaration is here
tcpwrapper.c: In function check_default:
tcpwrapper.c:212: warning: declaration of daemon shadows a
global declaration
/usr/include/unistd.h:953: warning: shadowed declaration is here

good_client() is used only in support/misc/tcpwrapper.c, so make it
static (and update its prototype to c99 standard form).

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agotcpwrapper: Fix signage problems in the tcp_wrappers hash function
Chuck Lever [Sun, 17 Jan 2010 21:50:29 +0000 (16:50 -0500)]
tcpwrapper: Fix signage problems in the tcp_wrappers hash function

Eliminate the following compiler warnings:

tcpwrapper.c:78: warning: no previous prototype for strtoint
tcpwrapper.c: In function strtoint
tcpwrapper.c:81: warning: conversion to int size_t may change the
    sign of the result
tcpwrapper.c:85: warning: conversion to unsigned int from int may
    change the sign of the result
tcpwrapper.c: In function hashint:
tcpwrapper.c:91: warning: conversion to int from unsigned int may
    change the sign of the result

The hash value is probably computed consistently even with
unexpected sign inversions.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agotcp_wrapper: Clean up logit()
Chuck Lever [Sun, 17 Jan 2010 21:48:56 +0000 (16:48 -0500)]
tcp_wrapper: Clean up logit()

Eliminate these compiler warnings:

tcpwrapper.c: In function logit
tcpwrapper.c:225: warning: unused parameter procnum
tcpwrapper.c:225: warning: unused parameter prognum

Actually, @procnum is not used anywhere in our tcpwrapper.c, so
let's just get rid of it.

Since there is only one logit() call site in tcpwrapper.c, the macro
wrapper just adds needless clutter.  Let's get rid of that too.

Finally, both mountd and statd now use xlog(), which adds an
appropriate program name prefix to every message.  Replace the
open-coded syslog(2) call with an xlog() call in order to
consistently identify the RPC service reporting the intrusion.

Since logit() no longer references "deny_severity" and no nfs-utils
caller sets either allow_severity or deny_severity, we remove them.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agotcp_wrappers: Use getifaddrs(3) if it is available
Chuck Lever [Fri, 15 Jan 2010 20:53:07 +0000 (15:53 -0500)]
tcp_wrappers: Use getifaddrs(3) if it is available

After glibc 2.3.3, getifaddrs(3) can return AF_INET6 addresses for
local network interfaces.  Using the library call is easier than
trying to update the open code in from_local(), and means we have
less to maintain in nfs-utils going forward.

And, since from_local() can now support IPv6, change its synopsis to
take a "struct sockaddr *" .

Note that the original code discovers local addresses once.  These
days, with wifi, DHCP, and NetworkManager, the local network
configuration can change dynamically over time.  So, call getifaddrs()
more often to ensure from_local() has up-to-date network configuration
information.

This implementation refreshes the list if from_local() has not been
called in the last second.  This is actually not terribly honerous.
check_default() invokes from_local() only when the remote host is not
in its access cache, or the access/deny files have changed.

So new hosts will cause a refresh, but previously seen hosts
(including localhost) should not.

On the other hand, it still may not be often enough.  After the first
call, if only previously seen hosts attempt to access our daemons,
from_local() would never be called, and the local list would never be
updated.  This might be possible during steady-state operation with
a small number of servers and clients.

It would also be nice if we could free the local interface address
list at shutdown time, but that would be a lot of trouble for little
gain.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
9 years agotcpwrappers: Use xlog() instead of perror(3) and syslog(2)
Chuck Lever [Fri, 15 Jan 2010 20:14:38 +0000 (15:14 -0500)]
tcpwrappers: Use xlog() instead of perror(3) and syslog(2)

Clean up: Replace calls to syslog(2) and perror(3) in from_local.c
with calls to xlog().  The problems displayed by the perror(3) calls
especially should be reported.  Currently they are never seen in the
system log.

As part of a build test, I defined TEST, and found a couple of
problems with main(), which are also addressed in this patch.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
9 years agoTone down a number xlog messages in svc_create_bindaddr() nfs-utils-1-2-2-rc7
Steve Dickson [Fri, 15 Jan 2010 18:51:04 +0000 (13:51 -0500)]
Tone down a number xlog messages in svc_create_bindaddr()

Signed-off-by: Steve Dickson <steved@redhat.com>
9 years agostatd: update rpc.statd(8) and sm-notify(8) to reflect IPv6 support
Chuck Lever [Thu, 14 Jan 2010 17:24:44 +0000 (12:24 -0500)]
statd: update rpc.statd(8) and sm-notify(8) to reflect IPv6 support

Expand and clarify the explanation of NSM operation on Linux, and
provide the same text in both man pages.

Update descriptions of the command line options to match the operation
of the current implementation.

Introduce sections discussing security and operational issues, and
IPv6 operation.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
9 years agostatd: Support TI-RPC statd listener
Chuck Lever [Thu, 14 Jan 2010 17:24:39 +0000 (12:24 -0500)]
statd: Support TI-RPC statd listener

If TI-RPC is available, use it to create statd's svc listener.  If
not, use the old function, rpc_init(), to create statd's listener.

IPv6 can be supported if TI-RPC is available.  In this case,
/etc/netconfig is searched to determine which transports to advertise.

Add the new listener creation API in libnfs.a since other components
of nfs-utils (such as rpc.mountd) will eventually want to share it.

A little re-arrangement of when the statd listener is created is done
to make unregistration of the statd service more reliable.  As it is
now, the statd service is never unregistered when it exits.  After it
is gone, other programs usually hang when trying to access statd or
see if it's running, since the registration is still there but statd
itself does not respond.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
9 years agolibnsm.a: retain CAP_NET_BIND when dropping privileges
Chuck Lever [Thu, 14 Jan 2010 17:24:34 +0000 (12:24 -0500)]
libnsm.a: retain CAP_NET_BIND when dropping privileges

I'm about to switch the order of listener creation and dropping root
privileges.  rpc.statd will drop privileges first, then create its
listeners.  The reason for the new ordering is explained in a
subsequent patch.

However, for non-TI-RPC builds, rpc_init() needs to use a privileged
port to do pmap registrations.  For both TI-RPC and non-TI-RPC builds,
CAP_NET_BIND is required in case the admin requests a privileged
listener port on the statd command line.

So that these requirements are met, nsm_drop_privileges() will now
retain CAP_NET_BIND while dropping root.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
9 years agostatd: Remove NL_ADDR() macro
Chuck Lever [Thu, 14 Jan 2010 17:24:30 +0000 (12:24 -0500)]
statd: Remove NL_ADDR() macro

Clean up: The contents of NL_ADDR are fixed: they are always the IPv4
loopback address.  Some time ago, the use of NL_ADDR() was stubbed out
of the NLM downcall forward path, replaced with a constant IPv4
loopback address.

Stub it out of the reply path as well, and then remove NL_ADDR
entirely.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
9 years agostatd: Support IPv6 in sm_stat_1_svc()
Chuck Lever [Thu, 14 Jan 2010 17:24:23 +0000 (12:24 -0500)]
statd: Support IPv6 in sm_stat_1_svc()

SM_STAT is usually not used by most contemporary NSM implementations,
but for consistency, it gets the same treatment as sm_mon_1_svc(),
since both should use the same logic to determine whether a mon_name
is able to be monitored.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
9 years agostatd: Support IPv6 in sm_mon_1_svc()
Chuck Lever [Thu, 14 Jan 2010 17:24:15 +0000 (12:24 -0500)]
statd: Support IPv6 in sm_mon_1_svc()

Replace deprecated gethostbyname(3) and gethostbyaddr(3) calls in
monitor.c, and address a couple of memory leaks.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>