From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Mon, 1 Nov 2010 10:13:56 +0000 (-0600)
Subject: Compile fixes from CentOS
X-Git-Tag: take1~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1fe225cb45d52fde9bdbcb7a68cda1c674a1424;p=thirdparty%2Fsquid.git

Compile fixes from CentOS
---

diff --git a/helpers/basic_auth/LDAP/Makefile.am b/helpers/basic_auth/LDAP/Makefile.am
index 56153c1696..82f4d23bad 100644
--- a/helpers/basic_auth/LDAP/Makefile.am
+++ b/helpers/basic_auth/LDAP/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST		= basic_ldap_auth.8 config.test
 basic_ldap_auth_SOURCES	= basic_ldap_auth.cc
 
 LDADD = \
+	$(top_builddir)/lib/libmiscencoding.la \
 	$(COMPAT_LIB) \
 	$(LDAPLIB) \
 	$(LBERLIB)
diff --git a/helpers/digest_auth/LDAP/Makefile.am b/helpers/digest_auth/LDAP/Makefile.am
index cb7ec9f522..de75cf58eb 100644
--- a/helpers/digest_auth/LDAP/Makefile.am
+++ b/helpers/digest_auth/LDAP/Makefile.am
@@ -10,11 +10,12 @@ digest_ldap_auth_SOURCES = digest_pw_auth.cc \
 	ldap_backend.h
 
 digest_ldap_auth_LDADD = \
+	$(top_builddir)/lib/libmiscencoding.la \
 	$(COMPAT_LIB) \
 	$(LDAPLIB) \
 	$(LBERLIB) \
 	$(CRYPTLIB) \
-	$(XTRA_LIBS) \
-	$(SSLLIB)
+	$(SSLLIB) \
+	$(XTRA_LIBS)
 
 EXTRA_DIST = config.test
diff --git a/helpers/digest_auth/eDirectory/Makefile.am b/helpers/digest_auth/eDirectory/Makefile.am
index 0997f2aca4..49ac644ba3 100644
--- a/helpers/digest_auth/eDirectory/Makefile.am
+++ b/helpers/digest_auth/eDirectory/Makefile.am
@@ -13,11 +13,12 @@ digest_edirectory_auth_SOURCES = digest_pw_auth.cc \
 	edir_ldapext.h
 
 digest_edirectory_auth_LDADD = \
+	$(top_builddir)/lib/libmiscencoding.la \
 	$(COMPAT_LIB) \
 	$(LDAPLIB) \
 	$(LBERLIB) \
 	$(CRYPTLIB) \
-	$(XTRA_LIBS) \
-	$(SSLLIB)
+	$(SSLLIB) \
+	$(XTRA_LIBS)
 
 EXTRA_DIST = config.test
diff --git a/helpers/external_acl/LDAP_group/Makefile.am b/helpers/external_acl/LDAP_group/Makefile.am
index fbf0cda814..2f4ca6e686 100644
--- a/helpers/external_acl/LDAP_group/Makefile.am
+++ b/helpers/external_acl/LDAP_group/Makefile.am
@@ -7,6 +7,7 @@ man_MANS 			= ext_ldap_group_acl.8
 EXTRA_DIST			= ext_ldap_group_acl.8 config.test
 
 LDADD = \
+	$(top_builddir)/lib/libmiscencoding.la \
 	$(COMPAT_LIB) \
 	$(LDAPLIB) \
 	$(LBERLIB) \
diff --git a/src/CpuAffinitySet.cc b/src/CpuAffinitySet.cc
index 593ae7ad0b..dded9f8f49 100644
--- a/src/CpuAffinitySet.cc
+++ b/src/CpuAffinitySet.cc
@@ -11,8 +11,11 @@
 #include "Debug.h"
 #include "util.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 #if HAVE_STRING_H
-#include <string.h> /* for memcpy() */
+#include <string.h>
 #endif
 
 
diff --git a/src/peer_proxy_negotiate_auth.cc b/src/peer_proxy_negotiate_auth.cc
index 6a74434823..863c8bd493 100644
--- a/src/peer_proxy_negotiate_auth.cc
+++ b/src/peer_proxy_negotiate_auth.cc
@@ -25,7 +25,8 @@
  * Hosted at http://sourceforge.net/projects/squidkerbauth
  */
 
-#include <squid.h>
+#include "squid.h"
+#include "base64.h"
 
 #if HAVE_KRB5 && HAVE_GSSAPI
 #ifdef __cplusplus