Changeset 11522 for trunk

Timestamp:

10/20/08 16:13:37 (3 months ago)

Author:

javier.amor.garcia@…

Message:

Bugfix: MDSize attribute should not be restored in sytems with MDSize feature disabled

Location:

trunk/client/mail

Files:

• ChangeLog (modified) (1 diff)
• src/EBox/Mail/ImportFromLdif.pm (modified) (3 diffs)

trunk/client/mail/ChangeLog

@@ -1 +1 @@
 0.12.100
-        + EBox::MailUserLdap::userAccount and  EBox::MailUserLdap::getUserLdapValue  dont longer assumme that the user exists
+        + EBox::MailUserLdap::userAccount and
+        EBox::MailUserLdap::getUserLdapValue  dont longer assumme that the
+        user exists
+        + Bugfix: MDSize attribute should not be restored in sytems with
+        MDSize feature disabled
 0.12.99
         + Add support for reporting

trunk/client/mail/src/EBox/Mail/ImportFromLdif.pm

@@ -68 +68 @@
 
     my $mailMod = EBox::Global->modInstance('mail');
+    $mailMod->mdQuotaAvailable() or
+        return;
+
+
     my $mailUserLdap = $mailMod->_ldapModImplementation();
     $mailUserLdap->setMDSize($mdsize);
@@ -93 +97 @@
     my $vdomainsLdap = EBox::MailVDomainsLdap->new();
     
-    # we add it to LDAP because until we have changed users to useg gconf things
+    # we add it to LDAP because until we have changed users to use gconf, things
     # may became inconsistent with mail accounts
     $vdomainsLdap->addVDomain($vdomain);
@@ -125 +129 @@
     my $vdomain = $entry->get_value('dc');
 
+
+
+    # quota sutff
+
     my $dftmdsize = $entry->get_value('vddftMaildirSize');
 
-    $dftmdsize or return;
+    $dftmdsize or 
+        return;
+
+    my $mailMod = EBox::Global->modInstance('mail');
+    $mailMod->mdQuotaAvailable() or
+        return;
+
 
     my $vdomainsLdap = EBox::MailVDomainsLdap->new();
-    $vdomainsLdap->_addVDomainWiithMdQuota($vdomain, $dftmdsize);
+    $vdomainsLdap->_addVDomainWithMdQuota($vdomain, $dftmdsize);
 }