steffen: server/perl-kolab/Kolab Kolab.pm,1.2,1.3

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	Kolab.pm 
Log Message:
make shared folders work

Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kolab.pm	18 Apr 2004 02:51:41 -0000	1.2
+++ Kolab.pm	20 Apr 2004 00:27:05 -0000	1.3
@@ -199,7 +199,7 @@
     #
     #   Currently supported backends:
     #     `ad' - Active Directory
-#    $config{'directory_mode'} = 'slurpd' if (!exists $config{'directory_mode'});
+    $config{'directory_mode'} = 'slurpd' if (!exists $config{'directory_mode'});
 
     # `conn_refresh_period' specifies how many minutes to wait before forceably
     # tearing down the change listener connection, re-syncing, and re-connecting.
@@ -240,7 +240,7 @@
 
     # `user_object_class' denotes what object class to search for when locating users.
     # Defaults to `inetOrgPerson'
-#    $config{'user_object_class'} = 'inetOrgPerson' if (!exists $config{'user_object_class'});
+    $config{'user_object_class'} = 'inetOrgPerson' if (!exists $config{'user_object_class'});
 
     # This part sets various backend-specific LDAP fields (if they have not been
     # overridden) based on `directory_mode'.
@@ -251,15 +251,15 @@
     # `user_field_quota' indicates a field that stores the cyrus quota for the user
     if ($config{'user_directory_mode'} eq 'ad') {
         # AD
-#        $config{'user_field_deleted'} = 'isDeleted' if (!exists $config{'user_field_deleted'});
-#        $config{'user_field_modified'} = 'whenChanged' if (!exists $config{'user_field_modified'});
-#        $config{'user_field_guid'} = 'objectGUID' if (!exists $config{'user_field_guid'});
+        $config{'user_field_deleted'} = 'isDeleted' if (!exists $config{'user_field_deleted'});
+        $config{'user_field_modified'} = 'whenChanged' if (!exists $config{'user_field_modified'});
+        $config{'user_field_guid'} = 'objectGUID' if (!exists $config{'user_field_guid'});
         $config{'user_field_quota'} = 'userquota' if (!exists $config{'user_field_quota'});
     } else {
-#        # slurd/default
-#        $config{'user_field_deleted'} = 'deleteflag' if (!exists $config{'user_field_deleted'});
-#        $config{'user_field_modified'} = 'modifytimestamp' if (!exists $config{'user_field_modified'});
-#        $config{'user_field_guid'} = 'entryUUID' if (!exists $config{'user_field_guid'});
+        # slurd/default
+        $config{'user_field_deleted'} = 'deleteflag' if (!exists $config{'user_field_deleted'});
+        $config{'user_field_modified'} = 'modifytimestamp' if (!exists $config{'user_field_modified'});
+        $config{'user_field_guid'} = 'entryUUID' if (!exists $config{'user_field_guid'});
         $config{'user_field_quota'} = 'userquota' if (!exists $config{'user_field_quota'});
     }
 
@@ -282,16 +282,16 @@
     $config{'sf_object_class'} = 'sharedfolder' if (!exists $config{'sf_object_class'});
 
     if ($config{'sf_directory_mode'} eq 'ad') {
-#        # AD
-#        $config{'sf_field_deleted'} = 'isDeleted' if (!exists $config{'sf_field_deleted'});
-#        $config{'sf_field_modified'} = 'whenChanged' if (!exists $config{'sf_field_modified'});
-#        $config{'sf_field_guid'} = 'entryUUID' if (!exists $config{'sf_field_guid'});
+        # AD
+        $config{'sf_field_deleted'} = 'isDeleted' if (!exists $config{'sf_field_deleted'});
+        $config{'sf_field_modified'} = 'whenChanged' if (!exists $config{'sf_field_modified'});
+        $config{'sf_field_guid'} = 'entryUUID' if (!exists $config{'sf_field_guid'});
         $config{'sf_field_quota'} = 'userquota' if (!exists $config{'sf_field_quota'});
     } else {
-#        # slurd/default
-#        $config{'sf_field_deleted'} = 'deleteflag' if (!exists $config{'sf_field_deleted'});
-#        $config{'sf_field_modified'} = 'modifytimestamp' if (!exists $config{'sf_field_modified'});
-#        $config{'sf_field_guid'} = 'entryUUID' if (!exists $config{'sf_field_guid'});
+        # slurd/default
+        $config{'sf_field_deleted'} = 'deleteflag' if (!exists $config{'sf_field_deleted'});
+        $config{'sf_field_modified'} = 'modifytimestamp' if (!exists $config{'sf_field_modified'});
+        $config{'sf_field_guid'} = 'entryUUID' if (!exists $config{'sf_field_guid'});
         $config{'sf_field_quota'} = 'userquota' if (!exists $config{'sf_field_quota'});
     }