Commit 8efc11a0 authored Jul 23, 2014 by Patrick Monnerat

GSSAPI: private export mechanisms OIDs. OS400: Make RPG binding up to date.

parent 2cd0c2d2

lib/config-os400.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -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

lib/curl_gssapi.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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,

lib/curl_gssapi.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -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 */

packages/OS400/curl.inc.in

+5 −4

Original line number	Diff line number	Diff line
		@@ -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...