From 24d424046313635eedf1e9759583bb48db81c8b8 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Thu, 15 May 2008 07:27:32 -0600 Subject: [PATCH] Rename helpers/basic_auth/squid_radius_auth/util.* to radius-util.* They were clashing with Squids' own include/util.h --- helpers/basic_auth/squid_radius_auth/Makefile.am | 3 ++- .../basic_auth/squid_radius_auth/{util.c => radius-util.c} | 2 +- helpers/basic_auth/squid_radius_auth/radius-util.h | 7 +++++++ helpers/basic_auth/squid_radius_auth/util.h | 2 -- 4 files changed, 10 insertions(+), 4 deletions(-) rename helpers/basic_auth/squid_radius_auth/{util.c => radius-util.c} (97%) create mode 100644 helpers/basic_auth/squid_radius_auth/radius-util.h delete mode 100644 helpers/basic_auth/squid_radius_auth/util.h diff --git a/helpers/basic_auth/squid_radius_auth/Makefile.am b/helpers/basic_auth/squid_radius_auth/Makefile.am index 049d78f83b..b13266f915 100644 --- a/helpers/basic_auth/squid_radius_auth/Makefile.am +++ b/helpers/basic_auth/squid_radius_auth/Makefile.am @@ -12,7 +12,8 @@ EXTRA_DIST = squid_radius_auth.8 squid_radius_auth_SOURCES = \ squid_rad_auth.c \ radius.h \ - util.c util.h + radius-util.c \ + radius-util.h LDADD = -L$(top_builddir)/lib -lmiscutil $(SSLLIB) $(XTRA_LIBS) INCLUDES = -I$(top_srcdir)/include diff --git a/helpers/basic_auth/squid_radius_auth/util.c b/helpers/basic_auth/squid_radius_auth/radius-util.c similarity index 97% rename from helpers/basic_auth/squid_radius_auth/util.c rename to helpers/basic_auth/squid_radius_auth/radius-util.c index 62a1373d11..d35144304c 100644 --- a/helpers/basic_auth/squid_radius_auth/util.c +++ b/helpers/basic_auth/squid_radius_auth/radius-util.c @@ -1,3 +1,4 @@ +// 2008-05-14: rename to radius-util.* to avoid name clashes with squid util.* /* * * RADIUS @@ -174,4 +175,3 @@ void md5_calc(unsigned char *output, unsigned char *input, unsigned int inlen) SquidMD5Update(&context, input, inlen); SquidMD5Final(output, &context); } - diff --git a/helpers/basic_auth/squid_radius_auth/radius-util.h b/helpers/basic_auth/squid_radius_auth/radius-util.h new file mode 100644 index 0000000000..ee16bfe1e5 --- /dev/null +++ b/helpers/basic_auth/squid_radius_auth/radius-util.h @@ -0,0 +1,7 @@ +// 2008-05-14: rename to radius-util.* to avoid name clashes with squid util.* + +// uses the squid utilities +#include "util.h" + +/* util.c */ +u_int32_t get_ipaddr (char *); diff --git a/helpers/basic_auth/squid_radius_auth/util.h b/helpers/basic_auth/squid_radius_auth/util.h deleted file mode 100644 index c95d74d5ae..0000000000 --- a/helpers/basic_auth/squid_radius_auth/util.h +++ /dev/null @@ -1,2 +0,0 @@ -/* util.c */ -u_int32_t get_ipaddr (char *); -- 2.47.3