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

Merge branch 'master' into lukeh/moonshot

Browse Source 
Conflicts:
	lib/gssapi/mech/gss_mech_switch.c
This commit is contained in:
Luke Howard
2011-05-13 00:19:01 +02:00
parent 4933215778 b323601091
commit 5dc4aeee49
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gssapi/mech/gss_mech_switch.c
View File

@@ -379,7 +379,7 @@ _gss_load_mech(void)
if (m->gm_mech.gm_inquire_names_for_mech) if (m->gm_mech.gm_inquire_names_for_mech)
(*m->gm_mech.gm_inquire_names_for_mech)(&minor_status, (*m->gm_mech.gm_inquire_names_for_mech)(&minor_status,
&m->gm_mech.gm_mech_oid, &m->gm_name_types); &m->gm_mech.gm_mech_oid, &m->gm_name_types);
if (m->gm_name_types == NULL) if (m->gm_name_types == NULL)
gss_create_empty_oid_set(&minor_status, &m->gm_name_types); gss_create_empty_oid_set(&minor_status, &m->gm_name_types);