aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorUsha Ketineni <ketineni@us.ibm.com>2007-07-17 07:04:50 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 13:23:08 -0400
commitae4c40b1d81f5299c04330306736b2f0f0539f4b (patch)
tree353db1c539cd8dfe67d5a4180519322b3adb4607 /net
parent91fe39d35ebd6adaece4e090f6b1a3e4b6a59c97 (diff)
knfsd: rpc: add gss krb5 and spkm3 oid values
Adds oid values to the gss_api mechanism structures. On the NFSV4 server side, these are required as part of the security triple (oid,qop,service) information being sent in the response of the SECINFO operation. Signed-off-by: Usha Ketineni <uketinen@us.ibm.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/auth_gss/gss_krb5_mech.c1
-rw-r--r--net/sunrpc/auth_gss/gss_spkm3_mech.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/sunrpc/auth_gss/gss_krb5_mech.c b/net/sunrpc/auth_gss/gss_krb5_mech.c
index 71b9daefdff3..9843eacef11d 100644
--- a/net/sunrpc/auth_gss/gss_krb5_mech.c
+++ b/net/sunrpc/auth_gss/gss_krb5_mech.c
@@ -231,6 +231,7 @@ static struct pf_desc gss_kerberos_pfs[] = {
231static struct gss_api_mech gss_kerberos_mech = { 231static struct gss_api_mech gss_kerberos_mech = {
232 .gm_name = "krb5", 232 .gm_name = "krb5",
233 .gm_owner = THIS_MODULE, 233 .gm_owner = THIS_MODULE,
234 .gm_oid = {9, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02"},
234 .gm_ops = &gss_kerberos_ops, 235 .gm_ops = &gss_kerberos_ops,
235 .gm_pf_num = ARRAY_SIZE(gss_kerberos_pfs), 236 .gm_pf_num = ARRAY_SIZE(gss_kerberos_pfs),
236 .gm_pfs = gss_kerberos_pfs, 237 .gm_pfs = gss_kerberos_pfs,
diff --git a/net/sunrpc/auth_gss/gss_spkm3_mech.c b/net/sunrpc/auth_gss/gss_spkm3_mech.c
index 577d590e755f..5deb4b6e4514 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_mech.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_mech.c
@@ -217,6 +217,7 @@ static struct pf_desc gss_spkm3_pfs[] = {
217static struct gss_api_mech gss_spkm3_mech = { 217static struct gss_api_mech gss_spkm3_mech = {
218 .gm_name = "spkm3", 218 .gm_name = "spkm3",
219 .gm_owner = THIS_MODULE, 219 .gm_owner = THIS_MODULE,
220 .gm_oid = {7, "\053\006\001\005\005\001\003"},
220 .gm_ops = &gss_spkm3_ops, 221 .gm_ops = &gss_spkm3_ops,
221 .gm_pf_num = ARRAY_SIZE(gss_spkm3_pfs), 222 .gm_pf_num = ARRAY_SIZE(gss_spkm3_pfs),
222 .gm_pfs = gss_spkm3_pfs, 223 .gm_pfs = gss_spkm3_pfs,