From 8efc11a0c1be6a460d3abc4bb8a02f4bc8e24ee3 Mon Sep 17 00:00:00 2001
From: Patrick Monnerat <pm@datasphere.ch>
Date: Wed, 23 Jul 2014 16:15:01 +0200
Subject: [PATCH] GSSAPI: private export mechanisms OIDs. OS400: Make RPG
binding up to date.
---
lib/config-os400.h | 9 +++++++++
lib/curl_gssapi.c | 6 +++---
lib/curl_gssapi.h | 8 ++++----
packages/OS400/curl.inc.in | 9 +++++----
4 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/lib/config-os400.h b/lib/config-os400.h
index 8896277802..e65e30acda 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 7a2f84a7dc..232b3ef9f2 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 ff752d552d..4559ef06c9 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 */
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 565df6198c..3f973cc2c4 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -94,7 +94,7 @@
d CURL_VERSION_NTLM...
d c X'00000010'
d CURL_VERSION_GSSNEGOTIATE...
- d c X'00000020'
+ d c X'00000020' Deprecated
d CURL_VERSION_DEBUG...
d c X'00000040'
d CURL_VERSION_ASYNCHDNS...
@@ -117,6 +117,8 @@
d c X'00008000'
d CURL_VERSION_HTTP2...
d c X'00010000'
+ d CURL_VERSION_GSSAPI...
+ d c X'00020000'
*
d HTTPPOST_FILENAME...
d c X'00000001'
@@ -152,7 +154,7 @@
d CURLAUTH_BASIC c X'00000001'
d CURLAUTH_DIGEST...
d c X'00000002'
- d CURLAUTH_GSSNEGOTIATE...
+ d CURLAUTH_NEGOTIATE...
d c X'00000004'
d CURLAUTH_NTLM c X'00000008'
d CURLAUTH_DIGEST_IE...
@@ -362,8 +364,7 @@
d c 14
d CURLE_FTP_CANT_GET_HOST...
d c 15
- d CURLE_OBSOLETE16...
- d c 16
+ d CURLE_HTTP2 c 16
d CURLE_FTP_COULDNT_SET_TYPE...
d c 17
d CURLE_PARTIAL_FILE...
--
GitLab