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

---
 modules-available/sysconfig/inc/configmodulebaseldap.inc.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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

diff --git a/modules-available/sysconfig/inc/configmodulebaseldap.inc.php b/modules-available/sysconfig/inc/configmodulebaseldap.inc.php
index d8a41a8b..d6fc3ed9 100644
--- a/modules-available/sysconfig/inc/configmodulebaseldap.inc.php
+++ b/modules-available/sysconfig/inc/configmodulebaseldap.inc.php
@@ -33,7 +33,10 @@ abstract class ConfigModuleBaseLdap extends ConfigModule
 
 	protected function generateInternal($tgz, $parent)
 	{
-		Trigger::ldadp($this->id(), $parent);
+		$np = Trigger::ldadp($this->id(), $parent);
+		if ($np !== false) {
+			$parent = $np;
+		}
 		$config = $this->moduleData;
 		if (isset($config['certificate']) && !is_string($config['certificate'])) {
 			unset($config['certificate']);
@@ -64,7 +67,11 @@ abstract class ConfigModuleBaseLdap extends ConfigModule
 			$config['fixnumeric'] = 's';
 		}
 		$this->preTaskmanagerHook($config);
-		return Taskmanager::submit('CreateLdapConfig', $config);
+		$task = Taskmanager::submit('CreateLdapConfig', $config);
+		if (is_array($task) && isset($task['id'])) {
+			Trigger::ldadp(null, $task['id']);
+		}
+		return $task;
 	}
 
 	/**
-- 
cgit v1.2.3-55-g7522