--------------------- PatchSet 5528 Date: 2002/12/01 09:28:10 Author: serassio Branch: nt-2_5 Tag: (none) Log: ip_user_check external ACL helper now builds on Windows Members: helpers/external_acl/ip_user/Makefile.am:1.1.12.2->1.1.12.3 helpers/external_acl/ip_user/dict.c:1.1.16.1->1.1.16.2 helpers/external_acl/ip_user/main.c:1.2.6.1->1.2.6.2 helpers/external_acl/ip_user/match.c:1.1.16.1->1.1.16.2 port/win32/ip_user_check/.cvsignore:1.1->1.1.2.1 port/win32/ip_user_check/ip_user_check.dsp:1.1->1.1.2.1 Index: squid/helpers/external_acl/ip_user/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/ip_user/Makefile.am,v retrieving revision 1.1.12.2 retrieving revision 1.1.12.3 diff -u -r1.1.12.2 -r1.1.12.3 --- squid/helpers/external_acl/ip_user/Makefile.am 22 Jul 2002 09:07:29 -0000 1.1.12.2 +++ squid/helpers/external_acl/ip_user/Makefile.am 1 Dec 2002 09:28:10 -0000 1.1.12.3 @@ -1,7 +1,7 @@ # # Makefile for the ip_user external_acl helper by Rodrigo Campos # -# $Id: Makefile.am,v 1.1.12.2 2002/07/22 09:07:29 serassio Exp $ +# $Id: Makefile.am,v 1.1.12.3 2002/12/01 09:28:10 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -24,7 +24,15 @@ # sysconf_DATA = +if ENABLE_MINGW32SPECIFIC +LDADD = -L$(top_builddir)/lib -lmiscutil \ + @XTRA_LIBS@ + +INCLUDES = -I. -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ + -I$(top_srcdir)/include -I$(top_srcdir)/src/ +else LDADD = @XTRA_LIBS@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ +endif Index: squid/helpers/external_acl/ip_user/dict.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/ip_user/dict.c,v retrieving revision 1.1.16.1 retrieving revision 1.1.16.2 diff -u -r1.1.16.1 -r1.1.16.2 --- squid/helpers/external_acl/ip_user/dict.c 13 Jul 2002 06:27:44 -0000 1.1.16.1 +++ squid/helpers/external_acl/ip_user/dict.c 1 Dec 2002 09:28:10 -0000 1.1.16.2 @@ -1,4 +1,4 @@ -/* $Id: dict.c,v 1.1.16.1 2002/07/13 06:27:44 serassio Exp $ +/* $Id: dict.c,v 1.1.16.2 2002/12/01 09:28:10 serassio Exp $ * Copyright (C) 2002 Rodrigo Campos * * This program is free software; you can redistribute it and/or modify @@ -23,9 +23,13 @@ #include #include #include +#ifdef _WIN32 +#include +#else #include #include #include +#endif #include "ip_user.h" @@ -129,9 +133,11 @@ if ((strchr (current_entry->username, '@')) == NULL) { if ((match_user (current_entry->username, username)) == 1) return 1; +#ifndef _WIN32 } else { if ((match_group (current_entry->username, username)) == 1) return 1; +#endif } } current_entry = current_entry->next_entry; Index: squid/helpers/external_acl/ip_user/main.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/ip_user/main.c,v retrieving revision 1.2.6.1 retrieving revision 1.2.6.2 diff -u -r1.2.6.1 -r1.2.6.2 --- squid/helpers/external_acl/ip_user/main.c 13 Jul 2002 06:27:44 -0000 1.2.6.1 +++ squid/helpers/external_acl/ip_user/main.c 1 Dec 2002 09:28:10 -0000 1.2.6.2 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.2.6.1 2002/07/13 06:27:44 serassio Exp $ +/* $Id: main.c,v 1.2.6.2 2002/12/01 09:28:10 serassio Exp $ * Copyright (C) 2002 Rodrigo Campos * * This program is free software; you can redistribute it and/or modify @@ -20,7 +20,11 @@ */ #include #include +#ifdef _WIN32 +#include +#else #include +#endif #include Index: squid/helpers/external_acl/ip_user/match.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/ip_user/match.c,v retrieving revision 1.1.16.1 retrieving revision 1.1.16.2 diff -u -r1.1.16.1 -r1.1.16.2 --- squid/helpers/external_acl/ip_user/match.c 13 Jul 2002 06:27:44 -0000 1.1.16.1 +++ squid/helpers/external_acl/ip_user/match.c 1 Dec 2002 09:28:10 -0000 1.1.16.2 @@ -1,4 +1,4 @@ -/* $Id: match.c,v 1.1.16.1 2002/07/13 06:27:44 serassio Exp $ +/* $Id: match.c,v 1.1.16.2 2002/12/01 09:28:10 serassio Exp $ * Copyright (C) 2002 Rodrigo Campos * * This program is free software; you can redistribute it and/or modify @@ -21,7 +21,9 @@ #include #include #include +#ifndef _WIN32 #include +#endif int @@ -37,6 +39,7 @@ return 0; } /* match_user */ +#ifndef _WIN32 int match_group (char *dict_group, char *username) { @@ -59,3 +62,4 @@ return 0; } /* match_group */ +#endif --- /dev/null Wed Feb 14 01:07:22 2007 +++ squid/port/win32/ip_user_check/.cvsignore Wed Feb 14 01:08:19 2007 @@ -0,0 +1,3 @@ +.cvsignore +Debug +Release --- /dev/null Wed Feb 14 01:07:22 2007 +++ squid/port/win32/ip_user_check/ip_user_check.dsp Wed Feb 14 01:08:19 2007 @@ -0,0 +1,114 @@ +# Microsoft Developer Studio Project File - Name="ip_user_check" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=ip_user_check - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "ip_user_check.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "ip_user_check.mak" CFG="ip_user_check - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ip_user_check - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "ip_user_check - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "ip_user_check - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "ip_user_check - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MT /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "ip_user_check - Win32 Release" +# Name "ip_user_check - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\helpers\external_acl\ip_user\dict.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\helpers\external_acl\ip_user\main.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\helpers\external_acl\ip_user\match.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\helpers\external_acl\ip_user\ip_user.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project