diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/sunrpc/auth.h | 15 | ||||
-rw-r--r-- | include/linux/sunrpc/gss_api.h | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h index bc77c730325c..e606c2804685 100644 --- a/include/linux/sunrpc/auth.h +++ b/include/linux/sunrpc/auth.h | |||
@@ -35,7 +35,7 @@ struct rpc_credops; | |||
35 | struct rpc_cred { | 35 | struct rpc_cred { |
36 | struct hlist_node cr_hash; /* hash chain */ | 36 | struct hlist_node cr_hash; /* hash chain */ |
37 | struct rpc_auth * cr_auth; | 37 | struct rpc_auth * cr_auth; |
38 | struct rpc_credops * cr_ops; | 38 | const struct rpc_credops *cr_ops; |
39 | unsigned long cr_expire; /* when to gc */ | 39 | unsigned long cr_expire; /* when to gc */ |
40 | atomic_t cr_count; /* ref count */ | 40 | atomic_t cr_count; /* ref count */ |
41 | unsigned short cr_flags; /* various flags */ | 41 | unsigned short cr_flags; /* various flags */ |
@@ -73,7 +73,7 @@ struct rpc_auth { | |||
73 | unsigned int au_verfsize; | 73 | unsigned int au_verfsize; |
74 | 74 | ||
75 | unsigned int au_flags; /* various flags */ | 75 | unsigned int au_flags; /* various flags */ |
76 | struct rpc_authops * au_ops; /* operations */ | 76 | const struct rpc_authops *au_ops; /* operations */ |
77 | rpc_authflavor_t au_flavor; /* pseudoflavor (note may | 77 | rpc_authflavor_t au_flavor; /* pseudoflavor (note may |
78 | * differ from the flavor in | 78 | * differ from the flavor in |
79 | * au_ops->au_flavor in gss | 79 | * au_ops->au_flavor in gss |
@@ -119,14 +119,11 @@ struct rpc_credops { | |||
119 | void *, __be32 *, void *); | 119 | void *, __be32 *, void *); |
120 | }; | 120 | }; |
121 | 121 | ||
122 | extern struct rpc_authops authunix_ops; | 122 | extern const struct rpc_authops authunix_ops; |
123 | extern struct rpc_authops authnull_ops; | 123 | extern const struct rpc_authops authnull_ops; |
124 | #ifdef CONFIG_SUNRPC_SECURE | ||
125 | extern struct rpc_authops authdes_ops; | ||
126 | #endif | ||
127 | 124 | ||
128 | int rpcauth_register(struct rpc_authops *); | 125 | int rpcauth_register(const struct rpc_authops *); |
129 | int rpcauth_unregister(struct rpc_authops *); | 126 | int rpcauth_unregister(const struct rpc_authops *); |
130 | struct rpc_auth * rpcauth_create(rpc_authflavor_t, struct rpc_clnt *); | 127 | struct rpc_auth * rpcauth_create(rpc_authflavor_t, struct rpc_clnt *); |
131 | void rpcauth_release(struct rpc_auth *); | 128 | void rpcauth_release(struct rpc_auth *); |
132 | struct rpc_cred * rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *, int); | 129 | struct rpc_cred * rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *, int); |
diff --git a/include/linux/sunrpc/gss_api.h b/include/linux/sunrpc/gss_api.h index 5eca9e442051..bbac101ac372 100644 --- a/include/linux/sunrpc/gss_api.h +++ b/include/linux/sunrpc/gss_api.h | |||
@@ -77,7 +77,7 @@ struct gss_api_mech { | |||
77 | struct module *gm_owner; | 77 | struct module *gm_owner; |
78 | struct xdr_netobj gm_oid; | 78 | struct xdr_netobj gm_oid; |
79 | char *gm_name; | 79 | char *gm_name; |
80 | struct gss_api_ops *gm_ops; | 80 | const struct gss_api_ops *gm_ops; |
81 | /* pseudoflavors supported by this mechanism: */ | 81 | /* pseudoflavors supported by this mechanism: */ |
82 | int gm_pf_num; | 82 | int gm_pf_num; |
83 | struct pf_desc * gm_pfs; | 83 | struct pf_desc * gm_pfs; |