+ option = po_get(options, "nfsvers");
+ if (option) {
+ nfs_server.pmap.pm_vers = atoi(option);
+ po_remove_all(options, "nfsvers");
+ }
+ option = po_get(options, "vers");
+ if (option) {
+ nfs_server.pmap.pm_vers = atoi(option);
+ po_remove_all(options, "vers");
+ }
+ option = po_get(options, "proto");
+ if (option) {
+ if (strcmp(option, "tcp") == 0) {
+ nfs_server.pmap.pm_prot = IPPROTO_TCP;
+ po_remove_all(options, "proto");
+ }
+ if (strcmp(option, "udp") == 0) {
+ nfs_server.pmap.pm_prot = IPPROTO_UDP;
+ po_remove_all(options, "proto");
+ }
+ }
+ p = po_rightmost(options, "tcp", "udp");
+ switch (p) {
+ case PO_KEY2_RIGHTMOST:
+ nfs_server.pmap.pm_prot = IPPROTO_UDP;
+ break;
+ case PO_KEY1_RIGHTMOST:
+ nfs_server.pmap.pm_prot = IPPROTO_TCP;
+ break;
+ }
+ po_remove_all(options, "tcp");
+ po_remove_all(options, "udp");
+
+ if (!probe_bothports(&mnt_server, &nfs_server)) {
+ errno = ESPIPE;
+ goto err;
+ }
+
+ snprintf(new_option, sizeof(new_option) - 1,
+ "nfsvers=%lu", nfs_server.pmap.pm_vers);
+ if (po_append(options, new_option) == PO_FAILED)
+ goto err;
+
+ if (nfs_server.pmap.pm_prot == IPPROTO_TCP)
+ snprintf(new_option, sizeof(new_option) - 1,
+ "proto=tcp");
+ else
+ snprintf(new_option, sizeof(new_option) - 1,
+ "proto=udp");
+ if (po_append(options, new_option) == PO_FAILED)
+ goto err;
+
+ if (nfs_server.pmap.pm_port != NFS_PORT) {
+ snprintf(new_option, sizeof(new_option) - 1,
+ "port=%lu", nfs_server.pmap.pm_port);
+ if (po_append(options, new_option) == PO_FAILED)
+ goto err;
+
+ }
+
+ errno = 0;
+ return options;
+
+err:
+ po_destroy(options);
+ return NULL;
+}
+
+/*
+ * Do the mount(2) system call.
+ *
+ * Returns 1 if successful, otherwise zero.
+ * "errno" is set to reflect the individual error.
+ */
+static int nfs_sys_mount(const struct nfsmount_info *mi, const char *type,
+ const char *options)
+{
+ int result;
+
+ result = mount(mi->spec, mi->node, type,
+ mi->flags & ~(MS_USER|MS_USERS), options);
+ if (verbose && result) {
+ int save = errno;
+ nfs_error(_("%s: mount(2): %s"), progname, strerror(save));
+ errno = save;
+ }
+ return !result;
+}
+
+/*
+ * Retry an NFS mount that failed because the requested service isn't
+ * available on the server.
+ *
+ * Returns 1 if successful. Otherwise, returns zero.
+ * "errno" is set to reflect the individual error.
+ *
+ * Side effect: If the retry is successful, both 'options' and
+ * 'extra_opts' are updated to reflect the mount options that worked.
+ * If the retry fails, 'options' and 'extra_opts' are left unchanged.
+ */
+static int nfs_retry_nfs23mount(struct nfsmount_info *mi)
+{
+ struct mount_options *retry_options;
+ char *retry_str = NULL;
+ char **extra_opts = mi->extra_opts;
+
+ retry_options = rewrite_mount_options(*extra_opts);
+ if (!retry_options)