From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 23 Apr 2013 14:22:51 +0000 (-0600)
Subject: Docs: remove Squid prefix from ntlm_auth example paths
X-Git-Tag: SQUID_3_4_0_1~190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4752e21ddbc2c2d3b5b3a05265e59217cb66951;p=thirdparty%2Fsquid.git

Docs: remove Squid prefix from ntlm_auth example paths

There is no longer a helper called ntlm_auth shipped with Squid and the
example configs are supposed to be referring to the Samba helper now
as demonstrated by the command line options.

/usr/bin/ is probably not the only location where Samba installs its
helper, but is easily recognised and better than prefixing with a custom
Squid-specific path from --prefix.
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 23037d8b69..7ad9637f5e 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -497,7 +497,7 @@ DOC_START
 	of type proxy_auth.  By default, the NTLM authenticator program
 	is not used.
 
-	auth_param ntlm program @DEFAULT_PREFIX@/bin/ntlm_auth
+	auth_param ntlm program /usr/bin/ntlm_auth
 
 	"children" numberofchildren [startup=N] [idle=N]
 	The maximum number of authenticator processes to spawn (default 5).
@@ -538,7 +538,7 @@ DOC_START
 	The only supported program for this role is the ntlm_auth
 	program distributed as part of Samba, version 4 or later.
 
-	auth_param negotiate program @DEFAULT_PREFIX@/bin/ntlm_auth --helper-protocol=gss-spnego
+	auth_param negotiate program /usr/bin/ntlm_auth --helper-protocol=gss-spnego
 
 	"children" numberofchildren [startup=N] [idle=N]
 	The maximum number of authenticator processes to spawn (default 5).