Commit 800052dc authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

use the HAVE_KRB4 define instead of just KRB4

parent d4629fd3

lib/config-riscos.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#undef NEED_REENTRANT



/* Define if you have the Kerberos4 libraries (including -ldes) */

#undef KRB4

#undef HAVE_KRB4



/* Define if you want to enable IPv6 support */

#undef ENABLE_IPV6

lib/config-vms.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#undef NEED_REENTRANT



/* Define if you have the Kerberos4 libraries (including -ldes) */

#undef KRB4

#undef HAVE_KRB4



/* Define this to 'int' if ssize_t is not an available typedefed type */

#undef ssize_t

lib/ftp.c

+5 −5
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
#include "http.h" /* for HTTP proxy tunnel stuff */

#include "ftp.h"



#ifdef KRB4

#ifdef HAVE_KRB4

#include "security.h"

#include "krb4.h"

#endif
@@ -377,7 +377,7 @@ CURLcode Curl_GetFTPResponse(ssize_t *nreadp, /* return number of bytes read */ 
  if(!result)

    code = atoi(buf);



#ifdef KRB4

#ifdef HAVE_KRB4

  /* handle the security-oriented responses 6xx ***/

  /* FIXME: some errorchecking perhaps... ***/

  switch(code) {
@@ -467,7 +467,7 @@ CURLcode Curl_ftp_connect(struct connectdata *conn) 
    return CURLE_FTP_WEIRD_SERVER_REPLY;

  }



#ifdef KRB4

#ifdef HAVE_KRB4

  /* if not anonymous login, try a secure login */

  if(data->set.krb4) {
@@ -559,7 +559,7 @@ CURLcode Curl_ftp_connect(struct connectdata *conn) 
       (the user logged in without password) */

    infof(data, "We have successfully logged in\n");

    if (conn->ssl[FIRSTSOCKET].use) {

#ifdef KRB4

#ifdef HAVE_KRB4

	/* we are logged in (with Kerberos)

	 * now set the requested protection level

	 */
@@ -739,7 +739,7 @@ CURLcode Curl_ftp_done(struct connectdata *conn) 
    }

  }



#ifdef KRB4

#ifdef HAVE_KRB4

  Curl_sec_fflush_fd(conn, conn->sock[SECONDARYSOCKET]);

#endif

  /* shut down the socket to inform the server we're done */

lib/krb4.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include "setup.h"



#ifndef CURL_DISABLE_FTP

#ifdef KRB4

#ifdef HAVE_KRB4



#include "security.h"

#include "base64.h"
@@ -402,5 +402,5 @@ CURLcode Curl_krb_kauth(struct connectdata *conn) 
  return CURLE_OK;

}



#endif /* KRB4 */

#endif /* HAVE_KRB4 */

#endif /* CURL_DISABLE_FTP */

lib/security.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include "setup.h"



#ifndef CURL_DISABLE_FTP

#ifdef KRB4

#ifdef HAVE_KRB4



#define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */

#include <curl/mprintf.h>
@@ -90,7 +90,7 @@ static struct Curl_sec_client_mech *mechs[] = { 
#ifdef KRB5

  /* not supported */

#endif

#ifdef KRB4

#ifdef HAVE_KRB4

    &Curl_krb4_client_mech,

#endif

    NULL
@@ -478,5 +478,5 @@ Curl_sec_end(struct connectdata *conn) 
  conn->mech=NULL;

}



#endif /* KRB4 */

#endif /* HAVE_KRB4 */

#endif /* CURL_DISABLE_FTP */