Imported upstream 1.2.8

[nfs-utils.git] / utils / mount / stropts.c

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 9b4197b7f93d812958da2b4eaffd73cba5600836..1dc38ef27ba50a83e8f221e1d18fb0fcfb3ae3bf 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -542,6 +542,8 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options)
                        errno = EACCES;
                else if (rpc_createerr.cf_stat == RPC_TIMEDOUT)
                        errno = ETIMEDOUT;
+               else if (rpc_createerr.cf_stat == RPC_PROGVERSMISMATCH)
+                       errno = EPROTONOSUPPORT;
                else if (rpc_createerr.cf_error.re_errno != 0)
                        errno = rpc_createerr.cf_error.re_errno;
                return 0;
@@ -666,6 +668,7 @@ static int nfs_try_mount_v3v2(struct nfsmount_info *mi)
                case EOPNOTSUPP:
                case EHOSTUNREACH:
                case ETIMEDOUT:
+               case EACCES:
                        continue;
                default:
                        goto out;
@@ -761,6 +764,7 @@ static int nfs_try_mount_v4(struct nfsmount_info *mi)
                case ECONNREFUSED:
                case EHOSTUNREACH:
                case ETIMEDOUT:
+               case EACCES:
                        continue;
                default:
                        goto out;