Cosmetic cleanup

diff --git a/helpers/negotiate_auth/mswin_sspi/libnegotiatessp.c b/helpers/negotiate_auth/mswin_sspi/libnegotiatessp.c
index 7af476b1c7cd80d7675c97e0a8f69c9e01d378a8..a05d1afe9e4b2db1baa0d623710101cf495ec3e8 100755 (executable)
--- 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 a71e0dd22da7a03d2d35a0e1ea041cf354ffdac6..12db46c2a882b8feafab21b546be523ae06f75d4 100755 (executable)
--- 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 8c5738900db98746eca69bc1a94ae03e57871ee0..91095a4390fa9227ea22a1efbabb8be5a882ec8e 100755 (executable)
--- 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 f54b1843802ffa641f6c3d3e17cda16f42faa5e0..24d9e07036f995c7aa54890f5fe5728cc22c3553 100755 (executable)
--- 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.