aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-11-16 12:42:53 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-11-16 12:42:53 +0000
commitc76d9395633e00205b1b83bd82c811f9fa4cca1e (patch)
treeff270677da310505effa9f0ab787d2e8abfb1787
parent3c4b69f95dbb4f62977557317a6962eadaad9d8f (diff)
Christian Krause fixed a build failure when building with gss support
enabled and FTP disabled.
-rw-r--r--CHANGES3
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/sendf.c3
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 99cd29ceb..a2f5782b7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
Changelog
Daniel Stenberg (16 Nov 2008)
+- Christian Krause fixed a build failure when building with gss support
+ enabled and FTP disabled.
+
- Added check for NULL returns from strdup() in src/main.c and lib/formdata.c
- reported by Jim Meyering also prevent buffer overflow on MSDOS when you do
for example -O on a url with a file name part longer than PATH_MAX letters
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6383f765e..9ecd2f975 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -13,6 +13,7 @@ This release includes the following changes:
This release includes the following bugfixes:
+ o build failure when disabling FTP but enabling GSS
o fixed several calls to memory functions that didn't check return codes
o memory leak for SSL connects with libcurl/NSS when CURLOPT_ISSUERCERT was
used
@@ -28,6 +29,6 @@ Other curl-related news:
This release would not have looked like this without help, code, reports and
advice from friends like these:
- Yang Tse, Daniel Fandrich, Jim Meyering
+ Yang Tse, Daniel Fandrich, Jim Meyering, Christian Krause
Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/sendf.c b/lib/sendf.c
index 566e26aa6..40d56d5a4 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -47,7 +47,8 @@
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
#include <curl/mprintf.h>
-#if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
+/* the krb4 functions only exists for FTP and if krb4 or gssapi is defined */
+#if !defined(CURL_DISABLE_FTP) && (defined(HAVE_KRB4) || defined(HAVE_GSSAPI))
#include "krb4.h"
#else
#define Curl_sec_send(a,b,c,d) -1