steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.57,1.58

cvs at intevation.de cvs at intevation.de
Fri Jul 8 04:05:37 CEST 2005


Author: steffen

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

Modified Files:
	Conf.pm 
Log Message:
multidomain shared folders. New folder have the domain encoded in CN, existing folders work as before

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- Conf.pm	6 Jul 2005 10:40:07 -0000	1.57
+++ Conf.pm	8 Jul 2005 02:05:35 -0000	1.58
@@ -469,6 +469,10 @@
         by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write
         by * continue
 
+access to filter=(&(objectClass=kolabSharedFolder)(cn=*@@@@domain@@@))
+        by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write
+        by * continue
+
 EOS
 
     my $dom_acl1 = << 'EOS';
@@ -515,6 +519,17 @@
     }
 
     $access->close;
+
+    if (-f $oldcfg) {
+        my $rc = `diff -q $cfg $oldcfg`;
+        chomp($rc);
+        if ($rc) {
+           Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
+           $Kolab::haschanged{'slapd'} = 1;
+        }
+    } else {
+        $Kolab::haschanged{'slapd'} = 1;
+    }
 
     chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $cfg);
 





More information about the commits mailing list