stuart: devel/kolab/Kolab Cyrus.pm,1.2,1.3 DirServ.pm,1.2,1.3

[cvs at intevation.de]

Author: stuart

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

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


Index: Cyrus.pm
===================================================================
RCS file: /kolabrepository/devel/kolab/Kolab/Cyrus.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Cyrus.pm	12 May 2004 13:12:34 -0000	1.2
+++ Cyrus.pm	12 May 2004 14:41:06 -0000	1.3
@@ -143,8 +143,7 @@
     my $cyruid = &createUid($uid, $sf);
 
     Kolab::log('Y', "Setting up ACL of mailbox `$cyruid'");
-    my $prefix = $Kolab::config{'kolab_root'};
-    my @acls = `$prefix/etc/kolab/workaround.sh $cyruid $Kolab::config{'bind_pw'} | sed -e /localhost/d`;
+    my @acls = `$Kolab::config{'kolab_root'}/etc/kolab/workaround.sh $cyruid $Kolab::config{'bind_pw'} | sed -e /localhost/d`;
     my ($user, $entry, $acl);
     Kolab::log('Y', "Removing users from ACL of $cyruid", KOLAB_DEBUG);
     foreach $acl (@acls) {

Index: DirServ.pm
===================================================================
RCS file: /kolabrepository/devel/kolab/Kolab/DirServ.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DirServ.pm	12 May 2004 13:12:34 -0000	1.2
+++ DirServ.pm	12 May 2004 14:41:06 -0000	1.3
@@ -67,7 +67,7 @@
 
 sub reloadPeers
 {
-    @peers = readList($Kolab::config{'kolab_root'} . "/etc/kolab/addressbook.peers");
+    @peers = readArray($Kolab::config{'kolab_root'} . "/etc/kolab/addressbook.peers");
 
     foreach my $peer (@peers) {
         Kolab::log('DS', "Using peer $peer", KOLAB_DEBUG);