[shibboleth-sp2] 01/29: Backport fixes from main branch and rev version.
Ferenc Wágner
wferi-guest at moszumanska.debian.org
Tue Jan 26 21:30:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
wferi-guest pushed a commit to annotated tag 2.4.3
in repository shibboleth-sp2.
commit 074e4a4917a74a161c5a4dbe7d8c9e50d544db23
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Tue May 31 20:14:40 2011 +0000
Backport fixes from main branch and rev version.
---
.gitignore | 1 +
Makefile.am | 15 +++-
adfs/adfs-lite.vcxproj | 2 -
adfs/adfs.rc | 14 ++--
adfs/adfs.vcxproj | 2 -
apache/mod_apache.cpp | 20 +++--
apache/mod_shib13.vcxproj | 2 -
apache/mod_shib20.vcxproj | 2 -
apache/mod_shib22.vcxproj | 2 -
apache/mod_shib_13.rc | 14 ++--
apache/mod_shib_20.rc | 14 ++--
apache/mod_shib_22.rc | 14 ++--
config_win32.h | 8 +-
configs/metagen.sh | 5 --
configure.ac | 87 +++++++++++++++-------
doc/Makefile.am | 6 +-
fastcgi/shibauthorizer.rc | 14 ++--
fastcgi/shibauthorizer.vcxproj | 2 -
fastcgi/shibresponder.rc | 14 ++--
fastcgi/shibresponder.vcxproj | 2 -
isapi_shib/isapi_shib.rc | 14 ++--
isapi_shib/isapi_shib.vcxproj | 2 -
memcache-store/memcache-store.rc | 14 ++--
memcache-store/memcache-store.vcxproj | 2 -
nsapi_shib/nsapi_shib.rc | 14 ++--
nsapi_shib/nsapi_shib.vcxproj | 2 -
odbc-store/odbc-store.cpp | 2 +-
odbc-store/odbc-store.rc | 14 ++--
odbc-store/odbc-store.vcxproj | 2 -
shibd/shibd.rc | 14 ++--
shibd/shibd.vcxproj | 2 -
shibsp/AbstractSPRequest.cpp | 2 +-
shibsp/GSSRequest.h | 6 +-
shibsp/Makefile.am | 7 +-
shibsp/ServiceProvider.h | 1 +
.../filtering/impl/AttributeScopeRegexFunctor.cpp | 2 +-
.../filtering/impl/AttributeValueStringFunctor.cpp | 4 +-
.../resolver/impl/XMLAttributeExtractor.cpp | 2 +-
shibsp/base.h | 6 ++
shibsp/config_pub.h.in | 26 +++++++
shibsp/config_pub_win32.h | 31 ++++++++
shibsp/handler/impl/RemotedHandler.cpp | 14 ++--
shibsp/shibsp-lite.vcxproj | 4 +-
shibsp/shibsp-lite.vcxproj.filters | 4 +
shibsp/shibsp.rc | 14 ++--
shibsp/shibsp.vcxproj | 4 +-
shibsp/shibsp.vcxproj.filters | 4 +
shibsp/version.h | 2 +-
util/mdquery.vcxproj | 2 -
util/resolvertest.vcxproj | 2 -
50 files changed, 280 insertions(+), 179 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7c3149d..e8f2a7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@
/*.sdf
/*.opensdf
/ipch
+/build
diff --git a/Makefile.am b/Makefile.am
index ef1c791..9726b63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,20 @@ WANT_SUBDIRS = @WANT_SUBDIRS@
SUBDIRS = $(WANT_SUBDIRS)
-DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-store memcache-store selinux
+DIST_SUBDIRS = \
+ doc \
+ schemas \
+ configs \
+ shibsp \
+ shibd \
+ adfs \
+ util \
+ apache \
+ nsapi_shib \
+ fastcgi \
+ odbc-store \
+ memcache-store \
+ selinux
if DX_COND_doc
all-local: doxygen-doc
diff --git a/adfs/adfs-lite.vcxproj b/adfs/adfs-lite.vcxproj
index 1faf6e3..ad750e3 100644
--- a/adfs/adfs-lite.vcxproj
+++ b/adfs/adfs-lite.vcxproj
@@ -94,7 +94,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -122,7 +121,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index 18346fa..5620d5a 100644
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -54,8 +54,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -71,15 +71,15 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
#ifdef SHIBSP_LITE
VALUE "InternalName", "adfs-lite\0"
#else
VALUE "InternalName", "adfs\0"
#endif
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
#ifdef SHIBSP_LITE
VALUE "OriginalFilename", "adfs-lite.so\0"
@@ -87,8 +87,8 @@ BEGIN
VALUE "OriginalFilename", "adfs.so\0"
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/adfs/adfs.vcxproj b/adfs/adfs.vcxproj
index 52d2a52..1835f42 100644
--- a/adfs/adfs.vcxproj
+++ b/adfs/adfs.vcxproj
@@ -94,7 +94,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -122,7 +121,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp
index 7aa50de..2a1d464 100644
--- a/apache/mod_apache.cpp
+++ b/apache/mod_apache.cpp
@@ -78,6 +78,7 @@
#include <sstream>
#include <stdexcept>
+#include <cstddef>
#ifdef HAVE_UNISTD_H
#include <unistd.h> // for getpid()
#endif
@@ -311,7 +312,7 @@ extern "C" const char* shib_table_set(cmd_parms* parms, shib_dir_config* dc, con
class ShibTargetApache : public AbstractSPRequest
-#if defined(HAVE_GSSAPI) && !defined(SHIB_APACHE_13)
+#if defined(SHIBSP_HAVE_GSSAPI) && !defined(SHIB_APACHE_13)
, public GSSRequest
#endif
{
@@ -356,6 +357,9 @@ public:
const char* getScheme() const {
return m_sc->szScheme ? m_sc->szScheme : ap_http_method(m_req);
}
+ bool isSecure() const {
+ return HTTPRequest::isSecure();
+ }
const char* getHostname() const {
return ap_get_server_name(m_req);
}
@@ -451,6 +455,12 @@ public:
#endif
return m_body.c_str();
}
+ const char* getParameter(const char* name) const {
+ return AbstractSPRequest::getParameter(name);
+ }
+ vector<const char*>::size_type getParameters(const char* name, vector<const char*>& values) const {
+ return AbstractSPRequest::getParameters(name, values);
+ }
void clearHeader(const char* rawname, const char* cginame) {
if (m_dc->bUseHeaders == 1) {
// ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(m_req), "shib_clear_header: hdr\n");
@@ -591,7 +601,7 @@ public:
}
long returnDecline(void) { return DECLINED; }
long returnOK(void) { return OK; }
-#if defined(HAVE_GSSAPI) && !defined(SHIB_APACHE_13)
+#if defined(SHIBSP_HAVE_GSSAPI) && !defined(SHIB_APACHE_13)
gss_ctx_id_t getGSSContext() const {
gss_ctx_id_t ctx = GSS_C_NO_CONTEXT;
apr_pool_userdata_get((void**)&ctx, g_szGSSContextKey, m_req->pool);
@@ -919,7 +929,7 @@ void ApacheRequestMapper::getAll(map<string,const char*>& properties) const
properties["exportAssertion"] = (sta->m_dc->bExportAssertion==1) ? "true" : "false";
if (sta->m_dc->tSettings)
- ap_table_do(_rm_get_all_table_walk, &properties, sta->m_dc->tSettings, nullptr);
+ ap_table_do(_rm_get_all_table_walk, &properties, sta->m_dc->tSettings, NULL);
}
const PropertySet* ApacheRequestMapper::getPropertySet(const char* name, const char* ns) const
@@ -1456,7 +1466,7 @@ static apr_status_t do_output_filter(ap_filter_t *f, apr_bucket_brigade *in)
ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r),"shib_out_filter: merging %d headers", apr_table_elts(rc->hdr_out)->nelts);
// can't use overlap call because it will collapse Set-Cookie headers
//apr_table_overlap(r->headers_out, rc->hdr_out, APR_OVERLAP_TABLES_MERGE);
- apr_table_do(_table_add,r->headers_out, rc->hdr_out,nullptr);
+ apr_table_do(_table_add,r->headers_out, rc->hdr_out,NULL);
}
/* remove ourselves from the filter chain */
@@ -1475,7 +1485,7 @@ static apr_status_t do_error_filter(ap_filter_t *f, apr_bucket_brigade *in)
ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r),"shib_err_filter: merging %d headers", apr_table_elts(rc->hdr_out)->nelts);
// can't use overlap call because it will collapse Set-Cookie headers
//apr_table_overlap(r->err_headers_out, rc->hdr_out, APR_OVERLAP_TABLES_MERGE);
- apr_table_do(_table_add,r->err_headers_out, rc->hdr_out,nullptr);
+ apr_table_do(_table_add,r->err_headers_out, rc->hdr_out,NULL);
}
/* remove ourselves from the filter chain */
diff --git a/apache/mod_shib13.vcxproj b/apache/mod_shib13.vcxproj
index 04216b3..93f5453 100644
--- a/apache/mod_shib13.vcxproj
+++ b/apache/mod_shib13.vcxproj
@@ -175,7 +175,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -208,7 +207,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/apache/mod_shib20.vcxproj b/apache/mod_shib20.vcxproj
index da56a12..9fef160 100644
--- a/apache/mod_shib20.vcxproj
+++ b/apache/mod_shib20.vcxproj
@@ -178,7 +178,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -212,7 +211,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/apache/mod_shib22.vcxproj b/apache/mod_shib22.vcxproj
index 4ffb6fd..225f037 100644
--- a/apache/mod_shib22.vcxproj
+++ b/apache/mod_shib22.vcxproj
@@ -176,7 +176,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..;\Apache2.2.14\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<BrowseInformation>true</BrowseInformation>
@@ -212,7 +211,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..;\httpd-2.2-x64\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<BrowseInformation>true</BrowseInformation>
diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
index ea88567..30aa7e6 100644
--- a/apache/mod_shib_13.rc
+++ b/apache/mod_shib_13.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,16 +45,16 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "mod_shib_13\0"
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_13.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index 831823b..277bf91 100644
--- a/apache/mod_shib_20.rc
+++ b/apache/mod_shib_20.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,16 +45,16 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "mod_shib_20\0"
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_20.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index af878e4..3c942d3 100644
--- a/apache/mod_shib_22.rc
+++ b/apache/mod_shib_22.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,16 +45,16 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "mod_shib_22\0"
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_22.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/config_win32.h b/config_win32.h
index 71b5711..8b28cb0 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -106,19 +106,19 @@
#define PACKAGE "shibboleth"
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.internet2.edu/"
+#define PACKAGE_BUGREPORT "https://issues.shibboleth.net/"
/* Define to the full name of this package. */
#define PACKAGE_NAME "shibboleth"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 2.4.2"
+#define PACKAGE_STRING "shibboleth 2.4.3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "shibboleth"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.4.2"
+#define PACKAGE_VERSION "2.4.3"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
@@ -131,7 +131,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "2.4.2"
+#define VERSION "2.4.3"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/configs/metagen.sh b/configs/metagen.sh
index e460240..d7c7f6a 100755
--- a/configs/metagen.sh
+++ b/configs/metagen.sh
@@ -124,11 +124,6 @@ if [ $SAML1 -eq 1 ] ; then
fi
fi
-if [ $SAML2 -eq 1 ] ; then
- ACS[${#ACS[*]}]=$SAML20PAOS
- ACSLOC[${#ACSLOC[*]}]="SAML2/ECP"
-fi
-
if [ $DECLS -eq 1 ] ; then
DECLS="xmlns:md=\"urn:oasis:names:tc:SAML:2.0:metadata\" xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\" "
if [ $DS -eq 1 ] ; then
diff --git a/configure.ac b/configure.ac
index 318fca0..9a8d518 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.4.2],[https://bugs.internet2.edu/],[shibboleth])
+AC_INIT([shibboleth],[2.4.3],[https://issues.shibboleth.net/],[shibboleth])
AC_CONFIG_SRCDIR(shibsp)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
@@ -31,7 +31,7 @@ else
GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
fi
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([config.h shibsp/config_pub.h])
AC_CONFIG_FILES([shibboleth.spec pkginfo Portfile])
AC_PROG_CC([gcc gcc3 cc])
@@ -996,7 +996,7 @@ if test x"$want_gss" = xyes; then
AC_CHECK_HEADER(gss.h,
[
dnl found in the given dirs
- AC_DEFINE([HAVE_GSSGNU],[1],[if you have the GNU gssapi libraries])
+ AC_DEFINE([SHIBSP_HAVE_GSSGNU],[1],[if you have the GNU gssapi libraries])
gnu_gss=yes
],
[
@@ -1017,7 +1017,7 @@ AC_INCLUDES_DEFAULT
AC_CHECK_HEADER([gssapi.h],
[
dnl found
- AC_DEFINE([HAVE_GSSHEIMDAL],[1],[if you have the Heimdal gssapi libraries])
+ AC_DEFINE([SHIBSP_HAVE_GSSHEIMDAL],[1],[if you have the Heimdal gssapi libraries])
],
[
dnl no header found, disabling GSS
@@ -1027,7 +1027,7 @@ AC_INCLUDES_DEFAULT
)
else
dnl MIT found
- AC_DEFINE([HAVE_GSSMIT],[1],[if you have the MIT gssapi libraries])
+ AC_DEFINE([SHIBSP_HAVE_GSSMIT],[1],[if you have the MIT gssapi libraries])
dnl check if we have a really old MIT kerberos (<= 1.2)
AC_MSG_CHECKING([if gssapi headers declare GSS_C_NT_HOSTBASED_SERVICE])
AC_COMPILE_IFELSE([
@@ -1055,34 +1055,67 @@ else
AC_MSG_RESULT(no)
fi
if test x"$want_gss" = xyes; then
- AC_DEFINE([HAVE_GSSAPI],[1],[if you have the gssapi libraries])
+ AC_DEFINE([SHIBSP_HAVE_GSSAPI],[1],[if you have the gssapi libraries])
if test -n "$gnu_gss"; then
LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
LIBS="$LIBS -lgss"
- elif test -z "$GSSAPI_LIB_DIR"; then
- case $host in
- *-*-darwin*)
- LIBS="$LIBS -lgssapi_krb5 -lresolv"
- ;;
- *)
- if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
- dnl krb5-config doesn't have --libs-only-L or similar, put everything
- dnl into LIBS
- gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
- LIBS="$LIBS $gss_libs"
- elif test "$GSSAPI_ROOT" != "yes"; then
- LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
- LIBS="$LIBS -lgssapi"
- else
- LIBS="$LIBS -lgssapi"
- fi
- ;;
- esac
else
- LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
- LIBS="$LIBS -lgssapi"
+ if test -z "$GSSAPI_LIB_DIR"; then
+ GSSAPI_LIB_DIR="$GSSAPI_ROOT/lib$libsuff"
+ fi
+ if test "$GSSAPI_ROOT" != "yes"; then
+ LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
+ fi
+ if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+ dnl krb5-config doesn't have --libs-only-L or similar, put everything
+ dnl into LIBS
+ gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
+ else
+ if test "x$not_mit" = "x1"; then
+ gss_libs="-lgssapi"
+ else
+ gss_libs="-lgssapi_krb5"
+ fi
+ fi
+ LIBS="$LIBS $gss_libs"
fi
+
+ AC_MSG_CHECKING([whether GSS-API naming extensions are available])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+#ifdef SHIBSP_HAVE_GSSGNU
+# include <gss.h>
+#elif defined SHIBSP_HAVE_GSSMIT
+# include <gssapi/gssapi.h>
+# include <gssapi/gssapi_ext.h>
+#else
+# include <gssapi.h>
+#endif]],
+ [[gss_get_name_attribute(NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);]])],
+ [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_NAMINGEXTS],[1],[Define to 1 if GSS-API naming extensions are available.])],
+ [AC_MSG_RESULT([no])])
+
+ AC_MSG_CHECKING([whether GSS-API composite name import is available])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+#ifdef SHIBSP_HAVE_GSSGNU
+# include <gss.h>
+#elif defined SHIBSP_HAVE_GSSMIT
+# include <gssapi/gssapi.h>
+# include <gssapi/gssapi_ext.h>
+#else
+# include <gssapi.h>
+#endif]],
+ [[
+ OM_uint32 minor;
+ gss_name_t srcname;
+ gss_buffer_desc importbuf;
+ gss_import_name(&minor, &importbuf, GSS_C_NT_EXPORT_NAME_COMPOSITE, &srcname);
+ ]])],
+ [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_COMPOSITE_NAME],[1],[Define to 1 if GSS-API composite name import is available.])],
+ [AC_MSG_RESULT([no])])
+
else
CPPFLAGS="$save_CPPFLAGS"
fi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 03f93ee..3a0692b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,8 +3,10 @@ AUTOMAKE_OPTIONS = foreign
pkgdocdir = $(datadir)/doc/@PACKAGE at -@PACKAGE_VERSION@
install-data-hook:
- cp -r api $(DESTDIR)$(pkgdocdir)
- rm -rf `find $(DESTDIR)$(pkgdocdir)/api -name .svn`
+ if test -d api ; then \
+ cp -r api $(DESTDIR)$(pkgdocdir); \
+ rm -rf `find $(DESTDIR)$(pkgdocdir)/api -name .svn`; \
+ fi;
docfiles = \
CREDITS.txt \
diff --git a/fastcgi/shibauthorizer.rc b/fastcgi/shibauthorizer.rc
index e19ccd4..b252d7f 100644
--- a/fastcgi/shibauthorizer.rc
+++ b/fastcgi/shibauthorizer.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,16 +45,16 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "shibauthorizer\0"
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibauthorizer.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/fastcgi/shibauthorizer.vcxproj b/fastcgi/shibauthorizer.vcxproj
index b895715..85dbad5 100644
--- a/fastcgi/shibauthorizer.vcxproj
+++ b/fastcgi/shibauthorizer.vcxproj
@@ -151,7 +151,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
@@ -181,7 +180,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc
index cdc6c4e..a11da7c 100644
--- a/fastcgi/shibresponder.rc
+++ b/fastcgi/shibresponder.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,16 +45,16 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth FastCGI Responder\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "shibresponder\0"
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibresponder.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/fastcgi/shibresponder.vcxproj b/fastcgi/shibresponder.vcxproj
index 9b0e589..d9547df 100644
--- a/fastcgi/shibresponder.vcxproj
+++ b/fastcgi/shibresponder.vcxproj
@@ -152,7 +152,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
@@ -182,7 +181,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index 786879d..7195b9b 100644
--- a/isapi_shib/isapi_shib.rc
+++ b/isapi_shib/isapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,16 +45,16 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "isapi_shib\0"
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "isapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/isapi_shib/isapi_shib.vcxproj b/isapi_shib/isapi_shib.vcxproj
index 1735415..e14538c 100644
--- a/isapi_shib/isapi_shib.vcxproj
+++ b/isapi_shib/isapi_shib.vcxproj
@@ -171,7 +171,6 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -205,7 +204,6 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc
index 7319285..b752992 100644
--- a/memcache-store/memcache-store.rc
+++ b/memcache-store/memcache-store.rc
@@ -53,8 +53,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,14 +69,14 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "memcache-store\0"
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "OriginalFilename", "memcache-store.so\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/memcache-store/memcache-store.vcxproj b/memcache-store/memcache-store.vcxproj
index a643992..1f717c6 100644
--- a/memcache-store/memcache-store.vcxproj
+++ b/memcache-store/memcache-store.vcxproj
@@ -94,7 +94,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;..\..\..\libmemcached;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
@@ -120,7 +119,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\cpp-xmltooling;..\..\..\libmemcached\visualc\toolset;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index 22cc7a7..f160892 100644
--- a/nsapi_shib/nsapi_shib.rc
+++ b/nsapi_shib/nsapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,16 +45,16 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth NSAPI Extension\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "nsapi_shib\0"
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "nsapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/nsapi_shib/nsapi_shib.vcxproj b/nsapi_shib/nsapi_shib.vcxproj
index ca90349..6f03f7f 100644
--- a/nsapi_shib/nsapi_shib.vcxproj
+++ b/nsapi_shib/nsapi_shib.vcxproj
@@ -170,7 +170,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -203,7 +202,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/odbc-store/odbc-store.cpp b/odbc-store/odbc-store.cpp
index 0e9c089..6a298df 100644
--- a/odbc-store/odbc-store.cpp
+++ b/odbc-store/odbc-store.cpp
@@ -532,7 +532,7 @@ int ODBCStorageService::readRow(
if (pexpiration)
q << ",expires";
if (pvalue)
- q << ",CASE version WHEN " << version << " THEN nullptr ELSE value END";
+ q << ",CASE version WHEN " << version << " THEN null ELSE value END";
q << " FROM " << table << " WHERE context='" << scontext << "' AND id='" << skey << "' AND expires > " << timebuf;
freeSafeSQL(scontext, context);
freeSafeSQL(skey, key);
diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc
index e12a849..9469704 100644
--- a/odbc-store/odbc-store.rc
+++ b/odbc-store/odbc-store.rc
@@ -53,8 +53,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,14 +69,14 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "odbc-store\0"
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "OriginalFilename", "odbc-store.so\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/odbc-store/odbc-store.vcxproj b/odbc-store/odbc-store.vcxproj
index 1c8a1c3..ada852a 100644
--- a/odbc-store/odbc-store.vcxproj
+++ b/odbc-store/odbc-store.vcxproj
@@ -94,7 +94,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
@@ -120,7 +119,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
diff --git a/shibd/shibd.rc b/shibd/shibd.rc
index 6e51922..5cdde14 100644
--- a/shibd/shibd.rc
+++ b/shibd/shibd.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,16 +45,16 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth Daemon Service\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "shibd\0"
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibd.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shibd/shibd.vcxproj b/shibd/shibd.vcxproj
index d655822..d701c9c 100644
--- a/shibd/shibd.vcxproj
+++ b/shibd/shibd.vcxproj
@@ -155,7 +155,6 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -185,7 +184,6 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/shibsp/AbstractSPRequest.cpp b/shibsp/AbstractSPRequest.cpp
index 7a0d863..fb15050 100644
--- a/shibsp/AbstractSPRequest.cpp
+++ b/shibsp/AbstractSPRequest.cpp
@@ -51,7 +51,7 @@ void SPRequest::setAuthType(const char* authtype)
{
}
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
GSSRequest::GSSRequest()
{
}
diff --git a/shibsp/GSSRequest.h b/shibsp/GSSRequest.h
index cb1c56f..2867d60 100644
--- a/shibsp/GSSRequest.h
+++ b/shibsp/GSSRequest.h
@@ -20,15 +20,15 @@
* Interface to a GSS-authenticated request.
*/
-#if !defined(__shibsp_gssreq_h__) && defined(HAVE_GSSAPI)
+#if !defined(__shibsp_gssreq_h__) && defined(SHIBSP_HAVE_GSSAPI)
#define __shibsp_gssreq_h__
#include <shibsp/base.h>
#include <xmltooling/io/GenericRequest.h>
-#ifdef HAVE_GSSGNU
+#ifdef SHIBSP_HAVE_GSSGNU
# include <gss.h>
-#elif defined HAVE_GSSMIT
+#elif defined SHIBSP_HAVE_GSSMIT
# include <gssapi/gssapi.h>
# include <gssapi/gssapi_generic.h>
#else
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 4bd9dbe..36af47a 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -29,6 +29,7 @@ libshibspinclude_HEADERS = \
AccessControl.h \
Application.h \
base.h \
+ config_pub.h \
exceptions.h \
paths.h \
GSSRequest.h \
@@ -217,9 +218,9 @@ libshibsp_la_SOURCES = \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = -version-info 5:2:0
+libshibsp_la_LDFLAGS = -version-info 5:3:0
libshibsp_la_LIBADD = $(XMLSEC_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 5:2:0
+libshibsp_lite_la_LDFLAGS = -version-info 5:3:0
libshibsp_lite_la_LIBADD = $(LITE_LIBS)
libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
@@ -253,6 +254,8 @@ EXTRA_DIST = \
shibsp-lite.vcxproj \
shibsp.vcxproj.filters \
shibsp-lite.vcxproj.filters \
+ config_pub.h.in \
+ config_pub_win32.h\
paths.h.in \
resource.h \
shibsp.rc
diff --git a/shibsp/ServiceProvider.h b/shibsp/ServiceProvider.h
index bd76b8c..41e3e9c 100644
--- a/shibsp/ServiceProvider.h
+++ b/shibsp/ServiceProvider.h
@@ -26,6 +26,7 @@
#include <shibsp/util/PropertySet.h>
#include <set>
+#include <vector>
#include <xmltooling/Lockable.h>
namespace xmltooling {
diff --git a/shibsp/attribute/filtering/impl/AttributeScopeRegexFunctor.cpp b/shibsp/attribute/filtering/impl/AttributeScopeRegexFunctor.cpp
index f27e848..5109b9c 100644
--- a/shibsp/attribute/filtering/impl/AttributeScopeRegexFunctor.cpp
+++ b/shibsp/attribute/filtering/impl/AttributeScopeRegexFunctor.cpp
@@ -53,7 +53,7 @@ namespace shibsp {
bool matches(const Attribute& attribute, size_t index) const;
public:
- AttributeScopeRegexFunctor(const DOMElement* e) : m_regex(nullptr), m_attributeID(XMLHelper::getAttrString(e, nullptr, attributeID)) {
+ AttributeScopeRegexFunctor(const DOMElement* e) : m_attributeID(XMLHelper::getAttrString(e, nullptr, attributeID)), m_regex(nullptr) {
const XMLCh* r = e ? e->getAttributeNS(nullptr,regex) : nullptr;
if (!r || !*r)
throw ConfigurationException("AttributeScopeRegex MatchFunctor requires non-empty regex attribute.");
diff --git a/shibsp/attribute/filtering/impl/AttributeValueStringFunctor.cpp b/shibsp/attribute/filtering/impl/AttributeValueStringFunctor.cpp
index b7ac084..d29a403 100644
--- a/shibsp/attribute/filtering/impl/AttributeValueStringFunctor.cpp
+++ b/shibsp/attribute/filtering/impl/AttributeValueStringFunctor.cpp
@@ -53,8 +53,8 @@ namespace shibsp {
public:
AttributeValueStringFunctor(const DOMElement* e)
- : m_value(e ? xmltooling::toUTF8(e->getAttributeNS(nullptr,value)) : nullptr),
- m_attributeID(XMLHelper::getAttrString(e, nullptr, attributeID)) {
+ : m_attributeID(XMLHelper::getAttrString(e, nullptr, attributeID)),
+ m_value(e ? xmltooling::toUTF8(e->getAttributeNS(nullptr,value)) : nullptr) {
if (!m_value || !*m_value) {
delete[] m_value;
throw ConfigurationException("AttributeValueString MatchFunctor requires non-empty value attribute.");
diff --git a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
index 0d38610..726ca3c 100644
--- a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
@@ -983,7 +983,7 @@ void XMLExtractor::extractAttributes(
return m_impl->extractAttributes(application, assertingParty.get(), relyingParty, *name1, attributes);
}
- throw AttributeExtractionException("Unable to extract attributes, unknown object type.");
+ m_log.debug("unable to extract attributes, unknown XML object type: %s", xmlObject.getElementQName().toString().c_str());
}
pair<bool,DOMElement*> XMLExtractor::background_load()
diff --git a/shibsp/base.h b/shibsp/base.h
index 7e7def0..6df035b 100644
--- a/shibsp/base.h
+++ b/shibsp/base.h
@@ -31,6 +31,12 @@
# include <saml/base.h>
#endif
+#if defined (_MSC_VER) || defined(__BORLANDC__)
+ #include <shibsp/config_pub_win32.h>
+#else
+ #include <shibsp/config_pub.h>
+#endif
+
// Windows and GCC4 Symbol Visibility Macros
#ifdef WIN32
#define SHIBSP_IMPORT __declspec(dllimport)
diff --git a/shibsp/config_pub.h.in b/shibsp/config_pub.h.in
new file mode 100644
index 0000000..8d8a058
--- /dev/null
+++ b/shibsp/config_pub.h.in
@@ -0,0 +1,26 @@
+/* if you have the gssapi libraries */
+#undef SHIBSP_HAVE_GSSAPI
+
+/* if you have the GNU gssapi libraries */
+#undef SHIBSP_HAVE_GSSGNU
+
+/* if you have the Heimdal gssapi libraries */
+#undef SHIBSP_HAVE_GSSHEIMDAL
+
+/* if you have the MIT gssapi libraries */
+#undef SHIBSP_HAVE_GSSMIT
+
+/* Define to 1 if log4cpp library is used. */
+#undef SHIBSP_LOG4CPP
+
+/* Define to 1 if log4shib library is used. */
+#undef SHIBSP_LOG4SHIB
+
+/* Define to 1 if Xerces XMLString includes XMLByte release. */
+#undef SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE
+
+/* Define to 1 if Xerces DOMNodeFilter API returns a short. */
+#undef SHIBSP_XERCESC_SHORT_ACCEPTNODE
+
+/* Define to 1 if XML-Security-C supports white/blacklisting algorithms. */
+#undef SHIBSP_XMLSEC_WHITELISTING
diff --git a/shibsp/config_pub_win32.h b/shibsp/config_pub_win32.h
new file mode 100644
index 0000000..7534a59
--- /dev/null
+++ b/shibsp/config_pub_win32.h
@@ -0,0 +1,31 @@
+/* if you have the gssapi libraries */
+#undef SHIBSP_HAVE_GSSAPI
+
+/* if you have the GNU gssapi libraries */
+#undef SHIBSP_HAVE_GSSGNU
+
+/* if you have the Heimdal gssapi libraries */
+#undef SHIBSP_HAVE_GSSHEIMDAL
+
+/* if you have the MIT gssapi libraries */
+#undef SHIBSP_HAVE_GSSMIT
+
+/* Define to 1 if log4cpp library is used. */
+#undef SHIBSP_LOG4CPP
+
+/* Define to 1 if log4shib library is used. */
+#define SHIBSP_LOG4SHIB 1
+
+#include <xercesc/util/XercesVersion.hpp>
+
+#if (XERCES_VERSION_MAJOR < 3)
+# define SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE 1
+# define SHIBSP_XERCESC_SHORT_ACCEPTNODE 1
+#endif
+
+#ifndef XMLTOOLING_NO_XMLSEC
+# include <xsec/framework/XSECDefs.hpp>
+# if (_XSEC_VERSION_FULL >= 10600)
+# define SHIBSP_XMLSEC_WHITELISTING 1
+# endif
+#endif
diff --git a/shibsp/handler/impl/RemotedHandler.cpp b/shibsp/handler/impl/RemotedHandler.cpp
index 272f667..4bdaec2 100644
--- a/shibsp/handler/impl/RemotedHandler.cpp
+++ b/shibsp/handler/impl/RemotedHandler.cpp
@@ -49,7 +49,7 @@ using namespace std;
#ifndef SHIBSP_LITE
namespace shibsp {
class SHIBSP_DLLLOCAL RemotedRequest :
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
public GSSRequest,
#endif
public HTTPRequest
@@ -57,12 +57,12 @@ namespace shibsp {
DDF& m_input;
mutable CGIParser* m_parser;
mutable vector<XSECCryptoX509*> m_certs;
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
mutable gss_ctx_id_t m_gss;
#endif
public:
RemotedRequest(DDF& input) : m_input(input), m_parser(nullptr)
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
, m_gss(GSS_C_NO_CONTEXT)
#endif
{
@@ -71,7 +71,7 @@ namespace shibsp {
virtual ~RemotedRequest() {
for_each(m_certs.begin(), m_certs.end(), xmltooling::cleanup<XSECCryptoX509>());
delete m_parser;
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
if (m_gss != GSS_C_NO_CONTEXT) {
OM_uint32 minor;
gss_delete_sec_context(&minor, &m_gss, GSS_C_NO_BUFFER);
@@ -117,7 +117,7 @@ namespace shibsp {
const std::vector<XSECCryptoX509*>& getClientCertificates() const;
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
// GSSRequest
gss_ctx_id_t getGSSContext() const;
#endif
@@ -206,7 +206,7 @@ const std::vector<XSECCryptoX509*>& RemotedRequest::getClientCertificates() cons
return m_certs;
}
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
gss_ctx_id_t RemotedRequest::getGSSContext() const
{
if (m_gss == GSS_C_NO_CONTEXT) {
@@ -360,7 +360,7 @@ DDF RemotedHandler::wrap(const SPRequest& request, const vector<string>* headers
#endif
}
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
const GSSRequest* gss = dynamic_cast<const GSSRequest*>(&request);
if (gss) {
gss_ctx_id_t ctx = gss->getGSSContext();
diff --git a/shibsp/shibsp-lite.vcxproj b/shibsp/shibsp-lite.vcxproj
index 5209287..68af819 100644
--- a/shibsp/shibsp-lite.vcxproj
+++ b/shibsp/shibsp-lite.vcxproj
@@ -94,7 +94,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
@@ -121,7 +120,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
@@ -249,6 +247,7 @@
<ClInclude Include="AccessControl.h" />
<ClInclude Include="Application.h" />
<ClInclude Include="base.h" />
+ <ClInclude Include="config_pub_win32.h" />
<ClInclude Include="exceptions.h" />
<ClInclude Include="internal.h" />
<ClInclude Include="RequestMapper.h" />
@@ -287,6 +286,7 @@
<ItemGroup>
<None Include="Makefile.am" />
<None Include="paths.h.in" />
+ <None Include="config_pub.h.in" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/shibsp/shibsp-lite.vcxproj.filters b/shibsp/shibsp-lite.vcxproj.filters
index 654a364..4baf10c 100644
--- a/shibsp/shibsp-lite.vcxproj.filters
+++ b/shibsp/shibsp-lite.vcxproj.filters
@@ -341,6 +341,9 @@
<ClInclude Include="GSSRequest.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="config_pub_win32.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="shibsp.rc">
@@ -350,5 +353,6 @@
<ItemGroup>
<None Include="Makefile.am" />
<None Include="paths.h.in" />
+ <None Include="config_pub.h.in" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index e2ea857..fbe4cf3 100644
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 1,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,13 +45,13 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
#ifdef SHIBSP_LITE
VALUE "FileDescription", "Shibboleth SP Lite Library\0"
#else
VALUE "FileDescription", "Shibboleth SP Library\0"
#endif
- VALUE "FileVersion", "1, 4, 2, 0\0"
+ VALUE "FileVersion", "1, 4, 3, 0\0"
#ifdef SHIBSP_LITE
#ifdef _DEBUG
VALUE "InternalName", "shibsp-lite1_4D\0"
@@ -65,7 +65,7 @@ BEGIN
VALUE "InternalName", "shibsp1_4\0"
#endif
#endif
- VALUE "LegalCopyright", "Copyright � 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
#ifdef SHIBSP_LITE
#ifdef _DEBUG
@@ -81,8 +81,8 @@ BEGIN
#endif
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shibsp/shibsp.vcxproj b/shibsp/shibsp.vcxproj
index 331fddb..17f3c85 100644
--- a/shibsp/shibsp.vcxproj
+++ b/shibsp/shibsp.vcxproj
@@ -94,7 +94,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
@@ -121,7 +120,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
@@ -290,6 +288,7 @@
<ClInclude Include="AccessControl.h" />
<ClInclude Include="Application.h" />
<ClInclude Include="base.h" />
+ <ClInclude Include="config_pub_win32.h" />
<ClInclude Include="exceptions.h" />
<ClInclude Include="internal.h" />
<ClInclude Include="RequestMapper.h" />
@@ -343,6 +342,7 @@
<ItemGroup>
<None Include="Makefile.am" />
<None Include="paths.h.in" />
+ <None Include="config_pub.h.in" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/shibsp/shibsp.vcxproj.filters b/shibsp/shibsp.vcxproj.filters
index cee9649..d63bb51 100644
--- a/shibsp/shibsp.vcxproj.filters
+++ b/shibsp/shibsp.vcxproj.filters
@@ -551,6 +551,9 @@
<ClInclude Include="GSSRequest.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="config_pub_win32.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="shibsp.rc">
@@ -560,5 +563,6 @@
<ItemGroup>
<None Include="Makefile.am" />
<None Include="paths.h.in" />
+ <None Include="config_pub.h.in" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/shibsp/version.h b/shibsp/version.h
index d56aebf..4394e9c 100644
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -39,7 +39,7 @@
#define SHIBSP_VERSION_MAJOR 1
#define SHIBSP_VERSION_MINOR 4
-#define SHIBSP_VERSION_REVISION 2
+#define SHIBSP_VERSION_REVISION 3
/** DO NOT MODIFY BELOW THIS LINE */
diff --git a/util/mdquery.vcxproj b/util/mdquery.vcxproj
index 7df8334..229595c 100644
--- a/util/mdquery.vcxproj
+++ b/util/mdquery.vcxproj
@@ -155,7 +155,6 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -185,7 +184,6 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/util/resolvertest.vcxproj b/util/resolvertest.vcxproj
index 91a5b32..f0215c5 100644
--- a/util/resolvertest.vcxproj
+++ b/util/resolvertest.vcxproj
@@ -157,7 +157,6 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -187,7 +186,6 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list