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:
322f2a4
)
https://issues.shibboleth.net/jira/browse/SSPCPP-252
author
Scott Cantor
<cantor.2@osu.edu>
Thu, 29 Oct 2009 18:42:20 +0000
(18:42 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Thu, 29 Oct 2009 18:42:20 +0000
(18:42 +0000)
shibsp/attribute/ScopedAttributeDecoder.cpp
patch
|
blob
|
history
diff --git
a/shibsp/attribute/ScopedAttributeDecoder.cpp
b/shibsp/attribute/ScopedAttributeDecoder.cpp
index
c3054c8
..
424ee7c
100644
(file)
--- a/
shibsp/attribute/ScopedAttributeDecoder.cpp
+++ b/
shibsp/attribute/ScopedAttributeDecoder.cpp
@@
-17,7
+17,7
@@
/**
* ScopedAttributeDecoder.cpp
*
/**
* ScopedAttributeDecoder.cpp
*
- * Decodes SAML into ScopedAttributes
+ * Decodes SAML into ScopedAttributes
.
*/
#include "internal.h"
*/
#include "internal.h"
@@
-35,15
+35,15
@@
using namespace std;
namespace shibsp {
static const XMLCh Scope[] = UNICODE_LITERAL_5(S,c,o,p,e);
namespace shibsp {
static const XMLCh Scope[] = UNICODE_LITERAL_5(S,c,o,p,e);
- static const XMLCh scopeDelim
eter[] = UNICODE_LITERAL_14(s,c,o,p,e,D,e,l,i,m,e
,t,e,r);
+ static const XMLCh scopeDelim
iter[] = UNICODE_LITERAL_14(s,c,o,p,e,D,e,l,i,m,i
,t,e,r);
class SHIBSP_DLLLOCAL ScopedAttributeDecoder : virtual public AttributeDecoder
{
public:
class SHIBSP_DLLLOCAL ScopedAttributeDecoder : virtual public AttributeDecoder
{
public:
- ScopedAttributeDecoder(const DOMElement* e) : AttributeDecoder(e), m_delim
e
ter('@') {
- if (e && e->hasAttributeNS(NULL,scopeDelim
e
ter)) {
- auto_ptr_char d(e->getAttributeNS(NULL,scopeDelim
e
ter));
- m_delim
e
ter = *(d.get());
+ ScopedAttributeDecoder(const DOMElement* e) : AttributeDecoder(e), m_delim
i
ter('@') {
+ if (e && e->hasAttributeNS(NULL,scopeDelim
i
ter)) {
+ auto_ptr_char d(e->getAttributeNS(NULL,scopeDelim
i
ter));
+ m_delim
i
ter = *(d.get());
}
}
~ScopedAttributeDecoder() {}
}
}
~ScopedAttributeDecoder() {}
@@
-53,7
+53,7
@@
namespace shibsp {
) const;
private:
) const;
private:
- char m_delim
e
ter;
+ char m_delim
i
ter;
};
AttributeDecoder* SHIBSP_DLLLOCAL ScopedAttributeDecoderFactory(const DOMElement* const & e)
};
AttributeDecoder* SHIBSP_DLLLOCAL ScopedAttributeDecoderFactory(const DOMElement* const & e)
@@
-70,7
+70,7
@@
shibsp::Attribute* ScopedAttributeDecoder::decode(
char* scope;
const XMLCh* xmlscope;
xmltooling::QName scopeqname(NULL,Scope);
char* scope;
const XMLCh* xmlscope;
xmltooling::QName scopeqname(NULL,Scope);
- auto_ptr<ScopedAttribute> scoped(new ScopedAttribute(ids, m_delim
e
ter));
+ auto_ptr<ScopedAttribute> scoped(new ScopedAttribute(ids, m_delim
i
ter));
vector< pair<string,string> >& dest = scoped->getValues();
vector<XMLObject*>::const_iterator v,stop;
vector< pair<string,string> >& dest = scoped->getValues();
vector<XMLObject*>::const_iterator v,stop;
@@
-122,7
+122,7
@@
shibsp::Attribute* ScopedAttributeDecoder::decode(
delete[] scope;
}
else {
delete[] scope;
}
else {
- scope = strchr(val, m_delim
e
ter);
+ scope = strchr(val, m_delim
i
ter);
if (scope) {
*scope++ = 0;
if (*scope)
if (scope) {
*scope++ = 0;
if (*scope)
@@
-174,8
+174,8
@@
shibsp::Attribute* ScopedAttributeDecoder::decode(
}
}
}
}
- if (val && *val && *val!=m_delim
e
ter) {
- scope = strchr(val, m_delim
e
ter);
+ if (val && *val && *val!=m_delim
i
ter) {
+ scope = strchr(val, m_delim
i
ter);
if (scope) {
*scope++ = 0;
if (*scope)
if (scope) {
*scope++ = 0;
if (*scope)
@@
-184,7
+184,7
@@
shibsp::Attribute* ScopedAttributeDecoder::decode(
log.warn("ignoring NameID with no scope");
}
else {
log.warn("ignoring NameID with no scope");
}
else {
- log.warn("ignoring NameID with no scope delimiter (%c)", m_delim
e
ter);
+ log.warn("ignoring NameID with no scope delimiter (%c)", m_delim
i
ter);
}
}
else {
}
}
else {