diff options
author | Patrick Monnerat <pm@datasphere.ch> | 2014-07-23 16:15:01 +0200 |
---|---|---|
committer | Patrick Monnerat <pm@datasphere.ch> | 2014-07-23 16:15:01 +0200 |
commit | 8efc11a0c1be6a460d3abc4bb8a02f4bc8e24ee3 (patch) | |
tree | 6b346461db42dac54ee4eb17e049d9773dc88043 /lib | |
parent | 2cd0c2d244a95f1c9e21a8854234023ceec194b6 (diff) |
GSSAPI: private export mechanisms OIDs. OS400: Make RPG binding up to date.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/config-os400.h | 9 | ||||
-rw-r--r-- | lib/curl_gssapi.c | 6 | ||||
-rw-r--r-- | lib/curl_gssapi.h | 8 |
3 files changed, 16 insertions, 7 deletions
diff --git a/lib/config-os400.h b/lib/config-os400.h index 889627780..e65e30acd 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -175,6 +175,15 @@ /* Define if you have GSS API. */ #define HAVE_GSSAPI +/* Define if you have the GNU gssapi libraries */ +#undef HAVE_GSSGNU + +/* Define if you have the Heimdal gssapi libraries */ +#define HAVE_GSSHEIMDAL + +/* Define if you have the MIT gssapi libraries */ +#undef HAVE_GSSMIT + /* Define if you have the `ucb' library (-lucb). */ #undef HAVE_LIBUCB diff --git a/lib/curl_gssapi.c b/lib/curl_gssapi.c index 7a2f84a7d..232b3ef9f 100644 --- a/lib/curl_gssapi.c +++ b/lib/curl_gssapi.c @@ -27,10 +27,10 @@ #include "curl_gssapi.h" #include "sendf.h" -static const char spengo_oid_bytes[] = "\x2b\x06\x01\x05\x05\x02"; -gss_OID_desc spnego_mech_oid = { 6, &spengo_oid_bytes }; +static const char spnego_oid_bytes[] = "\x2b\x06\x01\x05\x05\x02"; +gss_OID_desc Curl_spnego_mech_oid = { 6, &spnego_oid_bytes }; static const char krb5_oid_bytes[] = "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02"; -gss_OID_desc krb5_mech_oid = { 9, &krb5_oid_bytes }; +gss_OID_desc Curl_krb5_mech_oid = { 9, &krb5_oid_bytes }; OM_uint32 Curl_gss_init_sec_context( struct SessionHandle *data, diff --git a/lib/curl_gssapi.h b/lib/curl_gssapi.h index ff752d552..4559ef06c 100644 --- a/lib/curl_gssapi.h +++ b/lib/curl_gssapi.h @@ -40,12 +40,12 @@ #endif #ifndef SPNEGO_MECHANISM -CURL_EXTERN gss_OID_desc spnego_mech_oid; -#define SPNEGO_MECHANISM &spnego_mech_oid +extern gss_OID_desc Curl_spnego_mech_oid; +#define SPNEGO_MECHANISM &Curl_spnego_mech_oid #endif #ifndef KRB5_MECHANISM -CURL_EXTERN gss_OID_desc krb5_mech_oid; -#define KRB5_MECHANISM &krb5_mech_oid +extern gss_OID_desc Curl_krb5_mech_oid; +#define KRB5_MECHANISM &Curl_krb5_mech_oid #endif /* Common method for using GSS-API */ |