Commit 355bf01c authored by Steve Holme's avatar Steve Holme
Browse files

gssapi: Remove need for duplicated GSS_C_NT_HOSTBASED_SERVICE definitions 

Better code reuse and consistency in calls to gss_import_name().
parent 99e71e6a

lib/curl_gssapi.h

+12 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2011 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 2011 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -59,6 +59,17 @@ OM_uint32 Curl_gss_init_sec_context( 
void Curl_gss_log_error(struct SessionHandle *data, OM_uint32 status,

                        const char *prefix);



/* Provide some definitions missing in old headers */

#ifdef HAVE_OLD_GSSMIT

#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name

#define NCOMPAT 1

#endif



/* Define our privacy and integrity protection values */

#define GSSAUTH_P_NONE      1

#define GSSAUTH_P_INTEGRITY 2

#define GSSAUTH_P_PRIVACY   4



#endif /* HAVE_GSSAPI */



#endif /* HEADER_CURL_GSSAPI_H */

lib/curl_sasl_gssapi.c

+1 −10
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2014, Steve Holme, <steve_holme@hotmail.com>.

 * Copyright (C) 2014 - 2015, Steve Holme, <steve_holme@hotmail.com>.

 * Copyright (C) 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which
@@ -27,15 +27,6 @@ 


#if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5)



#ifdef HAVE_OLD_GSSMIT

#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name

#define NCOMPAT 1

#endif



#define GSSAUTH_P_NONE      1

#define GSSAUTH_P_INTEGRITY 2

#define GSSAUTH_P_PRIVACY   4



#include <curl/curl.h>



#include "curl_sasl.h"

lib/http_negotiate.c

+3 −12
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -22,14 +22,7 @@ 


#include "curl_setup.h"



#ifdef HAVE_GSSAPI



#if !defined(CURL_DISABLE_HTTP) && defined(USE_SPNEGO)



#ifdef HAVE_OLD_GSSMIT

#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name

#define NCOMPAT 1

#endif

#if defined(HAVE_GSSAPI) && !defined(CURL_DISABLE_HTTP) && defined(USE_SPNEGO)



#include "urldata.h"

#include "sendf.h"
@@ -211,6 +204,4 @@ void Curl_cleanup_negotiate(struct SessionHandle *data) 
  cleanup(&data->state.proxyneg);

}



#endif /* !CURL_DISABLE_HTTP && USE_SPNEGO */



#endif /* HAVE_GSSAPI */
 
#endif /* HAVE_GSSAPI && !CURL_DISABLE_HTTP && USE_SPNEGO */

lib/krb5.c

+3 −10
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright (c) 1995, 1996, 1997, 1998, 1999, 2013 Kungliga Tekniska Hgskolan

 * (Royal Institute of Technology, Stockholm, Sweden).

 * Copyright (c) 2004 - 2014 Daniel Stenberg

 * Copyright (c) 2004 - 2015 Daniel Stenberg

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -34,13 +34,7 @@ 


#include "curl_setup.h"



#ifndef CURL_DISABLE_FTP

#ifdef HAVE_GSSAPI



#ifdef HAVE_OLD_GSSMIT

#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name

#define NCOMPAT 1

#endif

#if defined(HAVE_GSSAPI) && !defined(CURL_DISABLE_FTP)



#ifdef HAVE_NETDB_H

#include <netdb.h>
@@ -335,5 +329,4 @@ struct Curl_sec_client_mech Curl_krb5_client_mech = { 
    krb5_decode

};



#endif /* HAVE_GSSAPI */

#endif /* CURL_DISABLE_FTP */
 
#endif /* HAVE_GSSAPI && !CURL_DISABLE_FTP */

lib/socks_gssapi.c

+4 −14
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2009, 2011, Markus Moeller, <markus_moeller@compuserve.com>

 * Copyright (C) 2012 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 2012 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -23,16 +23,7 @@ 


#include "curl_setup.h"



#ifndef CURL_DISABLE_PROXY



#ifdef HAVE_GSSAPI

#ifdef HAVE_OLD_GSSMIT

#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name

#define NCOMPAT 1

#endif

#ifndef gss_nt_service_name

#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE

#endif

#if defined(HAVE_GSSAPI) && !defined(CURL_DISABLE_PROXY)



#include "curl_gssapi.h"

#include "urldata.h"
@@ -162,7 +153,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 
             serviceptr, conn->proxy.name);



    gss_major_status = gss_import_name(&gss_minor_status, &service,

                                       gss_nt_service_name, &server);

                                       GSS_C_NT_HOSTBASED_SERVICE, &server);

  }



  gss_release_buffer(&gss_status, &service); /* clear allocated memory */
@@ -530,6 +521,5 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 


  return CURLE_OK;

}

#endif



#endif /* CURL_DISABLE_PROXY */
 
#endif /* HAVE_GSSAPI && !CURL_DISABLE_PROXY */