fixed a double-unlock bug, showed up when using rwlocks in backend manager

src/charon/config/backend_manager.c

@@ -76,24 +76,6 @@ typedef struct {
 	identification_t *other;
 } peer_data_t;
 
-/**
- * destroy IKE enumerator data and unlock list
- */
-static void ike_enum_destroy(ike_data_t *data)
-{
-	data->this->lock->unlock(data->this->lock);
-	free(data);
-}
-
-/**
- * destroy PEER enumerator data and unlock list
- */
-static void peer_enum_destroy(peer_data_t *data)
-{
-	data->this->lock->unlock(data->this->lock);
-	free(data);
-}
-
 /**
  * inner enumerator constructor for IKE cfgs
  */
@@ -180,7 +162,7 @@ static ike_cfg_t *get_ike_cfg(private_backend_manager_t *this,
 	this->lock->read_lock(this->lock);
 	enumerator = enumerator_create_nested(
 						this->backends->create_enumerator(this->backends),
-						(void*)ike_enum_create, data, (void*)ike_enum_destroy);
+						(void*)ike_enum_create, data, (void*)free);
 	while (enumerator->enumerate(enumerator, (void**)&current))
 	{
 		match = get_match(current, me, other);
@@ -243,7 +225,7 @@ static peer_cfg_t *get_peer_cfg(private_backend_manager_t *this, host_t *me,
 	this->lock->read_lock(this->lock);
 	enumerator = enumerator_create_nested(
 						this->backends->create_enumerator(this->backends),
-						(void*)peer_enum_create, data, (void*)peer_enum_destroy);
+						(void*)peer_enum_create, data, (void*)free);
 	while (enumerator->enumerate(enumerator, &current))
 	{
 		identification_t *my_cand, *other_cand;