[cpp-sp COMMIT] in /branches/REL_2: Shibboleth.sln configure.ac msi/WiX/ShibbolethSP-defs-x86.wxi msi/WiX/ShibbolethS...

[noreply at shibboleth.net]

Author: scantor
Date: Thu May 24 17:07:50 2012
New Revision: 3677

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3677&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-319

Added:
    branches/REL_2/plugins/TimeAccessControl.cpp
    branches/REL_2/plugins/plugins-lite.vcxproj
      - copied, changed from r3676, branches/REL_2/plugins/plugins.vcxproj
Modified:
    branches/REL_2/Shibboleth.sln
    branches/REL_2/configure.ac
    branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs
    branches/REL_2/plugins/Makefile.am
    branches/REL_2/plugins/plugins.cpp
    branches/REL_2/plugins/plugins.vcxproj
    branches/REL_2/plugins/plugins.vcxproj.filters
    branches/REL_2/shibsp/impl/TransactionLog.cpp

Modified: branches/REL_2/Shibboleth.sln
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/Shibboleth.sln?rev=3677&r1=3676&r2=3677&view=diff
==============================================================================
--- branches/REL_2/Shibboleth.sln (original)
+++ branches/REL_2/Shibboleth.sln Thu May 24 17:07:50 2012
@@ -133,6 +133,11 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugins", "plugins\plugins.vcxproj", "{A2140D6E-C2C6-4329-84E3-2F530CEBE445}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shib_24", "apache\mod_shib24.vcxproj", "{B44C0852-83B8-4FB2-A86E-097C9C8256D1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugins-lite", "plugins\plugins-lite.vcxproj", "{A2140D6E-C2C6-4329-84E3-2F530CEBE442}"
+	ProjectSection(ProjectDependencies) = postProject
+		{81F0F7A6-DC36-46EF-957F-F9E81D4403F7} = {81F0F7A6-DC36-46EF-957F-F9E81D4403F7}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -276,6 +281,14 @@
 		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Release|Win32.Build.0 = Release|Win32
 		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Release|x64.ActiveCfg = Release|x64
 		{B44C0852-83B8-4FB2-A86E-097C9C8256D1}.Release|x64.Build.0 = Release|x64
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Debug|Win32.Build.0 = Debug|Win32
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Debug|x64.ActiveCfg = Debug|x64
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Debug|x64.Build.0 = Debug|x64
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Release|Win32.ActiveCfg = Release|Win32
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Release|Win32.Build.0 = Release|Win32
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Release|x64.ActiveCfg = Release|x64
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -293,6 +306,7 @@
 		{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{666A63A7-983F-4C19-8411-207F24305198} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{A2140D6E-C2C6-4329-84E3-2F530CEBE445} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{F13141B6-6C87-40BB-8D4E-5CC56EBB4C5A} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
 		{F13141B6-6C87-40BB-8D4E-5CC56EBB4C59} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
 		{8CF7DDFA-EAA0-416E-853E-3DCB210C4AE0} = {8E1AF2CF-24E1-4983-8681-394D89DF9AD2}

Modified: branches/REL_2/configure.ac
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configure.ac?rev=3677&r1=3676&r2=3677&view=diff
==============================================================================
--- branches/REL_2/configure.ac (original)
+++ branches/REL_2/configure.ac Thu May 24 17:07:50 2012
@@ -77,7 +77,7 @@
 AC_FUNC_STRERROR_R
 AC_CHECK_HEADERS([sys/utsname.h grp.h pwd.h])
 AC_CHECK_HEADERS([sys/socket.h], [AC_DEFINE([SHIBSP_HAVE_SYS_SOCKET_H],[1],[Define to 1 if you have the <sys/socket> header file.])], [])
-AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r strtok_r strcasecmp getpwnam getgrnam])
+AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r localtime_r strtok_r strcasecmp getpwnam getgrnam])
 AC_CHECK_TYPES([struct sockaddr_storage], [], [], [[#include <sys/socket.h>]])
 AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [[#include <sys/socket.h>]])
 

Modified: branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi?rev=3677&r1=3676&r2=3677&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi Thu May 24 17:07:50 2012
@@ -59,6 +59,7 @@
   <ComponentRef Id='nsapi_shib.dll'/>
   <ComponentRef Id='odbc_store.so'/>
   <ComponentRef Id='plugins.so'/>
+  <ComponentRef Id='plugins_lite.so'/>
   <ComponentRef Id='shibauthorizer.exe'/>
   <ComponentRef Id='shibresponder.exe'/>
 
@@ -72,6 +73,7 @@
   <ComponentRef Id='nsapi_shib.dll_debug'/>
   <ComponentRef Id='odbc_store.so_debug'/>

[... 363 lines stripped ...]