steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.33,1.34

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	Conf.pm 
Log Message:
*BOMB*. Changes to support the new schema

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Conf.pm	9 Aug 2004 22:00:40 -0000	1.33
+++ Conf.pm	12 Aug 2004 10:55:39 -0000	1.34
@@ -241,7 +241,7 @@
     # Build transport rules for groups 
     $mesg = $ldap->search( base => 'cn=groups,'.$Kolab::config{'base_dn'},
 			   scope => 'sub',
-			   filter => '(objectClass=kInetOrgPerson)' );
+			   filter => '(objectClass=kolabinetorgperson)' );
     if ($mesg->code) {
         Kolab::log('T', 'Unable to locate groups transport map entries in LDAP', KOLAB_ERROR);
         exit(1);
@@ -258,7 +258,7 @@
     # Build transport rules for resources
     $mesg = $ldap->search( base => 'cn=resources,'.$Kolab::config{'base_dn'},
 			   scope => 'sub',
-			   filter => '(objectClass=kInetOrgPerson)' );
+			   filter => '(objectClass=kolabinetorgperson)' );
     if ($mesg->code) {
         Kolab::log('T', 'Unable to locate resources transport map entries in LDAP', KOLAB_ERROR);
         exit(1);
@@ -386,7 +386,7 @@
     my $mesg = $ldap->search(
         base    => $Kolab::config{'base_dn'},
         scope   => 'sub',
-        filter  => '(objectclass=groupOfNames)'
+        filter  => '(objectclass=kolabgroupofnames)'
     );
     if ($mesg->code) {
         Kolab::log('T', 'Unable to locate Cyrus groups in LDAP', KOLAB_ERROR);
@@ -469,7 +469,7 @@
 	@kh = ( $Kolab::config{'kolabhost'} );
       }
       for my $h ( @kh ) {
-	next if $h eq $Kolab::config{'fqhostname'};
+	next if $h eq $Kolab::config{'fqdnhostname'};
 	print $repl "replica uri=ldaps://$h\n"
 	  ."  binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
 	    ."  bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";