projects
/
mech_eap.orig
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c8aab0e
)
Initializeshib resolver before opensaml so catalog path is set
author
Sam Hartman
<hartmans@painless-security.com>
Tue, 3 Jan 2012 20:41:17 +0000
(15:41 -0500)
committer
Sam Hartman
<hartmans@painless-security.com>
Tue, 3 Jan 2012 20:41:17 +0000
(15:41 -0500)
mech_eap/util_attr.cpp
patch
|
blob
|
history
diff --git
a/mech_eap/util_attr.cpp
b/mech_eap/util_attr.cpp
index
3bfe785
..
d1c0075
100644
(file)
--- a/
mech_eap/util_attr.cpp
+++ b/
mech_eap/util_attr.cpp
@@
-58,16
+58,16
@@
GSSEAP_ONCE_CALLBACK(gssEapAttrProvidersInitInternal)
if (GSS_ERROR(major))
goto cleanup;
-#ifdef HAVE_OPENSAML
- major = gssEapSamlAttrProvidersInit(&minor);
- if (GSS_ERROR(major))
- goto cleanup;
-#endif
#ifdef HAVE_SHIBRESOLVER
/* Allow Shibboleth initialization failure to be non-fatal */
gssEapLocalAttrProviderInit(&minor);
#endif
+#ifdef HAVE_OPENSAML
+ major = gssEapSamlAttrProvidersInit(&minor);
+ if (GSS_ERROR(major))
+ goto cleanup;
+#endif
cleanup:
#ifdef GSSEAP_DEBUG