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_context.c
diff --git
a/mech_eap/util_context.c
b/mech_eap/util_context.c
index
7663f3d
..
039cfdb
100644
(file)
--- a/
mech_eap/util_context.c
+++ b/
mech_eap/util_context.c
@@
-214,7
+214,7
@@
gssEapVerifyToken(OM_uint32 *minor,
OM_uint32
gssEapContextTime(OM_uint32 *minor,
- gss_ctx_id_t context_handle,
+ gss_c
onst_c
tx_id_t context_handle,
OM_uint32 *time_rec)
{
*minor = 0;