steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.15,1.16

cvs at intevation.de cvs at intevation.de
Thu Aug 12 12:55:42 CEST 2004


Author: steffen

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

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

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- LDAP.pm	5 Aug 2004 00:55:55 -0000	1.15
+++ LDAP.pm	12 Aug 2004 10:55:39 -0000	1.16
@@ -182,7 +182,7 @@
     my $p = shift || 'user';
     my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1 );
     #foreach (@$del) {
-    #  return 1 if lc($_) eq lc($Kolab::config{'fqhostname'});
+    #  return 1 if lc($_) eq lc($Kolab::config{'fqdnhostname'});
     #}
     #return 0;
     return $#$del > 0;
@@ -221,7 +221,7 @@
 
     Kolab::log('L', "Kolab::LDAP::createObject() called with obj uid field `$objuidfield' for obj type `$p'", KOLAB_DEBUG);
 
-    my $homeserver = lc($object->get_value('homeServer'));
+    my $kolabhomeserver = lc($object->get_value('kolabhomeserver'));
     my $islocal = 1;
     my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1);
     if( ref($del) eq 'ARRAY' && @$del > 0 ) {
@@ -229,12 +229,12 @@
 		 ." because it is deleted");
       return;
     }
-    if( $homeserver && $homeserver ne lc($Kolab::config{'fqhostname'}) ) {
+    if( $kolabhomeserver && $kolabhomeserver ne lc($Kolab::config{'fqdnhostname'}) ) {
       if( $p eq 'sf' ) {
-	# Dont create shared folders on other hosts than it's homeserver
+	# Dont create shared folders on other hosts than it's kolabhomeserver
 	return;
       }
-      Kolab::log('L', "Kolab::LDAP::createObject() for other server $homeserver. TODO: Create referral or something, for now we just create ", KOLAB_DEBUG);
+      Kolab::log('L', "Kolab::LDAP::createObject() for other server $kolabhomeserver. TODO: Create referral or something, for now we just create ", KOLAB_DEBUG);
       $islocal = 0;
     }
 
@@ -360,14 +360,14 @@
 	    Kolab::log('L', "Unable to remove DN `$dn': ".$mesg->error, KOLAB_WARN);
 	  }
 	} else {
-	  # Just remove us from the deleteflag
-	  Kolab::log('L', "Removing ".$Kolab::config{'fqhostname'}." from deleteflag in `$dn'");
+	  # Just remove us from the kolabdeleteflag
+	  Kolab::log('L', "Removing ".$Kolab::config{'fqdnhostname'}." from kolabdeleteflag in `$dn'");
 	  my $mesg = $masterldap->modify( $dn, delete => 
 					  { $Kolab::config{$p . '_field_deleted'} =>
-					    $Kolab::config{'fqhostname'} } );
+					    $Kolab::config{'fqdnhostname'} } );
 	  if ($mesg->code) {
-	    Kolab::log('L', "Unable to remove ".$Kolab::config{'fqhostname'}
-		       ." from deleteflag in `$dn': ".$mesg->error, KOLAB_WARN);
+	    Kolab::log('L', "Unable to remove ".$Kolab::config{'fqdnhostname'}
+		       ." from kolabdeleteflag in `$dn': ".$mesg->error, KOLAB_WARN);
 	  }
 	}
 	if( $ldap != $masterldap ) {
@@ -479,7 +479,7 @@
         $ldapmesg = $ldap->search(
             base    => $dn,
             scope   => 'sub',
-            filter  => '(&(objectClass=' . $Kolab::config{$p . '_object_class'} . ")$add(" . $Kolab::config{$p . '_field_deleted'} . '='.$Kolab::config{'fqhostname'}.'))',
+            filter  => '(&(objectClass=' . $Kolab::config{$p . '_object_class'} . ")$add(" . $Kolab::config{$p . '_field_deleted'} . '='.$Kolab::config{'fqdnhostname'}.'))',
             attrs   => [
                 '*',
                 $Kolab::config{$p . '_field_guid'},





More information about the commits mailing list