shunt-manager: Remove stored entries if installation fails

diff --git a/src/libcharon/sa/shunt_manager.c b/src/libcharon/sa/shunt_manager.c
index 434bacee7e68f32932135c775e4f079ff90b24f9..2e42e7ebd4c478f8a2d1fd4aad24836499efa711 100644 (file)
--- a/src/libcharon/sa/shunt_manager.c
+++ b/src/libcharon/sa/shunt_manager.c
@@ -122,7 +122,7 @@ METHOD(shunt_manager_t, install, bool,
 {
        enumerator_t *enumerator;
        child_cfg_t *child_cfg;
-       bool found = FALSE;
+       bool found = FALSE, success;
 
        /* check if not already installed */
        this->lock->write_lock(this->lock);
@@ -146,7 +146,16 @@ METHOD(shunt_manager_t, install, bool,
        this->shunts->insert_last(this->shunts, child->get_ref(child));
        this->lock->unlock(this->lock);
 
-       return install_shunt_policy(child);
+       success = install_shunt_policy(child);
+
+       if (!success)
+       {
+               this->lock->write_lock(this->lock);
+               this->shunts->remove(this->shunts, child, NULL);
+               this->lock->unlock(this->lock);
+               child->destroy(child);
+       }
+       return success;
 }
 
 /**