From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 7 Apr 2010 01:20:51 +0000 (+1200)
Subject: Compat: permit LDAP helepr to use std memory allocators
X-Git-Tag: SQUID_3_2_0_1~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3314ecb0519fbdc96d1bd758f5361277f8e2e2da;p=thirdparty%2Fsquid.git

Compat: permit LDAP helepr to use std memory allocators
---

diff --git a/helpers/basic_auth/LDAP/basic_ldap_auth.cc b/helpers/basic_auth/LDAP/basic_ldap_auth.cc
index 5ec4ba0a97..80153a3d0e 100644
--- a/helpers/basic_auth/LDAP/basic_ldap_auth.cc
+++ b/helpers/basic_auth/LDAP/basic_ldap_auth.cc
@@ -82,6 +82,9 @@
  *             - Allow full filter specifications in -f
  */
 
+#define SQUID_NO_ALLOC_PROTECT 1
+#include "config.h"
+
 #define LDAP_DEPRECATED 1
 
 #include "rfc1738.h"
@@ -89,7 +92,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 #include <ctype.h>
 
 #ifdef _SQUID_MSWIN_		/* Native Windows port and MinGW */
@@ -126,7 +128,7 @@ PFldap_start_tls_s Win32_ldap_start_tls_s;
 
 #endif
 
-#define PROGRAM_NAME "squid_ldap_auth"
+#define PROGRAM_NAME "basic_ldap_auth"
 
 /* Global options */
 static const char *basedn;