summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2008-10-10 14:24:00 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2008-10-10 14:24:00 (GMT)
commitb8f7b994c611dd9b7db76d8713494ca4394da5ea (patch)
tree1d75e9402a238dd2c2366f671ac910a12990d11f
parent4ed87f9f9489856fdad3f1c9b4d680dbcfe0b558 (diff)
downloadperl-Kolab-b8f7b994c611dd9b7db76d8713494ca4394da5ea.tar.gz
Allow returning only the global information when bootstrapping. Removed prefix variable.
-rw-r--r--lib/Kolab.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Kolab.pm b/lib/Kolab.pm
index e6e7868..e286a57 100644
--- a/lib/Kolab.pm
+++ b/lib/Kolab.pm
@@ -83,6 +83,7 @@ sub KOLAB_DEBUG() { 4 }
sub reloadConfig
{
my $kolab_globals = shift;
+ my $globals_only = shift || 0;
my $tempval;
my $ldap;
@@ -100,6 +101,11 @@ sub reloadConfig
# First read `kolab.globals'
%config = readConfig(%config, $kolab_globals);
+ # Return if we should only read the base information.
+ if ($globals_only) {
+ return;
+ }
+
# Determine the root of the kolab installation, and read `kolab.globals'
# Notice that the location of the files is handled by dist_conf,
# so we don't use $tempval for anything other than storing it in
@@ -110,8 +116,6 @@ sub reloadConfig
$config{'log_level'} = KOLAB_WARN;
&log('C', 'Unable to determine the kolab user main directory', KOLAB_ERROR);
$error = 1;
- } else {
- $config{'prefix'} = $tempval;
}
# Now read `kolab.conf', overwriting values read from `kolab.globals'