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
/
util_moonshot.c
diff --git
a/mech_eap/util_moonshot.c
b/mech_eap/util_moonshot.c
index
68537a3
..
6d90eb2
100644
(file)
--- a/
mech_eap/util_moonshot.c
+++ b/
mech_eap/util_moonshot.c
@@
-141,7
+141,7
@@
static int stringEmpty(const char * s)
OM_uint32
libMoonshotResolveInitiatorCred(OM_uint32 *minor,
gss_cred_id_t cred,
-
const gss
_name_t targetName)
+
gss_const
_name_t targetName)
{
OM_uint32 major, tmpMinor;
gss_OID nameMech = gssEapPrimaryMechForCred(cred);