SourceFormat Enforcement

diff --git a/compat/os/solaris.h b/compat/os/solaris.h
index 6a152d206b4a488ec53f9cf85b1bc907919ff5dd..fe1c039ea31f98fd97edea3d605fc548e4d705a0 100644 (file)
--- a/compat/os/solaris.h
+++ b/compat/os/solaris.h
@@ -53,7 +53,7 @@ SQUIDCEXTERN int gethostname(char *, int);
 #endif
 
 /*
- * SunStudio CC does not define C++ portability API __FUNCTION__ 
+ * SunStudio CC does not define C++ portability API __FUNCTION__
  */
 #if defined(__SUNPRO_CC) && !defined(__FUNCTION__)
 #define __FUNCTION__ ""

diff --git a/helpers/negotiate_auth/kerberos/Makefile.am b/helpers/negotiate_auth/kerberos/Makefile.am
index 8c8f2011b5b2ad99151dc741f5fcf8137c8f4d9e..5ad1cf2832aca0c2b53a159fa6ea84ceb7177b67 100644 (file)
--- a/helpers/negotiate_auth/kerberos/Makefile.am
+++ b/helpers/negotiate_auth/kerberos/Makefile.am
@@ -24,6 +24,6 @@ negotiate_kerberos_auth_test_SOURCES = $(SOURCE_test)
 
 
 negotiate_kerberos_auth_LDFLAGS = 
-negotiate_kerberos_auth_LDADD = $(COMPAT_LIB) $(XTRA_LIBS) @KRB5LIBS@
+negotiate_kerberos_auth_LDADD = $(COMPAT_LIB) $(XTRA_LIBS) $(KRB5LIBS)
 negotiate_kerberos_auth_test_LDFLAGS = 
-negotiate_kerberos_auth_test_LDADD = $(COMPAT_LIB) $(XTRA_LIBS) @KRB5LIBS@
+negotiate_kerberos_auth_test_LDADD = $(COMPAT_LIB) $(XTRA_LIBS) $(KRB5LIBS)

diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
index 65d4b2a56bcbfe83247a4e5650c0d3026b3b75d8..61485f5bd5bb6a1960d7c88e11baf38a34c69678 100644 (file)
--- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
+++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
@@ -114,9 +114,9 @@ LogTime()
 char *
 gethost_name(void)
 {
-/*
-    char hostname[sysconf(_SC_HOST_NAME_MAX)];
-*/
+    /*
+        char hostname[sysconf(_SC_HOST_NAME_MAX)];
+    */
     char hostname[1024];
     struct addrinfo *hres = NULL, *hres_list;
     int rc, count;

diff --git a/src/peer_proxy_negotiate_auth.cc b/src/peer_proxy_negotiate_auth.cc
index 7db4515120e85c8bd9a8f91c5c6080d5fe487c74..6a74434823fc1d8eada0550a08a7d1708b4ba48f 100644 (file)
--- a/src/peer_proxy_negotiate_auth.cc
+++ b/src/peer_proxy_negotiate_auth.cc
@@ -40,7 +40,7 @@ extern "C" {
 #if defined(__cplusplus)
 #define KRB5INT_BEGIN_DECLS     extern "C" {
 #define KRB5INT_END_DECLS
-KRB5INT_BEGIN_DECLS
+    KRB5INT_BEGIN_DECLS
 #endif
 #endif
 #include <krb5.h>