From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 31 Jul 2010 05:48:01 +0000 (+1200)
Subject: Fix fake NTLM auth symbol clash on ERR/OK macros
X-Git-Tag: take1~435
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcb9c96c1d26592f07adcf61bc8c985fa05c7d19;p=thirdparty%2Fsquid.git

Fix fake NTLM auth symbol clash on ERR/OK macros
---

diff --git a/helpers/ntlm_auth/fake/ntlm_fake_auth.cc b/helpers/ntlm_auth/fake/ntlm_fake_auth.cc
index 000eb675bc..3d967a12e9 100644
--- a/helpers/ntlm_auth/fake/ntlm_fake_auth.cc
+++ b/helpers/ntlm_auth/fake/ntlm_fake_auth.cc
@@ -54,6 +54,7 @@
 #define IGNORANCE_IS_BLISS
 
 #include "config.h"
+#include "helpers/defines.h"
 #include "libntlmauth/ntlmauth.h"
 #include "libntlmauth/support_bits.cci"
 #include "util.h"
@@ -85,11 +86,6 @@
 #define SEND3(X,Y,Z) debug("sending '" X "' to squid\n",Y,Z); printf(X "\n",Y,Z);
 #endif
 
-#define ERR    "ERR\n"
-#define OK     "OK\n"
-
-#define BUFFER_SIZE 10240
-
 const char *authenticate_ntlm_domain = "WORKGROUP";
 int strip_domain_enabled = 0;
 int NTLM_packet_debug_enabled = 0;
@@ -151,7 +147,7 @@ process_options(int argc, char *argv[])
 int
 main(int argc, char *argv[])
 {
-    char buf[BUFFER_SIZE];
+    char buf[HELEPR_INPUT_BUFFER];
     int buflen = 0;
     char user[NTLM_MAX_FIELD_LENGTH], domain[NTLM_MAX_FIELD_LENGTH];
     char *p;
@@ -169,7 +165,7 @@ main(int argc, char *argv[])
 
     debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name);
 
-    while (fgets(buf, BUFFER_SIZE, stdin) != NULL) {
+    while (fgets(buf, HELPER_INPUT_BUFFER, stdin) != NULL) {
         user[0] = '\0';		/*no user code */
         domain[0] = '\0';		/*no domain code */