From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 13 Jul 2014 07:21:11 +0000 (-0700)
Subject: ext_lm_group_acl: portability fixes for MinGW
X-Git-Tag: SQUID_3_5_0_1~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=385df8184fa707a8f05c0d79c5093714ecbd9da8;p=thirdparty%2Fsquid.git

ext_lm_group_acl: portability fixes for MinGW
---

diff --git a/helpers/external_acl/LM_group/Makefile.am b/helpers/external_acl/LM_group/Makefile.am
index aba5045112..1bc27ed71b 100644
--- a/helpers/external_acl/LM_group/Makefile.am
+++ b/helpers/external_acl/LM_group/Makefile.am
@@ -4,6 +4,7 @@ libexec_PROGRAMS = ext_lm_group_acl
 ext_lm_group_acl_SOURCES = ext_lm_group_acl.cc
 
 LDADD = \
+	$(top_builddir)/lib/libmiscencoding.la \
 	$(COMPAT_LIB) \
 	-lnetapi32 \
 	-ladvapi32 \
diff --git a/helpers/external_acl/LM_group/ext_lm_group_acl.cc b/helpers/external_acl/LM_group/ext_lm_group_acl.cc
index 038f77e4e8..34713295b0 100644
--- a/helpers/external_acl/LM_group/ext_lm_group_acl.cc
+++ b/helpers/external_acl/LM_group/ext_lm_group_acl.cc
@@ -90,7 +90,7 @@ int _wcsicmp(const wchar_t *, const wchar_t *);
 
 int use_global = 0;
 int use_PDC_only = 0;
-char *program_name;
+const char *program_name;
 pid_t mypid;
 char *machinedomain;
 int use_case_insensitive_compare = 0;
@@ -534,12 +534,15 @@ main(int argc, char *argv[])
     }
     debug("External ACL win32 group helper build " __DATE__ ", " __TIME__
           " starting up...\n");
-    if (use_global)
+    if (use_global) {
         debug("Domain Global group mode enabled using '%s' as default domain.\n", DefaultDomain);
-    if (use_case_insensitive_compare)
+    }
+    if (use_case_insensitive_compare) {
         debug("Warning: running in case insensitive mode !!!\n");
-    if (use_PDC_only)
+    }
+    if (use_PDC_only) {
         debug("Warning: using only PDCs for group validation !!!\n");
+    }
 
     /* Main Loop */
     while (fgets(buf, HELPER_INPUT_BUFFER, stdin)) {