From: hno <>
Date: Mon, 22 Jul 2002 17:20:10 +0000 (+0000)
Subject: NTLM fixes by Guido
X-Git-Tag: SQUID_3_0_PRE1~869
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=820d15c84b4cd242013b689e7d7d8f4eae73425c;p=thirdparty%2Fsquid.git

NTLM fixes by Guido
---

diff --git a/helpers/ntlm_auth/SMB/ntlm_auth.c b/helpers/ntlm_auth/SMB/ntlm_auth.c
index e496110f12..c8582917c7 100644
--- a/helpers/ntlm_auth/SMB/ntlm_auth.c
+++ b/helpers/ntlm_auth/SMB/ntlm_auth.c
@@ -133,7 +133,14 @@ void
 usage()
 {
     fprintf(stderr,
-	"%s usage:\n%s [-b] [-f] [-d] domain\\controller [domain\\controller ...]\n-b, if specified, enables load-balancing among controllers\n-f, if specified, enables failover among controllers (DEPRECATED and always active)\n-l, if specified, changes behavior on domain controller failyures to\tlast-ditch.-d enables debugging statements if DEBUG was defined at build-time.\n\nYou MUST specify at least one Domain Controller.\nYou can use either \\ or / as separator between the domain name \n\tand the controller name\n",
+	"%s usage:\n%s [-b] [-f] [-d] [-l] domain\\controller [domain\\controller ...]\n"
+	"-b enables load-balancing among controllers\n"
+	"-f enables failover among controllers (DEPRECATED and always active)\n"
+	"-l changes behavior on domain controller failyures to last-ditch.\n"
+	"-d enables debugging statements if DEBUG was defined at build-time.\n\n"
+	"You MUST specify at least one Domain Controller.\n"
+	"You can use either \\ or / as separator between the domain name \n"
+	"and the controller name\n",
 	my_program_name, my_program_name);
 }
 
@@ -301,7 +308,7 @@ manage_request()
 	    SEND("NA Broken authentication packet");
 	    return;
 	}
-	switch (fast_header->type) {
+	switch WSWAP(fast_header->type) {
 	case NTLM_NEGOTIATE:
 	    SEND("NA Invalid negotiation request received");
 	    return;
diff --git a/helpers/ntlm_auth/winbind/wb_ntlm_auth.c b/helpers/ntlm_auth/winbind/wb_ntlm_auth.c
index a8be7fa109..b5cb69612e 100644
--- a/helpers/ntlm_auth/winbind/wb_ntlm_auth.c
+++ b/helpers/ntlm_auth/winbind/wb_ntlm_auth.c
@@ -314,7 +314,7 @@ try_again:
 	return;
     }
     /* Understand what we got */
-    switch (fast_header->type) {
+    switch WSWAP(fast_header->type) {
     case NTLM_NEGOTIATE:
 	authfail("-", "-", "Received neg-request while expecting auth packet");
 	return;