make reauth support conditionaly compilable

[mech_eap.git] / eap_mech.c

diff --git a/eap_mech.c b/eap_mech.c
index fb149e0..26ee5ec 100644 (file)
--- a/eap_mech.c
+++ b/eap_mech.c
@@ -254,7 +254,7 @@ gssEapInitLibEap(OM_uint32 *minor)
 }
 
 static OM_uint32
-gssEapInitLibRadSec(OM_uint32 *minor)
+gssEapInitLibRadius(OM_uint32 *minor)
 {
     return GSS_S_COMPLETE;
 }
@@ -267,21 +267,40 @@ gssEapInit(void)
 {
     OM_uint32 major, minor;
 
-    gssEapInitLibEap(&minor);
-    gssEapInitLibRadSec(&minor);
-    eapServerRegisterMethods(&minor);
-    gssEapAttrProvidersInit(&minor);
+    major = gssEapInitLibEap(&minor);
+    assert(major == GSS_S_COMPLETE);
+
+    major = gssEapInitLibRadius(&minor);
+    assert(major == GSS_S_COMPLETE);
+
+    major = eapServerRegisterMethods(&minor);
+    assert(major == GSS_S_COMPLETE);
+
+    major = gssEapRadiusAttrProviderInit(&minor);
+    assert(major == GSS_S_COMPLETE);
+
+    major = gssEapSamlAttrProvidersInit(&minor);
+    assert(major == GSS_S_COMPLETE);
+
+    major = gssEapLocalAttrProviderInit(&minor);
+    assert(major == GSS_S_COMPLETE);
+
+#ifdef GSSEAP_ENABLE_REAUTH
+    major = gssEapReauthInitialize(&minor);
+    assert(major == GSS_S_COMPLETE);
+#endif
 }
 
 static void
 gssEapFinalize(void)
 {
-    OM_uint32 major, minor;
+    OM_uint32 minor;
+
+    gssEapLocalAttrProviderFinalize(&minor);
+    gssEapSamlAttrProvidersFinalize(&minor);
+    gssEapRadiusAttrProviderFinalize(&minor);
 
     eap_peer_unregister_methods();
-#if 1
     eap_server_unregister_methods();
-#endif
-    gssEapAttrProvidersFinalize(&minor);
 }