> but I don't know what would be the best way to resolve it properly.
Actually the following might be a more universal solution,
relying on amavisd to decide whether it is a SQL or file-based
quarantine, based on its SQL settings:
--- amavisd-release~ 2008-08-05 18:49:30.000000000 +0200
+++ amavisd-release 2010-02-10 17:32:43.000000000 +0100
@@ -157,13 +157,11 @@
}
my($quar_type) =
- $fn_suffix eq '.gz' ? 'Z'
- : $fn_path eq '' && $mail_id eq $mail_file ? 'Q' : 'F';
+ $fn_suffix eq '.gz' ? 'Z' : $fn_path ne '' ? 'F' : '';
my($request_type) = $0 =~ /\breport\z/i ? 'report'
: $0 =~ /\brequeue\z/i ? 'requeue' : 'release';
- my(@query) = (
- "request=$request_type",
- "quar_type=$quar_type",
- "mail_id=$mail_id",
- );
+ my(@query);
+ push(@query, "request=$request_type");
+ push(@query, "mail_id=$mail_id");
+ push(@query, "quar_type=$quar_type") if $quar_type ne '';
push(@query, "secret_id=$secret_id") if $secret_id ne '';
push(@query, "mail_file=$mail_file") if $quar_type =~ /^[FZB]\z/;
Mark
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
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/
