}
# Find appropriate versions of the auto tools
-find_program aclocal 1.5
+find_program aclocal 1.7
aclocal="$program"
find_program autoheader 2.53
autoheader="$program"
-find_program automake 1.5
+find_program automake 1.7
automake="$program"
find_program autoconf 2.53
autoconf="$program"
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
+ don't. */
+#define HAVE_DECL_STRERROR_R 0
+
+/* Define to 1 if you have the declaration of `svcfd_create', and to 0 if you
+ don't. */
+#define HAVE_DECL_SVCFD_CREATE 1
+
+/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you
+ don't. */
+/* #undef HAVE_DECL_SYS_ERRLIST */
+
/* Define to 1 if you have the <dlfcn.h> header file. */
/* #undef HAVE_DLFCN_H */
#define HAVE_SAML 1
/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
+/* #undef HAVE_STDINT_H */
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the `strtok_r' function. */
/* #undef HAVE_STRTOK_R */
+/* Define to 1 if the system has the type `struct rpcent'. */
+/* #undef HAVE_STRUCT_RPCENT */
+
/* Define to 1 if you have the `strerror_r' function. */
/* #undef HAVE_STRERROR_R */
/* Define to 1 if you have the <unistd.h> header file. */
/* #undef HAVE_UNISTD_H */
+/* Define if RPC SVC macros work on this platform */
+#define HAVE_WORKING_SVC_DESTROY 1
+
/* Name of package */
#define PACKAGE "shibboleth"
#define PACKAGE_NAME "shibboleth"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 1.2"
+#define PACKAGE_STRING "shibboleth 1.2.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "shibboleth"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2"
+#define PACKAGE_VERSION "1.2.1"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
#define USE_OUR_ONCRPC 1
/* Version number of package */
-#define VERSION "1.2"
+#define VERSION "1.2.1"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
Apache's ServerName and Port directives or the IIS Site mapping in the <ISAPI> element
below.
-->
- <Host name="localhost" scheme="https">
+ <Host name="localhost">
<Path name="secure" requireSession="true" exportAssertion="true">
<!-- Example shows a subfolder on the SSL port assigned to a separate <Application> -->
<Path name="admin" applicationId="foo-admin"/>
</Path>
</Host>
- <Host name="localhost" scheme="http">
- <Path name="secure" requireSession="true" exportAssertion="true"/>
- </Host>
</RequestMap>
</RequestMapProvider>
<Implementation>
<ISAPI normalizeRequest="true">
- <!-- Maps IIS IID values to the host scheme/name/port. -->
- <Site id="1" scheme="http" name="localhost" port="80"/>
+ <!--
+ Maps IIS IID values to the host scheme/name/port. The name is required so that
+ the proper <Host> in the request map above is found without having to cover every
+ possible DNS/IP combination the user might enter. The port and scheme can
+ usually be omitted, so the HTTP request's port and scheme will be used.
+ -->
+ <Site id="1" name="localhost"/>
</ISAPI>
</Implementation>
</SHIRE>
AC_PREREQ([2.50])
-AC_INIT([shibboleth], [1.2], [shibboleth-users@internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [1.2.1], [shibboleth-users@internet2.edu], [shibboleth])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(shibboleth, 1.2)
+AM_INIT_AUTOMAKE([shibboleth],[1.2.1])
sinclude(acx_pthread.m4)
sinclude(acx_rpctest.m4)
GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
fi
-AC_PROG_CC([gcc3 gcc cc])
-AC_PROG_CXX([g++3 g++ c++ CC])
+AC_PROG_CC([gcc gcc3 cc])
+AC_PROG_CXX([g++ g++3 c++ CC])
if test "$GCC" = "yes" ; then
CFLAGS="$GCC_CFLAGS"
AC_LANG(C++)
+# C++ requirements
+AC_CXX_REQUIRE_STL
+AC_CXX_NAMESPACES
+
+AC_LANG(C)
+
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
AC_CHECK_FUNCS([strchr strdup strstr gmtime_r strtok_r strcasecmp])
AC_CHECK_HEADERS([dlfcn.h])
-# C++ requirements
-AC_CXX_REQUIRE_STL
-AC_CXX_NAMESPACES
-
-
# old_LIBS="$LIBS"
# AC_SEARCH_LIBS(xdr_uint64_t,nsl,,
# [CFLAGS="$CFLAGS -DNEED_XDR_LONGLONG"
CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
fi
-# Test RPC now -- deal with it later
+# Test RPC now -- finish dealing with it later
+AC_ARG_ENABLE(native-rpc,
+ AC_HELP_STRING([--enable-native-rpc], [use the OS-supplied Sun RPC library, default is NO, except Linux]),
+ [ if test "x$enableval" = "x" ; then
+ NATIVE_RPC=yes
+ else
+ NATIVE_RPC="$enableval"
+ fi
+ ], [ NATIVE_RPC=no ])
ACX_RPCTEST([rpctest="yes"],[rpctest="no"])
+AC_MSG_NOTICE([does the native Sun RPC library support svcfd_create...$rpctest])
+if test $NATIVE_RPC = "no"; then
+ case "${host}" in
+ *-*-linux*)
+ if test $rpctest = "yes"; then
+ AC_MSG_WARN([embedded Sun RPC library does not support Linux])
+ NATIVE_RPC="yes"
+ else
+ AC_MSG_ERROR([embedded Sun RPC library won't work, but neither will native version])
+ fi
+ ;;
+ esac
+fi
+if test $NATIVE_RPC = "yes" && test $rpctest = "no"; then
+ AC_MSG_WARN([native Sun RPC won't work, using internal version])
+ NATIVE_RPC = "no"
+fi
+if test $NATIVE_RPC = "yes"; then
+ AC_CHECK_DECLS([svcfd_create],,,[#include <rpc/rpc.h>])
+ AC_LANG_PUSH(C++)
+ AC_COMPILE_IFELSE(
+ AC_LANG_PROGRAM(
+ [[#include <rpc/rpc.h>
+static SVCXPRT* xprt = NULL;]],
+ [[svc_destroy(xprt);]]),
+ AC_DEFINE(HAVE_WORKING_SVC_DESTROY,1,[Define if RPC SVC macros work on this platform]),)
+ AC_LANG_POP(C++)
+else
+ AC_CHECK_TYPES([struct rpcent],,,[#include <netdb.h>])
+ AC_CHECK_DECLS(sys_errlist)
+ AC_DEFINE(HAVE_DECL_SVCFD_CREATE,1,[ Define to 1 if you have the declaration of svcfd_create, and to 0 if you don't.])
+ AC_DEFINE(HAVE_WORKING_SVC_DESTROY,1,[Define if RPC SVC macros work on this platform])
+fi
AC_ARG_WITH(dmalloc,
AC_HELP_STRING([--with-dmalloc=PATH], [where dmalloc is installed]),
AC_MSG_ERROR([unable to link with openssl libraries]))
AC_MSG_RESULT(yes)
+AC_LANG(C++)
+
# log4cpp settings
AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config)
AC_ARG_WITH(log4cpp,
LIBS="-lxerces-c $LIBS"
AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,
AC_MSG_ERROR([unable to find xerces header files]))
-AC_TRY_LINK(
- [#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/XercesVersion.hpp>],
- [#if _XERCES_VERSION >= 20300
-xercesc::XMLPlatformUtils::Initialize();
+AC_MSG_CHECKING([Xerces version])
+AC_PREPROC_IFELSE(
+ [AC_LANG_PROGRAM([#include <xercesc/util/XercesVersion.hpp>],
+[#if _XERCES_VERSION != 20600 && _XERCES_VERSION >= 20300
+int i = 0;
#else
-#error Need Xerces-C version 2.3 or higher
-#endif],
- [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])],
- [AC_MSG_ERROR([unable to link with Xerces])])
+#error cannot use version = 2.6.0 or < 2.3.0
+#endif])],
+ [AC_MSG_RESULT(OK)],
+ [AC_MSG_FAILURE([Shibboleth requires a Xerces version > 2.3.0, but cannot use 2.6.0 -- a 2.6.1 patched release is available from us])])
+AC_TRY_LINK(
+ [#include <xercesc/util/PlatformUtils.hpp>],
+ [xercesc::XMLPlatformUtils::Initialize()],
+ [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])],
+ [AC_MSG_ERROR([unable to link with Xerces])])
+
# XML-Security settings
AC_ARG_WITH(xmlsec,
# now deal with the rpc library, to see if we need to build our own
-if test $rpctest = "no"; then
+if test $NATIVE_RPC = "no"; then
WANT_SUBDIRS="oncrpc $WANT_SUBDIRS"
AC_DEFINE(USE_OUR_ONCRPC,1,[Define if using embedded version of ONC RPC.])
fi
-AM_CONDITIONAL(USE_OUR_ONCRPC,test "$rpctest" = "no")
+AM_CONDITIONAL(USE_OUR_ONCRPC,test "$NATIVE_RPC" = "no")
# Apache 1.3 (mod_shib_13)
</choice>
<element ref="conf:Path" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
- <attribute name="scheme" use="optional" default="http">
+ <attribute name="scheme" use="optional">
<simpleType>
<restriction base="string">
<enumeration value="http"/>
Changes made are the following:
- reverted namespace to http://schemas.xmlsoap.org/soap/envelope/
- reverted mustUnderstand to only allow 0 and 1 as lexical values
+ - made encodingStyle a global attribute 20020825
+
+ Further changes:
+
+ - removed default value from mustUnderstand attribute declaration - 20030314
Original copyright:
<!-- Global Attributes. The following attributes are intended to be usable via qualified attribute names on any complex type referencing them. -->
- <xs:attribute name="mustUnderstand" default="0" >
+ <xs:attribute name="mustUnderstand" >
<xs:simpleType>
<xs:restriction base='xs:boolean'>
<xs:pattern value='0|1' />
<xs:list itemType="xs:anyURI" />
</xs:simpleType>
+ <xs:attribute name="encodingStyle" type="tns:encodingStyle" />
<xs:attributeGroup name="encodingStyle" >
- <xs:attribute name="encodingStyle" type="tns:encodingStyle" />
+ <xs:attribute ref="tns:encodingStyle" />
</xs:attributeGroup>
+ <xs:element name="Fault" type="tns:Fault" />
<xs:complexType name="Fault" final="extension" >
<xs:annotation>
<xs:documentation>
</xs:schema>
-
-
-
-
-
#ifndef WIN32
extern "C" unsigned long openssl_thread_id(void)
{
- return static_cast<unsigned long>(pthread_self());
+ return (unsigned long)(pthread_self());
}
#endif
--- /dev/null
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by shib.rc
+//
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
# End Source File
# Begin Source File
+SOURCE=.\resource.h
+# End Source File
+# Begin Source File
+
SOURCE=".\shib-threads-win32.cpp"
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=.\shib.rc
+# End Source File
+# Begin Source File
+
SOURCE=.\ShibBinding.cpp
# End Source File
# Begin Source File
--- /dev/null
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 5,0,1,0
+ PRODUCTVERSION 1,2,1,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "\0"
+ VALUE "CompanyName", "UCAID\0"
+ VALUE "FileDescription", "Shibboleth Core\0"
+ VALUE "FileVersion", "5, 0, 1, 0\0"
+#ifdef _DEBUG
+ VALUE "InternalName", "shib_5D\0"
+#else
+ VALUE "InternalName", "shib_5\0"
+#endif
+ VALUE "LegalCopyright", "Copyright © 2004 UCAID\0"
+ VALUE "LegalTrademarks", "\0"
+#ifdef _DEBUG
+ VALUE "OriginalFilename", "shib_5D.dll\0"
+#else
+ VALUE "OriginalFilename", "shib_5.dll\0"
+#endif
+ VALUE "PrivateBuild", "\0"
+ VALUE "ProductName", "Shibboleth 1.2.1\0"
+ VALUE "ProductVersion", "1, 2, 1, 0\0"
+ VALUE "SpecialBuild", "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // !_MAC
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
projects / shibboleth / sp.git / commitdiff