oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

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

Browse Source 
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
parent 3069d80734 2a8dc252b6
commit dfba868910
24 changed files with 1185 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gssapi/test_context.c
View File

@@ -581,7 +581,7 @@ main(int argc, char **argv)
credential_type, &credential_data,
0, GSS_C_NO_OID, GSS_C_INITIATE, &client_cred);
if (GSS_ERROR(maj_stat))
errx(1, "gss_acquire_cred_ex: %s",
errx(1, "gss_acquire_cred_ext: %s",
gssapi_err(maj_stat, min_stat, GSS_C_NO_OID));
gss_release_name(&min_stat, &cname);
} else if (credential_type) {