Unverified Commit 28177def authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

gssapi: fix deprecated header warnings 

Heimdal includes on FreeBSD spewed out lots of them. Less so now.

Closes #3566
parent d957b61d

lib/curl_gssapi.h

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

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

 *

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

 * Copyright (C) 2011 - 2019, 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
@@ -26,19 +26,6 @@ 
#include "urldata.h"



#ifdef HAVE_GSSAPI



#ifdef HAVE_GSSGNU

#  include <gss.h>

#elif defined HAVE_GSSMIT

   /* MIT style */

#  include <gssapi/gssapi.h>

#  include <gssapi/gssapi_generic.h>

#  include <gssapi/gssapi_krb5.h>

#else

   /* Heimdal-style */

#  include <gssapi.h>

#endif



extern gss_OID_desc Curl_spnego_mech_oid;

extern gss_OID_desc Curl_krb5_mech_oid;
@@ -71,5 +58,4 @@ void Curl_gss_log_error(struct Curl_easy *data, const char *prefix, 
#define GSSAUTH_P_PRIVACY   4



#endif /* HAVE_GSSAPI */



#endif /* HEADER_CURL_GSSAPI_H */

lib/urldata.h

+4 −2
Original line number Diff line number Diff line
@@ -129,12 +129,14 @@ typedef ssize_t (Curl_recv)(struct connectdata *conn, /* connection data */ 
#ifdef HAVE_GSSAPI

# ifdef HAVE_GSSGNU

#  include <gss.h>

# elif defined HAVE_GSSMIT

# elif defined HAVE_GSSAPI_GSSAPI_H

#  include <gssapi/gssapi.h>

#  include <gssapi/gssapi_generic.h>

# else

#  include <gssapi.h>

# endif

# ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H

#  include <gssapi/gssapi_generic.h>

# endif

#endif



#ifdef HAVE_LIBSSH2_H

tests/libtest/stub_gssapi.c

+9 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ enum min_err_code { 
    GSS_LAST

};



const char *min_err_table[] = {

static const char *min_err_table[] = {

  "stub-gss: no error",

  "stub-gss: no memory",

  "stub-gss: invalid arguments",