From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 11 Nov 2008 10:11:53 +0000 (+1300)
Subject: Update squid_kerb_auth to 1.0.5
X-Git-Tag: SQUID_3_2_0_1~1338
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2e0029d8cacc79ae0896e3b61ea1c4edd3a921b;p=thirdparty%2Fsquid.git

Update squid_kerb_auth to 1.0.5

produces clean errors when headers are missing.
dist spnegohelp files.
---

diff --git a/helpers/negotiate_auth/squid_kerb_auth/Makefile.am b/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
index 1ecea772af..a89960a9c9 100644
--- a/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+++ b/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
@@ -1,15 +1,27 @@
 EXTRA_DIST = configure README NEWS ChangeLog AUTHORS INSTALL
 SUBDIRS = 
 
-bin_PROGRAMS = squid_kerb_auth squid_kerb_auth_test
+bin_PROGRAMS = squid_kerb_auth squid_kerb_auth_test negotiate_kerb_auth negotiate_kerb_auth_test
+
+SPNEGO_SOURCE= \
+	spnegohelp/derparse.c \
+	spnegohelp/derparse.h \
+	spnegohelp/spnego.c \
+	spnegohelp/spnego.h \
+	spnegohelp/spnegohelp.c \
+	spnegohelp/spnegohelp.h \
+	spnegohelp/spnegoparse.c \
+	spnegohelp/spnegoparse.h
+
+EXTRA_DIST += $(SPNEGO_SOURCE)
 
 if HAVE_SPNEGO
-squid_kerb_auth_SOURCES = squid_kerb_auth.c base64.c
-squid_kerb_auth_test_SOURCES = squid_kerb_auth_test.c base64.c
+squid_kerb_auth_SOURCES = squid_kerb_auth.c base64.c base64.h
+squid_kerb_auth_test_SOURCES = squid_kerb_auth_test.c base64.c base64.h
 else
-squid_kerb_auth_SOURCES = squid_kerb_auth.c base64.c spnegohelp/derparse.c  spnegohelp/spnego.c  spnegohelp/spnegohelp.c  spnegohelp/spnegoparse.c
+squid_kerb_auth_SOURCES = squid_kerb_auth.c base64.c base64.h $(SPNEGO_SOURCE)
 INCLUDES = -Ispnegohelp 
-squid_kerb_auth_test_SOURCES = squid_kerb_auth_test.c base64.c
+squid_kerb_auth_test_SOURCES = squid_kerb_auth_test.c base64.c base64.h
 endif
 
 
@@ -17,3 +29,11 @@ squid_kerb_auth_LDFLAGS =
 squid_kerb_auth_LDADD =
 squid_kerb_auth_test_LDFLAGS = 
 squid_kerb_auth_test_LDADD =
+
+negotiate_kerb_auth: squid_kerb_auth
+	cp squid_kerb_auth negotiate_kerb_auth
+
+negotiate_kerb_auth_test: squid_kerb_auth_test
+	cp squid_kerb_auth_test negotiate_kerb_auth_test
+
+
diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.in b/helpers/negotiate_auth/squid_kerb_auth/configure.in
index 7b6eb6ce5f..0bb1fa10e2 100644
--- a/helpers/negotiate_auth/squid_kerb_auth/configure.in
+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.in
@@ -15,8 +15,8 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 
 
-AC_INIT([squid_kerb_auth],[1.0.3],[markus_moeller@compuserve.com])
-AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.3)
+AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
+AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -312,6 +312,11 @@ if test "$enable_arg" = "no"; then
   esac
 fi
 
+if test "$ac_cv_header_gssapi_h" = "no" -a "$ac_cv_header_gssapi_gssapi_h" = "no"; then
+        echo "GSSAPI headers are required to compile squid_kerb_auth"
+        echo "Please install gssapi headers and then re-run configure"
+        exit 1
+fi
 
 old_LIBS=$LIBS
 AC_CACHE_CHECK([for SPNEGO support],ac_cv_have_spnego,[
@@ -441,6 +446,8 @@ AH_BOTTOM([
 #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
@@ -449,6 +456,8 @@ AH_BOTTOM([
 #include <gssapi/gssapi.h>
 #elif defined(HAVE_GSSAPI_H)
 #include <gssapi.h>
+#else
+#error "GSSAPI header required"
 #endif
 #ifdef HAVE_GSSAPI_GSSAPI_EXT_H
 #include <gssapi/gssapi_ext.h>
@@ -459,6 +468,8 @@ AH_BOTTOM([
 #include <gssapi/gssapi.h>
 #elif defined(HAVE_GSSAPI_H)
 #include <gssapi.h>
+#else
+#error "GSSAPI header required"
 #endif
 #ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
 #include <gssapi/gssapi_krb5.h>