← Back to branch summary

~hartmans/moonshot/mech_eap-debian-dep-fix

« back to all changes in this revision

Viewing changes to mech_eap/util_shib.cpp

  • Committer: Sam Hartman
  • Date: 2013-09-27 12:52:03 UTC
  • mfrom: (1.10.131)
  • Revision ID: git-v1:b2002998eebfaec7e080c64b7c583150478dfaa4
Merge branch 'master' into debian

Conflicts:
        libeap/Makefile.am

Show diffs side-by-side

added added

removed removed

Lines of Context:
mech_eap/util_shib.cpp
163
163
    const gss_eap_radius_attr_provider *radius;
164
164
    int authenticated, complete;
165
165
    gss_buffer_desc value = GSS_C_EMPTY_BUFFER;
 
166
    gss_eap_attrid attrid(VENDORPEC_UKERNA, PW_SAML_AAA_ASSERTION);
166
167
 
167
168
    radius = static_cast<const gss_eap_radius_attr_provider *>
168
169
        (m_manager->getProvider(ATTR_TYPE_RADIUS));
169
170
    if (radius != NULL &&
170
 
        radius->getFragmentedAttribute(PW_SAML_AAA_ASSERTION,
171
 
                                       VENDORPEC_UKERNA,
172
 
                                       &authenticated, &complete, &value)) {
 
171
        radius->getFragmentedAttribute(attrid, &authenticated, &complete, &value)) {
173
172
        string str((char *)value.value, value.length);
174
173
        istringstream istream(str);
175
174
        DOMDocument *doc = XMLToolingConfig::getConfig().getParser().parse(istream);