Index: rlm_eap.c
===================================================================
RCS file: /source/radiusd/src/modules/rlm_eap/rlm_eap.c,v
retrieving revision 1.49
diff -u -r1.49 rlm_eap.c
--- rlm_eap.c	20 Nov 2007 08:12:38 -0000	1.49
+++ rlm_eap.c	22 Nov 2007 16:23:17 -0000
@@ -79,12 +79,13 @@
 	const EAP_HANDLER *one = a;
 	const EAP_HANDLER *two = b;
 
+#if 0
 	if (one->eap_id < two->eap_id) return -1;
 	if (one->eap_id > two->eap_id) return +1;
 
 	rcode = lrad_ipaddr_cmp(&one->src_ipaddr, &two->src_ipaddr);
 	if (rcode != 0) return rcode;
-
+#endif
 	return memcmp(one->state, two->state, sizeof(one->state));
 }
 
Index: libeap/eap_tls.c
===================================================================
RCS file: /source/radiusd/src/modules/rlm_eap/libeap/eap_tls.c,v
retrieving revision 1.7
diff -u -r1.7 eap_tls.c
--- libeap/eap_tls.c	22 Nov 2007 09:43:20 -0000	1.7
+++ libeap/eap_tls.c	22 Nov 2007 16:23:18 -0000
@@ -337,6 +337,10 @@
 	    ((eap_ds->response->length == EAP_HEADER_LEN + 2) &&
 	     ((eaptls_packet->flags & 0xc0) == 0x00))) {
 
+#if 1
+			radlog(L_INFO, "XXX rlm_eap_tls: Received EAP-TLS ACK message");
+			return eaptls_ack_handler(handler);
+#else
 		if (prev_eap_ds->request->id == eap_ds->response->id) {
 			/*
 			 *	Run the ACK handler directly from here.
@@ -347,6 +351,7 @@
 			radlog(L_ERR, "rlm_eap_tls: Received Invalid EAP-TLS ACK message");
 			return EAPTLS_INVALID;
 		}
+#endif
 	}
 
 	/*