From: Amos Jeffries Date: Mon, 14 Jun 2010 11:33:42 +0000 (+1200) Subject: Drop no_check.pl NTLM helper X-Git-Tag: SQUID_3_2_0_1~143 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=266d355edd939a9c5891a39ee238b6545d871338;p=thirdparty%2Fsquid.git Drop no_check.pl NTLM helper It was a near duplicate of ntlm_fake_auth. But with some additional cons: * predictable challenge nonce (BAD) * less configurable * required run-time perl infrastructure. The original perl code is kept as ntlm_fake_auth.pl.in for now but does not get built and installed. --- diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml index 94e4a680c9..764e19c424 100644 --- a/doc/release-notes/release-3.2.sgml +++ b/doc/release-notes/release-3.2.sgml @@ -125,6 +125,7 @@ Most user-facing changes are reflected in squid.conf (see below).

fakeauth_auth - ntlm_fake_auth - Perform NTLMSSP to recover the username but don't verify the password. ntlm_auth - ntlm_smb_lm_auth - Perform SMB LanManager domain-less authentication over NTLM protocol. + no_check.pl - Deprecated. - Use the faster and less decryptable ntlm_fake_auth instead. URL re-write helpers diff --git a/helpers/ntlm_auth/fake/Makefile.am b/helpers/ntlm_auth/fake/Makefile.am index ee777c1b43..fc45bb36db 100644 --- a/helpers/ntlm_auth/fake/Makefile.am +++ b/helpers/ntlm_auth/fake/Makefile.am @@ -9,6 +9,9 @@ ntlm_fake_auth_LDADD = \ $(CRYPTLIB) \ $(XTRA_LIBS) -ntlm_fake_auth_DEPENDENCIES = $(top_builddir)/lib/libntlmauth.a +## Demo using perl. +## ntlm_fake_auth.pl: ntlm_fake_auth.pl.in +## $(subst_perlshell) -EXTRA_DIST = config.test +EXTRA_DIST = config.test \ + ntlm_fake_auth.pl.in diff --git a/helpers/ntlm_auth/no_check/no_check.pl b/helpers/ntlm_auth/fake/ntlm_fake_auth.pl.in similarity index 93% rename from helpers/ntlm_auth/no_check/no_check.pl rename to helpers/ntlm_auth/fake/ntlm_fake_auth.pl.in index 414df0b470..7c94efd10b 100755 --- a/helpers/ntlm_auth/no_check/no_check.pl +++ b/helpers/ntlm_auth/fake/ntlm_fake_auth.pl.in @@ -1,6 +1,16 @@ -#!/usr/bin/perl +#!@PERL@ +# # (C) 2000 Francesco Chemolli +# Distributed freely under the terms of the GNU General Public License, +# version 2. For the licensing terms, see the file COPYING that +# came with Squid. # +# This is a dummy NTLM authentication module for Squid. +# It performs the NTLM challenge, but then it doesn't verify the +# user's credentials, it just takes the client's domain and username +# at face value. +# It's included mostly for demonstration purposes. +# # TODO: use command-line arguments #use MIME::Base64; diff --git a/helpers/ntlm_auth/no_check/Makefile.am b/helpers/ntlm_auth/no_check/Makefile.am deleted file mode 100644 index 305888add3..0000000000 --- a/helpers/ntlm_auth/no_check/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id$ -# -# Uncomment and customize the following to suit your needs: -# - -libexec_SCRIPTS = no_check.pl - -EXTRA_DIST = \ - no_check.pl \ - README.no_check_ntlm_auth \ - config.test diff --git a/helpers/ntlm_auth/no_check/README.no_check_ntlm_auth b/helpers/ntlm_auth/no_check/README.no_check_ntlm_auth deleted file mode 100644 index 19d895a954..0000000000 --- a/helpers/ntlm_auth/no_check/README.no_check_ntlm_auth +++ /dev/null @@ -1,10 +0,0 @@ -This is a dummy NTLM authentication module for Squid. -It performs the NTLM challenge, but then it doesn't verify the -user's credentials, it just takes the client's domain and username -at face value. -It's included mostly for demonstration purposes. - -(C) 2000 Francesco Chemolli -Distributed freely under the terms of the GNU General Public License, -version 2. For the licensing terms, see the file COPYING that -came with Squid. diff --git a/helpers/ntlm_auth/no_check/config.test b/helpers/ntlm_auth/no_check/config.test deleted file mode 100755 index 039e4d0069..0000000000 --- a/helpers/ntlm_auth/no_check/config.test +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exit 0