remove debugging statement

[moonshot.git] / mech_eap / eap_mech.c

diff --git a/mech_eap/eap_mech.c b/mech_eap/eap_mech.c
index bff8d23..fb827dd 100644 (file)
--- a/mech_eap/eap_mech.c
+++ b/mech_eap/eap_mech.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Initialisation and finalise functions.
+ */
+
 #include "gssapiP_eap.h"
 
 static OM_uint32
@@ -137,7 +141,11 @@ eapPeerRegisterMethods(OM_uint32 *minor)
         ret = eap_peer_tnc_register();
 #endif /* EAP_TNC */
 
-    return ret ? GSS_S_FAILURE : GSS_S_COMPLETE;
+    if (ret == 0)
+        return GSS_S_COMPLETE;
+
+    *minor = GSSEAP_LIBEAP_INIT_FAILURE;
+    return GSS_S_FAILURE;
 }
 
 static OM_uint32
@@ -147,32 +155,31 @@ gssEapInitLibEap(OM_uint32 *minor)
 }
 
 static OM_uint32
-gssEapInitLibRadius(OM_uint32 *minor)
+gssEapInitLibRadsec(OM_uint32 *minor)
 {
+    if (0) {
+        *minor = GSSEAP_RADSEC_INIT_FAILURE;
+        return GSS_S_FAILURE;
+    }
+
     return GSS_S_COMPLETE;
 }
 
-static void gssEapInit(void) __attribute__((constructor));
+static void gssEapInitiatorInit(void) __attribute__((constructor));
 static void gssEapFinalize(void) __attribute__((destructor));
 
 static void
-gssEapInit(void)
+gssEapInitiatorInit(void)
 {
     OM_uint32 major, minor;
 
-    major = gssEapInitLibEap(&minor);
-    assert(major == GSS_S_COMPLETE);
-
-    major = gssEapInitLibRadius(&minor);
-    assert(major == GSS_S_COMPLETE);
+    initialize_eapg_error_table();
+    initialize_rse_error_table();
 
-    major = gssEapRadiusAttrProviderInit(&minor);
-    assert(major == GSS_S_COMPLETE);
-
-    major = gssEapSamlAttrProvidersInit(&minor);
+    major = gssEapInitLibEap(&minor);
     assert(major == GSS_S_COMPLETE);
 
-    major = gssEapLocalAttrProviderInit(&minor);
+    major = gssEapInitLibRadsec(&minor);
     assert(major == GSS_S_COMPLETE);
 
 #ifdef GSSEAP_ENABLE_REAUTH
@@ -186,9 +193,6 @@ gssEapFinalize(void)
 {
     OM_uint32 minor;
 
-    gssEapLocalAttrProviderFinalize(&minor);
-    gssEapSamlAttrProvidersFinalize(&minor);
-    gssEapRadiusAttrProviderFinalize(&minor);
+    gssEapAttrProvidersFinalize(&minor);
     eap_peer_unregister_methods();
 }
-