--------------------- PatchSet 520 Date: 2000/08/10 11:54:57 Author: kinkie Branch: ntlm Tag: (none) Log: Changed the API. The Domain used in SMB_Logon must now be specified. This might suck in the general case, but it's fine for what we need. Members: ntlm_auth_modules/NTLMSSP/smbval/smblib.c:1.1.2.4->1.1.2.5 Index: squid/ntlm_auth_modules/NTLMSSP/smbval/smblib.c =================================================================== RCS file: /cvsroot/squid-sf//squid/ntlm_auth_modules/NTLMSSP/smbval/Attic/smblib.c,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid/ntlm_auth_modules/NTLMSSP/smbval/smblib.c 6 Aug 2000 01:17:36 -0000 1.1.2.4 +++ squid/ntlm_auth_modules/NTLMSSP/smbval/smblib.c 10 Aug 2000 11:54:57 -0000 1.1.2.5 @@ -319,7 +319,7 @@ /* Unicode yet! */ int SMB_Logon_Server(SMB_Handle_Type Con_Handle, char *UserName, - char *PassWord, int precrypted) + char *PassWord, char *UserDomain, int precrypted) { struct RFCNB_Pkt *pkt; int param_len, i, pkt_len, pass_len,a; @@ -353,7 +353,7 @@ if (Con_Handle -> protocol < SMB_P_NT1) { param_len = strlen(UserName) + 1 + pass_len + 1 + - strlen(Con_Handle -> PDomain) + 1 + + strlen(UserDomain) + 1 + strlen(Con_Handle -> OSName) + 1; pkt_len = SMB_ssetpLM_len + param_len; @@ -402,8 +402,8 @@ p = p + 1; - strcpy(p, Con_Handle -> PDomain); - p = p + strlen(Con_Handle -> PDomain); + strcpy(p, UserDomain); + p = p + strlen(UserDomain); *p = 0; p = p + 1; @@ -417,7 +417,7 @@ /* We don't admit to UNICODE support ... */ param_len = strlen(UserName) + 1 + pass_len + - strlen(Con_Handle -> PDomain) + 1 + + strlen(UserDomain) + 1 + strlen(Con_Handle -> OSName) + 1 + strlen(Con_Handle -> LMType) + 1; @@ -469,8 +469,8 @@ p = p + 1; - strcpy(p, Con_Handle -> PDomain); - p = p + strlen(Con_Handle -> PDomain); + strcpy(p, UserDomain); + p = p + strlen(UserDomain); *p = 0; p = p + 1;