/* * DIFF made from squid-head-200109262300 * diff -bit -c -r squid-head-200109262300/lib/ntlmauth.c squid-head-200109262300-good/lib/ntlmauth.c *** squid-head-200109262300/lib/ntlmauth.c Thu Aug 30 00:57:34 2001 --- squid-head-200109262300-good/lib/ntlmauth.c Fri Oct 26 17:02:32 2001 *************** *** 99,107 **** int l = (*payload_length); memcpy(payload + l, toadd, toadd_length); ! hdr->len = toadd_length; ! hdr->maxlen = toadd_length; ! hdr->offset = l + base_offset; /* 48 is the base offset of the payload */ (*payload_length) += toadd_length; } --- 99,107 ---- int l = (*payload_length); memcpy(payload + l, toadd, toadd_length); ! hdr->len = SSWAP(toadd_length); ! hdr->maxlen = SSWAP(toadd_length); ! hdr->offset = WSWAP(l + base_offset); /* 48 is the base offset of the payload */ (*payload_length) += toadd_length; } diff -bit -c -r squid-head-200109262300/src/auth/ntlm/helpers/NTLMSSP/ntlm.h squid-head-200109262300-good/src/auth/ntlm/helpers/NTLMSSP/ntlm.h *** squid-head-200109262300/src/auth/ntlm/helpers/NTLMSSP/ntlm.h Thu Aug 30 00:57:37 2001 --- squid-head-200109262300-good/src/auth/ntlm/helpers/NTLMSSP/ntlm.h Fri Oct 26 17:02:38 2001 *************** *** 51,57 **** #include #include static char *__foo; ! #define debug(X...) fprintf(stderr,"ntlm-auth[%d](%s:%d): ", getpid(), \ ((__foo=strrchr(__FILE__,'/'))==NULL?__FILE__:__foo+1),\ __LINE__);\ fprintf(stderr,X) --- 51,57 ---- #include #include static char *__foo; ! #define debug(X...) fprintf(stderr,"ntlm-auth[%d](%s:%d): ", (int)getpid(), \ ((__foo=strrchr(__FILE__,'/'))==NULL?__FILE__:__foo+1),\ __LINE__);\ fprintf(stderr,X) diff -bit -c -r squid-head-200109262300/src/auth/ntlm/helpers/NTLMSSP/ntlm_auth.c squid-head-200109262300-good/src/auth/ntlm/helpers/NTLMSSP/ntlm_auth.c *** squid-head-200109262300/src/auth/ntlm/helpers/NTLMSSP/ntlm_auth.c Thu Aug 30 00:57:37 2001 --- squid-head-200109262300-good/src/auth/ntlm/helpers/NTLMSSP/ntlm_auth.c Fri Oct 26 17:02:38 2001 *************** *** 296,302 **** SEND("NA Broken authentication packet"); return; } ! switch (fast_header->type) { case NTLM_NEGOTIATE: SEND("NA Invalid negotiation request received"); return; --- 296,302 ---- SEND("NA Broken authentication packet"); return; } ! switch (WSWAP(fast_header->type)) { case NTLM_NEGOTIATE: SEND("NA Invalid negotiation request received"); return; *************** *** 315,321 **** alarm(0); signal(SIGALRM,SIG_DFL); if (got_timeout != 0) { ! fprintf(stderr,"ntlm-auth[%d]: Timeout during authentication.\n", getpid()); SEND("BH Timeout during authentication"); got_timeout=0; return; --- 315,321 ---- alarm(0); signal(SIGALRM,SIG_DFL); if (got_timeout != 0) { ! fprintf(stderr,"ntlm-auth[%d]: Timeout during authentication.\n", (int)getpid()); SEND("BH Timeout during authentication"); got_timeout=0; return;