From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 4 Sep 2009 13:07:52 +0000 (+1200)
Subject: Bump kerberos helper to C++
X-Git-Tag: SQUID_3_2_0_1~612^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7affd0d81ae6109bfe4cdaf7a06b5de5dbfc2196;p=thirdparty%2Fsquid.git

Bump kerberos helper to C++
---

diff --git a/helpers/negotiate_auth/kerberos/Makefile.am b/helpers/negotiate_auth/kerberos/Makefile.am
index 77556de3a0..c79a7e9038 100644
--- a/helpers/negotiate_auth/kerberos/Makefile.am
+++ b/helpers/negotiate_auth/kerberos/Makefile.am
@@ -1,25 +1,25 @@
 EXTRA_DIST = configure README NEWS ChangeLog AUTHORS INSTALL
 SUBDIRS = 
 
-bin_PROGRAMS = squid_kerb_auth squid_kerb_auth_test
+bin_PROGRAMS = negotiate_kerberos_auth negotiate_kerberos_auth_test
 
-SOURCE = squid_kerb_auth.c base64.c base64.h
-SOURCE_test = squid_kerb_auth_test.c base64.c base64.h
+SOURCE = negotiate_kerberos_auth.cc base64.cc base64.h
+SOURCE_test = negotiate_kerberos_auth_test.cc base64.cc base64.h
 SPNEGO = spnegohelp/derparse.c spnegohelp/derparse.h spnegohelp/Makefile spnegohelp/spnego.c spnegohelp/spnego.h spnegohelp/spnegohelp.c spnegohelp/spnegohelp.h spnegohelp/spnegop
 if HAVE_SPNEGO
-squid_kerb_auth_SOURCES = $(SOURCE)
+negotiate_kerberos_auth_SOURCES = $(SOURCE)
 AM_CPPFLAGS = $(KERBINCS) -I.
 else
-squid_kerb_auth_SOURCES = $(SOURCE) $(SPNEGO)
+negotiate_kerberos_auth_SOURCES = $(SOURCE) $(SPNEGO)
 AM_CPPFLAGS = $(KERBINCS) -I$(srcdir)/spnegohelp -I.
 endif
-squid_kerb_auth_test_SOURCES = $(SOURCE_test)
+negotiate_kerberos_auth_test_SOURCES = $(SOURCE_test)
 
 
-squid_kerb_auth_LDFLAGS = 
-squid_kerb_auth_LDADD = -L../../../lib -lmiscutil -lm $(KERBLIBS)
-squid_kerb_auth_test_LDFLAGS = 
-squid_kerb_auth_test_LDADD = -L../../../lib -lmiscutil -lm $(KERBLIBS)
+negotiate_kerberos_auth_LDFLAGS = 
+negotiate_kerberos_auth_LDADD = -L../../../lib -lmiscutil -lm $(KERBLIBS)
+negotiate_kerberos_auth_test_LDFLAGS = 
+negotiate_kerberos_auth_test_LDADD = -L../../../lib -lmiscutil -lm $(KERBLIBS)
 
 KERBINCS = @KRB5INCS@
 KERBLIBS = @KRB5LIBS@
diff --git a/helpers/negotiate_auth/kerberos/base64.c b/helpers/negotiate_auth/kerberos/base64.cc
similarity index 100%
rename from helpers/negotiate_auth/kerberos/base64.c
rename to helpers/negotiate_auth/kerberos/base64.cc
diff --git a/helpers/negotiate_auth/kerberos/squid_kerb_auth.c b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
similarity index 100%
rename from helpers/negotiate_auth/kerberos/squid_kerb_auth.c
rename to helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
diff --git a/helpers/negotiate_auth/kerberos/squid_kerb_auth_test.c b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc
similarity index 100%
rename from helpers/negotiate_auth/kerberos/squid_kerb_auth_test.c
rename to helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc