From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 12 Sep 2009 08:16:48 +0000 (+1200)
Subject: Wrap kerberos test headers per Squid requirement. change internal name
X-Git-Tag: SQUID_3_2_0_1~612^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70125c347af952cc26d52075ae8d1df33e4d1786;p=thirdparty%2Fsquid.git

Wrap kerberos test headers per Squid requirement. change internal name
---

diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc
index 8041156357..bc74bc6cfc 100644
--- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc
+++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth_test.cc
@@ -28,15 +28,33 @@
 #include "config.h"
 
 #if HAVE_GSSAPI
+
+#if HAVE_STRING_H
 #include <string.h>
+#endif
+#if HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#if HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#if HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#if HAVE_TIME_H
 #include <time.h>
+#endif
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#if HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
+#include "base64.h"
 #include "util.h"
 
 #if HAVE_HEIMDAL_KERBEROS
@@ -60,8 +78,6 @@
 #endif /* HAVE_GSSAPI_GSSAPI_GENERIC_H */
 #endif /* HAVE_HEIMDAL_KERBEROS */
 
-#include "base64.h"
-
 static const char *LogTime(void);
 
 int check_gss_err(OM_uint32 major_status, OM_uint32 minor_status,
@@ -69,7 +85,7 @@ int check_gss_err(OM_uint32 major_status, OM_uint32 minor_status,
 
 const char *squid_kerb_proxy_auth(char *proxy);
 
-#define PROGRAM "squid_kerb_auth_test"
+#define PROGRAM "negotiate_kerberos_auth_test"
 
 static const char *
 LogTime()