projects
/
mech_eap.orig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make gssEapImportContext un-static for other internal consumers
[mech_eap.orig]
/
mech_eap
/
import_sec_context.c
diff --git
a/mech_eap/import_sec_context.c
b/mech_eap/import_sec_context.c
index
d571bca
..
9e824fa
100644
(file)
--- a/
mech_eap/import_sec_context.c
+++ b/
mech_eap/import_sec_context.c
@@
-48,6
+48,7
@@
} \
} while (0)
} \
} while (0)
+#ifdef GSSEAP_ENABLE_ACCEPTOR
static OM_uint32
gssEapImportPartialContext(OM_uint32 *minor,
unsigned char **pBuf,
static OM_uint32
gssEapImportPartialContext(OM_uint32 *minor,
unsigned char **pBuf,
@@
-113,6
+114,7
@@
gssEapImportPartialContext(OM_uint32 *minor,
return GSS_S_COMPLETE;
}
return GSS_S_COMPLETE;
}
+#endif /* GSSEAP_ENABLE_ACCEPTOR */
static OM_uint32
importMechanismOid(OM_uint32 *minor,
static OM_uint32
importMechanismOid(OM_uint32 *minor,
@@
-232,7
+234,7
@@
importName(OM_uint32 *minor,
return GSS_S_COMPLETE;
}
return GSS_S_COMPLETE;
}
-
static
OM_uint32
+OM_uint32
gssEapImportContext(OM_uint32 *minor,
gss_buffer_t token,
gss_ctx_id_t ctx)
gssEapImportContext(OM_uint32 *minor,
gss_buffer_t token,
gss_ctx_id_t ctx)
@@
-304,6
+306,7
@@
gssEapImportContext(OM_uint32 *minor,
if (GSS_ERROR(major))
return major;
if (GSS_ERROR(major))
return major;
+#ifdef GSSEAP_ENABLE_ACCEPTOR
/*
* The partial context should only be expected for unestablished
* acceptor contexts.
/*
* The partial context should only be expected for unestablished
* acceptor contexts.
@@
-318,6
+321,7
@@
gssEapImportContext(OM_uint32 *minor,
#ifdef GSSEAP_DEBUG
assert(remain == 0);
#endif
#ifdef GSSEAP_DEBUG
assert(remain == 0);
#endif
+#endif /* GSSEAP_ENABLE_ACCEPTOR */
major = GSS_S_COMPLETE;
*minor = 0;
major = GSS_S_COMPLETE;
*minor = 0;
@@
-325,7
+329,7
@@
gssEapImportContext(OM_uint32 *minor,
return major;
}
return major;
}
-OM_uint32
+OM_uint32
GSSAPI_CALLCONV
gss_import_sec_context(OM_uint32 *minor,
gss_buffer_t interprocess_token,
gss_ctx_id_t *context_handle)
gss_import_sec_context(OM_uint32 *minor,
gss_buffer_t interprocess_token,
gss_ctx_id_t *context_handle)