steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.31.2.3,1.31.2.4

[cvs at intevation.de]

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	LDAP.pm 
Log Message:
Fix for Issue885 (shared folder domain-part problem)

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -d -r1.31.2.3 -r1.31.2.4
--- LDAP.pm	28 Jul 2005 01:52:48 -0000	1.31.2.3
+++ LDAP.pm	12 Sep 2005 19:56:09 -0000	1.31.2.4
@@ -261,13 +261,8 @@
 
    if( $p eq 'sf' ) {
      # We have to create shared folders
-     # with names user.<fldrname>@<domain>
-     my @dcs = split(/,/,$object->dn());
-     my @dn;
-     while( pop( @dcs ) =~ /dc=(.*)/ ) {
-       push(@dn, $1);
-     }
-     if( $#dn > 0 ) { $uid .= '@'.join('.',reverse(@dn)); }
+     # with names shared.<fldrname>@<domain>
+     $uid .= '@'.$Kolab::config{'postfix-mydomain'};
    }
     if (!$uid) {
         Kolab::log('L', "Kolab::LDAP::createObject() called with null id attribute `$objuidfield', returning", KOLAB_DEBUG);