[shibboleth-sp2] 08/119: Fixed contact type assignment, and corrected admin constant.

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to annotated tag 1.3.1
in repository shibboleth-sp2.

commit d8e53cd20a753eb292b93bd454c738d01d7ab33f
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Wed Jan 3 17:03:08 2007 +0000

    Fixed contact type assignment, and corrected admin constant.
---
 xmlproviders/XML.cpp         | 2 +-
 xmlproviders/XMLMetadata.cpp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/xmlproviders/XML.cpp b/xmlproviders/XML.cpp
index 61fa8d9..e5a604f 100644
--- a/xmlproviders/XML.cpp
+++ b/xmlproviders/XML.cpp
@@ -299,7 +299,7 @@ const XMLCh XML::Literals::xpath[] =
 { chLatin_x, chLatin_p, chLatin_a, chLatin_t, chLatin_h, chNull };
 
 const XMLCh XML::Literals::administrative[] =
-{ chLatin_a, chLatin_m, chLatin_i, chLatin_n, chLatin_i, chLatin_s, chLatin_t, chLatin_r, chLatin_a, chLatin_t, chLatin_i, chLatin_v, chLatin_e, chNull };
+{ chLatin_a, chLatin_d, chLatin_m, chLatin_i, chLatin_n, chLatin_i, chLatin_s, chLatin_t, chLatin_r, chLatin_a, chLatin_t, chLatin_i, chLatin_v, chLatin_e, chNull };
 
 const XMLCh XML::Literals::billing[] =
 { chLatin_b, chLatin_i, chLatin_l, chLatin_l, chLatin_i, chLatin_n, chLatin_g, chNull };
diff --git a/xmlproviders/XMLMetadata.cpp b/xmlproviders/XMLMetadata.cpp
index 60d8657..d7a96c9 100644
--- a/xmlproviders/XMLMetadata.cpp
+++ b/xmlproviders/XMLMetadata.cpp
@@ -461,7 +461,7 @@ ReloadableXMLFileImpl* XMLMetadata::newImplementation(const char* pathname, bool
     return new XMLMetadataImpl(pathname,this);
 }
 
-XMLMetadataImpl::ContactPerson::ContactPerson(const DOMElement* e) : m_root(e)
+XMLMetadataImpl::ContactPerson::ContactPerson(const DOMElement* e) : m_root(e), m_type(IContactPerson::other)
 {
     const XMLCh* type=NULL;
     
@@ -518,8 +518,6 @@ XMLMetadataImpl::ContactPerson::ContactPerson(const DOMElement* e) : m_root(e)
         m_type=IContactPerson::administrative;
     else if (!XMLString::compareString(type,SHIB_L(billing)))
         m_type=IContactPerson::billing;
-    else if (!XMLString::compareString(type,SHIB_L(other)))
-        m_type=IContactPerson::other;
 }
 
 XMLMetadataImpl::Organization::Organization(const DOMElement* e) : m_root(e)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git