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

Fix silly bug with tcp-wrappers check

A stray '$'.

Signed-off-by: Neil Brown <neilb@suse.de>

Fix silly bug with gid lookup

Wrong pointer test meant mountd would alway do gid lookups
instead of only if asked to with '-g'.

Signed-off-by: Neil Brown <neilb@suse.de>

Extend the exportfs/mountd interface to pass fslocations info into the kernel

Fix up a few issues with the fsloc code.

Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>

Fix reference error when writing fsloc data to cache

Use the correct pointer when writing fslocations data to the cache.
Also write the fsloc stuff before the uuid stuff so userland code
will work with or without the uuid kernel patches.

Signed-off-by: Neil Brown <neilb@suse.de>

Add missing fsloc.[ch] files - oops.

Update version to 1.0.11

Extend the exportfs interface to pass fslocations info into the kernel.

Extend exportfs interface to pass fslocations info into the kernel,
using syntax modelled after AIX.  Adds "refer=" and "replicas="
options to /etc/exports to enable use of the kernel fslocation code.

Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>

Fix showmount bugs.

When doing a nonblocked connect, we need to select for 'write', not 'read'.

Also, when a tcp socket has been connected, we should use clnttcp_create
to make a tcp client, not clntudp_bufcreate !!

Support group-id looks for kernels that ask for them.

With "-g" mountd will listen for uid -> gidlist requests
from the kernel and provide the required mapping.
This is specific to AUTH_USER (aka AUTH_SYS) and is designed
to overcome the 16-gid limit in the AUTH_UNIX protocol.

Use UUIDs to identify filesystems if kernel supports it.

This introduces a new dependancy on libblkid.
If a filesystem being exported has a UUID that libblkid
can extract, then that is passed to the kernel for use
in identifying the filesystem in filehandles.
This means that 'fsid=' is no longer needed to work around the
problem of device numbers changing.
fsid= is still needed for fielsystems that have no device,
and can now be given  16byute uuid instead of just a 32bit one.

Correct spelling error

 writting -> writing

Add option to svcgssd to enable libnfsidmap debugging.

Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
As suggested by Glenn Machin <GMachin@sandia.gov>.  Allow svcgssd
to turn on libnfsidmap debugging.  This uses a new command-line
parameter so that it can be enabled independently from other
debugging.
Signed-off-by: Neil Brown <neilb@suse.de>

Remove duplicated code.

Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Remove duplicated code.
Signed-off-by: Neil Brown <neilb@suse.de>

Share handling of lucid_sec_context for Heimdal and MIT

Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
The 0.8 release of Heimdal has (will have) support for the lucid context.
The handling of lucid_sec_context can be shared between builds with MIT
or Heimdal Kerberos.

Split out the lucid_sec_context code from context_mit.c
and make a new common file, context_lucid.c.
Signed-off-by: Neil Brown <neilb@suse.de>

Use owner rather than filename format in choosing cred cache files

Signed-off-by: Glenn Machin <gmachin@sandia.gov>
Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Some installations use different name formats for their credentials
caches.  Instead of checking that the uid is part of the name, just
make sure that uid is the owner of the file.
This is a modification of the original patch from Glenn.
Signed-off-by: Neil Brown <neilb@suse.de>