Compile fixes from CentOS

diff --git a/helpers/basic_auth/LDAP/Makefile.am b/helpers/basic_auth/LDAP/Makefile.am
index 56153c16961ee11f8d483fad3eba9d52112bc8d0..82f4d23bada7c98b00b9fd68a4aa27236ea56dd6 100644 (file)
--- 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 cb7ec9f5224c4ef1d3b2d02a2c657959ec65c48b..de75cf58ebe3f5d8657741ca23a8c8866e519959 100644 (file)
--- 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 0997f2aca45c915fb9325c62584b252a136731d9..49ac644ba3ca0745af47c1f7c0f47672aad8a923 100644 (file)
--- 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 fbf0cda814cdfcbc9f94a17f1c13bc16fdcce695..2f4ca6e6862af3693c74f51abd284a4e5b3dacec 100644 (file)
--- 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 593ae7ad0b52da100dcd99d030ad8b6803c2089e..dded9f8f4945095b6cfd12a726489006c5c556ff 100644 (file)
--- 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 6a74434823fc1d8eada0550a08a7d1708b4ba48f..863c8bd4931bed8822726505751626683d0d807d 100644 (file)
--- 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