From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 2 Nov 2010 12:16:02 +0000 (+1300)
Subject: C++ fixes for ext_edirectory_userip_acl
X-Git-Tag: take1~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88f2cf55f276aa84b8919c615ab14d5422c02688;p=thirdparty%2Fsquid.git

C++ fixes for ext_edirectory_userip_acl
---

diff --git a/helpers/external_acl/eDirectory_userip/Makefile.am b/helpers/external_acl/eDirectory_userip/Makefile.am
index 0801dbc5c5..abb6e1c88d 100644
--- a/helpers/external_acl/eDirectory_userip/Makefile.am
+++ b/helpers/external_acl/eDirectory_userip/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/src/Common.am
 libexec_PROGRAMS = ext_edirectory_userip_acl
 
 ext_edirectory_userip_acl_SOURCES = \
-	ext_edirectory_userip_acl.c
+	ext_edirectory_userip_acl.cc
 
 ext_edirectory_userip_acl_LDADD = \
 	$(COMPAT_LIB) \
diff --git a/helpers/external_acl/eDirectory_userip/config.test b/helpers/external_acl/eDirectory_userip/config.test
index 1e690b20db..8f83d3905d 100644
--- a/helpers/external_acl/eDirectory_userip/config.test
+++ b/helpers/external_acl/eDirectory_userip/config.test
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-# AYJ: currently does not build portable
-exit 1
-
 if [ -f /usr/include/ldap.h ]; then
 	exit 0
 fi
diff --git a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.c b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
similarity index 99%
rename from helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.c
rename to helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
index 7e46867742..32282e8da6 100644
--- a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.c
+++ b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
@@ -36,8 +36,12 @@
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
+#ifndef __USE_GNU
 #define __USE_GNU
+#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
@@ -2038,7 +2042,7 @@ int main(int argc, char **argv)
                     local_printfx("ERR (ConvertIP: %s)\n", ErrLDAP(x));
                 } else {
                     edui_ldap.err = -1;
-                    debug("ConvertIP(-, %s) -> Result[%zd]: %s\n", bufb, x, edui_ldap.search_ip);
+                    debug("ConvertIP(-, %s) -> Result[%d]: %s\n", bufb, x, edui_ldap.search_ip);
                     x = SearchFilterLDAP(&edui_ldap, bufa);
                     if (x < 0) {
                         debug("SearchFilterLDAP() -> %s\n", ErrLDAP(x));
@@ -2068,7 +2072,7 @@ int main(int argc, char **argv)
                     }
                 }
             } else {
-                debug("SplitString() -> Error: %d\n", i);
+                debug("SplitString() -> Error: %Zu\n", i);
                 local_printfx("ERR (SplitString Error %d)\n", i);
             }
         } else {
@@ -2078,7 +2082,7 @@ int main(int argc, char **argv)
                 debug("ConvertIP() -> %s\n", ErrLDAP(x));
                 local_printfx("ERR (ConvertIP: %s)\n", ErrLDAP(x));
             } else {
-                debug("ConvertIP(-, %s) -> Result[%zd]: %s\n", bufa, x, edui_ldap.search_ip);
+                debug("ConvertIP(-, %s) -> Result[%d]: %s\n", bufa, x, edui_ldap.search_ip);
                 /* Do search */
                 x = SearchFilterLDAP(&edui_ldap, NULL);
                 if (x < 0) {