Merge branch 'master' into lukeh/acquire-cred-ex-moonshot-integ

Conflicts:
	lib/gssapi/Makefile.am
	lib/gssapi/mech/gss_acquire_cred_with_password.c
	lib/gssapi/test_context.c
	lib/gssapi/version-script.map
This commit is contained in:
Luke Howard
2011-05-14 16:48:49 +02:00
24 changed files with 1185 additions and 221 deletions

View File

@@ -324,6 +324,11 @@ static gssapi_mech_interface_desc krb5_mech = {
NULL,
krb5_mo,
sizeof(krb5_mo) / sizeof(krb5_mo[0]),
_gsskrb5_pname_to_uid,
_gsskrb5_authorize_localname,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,