diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:32 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:32 -0500 |
commit | 7bd8826915989f1bd6917c11b0a4151b129e68cb (patch) | |
tree | 49aabaf0cefd07c91ab622358550acab8545cfb4 /net/sunrpc | |
parent | 468039ee469c5772d3e39f736923c5e0c31017e2 (diff) |
SUNRPC: rpcsec_gss modules should not be used by out-of-tree code
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/auth_gss/gss_generic_token.c | 6 | ||||
-rw-r--r-- | net/sunrpc/auth_gss/gss_mech_switch.c | 18 | ||||
-rw-r--r-- | net/sunrpc/auth_gss/svcauth_gss.c | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/net/sunrpc/auth_gss/gss_generic_token.c b/net/sunrpc/auth_gss/gss_generic_token.c index d83b881685fe..c0ba39c4f5f2 100644 --- a/net/sunrpc/auth_gss/gss_generic_token.c +++ b/net/sunrpc/auth_gss/gss_generic_token.c | |||
@@ -152,7 +152,7 @@ g_token_size(struct xdr_netobj *mech, unsigned int body_size) | |||
152 | return(1 + der_length_size(body_size) + body_size); | 152 | return(1 + der_length_size(body_size) + body_size); |
153 | } | 153 | } |
154 | 154 | ||
155 | EXPORT_SYMBOL(g_token_size); | 155 | EXPORT_SYMBOL_GPL(g_token_size); |
156 | 156 | ||
157 | /* fills in a buffer with the token header. The buffer is assumed to | 157 | /* fills in a buffer with the token header. The buffer is assumed to |
158 | be the right size. buf is advanced past the token header */ | 158 | be the right size. buf is advanced past the token header */ |
@@ -167,7 +167,7 @@ g_make_token_header(struct xdr_netobj *mech, int body_size, unsigned char **buf) | |||
167 | TWRITE_STR(*buf, mech->data, ((int) mech->len)); | 167 | TWRITE_STR(*buf, mech->data, ((int) mech->len)); |
168 | } | 168 | } |
169 | 169 | ||
170 | EXPORT_SYMBOL(g_make_token_header); | 170 | EXPORT_SYMBOL_GPL(g_make_token_header); |
171 | 171 | ||
172 | /* | 172 | /* |
173 | * Given a buffer containing a token, reads and verifies the token, | 173 | * Given a buffer containing a token, reads and verifies the token, |
@@ -231,5 +231,5 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size, | |||
231 | return(ret); | 231 | return(ret); |
232 | } | 232 | } |
233 | 233 | ||
234 | EXPORT_SYMBOL(g_verify_token_header); | 234 | EXPORT_SYMBOL_GPL(g_verify_token_header); |
235 | 235 | ||
diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c index bce9d527af08..6efbb0cd3c7c 100644 --- a/net/sunrpc/auth_gss/gss_mech_switch.c +++ b/net/sunrpc/auth_gss/gss_mech_switch.c | |||
@@ -117,7 +117,7 @@ gss_mech_register(struct gss_api_mech *gm) | |||
117 | return 0; | 117 | return 0; |
118 | } | 118 | } |
119 | 119 | ||
120 | EXPORT_SYMBOL(gss_mech_register); | 120 | EXPORT_SYMBOL_GPL(gss_mech_register); |
121 | 121 | ||
122 | void | 122 | void |
123 | gss_mech_unregister(struct gss_api_mech *gm) | 123 | gss_mech_unregister(struct gss_api_mech *gm) |
@@ -129,7 +129,7 @@ gss_mech_unregister(struct gss_api_mech *gm) | |||
129 | gss_mech_free(gm); | 129 | gss_mech_free(gm); |
130 | } | 130 | } |
131 | 131 | ||
132 | EXPORT_SYMBOL(gss_mech_unregister); | 132 | EXPORT_SYMBOL_GPL(gss_mech_unregister); |
133 | 133 | ||
134 | struct gss_api_mech * | 134 | struct gss_api_mech * |
135 | gss_mech_get(struct gss_api_mech *gm) | 135 | gss_mech_get(struct gss_api_mech *gm) |
@@ -138,7 +138,7 @@ gss_mech_get(struct gss_api_mech *gm) | |||
138 | return gm; | 138 | return gm; |
139 | } | 139 | } |
140 | 140 | ||
141 | EXPORT_SYMBOL(gss_mech_get); | 141 | EXPORT_SYMBOL_GPL(gss_mech_get); |
142 | 142 | ||
143 | struct gss_api_mech * | 143 | struct gss_api_mech * |
144 | gss_mech_get_by_name(const char *name) | 144 | gss_mech_get_by_name(const char *name) |
@@ -158,7 +158,7 @@ gss_mech_get_by_name(const char *name) | |||
158 | 158 | ||
159 | } | 159 | } |
160 | 160 | ||
161 | EXPORT_SYMBOL(gss_mech_get_by_name); | 161 | EXPORT_SYMBOL_GPL(gss_mech_get_by_name); |
162 | 162 | ||
163 | static inline int | 163 | static inline int |
164 | mech_supports_pseudoflavor(struct gss_api_mech *gm, u32 pseudoflavor) | 164 | mech_supports_pseudoflavor(struct gss_api_mech *gm, u32 pseudoflavor) |
@@ -191,7 +191,7 @@ gss_mech_get_by_pseudoflavor(u32 pseudoflavor) | |||
191 | return gm; | 191 | return gm; |
192 | } | 192 | } |
193 | 193 | ||
194 | EXPORT_SYMBOL(gss_mech_get_by_pseudoflavor); | 194 | EXPORT_SYMBOL_GPL(gss_mech_get_by_pseudoflavor); |
195 | 195 | ||
196 | u32 | 196 | u32 |
197 | gss_svc_to_pseudoflavor(struct gss_api_mech *gm, u32 service) | 197 | gss_svc_to_pseudoflavor(struct gss_api_mech *gm, u32 service) |
@@ -205,7 +205,7 @@ gss_svc_to_pseudoflavor(struct gss_api_mech *gm, u32 service) | |||
205 | } | 205 | } |
206 | return RPC_AUTH_MAXFLAVOR; /* illegal value */ | 206 | return RPC_AUTH_MAXFLAVOR; /* illegal value */ |
207 | } | 207 | } |
208 | EXPORT_SYMBOL(gss_svc_to_pseudoflavor); | 208 | EXPORT_SYMBOL_GPL(gss_svc_to_pseudoflavor); |
209 | 209 | ||
210 | u32 | 210 | u32 |
211 | gss_pseudoflavor_to_service(struct gss_api_mech *gm, u32 pseudoflavor) | 211 | gss_pseudoflavor_to_service(struct gss_api_mech *gm, u32 pseudoflavor) |
@@ -219,7 +219,7 @@ gss_pseudoflavor_to_service(struct gss_api_mech *gm, u32 pseudoflavor) | |||
219 | return 0; | 219 | return 0; |
220 | } | 220 | } |
221 | 221 | ||
222 | EXPORT_SYMBOL(gss_pseudoflavor_to_service); | 222 | EXPORT_SYMBOL_GPL(gss_pseudoflavor_to_service); |
223 | 223 | ||
224 | char * | 224 | char * |
225 | gss_service_to_auth_domain_name(struct gss_api_mech *gm, u32 service) | 225 | gss_service_to_auth_domain_name(struct gss_api_mech *gm, u32 service) |
@@ -233,7 +233,7 @@ gss_service_to_auth_domain_name(struct gss_api_mech *gm, u32 service) | |||
233 | return NULL; | 233 | return NULL; |
234 | } | 234 | } |
235 | 235 | ||
236 | EXPORT_SYMBOL(gss_service_to_auth_domain_name); | 236 | EXPORT_SYMBOL_GPL(gss_service_to_auth_domain_name); |
237 | 237 | ||
238 | void | 238 | void |
239 | gss_mech_put(struct gss_api_mech * gm) | 239 | gss_mech_put(struct gss_api_mech * gm) |
@@ -242,7 +242,7 @@ gss_mech_put(struct gss_api_mech * gm) | |||
242 | module_put(gm->gm_owner); | 242 | module_put(gm->gm_owner); |
243 | } | 243 | } |
244 | 244 | ||
245 | EXPORT_SYMBOL(gss_mech_put); | 245 | EXPORT_SYMBOL_GPL(gss_mech_put); |
246 | 246 | ||
247 | /* The mech could probably be determined from the token instead, but it's just | 247 | /* The mech could probably be determined from the token instead, but it's just |
248 | * as easy for now to pass it in. */ | 248 | * as easy for now to pass it in. */ |
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 81ae3d62a0cc..12803da95dc4 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c | |||
@@ -746,7 +746,7 @@ u32 svcauth_gss_flavor(struct auth_domain *dom) | |||
746 | return gd->pseudoflavor; | 746 | return gd->pseudoflavor; |
747 | } | 747 | } |
748 | 748 | ||
749 | EXPORT_SYMBOL(svcauth_gss_flavor); | 749 | EXPORT_SYMBOL_GPL(svcauth_gss_flavor); |
750 | 750 | ||
751 | int | 751 | int |
752 | svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name) | 752 | svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name) |
@@ -780,7 +780,7 @@ out: | |||
780 | return stat; | 780 | return stat; |
781 | } | 781 | } |
782 | 782 | ||
783 | EXPORT_SYMBOL(svcauth_gss_register_pseudoflavor); | 783 | EXPORT_SYMBOL_GPL(svcauth_gss_register_pseudoflavor); |
784 | 784 | ||
785 | static inline int | 785 | static inline int |
786 | read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj) | 786 | read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj) |