steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.35,1.36

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	LDAP.pm 
Log Message:
deletion handling + versions

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- LDAP.pm	14 Jul 2005 21:39:49 -0000	1.35
+++ LDAP.pm	28 Jul 2005 02:14:38 -0000	1.36
@@ -238,8 +238,10 @@
 
     Kolab::log('L', "Kolab::LDAP::createObject() called with obj uid field `$objuidfield' for obj type `$p'", KOLAB_DEBUG);
 
-    # No action for groups
+    # No action for groups or external
     return if( $objuidfield eq '' );
+    my $uid = trim($object->get_value($objuidfield)) || 0;
+    return unless $uid;
 
     my $kolabhomeserver = lc($object->get_value('kolabhomeserver'));
     my $islocal = 1;
@@ -258,7 +260,6 @@
       $islocal = 0;
     }
 
-    my $uid = trim($object->get_value($objuidfield)) || 0;
     # Intermediate multidomain support:
     # We accept domain encoded in CN...
     if( $p eq 'sf' && index( $uid, '@' ) < 0 ) {
@@ -483,7 +484,7 @@
     }
     %newuid_db = ();
 
-    syncBasic($cyrus, 'user', '(uid=*)', 0);
+    syncBasic($cyrus, 'user', '', 0);
     syncBasic($cyrus, 'sf', '', 1);
     syncBasic($cyrus, 'group', '', 0);