stuart: devel/kolab Kolab.pm,1.3,1.4 kolabd,1.2,1.3

[cvs at intevation.de]

Author: stuart

Update of /kolabrepository/devel/kolab
In directory doto:/tmp/cvs-serv25485

Modified Files:
	Kolab.pm kolabd 
Log Message:
Small bugfixes to get the code to compile cleanly. There may be more fixes needed :-)


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/devel/kolab/Kolab.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kolab.pm	12 May 2004 11:01:13 -0000	1.3
+++ Kolab.pm	12 May 2004 14:41:06 -0000	1.4
@@ -103,7 +103,7 @@
     my $name = shift || `basename $0`;
     $name = trim($name);
 
-    my $temp = $config{'log'};
+    my $temp = $config{'log'} || '';
     if ($temp =~ /(\w+):(.*)?/) {
         if ($1 eq 'syslog') {
             $logType = KOLAB_LOG_SYSLOG;
@@ -137,6 +137,7 @@
         if ($logType == KOLAB_LOG_SYSLOG) {
             syslog('info', $text);
         } elsif ($logType == KOLAB_LOG_FILE) {
+            my $time = localtime;
             print $logDestination "$time ${logPrefix}[$$]: $text\n";
         }
     }

Index: kolabd
===================================================================
RCS file: /kolabrepository/devel/kolab/kolabd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabd	12 May 2004 13:12:34 -0000	1.2
+++ kolabd	12 May 2004 14:41:06 -0000	1.3
@@ -110,7 +110,7 @@
         kill('INT', $pid);
         waitpid($pid, 0);
     }
-    %pids = ();
+    %childPIDs = ();
     Kolab::loadConfig(@configs);
     Kolab::log(PREFIX, 'Synchronising');
     Kolab::LDAP::sync;
@@ -133,7 +133,7 @@
         }
 
         if ($pid) {
-            $pids{$pid} = 1;
+            $childPIDs{$pid} = 1;
             $finished++;
             next;
         }