NFS: Change initial mount authflavor only when server returns NFS4ERR_WRONGSEC

PATCH New Bryan Schumaker 1 participant 1 message Apr 7, 2011

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Bryan Schumaker

author

2011-04-07 20:02 UTC #0 lore raw

PATCH 1/1 NFS: Change initial mount authflavor only when server returns NFS4ERR_WRONGSEC

When attempting an initial mount, we should only attempt other authflavors if AUTH_UNIX receives a NFS4ERR_WRONGSEC error. This allows other errors to be passed back to userspace programs.

Signed-off-by Bryan Schumaker <[email protected]>

---

fs/nfs/nfs4proc.c +1 -3

index dfd1e6d..9bf41ea 100644
@@ -2204,8 +2204,6 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl
 		goto out;
 	}
 	ret = nfs4_lookup_root(server, fhandle, info);
-	if (ret < 0)
-		ret = -EAGAIN;
 out:
 	return ret;
 }

@@ -2226,7 +2224,7 @@ static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
 
 	for (i = 0; i < len; i++) {
 		status = nfs4_lookup_root_sec(server, fhandle, info, flav_array[i]);
-		if (status == 0)
+		if (status != -EPERM)
 			break;
 	}
 	if (status == 0)