aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-05-26 03:10:34 +0000
committerYang Tse <yangsita@gmail.com>2008-05-26 03:10:34 +0000
commitc57e748107935f94a16cda112f3b5dfce9a93481 (patch)
treec187e66a49972aad386e3927c94eaa5b9003c71c
parentd6f8f1606850c8d814dec0dd65818960af88bbca (diff)
David Rosenstrauch reported that header files spnegohelp.h and
openssl/objects.h were needed to compile SPNEGO support.
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/http_negotiate.c9
3 files changed, 15 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 7112efc58..519338032 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
Changelog
+Yang Tse (26 May 2008)
+- David Rosenstrauch reported that header files spnegohelp.h and
+ openssl/objects.h were needed to compile SPNEGO support.
+
Daniel Fandrich (22 May 2008)
- Made sure to pass longs in to curl_easy_setopt where necessary in the
example programs and libtest code.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a52f71f79..c3d7b7778 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -57,6 +57,7 @@ advice from friends like these:
Michal Marek, Daniel Fandrich, Scott Barrett, Alexey Simak, Daniel Black,
Rafa Muyo, Andre Guibert de Bruet, Brock Noland, Sandor Feldi, Stefan Krause,
David Shaw, Norbert Frese, Bart Whiteley, Jean-Francois Bertrand, Ben Van Hof,
- Yuriy Sosov, Christopher Palow, Yang Tse, Liam Healy, Nikolai Kondrashov
+ Yuriy Sosov, Christopher Palow, Yang Tse, Liam Healy, Nikolai Kondrashov,
+ David Rosenstrauch
Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index e7f934824..9644a751c 100644
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -42,6 +42,15 @@
#include "http_negotiate.h"
#include "memory.h"
+#ifdef HAVE_SPNEGO
+# include <spnegohelp.h>
+# if defined(USE_OPENSSL) && !defined(USE_YASSLEMUL)
+# include <openssl/objects.h>
+# else
+# error "Can't compile SPNEGO support without OpenSSL."
+# endif
+#endif
+
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>