From 6fb4d4597cca1831857717b5e02aabbed9405f73 Mon Sep 17 00:00:00 2001
From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Fri, 24 Jul 2009 16:09:17 +0200
Subject: [PATCH] Fixup squid_kerb_auth so it compiles

  - Out-of-tree build support
  - Compiler warning about odd const address arithmetics
---
 helpers/negotiate_auth/squid_kerb_auth/Makefile.am       | 2 +-
 helpers/negotiate_auth/squid_kerb_auth/Makefile.in       | 2 +-
 helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/helpers/negotiate_auth/squid_kerb_auth/Makefile.am b/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
index 90a5922e5c..768eeba9fe 100644
--- a/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+++ b/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
@@ -16,7 +16,7 @@ else
 squid_kerb_auth_SOURCES = $(SOURCE) $(SPNEGO)
 endif
 
-AM_CPPFLAGS = $(KERBINCS) -I$(srcdir)/spnegohelp -I.
+INCLUDES = -I$(top_srcdir)/include $(KERBINCS) -I$(srcdir)/spnegohelp -I.
 #-I$(top_srcdir)/include -I$(top_srcdir)/src
 LDADD = $(KERBLIBS)
 #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
diff --git a/helpers/negotiate_auth/squid_kerb_auth/Makefile.in b/helpers/negotiate_auth/squid_kerb_auth/Makefile.in
index 0e4133d872..ea889f5071 100644
--- a/helpers/negotiate_auth/squid_kerb_auth/Makefile.in
+++ b/helpers/negotiate_auth/squid_kerb_auth/Makefile.in
@@ -262,7 +262,7 @@ SOURCE = squid_kerb_auth.c base64.c base64.h
 EXTRA_DIST = readme.txt do.sh
 @HAVE_SPNEGO_FALSE@squid_kerb_auth_SOURCES = $(SOURCE) $(SPNEGO)
 @HAVE_SPNEGO_TRUE@squid_kerb_auth_SOURCES = $(SOURCE)
-AM_CPPFLAGS = $(KERBINCS) -I$(srcdir)/spnegohelp -I.
+INCLUDES = -I$(top_srcdir)/include $(KERBINCS) -I$(srcdir)/spnegohelp -I.
 #-I$(top_srcdir)/include -I$(top_srcdir)/src
 LDADD = $(KERBLIBS)
 #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
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 1f92392ef7..410fab8859 100644
--- a/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
+++ b/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
@@ -284,7 +284,7 @@ int main(int argc, char * const argv[])
     }
 
     if (debug)
-      fprintf(stderr, "%s| %s: Got '%s' from squid (length: %d).\n", LogTime(), PROGRAM, buf?buf:"NULL",length);
+      fprintf(stderr, "%s| %s: Got '%.*s' from squid (length: %d).\n", LogTime(), PROGRAM, length, buf, length);
 
     if (buf[0] == '\0') {
       if (debug)
-- 
2.47.2