From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Sat, 14 Nov 2009 01:12:55 +0000 (-0700)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_2_0_1~576
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6aa9181e51bae2047091ea3b5430bc6ee0d6b11;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/compat/os/solaris.h b/compat/os/solaris.h
index 6a152d206b..fe1c039ea3 100644
--- 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 8c8f2011b5..5ad1cf2832 100644
--- 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 65d4b2a56b..61485f5bd5 100644
--- 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 7db4515120..6a74434823 100644
--- 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>