steffen: server/perl-kolab/Kolab Kolab.pm,1.24,1.25

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab
In directory doto:/tmp/cvs-serv3597/Kolab

Modified Files:
	Kolab.pm 
Log Message:
perl-kolab is back in business

Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Kolab.pm	30 Jun 2005 01:43:55 -0000	1.24
+++ Kolab.pm	30 Jun 2005 11:12:10 -0000	1.25
@@ -78,17 +78,21 @@
     #     4 - Debug (i.e. everything)
 
     # 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 $tempcal for anything other than storing it in
+    # $config{'prefix'}. Once prefix is not in use anywhere, we can remove
+    # this code. /steffen
     if (!($tempval = (getpwnam('kolab'))[7])) {
         $config{'log_level'} = KOLAB_WARN;
         &log('C', 'Unable to determine the kolab root directory', KOLAB_ERROR);	
 	$error = 1;
     } else {
-        %config = readConfig(%config, "$tempval$ap::config->{sysconfdir}/kolab/kolab.globals");
+        %config = readConfig(%config, "$ap::config->{sysconfdir}/kolab/kolab.globals");
         $config{'prefix'} = $tempval;
     }
 
     # Now read `kolab.conf', overwriting values read from `kolab.globals'
-    %config = readConfig(\%config, "$tempval$ap::config->{sysconfdir}/kolab/kolab.conf");
+    %config = readConfig(\%config, "$ap::config->{sysconfdir}/kolab/kolab.conf");
 
 #    $config{'log_level'} = KOLAB_WARN if (!exists $config{'log_level'});
     &log('C', 'Reloading configuration');