Renamed variable do_reload to $Kolab::do_reload, to make it a global variable.

This is needed to solve kolab/issue3951: kolabconf -n (noreload) restarts
services if RUNONCHANGE is used

1 files changed, 12 insertions, 2 deletions

diff --git a/lib/Kolab/Conf.pm b/lib/Kolab/Conf.pm
index 3491795..9d12855 100644
--- a/lib/Kolab/Conf.pm
+++ b/lib/Kolab/Conf.pm
@@ -741,8 +741,18 @@ sub rebuildTemplates
     }
     my $cmd;
     foreach $cmd (keys %cmds) {
-	Kolab::log('T', 'Executing command: '.$cmd, KOLAB_DEBUG );
-	system($cmd);
+        # $cmd can contain:
+        # - /usr/sbin/postmap: should always be executed
+        # - openpkg rc imapd restart (in openpkg distribution)
+        # - kolabsrv rc post reload  (in other distributions)
+        # The commands with ' rc ' may only be executed when reloading is not
+        # prohibited by the user with the "-n" option.
+        if ($Kolab::do_reload || $cmd !~ / rc \S+ re(start|load)/) {
+            Kolab::log('T', 'Executing command: '.$cmd, KOLAB_DEBUG );
+            system($cmd);
+        } else {
+            Kolab::log('T', 'Reload not allowed, not executing command: '.$cmd, KOLAB_DEBUG );
+        }
     }
 }