From: serassio <>
Date: Sun, 27 Nov 2005 16:54:35 +0000 (+0000)
Subject: Cosmetic cleanup
X-Git-Tag: SQUID_3_0_PRE4~484
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f127098b653eb26a03db376d88c94ea1e0ed574;p=thirdparty%2Fsquid.git

Cosmetic cleanup
---

diff --git a/helpers/negotiate_auth/mswin_sspi/libnegotiatessp.c b/helpers/negotiate_auth/mswin_sspi/libnegotiatessp.c
index 7af476b1c7..a05d1afe9e 100755
--- a/helpers/negotiate_auth/mswin_sspi/libnegotiatessp.c
+++ b/helpers/negotiate_auth/mswin_sspi/libnegotiatessp.c
@@ -1,5 +1,5 @@
 /*
- * (C) 2002 Guido Serassio <serassio@libero.it>
+ * (C) 2005 Guido Serassio <guido.serassio@acmeconsulting.it>
  * Based on previous work of Francesco Chemolli and Robert Collins
  * Distributed freely under the terms of the GNU General Public License,
  * version 2. See the file COPYING for licensing details
diff --git a/helpers/negotiate_auth/mswin_sspi/negotiate.h b/helpers/negotiate_auth/mswin_sspi/negotiate.h
index a71e0dd22d..12db46c2a8 100755
--- a/helpers/negotiate_auth/mswin_sspi/negotiate.h
+++ b/helpers/negotiate_auth/mswin_sspi/negotiate.h
@@ -1,5 +1,5 @@
 /*
- * (C) 2002 Guido Serassio <serassio@libero.it>
+ * (C) 2005 Guido Serassio <guido.serassio@acmeconsulting.it>
  * Based on previous work of Francesco Chemolli, Robert Collins and Andrew Doran
  *
  * Distributed freely under the terms of the GNU General Public License,
@@ -15,14 +15,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  */
 
-#ifndef _NTLM_H_
-#define _NTLM_H_
+#ifndef _NEGOTIATE_H_
+#define _NEGOTIATE_H_
 
 #include "sspwin32.h"
 #include <windows.h>
 #include <sspi.h>
 #include <security.h>
-#include "ntlmauth.h"
 #undef debug
 
 /************* CONFIGURATION ***************/
@@ -97,15 +96,6 @@ debug(char *format,...)
 #define SEND3(X,Y,Z) debug("sending '" X "' to squid\n",Y,Z); printf(X "\n",Y,Z);
 #endif
 
-extern int ntlm_errno;
-
-#define NTLM_NO_ERROR 0
-#define NTLM_SSPI_ERROR 1
-#define NTLM_BAD_NTGROUP 2
-#define NTLM_BAD_REQUEST 3
-
-#define NEGOTIATE_LENGTH 16
-
 extern void uc(char *);
 
 extern char *negotiate_check_auth(SSP_blobP auth, int auth_length);
@@ -113,4 +103,4 @@ extern void hex_dump(void *, int);
 
 #define safe_free(x)	if (x) { free(x); x = NULL; }
 
-#endif /* _NTLM_H_ */
+#endif /* _NEGOTIATE_H_ */
diff --git a/helpers/negotiate_auth/mswin_sspi/negotiate_auth.c b/helpers/negotiate_auth/mswin_sspi/negotiate_auth.c
index 8c5738900d..91095a4390 100755
--- a/helpers/negotiate_auth/mswin_sspi/negotiate_auth.c
+++ b/helpers/negotiate_auth/mswin_sspi/negotiate_auth.c
@@ -1,5 +1,5 @@
 /*
- * win32_ntlm_auth: helper for NTLM Authentication for Squid Cache
+ * mswin_negotiate_auth: helper for Negotiate Authentication for Squid Cache
  *
  * (C)2005 Guido Serassio - Acme Consulting S.r.l.
  *
@@ -87,7 +87,7 @@ helperfail(const char *reason)
 /*
   options:
   -d enable debugging.
-  -v enable verbose NTLM packet debugging.
+  -v enable verbose Negotiate packet debugging.
  */
 char *my_program_name = NULL;
 
@@ -97,7 +97,7 @@ usage()
     fprintf(stderr,
 	"Usage: %s [-d] [-v] [-h]\n"
 	" -d  enable debugging.\n"
-        " -v  enable verbose NTLM packet debugging.\n"
+        " -v  enable verbose Negotiate packet debugging.\n"
 	" -h  this message\n\n",
 	my_program_name);
 }
diff --git a/helpers/negotiate_auth/mswin_sspi/readme.txt b/helpers/negotiate_auth/mswin_sspi/readme.txt
index f54b184380..24d9e07036 100755
--- a/helpers/negotiate_auth/mswin_sspi/readme.txt
+++ b/helpers/negotiate_auth/mswin_sspi/readme.txt
@@ -39,11 +39,3 @@ internal Squid FTP icons. The following squid.conf ACL works around this:
 acl internal_icons urlpath_regex -i /squid-internal-static/icons/
 
 http_access allow our_networks internal_icons <== BEFORE authentication ACL !!!
-
-
-===============
-Contact details
-===============
-
-To contact the maintainer of this package, e-mail on squidnt@acmeconsulting.it.
-The latest version may be found on http://www.acmeconsulting.it/SquidNT.htm.