diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-08-23 16:16:42 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-08-25 19:16:36 +0200 |
| commit | bb5529331334e1e1c79ff3320220bba12fc8457d (patch) | |
| tree | 65a79458b8b78bf3729f44ae754605ed5ed51ec0 /lib/urldata.h | |
| parent | 817ceb09e0a8f0754e81ccc592ad919125bc7908 (diff) | |
FTP: remove krb4 support
We've announced this pending removal for a long time and we've
repeatedly asked if anyone would care or if anyone objects. Nobody has
objected. It has probably not even been working for a good while since
nobody has tested/used this code recently.
The stuff in krb4.h that was generic enough to be used by other sources
is now present in security.h
Diffstat (limited to 'lib/urldata.h')
| -rw-r--r-- | lib/urldata.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index be139ef64..dde35a9cb 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -222,9 +222,9 @@ #define CURLMIN(x,y) ((x)<(y)?(x):(y)) -#if defined(HAVE_KRB4) || defined(HAVE_GSSAPI) -/* Types needed for krb4/5-ftp connections */ -struct krb4buffer { +#ifdef HAVE_GSSAPI +/* Types needed for krb5-ftp connections */ +struct krb5buffer { void *data; size_t size; size_t index; @@ -934,12 +934,12 @@ struct connectdata { } allocptr; int sec_complete; /* if kerberos is enabled for this connection */ -#if defined(HAVE_KRB4) || defined(HAVE_GSSAPI) +#ifdef HAVE_GSSAPI enum protection_level command_prot; enum protection_level data_prot; enum protection_level request_data_prot; size_t buffer_size; - struct krb4buffer in_buffer; + struct krb5buffer in_buffer; void *app_data; const struct Curl_sec_client_mech *mech; struct sockaddr_in local_addr; |