Imported Upstream version 1.1.0~rc1

Imported Debian patch 1.0.12-4

Imported Debian patch 1.0.12-3

Imported Debian patch 1.0.12-2

Imported Debian patch 1.0.12-1

Merge branch 'upstream'

Conflicts:
configure
utils/mountd/fsloc.c

Imported Upstream version 1.0.12

Imported Debian patch 1.0.11-2

Imported Debian patch 1.0.11-1

Merge branch 'upstream'

Conflicts:
configure
utils/mountd/Makefile.in

Imported Upstream version 1.0.11

Imported Debian patch 1.0.11~git-20070212-1

Merge branch 'upstream'

Conflicts:
Makefile.in
aclocal.m4
autom4te.cache/output.0
autom4te.cache/output.1
autom4te.cache/requests
autom4te.cache/traces.0
autom4te.cache/traces.1
configure
depcomp
install-sh
linux-nfs/Makefile.in
missing
support/Makefile.in
support/export/Makefile.in
support/include/Makefile.in
support/include/nfs/Makefile.in
support/include/rpcsvc/Makefile.in
support/include/sys/Makefile.in
support/include/sys/fs/Makefile.in
support/misc/Makefile.in
support/nfs/Makefile.in
tools/Makefile.in
tools/getiversion/Makefile.in
tools/locktest/Makefile.in
tools/nlmtest/Makefile.in
tools/rpcdebug/Makefile.in
tools/rpcgen/Makefile.in
utils/Makefile.in
utils/exportfs/Makefile.in
utils/gssd/Makefile.in
utils/idmapd/Makefile.in
utils/lockd/Makefile.in
utils/mount/Makefile.in
utils/mountd/Makefile.in
utils/nfsd/Makefile.in
utils/nfsstat/Makefile.in
utils/rquotad/Makefile.in
utils/showmount/Makefile.in
utils/statd/Makefile.in

Imported Upstream version 1.0.11~git-20070212

Imported Debian patch 1.0.11~git-20060117-2

Imported Debian patch 1.0.11~git-20060117-1

Merge branch 'upstream'

Conflicts:
Makefile.in
aclocal.m4
autom4te.cache/output.0
autom4te.cache/output.1
autom4te.cache/requests
autom4te.cache/traces.0
autom4te.cache/traces.1
compile
configure
depcomp
install-sh
linux-nfs/Makefile.in
missing
support/Makefile.in
support/export/Makefile.in
support/include/Makefile.in
support/include/nfs/Makefile.in
support/include/rpcsvc/Makefile.in
support/include/sys/Makefile.in
support/include/sys/fs/Makefile.in
support/misc/Makefile.in
support/nfs/Makefile.in
tools/Makefile.in
tools/getiversion/Makefile.in
tools/getkversion/Makefile.in
tools/locktest/Makefile.in
tools/nlmtest/Makefile.in
tools/rpcdebug/Makefile.in
tools/rpcgen/Makefile.in
utils/Makefile.in
utils/exportfs/Makefile.in
utils/gssd/Makefile.in
utils/idmapd/Makefile.in
utils/lockd/Makefile.in
utils/mount/Makefile.in
utils/mountd/Makefile.in
utils/nfsd/Makefile.in
utils/nfsstat/Makefile.in
utils/rquotad/Makefile.in
utils/showmount/Makefile.in
utils/statd/Makefile.in

Imported Upstream version 1.0.11~git-20060117

Imported Debian patch 1.0.11~git-20060105-2

Imported Debian patch 1.0.11~git-20060105-1

Merge branch 'upstream'

Conflicts:
aclocal.m4
config.guess
config.sub
configure
utils/Makefile.in

Imported Upstream version 1.0.11~git-20060105

Imported Debian patch 1.0.10-6~quilt.7

Imported Debian patch 1.0.10-6~quilt.6

Imported Debian patch 1.0.10-6~quilt.5

Imported Debian patch 1.0.10-6~quilt.4

Imported Debian patch 1.0.10-6~quilt.3

Imported Debian patch 1.0.10-6~quilt.2

Imported Debian patch 1.0.10-6~quilt.1

Imported Debian patch 1.0.10-6~quilt.0

Imported Debian patch 1.0.10-5

Imported Debian patch 1.0.10-4

Imported Debian patch 1.0.10-3

Imported Debian patch 1.0.10-2

Imported Debian patch 1.0.10-1

Merge branch 'upstream'

Conflicts:
configure

Imported Upstream version 1.0.10

Imported Debian patch 1.0.9-12

Imported Debian patch 1.0.9-11

Imported Debian patch 1.0.9-10

Imported Debian patch 1.0.9-9

Imported Debian patch 1.0.9-8

Imported Debian patch 1.0.9-7

Imported Debian patch 1.0.9-6

Imported Debian patch 1.0.9-5

Imported Debian patch 1.0.9-4

Imported Debian patch 1.0.9-3

Imported Debian patch 1.0.9-2

Imported Debian patch 1.0.9-1

Merge branch 'upstream'

Conflicts:
Makefile.in
configure
linux-nfs/Makefile.in
support/Makefile.in
support/export/Makefile.in
support/include/Makefile.in
support/include/config.h.in
support/include/nfs/Makefile.in
support/include/rpcsvc/Makefile.in
support/include/sys/Makefile.in
support/include/sys/fs/Makefile.in
support/misc/Makefile.in
support/nfs/Makefile.in
support/nfs/clients.c
tools/Makefile.in
tools/getiversion/Makefile.in
tools/getkversion/Makefile.in
tools/locktest/Makefile.in
tools/nlmtest/Makefile.in
tools/rpcdebug/Makefile.in
tools/rpcgen/Makefile.in
utils/Makefile.in
utils/exportfs/Makefile.in
utils/gssd/Makefile.am
utils/gssd/Makefile.in
utils/gssd/svcgssd_proc.c
utils/idmapd/Makefile.in
utils/lockd/Makefile.in
utils/mount/Makefile.in
utils/mountd/Makefile.in
utils/nfsd/Makefile.in
utils/nfsstat/Makefile.in
utils/nhfsstone/Makefile.in
utils/rquotad/Makefile.in
utils/showmount/Makefile.in
utils/statd/Makefile.in

Imported Upstream version 1.0.9

Imported Debian patch 1.0.8+1.0.9pre1-4

Imported Debian patch 1.0.8+1.0.9pre1-3

Imported Debian patch 1.0.8+1.0.9pre1-2

Imported Debian patch 1.0.8+1.0.9pre1-1

Merge branch 'upstream'

Conflicts:
configure
debian/changelog
debian/control
debian/etc.exports
debian/nfs-common.default
debian/nfs-common.dirs
debian/nfs-common.init
debian/nfs-common.install
debian/nfs-common.postinst
debian/nfs-common.postrm
debian/nfs-common.prerm
debian/nfs-kernel-server.default
debian/nfs-kernel-server.dirs
debian/nfs-kernel-server.init
debian/nfs-kernel-server.postinst
debian/nfs-kernel-server.postrm
debian/nfs-kernel-server.prerm
debian/rules
support/nfs/exports.c
utils/mountd/mountd.c
utils/mountd/mountd.man

Imported Upstream version 1.0.8+1.0.9pre1

Imported Debian patch 1.0.8-10

Imported Debian patch 1.0.8-9

Imported Debian patch 1.0.8-8

Imported Debian patch 1.0.8-7

Imported Debian patch 1.0.8-6

Imported Debian patch 1.0.8-5

Imported Debian patch 1.0.8-4

Imported Debian patch 1.0.8-3

Imported Debian patch 1.0.8-2

Imported Debian patch 1.0.8-1

Merge branch 'upstream'

Conflicts:
config.guess
config.sub
configure
debian/changelog
debian/control
debian/etc.exports
debian/nfs-common.default
debian/nfs-common.dirs
debian/nfs-common.init
debian/nfs-common.install
debian/nfs-common.postinst
debian/nfs-common.postrm
debian/nfs-common.prerm
debian/nfs-kernel-server.default
debian/nfs-kernel-server.dirs
debian/nfs-kernel-server.init
debian/nfs-kernel-server.postinst
debian/nfs-kernel-server.postrm
debian/nfs-kernel-server.prerm
debian/rules
utils/gssd/Makefile
utils/svcgssd/Makefile

Imported Upstream version 1.0.8

Imported Debian patch 1.0.7-19

Imported Debian patch 1.0.7-18

Imported Debian patch 1.0.7-17

Imported Debian patch 1.0.7-16

Imported Debian patch 1.0.7-15

Imported Debian patch 1.0.7-14

Imported Debian patch 1.0.7-13

Imported Debian patch 1.0.7-12

Imported Debian patch 1.0.7-11

Imported Debian patch 1.0.7-10

Imported Debian patch 1.0.7-9

Imported Debian patch 1.0.7-8

Imported Debian patch 1.0.7-7

Imported Debian patch 1.0.7-6

Imported Debian patch 1.0.7-5

Imported Debian patch 1.0.7-4

Imported Debian patch 1.0.7-3

Merge commit 'debian/1.0.7-2'

Conflicts:
debian/changelog

Imported Debian patch 1.0.6-3.1

Merge commit 'debian/1.0.6-3'

Imported Upstream version 1.0.6

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>