From c324749267d31498f28b170dfb3d0d3968fadc61 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 18 Dec 2017 14:25:47 +0100
Subject: [sysconfig] Fix logic by which condition the LDADPd gets (re)started

---
 .../sysconfig/addmodule_ldapauth.inc.php            | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'modules-available/sysconfig/addmodule_ldapauth.inc.php')

diff --git a/modules-available/sysconfig/addmodule_ldapauth.inc.php b/modules-available/sysconfig/addmodule_ldapauth.inc.php
index a193f779..e0de06ac 100644
--- a/modules-available/sysconfig/addmodule_ldapauth.inc.php
+++ b/modules-available/sysconfig/addmodule_ldapauth.inc.php
@@ -281,8 +281,7 @@ class LdapAuth_Finish extends AddModule_Base
 			Message::addError('main.value-invalid', 'any', 'any');
 			$tgz = false;
 		} else {
-			$parent = $this->stopOldInstance();
-			$tgz = $module->generate($this->edit === false, $parent);
+			$tgz = $module->generate($this->edit === false);
 		}
 		if ($tgz === false) {
 			AddModule_Base::setStep('LdapAuth_Start'); // Continues with LdapAuth_Start for render()
@@ -293,24 +292,6 @@ class LdapAuth_Finish extends AddModule_Base
 		);
 	}
 
-	private function stopOldInstance()
-	{
-		if ($this->edit === false)
-			return NULL;
-		$list = ConfigTgz::getAllForModule($this->edit->id());
-		if (!is_array($list))
-			return NULL;
-		$parent = NULL;
-		foreach ($list as $tgz) {
-			if (!$tgz->isActive())
-				continue;
-			$task = Trigger::ldadp($tgz->id(), $parent);
-			if (isset($task['id']))
-				$parent = $task['id'];
-		}
-		return $parent;
-	}
-
 	protected function renderInternal()
 	{
 		Render::addDialog(Dictionary::translateFile('config-module', 'ldapAuth_title'), false, 'ldap-finish', $this->taskIds);
-- 
cgit v1.2.3-55-g7522