diff options
| author | Simon Rettberg | 2017-12-18 14:25:47 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-18 14:25:47 +0100 |
| commit | c324749267d31498f28b170dfb3d0d3968fadc61 (patch) | |
| tree | 60f4050b5a64a9a95576c76d913cc3bd6871db83 /modules-available/sysconfig/inc | |
| parent | [syconfig] AD: Better error messages, don't lose DN if homeAttrCheck fails (diff) | |
| download | slx-admin-c324749267d31498f28b170dfb3d0d3968fadc61.tar.gz slx-admin-c324749267d31498f28b170dfb3d0d3968fadc61.tar.xz slx-admin-c324749267d31498f28b170dfb3d0d3968fadc61.zip | |
[sysconfig] Fix logic by which condition the LDADPd gets (re)started
Diffstat (limited to 'modules-available/sysconfig/inc')
| -rw-r--r-- | modules-available/sysconfig/inc/configmodulebaseldap.inc.php | 11 | ||||
| -rw-r--r-- | modules-available/sysconfig/inc/configtgz.inc.php | 1 |
2 files changed, 9 insertions, 3 deletions
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; } /** diff --git a/modules-available/sysconfig/inc/configtgz.inc.php b/modules-available/sysconfig/inc/configtgz.inc.php index 09ea999c..17c9f35d 100644 --- a/modules-available/sysconfig/inc/configtgz.inc.php +++ b/modules-available/sysconfig/inc/configtgz.inc.php @@ -157,7 +157,6 @@ class ConfigTgz { if ($this->configId === 0) Util::traceError('ConfigTgz::markUpdated called with invalid config id!'); - Event::activeConfigChanged(); if ($this->areAllModulesUpToDate()) return $this->mark('OK'); return $this->mark('OUTDATED'); |