From: hno <>
Date: Mon, 7 Jan 2008 22:25:14 +0000 (+0000)
Subject: Make squid_kerb_auth compile again after the IPv6 merge
X-Git-Tag: BASIC_TPROXY4~208
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=102728eb40b1ded8c70d42022a56ada5b3a84995;p=thirdparty%2Fsquid.git

Make squid_kerb_auth compile again after the IPv6 merge
---

diff --git a/helpers/negotiate_auth/squid_kerb_auth/Makefile.am b/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
index 44908bc521..c5cc19ba0b 100755
--- a/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+++ b/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.1 2007/06/24 22:34:15 hno Exp $
+#  $Id: Makefile.am,v 1.2 2008/01/07 15:25:14 hno Exp $
 #
 
 libexec_PROGRAMS = squid_kerb_auth
@@ -12,10 +12,8 @@ EXTRA_DIST = readme.txt do.sh
 
 squid_kerb_auth_SOURCES = $(SOURCE) $(SPNEGO)
 
-CPPFLAGS = $(KERBINC) -I$(srcdir)/spnegohelp -I.
-#-I$(top_srcdir)/include -I$(top_srcdir)/src
-LDADD = $(KERBLIBS)
-#-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+CPPFLAGS = $(KERBINC) -I$(srcdir)/spnegohelp -I. -I$(top_srcdir)/include
+LDADD = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) $(KERBLIBS) 
 
 # HEIMDAL
 #KERBINC = -DHEIMDAL -I/usr/include/heimdal
diff --git a/helpers/negotiate_auth/squid_kerb_auth/Makefile.in b/helpers/negotiate_auth/squid_kerb_auth/Makefile.in
index ef5c78f699..0f36e8af71 100644
--- a/helpers/negotiate_auth/squid_kerb_auth/Makefile.in
+++ b/helpers/negotiate_auth/squid_kerb_auth/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.20 2007/12/16 01:11:33 hno Exp $
+#  $Id: Makefile.in,v 1.21 2008/01/07 15:25:14 hno Exp $
 #
 
 srcdir = @srcdir@
@@ -63,7 +63,8 @@ am_squid_kerb_auth_OBJECTS = $(am__objects_1) $(am__objects_2)
 squid_kerb_auth_OBJECTS = $(am_squid_kerb_auth_OBJECTS)
 squid_kerb_auth_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-squid_kerb_auth_DEPENDENCIES = $(am__DEPENDENCIES_1)
+squid_kerb_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp
 am__depfiles_maybe = depfiles
@@ -104,7 +105,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CGIEXT = @CGIEXT@
 CPP = @CPP@
-CPPFLAGS = $(KERBINC) -I$(srcdir)/spnegohelp -I.
+CPPFLAGS = $(KERBINC) -I$(srcdir)/spnegohelp -I. -I$(top_srcdir)/include
 CPPUNITCONFIG = @CPPUNITCONFIG@
 CRYPTLIB = @CRYPTLIB@
 CXX = @CXX@
@@ -301,9 +302,7 @@ SPNEGO = spnegohelp/derparse.c spnegohelp/derparse.h spnegohelp/Makefile spnegoh
 SOURCE = squid_kerb_auth.c base64.c base64.h
 EXTRA_DIST = readme.txt do.sh
 squid_kerb_auth_SOURCES = $(SOURCE) $(SPNEGO)
-#-I$(top_srcdir)/include -I$(top_srcdir)/src
-LDADD = $(KERBLIBS)
-#-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+LDADD = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) $(KERBLIBS) 
 
 # HEIMDAL
 #KERBINC = -DHEIMDAL -I/usr/include/heimdal
diff --git a/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c b/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
index e4e2181e84..999837eaac 100755
--- a/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
+++ b/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
@@ -32,6 +32,9 @@
 #include <time.h>
 #include <sys/time.h>
 
+#include "getaddrinfo.h"
+#include "getnameinfo.h"
+
 #include "base64.h"
 #ifndef HAVE_SPNEGO
 #include "spnegohelp.h"