Commit 7bd88269 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: rpcsec_gss modules should not be used by out-of-tree code 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 468039ee

net/sunrpc/auth_gss/gss_generic_token.c

+3 −3
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ g_token_size(struct xdr_netobj *mech, unsigned int body_size) 
	return(1 + der_length_size(body_size) + body_size);

}



EXPORT_SYMBOL(g_token_size);

EXPORT_SYMBOL_GPL(g_token_size);



/* fills in a buffer with the token header.  The buffer is assumed to

   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) 
	TWRITE_STR(*buf, mech->data, ((int) mech->len));

}



EXPORT_SYMBOL(g_make_token_header);

EXPORT_SYMBOL_GPL(g_make_token_header);



/*

 * 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, 
	return(ret);

}



EXPORT_SYMBOL(g_verify_token_header);

EXPORT_SYMBOL_GPL(g_verify_token_header);

net/sunrpc/auth_gss/gss_mech_switch.c

+9 −9
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ gss_mech_register(struct gss_api_mech *gm) 
	return 0;

}



EXPORT_SYMBOL(gss_mech_register);

EXPORT_SYMBOL_GPL(gss_mech_register);



void

gss_mech_unregister(struct gss_api_mech *gm)
@@ -129,7 +129,7 @@ gss_mech_unregister(struct gss_api_mech *gm) 
	gss_mech_free(gm);

}



EXPORT_SYMBOL(gss_mech_unregister);

EXPORT_SYMBOL_GPL(gss_mech_unregister);



struct gss_api_mech *

gss_mech_get(struct gss_api_mech *gm)
@@ -138,7 +138,7 @@ gss_mech_get(struct gss_api_mech *gm) 
	return gm;

}



EXPORT_SYMBOL(gss_mech_get);

EXPORT_SYMBOL_GPL(gss_mech_get);



struct gss_api_mech *

gss_mech_get_by_name(const char *name)
@@ -158,7 +158,7 @@ gss_mech_get_by_name(const char *name) 


}



EXPORT_SYMBOL(gss_mech_get_by_name);

EXPORT_SYMBOL_GPL(gss_mech_get_by_name);



static inline int

mech_supports_pseudoflavor(struct gss_api_mech *gm, u32 pseudoflavor)
@@ -191,7 +191,7 @@ gss_mech_get_by_pseudoflavor(u32 pseudoflavor) 
	return gm;

}



EXPORT_SYMBOL(gss_mech_get_by_pseudoflavor);

EXPORT_SYMBOL_GPL(gss_mech_get_by_pseudoflavor);



u32

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) 
	}

	return RPC_AUTH_MAXFLAVOR; /* illegal value */

}

EXPORT_SYMBOL(gss_svc_to_pseudoflavor);

EXPORT_SYMBOL_GPL(gss_svc_to_pseudoflavor);



u32

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) 
	return 0;

}



EXPORT_SYMBOL(gss_pseudoflavor_to_service);

EXPORT_SYMBOL_GPL(gss_pseudoflavor_to_service);



char *

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) 
	return NULL;

}



EXPORT_SYMBOL(gss_service_to_auth_domain_name);

EXPORT_SYMBOL_GPL(gss_service_to_auth_domain_name);



void

gss_mech_put(struct gss_api_mech * gm)
@@ -242,7 +242,7 @@ gss_mech_put(struct gss_api_mech * gm) 
		module_put(gm->gm_owner);

}



EXPORT_SYMBOL(gss_mech_put);

EXPORT_SYMBOL_GPL(gss_mech_put);



/* The mech could probably be determined from the token instead, but it's just

 * as easy for now to pass it in. */

net/sunrpc/auth_gss/svcauth_gss.c

+2 −2
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ u32 svcauth_gss_flavor(struct auth_domain *dom) 
	return gd->pseudoflavor;

}



EXPORT_SYMBOL(svcauth_gss_flavor);

EXPORT_SYMBOL_GPL(svcauth_gss_flavor);



int

svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name)
@@ -780,7 +780,7 @@ svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name) 
	return stat;

}



EXPORT_SYMBOL(svcauth_gss_register_pseudoflavor);

EXPORT_SYMBOL_GPL(svcauth_gss_register_pseudoflavor);



static inline int

read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj)