From 57ea3f73bbe723243f4eb4a0cd4094e9c2d14290 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 3 Nov 2017 10:47:48 +0100
Subject: [PATCH] shunt-manager: Remove first match if no namespace given
 during uninstall

Also makes namespace mandatory.
---
 src/libcharon/sa/shunt_manager.c | 13 ++++++++++---
 src/libcharon/sa/shunt_manager.h | 10 ++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/libcharon/sa/shunt_manager.c b/src/libcharon/sa/shunt_manager.c
index 3a254cea5..a83da0480 100644
--- a/src/libcharon/sa/shunt_manager.c
+++ b/src/libcharon/sa/shunt_manager.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2016 Tobias Brunner
+ * Copyright (C) 2015-2017 Tobias Brunner
  * Copyright (C) 2011-2016 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
@@ -198,6 +198,13 @@ METHOD(shunt_manager_t, install, bool,
 	entry_t *entry;
 	bool found = FALSE, success;
 
+	if (!ns)
+	{
+		DBG1(DBG_CFG, "missing namespace for shunt policy '%s'",
+			 cfg->get_name(cfg));
+		return FALSE;
+	}
+
 	/* check if not already installed */
 	this->lock->write_lock(this->lock);
 	if (this->installing == INSTALL_DISABLED)
@@ -224,7 +231,7 @@ METHOD(shunt_manager_t, install, bool,
 		return TRUE;
 	}
 	INIT(entry,
-		.ns = strdupnull(ns),
+		.ns = strdup(ns),
 		.cfg = cfg->get_ref(cfg),
 	);
 	this->shunts->insert_last(this->shunts, entry);
@@ -369,7 +376,7 @@ METHOD(shunt_manager_t, uninstall, bool,
 	enumerator = this->shunts->create_enumerator(this->shunts);
 	while (enumerator->enumerate(enumerator, &entry))
 	{
-		if (streq(ns, entry->ns) &&
+		if ((!ns || streq(ns, entry->ns)) &&
 			streq(name, entry->cfg->get_name(entry->cfg)))
 		{
 			this->shunts->remove_at(this->shunts, enumerator);
diff --git a/src/libcharon/sa/shunt_manager.h b/src/libcharon/sa/shunt_manager.h
index f2b721032..3d9848c93 100644
--- a/src/libcharon/sa/shunt_manager.h
+++ b/src/libcharon/sa/shunt_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2016 Tobias Brunner
+ * Copyright (C) 2015-2017 Tobias Brunner
  * Copyright (C) 2011 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
@@ -36,8 +36,7 @@ struct shunt_manager_t {
 	/**
 	 * Install a policy as a shunt.
 	 *
-	 * @param ns		optional namespace (e.g. name of a connection or
-	 *					plugin), cloned
+	 * @param ns		namespace (e.g. name of a connection or plugin), cloned
 	 * @param child		child configuration to install as a shunt
 	 * @return			TRUE if installed successfully
 	 */
@@ -46,7 +45,10 @@ struct shunt_manager_t {
 	/**
 	 * Uninstall a shunt policy.
 	 *
-	 * @param ns		namespace (same as given during installation)
+	 * If no namespace is given the first matching child configuration is
+	 * removed.
+	 *
+	 * @param ns		namespace (same as given during installation) or NULL
 	 * @param name	 	name of child configuration to uninstall as a shunt
 	 * @return			TRUE if uninstalled successfully
 	 */