projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve minor conflict in merge.
[mech_eap.git]
/
mech_eap
/
add_cred_with_password.c
diff --git
a/mech_eap/add_cred_with_password.c
b/mech_eap/add_cred_with_password.c
index
b982f0d
..
742e562
100644
(file)
--- a/
mech_eap/add_cred_with_password.c
+++ b/
mech_eap/add_cred_with_password.c
@@
-38,8
+38,13
@@
OM_uint32 GSSAPI_CALLCONV
gss_add_cred_with_password(OM_uint32 *minor,
OM_uint32 GSSAPI_CALLCONV
gss_add_cred_with_password(OM_uint32 *minor,
+#ifdef HAVE_HEIMDAL_VERSION
+ gss_const_cred_id_t input_cred_handle GSSEAP_UNUSED,
+ gss_const_name_t desired_name,
+#else
const gss_cred_id_t input_cred_handle GSSEAP_UNUSED,
const gss_name_t desired_name,
const gss_cred_id_t input_cred_handle GSSEAP_UNUSED,
const gss_name_t desired_name,
+#endif
const gss_OID desired_mech,
const gss_buffer_t password,
gss_cred_usage_t cred_usage,
const gss_OID desired_mech,
const gss_buffer_t password,
gss_cred_usage_t cred_usage,