--------------------- PatchSet 4073 Date: 2002/04/25 19:53:36 Author: serassio Branch: nt-2_5 Tag: (none) Log: Some NTLM on WIN32 stuff Members: port/win32/update.cmd:1.1.2.5->1.1.2.6 src/helper.c:1.16.10.4->1.16.10.5 src/structs.h:1.48.6.6->1.48.6.7 src/unlinkd.c:1.6.10.4->1.6.10.5 src/auth/ntlm/helpers/fakeauth/fakeauth_auth.c:1.4->1.4.20.1 Index: squid/port/win32/update.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/update.cmd,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid/port/win32/update.cmd 21 Apr 2002 20:37:34 -0000 1.1.2.5 +++ squid/port/win32/update.cmd 25 Apr 2002 19:53:36 -0000 1.1.2.6 @@ -5,7 +5,7 @@ copy %0\..\dnsserver\%1\dnsserver.exe %2\libexec\dnsserver.exe copy %0\..\pinger\%1\pinger.exe %2\libexec\pinger.exe copy %0\..\squidclient\%1\squidclient.exe %2\bin\squidclient.exe -copy %0\..\fake_auth\%1\fake_auth.exe %2\libexec\fake_auth.exe +copy %0\..\fake_auth\%1\fake_auth.exe %2\libexec\fakeauth_auth.exe copy %0\..\nt_auth\%1\nt_auth.exe %2\libexec\nt_auth.exe copy %0\..\ncsa_auth\%1\ncsa_auth.exe %2\libexec\ncsa_auth.exe copy %0\..\ntlm_win32_auth\%1\ntlm_win32_auth.exe %2\libexec\ntlm_win32_auth.exe Index: squid/src/helper.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/helper.c,v retrieving revision 1.16.10.4 retrieving revision 1.16.10.5 diff -u -r1.16.10.4 -r1.16.10.5 --- squid/src/helper.c 21 Apr 2002 20:41:13 -0000 1.16.10.4 +++ squid/src/helper.c 25 Apr 2002 19:53:36 -0000 1.16.10.5 @@ -1,6 +1,6 @@ /* - * $Id: helper.c,v 1.16.10.4 2002/04/21 20:41:13 serassio Exp $ + * $Id: helper.c,v 1.16.10.5 2002/04/25 19:53:36 serassio Exp $ * * DEBUG: section 29 Helper process maintenance * AUTHOR: Harvest Derived? @@ -124,7 +124,7 @@ srv->parent = hlp; #ifdef _SQUID_MSWIN_ srv->hIpc = hIpc; - srv->pid = pid; + srv->win32_pid = pid; #endif cbdataLock(hlp); /* lock because of the parent backlink */ dlinkAddTail(srv, &srv->link, &hlp->servers); @@ -220,6 +220,7 @@ srv->parent = hlp; #ifdef _SQUID_MSWIN_ srv->hIpc = hIpc; + srv->win32_pid = pid; #endif if (hlp->datapool != NULL) srv->data = memPoolAlloc(hlp->datapool); @@ -443,9 +444,16 @@ storeAppendPrintf(sentry, "avg service time: %d msec\n", hlp->stats.avg_svc_time); storeAppendPrintf(sentry, "\n"); +#ifdef _SQUID_MSWIN_ + storeAppendPrintf(sentry, "%7s\t%7s\t%7s\t%11s\t%s\t%7s\t%7s\t%7s\n", +#else storeAppendPrintf(sentry, "%7s\t%7s\t%11s\t%s\t%7s\t%7s\t%7s\n", +#endif "#", "FD", +#ifdef _SQUID_MSWIN_ + "PID", +#endif "# Requests", "Flags", "Time", @@ -454,9 +462,16 @@ for (link = hlp->servers.head; link; link = link->next) { srv = link->data; tt = 0.001 * tvSubMsec(srv->dispatch_time, current_time); +#ifdef _SQUID_MSWIN_ + storeAppendPrintf(sentry, "%7d\t%7d\t%7d\t%11d\t%c%c%c%c\t%7.3f\t%7d\t%s\n", +#else storeAppendPrintf(sentry, "%7d\t%7d\t%11d\t%c%c%c%c\t%7.3f\t%7d\t%s\n", +#endif srv->index + 1, srv->rfd, +#ifdef _SQUID_MSWIN_ + srv->win32_pid, +#endif srv->stats.uses, srv->flags.alive ? 'A' : ' ', srv->flags.busy ? 'B' : ' ', @@ -506,7 +521,11 @@ storeAppendPrintf(sentry, "%7d\t%7d\t%7d\t%11d\t%11d\t%c%c%c%c%c%c\t%7.3f\t%7d\t%s\n", srv->index + 1, srv->rfd, +#ifdef _SQUID_MSWIN_ + srv->win32_pid, +#else srv->pid, +#endif srv->stats.uses, (int) srv->deferred_requests, srv->flags.alive ? 'A' : ' ', @@ -560,7 +579,7 @@ srv->flags.closing = 1; #ifdef _SQUID_MSWIN_ hIpc = srv->hIpc; - pid = srv->pid; + pid = srv->win32_pid; no = srv->index + 1; shutdown(srv->rfd, SD_BOTH); #endif @@ -622,7 +641,7 @@ srv->flags.closing = 1; #ifdef _SQUID_MSWIN_ hIpc = srv->hIpc; - pid = srv->pid; + pid = srv->win32_pid; no = srv->index + 1; shutdown(srv->rfd, SD_BOTH); #endif Index: squid/src/structs.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/structs.h,v retrieving revision 1.48.6.6 retrieving revision 1.48.6.7 diff -u -r1.48.6.6 -r1.48.6.7 --- squid/src/structs.h 22 Apr 2002 16:54:36 -0000 1.48.6.6 +++ squid/src/structs.h 25 Apr 2002 19:53:36 -0000 1.48.6.7 @@ -1,6 +1,6 @@ /* - * $Id: structs.h,v 1.48.6.6 2002/04/22 16:54:36 serassio Exp $ + * $Id: structs.h,v 1.48.6.7 2002/04/25 19:53:36 serassio Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -2058,7 +2058,7 @@ } stats; #ifdef _SQUID_MSWIN_ HANDLE hIpc; - pid_t pid; + pid_t win32_pid; #endif }; @@ -2082,7 +2082,7 @@ unsigned int busy:1; unsigned int closing:1; unsigned int shutdown:1; - stateful_helper_reserve_t reserved:2; + unsigned int reserved:2; } flags; struct { int uses; @@ -2095,6 +2095,7 @@ void *data; /* State data used by the calling routines */ #ifdef _SQUID_MSWIN_ HANDLE hIpc; + pid_t win32_pid; #endif }; Index: squid/src/unlinkd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/unlinkd.c,v retrieving revision 1.6.10.4 retrieving revision 1.6.10.5 diff -u -r1.6.10.4 -r1.6.10.5 --- squid/src/unlinkd.c 13 Apr 2002 14:58:55 -0000 1.6.10.4 +++ squid/src/unlinkd.c 25 Apr 2002 19:53:37 -0000 1.6.10.5 @@ -1,6 +1,6 @@ /* - * $Id: unlinkd.c,v 1.6.10.4 2002/04/13 14:58:55 serassio Exp $ + * $Id: unlinkd.c,v 1.6.10.5 2002/04/25 19:53:37 serassio Exp $ * * DEBUG: section 12 Unlink Daemon * AUTHOR: Duane Wessels @@ -211,6 +211,7 @@ void unlinkdInit(void) { +#ifdef USE_UNLINKD int x; const char *args[2]; struct timeval slp; @@ -255,6 +256,7 @@ commUnsetNonBlocking(unlinkd_wfd); debug(12, 1) ("Unlinkd pipe opened on FD %d\n", unlinkd_wfd); cachemgrRegister("unlinkd", "Unlink Daemon Stats", unlinkdStats, 0, 1); +#endif } #endif /* ndef UNLINK_DAEMON */ Index: squid/src/auth/ntlm/helpers/fakeauth/fakeauth_auth.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/helpers/fakeauth/Attic/fakeauth_auth.c,v retrieving revision 1.4 retrieving revision 1.4.20.1 diff -u -r1.4 -r1.4.20.1 --- squid/src/auth/ntlm/helpers/fakeauth/fakeauth_auth.c 30 Aug 2001 16:24:14 -0000 1.4 +++ squid/src/auth/ntlm/helpers/fakeauth/fakeauth_auth.c 25 Apr 2002 19:53:37 -0000 1.4.20.1 @@ -249,6 +249,7 @@ char *data = NULL; setbuf(stdout, NULL); + setbuf(stderr, NULL); while (fgets(buf, 256, stdin) != NULL) { user[0] = '\0'; /*no usercode */