Christian Krause fixed a build failure when building with gss support

enabled and FTP disabled.

diff --git a/CHANGES b/CHANGES
index 99cd29ceb64c9e796eada17fcb5706a353a3a210..a2f5782b73068c7feb3e77194b65038f73da8b89 100644 (file)
--- 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 6383f765e647b397d059ddd2ba80b2864f7ea881..9ecd2f97582fc258f7f655d5aafaf2ee6067cc66 100644 (file)
--- 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 566e26aa671afa576f0947e3f483673b179980c0..40d56d5a443d40f2de4a354678455ab701d5e27c 100644 (file)
--- 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