steffen: server/perl-kolab/Kolab-Cyrus Cyrus.pm,1.2,1.3
cvs at intevation.de
cvs at intevation.de
Fri Jun 18 15:26:07 CEST 2004
Author: steffen
Update of /kolabrepository/server/perl-kolab/Kolab-Cyrus
In directory doto:/tmp/cvs-serv13948/Kolab-Cyrus
Modified Files:
Cyrus.pm
Log Message:
acl fix, this should take care of Issue154
Index: Cyrus.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Cyrus/Cyrus.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Cyrus.pm 23 Apr 2004 00:03:49 -0000 1.2
+++ Cyrus.pm 18 Jun 2004 13:26:05 -0000 1.3
@@ -150,12 +150,10 @@
Kolab::log('Y', "Setting up ACL of mailbox `$cyruid'");
my $prefix = $Kolab::config{'prefix'};
- my @acls = `$prefix/etc/kolab/workaround.sh $cyruid $Kolab::config{'bind_pw'} | sed -e /localhost/d`;
+ my %acls = $cyrus->listacl( $cyruid );
my ($user, $entry, $acl);
- Kolab::log('Y', "Removing users from ACL of $cyruid", KOLAB_DEBUG);
- foreach $acl (@acls) {
- $acl = trim($acl);
- ($user, ) = split(/ /, $acl);
+ Kolab::log('Y', "Removing users from ACL of $cyruid (users are \"".join(', ', keys %acls)."\")", KOLAB_DEBUG);
+ foreach $user ( keys %acls) {
Kolab::log('Y', "Removing `$user' from the ACL of mailbox `$cyruid'");
if (!$cyrus->deleteacl($cyruid, $user)) {
Kolab::log('Y', "Unable to remove `$user' from the ACL of mailbox `$cyruid', Error = `" . $cyrus->error . "'", KOLAB_WARN);
More information about the commits
mailing list