Commit 058c5c99 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

rpc: allow autoloading of gss mechanisms 



Remove the need for an explicit modprobe of rpcsec_gss_krb5.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 13e0e958

net/sunrpc/auth_gss/gss_krb5_mech.c

+7 −0
Original line number Diff line number Diff line
@@ -744,6 +744,13 @@ static struct pf_desc gss_kerberos_pfs[] = { 
	},

};



MODULE_ALIAS("rpc-auth-gss-krb5");

MODULE_ALIAS("rpc-auth-gss-krb5i");

MODULE_ALIAS("rpc-auth-gss-krb5p");

MODULE_ALIAS("rpc-auth-gss-390003");

MODULE_ALIAS("rpc-auth-gss-390004");

MODULE_ALIAS("rpc-auth-gss-390005");



static struct gss_api_mech gss_kerberos_mech = {

	.gm_name	= "krb5",

	.gm_owner	= THIS_MODULE,

net/sunrpc/auth_gss/gss_mech_switch.c

+28 −4
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ gss_mech_get(struct gss_api_mech *gm) 
EXPORT_SYMBOL_GPL(gss_mech_get);



struct gss_api_mech *

gss_mech_get_by_name(const char *name)

_gss_mech_get_by_name(const char *name)

{

	struct gss_api_mech	*pos, *gm = NULL;
@@ -158,6 +158,17 @@ gss_mech_get_by_name(const char *name) 


}



struct gss_api_mech * gss_mech_get_by_name(const char *name)

{

	struct gss_api_mech *gm = NULL;



	gm = _gss_mech_get_by_name(name);

	if (!gm) {

		request_module("rpc-auth-gss-%s", name);

		gm = _gss_mech_get_by_name(name);

	}

	return gm;

}

EXPORT_SYMBOL_GPL(gss_mech_get_by_name);



struct gss_api_mech *
@@ -194,10 +205,9 @@ mech_supports_pseudoflavor(struct gss_api_mech *gm, u32 pseudoflavor) 
	return 0;

}



struct gss_api_mech *

gss_mech_get_by_pseudoflavor(u32 pseudoflavor)

struct gss_api_mech *_gss_mech_get_by_pseudoflavor(u32 pseudoflavor)

{

	struct gss_api_mech *pos, *gm = NULL;

	struct gss_api_mech *gm = NULL, *pos;



	spin_lock(&registered_mechs_lock);

	list_for_each_entry(pos, &registered_mechs, gm_list) {
@@ -213,6 +223,20 @@ gss_mech_get_by_pseudoflavor(u32 pseudoflavor) 
	return gm;

}



struct gss_api_mech *

gss_mech_get_by_pseudoflavor(u32 pseudoflavor)

{

	struct gss_api_mech *gm;



	gm = _gss_mech_get_by_pseudoflavor(pseudoflavor);



	if (!gm) {

		request_module("rpc-auth-gss-%u", pseudoflavor);

		gm = _gss_mech_get_by_pseudoflavor(pseudoflavor);

	}

	return gm;

}



EXPORT_SYMBOL_GPL(gss_mech_get_by_pseudoflavor);



int gss_mech_list_pseudoflavors(rpc_authflavor_t *array_ptr)