"Kinkie" <[email protected]> wrote in message
news:[email protected]...
Hi all,
Kerberos integration in squidclient has caused some problems with
squidclient;
Ubuntu 10.4 fails with
/home/kinkie/squid/workspace/stringng/tools/squidclient.cc:857:
undefined reference to `gss_release_buffer'
/home/kinkie/squid/workspace/stringng/tools/squidclient.cc:850:
undefined reference to `gss_display_status'
/home/kinkie/squid/workspace/stringng/tools/squidclient.cc:854:
undefined reference to `gss_release_buffer'
Opensolaris instead complains that
../../tools/squidclient.cc: In function `char* GSSAPI_token(const char*)':
../../tools/squidclient.cc:912: error: `gss_nt_service_name'
undeclared (first use this function)
I couldn't find a simple way to fix this.. any hints?
Does this fix it ?
# bzr diff -r submit:
Using parent branch http://bzr.squid-cache.org/bzr/squid3/trunk/
=== modified file 'tools/squidclient.cc'
--- tools/squidclient.cc 2010-08-25 03:10:45 +0000
+++ tools/squidclient.cc 2010-08-28 12:42:07 +0000
@@ -80,43 +80,23 @@
#endif
#if HAVE_GSSAPI
-#ifdef HAVE_HEIMDAL_KERBEROS
-#ifdef HAVE_GSSAPI_GSSAPI_H
-#include <gssapi/gssapi.h>
-#elif defined(HAVE_GSSAPI_H)
-#include <gssapi.h>
-#else
-#error "GSSAPI header required"
-#endif
-#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
-#else
-#ifdef HAVE_SEAM_KERBEROS
-#ifdef HAVE_GSSAPI_GSSAPI_H
-#include <gssapi/gssapi.h>
-#elif defined(HAVE_GSSAPI_H)
-#include <gssapi.h>
-#else
-#error "GSSAPI header required"
-#endif
-#ifdef HAVE_GSSAPI_GSSAPI_EXT_H
+#if HAVE_GSSAPI_GSSAPI_H
+#include <gssapi/gssapi.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
+#endif /* HAVE_GSSAPI_H */
+#if HAVE_GSSAPI_GSSAPI_EXT_H
#include <gssapi/gssapi_ext.h>
-#endif
-#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
-#else /*MIT */
-#ifdef HAVE_GSSAPI_GSSAPI_H
-#include <gssapi/gssapi.h>
-#elif defined(HAVE_GSSAPI_H)
-#include <gssapi.h>
-#else
-#error "GSSAPI header required"
-#endif
-#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
+#endif /* HAVE_GSSAPI_GSSAPI_EXT_H */
+#if HAVE_GSSAPI_GSSAPI_KRB5_H
#include <gssapi/gssapi_krb5.h>
-#endif
-#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
+#endif /* HAVE_GSSAPI_GSSAPI_KRB5_H */
+#if HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
-#endif
-#endif
+#endif /* HAVE_GSSAPI_GSSAPI_GENERIC_H */
+
+#ifndef gss_nt_service_name
+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
#endif
#ifndef gss_mech_spnego
Thanks
--
/kinkie
Markus
