projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2719fe6
)
Missing min macro
author
Scott Cantor
<cantor.2@osu.edu>
Mon, 30 Apr 2012 14:08:17 +0000
(14:08 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Mon, 30 Apr 2012 14:08:17 +0000
(14:08 +0000)
shibsp/handler/impl/ExternalAuthHandler.cpp
patch
|
blob
|
history
diff --git
a/shibsp/handler/impl/ExternalAuthHandler.cpp
b/shibsp/handler/impl/ExternalAuthHandler.cpp
index
5c12068
..
3e254fa
100644
(file)
--- a/
shibsp/handler/impl/ExternalAuthHandler.cpp
+++ b/
shibsp/handler/impl/ExternalAuthHandler.cpp
@@
-61,6
+61,9
@@
using namespace opensaml;
using saml2::NameID;
using saml2::AuthnStatement;
using saml2::AuthnContext;
using saml2::NameID;
using saml2::AuthnStatement;
using saml2::AuthnContext;
+# ifndef min
+# define min(a,b) (((a) < (b)) ? (a) : (b))
+# endif
#endif
using namespace shibspconstants;
#endif
using namespace shibspconstants;
@@
-528,7
+531,6
@@
pair<bool,long> ExternalAuth::processMessage(
static const XMLCh _SessionID[] = UNICODE_LITERAL_9(S,e,s,s,i,o,n,I,D);
static const XMLCh _RelayState[] = UNICODE_LITERAL_10(R,e,l,a,y,S,t,a,t,e);
static const XMLCh _Cookie[] = UNICODE_LITERAL_6(C,o,o,k,i,e);
static const XMLCh _SessionID[] = UNICODE_LITERAL_9(S,e,s,s,i,o,n,I,D);
static const XMLCh _RelayState[] = UNICODE_LITERAL_10(R,e,l,a,y,S,t,a,t,e);
static const XMLCh _Cookie[] = UNICODE_LITERAL_6(C,o,o,k,i,e);
- static const XMLCh _name[] = UNICODE_LITERAL_4(n,a,m,e);
DOMDocument* retdoc = XMLToolingConfig::getConfig().getParser().newDocument();
XercesJanitor<DOMDocument> retjanitor(retdoc);
retdoc->appendChild(retdoc->createElement(_ExternalAuth));
DOMDocument* retdoc = XMLToolingConfig::getConfig().getParser().newDocument();
XercesJanitor<DOMDocument> retjanitor(retdoc);
retdoc->appendChild(retdoc->createElement(_ExternalAuth));