GSSAPI: remove useless *_MECHANISM defines.

curl · Jul 23, 2014 · c31dec7 · c31dec7
1 parent 5b22c47
commit c31dec7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,