lib/Kolab

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu Apr 14 21:20:48 CEST 2011


 lib/Kolab/LDAP/Backend/fds.pm      |    4 +++-
 lib/Kolab/LDAP/Backend/slurpd.pm   |   11 +++++++----
 lib/Kolab/LDAP/Backend/syncrepl.pm |    7 +++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 758e6927e4b63a82aabd5bb3bb1176dcc5a7c402
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Apr 14 20:19:29 2011 +0100

    Introduce the handling of a new (boolean) setting 'auto_kolab_conf'.

diff --git a/lib/Kolab/LDAP/Backend/fds.pm b/lib/Kolab/LDAP/Backend/fds.pm
index 9d35610..8daf873 100644
--- a/lib/Kolab/LDAP/Backend/fds.pm
+++ b/lib/Kolab/LDAP/Backend/fds.pm
@@ -110,7 +110,9 @@ FOO:
     Kolab::log('FDS', "Calling Kolab::LDAP::sync", KOLAB_DEBUG);
     Kolab::LDAP::sync;
 
-    system($Kolab::config{'kolabconf_script'}) == 0 || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
+    if ($Kolab::config{'auto_kolab_conf'}) {
+        system($Kolab::config{'kolabconf_script'}) == 0 || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
+    }
 
     Kolab::log('FDS', "Finished Kolab::LDAP::sync, sleeping for 5 seconds", KOLAB_DEBUG);
 
diff --git a/lib/Kolab/LDAP/Backend/slurpd.pm b/lib/Kolab/LDAP/Backend/slurpd.pm
index 26b83bb..d36c2bb 100644
--- a/lib/Kolab/LDAP/Backend/slurpd.pm
+++ b/lib/Kolab/LDAP/Backend/slurpd.pm
@@ -290,10 +290,13 @@ TRYCONNECT:
                         exit(0);
                     }
                     waitpid($kidpid, 0);
-                    Kolab::log('SD', "Running $Kolab::config{'kolabconf_script'}");
-                    system($Kolab::config{'kolabconf_script'}) == 0
-                        or Kolab::log('SD', "Failed to run $Kolab::config{'kolabconf_script'}: $?", KOLAB_ERROR);
-                    Kolab::log('SD', "$Kolab::config{'kolabconf_script'} complete");
+
+                    if ($Kolab::config{'auto_kolab_conf'}) {
+                        Kolab::log('SD', "Running $Kolab::config{'kolabconf_script'}");
+                        system($Kolab::config{'kolabconf_script'}) == 0
+                            or Kolab::log('SD', "Failed to run $Kolab::config{'kolabconf_script'}: $?", KOLAB_ERROR);
+                        Kolab::log('SD', "$Kolab::config{'kolabconf_script'} complete");
+                    }
                 }
             }
 
diff --git a/lib/Kolab/LDAP/Backend/syncrepl.pm b/lib/Kolab/LDAP/Backend/syncrepl.pm
index 5283262..ee84d58 100644
--- a/lib/Kolab/LDAP/Backend/syncrepl.pm
+++ b/lib/Kolab/LDAP/Backend/syncrepl.pm
@@ -243,8 +243,11 @@ sub searchCallback {
 
             Kolab::log('SYNCREPL', "Calling Kolab::LDAP::sync", KOLAB_DEBUG);
             Kolab::LDAP::sync;
-            system($Kolab::config{'kolabconf_script'}) == 0
-                || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
+
+            if ($Kolab::config{'auto_kolab_conf'}) {
+                system($Kolab::config{'kolabconf_script'}) == 0
+                    || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
+            }
 
             Kolab::log('SYNCREPL', "Finished Kolab::LDAP::sync sleeping 1s", KOLAB_DEBUG);
             sleep 1; # we get too many bogus change notifications!





More information about the commits mailing list