NFSv4.1: try SECINFO_NO_NAME flavs until one works
Subsystems (2)
PATCH 1/1 NFSv4.1: try SECINFO_NO_NAME flavs until one works
Call nfs4_lookup_root_sec for each flavor returned by SECINFO_NO_NAME until one works.
Signed-off-by Weston Andros Adamson <[email protected]>
--- fs/nfs/nfs4proc.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
fs/nfs/nfs4proc.c +22 -3
@@ -7566,6 +7566,8 @@ nfs41_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,struct page *page;rpc_authflavor_t flavor;struct nfs4_secinfo_flavors *flavors; +struct nfs4_secinfo4 *secinfo; +int i; page =alloc_page (GFP_KERNEL );if (!page) {
@@ -7587,9 +7589,26 @@ nfs41_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,if (err) goto out_freepage; - flavor =nfs_find_best_sec (flavors); -if (err ==0 ) - err =nfs4_lookup_root_sec (server, fhandle, info, flavor); +for (i =0 ; i < flavors->num_flavors; i++) { + secinfo = &flavors->flavors[i]; + +switch (secinfo->flavor) { +case RPC_AUTH_NULL : +case RPC_AUTH_UNIX : +case RPC_AUTH_GSS : + flavor =rpcauth_get_pseudoflavor (secinfo->flavor, + &secinfo->flavor_info); +break ; + } + +if (flavor !=RPC_AUTH_MAXFLAVOR ) { + err =nfs4_lookup_root_sec (server, fhandle, + info, flavor); + +if (!err) +break ; + } + } out_freepage:put_page (page);
Signature · 1 line
1.7.12.4 (Apple Git-37)
Bah, ignore this. Reposting….
-dros
Quoted 54 lines · Weston Andros Adamson
Call
nfs4_lookup_root_secfor each flavor returned bySECINFO_NO_NAMEuntil one works.Signed-off-by Weston Andros Adamson <[email protected]>---
fs/nfs/nfs4proc.c| 25 ++++++++++++++++++++++---1 file changed, 22 insertions(+), 3 deletions(-)fs/nfs/nfs4proc.c +22
-3@@ -7566,6 +7566,8 @@ nfs41_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,struct page *page;rpc_authflavor_t flavor;struct nfs4_secinfo_flavors *flavors; +struct nfs4_secinfo4 *secinfo; +int i; page =alloc_page (GFP_KERNEL );if (!page) {@@ -7587,9 +7589,26 @@ nfs41_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,if (err) goto out_freepage; - flavor =nfs_find_best_sec (flavors); -if (err ==0 ) - err =nfs4_lookup_root_sec (server, fhandle, info, flavor); +for (i =0 ; i < flavors->num_flavors; i++) { + secinfo = &flavors->flavors[i]; + +switch (secinfo->flavor) { +case RPC_AUTH_NULL : +case RPC_AUTH_UNIX : +case RPC_AUTH_GSS : + flavor =rpcauth_get_pseudoflavor (secinfo->flavor, + &secinfo->flavor_info); +break ; + } + +if (flavor !=RPC_AUTH_MAXFLAVOR ) { + err =nfs4_lookup_root_sec (server, fhandle, + info, flavor); + +if (!err) +break ; + } + }
out_freepage:put_page(page);Signature · 1 line
1.7.12.4 (Apple Git-37)