2007-01-23 07:17:10 +00:00
|
|
|
/*
|
|
|
|
* copyright (c) 2003
|
|
|
|
* the regents of the university of michigan
|
|
|
|
* all rights reserved
|
|
|
|
*
|
|
|
|
* permission is granted to use, copy, create derivative works and redistribute
|
|
|
|
* this software and such derivative works for any purpose, so long as the name
|
|
|
|
* of the university of michigan is not used in any advertising or publicity
|
|
|
|
* pertaining to the use or distribution of this software without specific,
|
|
|
|
* written prior authorization. if the above copyright notice or any other
|
|
|
|
* identification of the university of michigan is included in any copy of any
|
|
|
|
* portion of this software, then the disclaimer below must also be included.
|
|
|
|
*
|
|
|
|
* this software is provided as is, without representation from the university
|
|
|
|
* of michigan as to its fitness for any purpose, and without warranty by the
|
|
|
|
* university of michigan of any kind, either express or implied, including
|
|
|
|
* without limitation the implied warranties of merchantability and fitness for
|
|
|
|
* a particular purpose. the regents of the university of michigan shall not be
|
|
|
|
* liable for any damages, including special, indirect, incidental, or
|
|
|
|
* consequential damages, with respect to any claim arising out of or in
|
|
|
|
* connection with the use of the software, even if it has been or is hereafter
|
|
|
|
* advised of the possibility of such damages.
|
|
|
|
*/
|
|
|
|
|
1994-05-26 06:35:07 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1992, 1993, 1994
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
|
|
|
* This code is derived from software contributed to Berkeley by
|
|
|
|
* Rick Macklem at The University of Guelph.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
2003-05-03 18:41:59 +00:00
|
|
|
#if 0
|
1994-05-26 06:35:07 +00:00
|
|
|
#ifndef lint
|
1998-07-06 07:15:53 +00:00
|
|
|
static const char copyright[] =
|
1994-05-26 06:35:07 +00:00
|
|
|
"@(#) Copyright (c) 1992, 1993, 1994\n\
|
|
|
|
The Regents of the University of California. All rights reserved.\n";
|
|
|
|
#endif /* not lint */
|
|
|
|
|
|
|
|
#ifndef lint
|
1997-03-11 12:40:45 +00:00
|
|
|
static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95";
|
1994-05-26 06:35:07 +00:00
|
|
|
#endif /* not lint */
|
2003-05-03 18:41:59 +00:00
|
|
|
#endif
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
1994-05-26 06:35:07 +00:00
|
|
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/mount.h>
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
#include <sys/socket.h>
|
1994-05-26 06:35:07 +00:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/syslog.h>
|
2006-11-21 01:53:18 +00:00
|
|
|
#include <sys/uio.h>
|
1994-05-26 06:35:07 +00:00
|
|
|
|
|
|
|
#include <rpc/rpc.h>
|
|
|
|
#include <rpc/pmap_clnt.h>
|
|
|
|
#include <rpc/pmap_prot.h>
|
|
|
|
|
|
|
|
#include <nfs/rpcv2.h>
|
1995-06-27 11:07:30 +00:00
|
|
|
#include <nfs/nfsproto.h>
|
2001-09-18 23:34:44 +00:00
|
|
|
#include <nfsclient/nfs.h>
|
1994-05-26 06:35:07 +00:00
|
|
|
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <err.h>
|
|
|
|
#include <errno.h>
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
#include <fcntl.h>
|
1994-05-26 06:35:07 +00:00
|
|
|
#include <netdb.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2003-03-25 00:16:41 +00:00
|
|
|
#include <string.h>
|
1994-05-26 06:35:07 +00:00
|
|
|
#include <strings.h>
|
1996-05-13 17:43:19 +00:00
|
|
|
#include <sysexits.h>
|
1994-05-26 06:35:07 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
#include "mntopts.h"
|
1999-11-22 04:23:11 +00:00
|
|
|
#include "mounttab.h"
|
1994-05-26 06:35:07 +00:00
|
|
|
|
2001-05-13 00:07:03 +00:00
|
|
|
/* Table for af,sotype -> netid conversions. */
|
|
|
|
struct nc_protos {
|
2008-09-13 20:22:46 +00:00
|
|
|
const char *netid;
|
2001-05-13 00:07:03 +00:00
|
|
|
int af;
|
|
|
|
int sotype;
|
|
|
|
} nc_protos[] = {
|
|
|
|
{"udp", AF_INET, SOCK_DGRAM},
|
|
|
|
{"tcp", AF_INET, SOCK_STREAM},
|
|
|
|
{"udp6", AF_INET6, SOCK_DGRAM},
|
|
|
|
{"tcp6", AF_INET6, SOCK_STREAM},
|
2006-11-21 02:00:48 +00:00
|
|
|
{NULL, 0, 0}
|
2001-05-13 00:07:03 +00:00
|
|
|
};
|
|
|
|
|
1994-05-26 06:35:07 +00:00
|
|
|
struct nfhret {
|
1995-06-27 11:07:30 +00:00
|
|
|
u_long stat;
|
|
|
|
long vers;
|
|
|
|
long auth;
|
|
|
|
long fhsize;
|
|
|
|
u_char nfh[NFSX_V3FHMAX];
|
1994-05-26 06:35:07 +00:00
|
|
|
};
|
|
|
|
#define BGRND 1
|
|
|
|
#define ISBGRND 2
|
2003-03-25 01:25:30 +00:00
|
|
|
#define OF_NOINET4 4
|
|
|
|
#define OF_NOINET6 8
|
2001-07-19 21:11:48 +00:00
|
|
|
int retrycnt = -1;
|
1994-05-26 06:35:07 +00:00
|
|
|
int opflags = 0;
|
1995-06-27 11:07:30 +00:00
|
|
|
int nfsproto = IPPROTO_UDP;
|
|
|
|
int mnttcp_ok = 1;
|
2008-09-13 20:22:46 +00:00
|
|
|
int noconn = 0;
|
2001-04-10 22:05:47 +00:00
|
|
|
char *portspec = NULL; /* Server nfs port; NULL means look up via rpcbind. */
|
2008-09-13 20:22:46 +00:00
|
|
|
struct sockaddr *addr;
|
|
|
|
int addrlen = 0;
|
|
|
|
u_char *fh = NULL;
|
|
|
|
int fhsize = 0;
|
Implement support for RPCSEC_GSS authentication to both the NFS client
and server. This replaces the RPC implementation of the NFS client and
server with the newer RPC implementation originally developed
(actually ported from the userland sunrpc code) to support the NFS
Lock Manager. I have tested this code extensively and I believe it is
stable and that performance is at least equal to the legacy RPC
implementation.
The NFS code currently contains support for both the new RPC
implementation and the older legacy implementation inherited from the
original NFS codebase. The default is to use the new implementation -
add the NFS_LEGACYRPC option to fall back to the old code. When I
merge this support back to RELENG_7, I will probably change this so
that users have to 'opt in' to get the new code.
To use RPCSEC_GSS on either client or server, you must build a kernel
which includes the KGSSAPI option and the crypto device. On the
userland side, you must build at least a new libc, mountd, mount_nfs
and gssd. You must install new versions of /etc/rc.d/gssd and
/etc/rc.d/nfsd and add 'gssd_enable=YES' to /etc/rc.conf.
As long as gssd is running, you should be able to mount an NFS
filesystem from a server that requires RPCSEC_GSS authentication. The
mount itself can happen without any kerberos credentials but all
access to the filesystem will be denied unless the accessing user has
a valid ticket file in the standard place (/tmp/krb5cc_<uid>). There
is currently no support for situations where the ticket file is in a
different place, such as when the user logged in via SSH and has
delegated credentials from that login. This restriction is also
present in Solaris and Linux. In theory, we could improve this in
future, possibly using Brooks Davis' implementation of variant
symlinks.
Supporting RPCSEC_GSS on a server is nearly as simple. You must create
service creds for the server in the form 'nfs/<fqdn>@<REALM>' and
install them in /etc/krb5.keytab. The standard heimdal utility ktutil
makes this fairly easy. After the service creds have been created, you
can add a '-sec=krb5' option to /etc/exports and restart both mountd
and nfsd.
The only other difference an administrator should notice is that nfsd
doesn't fork to create service threads any more. In normal operation,
there will be two nfsd processes, one in userland waiting for TCP
connections and one in the kernel handling requests. The latter
process will create as many kthreads as required - these should be
visible via 'top -H'. The code has some support for varying the number
of service threads according to load but initially at least, nfsd uses
a fixed number of threads according to the value supplied to its '-n'
option.
Sponsored by: Isilon Systems
MFC after: 1 month
2008-11-03 10:38:00 +00:00
|
|
|
int secflavor = -1;
|
2008-09-13 20:22:46 +00:00
|
|
|
|
2001-04-10 22:05:47 +00:00
|
|
|
enum mountmode {
|
1997-04-18 16:23:10 +00:00
|
|
|
ANY,
|
|
|
|
V2,
|
2007-01-23 07:17:10 +00:00
|
|
|
V3,
|
|
|
|
V4
|
1997-04-18 16:23:10 +00:00
|
|
|
} mountmode = ANY;
|
1994-05-26 06:35:07 +00:00
|
|
|
|
2001-04-10 22:05:47 +00:00
|
|
|
/* Return codes for nfs_tryproto. */
|
|
|
|
enum tryret {
|
|
|
|
TRYRET_SUCCESS,
|
|
|
|
TRYRET_TIMEOUT, /* No response received. */
|
|
|
|
TRYRET_REMOTEERR, /* Error received from remote server. */
|
|
|
|
TRYRET_LOCALERR /* Local failure. */
|
|
|
|
};
|
|
|
|
|
2008-09-13 20:22:46 +00:00
|
|
|
int fallback_mount(struct iovec *iov, int iovlen, int mntflags);
|
Implement support for RPCSEC_GSS authentication to both the NFS client
and server. This replaces the RPC implementation of the NFS client and
server with the newer RPC implementation originally developed
(actually ported from the userland sunrpc code) to support the NFS
Lock Manager. I have tested this code extensively and I believe it is
stable and that performance is at least equal to the legacy RPC
implementation.
The NFS code currently contains support for both the new RPC
implementation and the older legacy implementation inherited from the
original NFS codebase. The default is to use the new implementation -
add the NFS_LEGACYRPC option to fall back to the old code. When I
merge this support back to RELENG_7, I will probably change this so
that users have to 'opt in' to get the new code.
To use RPCSEC_GSS on either client or server, you must build a kernel
which includes the KGSSAPI option and the crypto device. On the
userland side, you must build at least a new libc, mountd, mount_nfs
and gssd. You must install new versions of /etc/rc.d/gssd and
/etc/rc.d/nfsd and add 'gssd_enable=YES' to /etc/rc.conf.
As long as gssd is running, you should be able to mount an NFS
filesystem from a server that requires RPCSEC_GSS authentication. The
mount itself can happen without any kerberos credentials but all
access to the filesystem will be denied unless the accessing user has
a valid ticket file in the standard place (/tmp/krb5cc_<uid>). There
is currently no support for situations where the ticket file is in a
different place, such as when the user logged in via SSH and has
delegated credentials from that login. This restriction is also
present in Solaris and Linux. In theory, we could improve this in
future, possibly using Brooks Davis' implementation of variant
symlinks.
Supporting RPCSEC_GSS on a server is nearly as simple. You must create
service creds for the server in the form 'nfs/<fqdn>@<REALM>' and
install them in /etc/krb5.keytab. The standard heimdal utility ktutil
makes this fairly easy. After the service creds have been created, you
can add a '-sec=krb5' option to /etc/exports and restart both mountd
and nfsd.
The only other difference an administrator should notice is that nfsd
doesn't fork to create service threads any more. In normal operation,
there will be two nfsd processes, one in userland waiting for TCP
connections and one in the kernel handling requests. The latter
process will create as many kthreads as required - these should be
visible via 'top -H'. The code has some support for varying the number
of service threads according to load but initially at least, nfsd uses
a fixed number of threads according to the value supplied to its '-n'
option.
Sponsored by: Isilon Systems
MFC after: 1 month
2008-11-03 10:38:00 +00:00
|
|
|
int sec_name_to_num(char *sec);
|
|
|
|
char *sec_num_to_name(int num);
|
2008-09-13 20:22:46 +00:00
|
|
|
int getnfsargs(char *, struct iovec **iov, int *iovlen);
|
|
|
|
int getnfs4args(char *, struct iovec **iov, int *iovlen);
|
2002-03-21 13:14:21 +00:00
|
|
|
/* void set_rpc_maxgrouplist(int); */
|
2001-05-13 00:07:03 +00:00
|
|
|
struct netconfig *getnetconf_cached(const char *netid);
|
2008-09-13 20:22:46 +00:00
|
|
|
const char *netidbytype(int af, int sotype);
|
2002-03-21 13:14:21 +00:00
|
|
|
void usage(void) __dead2;
|
|
|
|
int xdr_dir(XDR *, char *);
|
|
|
|
int xdr_fh(XDR *, struct nfhret *);
|
2008-09-13 20:22:46 +00:00
|
|
|
enum tryret nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec,
|
|
|
|
char **errstr, struct iovec **iov, int *iovlen);
|
|
|
|
enum tryret nfs4_tryproto(struct addrinfo *ai, char *hostp, char *spec,
|
|
|
|
char **errstr);
|
2001-04-10 22:05:47 +00:00
|
|
|
enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr);
|
2008-09-19 11:59:10 +00:00
|
|
|
extern int getosreldate(void);
|
1994-05-26 06:35:07 +00:00
|
|
|
|
|
|
|
int
|
2006-03-20 21:28:46 +00:00
|
|
|
main(int argc, char *argv[])
|
1994-05-26 06:35:07 +00:00
|
|
|
{
|
2002-03-20 17:55:10 +00:00
|
|
|
int c;
|
2006-11-21 01:53:18 +00:00
|
|
|
struct iovec *iov;
|
2008-09-19 11:59:10 +00:00
|
|
|
int mntflags, num, iovlen;
|
|
|
|
int osversion;
|
2008-02-18 00:23:28 +00:00
|
|
|
char *name, *p, *spec, *fstype;
|
2006-11-29 00:46:30 +00:00
|
|
|
char mntpath[MAXPATHLEN], errmsg[255];
|
1994-05-26 06:35:07 +00:00
|
|
|
|
|
|
|
mntflags = 0;
|
2006-11-21 01:53:18 +00:00
|
|
|
iov = NULL;
|
|
|
|
iovlen = 0;
|
2006-11-29 00:46:30 +00:00
|
|
|
memset(errmsg, 0, sizeof(errmsg));
|
2006-11-21 01:53:18 +00:00
|
|
|
|
2006-11-29 00:41:44 +00:00
|
|
|
fstype = strrchr(argv[0], '_');
|
|
|
|
if (fstype == NULL)
|
|
|
|
errx(EX_USAGE, "argv[0] must end in _fstype");
|
|
|
|
|
|
|
|
++fstype;
|
|
|
|
|
2007-01-23 07:17:10 +00:00
|
|
|
if (strcmp(fstype, "nfs4") == 0) {
|
|
|
|
nfsproto = IPPROTO_TCP;
|
|
|
|
portspec = "2049";
|
2008-09-13 20:22:46 +00:00
|
|
|
build_iovec(&iov, &iovlen, "tcp", NULL, 0);
|
2007-01-23 07:17:10 +00:00
|
|
|
mountmode = V4;
|
|
|
|
}
|
|
|
|
|
1994-05-26 06:35:07 +00:00
|
|
|
while ((c = getopt(argc, argv,
|
2007-01-23 07:17:10 +00:00
|
|
|
"234a:bcdD:g:I:iLlNo:PR:r:sTt:w:x:U")) != -1)
|
1994-05-26 06:35:07 +00:00
|
|
|
switch (c) {
|
1997-04-18 16:23:10 +00:00
|
|
|
case '2':
|
|
|
|
mountmode = V2;
|
|
|
|
break;
|
1995-06-27 11:07:30 +00:00
|
|
|
case '3':
|
1997-04-18 16:23:10 +00:00
|
|
|
mountmode = V3;
|
1995-06-27 11:07:30 +00:00
|
|
|
break;
|
2007-01-23 07:17:10 +00:00
|
|
|
case '4':
|
|
|
|
mountmode = V4;
|
|
|
|
fstype = "nfs4";
|
|
|
|
break;
|
1994-05-26 06:35:07 +00:00
|
|
|
case 'a':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-a deprecated, use -o readhead=<value>\n");
|
|
|
|
build_iovec(&iov, &iovlen, "readahead", optarg, (size_t)-1);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 'b':
|
|
|
|
opflags |= BGRND;
|
|
|
|
break;
|
|
|
|
case 'c':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-c deprecated, use -o noconn\n");
|
|
|
|
build_iovec(&iov, &iovlen, "noconn", NULL, 0);
|
|
|
|
noconn = 1;
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 'D':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-D deprecated, use -o deadthresh=<value>\n");
|
|
|
|
build_iovec(&iov, &iovlen, "deadthresh", optarg, (size_t)-1);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 'd':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-d deprecated, use -o dumbtimer");
|
|
|
|
build_iovec(&iov, &iovlen, "dumbtimer", NULL, 0);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 'g':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-g deprecated, use -o maxgroups");
|
1994-05-26 06:35:07 +00:00
|
|
|
num = strtol(optarg, &p, 10);
|
|
|
|
if (*p || num <= 0)
|
|
|
|
errx(1, "illegal -g value -- %s", optarg);
|
2008-09-13 20:22:46 +00:00
|
|
|
//set_rpc_maxgrouplist(num);
|
|
|
|
build_iovec(&iov, &iovlen, "maxgroups", optarg, (size_t)-1);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
1995-06-27 11:07:30 +00:00
|
|
|
case 'I':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-I deprecated, use -o readdirsize=<value>\n");
|
|
|
|
build_iovec(&iov, &iovlen, "readdirsize", optarg, (size_t)-1);
|
1995-06-27 11:07:30 +00:00
|
|
|
break;
|
1994-05-26 06:35:07 +00:00
|
|
|
case 'i':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-i deprecated, use -o intr\n");
|
|
|
|
build_iovec(&iov, &iovlen, "intr", NULL, 0);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
2001-11-12 02:33:52 +00:00
|
|
|
case 'L':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-i deprecated, use -o nolockd\n");
|
|
|
|
build_iovec(&iov, &iovlen, "nolockd", NULL, 0);
|
2001-11-12 02:33:52 +00:00
|
|
|
break;
|
1994-05-26 06:35:07 +00:00
|
|
|
case 'l':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-l deprecated, -o rdirplus\n");
|
|
|
|
build_iovec(&iov, &iovlen, "rdirplus", NULL, 0);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
1997-10-19 16:40:01 +00:00
|
|
|
case 'N':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-N deprecated, do not specify -o resvport\n");
|
1997-10-19 16:40:01 +00:00
|
|
|
break;
|
2008-09-13 20:22:46 +00:00
|
|
|
case 'o': {
|
|
|
|
int pass_flag_to_nmount;
|
|
|
|
char *opt = optarg;
|
|
|
|
while (opt) {
|
|
|
|
char *pval = NULL;
|
|
|
|
char *pnextopt = NULL;
|
|
|
|
char *val = "";
|
|
|
|
pass_flag_to_nmount = 1;
|
|
|
|
pval = strchr(opt, '=');
|
|
|
|
pnextopt = strchr(opt, ',');
|
|
|
|
if (pval != NULL) {
|
|
|
|
*pval = '\0';
|
|
|
|
val = pval + 1;
|
|
|
|
}
|
|
|
|
if (pnextopt) {
|
|
|
|
*pnextopt = '\0';
|
|
|
|
pnextopt++;
|
|
|
|
}
|
|
|
|
if (strcmp(opt, "bg") == 0) {
|
|
|
|
opflags |= BGRND;
|
|
|
|
pass_flag_to_nmount=0;
|
|
|
|
} else if (strcmp(opt, "fg") == 0) {
|
|
|
|
/* same as not specifying -o bg */
|
|
|
|
pass_flag_to_nmount=0;
|
|
|
|
} else if (strcmp(opt, "mntudp") == 0) {
|
|
|
|
mnttcp_ok = 0;
|
|
|
|
nfsproto = IPPROTO_UDP;
|
|
|
|
} else if (strcmp(opt, "udp") == 0) {
|
|
|
|
nfsproto = IPPROTO_UDP;
|
|
|
|
} else if (strcmp(opt, "tcp") == 0) {
|
|
|
|
nfsproto = IPPROTO_TCP;
|
|
|
|
} else if (strcmp(opt, "noinet4") == 0) {
|
|
|
|
pass_flag_to_nmount=0;
|
|
|
|
opflags |= OF_NOINET4;
|
|
|
|
} else if (strcmp(opt, "noinet6") == 0) {
|
|
|
|
pass_flag_to_nmount=0;
|
|
|
|
opflags |= OF_NOINET6;
|
|
|
|
} else if (strcmp(opt, "noconn") == 0) {
|
|
|
|
noconn = 1;
|
|
|
|
} else if (strcmp(opt, "nfsv2") == 0) {
|
|
|
|
pass_flag_to_nmount=0;
|
|
|
|
mountmode = V2;
|
|
|
|
} else if (strcmp(opt, "nfsv3") == 0) {
|
|
|
|
mountmode = V3;
|
|
|
|
} else if (strcmp(opt, "nfsv4") == 0) {
|
|
|
|
pass_flag_to_nmount=0;
|
|
|
|
mountmode = V4;
|
|
|
|
fstype = "nfs4";
|
|
|
|
} else if (strcmp(opt, "port") == 0) {
|
|
|
|
pass_flag_to_nmount=0;
|
2002-09-06 19:59:29 +00:00
|
|
|
asprintf(&portspec, "%d",
|
2008-09-13 20:22:46 +00:00
|
|
|
atoi(val));
|
2002-09-06 19:59:29 +00:00
|
|
|
if (portspec == NULL)
|
|
|
|
err(1, "asprintf");
|
Implement support for RPCSEC_GSS authentication to both the NFS client
and server. This replaces the RPC implementation of the NFS client and
server with the newer RPC implementation originally developed
(actually ported from the userland sunrpc code) to support the NFS
Lock Manager. I have tested this code extensively and I believe it is
stable and that performance is at least equal to the legacy RPC
implementation.
The NFS code currently contains support for both the new RPC
implementation and the older legacy implementation inherited from the
original NFS codebase. The default is to use the new implementation -
add the NFS_LEGACYRPC option to fall back to the old code. When I
merge this support back to RELENG_7, I will probably change this so
that users have to 'opt in' to get the new code.
To use RPCSEC_GSS on either client or server, you must build a kernel
which includes the KGSSAPI option and the crypto device. On the
userland side, you must build at least a new libc, mountd, mount_nfs
and gssd. You must install new versions of /etc/rc.d/gssd and
/etc/rc.d/nfsd and add 'gssd_enable=YES' to /etc/rc.conf.
As long as gssd is running, you should be able to mount an NFS
filesystem from a server that requires RPCSEC_GSS authentication. The
mount itself can happen without any kerberos credentials but all
access to the filesystem will be denied unless the accessing user has
a valid ticket file in the standard place (/tmp/krb5cc_<uid>). There
is currently no support for situations where the ticket file is in a
different place, such as when the user logged in via SSH and has
delegated credentials from that login. This restriction is also
present in Solaris and Linux. In theory, we could improve this in
future, possibly using Brooks Davis' implementation of variant
symlinks.
Supporting RPCSEC_GSS on a server is nearly as simple. You must create
service creds for the server in the form 'nfs/<fqdn>@<REALM>' and
install them in /etc/krb5.keytab. The standard heimdal utility ktutil
makes this fairly easy. After the service creds have been created, you
can add a '-sec=krb5' option to /etc/exports and restart both mountd
and nfsd.
The only other difference an administrator should notice is that nfsd
doesn't fork to create service threads any more. In normal operation,
there will be two nfsd processes, one in userland waiting for TCP
connections and one in the kernel handling requests. The latter
process will create as many kthreads as required - these should be
visible via 'top -H'. The code has some support for varying the number
of service threads according to load but initially at least, nfsd uses
a fixed number of threads according to the value supplied to its '-n'
option.
Sponsored by: Isilon Systems
MFC after: 1 month
2008-11-03 10:38:00 +00:00
|
|
|
} else if (strcmp(opt, "sec") == 0) {
|
|
|
|
/*
|
|
|
|
* Don't add this option to
|
|
|
|
* the iovec yet - we will
|
|
|
|
* negotiate which sec flavor
|
|
|
|
* to use with the remote
|
|
|
|
* mountd.
|
|
|
|
*/
|
|
|
|
pass_flag_to_nmount=0;
|
|
|
|
secflavor = sec_name_to_num(val);
|
|
|
|
if (secflavor < 0) {
|
|
|
|
errx(1,
|
|
|
|
"illegal sec value -- %s",
|
|
|
|
val);
|
|
|
|
}
|
2008-09-13 20:22:46 +00:00
|
|
|
} else if (strcmp(opt, "retrycnt") == 0) {
|
|
|
|
pass_flag_to_nmount=0;
|
|
|
|
num = strtol(val, &p, 10);
|
|
|
|
if (*p || num < 0)
|
|
|
|
errx(1, "illegal retrycnt value -- %s", val);
|
|
|
|
retrycnt = num;
|
|
|
|
} else if (strcmp(opt, "maxgroups") == 0) {
|
|
|
|
num = strtol(val, &p, 10);
|
|
|
|
if (*p || num <= 0)
|
|
|
|
errx(1, "illegal maxgroups value -- %s", val);
|
|
|
|
//set_rpc_maxgrouplist(num);
|
2002-09-06 19:59:29 +00:00
|
|
|
}
|
2008-09-13 20:22:46 +00:00
|
|
|
if (pass_flag_to_nmount)
|
|
|
|
build_iovec(&iov, &iovlen, opt, val,
|
|
|
|
strlen(val) + 1);
|
|
|
|
opt = pnextopt;
|
2001-04-10 22:05:47 +00:00
|
|
|
}
|
2002-09-06 19:59:29 +00:00
|
|
|
}
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 'P':
|
2008-09-13 20:22:46 +00:00
|
|
|
/* obsolete for -o noresvport now default */
|
|
|
|
printf("-P deprecated, use -o noresvport\n");
|
|
|
|
build_iovec(&iov, &iovlen, "noresvport", NULL, 0);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 'R':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-R deprecated, use -o retrycnt=<retrycnt>\n");
|
1994-05-26 06:35:07 +00:00
|
|
|
num = strtol(optarg, &p, 10);
|
2001-07-19 21:11:48 +00:00
|
|
|
if (*p || num < 0)
|
1994-05-26 06:35:07 +00:00
|
|
|
errx(1, "illegal -R value -- %s", optarg);
|
|
|
|
retrycnt = num;
|
|
|
|
break;
|
|
|
|
case 'r':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-r deprecated, use -o rsize=<rsize>\n");
|
|
|
|
build_iovec(&iov, &iovlen, "rsize", optarg, (size_t)-1);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 's':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-s deprecated, use -o soft\n");
|
|
|
|
build_iovec(&iov, &iovlen, "soft", NULL, 0);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 'T':
|
1995-06-27 11:07:30 +00:00
|
|
|
nfsproto = IPPROTO_TCP;
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-T deprecated, use -o tcp\n");
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 't':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-t deprecated, use -o timeout=<value>\n");
|
|
|
|
build_iovec(&iov, &iovlen, "timeout", optarg, (size_t)-1);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 'w':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-w deprecated, use -o wsize=<value>\n");
|
|
|
|
build_iovec(&iov, &iovlen, "wsize", optarg, (size_t)-1);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
|
|
|
case 'x':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-x deprecated, use -o retrans=<value>\n");
|
|
|
|
build_iovec(&iov, &iovlen, "retrans", optarg, (size_t)-1);
|
1994-05-26 06:35:07 +00:00
|
|
|
break;
|
1995-06-27 11:07:30 +00:00
|
|
|
case 'U':
|
2008-09-13 20:22:46 +00:00
|
|
|
printf("-U deprecated, use -o mntudp\n");
|
1995-06-27 11:07:30 +00:00
|
|
|
mnttcp_ok = 0;
|
2007-01-23 07:17:10 +00:00
|
|
|
nfsproto = IPPROTO_UDP;
|
2008-09-13 20:22:46 +00:00
|
|
|
build_iovec(&iov, &iovlen, "mntudp", NULL, 0);
|
1995-06-27 11:07:30 +00:00
|
|
|
break;
|
1994-05-26 06:35:07 +00:00
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
argc -= optind;
|
|
|
|
argv += optind;
|
|
|
|
|
1997-03-11 12:40:45 +00:00
|
|
|
if (argc != 2) {
|
1995-01-27 23:24:33 +00:00
|
|
|
usage();
|
1997-03-11 12:40:45 +00:00
|
|
|
/* NOTREACHED */
|
|
|
|
}
|
1994-05-26 06:35:07 +00:00
|
|
|
|
|
|
|
spec = *argv++;
|
|
|
|
name = *argv;
|
|
|
|
|
2001-07-19 21:11:48 +00:00
|
|
|
if (retrycnt == -1)
|
2001-07-21 15:38:37 +00:00
|
|
|
/* The default is to keep retrying forever. */
|
|
|
|
retrycnt = 0;
|
2007-01-23 07:17:10 +00:00
|
|
|
|
|
|
|
if (mountmode == V4) {
|
2008-09-13 20:22:46 +00:00
|
|
|
if (!getnfs4args(spec, &iov, &iovlen))
|
2007-01-23 07:17:10 +00:00
|
|
|
exit(1);
|
|
|
|
} else {
|
2008-09-13 20:22:46 +00:00
|
|
|
if (!getnfsargs(spec, &iov, &iovlen))
|
2007-01-23 07:17:10 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
1994-09-22 22:17:02 +00:00
|
|
|
|
1999-10-09 11:54:14 +00:00
|
|
|
/* resolve the mountpoint with realpath(3) */
|
|
|
|
(void)checkpath(name, mntpath);
|
|
|
|
|
2006-11-29 00:41:44 +00:00
|
|
|
build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1);
|
2006-11-21 01:53:18 +00:00
|
|
|
build_iovec(&iov, &iovlen, "fspath", mntpath, (size_t)-1);
|
2006-11-29 00:46:30 +00:00
|
|
|
build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
|
2006-11-21 01:53:18 +00:00
|
|
|
|
2008-09-19 11:59:10 +00:00
|
|
|
/*
|
|
|
|
* XXX:
|
|
|
|
* Backwards compatibility routines for older kernels.
|
|
|
|
* Remove this and fallback_mount() code when we do not need to support
|
|
|
|
* NFS mounts against older kernels which still need
|
|
|
|
* struct nfs_args to be passed in via nmount().
|
|
|
|
*/
|
|
|
|
osversion = getosreldate();
|
|
|
|
if (osversion >= 800048) {
|
|
|
|
if (nmount(iov, iovlen, mntflags))
|
|
|
|
err(1, "%s, %s", mntpath, errmsg);
|
|
|
|
} else {
|
|
|
|
if (fallback_mount(iov, iovlen, mntflags))
|
2008-09-13 20:22:46 +00:00
|
|
|
err(1, "%s, %s", mntpath, errmsg);
|
|
|
|
}
|
1995-06-27 11:07:30 +00:00
|
|
|
|
1994-05-26 06:35:07 +00:00
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2008-09-13 20:22:46 +00:00
|
|
|
static int
|
|
|
|
findopt(struct iovec *iov, int iovlen, const char *name,
|
|
|
|
char **valuep, int *lenp)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < iovlen/2; i++, iov += 2) {
|
|
|
|
if (strcmp(name, iov[0].iov_base) == 0) {
|
|
|
|
if (valuep)
|
|
|
|
*valuep = iov[1].iov_base;
|
|
|
|
if (lenp)
|
|
|
|
*lenp = iov[1].iov_len;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (ENOENT);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
copyopt(struct iovec **newiov, int *newiovlen,
|
|
|
|
struct iovec *iov, int iovlen, const char *name)
|
|
|
|
{
|
|
|
|
char *value;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if (findopt(iov, iovlen, name, &value, &len) == 0)
|
|
|
|
build_iovec(newiov, newiovlen, name, value, len);
|
|
|
|
}
|
|
|
|
|
1994-05-26 06:35:07 +00:00
|
|
|
int
|
2008-09-13 20:22:46 +00:00
|
|
|
fallback_mount(struct iovec *iov, int iovlen, int mntflags)
|
|
|
|
{
|
|
|
|
struct nfs_args args = {
|
|
|
|
.version = NFS_ARGSVERSION,
|
|
|
|
.addr = NULL,
|
|
|
|
.addrlen = sizeof (struct sockaddr_in),
|
|
|
|
.sotype = SOCK_STREAM,
|
|
|
|
.proto = 0,
|
|
|
|
.fh = NULL,
|
|
|
|
.fhsize = 0,
|
|
|
|
.flags = NFSMNT_RESVPORT,
|
|
|
|
.wsize = NFS_WSIZE,
|
|
|
|
.rsize = NFS_RSIZE,
|
|
|
|
.readdirsize = NFS_READDIRSIZE,
|
|
|
|
.timeo = 10,
|
|
|
|
.retrans = NFS_RETRANS,
|
|
|
|
.maxgrouplist = NFS_MAXGRPS,
|
|
|
|
.readahead = NFS_DEFRAHEAD,
|
|
|
|
.wcommitsize = 0, /* was: NQ_DEFLEASE */
|
|
|
|
.deadthresh = NFS_MAXDEADTHRESH, /* was: NQ_DEADTHRESH */
|
|
|
|
.hostname = NULL,
|
|
|
|
/* args version 4 */
|
|
|
|
.acregmin = NFS_MINATTRTIMO,
|
|
|
|
.acregmax = NFS_MAXATTRTIMO,
|
|
|
|
.acdirmin = NFS_MINDIRATTRTIMO,
|
|
|
|
.acdirmax = NFS_MAXDIRATTRTIMO,
|
|
|
|
};
|
|
|
|
int ret;
|
|
|
|
char *opt;
|
|
|
|
struct iovec *newiov;
|
|
|
|
int newiovlen;
|
|
|
|
|
|
|
|
if (findopt(iov, iovlen, "dumbtimer", NULL, NULL) == 0)
|
|
|
|
args.flags |= NFSMNT_DUMBTIMR;
|
|
|
|
if (findopt(iov, iovlen, "noconn", NULL, NULL) == 0)
|
|
|
|
args.flags |= NFSMNT_NOCONN;
|
|
|
|
if (findopt(iov, iovlen, "conn", NULL, NULL) == 0)
|
|
|
|
args.flags |= NFSMNT_NOCONN;
|
|
|
|
if (findopt(iov, iovlen, "nolockd", NULL, NULL) == 0)
|
|
|
|
args.flags |= NFSMNT_NOLOCKD;
|
|
|
|
if (findopt(iov, iovlen, "lockd", NULL, NULL) == 0)
|
|
|
|
args.flags &= ~NFSMNT_NOLOCKD;
|
|
|
|
if (findopt(iov, iovlen, "intr", NULL, NULL) == 0)
|
|
|
|
args.flags |= NFSMNT_INT;
|
|
|
|
if (findopt(iov, iovlen, "rdirplus", NULL, NULL) == 0)
|
|
|
|
args.flags |= NFSMNT_RDIRPLUS;
|
|
|
|
if (findopt(iov, iovlen, "resvport", NULL, NULL) == 0)
|
|
|
|
args.flags |= NFSMNT_RESVPORT;
|
|
|
|
if (findopt(iov, iovlen, "noresvport", NULL, NULL) == 0)
|
|
|
|
args.flags &= ~NFSMNT_RESVPORT;
|
|
|
|
if (findopt(iov, iovlen, "soft", NULL, NULL) == 0)
|
|
|
|
args.flags |= NFSMNT_SOFT;
|
|
|
|
if (findopt(iov, iovlen, "hard", NULL, NULL) == 0)
|
|
|
|
args.flags &= ~NFSMNT_SOFT;
|
|
|
|
if (findopt(iov, iovlen, "mntudp", NULL, NULL) == 0)
|
|
|
|
args.sotype = SOCK_DGRAM;
|
|
|
|
if (findopt(iov, iovlen, "udp", NULL, NULL) == 0)
|
|
|
|
args.sotype = SOCK_DGRAM;
|
|
|
|
if (findopt(iov, iovlen, "tcp", NULL, NULL) == 0)
|
|
|
|
args.sotype = SOCK_STREAM;
|
|
|
|
if (findopt(iov, iovlen, "nfsv3", NULL, NULL) == 0)
|
|
|
|
args.flags |= NFSMNT_NFSV3;
|
|
|
|
if (findopt(iov, iovlen, "readdirsize", &opt, NULL) == 0) {
|
|
|
|
if (opt == NULL) {
|
|
|
|
errx(1, "illegal readdirsize");
|
|
|
|
}
|
|
|
|
ret = sscanf(opt, "%d", &args.readdirsize);
|
|
|
|
if (ret != 1 || args.readdirsize <= 0) {
|
|
|
|
errx(1, "illegal readdirsize: %s", opt);
|
|
|
|
}
|
|
|
|
args.flags |= NFSMNT_READDIRSIZE;
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "readahead", &opt, NULL) == 0) {
|
|
|
|
if (opt == NULL) {
|
|
|
|
errx(1, "illegal readahead");
|
|
|
|
}
|
|
|
|
ret = sscanf(opt, "%d", &args.readahead);
|
|
|
|
if (ret != 1 || args.readahead <= 0) {
|
|
|
|
errx(1, "illegal readahead: %s", opt);
|
|
|
|
}
|
|
|
|
args.flags |= NFSMNT_READAHEAD;
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "wsize", &opt, NULL) == 0) {
|
|
|
|
if (opt == NULL) {
|
|
|
|
errx(1, "illegal wsize");
|
|
|
|
}
|
|
|
|
ret = sscanf(opt, "%d", &args.wsize);
|
|
|
|
if (ret != 1 || args.wsize <= 0) {
|
|
|
|
errx(1, "illegal wsize: %s", opt);
|
|
|
|
}
|
|
|
|
args.flags |= NFSMNT_WSIZE;
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "rsize", &opt, NULL) == 0) {
|
|
|
|
if (opt == NULL) {
|
|
|
|
errx(1, "illegal rsize");
|
|
|
|
}
|
|
|
|
ret = sscanf(opt, "%d", &args.rsize);
|
|
|
|
if (ret != 1 || args.rsize <= 0) {
|
|
|
|
errx(1, "illegal wsize: %s", opt);
|
|
|
|
}
|
|
|
|
args.flags |= NFSMNT_RSIZE;
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "retrans", &opt, NULL) == 0) {
|
|
|
|
if (opt == NULL) {
|
|
|
|
errx(1, "illegal retrans");
|
|
|
|
}
|
|
|
|
ret = sscanf(opt, "%d", &args.retrans);
|
|
|
|
if (ret != 1 || args.retrans <= 0) {
|
|
|
|
errx(1, "illegal retrans: %s", opt);
|
|
|
|
}
|
|
|
|
args.flags |= NFSMNT_RETRANS;
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "acregmin", &opt, NULL) == 0) {
|
|
|
|
ret = sscanf(opt, "%d", &args.acregmin);
|
|
|
|
if (ret != 1 || args.acregmin <= 0) {
|
|
|
|
errx(1, "illegal acregmin: %s", opt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "acregmax", &opt, NULL) == 0) {
|
|
|
|
ret = sscanf(opt, "%d", &args.acregmax);
|
|
|
|
if (ret != 1 || args.acregmax <= 0) {
|
|
|
|
errx(1, "illegal acregmax: %s", opt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "acdirmin", &opt, NULL) == 0) {
|
|
|
|
ret = sscanf(opt, "%d", &args.acdirmin);
|
|
|
|
if (ret != 1 || args.acdirmin <= 0) {
|
|
|
|
errx(1, "illegal acdirmin: %s", opt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "acdirmax", &opt, NULL) == 0) {
|
|
|
|
ret = sscanf(opt, "%d", &args.acdirmax);
|
|
|
|
if (ret != 1 || args.acdirmax <= 0) {
|
|
|
|
errx(1, "illegal acdirmax: %s", opt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "deadthresh", &opt, NULL) == 0) {
|
|
|
|
ret = sscanf(opt, "%d", &args.deadthresh);
|
|
|
|
if (ret != 1 || args.deadthresh <= 0) {
|
|
|
|
errx(1, "illegal deadthresh: %s", opt);
|
|
|
|
}
|
|
|
|
args.flags |= NFSMNT_DEADTHRESH;
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "timeout", &opt, NULL) == 0) {
|
|
|
|
ret = sscanf(opt, "%d", &args.timeo);
|
|
|
|
if (ret != 1 || args.timeo <= 0) {
|
|
|
|
errx(1, "illegal timeout: %s", opt);
|
|
|
|
}
|
|
|
|
args.flags |= NFSMNT_TIMEO;
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "maxgroups", &opt, NULL) == 0) {
|
|
|
|
ret = sscanf(opt, "%d", &args.maxgrouplist);
|
|
|
|
if (ret != 1 || args.timeo <= 0) {
|
|
|
|
errx(1, "illegal maxgroups: %s", opt);
|
|
|
|
}
|
|
|
|
args.flags |= NFSMNT_MAXGRPS;
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "addr", &opt,
|
|
|
|
&args.addrlen) == 0) {
|
|
|
|
args.addr = (struct sockaddr *) opt;
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "fh", &opt, &args.fhsize) == 0) {
|
|
|
|
args.fh = opt;
|
|
|
|
}
|
|
|
|
if (findopt(iov, iovlen, "hostname", &args.hostname,
|
|
|
|
NULL) == 0) {
|
|
|
|
}
|
|
|
|
if (args.hostname == NULL) {
|
|
|
|
errx(1, "Invalid hostname");
|
|
|
|
}
|
|
|
|
|
|
|
|
newiov = NULL;
|
|
|
|
newiovlen = 0;
|
|
|
|
|
|
|
|
build_iovec(&newiov, &newiovlen, "nfs_args", &args, sizeof(args));
|
|
|
|
copyopt(&newiov, &newiovlen, iov, iovlen, "fstype");
|
|
|
|
copyopt(&newiov, &newiovlen, iov, iovlen, "fspath");
|
|
|
|
copyopt(&newiov, &newiovlen, iov, iovlen, "errmsg");
|
|
|
|
|
|
|
|
return nmount(newiov, newiovlen, mntflags);
|
|
|
|
}
|
|
|
|
|
Implement support for RPCSEC_GSS authentication to both the NFS client
and server. This replaces the RPC implementation of the NFS client and
server with the newer RPC implementation originally developed
(actually ported from the userland sunrpc code) to support the NFS
Lock Manager. I have tested this code extensively and I believe it is
stable and that performance is at least equal to the legacy RPC
implementation.
The NFS code currently contains support for both the new RPC
implementation and the older legacy implementation inherited from the
original NFS codebase. The default is to use the new implementation -
add the NFS_LEGACYRPC option to fall back to the old code. When I
merge this support back to RELENG_7, I will probably change this so
that users have to 'opt in' to get the new code.
To use RPCSEC_GSS on either client or server, you must build a kernel
which includes the KGSSAPI option and the crypto device. On the
userland side, you must build at least a new libc, mountd, mount_nfs
and gssd. You must install new versions of /etc/rc.d/gssd and
/etc/rc.d/nfsd and add 'gssd_enable=YES' to /etc/rc.conf.
As long as gssd is running, you should be able to mount an NFS
filesystem from a server that requires RPCSEC_GSS authentication. The
mount itself can happen without any kerberos credentials but all
access to the filesystem will be denied unless the accessing user has
a valid ticket file in the standard place (/tmp/krb5cc_<uid>). There
is currently no support for situations where the ticket file is in a
different place, such as when the user logged in via SSH and has
delegated credentials from that login. This restriction is also
present in Solaris and Linux. In theory, we could improve this in
future, possibly using Brooks Davis' implementation of variant
symlinks.
Supporting RPCSEC_GSS on a server is nearly as simple. You must create
service creds for the server in the form 'nfs/<fqdn>@<REALM>' and
install them in /etc/krb5.keytab. The standard heimdal utility ktutil
makes this fairly easy. After the service creds have been created, you
can add a '-sec=krb5' option to /etc/exports and restart both mountd
and nfsd.
The only other difference an administrator should notice is that nfsd
doesn't fork to create service threads any more. In normal operation,
there will be two nfsd processes, one in userland waiting for TCP
connections and one in the kernel handling requests. The latter
process will create as many kthreads as required - these should be
visible via 'top -H'. The code has some support for varying the number
of service threads according to load but initially at least, nfsd uses
a fixed number of threads according to the value supplied to its '-n'
option.
Sponsored by: Isilon Systems
MFC after: 1 month
2008-11-03 10:38:00 +00:00
|
|
|
int
|
|
|
|
sec_name_to_num(char *sec)
|
|
|
|
{
|
|
|
|
if (!strcmp(sec, "krb5"))
|
|
|
|
return (RPCSEC_GSS_KRB5);
|
|
|
|
if (!strcmp(sec, "krb5i"))
|
|
|
|
return (RPCSEC_GSS_KRB5I);
|
|
|
|
if (!strcmp(sec, "krb5p"))
|
|
|
|
return (RPCSEC_GSS_KRB5P);
|
|
|
|
if (!strcmp(sec, "sys"))
|
|
|
|
return (AUTH_SYS);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
sec_num_to_name(int flavor)
|
|
|
|
{
|
|
|
|
switch (flavor) {
|
|
|
|
case RPCSEC_GSS_KRB5:
|
|
|
|
return ("krb5");
|
|
|
|
case RPCSEC_GSS_KRB5I:
|
|
|
|
return ("krb5i");
|
|
|
|
case RPCSEC_GSS_KRB5P:
|
|
|
|
return ("krb5p");
|
|
|
|
case AUTH_SYS:
|
|
|
|
return ("sys");
|
|
|
|
}
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
2008-09-13 20:22:46 +00:00
|
|
|
int
|
|
|
|
getnfsargs(char *spec, struct iovec **iov, int *iovlen)
|
1994-05-26 06:35:07 +00:00
|
|
|
{
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
struct addrinfo hints, *ai_nfs, *ai;
|
2001-04-10 22:05:47 +00:00
|
|
|
enum tryret ret;
|
|
|
|
int ecode, speclen, remoteerr;
|
|
|
|
char *hostp, *delimp, *errstr;
|
1999-10-30 17:56:47 +00:00
|
|
|
size_t len;
|
1994-05-26 06:35:07 +00:00
|
|
|
static char nam[MNAMELEN + 1];
|
|
|
|
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
if ((delimp = strrchr(spec, ':')) != NULL) {
|
1994-05-26 06:35:07 +00:00
|
|
|
hostp = spec;
|
|
|
|
spec = delimp + 1;
|
1999-10-09 11:54:14 +00:00
|
|
|
} else if ((delimp = strrchr(spec, '@')) != NULL) {
|
|
|
|
warnx("path@server syntax is deprecated, use server:path");
|
|
|
|
hostp = delimp + 1;
|
1994-05-26 06:35:07 +00:00
|
|
|
} else {
|
1999-10-09 11:54:14 +00:00
|
|
|
warnx("no <host>:<dirpath> nfs-name");
|
1994-05-26 06:35:07 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
*delimp = '\0';
|
1999-10-09 11:54:14 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If there has been a trailing slash at mounttime it seems
|
|
|
|
* that some mountd implementations fail to remove the mount
|
|
|
|
* entries from their mountlist while unmounting.
|
|
|
|
*/
|
1999-10-30 17:56:47 +00:00
|
|
|
for (speclen = strlen(spec);
|
|
|
|
speclen > 1 && spec[speclen - 1] == '/';
|
|
|
|
speclen--)
|
1999-10-09 11:54:14 +00:00
|
|
|
spec[speclen - 1] = '\0';
|
|
|
|
if (strlen(hostp) + strlen(spec) + 1 > MNAMELEN) {
|
|
|
|
warnx("%s:%s: %s", hostp, spec, strerror(ENAMETOOLONG));
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
/* Make both '@' and ':' notations equal */
|
1999-10-30 17:56:47 +00:00
|
|
|
if (*hostp != '\0') {
|
|
|
|
len = strlen(hostp);
|
|
|
|
memmove(nam, hostp, len);
|
|
|
|
nam[len] = ':';
|
|
|
|
memmove(nam + len + 1, spec, speclen);
|
|
|
|
nam[len + speclen + 1] = '\0';
|
|
|
|
}
|
1994-05-26 06:35:07 +00:00
|
|
|
|
|
|
|
/*
|
2001-09-18 23:34:44 +00:00
|
|
|
* Handle an internet host address.
|
1994-05-26 06:35:07 +00:00
|
|
|
*/
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
memset(&hints, 0, sizeof hints);
|
|
|
|
hints.ai_flags = AI_NUMERICHOST;
|
2008-09-13 20:22:46 +00:00
|
|
|
if (nfsproto == IPPROTO_TCP)
|
|
|
|
hints.ai_socktype = SOCK_STREAM;
|
|
|
|
else if (nfsproto == IPPROTO_UDP)
|
|
|
|
hints.ai_socktype = SOCK_DGRAM;
|
|
|
|
|
2001-09-18 23:34:44 +00:00
|
|
|
if (getaddrinfo(hostp, portspec, &hints, &ai_nfs) != 0) {
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
hints.ai_flags = 0;
|
2001-04-10 22:05:47 +00:00
|
|
|
if ((ecode = getaddrinfo(hostp, portspec, &hints, &ai_nfs))
|
|
|
|
!= 0) {
|
|
|
|
if (portspec == NULL)
|
|
|
|
errx(1, "%s: %s", hostp, gai_strerror(ecode));
|
|
|
|
else
|
|
|
|
errx(1, "%s:%s: %s", hostp, portspec,
|
|
|
|
gai_strerror(ecode));
|
1994-05-26 06:35:07 +00:00
|
|
|
return (0);
|
|
|
|
}
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
}
|
1994-05-26 06:35:07 +00:00
|
|
|
|
2001-04-10 22:05:47 +00:00
|
|
|
ret = TRYRET_LOCALERR;
|
2001-07-19 21:11:48 +00:00
|
|
|
for (;;) {
|
2001-04-10 22:05:47 +00:00
|
|
|
/*
|
|
|
|
* Try each entry returned by getaddrinfo(). Note the
|
|
|
|
* occurence of remote errors by setting `remoteerr'.
|
|
|
|
*/
|
|
|
|
remoteerr = 0;
|
|
|
|
for (ai = ai_nfs; ai != NULL; ai = ai->ai_next) {
|
2003-03-25 01:25:30 +00:00
|
|
|
if ((ai->ai_family == AF_INET6) &&
|
|
|
|
(opflags & OF_NOINET6))
|
|
|
|
continue;
|
|
|
|
if ((ai->ai_family == AF_INET) &&
|
|
|
|
(opflags & OF_NOINET4))
|
|
|
|
continue;
|
2008-09-13 20:22:46 +00:00
|
|
|
ret = nfs_tryproto(ai, hostp, spec, &errstr, iov,
|
|
|
|
iovlen);
|
2001-04-10 22:05:47 +00:00
|
|
|
if (ret == TRYRET_SUCCESS)
|
|
|
|
break;
|
|
|
|
if (ret != TRYRET_LOCALERR)
|
|
|
|
remoteerr = 1;
|
|
|
|
if ((opflags & ISBGRND) == 0)
|
|
|
|
fprintf(stderr, "%s\n", errstr);
|
|
|
|
}
|
|
|
|
if (ret == TRYRET_SUCCESS)
|
|
|
|
break;
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
|
2001-07-19 21:11:48 +00:00
|
|
|
/* Exit if all errors were local. */
|
|
|
|
if (!remoteerr)
|
2001-04-10 22:05:47 +00:00
|
|
|
exit(1);
|
|
|
|
|
2001-07-19 21:11:48 +00:00
|
|
|
/*
|
|
|
|
* If retrycnt == 0, we are to keep retrying forever.
|
|
|
|
* Otherwise decrement it, and exit if it hits zero.
|
|
|
|
*/
|
|
|
|
if (retrycnt != 0 && --retrycnt == 0)
|
2001-04-10 22:05:47 +00:00
|
|
|
exit(1);
|
|
|
|
|
|
|
|
if ((opflags & (BGRND | ISBGRND)) == BGRND) {
|
|
|
|
warnx("Cannot immediately mount %s:%s, backgrounding",
|
|
|
|
hostp, spec);
|
|
|
|
opflags |= ISBGRND;
|
|
|
|
if (daemon(0, 0) != 0)
|
|
|
|
err(1, "daemon");
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
}
|
2001-04-10 22:05:47 +00:00
|
|
|
sleep(60);
|
|
|
|
}
|
|
|
|
freeaddrinfo(ai_nfs);
|
2008-09-13 20:22:46 +00:00
|
|
|
|
|
|
|
build_iovec(iov, iovlen, "hostname", nam, (size_t)-1);
|
2002-08-21 18:11:48 +00:00
|
|
|
/* Add mounted file system to PATH_MOUNTTAB */
|
2001-04-10 22:05:47 +00:00
|
|
|
if (!add_mtab(hostp, spec))
|
|
|
|
warnx("can't update %s for %s:%s", PATH_MOUNTTAB, hostp, spec);
|
|
|
|
return (1);
|
|
|
|
}
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
|
2007-01-23 07:17:10 +00:00
|
|
|
|
|
|
|
int
|
2008-09-13 20:22:46 +00:00
|
|
|
getnfs4args(char *spec, struct iovec **iov, int *iovlen)
|
2007-01-23 07:17:10 +00:00
|
|
|
{
|
|
|
|
struct addrinfo hints, *ai_nfs, *ai;
|
|
|
|
enum tryret ret;
|
2008-09-13 20:22:46 +00:00
|
|
|
int ecode, speclen, remoteerr, sotype;
|
2007-01-23 07:17:10 +00:00
|
|
|
char *hostp, *delimp, *errstr;
|
|
|
|
size_t len;
|
|
|
|
static char nam[MNAMELEN + 1];
|
|
|
|
|
2008-09-13 20:22:46 +00:00
|
|
|
if (nfsproto == IPPROTO_TCP)
|
|
|
|
sotype = SOCK_STREAM;
|
|
|
|
else if (nfsproto == IPPROTO_UDP)
|
|
|
|
sotype = SOCK_DGRAM;
|
|
|
|
|
|
|
|
|
2007-01-23 07:17:10 +00:00
|
|
|
if ((delimp = strrchr(spec, ':')) != NULL) {
|
|
|
|
hostp = spec;
|
|
|
|
spec = delimp + 1;
|
|
|
|
} else if ((delimp = strrchr(spec, '@')) != NULL) {
|
|
|
|
warnx("path@server syntax is deprecated, use server:path");
|
|
|
|
hostp = delimp + 1;
|
|
|
|
} else {
|
|
|
|
warnx("no <host>:<dirpath> nfs-name");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
*delimp = '\0';
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If there has been a trailing slash at mounttime it seems
|
|
|
|
* that some mountd implementations fail to remove the mount
|
|
|
|
* entries from their mountlist while unmounting.
|
|
|
|
*/
|
|
|
|
for (speclen = strlen(spec);
|
|
|
|
speclen > 1 && spec[speclen - 1] == '/';
|
|
|
|
speclen--)
|
|
|
|
spec[speclen - 1] = '\0';
|
|
|
|
if (strlen(hostp) + strlen(spec) + 1 > MNAMELEN) {
|
|
|
|
warnx("%s:%s: %s", hostp, spec, strerror(ENAMETOOLONG));
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
/* Make both '@' and ':' notations equal */
|
|
|
|
if (*hostp != '\0') {
|
|
|
|
len = strlen(hostp);
|
|
|
|
memmove(nam, hostp, len);
|
|
|
|
nam[len] = ':';
|
|
|
|
memmove(nam + len + 1, spec, speclen);
|
|
|
|
nam[len + speclen + 1] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle an internet host address.
|
|
|
|
*/
|
|
|
|
memset(&hints, 0, sizeof hints);
|
|
|
|
hints.ai_flags = AI_NUMERICHOST;
|
2008-09-13 20:22:46 +00:00
|
|
|
hints.ai_socktype = sotype;
|
2007-01-23 07:17:10 +00:00
|
|
|
if (getaddrinfo(hostp, portspec, &hints, &ai_nfs) != 0) {
|
|
|
|
hints.ai_flags = 0;
|
|
|
|
if ((ecode = getaddrinfo(hostp, portspec, &hints, &ai_nfs))
|
|
|
|
!= 0) {
|
|
|
|
if (portspec == NULL)
|
|
|
|
errx(1, "%s: %s", hostp, gai_strerror(ecode));
|
|
|
|
else
|
|
|
|
errx(1, "%s:%s: %s", hostp, portspec,
|
|
|
|
gai_strerror(ecode));
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = TRYRET_LOCALERR;
|
|
|
|
for (;;) {
|
|
|
|
/*
|
|
|
|
* Try each entry returned by getaddrinfo(). Note the
|
|
|
|
* occurence of remote errors by setting `remoteerr'.
|
|
|
|
*/
|
|
|
|
remoteerr = 0;
|
|
|
|
for (ai = ai_nfs; ai != NULL; ai = ai->ai_next) {
|
|
|
|
if ((ai->ai_family == AF_INET6) &&
|
|
|
|
(opflags & OF_NOINET6))
|
|
|
|
continue;
|
|
|
|
if ((ai->ai_family == AF_INET) &&
|
|
|
|
(opflags & OF_NOINET4))
|
|
|
|
continue;
|
2008-09-13 20:22:46 +00:00
|
|
|
ret = nfs4_tryproto(ai, hostp, spec, &errstr);
|
2007-01-23 07:17:10 +00:00
|
|
|
if (ret == TRYRET_SUCCESS)
|
|
|
|
break;
|
|
|
|
if (ret != TRYRET_LOCALERR)
|
|
|
|
remoteerr = 1;
|
|
|
|
if ((opflags & ISBGRND) == 0)
|
|
|
|
fprintf(stderr, "%s\n", errstr);
|
|
|
|
}
|
|
|
|
if (ret == TRYRET_SUCCESS)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Exit if all errors were local. */
|
|
|
|
if (!remoteerr)
|
|
|
|
exit(1);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If retrycnt == 0, we are to keep retrying forever.
|
|
|
|
* Otherwise decrement it, and exit if it hits zero.
|
|
|
|
*/
|
|
|
|
if (retrycnt != 0 && --retrycnt == 0)
|
|
|
|
exit(1);
|
|
|
|
|
|
|
|
if ((opflags & (BGRND | ISBGRND)) == BGRND) {
|
|
|
|
warnx("Cannot immediately mount %s:%s, backgrounding",
|
|
|
|
hostp, spec);
|
|
|
|
opflags |= ISBGRND;
|
|
|
|
if (daemon(0, 0) != 0)
|
|
|
|
err(1, "daemon");
|
|
|
|
}
|
|
|
|
sleep(60);
|
|
|
|
}
|
|
|
|
freeaddrinfo(ai_nfs);
|
2008-09-13 20:22:46 +00:00
|
|
|
build_iovec(iov, iovlen, "hostname", nam, (size_t)-1);
|
2007-01-23 07:17:10 +00:00
|
|
|
/* Add mounted file system to PATH_MOUNTTAB */
|
|
|
|
if (!add_mtab(hostp, spec))
|
|
|
|
warnx("can't update %s for %s:%s", PATH_MOUNTTAB, hostp, spec);
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
2001-04-10 22:05:47 +00:00
|
|
|
/*
|
|
|
|
* Try to set up the NFS arguments according to the address
|
|
|
|
* family, protocol (and possibly port) specified in `ai'.
|
|
|
|
*
|
|
|
|
* Returns TRYRET_SUCCESS if successful, or:
|
|
|
|
* TRYRET_TIMEOUT The server did not respond.
|
|
|
|
* TRYRET_REMOTEERR The server reported an error.
|
|
|
|
* TRYRET_LOCALERR Local failure.
|
|
|
|
*
|
|
|
|
* In all error cases, *errstr will be set to a statically-allocated string
|
|
|
|
* describing the error.
|
|
|
|
*/
|
|
|
|
enum tryret
|
2008-09-13 20:22:46 +00:00
|
|
|
nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec, char **errstr,
|
|
|
|
struct iovec **iov, int *iovlen)
|
2001-04-10 22:05:47 +00:00
|
|
|
{
|
|
|
|
static char errbuf[256];
|
|
|
|
struct sockaddr_storage nfs_ss;
|
|
|
|
struct netbuf nfs_nb;
|
|
|
|
struct nfhret nfhret;
|
|
|
|
struct timeval try;
|
|
|
|
struct rpc_err rpcerr;
|
|
|
|
CLIENT *clp;
|
|
|
|
struct netconfig *nconf, *nconf_mnt;
|
2008-09-13 20:22:46 +00:00
|
|
|
const char *netid, *netid_mnt;
|
Implement support for RPCSEC_GSS authentication to both the NFS client
and server. This replaces the RPC implementation of the NFS client and
server with the newer RPC implementation originally developed
(actually ported from the userland sunrpc code) to support the NFS
Lock Manager. I have tested this code extensively and I believe it is
stable and that performance is at least equal to the legacy RPC
implementation.
The NFS code currently contains support for both the new RPC
implementation and the older legacy implementation inherited from the
original NFS codebase. The default is to use the new implementation -
add the NFS_LEGACYRPC option to fall back to the old code. When I
merge this support back to RELENG_7, I will probably change this so
that users have to 'opt in' to get the new code.
To use RPCSEC_GSS on either client or server, you must build a kernel
which includes the KGSSAPI option and the crypto device. On the
userland side, you must build at least a new libc, mountd, mount_nfs
and gssd. You must install new versions of /etc/rc.d/gssd and
/etc/rc.d/nfsd and add 'gssd_enable=YES' to /etc/rc.conf.
As long as gssd is running, you should be able to mount an NFS
filesystem from a server that requires RPCSEC_GSS authentication. The
mount itself can happen without any kerberos credentials but all
access to the filesystem will be denied unless the accessing user has
a valid ticket file in the standard place (/tmp/krb5cc_<uid>). There
is currently no support for situations where the ticket file is in a
different place, such as when the user logged in via SSH and has
delegated credentials from that login. This restriction is also
present in Solaris and Linux. In theory, we could improve this in
future, possibly using Brooks Davis' implementation of variant
symlinks.
Supporting RPCSEC_GSS on a server is nearly as simple. You must create
service creds for the server in the form 'nfs/<fqdn>@<REALM>' and
install them in /etc/krb5.keytab. The standard heimdal utility ktutil
makes this fairly easy. After the service creds have been created, you
can add a '-sec=krb5' option to /etc/exports and restart both mountd
and nfsd.
The only other difference an administrator should notice is that nfsd
doesn't fork to create service threads any more. In normal operation,
there will be two nfsd processes, one in userland waiting for TCP
connections and one in the kernel handling requests. The latter
process will create as many kthreads as required - these should be
visible via 'top -H'. The code has some support for varying the number
of service threads according to load but initially at least, nfsd uses
a fixed number of threads according to the value supplied to its '-n'
option.
Sponsored by: Isilon Systems
MFC after: 1 month
2008-11-03 10:38:00 +00:00
|
|
|
char *secname;
|
2008-09-13 20:22:46 +00:00
|
|
|
int doconnect, nfsvers, mntvers, sotype;
|
2001-04-10 22:05:47 +00:00
|
|
|
enum clnt_stat stat;
|
|
|
|
enum mountmode trymntmode;
|
Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and
associated changes that had to happen to make this possible as well as
bugs fixed along the way.
Bring in required TLI library routines to support this.
Since we don't support TLI we've essentially copied what NetBSD
has done, adding a thin layer to emulate direct the TLI calls
into BSD socket calls.
This is mostly from Sun's tirpc release that was made in 1994,
however some fixes were backported from the 1999 release (supposedly
only made available after this porting effort was underway).
The submitter has agreed to continue on and bring us up to the
1999 release.
Several key features are introduced with this update:
Client calls are thread safe. (1999 code has server side thread
safe)
Updated, a more modern interface.
Many userland updates were done to bring the code up to par with
the recent RPC API.
There is an update to the pthreads library, a function
pthread_main_np() was added to emulate a function of Sun's threads
library.
While we're at it, bring in NetBSD's lockd, it's been far too
long of a wait.
New rpcbind(8) replaces portmap(8) (supporting communication over
an authenticated Unix-domain socket, and by default only allowing
set and unset requests over that channel). It's much more secure
than the old portmapper.
Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
to support TI-RPC and to support IPV6.
Umount(8) is also fixed to unmount pathnames longer than 80 chars,
which are currently truncated by the Kernel statfs structure.
Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul
2001-03-19 12:50:13 +00:00
|
|
|
|
2001-04-10 22:05:47 +00:00
|
|
|
trymntmode = mountmode;
|
|
|
|
errbuf[0] = '\0';
|
|
|
|
*errstr = errbuf;
|
|
|
|
|
2008-09-13 20:22:46 +00:00
|
|
|
if (nfsproto == IPPROTO_TCP)
|
|
|
|
sotype = SOCK_STREAM;
|
|
|
|
else if (nfsproto == IPPROTO_UDP)
|
|
|
|
sotype = SOCK_DGRAM;
|
|
|
|
|
|
|
|
if ((netid = netidbytype(ai->ai_family, sotype)) == NULL) {
|
2001-05-13 00:07:03 +00:00
|
|
|
snprintf(errbuf, sizeof errbuf,
|
2008-09-13 20:22:46 +00:00
|
|
|
"af %d sotype %d not supported", ai->ai_family, sotype);
|
2001-05-13 00:07:03 +00:00
|
|
|
return (TRYRET_LOCALERR);
|
|
|
|
}
|
|
|
|
if ((nconf = getnetconf_cached(netid)) == NULL) {
|
2001-04-10 22:05:47 +00:00
|
|
|
snprintf(errbuf, sizeof errbuf, "%s: %s", netid, nc_sperror());
|
|
|
|
return (TRYRET_LOCALERR);
|
|
|
|
}
|
|
|
|
/* The RPCPROG_MNT netid may be different. */
|
|
|
|
if (mnttcp_ok) {
|
2001-04-11 00:21:16 +00:00
|
|
|
netid_mnt = netid;
|
2001-04-10 22:05:47 +00:00
|
|
|
nconf_mnt = nconf;
|
|
|
|
} else {
|
2001-05-13 00:07:03 +00:00
|
|
|
if ((netid_mnt = netidbytype(ai->ai_family, SOCK_DGRAM))
|
|
|
|
== NULL) {
|
|
|
|
snprintf(errbuf, sizeof errbuf,
|
|
|
|
"af %d sotype SOCK_DGRAM not supported",
|
|
|
|
ai->ai_family);
|
|
|
|
return (TRYRET_LOCALERR);
|
|
|
|
}
|
|
|
|
if ((nconf_mnt = getnetconf_cached(netid_mnt)) == NULL) {
|
2001-04-11 00:21:16 +00:00
|
|
|
snprintf(errbuf, sizeof errbuf, "%s: %s", netid_mnt,
|
2001-04-10 22:05:47 +00:00
|
|
|
nc_sperror());
|
|
|
|
return (TRYRET_LOCALERR);
|
2001-03-31 20:45:21 +00:00
|
|
|
}
|
2001-04-10 22:05:47 +00:00
|
|
|
}
|
2001-04-11 00:21:16 +00:00
|
|
|
|
2001-04-10 22:05:47 +00:00
|
|
|
tryagain:
|
|
|
|
if (trymntmode == V2) {
|
|
|
|
nfsvers = 2;
|
|
|
|
mntvers = 1;
|
|
|
|
} else {
|
|
|
|
nfsvers = 3;
|
|
|
|
mntvers = 3;
|
|
|
|
}
|
2001-03-31 20:45:21 +00:00
|
|
|
|
2001-04-10 22:05:47 +00:00
|
|
|
if (portspec != NULL) {
|
|
|
|
/* `ai' contains the complete nfsd sockaddr. */
|
|
|
|
nfs_nb.buf = ai->ai_addr;
|
|
|
|
nfs_nb.len = nfs_nb.maxlen = ai->ai_addrlen;
|
|
|
|
} else {
|
|
|
|
/* Ask the remote rpcbind. */
|
|
|
|
nfs_nb.buf = &nfs_ss;
|
|
|
|
nfs_nb.len = nfs_nb.maxlen = sizeof nfs_ss;
|
|
|
|
|
|
|
|
if (!rpcb_getaddr(RPCPROG_NFS, nfsvers, nconf, &nfs_nb,
|
|
|
|
hostp)) {
|
|
|
|
if (rpc_createerr.cf_stat == RPC_PROGVERSMISMATCH &&
|
|
|
|
trymntmode == ANY) {
|
|
|
|
trymntmode = V2;
|
|
|
|
goto tryagain;
|
1994-05-26 06:35:07 +00:00
|
|
|
}
|
2001-04-10 22:05:47 +00:00
|
|
|
snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s",
|
|
|
|
netid, hostp, spec,
|
|
|
|
clnt_spcreateerror("RPCPROG_NFS"));
|
|
|
|
return (returncode(rpc_createerr.cf_stat,
|
|
|
|
&rpc_createerr.cf_error));
|
2001-03-31 20:45:21 +00:00
|
|
|
}
|
2001-04-10 22:05:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check that the server (nfsd) responds on the port we have chosen. */
|
|
|
|
clp = clnt_tli_create(RPC_ANYFD, nconf, &nfs_nb, RPCPROG_NFS, nfsvers,
|
|
|
|
0, 0);
|
|
|
|
if (clp == NULL) {
|
|
|
|
snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s", netid,
|
|
|
|
hostp, spec, clnt_spcreateerror("nfsd: RPCPROG_NFS"));
|
|
|
|
return (returncode(rpc_createerr.cf_stat,
|
|
|
|
&rpc_createerr.cf_error));
|
|
|
|
}
|
2008-09-13 20:22:46 +00:00
|
|
|
if (sotype == SOCK_DGRAM && noconn == 0) {
|
2001-06-23 19:57:20 +00:00
|
|
|
/*
|
|
|
|
* Use connect(), to match what the kernel does. This
|
|
|
|
* catches cases where the server responds from the
|
|
|
|
* wrong source address.
|
|
|
|
*/
|
|
|
|
doconnect = 1;
|
|
|
|
if (!clnt_control(clp, CLSET_CONNECT, (char *)&doconnect)) {
|
|
|
|
clnt_destroy(clp);
|
|
|
|
snprintf(errbuf, sizeof errbuf,
|
|
|
|
"[%s] %s:%s: CLSET_CONNECT failed", netid, hostp,
|
|
|
|
spec);
|
|
|
|
return (TRYRET_LOCALERR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-04-10 22:05:47 +00:00
|
|
|
try.tv_sec = 10;
|
|
|
|
try.tv_usec = 0;
|
2003-03-25 00:16:41 +00:00
|
|
|
stat = clnt_call(clp, NFSPROC_NULL, (xdrproc_t)xdr_void, NULL,
|
|
|
|
(xdrproc_t)xdr_void, NULL,
|
2001-04-10 22:05:47 +00:00
|
|
|
try);
|
|
|
|
if (stat != RPC_SUCCESS) {
|
|
|
|
if (stat == RPC_PROGVERSMISMATCH && trymntmode == ANY) {
|
|
|
|
clnt_destroy(clp);
|
|
|
|
trymntmode = V2;
|
|
|
|
goto tryagain;
|
1994-05-26 06:35:07 +00:00
|
|
|
}
|
2001-04-10 22:05:47 +00:00
|
|
|
clnt_geterr(clp, &rpcerr);
|
|
|
|
snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s", netid,
|
|
|
|
hostp, spec, clnt_sperror(clp, "NFSPROC_NULL"));
|
|
|
|
clnt_destroy(clp);
|
|
|
|
return (returncode(stat, &rpcerr));
|
1994-05-26 06:35:07 +00:00
|
|
|
}
|
2001-04-10 22:05:47 +00:00
|
|
|
clnt_destroy(clp);
|
|
|
|
|
|
|
|
/* Send the RPCMNT_MOUNT RPC to get the root filehandle. */
|
|
|
|
try.tv_sec = 10;
|
|
|
|
try.tv_usec = 0;
|
|
|
|
clp = clnt_tp_create(hostp, RPCPROG_MNT, mntvers, nconf_mnt);
|
|
|
|
if (clp == NULL) {
|
2001-04-11 00:21:16 +00:00
|
|
|
snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s", netid_mnt,
|
2001-04-10 22:05:47 +00:00
|
|
|
hostp, spec, clnt_spcreateerror("RPCMNT: clnt_create"));
|
|
|
|
return (returncode(rpc_createerr.cf_stat,
|
|
|
|
&rpc_createerr.cf_error));
|
1994-05-26 06:35:07 +00:00
|
|
|
}
|
2001-04-10 22:05:47 +00:00
|
|
|
clp->cl_auth = authsys_create_default();
|
Implement support for RPCSEC_GSS authentication to both the NFS client
and server. This replaces the RPC implementation of the NFS client and
server with the newer RPC implementation originally developed
(actually ported from the userland sunrpc code) to support the NFS
Lock Manager. I have tested this code extensively and I believe it is
stable and that performance is at least equal to the legacy RPC
implementation.
The NFS code currently contains support for both the new RPC
implementation and the older legacy implementation inherited from the
original NFS codebase. The default is to use the new implementation -
add the NFS_LEGACYRPC option to fall back to the old code. When I
merge this support back to RELENG_7, I will probably change this so
that users have to 'opt in' to get the new code.
To use RPCSEC_GSS on either client or server, you must build a kernel
which includes the KGSSAPI option and the crypto device. On the
userland side, you must build at least a new libc, mountd, mount_nfs
and gssd. You must install new versions of /etc/rc.d/gssd and
/etc/rc.d/nfsd and add 'gssd_enable=YES' to /etc/rc.conf.
As long as gssd is running, you should be able to mount an NFS
filesystem from a server that requires RPCSEC_GSS authentication. The
mount itself can happen without any kerberos credentials but all
access to the filesystem will be denied unless the accessing user has
a valid ticket file in the standard place (/tmp/krb5cc_<uid>). There
is currently no support for situations where the ticket file is in a
different place, such as when the user logged in via SSH and has
delegated credentials from that login. This restriction is also
present in Solaris and Linux. In theory, we could improve this in
future, possibly using Brooks Davis' implementation of variant
symlinks.
Supporting RPCSEC_GSS on a server is nearly as simple. You must create
service creds for the server in the form 'nfs/<fqdn>@<REALM>' and
install them in /etc/krb5.keytab. The standard heimdal utility ktutil
makes this fairly easy. After the service creds have been created, you
can add a '-sec=krb5' option to /etc/exports and restart both mountd
and nfsd.
The only other difference an administrator should notice is that nfsd
doesn't fork to create service threads any more. In normal operation,
there will be two nfsd processes, one in userland waiting for TCP
connections and one in the kernel handling requests. The latter
process will create as many kthreads as required - these should be
visible via 'top -H'. The code has some support for varying the number
of service threads according to load but initially at least, nfsd uses
a fixed number of threads according to the value supplied to its '-n'
option.
Sponsored by: Isilon Systems
MFC after: 1 month
2008-11-03 10:38:00 +00:00
|
|
|
nfhret.auth = secflavor;
|
2001-04-10 22:05:47 +00:00
|
|
|
nfhret.vers = mntvers;
|
2003-03-25 00:16:41 +00:00
|
|
|
stat = clnt_call(clp, RPCMNT_MOUNT, (xdrproc_t)xdr_dir, spec,
|
|
|
|
(xdrproc_t)xdr_fh, &nfhret,
|
2001-04-10 22:05:47 +00:00
|
|
|
try);
|
|
|
|
auth_destroy(clp->cl_auth);
|
|
|
|
if (stat != RPC_SUCCESS) {
|
|
|
|
if (stat == RPC_PROGVERSMISMATCH && trymntmode == ANY) {
|
|
|
|
clnt_destroy(clp);
|
|
|
|
trymntmode = V2;
|
|
|
|
goto tryagain;
|
|
|
|
}
|
|
|
|
clnt_geterr(clp, &rpcerr);
|
2001-04-11 00:21:16 +00:00
|
|
|
snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s", netid_mnt,
|
2001-04-10 22:05:47 +00:00
|
|
|
hostp, spec, clnt_sperror(clp, "RPCPROG_MNT"));
|
|
|
|
clnt_destroy(clp);
|
|
|
|
return (returncode(stat, &rpcerr));
|
1994-05-26 06:35:07 +00:00
|
|
|
}
|
2001-04-10 22:05:47 +00:00
|
|
|
clnt_destroy(clp);
|
|
|
|
|
|
|
|
if (nfhret.stat != 0) {
|
2001-04-11 00:21:16 +00:00
|
|
|
snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s", netid_mnt,
|
2001-04-10 22:05:47 +00:00
|
|
|
hostp, spec, strerror(nfhret.stat));
|
|
|
|
return (TRYRET_REMOTEERR);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Store the filehandle and server address in nfsargsp, making
|
|
|
|
* sure to copy any locally allocated structures.
|
|
|
|
*/
|
2008-09-13 20:22:46 +00:00
|
|
|
addrlen = nfs_nb.len;
|
|
|
|
addr = malloc(addrlen);
|
|
|
|
fhsize = nfhret.fhsize;
|
|
|
|
fh = malloc(fhsize);
|
|
|
|
if (addr == NULL || fh == NULL)
|
2001-04-10 22:05:47 +00:00
|
|
|
err(1, "malloc");
|
2008-09-13 20:22:46 +00:00
|
|
|
bcopy(nfs_nb.buf, addr, addrlen);
|
|
|
|
bcopy(nfhret.nfh, fh, fhsize);
|
2001-04-10 22:05:47 +00:00
|
|
|
|
2008-09-13 20:22:46 +00:00
|
|
|
build_iovec(iov, iovlen, "addr", addr, addrlen);
|
|
|
|
build_iovec(iov, iovlen, "fh", fh, fhsize);
|
Implement support for RPCSEC_GSS authentication to both the NFS client
and server. This replaces the RPC implementation of the NFS client and
server with the newer RPC implementation originally developed
(actually ported from the userland sunrpc code) to support the NFS
Lock Manager. I have tested this code extensively and I believe it is
stable and that performance is at least equal to the legacy RPC
implementation.
The NFS code currently contains support for both the new RPC
implementation and the older legacy implementation inherited from the
original NFS codebase. The default is to use the new implementation -
add the NFS_LEGACYRPC option to fall back to the old code. When I
merge this support back to RELENG_7, I will probably change this so
that users have to 'opt in' to get the new code.
To use RPCSEC_GSS on either client or server, you must build a kernel
which includes the KGSSAPI option and the crypto device. On the
userland side, you must build at least a new libc, mountd, mount_nfs
and gssd. You must install new versions of /etc/rc.d/gssd and
/etc/rc.d/nfsd and add 'gssd_enable=YES' to /etc/rc.conf.
As long as gssd is running, you should be able to mount an NFS
filesystem from a server that requires RPCSEC_GSS authentication. The
mount itself can happen without any kerberos credentials but all
access to the filesystem will be denied unless the accessing user has
a valid ticket file in the standard place (/tmp/krb5cc_<uid>). There
is currently no support for situations where the ticket file is in a
different place, such as when the user logged in via SSH and has
delegated credentials from that login. This restriction is also
present in Solaris and Linux. In theory, we could improve this in
future, possibly using Brooks Davis' implementation of variant
symlinks.
Supporting RPCSEC_GSS on a server is nearly as simple. You must create
service creds for the server in the form 'nfs/<fqdn>@<REALM>' and
install them in /etc/krb5.keytab. The standard heimdal utility ktutil
makes this fairly easy. After the service creds have been created, you
can add a '-sec=krb5' option to /etc/exports and restart both mountd
and nfsd.
The only other difference an administrator should notice is that nfsd
doesn't fork to create service threads any more. In normal operation,
there will be two nfsd processes, one in userland waiting for TCP
connections and one in the kernel handling requests. The latter
process will create as many kthreads as required - these should be
visible via 'top -H'. The code has some support for varying the number
of service threads according to load but initially at least, nfsd uses
a fixed number of threads according to the value supplied to its '-n'
option.
Sponsored by: Isilon Systems
MFC after: 1 month
2008-11-03 10:38:00 +00:00
|
|
|
secname = sec_num_to_name(nfhret.auth);
|
|
|
|
if (secname)
|
|
|
|
build_iovec(iov, iovlen, "sec", secname, (size_t)-1);
|
2001-04-10 22:05:47 +00:00
|
|
|
if (nfsvers == 3)
|
2008-09-13 20:22:46 +00:00
|
|
|
build_iovec(iov, iovlen, "nfsv3", NULL, 0);
|
2001-04-10 22:05:47 +00:00
|
|
|
|
|
|
|
return (TRYRET_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-01-23 07:17:10 +00:00
|
|
|
/*
|
|
|
|
* Try to set up the NFS arguments according to the address
|
|
|
|
* family, protocol (and possibly port) specified in `ai'.
|
|
|
|
*
|
|
|
|
* Returns TRYRET_SUCCESS if successful, or:
|
|
|
|
* TRYRET_TIMEOUT The server did not respond.
|
|
|
|
* TRYRET_REMOTEERR The server reported an error.
|
|
|
|
* TRYRET_LOCALERR Local failure.
|
|
|
|
*
|
|
|
|
* In all error cases, *errstr will be set to a statically-allocated string
|
|
|
|
* describing the error.
|
|
|
|
*/
|
|
|
|
enum tryret
|
2008-09-13 20:22:46 +00:00
|
|
|
nfs4_tryproto(struct addrinfo *ai, char *hostp, char *spec, char **errstr)
|
2007-01-23 07:17:10 +00:00
|
|
|
{
|
|
|
|
static char errbuf[256];
|
|
|
|
struct sockaddr_storage nfs_ss;
|
|
|
|
struct netbuf nfs_nb;
|
|
|
|
struct netconfig *nconf;
|
2008-09-13 20:22:46 +00:00
|
|
|
const char *netid;
|
|
|
|
int nfsvers, sotype;
|
2007-01-23 07:17:10 +00:00
|
|
|
|
|
|
|
errbuf[0] = '\0';
|
|
|
|
*errstr = errbuf;
|
|
|
|
|
2008-09-13 20:22:46 +00:00
|
|
|
if (nfsproto == IPPROTO_TCP)
|
|
|
|
sotype = SOCK_STREAM;
|
|
|
|
else if (nfsproto == IPPROTO_UDP)
|
|
|
|
sotype = SOCK_DGRAM;
|
|
|
|
|
|
|
|
if ((netid = netidbytype(ai->ai_family, sotype)) == NULL) {
|
2007-01-23 07:17:10 +00:00
|
|
|
snprintf(errbuf, sizeof errbuf,
|
2008-09-13 20:22:46 +00:00
|
|
|
"af %d sotype %d not supported", ai->ai_family, sotype);
|
2007-01-23 07:17:10 +00:00
|
|
|
return (TRYRET_LOCALERR);
|
|
|
|
}
|
|
|
|
if ((nconf = getnetconf_cached(netid)) == NULL) {
|
|
|
|
snprintf(errbuf, sizeof errbuf, "%s: %s", netid, nc_sperror());
|
|
|
|
return (TRYRET_LOCALERR);
|
|
|
|
}
|
|
|
|
|
|
|
|
nfsvers = 4;
|
|
|
|
|
|
|
|
if (portspec != NULL && atoi(portspec) != 0) {
|
|
|
|
/* `ai' contains the complete nfsd sockaddr. */
|
|
|
|
nfs_nb.buf = ai->ai_addr;
|
|
|
|
nfs_nb.len = nfs_nb.maxlen = ai->ai_addrlen;
|
|
|
|
} else {
|
|
|
|
/* Ask the remote rpcbind. */
|
|
|
|
nfs_nb.buf = &nfs_ss;
|
|
|
|
nfs_nb.len = nfs_nb.maxlen = sizeof nfs_ss;
|
|
|
|
|
|
|
|
if (!rpcb_getaddr(RPCPROG_NFS, nfsvers, nconf, &nfs_nb,
|
|
|
|
hostp)) {
|
|
|
|
snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s",
|
|
|
|
netid, hostp, spec,
|
|
|
|
clnt_spcreateerror("RPCPROG_NFS"));
|
|
|
|
return (returncode(rpc_createerr.cf_stat,
|
|
|
|
&rpc_createerr.cf_error));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Store the filehandle and server address in nfsargsp, making
|
|
|
|
* sure to copy any locally allocated structures.
|
|
|
|
*/
|
2008-09-13 20:22:46 +00:00
|
|
|
addrlen = nfs_nb.len;
|
|
|
|
addr = malloc(addrlen);
|
2007-01-23 07:17:10 +00:00
|
|
|
|
2008-09-13 20:22:46 +00:00
|
|
|
if (addr == NULL)
|
2007-01-23 07:17:10 +00:00
|
|
|
err(1, "malloc");
|
2008-09-13 20:22:46 +00:00
|
|
|
bcopy(nfs_nb.buf, addr, addrlen);
|
2007-01-23 07:17:10 +00:00
|
|
|
|
|
|
|
return (TRYRET_SUCCESS);
|
|
|
|
}
|
|
|
|
|
2001-04-10 22:05:47 +00:00
|
|
|
/*
|
|
|
|
* Catagorise a RPC return status and error into an `enum tryret'
|
|
|
|
* return code.
|
|
|
|
*/
|
|
|
|
enum tryret
|
|
|
|
returncode(enum clnt_stat stat, struct rpc_err *rpcerr)
|
|
|
|
{
|
|
|
|
switch (stat) {
|
|
|
|
case RPC_TIMEDOUT:
|
|
|
|
return (TRYRET_TIMEOUT);
|
|
|
|
case RPC_PMAPFAILURE:
|
|
|
|
case RPC_PROGNOTREGISTERED:
|
|
|
|
case RPC_PROGVERSMISMATCH:
|
2001-06-23 19:57:20 +00:00
|
|
|
/* XXX, these can be local or remote. */
|
|
|
|
case RPC_CANTSEND:
|
|
|
|
case RPC_CANTRECV:
|
2001-04-10 22:05:47 +00:00
|
|
|
return (TRYRET_REMOTEERR);
|
|
|
|
case RPC_SYSTEMERROR:
|
|
|
|
switch (rpcerr->re_errno) {
|
|
|
|
case ETIMEDOUT:
|
|
|
|
return (TRYRET_TIMEOUT);
|
|
|
|
case ENOMEM:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return (TRYRET_REMOTEERR);
|
|
|
|
}
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return (TRYRET_LOCALERR);
|
1994-05-26 06:35:07 +00:00
|
|
|
}
|
|
|
|
|
2001-05-13 00:07:03 +00:00
|
|
|
/*
|
|
|
|
* Look up a netid based on an address family and socket type.
|
|
|
|
* `af' is the address family, and `sotype' is SOCK_DGRAM or SOCK_STREAM.
|
|
|
|
*
|
|
|
|
* XXX there should be a library function for this.
|
|
|
|
*/
|
2008-09-13 20:22:46 +00:00
|
|
|
const char *
|
2006-03-20 21:28:46 +00:00
|
|
|
netidbytype(int af, int sotype)
|
|
|
|
{
|
2001-05-13 00:07:03 +00:00
|
|
|
struct nc_protos *p;
|
|
|
|
|
|
|
|
for (p = nc_protos; p->netid != NULL; p++) {
|
|
|
|
if (af != p->af || sotype != p->sotype)
|
|
|
|
continue;
|
|
|
|
return (p->netid);
|
|
|
|
}
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Look up a netconfig entry based on a netid, and cache the result so
|
|
|
|
* that we don't need to remember to call freenetconfigent().
|
|
|
|
*
|
|
|
|
* Otherwise it behaves just like getnetconfigent(), so nc_*error()
|
|
|
|
* work on failure.
|
|
|
|
*/
|
|
|
|
struct netconfig *
|
2006-03-20 21:28:46 +00:00
|
|
|
getnetconf_cached(const char *netid)
|
|
|
|
{
|
2001-05-13 00:07:03 +00:00
|
|
|
static struct nc_entry {
|
|
|
|
struct netconfig *nconf;
|
|
|
|
struct nc_entry *next;
|
|
|
|
} *head;
|
|
|
|
struct nc_entry *p;
|
|
|
|
struct netconfig *nconf;
|
|
|
|
|
|
|
|
for (p = head; p != NULL; p = p->next)
|
|
|
|
if (strcmp(netid, p->nconf->nc_netid) == 0)
|
|
|
|
return (p->nconf);
|
|
|
|
|
|
|
|
if ((nconf = getnetconfigent(netid)) == NULL)
|
|
|
|
return (NULL);
|
|
|
|
if ((p = malloc(sizeof(*p))) == NULL)
|
|
|
|
err(1, "malloc");
|
|
|
|
p->nconf = nconf;
|
|
|
|
p->next = head;
|
|
|
|
head = p;
|
|
|
|
|
|
|
|
return (p->nconf);
|
|
|
|
}
|
|
|
|
|
1994-05-26 06:35:07 +00:00
|
|
|
/*
|
|
|
|
* xdr routines for mount rpc's
|
|
|
|
*/
|
|
|
|
int
|
2006-03-20 21:28:46 +00:00
|
|
|
xdr_dir(XDR *xdrsp, char *dirp)
|
1994-05-26 06:35:07 +00:00
|
|
|
{
|
|
|
|
return (xdr_string(xdrsp, &dirp, RPCMNT_PATHLEN));
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2006-03-20 21:28:46 +00:00
|
|
|
xdr_fh(XDR *xdrsp, struct nfhret *np)
|
1994-05-26 06:35:07 +00:00
|
|
|
{
|
2002-03-20 17:55:10 +00:00
|
|
|
int i;
|
1995-06-27 11:07:30 +00:00
|
|
|
long auth, authcnt, authfnd = 0;
|
|
|
|
|
|
|
|
if (!xdr_u_long(xdrsp, &np->stat))
|
1994-05-26 06:35:07 +00:00
|
|
|
return (0);
|
|
|
|
if (np->stat)
|
|
|
|
return (1);
|
1995-06-27 11:07:30 +00:00
|
|
|
switch (np->vers) {
|
|
|
|
case 1:
|
|
|
|
np->fhsize = NFSX_V2FH;
|
|
|
|
return (xdr_opaque(xdrsp, (caddr_t)np->nfh, NFSX_V2FH));
|
|
|
|
case 3:
|
|
|
|
if (!xdr_long(xdrsp, &np->fhsize))
|
|
|
|
return (0);
|
|
|
|
if (np->fhsize <= 0 || np->fhsize > NFSX_V3FHMAX)
|
|
|
|
return (0);
|
|
|
|
if (!xdr_opaque(xdrsp, (caddr_t)np->nfh, np->fhsize))
|
|
|
|
return (0);
|
|
|
|
if (!xdr_long(xdrsp, &authcnt))
|
|
|
|
return (0);
|
|
|
|
for (i = 0; i < authcnt; i++) {
|
|
|
|
if (!xdr_long(xdrsp, &auth))
|
|
|
|
return (0);
|
2008-09-13 20:22:46 +00:00
|
|
|
if (np->auth == -1) {
|
|
|
|
np->auth = auth;
|
|
|
|
authfnd++;
|
|
|
|
} else if (auth == np->auth) {
|
1995-06-27 11:07:30 +00:00
|
|
|
authfnd++;
|
2008-09-13 20:22:46 +00:00
|
|
|
}
|
1995-06-27 11:07:30 +00:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Some servers, such as DEC's OSF/1 return a nil authenticator
|
|
|
|
* list to indicate RPCAUTH_UNIX.
|
|
|
|
*/
|
2008-09-13 20:22:46 +00:00
|
|
|
if (authcnt == 0 && np->auth == -1)
|
|
|
|
np->auth = AUTH_SYS;
|
|
|
|
if (!authfnd && (authcnt > 0 || np->auth != AUTH_SYS))
|
1995-06-27 11:07:30 +00:00
|
|
|
np->stat = EAUTH;
|
|
|
|
return (1);
|
|
|
|
};
|
|
|
|
return (0);
|
1994-05-26 06:35:07 +00:00
|
|
|
}
|
|
|
|
|
1996-09-14 03:00:32 +00:00
|
|
|
void
|
1994-05-26 06:35:07 +00:00
|
|
|
usage()
|
|
|
|
{
|
1998-07-06 07:15:53 +00:00
|
|
|
(void)fprintf(stderr, "%s\n%s\n%s\n%s\n",
|
2007-01-23 07:17:10 +00:00
|
|
|
"usage: mount_nfs [-234bcdiLlNPsTU] [-a maxreadahead] [-D deadthresh]",
|
2005-02-10 09:19:34 +00:00
|
|
|
" [-g maxgroups] [-I readdirsize] [-o options] [-R retrycnt]",
|
|
|
|
" [-r readsize] [-t timeout] [-w writesize] [-x retrans]",
|
|
|
|
" rhost:path node");
|
1994-05-26 06:35:07 +00:00
|
|
|
exit(1);
|
|
|
|
}
|