summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Hansen <steffen@kdab.com>2004-04-18 02:51:41 (GMT)
committerSteffen Hansen <steffen@kdab.com>2004-04-18 02:51:41 (GMT)
commit30f55ebaba84248af2602c610bed8845c5acf6b7 (patch)
tree3ef728a0800461d26788c8f98e3c893027bd39eb
parent615e5cbbd6b690ad1749f2bddaf1862d43668639 (diff)
downloadperl-Kolab-30f55ebaba84248af2602c610bed8845c5acf6b7.tar.gz
quota stuff2.0-proko2_m1
-rw-r--r--Kolab/Kolab.pm24
-rw-r--r--perl-kolab.spec2
2 files changed, 13 insertions, 13 deletions
diff --git a/Kolab/Kolab.pm b/Kolab/Kolab.pm
index 07f473a..5a89273 100644
--- a/Kolab/Kolab.pm
+++ b/Kolab/Kolab.pm
@@ -249,19 +249,19 @@ sub reloadConfig
# `user_field_modified' is used to test whether a user object has been modified
# `user_field_guid' indicates a field that can be considered globally unique to the object
# `user_field_quota' indicates a field that stores the cyrus quota for the user
-# if ($config{'user_directory_mode'} eq 'ad') {
-# # AD
+ 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_quota'} = 'userquota' if (!exists $config{'user_field_quota'});
-# } else {
+ $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'});
-# $config{'user_field_quota'} = 'userquota' if (!exists $config{'user_field_quota'});
-# }
+ $config{'user_field_quota'} = 'userquota' if (!exists $config{'user_field_quota'});
+ }
# The `sf_XXX' variables are the shared folder equivalents of the `user_XXX' variables
$config{'sf_ldap_uri'} = $config{'ldap_uri'} if (!exists $config{'sf_ldap_uri'});
@@ -279,21 +279,21 @@ sub reloadConfig
$config{'sf_dn_list'} = $config{'base_dn'} if (!exists $config{'sf_dn_list'});
$config{'sf_directory_mode'} = $config{'directory_mode'} if (!exists $config{'sf_directory_mode'});
-# $config{'sf_object_class'} = 'sharedfolder' if (!exists $config{'sf_object_class'});
+ $config{'sf_object_class'} = 'sharedfolder' if (!exists $config{'sf_object_class'});
-# if ($config{'sf_directory_mode'} eq 'ad') {
+ 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'});
-# $config{'sf_field_quota'} = 'userquota' if (!exists $config{'sf_field_quota'});
-# } else {
+ $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'});
-# $config{'sf_field_quota'} = 'userquota' if (!exists $config{'sf_field_quota'});
-# }
+ $config{'sf_field_quota'} = 'userquota' if (!exists $config{'sf_field_quota'});
+ }
# `gyard_deletion_period' specifies how many minutes to leave lost users in
# the graveyard before deleting them.
diff --git a/perl-kolab.spec b/perl-kolab.spec
index 17597ea..7f49b60 100644
--- a/perl-kolab.spec
+++ b/perl-kolab.spec
@@ -48,7 +48,7 @@ Class: PLUS
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 20040416
+Release: 20040418
# list of sources
Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz