--- source/utils/ntlm_auth.c.orig	2003-10-05 05:24:06.081183000 +0900
+++ source/utils/ntlm_auth.c	2003-10-06 02:18:36.283010000 +0900
@@ -336,6 +336,7 @@
 {
 	char *user, *pass;	
 	user=buf;
+        fstring user1;
 	
 	pass=memchr(buf,' ',length);
 	if (!pass) {
@@ -350,8 +351,10 @@
 		rfc1738_unescape(user);
 		rfc1738_unescape(pass);
 	}
-	
-	if (check_plaintext_auth(user, pass, False)) {
+
+	fstr_sprintf(user1, "%s%c%s", opt_domain, winbind_separator(), user);
+
+	if (check_plaintext_auth(user1, pass, False)) {
 		x_fprintf(x_stdout, "OK\n");
 	} else {
 		x_fprintf(x_stdout, "ERR\n");
@@ -2018,6 +2021,10 @@
 		}
 	}
 
+	if (opt_domain == NULL) {
+		opt_domain = get_winbind_domain();
+	}
+
 	if (helper_protocol) {
 		if (strcmp(helper_protocol, "squid-2.5-ntlmssp")== 0) {
 			squid_stream(SQUID_2_5_NTLMSSP);
@@ -2041,10 +2048,6 @@
 		exit(1);
 	}
 
-	if (opt_domain == NULL) {
-		opt_domain = get_winbind_domain();
-	}
-
 	if (opt_workstation == NULL) {
 		opt_workstation = "";
 	}