X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=008fdbc7c9846f41100b3921ea657cad53adb3a0;hp=25b206fd4ebe4c1740782621e44528e19b60e298;hb=bac279da80ae860267e8485d7fe2109096a326e9;hpb=0de3189d32a183f5e91a6d27a9e8f159216d9473 diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 25b206f..008fdbc 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -38,6 +38,7 @@ #include "xcommon.h" #include "mount.h" #include "nls.h" +#include "nfsrpc.h" #include "mount_constants.h" #include "stropts.h" #include "error.h" @@ -45,6 +46,7 @@ #include "parse_opt.h" #include "version.h" #include "parse_dev.h" +#include "conffile.h" #ifndef NFS_PROGRAM #define NFS_PROGRAM (100003) @@ -92,6 +94,25 @@ struct nfsmount_info { child; /* forked bg child? */ }; +#ifdef MOUNT_CONFIG +static void nfs_default_version(struct nfsmount_info *mi); + +static void nfs_default_version(struct nfsmount_info *mi) +{ + extern unsigned long config_default_vers; + /* + * Use the default value set in the config file when + * the version has not been explicitly set. + */ + if (mi->version == 0 && config_default_vers) { + if (config_default_vers < 4) + mi->version = config_default_vers; + } +} +#else +inline void nfs_default_version(struct nfsmount_info *mi) {} +#endif /* MOUNT_CONFIG */ + /* * Obtain a retry timeout value based on the value of the "retry=" option. * @@ -258,6 +279,40 @@ static int nfs_append_sloppy_option(struct mount_options *options) return 1; } +static int nfs_set_version(struct nfsmount_info *mi) +{ + if (!nfs_nfs_version(mi->options, &mi->version)) + return 0; + + if (strncmp(mi->type, "nfs4", 4) == 0) + mi->version = 4; + else { + char *option = po_get(mi->options, "proto"); + if (option && strcmp(option, "rdma") == 0) + mi->version = 3; + } + + /* + * If we still don't know, check for version-specific + * mount options. + */ + if (mi->version == 0) { + if (po_contains(mi->options, "mounthost") || + po_contains(mi->options, "mountaddr") || + po_contains(mi->options, "mountvers") || + po_contains(mi->options, "mountproto")) + mi->version = 3; + } + + /* + * If enabled, see if the default version was + * set in the config file + */ + nfs_default_version(mi); + + return 1; +} + /* * Set up mandatory non-version specific NFS mount options. * @@ -274,10 +329,8 @@ static int nfs_validate_options(struct nfsmount_info *mi) if (!nfs_name_to_address(mi->hostname, sap, &mi->salen)) return 0; - if (!nfs_nfs_version(mi->options, &mi->version)) + if (!nfs_set_version(mi)) return 0; - if (strncmp(mi->type, "nfs4", 4) == 0) - mi->version = 4; if (!nfs_append_sloppy_option(mi->options)) return 0; @@ -319,10 +372,13 @@ static int nfs_extract_server_addresses(struct mount_options *options, } static int nfs_construct_new_options(struct mount_options *options, + struct sockaddr *nfs_saddr, struct pmap *nfs_pmap, + struct sockaddr *mnt_saddr, struct pmap *mnt_pmap) { char new_option[64]; + char *netid; po_remove_all(options, "nfsprog"); po_remove_all(options, "mountprog"); @@ -339,20 +395,14 @@ static int nfs_construct_new_options(struct mount_options *options, po_remove_all(options, "proto"); po_remove_all(options, "udp"); po_remove_all(options, "tcp"); - switch (nfs_pmap->pm_prot) { - case IPPROTO_TCP: - snprintf(new_option, sizeof(new_option) - 1, - "proto=tcp"); - if (po_append(options, new_option) == PO_FAILED) - return 0; - break; - case IPPROTO_UDP: - snprintf(new_option, sizeof(new_option) - 1, - "proto=udp"); - if (po_append(options, new_option) == PO_FAILED) - return 0; - break; - } + netid = nfs_get_netid(nfs_saddr->sa_family, nfs_pmap->pm_prot); + if (netid == NULL) + return 0; + snprintf(new_option, sizeof(new_option) - 1, + "proto=%s", netid); + free(netid); + if (po_append(options, new_option) == PO_FAILED) + return 0; po_remove_all(options, "port"); if (nfs_pmap->pm_port != NFS_PORT) { @@ -369,20 +419,14 @@ static int nfs_construct_new_options(struct mount_options *options, return 0; po_remove_all(options, "mountproto"); - switch (mnt_pmap->pm_prot) { - case IPPROTO_TCP: - snprintf(new_option, sizeof(new_option) - 1, - "mountproto=tcp"); - if (po_append(options, new_option) == PO_FAILED) - return 0; - break; - case IPPROTO_UDP: - snprintf(new_option, sizeof(new_option) - 1, - "mountproto=udp"); - if (po_append(options, new_option) == PO_FAILED) - return 0; - break; - } + netid = nfs_get_netid(mnt_saddr->sa_family, mnt_pmap->pm_prot); + if (netid == NULL) + return 0; + snprintf(new_option, sizeof(new_option) - 1, + "mountproto=%s", netid); + free(netid); + if (po_append(options, new_option) == PO_FAILED) + return 0; po_remove_all(options, "mountport"); snprintf(new_option, sizeof(new_option) - 1, @@ -458,7 +502,8 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options) return 0; } - if (!nfs_construct_new_options(options, &nfs_pmap, &mnt_pmap)) { + if (!nfs_construct_new_options(options, nfs_saddr, &nfs_pmap, + mnt_saddr, &mnt_pmap)) { errno = EINVAL; return 0; } @@ -558,6 +603,25 @@ static int nfs_try_mount_v4(struct nfsmount_info *mi) return result; } + if (mi->version == 0) { + if (po_contains(options, "mounthost") || + po_contains(options, "mountaddr") || + po_contains(options, "mountvers") || + po_contains(options, "mountproto")) { + /* + * Since these mountd options are set assume version 3 + * is wanted so error out with EPROTONOSUPPORT so the + * protocol negation starts with v3. + */ + errno = EPROTONOSUPPORT; + goto out_fail; + } + if (po_append(options, "vers=4") == PO_FAILED) { + errno = EINVAL; + goto out_fail; + } + } + if (!nfs_append_clientaddr_option(sap, mi->salen, options)) { errno = EINVAL; goto out_fail; @@ -568,7 +632,7 @@ static int nfs_try_mount_v4(struct nfsmount_info *mi) */ if (po_join(options, mi->extra_opts) == PO_FAILED) { errno = ENOMEM; - return 0; + goto out_fail; } result = nfs_sys_mount(mi, options); @@ -590,6 +654,20 @@ static int nfs_try_mount(struct nfsmount_info *mi) switch (mi->version) { case 0: + if (linux_version_code() > MAKE_VERSION(2, 6, 31)) { + errno = 0; + result = nfs_try_mount_v4(mi); + if (errno != EPROTONOSUPPORT) { + /* + * To deal with legacy Linux servers that don't + * automatically export a pseudo root, retry + * ENOENT errors using version 3. And for + * Linux servers prior to 2.6.25, retry EPERM + */ + if (errno != ENOENT && errno != EPERM) + break; + } + } case 2: case 3: result = nfs_try_mount_v3v2(mi);