X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsmount.c;h=a3cbbbe595680fc612d41e7556eeb1b15e17672f;hp=776ef6440a78acf67effed85e0a3789a0dccdf6a;hb=66ab98cbd17f7f54edda78a470579d3ab01f35c0;hpb=e8a29cc56f3bf9b550b0f4f4876f23ca379d3e14 diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c index 776ef64..a3cbbbe 100644 --- a/utils/mount/nfsmount.c +++ b/utils/mount/nfsmount.c @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include @@ -64,13 +63,8 @@ #include "nfs_mount.h" #include "mount_constants.h" #include "nls.h" - -#ifdef HAVE_RPCSVC_NFS_PROT_H -#include -#else -#include -#define nfsstat nfs_stat -#endif +#include "error.h" +#include "network.h" #ifndef NFS_PORT #define NFS_PORT 2049 @@ -79,13 +73,6 @@ #define NFS_FHSIZE 32 #endif -static char *nfs_strerror(int stat); - -#define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) -#define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2) -#define MAX_MNTPROT ((nfs_mount_version >= 4) ? 3 : 2) -#define HAVE_RELIABLE_TCP (nfs_mount_version >= 4) - #ifndef HAVE_INET_ATON #define inet_aton(a,b) (0) #endif @@ -101,385 +88,12 @@ typedef union { mnt3res_t nfsv3; } mntres_t; -static char errbuf[BUFSIZ]; -static char *erreob = &errbuf[BUFSIZ]; +extern int nfs_mount_data_version; +extern char *progname; extern int verbose; extern int sloppy; -/* Convert RPC errors into strings */ -int rpc_strerror(int); -int rpc_strerror(int spos) -{ - int cf_stat = rpc_createerr.cf_stat; - int pos=0, cf_errno = rpc_createerr.cf_error.re_errno; - char *ptr, *estr = clnt_sperrno(cf_stat); - char *tmp; - - if (estr) { - if ((ptr = index(estr, ':'))) - estr = ++ptr; - - tmp = &errbuf[spos]; - if (cf_stat == RPC_SYSTEMERROR) - pos = snprintf(tmp, (erreob - tmp), - "System Error: %s", strerror(cf_errno)); - else - pos = snprintf(tmp, (erreob - tmp), "RPC Error:%s", estr); - } - return (pos); -} -void mount_errors(char *, int, int); -void mount_errors(char *server, int will_retry, int bg) -{ - int pos = 0; - char *tmp; - static int onlyonce = 0; - - tmp = &errbuf[pos]; - if (bg) - pos = snprintf(tmp, (erreob - tmp), - "mount to NFS server '%s' failed: ", server); - else - pos = snprintf(tmp, (erreob - tmp), - "mount: mount to NFS server '%s' failed: ", server); - - tmp = &errbuf[pos]; - if (rpc_createerr.cf_stat == RPC_TIMEDOUT) { - pos = snprintf(tmp, (erreob - tmp), "timed out %s", - will_retry ? "(retrying)" : "(giving up)"); - } else { - pos += rpc_strerror(pos); - tmp = &errbuf[pos]; - if (bg) { - pos = snprintf(tmp, (erreob - tmp), " %s", - will_retry ? "(retrying)" : "(giving up)"); - } - } - if (bg) { - if (onlyonce++ < 1) - openlog("mount", LOG_CONS|LOG_PID, LOG_AUTH); - syslog(LOG_ERR, "%s.", errbuf); - } else - fprintf(stderr, "%s.\n", errbuf); -} - -/* Define the order in which to probe for UDP/TCP services */ -enum plist { - use_tcp = 0, - udp_tcp, - udp_only, -}; -static const u_int * -proto_probelist(enum plist list) -{ - static const u_int probe_udp_tcp[] = { IPPROTO_UDP, IPPROTO_TCP, 0 }; - static const u_int probe_both[] = { IPPROTO_TCP, IPPROTO_UDP, 0 }; - static const u_int probe_udponly[] = { IPPROTO_UDP, 0 }; - - if (list == use_tcp) - return probe_both; - if (list == udp_tcp) - return probe_udp_tcp; - return probe_udponly; -} - -/* Define the order in which NFS versions are probed on portmapper */ -static const u_long * -nfs_probelist(const int vers) -{ - static const u_long nfs2_probe[] = { 2, 0}; - static const u_long nfs3_probe[] = { 3, 2, 0}; - switch (vers) { - case 3: - return nfs3_probe; - default: - return nfs2_probe; - } -} - -/* Define the order in which Mountd versions are probed on portmapper */ -static const u_long * -mnt_probelist(const int vers) -{ - static const u_long mnt1_probe[] = { 1, 2, 0 }; - static const u_long mnt3_probe[] = { 3, 1, 2, 0 }; - switch (vers) { - case 3: - return mnt3_probe; - default: - return mnt1_probe; - } -} - -static int -linux_version_code(void) { - struct utsname my_utsname; - int p, q, r; - - if (uname(&my_utsname) == 0) { - p = atoi(strtok(my_utsname.release, ".")); - q = atoi(strtok(NULL, ".")); - r = atoi(strtok(NULL, ".")); - return MAKE_VERSION(p,q,r); - } - return 0; -} - -/* - * Unfortunately, the kernel prints annoying console messages - * in case of an unexpected nfs mount version (instead of - * just returning some error). Therefore we'll have to try - * and figure out what version the kernel expects. - * - * Variables: - * NFS_MOUNT_VERSION: these nfsmount sources at compile time - * nfs_mount_version: version this source and running kernel can handle - */ -int nfs_mount_version = NFS_MOUNT_VERSION; - -int -find_kernel_nfs_mount_version(void) { - static int kernel_version = -1; - int mnt_version = NFS_MOUNT_VERSION; - - if (kernel_version == -1) - kernel_version = linux_version_code(); - - if (kernel_version) { - if (kernel_version < MAKE_VERSION(2,1,32)) - mnt_version = 1; - else if (kernel_version < MAKE_VERSION(2,2,18)) - mnt_version = 3; - else if (kernel_version < MAKE_VERSION(2,3,0)) - mnt_version = 4; /* since 2.2.18pre9 */ - else if (kernel_version < MAKE_VERSION(2,3,99)) - mnt_version = 3; - else if (kernel_version < MAKE_VERSION(2,6,3)) - mnt_version = 4; - else - mnt_version = 6; - } - if (mnt_version > NFS_MOUNT_VERSION) - mnt_version = NFS_MOUNT_VERSION; - return mnt_version; -} - -int nfs_gethostbyname(const char *, struct sockaddr_in *); -int nfs_gethostbyname(const char *hostname, struct sockaddr_in *saddr) -{ - struct hostent *hp; - - saddr->sin_family = AF_INET; - if (!inet_aton(hostname, &saddr->sin_addr)) { - if ((hp = gethostbyname(hostname)) == NULL) { - fprintf(stderr, _("mount: can't get address for %s\n"), - hostname); - return 0; - } else { - if (hp->h_length > sizeof(*saddr)) { - fprintf(stderr, - _("mount: got bad hp->h_length\n")); - hp->h_length = sizeof(*saddr); - } - memcpy(&saddr->sin_addr, hp->h_addr, hp->h_length); - } - } - return 1; -} - -/* - * getport() is very similar to pmap_getport() with - * the exception this version uses a non-reserve ports - * instead of reserve ports since reserve ports - * are not needed for pmap requests. - */ -u_short -getport( - struct sockaddr_in *saddr, - u_long prog, - u_long vers, - u_int prot) -{ - u_short port = 0; - int socket; - CLIENT *clnt = NULL; - struct pmap parms; - enum clnt_stat stat; - - saddr->sin_port = htons (PMAPPORT); - socket = get_socket(saddr, prot, FALSE, FALSE); - - switch (prot) { - case IPPROTO_UDP: - clnt = clntudp_bufcreate(saddr, - PMAPPROG, PMAPVERS, TIMEOUT, &socket, - UDPMSGSIZE, UDPMSGSIZE); - break; - case IPPROTO_TCP: - clnt = clnttcp_create(saddr, - PMAPPROG, PMAPVERS, &socket, 50, 500); - break; - } - if (clnt != NULL) { - parms.pm_prog = prog; - parms.pm_vers = vers; - parms.pm_prot = prot; - parms.pm_port = 0; /* not needed or used */ - - stat = clnt_call(clnt, PMAPPROC_GETPORT, (xdrproc_t)xdr_pmap, - (caddr_t)&parms, (xdrproc_t)xdr_u_short, (caddr_t)&port, TIMEOUT); - if (stat) { - clnt_geterr(clnt, &rpc_createerr.cf_error); - rpc_createerr.cf_stat = stat; - } - clnt_destroy(clnt); - if (stat != RPC_SUCCESS) - port = 0; - else if (port == 0) - rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED; - } - if (socket != 1) - close(socket); - - return port; -} - -/* - * Use the portmapper to discover whether or not the service we want is - * available. The lists 'versions' and 'protos' define ordered sequences - * of service versions and udp/tcp protocols to probe for. - */ -static int -probe_port(clnt_addr_t *server, - const u_long *versions, - const u_int *protos) -{ - struct sockaddr_in *saddr = &server->saddr; - struct pmap *pmap = &server->pmap; - const u_long prog = pmap->pm_prog, *p_vers; - const u_int prot = (u_int)pmap->pm_prot, - *p_prot; - const u_short port = (u_short) pmap->pm_port; - u_long vers = pmap->pm_vers; - u_short p_port; - p_prot = prot ? &prot : protos; - p_vers = vers ? &vers : versions; - rpc_createerr.cf_stat = 0; - for (;;) { - saddr->sin_port = htons(PMAPPORT); - p_port = getport(saddr, prog, *p_vers, *p_prot); - if (p_port) { - if (!port || port == p_port) { - saddr->sin_port = htons(p_port); - if (verbose) { - fprintf(stderr, - "mount: trying %s prog %ld vers %ld prot %s port %d\n", - inet_ntoa(saddr->sin_addr), prog, *p_vers, - *p_prot == IPPROTO_UDP ? "udp" : "tcp", p_port); - } - if (clnt_ping(saddr, prog, *p_vers, *p_prot, NULL)) - goto out_ok; - if (rpc_createerr.cf_stat == RPC_TIMEDOUT) - goto out_bad; - } - } - if (rpc_createerr.cf_stat != RPC_PROGNOTREGISTERED) - goto out_bad; - - if (!prot) { - if (*++p_prot) - continue; - p_prot = protos; - } - if (vers == pmap->pm_vers) { - p_vers = versions; - vers = 0; - } - if (vers || !*++p_vers) - break; - } -out_bad: - return 0; - - out_ok: - if (!vers) - pmap->pm_vers = *p_vers; - if (!prot) - pmap->pm_prot = *p_prot; - if (!port) - pmap->pm_port = p_port; - rpc_createerr.cf_stat = 0; - return 1; -} - -static int -probe_nfsport(clnt_addr_t *nfs_server) -{ - const struct pmap *pmap = &nfs_server->pmap; - const u_long *probe_vers; - const u_int *probe_prot; - - if (pmap->pm_vers && pmap->pm_prot && pmap->pm_port) - return 1; - probe_vers = nfs_probelist(MAX_NFSPROT); - probe_prot = proto_probelist(HAVE_RELIABLE_TCP ? use_tcp : udp_only); - return probe_port(nfs_server, probe_vers, probe_prot); -} - -int probe_mntport(clnt_addr_t *mnt_server) -{ - const struct pmap *pmap = &mnt_server->pmap; - const u_long *probe_vers; - const u_int *probe_prot; - - if (pmap->pm_vers && pmap->pm_prot && pmap->pm_port) - return 1; - probe_vers = mnt_probelist(MAX_MNTPROT); - probe_prot = proto_probelist(HAVE_RELIABLE_TCP ? udp_tcp : udp_only); - return probe_port(mnt_server, probe_vers, probe_prot); -} - -static int -probe_bothports(clnt_addr_t *mnt_server, clnt_addr_t *nfs_server) -{ - struct pmap *nfs_pmap = &nfs_server->pmap; - struct pmap *mnt_pmap = &mnt_server->pmap; - struct pmap save_nfs, save_mnt; - int res; - const u_long *probe_vers; - - if (mnt_pmap->pm_vers && !nfs_pmap->pm_vers) - nfs_pmap->pm_vers = mntvers_to_nfs(mnt_pmap->pm_vers); - else if (nfs_pmap->pm_vers && !mnt_pmap->pm_vers) - mnt_pmap->pm_vers = nfsvers_to_mnt(nfs_pmap->pm_vers); - if (nfs_pmap->pm_vers) - goto version_fixed; - memcpy(&save_nfs, nfs_pmap, sizeof(save_nfs)); - memcpy(&save_mnt, mnt_pmap, sizeof(save_mnt)); - for (probe_vers = mnt_probelist(MAX_MNTPROT); *probe_vers; probe_vers++) { - nfs_pmap->pm_vers = mntvers_to_nfs(*probe_vers); - if ((res = probe_nfsport(nfs_server) != 0)) { - mnt_pmap->pm_vers = nfsvers_to_mnt(nfs_pmap->pm_vers); - if ((res = probe_mntport(mnt_server)) != 0) - return 1; - memcpy(mnt_pmap, &save_mnt, sizeof(*mnt_pmap)); - } - switch (rpc_createerr.cf_stat) { - case RPC_PROGVERSMISMATCH: - case RPC_PROGNOTREGISTERED: - break; - default: - goto out_bad; - } - memcpy(nfs_pmap, &save_nfs, sizeof(*nfs_pmap)); - } - out_bad: - return 0; - version_fixed: - if (!probe_nfsport(nfs_server)) - goto out_bad; - return probe_mntport(mnt_server); -} +extern int linux_version_code(); static inline enum clnt_stat nfs3_mount(CLIENT *clnt, mnt3arg_t *mnt3arg, mnt3res_t *mnt3res) @@ -621,7 +235,7 @@ parse_options(char *old_opts, struct nfs_mount_data *data, opt = "nfsvers"; #if NFS_MOUNT_VERSION >= 2 } else if (!strcmp(opt, "namlen")) { - if (nfs_mount_version >= 2) + if (nfs_mount_data_version >= 2) data->namlen = val; else if (sloppy) continue; @@ -645,7 +259,7 @@ parse_options(char *old_opts, struct nfs_mount_data *data, #if NFS_MOUNT_VERSION >= 2 data->flags &= ~NFS_MOUNT_TCP; } else if (!strcmp(opteq+1, "tcp") && - nfs_mount_version > 2) { + nfs_mount_data_version > 2) { nfs_pmap->pm_prot = IPPROTO_TCP; mnt_pmap->pm_prot = IPPROTO_TCP; data->flags |= NFS_MOUNT_TCP; @@ -658,7 +272,7 @@ parse_options(char *old_opts, struct nfs_mount_data *data, } else if (!strcmp(opt, "sec")) { char *secflavor = opteq+1; /* see RFC 2623 */ - if (nfs_mount_version < 5) { + if (nfs_mount_data_version < 5) { printf(_("Warning: ignoring sec=%s option\n"), secflavor); continue; } else if (!strcmp(secflavor, "none")) @@ -757,7 +371,7 @@ parse_options(char *old_opts, struct nfs_mount_data *data, } else if (!strcmp(opt, "tcp")) { data->flags &= ~NFS_MOUNT_TCP; if (val) { - if (nfs_mount_version < 2) + if (nfs_mount_data_version < 2) goto bad_option; nfs_pmap->pm_prot = IPPROTO_TCP; mnt_pmap->pm_prot = IPPROTO_TCP; @@ -769,7 +383,7 @@ parse_options(char *old_opts, struct nfs_mount_data *data, } else if (!strcmp(opt, "udp")) { data->flags &= ~NFS_MOUNT_TCP; if (!val) { - if (nfs_mount_version < 2) + if (nfs_mount_data_version < 2) goto bad_option; nfs_pmap->pm_prot = IPPROTO_TCP; mnt_pmap->pm_prot = IPPROTO_TCP; @@ -783,7 +397,7 @@ parse_options(char *old_opts, struct nfs_mount_data *data, } else if (!strcmp(opt, "lock")) { data->flags &= ~NFS_MOUNT_NONLM; if (!val) { - if (nfs_mount_version < 3) + if (nfs_mount_data_version < 3) goto bad_option; data->flags |= NFS_MOUNT_NONLM; } @@ -792,7 +406,7 @@ parse_options(char *old_opts, struct nfs_mount_data *data, } else if (!strcmp(opt, "broken_suid")) { data->flags &= ~NFS_MOUNT_BROKEN_SUID; if (val) { - if (nfs_mount_version < 4) + if (nfs_mount_data_version < 4) goto bad_option; data->flags |= NFS_MOUNT_BROKEN_SUID; } @@ -800,6 +414,14 @@ parse_options(char *old_opts, struct nfs_mount_data *data, data->flags &= ~NFS_MOUNT_NOACL; if (!val) data->flags |= NFS_MOUNT_NOACL; + } else if (!strcmp(opt, "rdirplus")) { + data->flags &= ~NFS_MOUNT_NORDIRPLUS; + if (!val) + data->flags |= NFS_MOUNT_NORDIRPLUS; + } else if (!strcmp(opt, "sharecache")) { + data->flags &= ~NFS_MOUNT_UNSHARED; + if (!val) + data->flags |= NFS_MOUNT_UNSHARED; #endif } else { bad_option: @@ -831,33 +453,42 @@ parse_options(char *old_opts, struct nfs_mount_data *data, return 0; } -static inline int -nfsmnt_check_compat(const struct pmap *nfs_pmap, const struct pmap *mnt_pmap) +static int nfsmnt_check_compat(const struct pmap *nfs_pmap, + const struct pmap *mnt_pmap) { - if (nfs_pmap->pm_vers && - (nfs_pmap->pm_vers > MAX_NFSPROT || nfs_pmap->pm_vers < 2)) { - if (nfs_pmap->pm_vers == 4) - fprintf(stderr, _("'vers=4' is not supported. " - "Use '-t nfs4' instead.\n")); - else - fprintf(stderr, _("NFS version %ld is not supported.\n"), - nfs_pmap->pm_vers); + unsigned int max_nfs_vers = (nfs_mount_data_version >= 4) ? 3 : 2; + unsigned int max_mnt_vers = (nfs_mount_data_version >= 4) ? 3 : 2; + + if (nfs_pmap->pm_vers == 4) { + fprintf(stderr, _("Please use '-t nfs4' " + "instead of '-o vers=4'.\n")); goto out_bad; } - if (mnt_pmap->pm_vers > MAX_MNTPROT) { + + if (nfs_pmap->pm_vers) { + if (nfs_pmap->pm_vers > max_nfs_vers || nfs_pmap->pm_vers < 2) { + fprintf(stderr, _("NFS version %ld is not supported.\n"), + nfs_pmap->pm_vers); + goto out_bad; + } + } + + if (mnt_pmap->pm_vers > max_mnt_vers) { fprintf(stderr, _("NFS mount version %ld s not supported.\n"), mnt_pmap->pm_vers); goto out_bad; } + return 1; - out_bad: + +out_bad: return 0; } int nfsmount(const char *spec, const char *node, int *flags, char **extra_opts, char **mount_opts, - int running_bg, int *need_statd) + int running_bg, int fake) { static char *prev_bg_host; char hostdir[1024]; @@ -886,8 +517,6 @@ nfsmount(const char *spec, const char *node, int *flags, time_t prevt; time_t timeout; - nfs_mount_version = find_kernel_nfs_mount_version(); - if (strlen(spec) >= sizeof(hostdir)) { fprintf(stderr, _("mount: " "excessively long host:dir argument\n")); @@ -983,11 +612,12 @@ nfsmount(const char *spec, const char *node, int *flags, #endif #if NFS_MOUNT_VERSION >= 5 printf("sec = %u ", data.pseudoflavor); + printf("readdirplus = %d ", (data.flags & NFS_MOUNT_NORDIRPLUS) != 0); #endif printf("\n"); #endif - data.version = nfs_mount_version; + data.version = nfs_mount_data_version; *mount_opts = (char *) &data; if (*flags & MS_REMOUNT) @@ -1163,7 +793,7 @@ noauth_flavors: #endif } - if (nfs_mount_version == 1) { + if (nfs_mount_data_version == 1) { /* create nfs socket for kernel */ if (nfs_pmap->pm_prot == IPPROTO_TCP) fsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -1220,7 +850,18 @@ noauth_flavors: strcat(new_opts, cbuf); *extra_opts = xstrdup(new_opts); - *need_statd = ! (data.flags & NFS_MOUNT_NONLM); + + if (!fake && !(data.flags & NFS_MOUNT_NONLM)) { + if (!start_statd()) { + nfs_error(_("%s: rpc.statd is not running but is " + "required for remote locking.\n" + " Either use '-o nolocks' to keep " + "locks local, or start statd."), + progname); + goto fail; + } + } + return 0; /* abort */ @@ -1229,62 +870,3 @@ noauth_flavors: close(fsock); return retval; } - -/* - * We need to translate between nfs status return values and - * the local errno values which may not be the same. - * - * Andreas Schwab : change errno: - * "after #include the symbol errno is reserved for any use, - * it cannot even be used as a struct tag or field name". - */ - -#ifndef EDQUOT -#define EDQUOT ENOSPC -#endif - -static struct { - enum nfsstat stat; - int errnum; -} nfs_errtbl[] = { - { NFS_OK, 0 }, - { NFSERR_PERM, EPERM }, - { NFSERR_NOENT, ENOENT }, - { NFSERR_IO, EIO }, - { NFSERR_NXIO, ENXIO }, - { NFSERR_ACCES, EACCES }, - { NFSERR_EXIST, EEXIST }, - { NFSERR_NODEV, ENODEV }, - { NFSERR_NOTDIR, ENOTDIR }, - { NFSERR_ISDIR, EISDIR }, -#ifdef NFSERR_INVAL - { NFSERR_INVAL, EINVAL }, /* that Sun forgot */ -#endif - { NFSERR_FBIG, EFBIG }, - { NFSERR_NOSPC, ENOSPC }, - { NFSERR_ROFS, EROFS }, - { NFSERR_NAMETOOLONG, ENAMETOOLONG }, - { NFSERR_NOTEMPTY, ENOTEMPTY }, - { NFSERR_DQUOT, EDQUOT }, - { NFSERR_STALE, ESTALE }, -#ifdef EWFLUSH - { NFSERR_WFLUSH, EWFLUSH }, -#endif - /* Throw in some NFSv3 values for even more fun (HP returns these) */ - { 71, EREMOTE }, - - { -1, EIO } -}; - -static char *nfs_strerror(int stat) -{ - int i; - static char buf[256]; - - for (i = 0; nfs_errtbl[i].stat != -1; i++) { - if (nfs_errtbl[i].stat == stat) - return strerror(nfs_errtbl[i].errnum); - } - sprintf(buf, _("unknown nfs status return value: %d"), stat); - return buf; -}