--------------------- PatchSet 2953 Date: 2001/09/04 09:27:36 Author: rbcollins Branch: ntlm Tag: (none) Log: fix merge hiccup with credentials_ok Members: src/auth/ntlm/auth_ntlm.h:1.1.8.12->1.1.8.13 Index: squid/src/auth/ntlm/auth_ntlm.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/auth_ntlm.h,v retrieving revision 1.1.8.12 retrieving revision 1.1.8.13 diff -u -r1.1.8.12 -r1.1.8.13 --- squid/src/auth/ntlm/auth_ntlm.h 4 Sep 2001 08:13:05 -0000 1.1.8.12 +++ squid/src/auth/ntlm/auth_ntlm.h 4 Sep 2001 09:27:36 -0000 1.1.8.13 @@ -31,9 +31,6 @@ }; struct _ntlm_request { - struct { - unsigned int credentials_ok:2; /*0=unchecked,1=ok,2=failed */ - } flags; /* what negotiate string did the client use? */ char *ntlmnegotiate; /* what challenge did we give the client? */