From: Patrick Monnerat <pm@datasphere.ch>
Date: Wed, 23 Jul 2014 16:56:19 +0000 (+0200)
Subject: GSSAPI: remove useless *_MECHANISM defines.
X-Git-Tag: curl-7_38_0~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c31dec7f9856add0bf1106d6b48a6269d6c77c95;p=thirdparty%2Fcurl.git

GSSAPI: remove useless *_MECHANISM defines.
---

diff --git a/lib/curl_gssapi.h b/lib/curl_gssapi.h
index 4559ef06c9..b91bd7ea76 100644
--- a/lib/curl_gssapi.h
+++ b/lib/curl_gssapi.h
@@ -39,14 +39,8 @@
 #  include <gssapi.h>
 #endif
 
-#ifndef SPNEGO_MECHANISM
 extern gss_OID_desc Curl_spnego_mech_oid;
-#define SPNEGO_MECHANISM &Curl_spnego_mech_oid
-#endif
-#ifndef KRB5_MECHANISM
 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/lib/http_negotiate.c b/lib/http_negotiate.c
index 4b657cfa23..c8bfa29bf1 100644
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -147,7 +147,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
                                            &minor_status,
                                            &neg_ctx->context,
                                            neg_ctx->server_name,
-                                           SPNEGO_MECHANISM,
+                                           &Curl_spnego_mech_oid,
                                            GSS_C_NO_CHANNEL_BINDINGS,
                                            &input_token,
                                            &output_token,
diff --git a/lib/krb5.c b/lib/krb5.c
index 10a79aaa4c..7e82a6805b 100644
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -236,7 +236,7 @@ krb5_auth(void *app_data, struct connectdata *conn)
                                       &min,
                                       context,
                                       gssname,
-                                      KRB5_MECHANISM,
+                                      &Curl_krb5_mech_oid,
                                       &chan,
                                       gssresp,
                                       &output_buffer,
diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 228688eb1a..0eaa74c2b7 100644
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -181,7 +181,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
                                                  &gss_minor_status,
                                                  &gss_context,
                                                  server,
-                                                 KRB5_MECHANISM,
+                                                 &Curl_krb5_mech_oid,
                                                  NULL,
                                                  gss_token,
                                                  &gss_send_token,