+ 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;
+
+ }
+
+ return options;
+
+err:
+ po_destroy(options);
+ return NULL;
+}
+
+/*
+ * 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 retry_nfsmount(const char *spec, const char *node,
+ int flags, struct mount_options *options,
+ int fake, char **extra_opts)
+{
+ struct mount_options *retry_options;
+ char *retry_str = NULL;
+
+ retry_options = rewrite_mount_options(*extra_opts);
+ if (!retry_options) {
+ errno = EIO;
+ return 0;
+ }
+
+ if (po_join(retry_options, &retry_str) == PO_FAILED) {
+ po_destroy(retry_options);
+ errno = EIO;
+ return 0;
+ }
+
+ if (verbose)
+ printf(_("%s: text-based options (retry): '%s'\n"),
+ progname, retry_str);
+
+ if (!mount(spec, node, "nfs",
+ flags & ~(MS_USER|MS_USERS), retry_str)) {
+ free(*extra_opts);
+ *extra_opts = retry_str;
+ po_replace(options, retry_options);
+ return 1;
+ }
+
+ po_destroy(retry_options);
+ free(retry_str);
+ return 0;
+}
+
+/*
+ * Attempt an NFSv2/3 mount via a mount(2) system call. If the kernel
+ * claims the requested service isn't supported on the server, probe
+ * the server to see what's supported, rewrite the mount options,
+ * and retry the request.
+ *
+ * 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 try_nfs23mount(const char *spec, const char *node,
+ int flags, struct mount_options *options,
+ int fake, char **extra_opts)
+{
+ if (po_join(options, extra_opts) == PO_FAILED) {
+ errno = EIO;
+ return 0;
+ }