Quanah,

> <[EMAIL PROTECTED]> wrote:
> > Back in 2006, a patch for the missing amavisArchiveQuarantineTo attribute
> > from the LDAP schema was submitted from Zimbra.  This still appears to be
> > missing even in the current 2.6 release.  Is there a plan to add this?
> >
> > <http://www.usenet-forums.com/amavis-user/223047-amavis-user-archive-quar
> > antine-ldap.html>

Thanks for promptimg me. It was still on a forgotten to-do stack,
will go into 2.6.2.

> Updated patch attached, for 2.6.1.  Includes slight modifications to
> amavisd.

The mailing list strips attachments.

I'll add the following change. In case you have something in addition,
please tell me (or send a patch directly to me if nontrivial).


--- amavisd-new-2.6.1/amavisd   2008-06-29 02:37:58.000000000 +0200
+++ ./amavisd   2008-10-10 19:37:02.000000000 +0200
@@ -14076,5 +14076,6 @@
     amavisSpamSubjectTag amavisSpamSubjectTag2 amavisSpamModifiesSubj
     amavisVirusQuarantineTo amavisSpamQuarantineTo amavisBannedQuarantineTo
-    amavisBadHeaderQuarantineTo amavisBlacklistSender amavisWhitelistSender
+    amavisBadHeaderQuarantineTo amavisArchiveQuarantineTo
+    amavisBlacklistSender amavisWhitelistSender
     amavisLocal amavisMessageSizeLimit amavisWarnVirusRecip
     amavisWarnBannedRecip amavisWarnBadHeaderRecip amavisVirusAdmin
@@ -14188,4 +14189,5 @@
     my($result) = $conn_h->do_search($base, $self->{scope}, $filter);
     my(@entry) = $result->entries;
+    my(%mv_ldap_attrs) = map { (lc($_), 1) } @mv_ldap_attrs;
     for my $entry (@entry) {
       my($match) = {};
@@ -14193,7 +14195,7 @@
       for my $attr (@ldap_attrs) {
         my($value);
-        $attr = lc($attr);
         do_log(9,'lookup_ldap: reading attribute "%s" from object', $attr);
-        if (grep /^$attr\z/i, @mv_ldap_attrs) { # multivalued
+        $attr = lc($attr);
+        if ($mv_ldap_attrs{$attr}) {  # multivalued
           $value = $entry->get_value($attr, asref => 1);
         } else {
--- /home/mark/amavisd-new-2.6.1/LDAP.schema    2006-05-10 14:14:58.000000000 
+0200
+++ ./LDAP.schema       2008-10-10 19:29:02.000000000 +0200
@@ -378,4 +378,15 @@
   SINGLE-VALUE )
 
+#dn: cn=schema
+#changetype: modify
+#add: attributetypes
+attributetype ( 1.3.6.1.4.1.15312.2.2.1.34
+  NAME 'amavisArchiveQuarantineTo'
+  DESC 'Archive quarantine location'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE )
+
 
 # Classes
@@ -402,4 +413,5 @@
         amavisSpamQuarantineTo $ amavisVirusQuarantineTo $
         amavisBannedQuarantineTo $ amavisBadHeaderQuarantineTo $
+        amavisArchiveQuarantineTo $
         amavisSpamModifiesSubj $ amavisLocal $ amavisMessageSizeLimit $
         amavisWarnVirusRecip $ amavisWarnBannedRecip $



Mark

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
AMaViS-user mailing list
[email protected] 
https://lists.sourceforge.net/lists/listinfo/amavis-user 
 AMaViS-FAQ:http://www.amavis.org/amavis-faq.php3 
 AMaViS-HowTos:http://www.amavis.org/howto/ 

Reply via email to