Dear list,
We were looking over internet for someone who patched vdelivermail in
order to call maildrop in the delivery process for filtering purpose.
This kind of implementation using maildrop for filtering seems to be the
cleanest way for us in our mind, because we do not have to change
.qmail-default behavior in many ways (ie because of other qmail tools
like qmailadmin…).
And therefore, using vdelivermail make us sure to do many more check
regarding vpopmail, like for sample ‘bouncing over-quota mails over full
mailboxes’ and reading dot qmail files.
We founded a patch located here :
http://katastrophos.net/andre/blog/2006/10/03/vpopmail-maildrop-sqwebmail-mailfilter-patch/
but after many check and test this was not as clean as we wanted.
So we rewritted a patch from scratch, witch is working fine in ours tests …
in synthesis :
This patch keep the behavior of vdelivermail on all delivering cases
(like bouncing, deferals …). This is particularly important on the way
that vdelivermail handle quota, and the users notifications.
It also has the granularity of a using a mailfilter configuration file
for domains (ie /home/vpopmail/domains/onedomain/mailfilter), all
domains (ie /home/vpopmail/domains/mailfilter) … and indeed a default
one in /etc/mailfilter.
If no mailfilter file is present, vdelivermail act as it does naturally.
You'll find our patch below, if it can help someone ...
Any feedback would be cool :)
Regards,
--- vpopmail-5.4.17/vdelivermail.c 2006-06-29 21:36:43.000000000 +0200
+++ vpopmail-5.4.17.patchmaildrop_actinux/vdelivermail.c 2006-10-25
16:59:17.000000000 +0200
@@ -22,6 +22,13 @@
*
*/
+/* Patch insertion for using maildrop delivery program October 2006
+ * by Actinux Team
+ * Jerome MOLLIER-PIERRET <[EMAIL PROTECTED]>,
+ * Brian PASSANTE <[EMAIL PROTECTED]>
+ *
+ */
+
/* include files */
#include <unistd.h>
#include <stdlib.h>
@@ -81,6 +88,9 @@
/* from qmail's wait.h for run_command() */
#define wait_exitcode(w) ((w) >> 8)
+/* Maildrop binary path */
+#define MAILDROP "/usr/local/bin/maildrop"
+
/* Forward declarations */
int process_valias(void);
void get_arguments(int argc, char **argv);
@@ -93,6 +103,7 @@
void usernotfound(void);
int is_loop_match( const char *dt, const char *address);
int deliver_quota_warning(const char *dir, const char *q);
+int launchmaildrop(void);
/* print an error string and then exit
@@ -610,7 +621,7 @@
maildir_to_email(address));
}
- switch (deliver_to_maildir (address, DeliveredTo, 0,
message_size)) {
+ switch (launchmaildrop()) {
case -1:
vexiterr (EXIT_OVERQUOTA, "user is over quota");
break;
@@ -620,6 +631,22 @@
case -3:
vexiterr (EXIT_BOUNCE, "mail is looping");
break;
+ case -200:
+ /*start the old launch */
+ printf ("trying_normal_delivery: ");
+ switch (deliver_to_maildir (address, DeliveredTo, 0,
message_size)) {
+ case -1:
+ vexiterr (EXIT_OVERQUOTA, "user is over quota");
+ break;
+ case -2:
+ vexiterr (EXIT_DEFER, "system error");
+ break;
+ case -3:
+ vexiterr (EXIT_BOUNCE, "mail is looping");
+ break;
+ default:
+ return;
+ }
default:
return;
}
@@ -1042,6 +1069,7 @@
maildir_to_email(newdir), date_header());
}
+
err = deliver_to_maildir (dir, DeliveredTo, read_fd, sb.st_size);
close (read_fd);
@@ -1063,3 +1091,67 @@
return (strcasecmp (compare, (dt+14)) == 0);
}
+
+int launchmaildrop(void)
+{
+ char *prog;
+ int child;
+ char *(args[4]);
+ int wstat;
+ char mailfilter_file[256];
+ FILE *fs;
+
+ printf("trying_through_maildrop: ");
+
+ sprintf(mailfilter_file, "%s/mailfilter",TheDomainDir);
+ if ( (fs=fopen(mailfilter_file, "r")) == NULL ) {
+ /* if no mailfilter in domain then check in vpopmail dir */
+ sprintf(mailfilter_file, "%s/%s/mailfilter",VPOPMAILDIR,DOMAINS_DIR);
+ if ( (fs=fopen(mailfilter_file, "r")) == NULL ) {
+ /* if no mailfilter in vpopmail dir check in /etc/ */
+ sprintf(mailfilter_file, "/etc/mailfilter");
+ if ( (fs=fopen(mailfilter_file, "r")) == NULL ) {
+ /* no mailfilter file present */
+ printf("Ouups,_no_mailfilter_file: ");
+ return -200;
+ }
+ }
+ }
+
+snprintf(prog, AUTH_SIZE, "| /usr/bin/env HOME=%s VDOMAINDIR=%s
VUSERDIR=%s VUSER=%s VDOMAIN=%s preline \"%s\" %s", TheDomainDir,
TheDomainDir, vpw->pw_dir, TheUser, TheDomain, MAILDROP, mailfilter_file);
+
+/*to put maildrop in debug mode uncomment theses line
+snprintf(prog, AUTH_SIZE, "| /usr/bin/env HOME=%s VDOMAINDIR=%s
VUSERDIR=%s VUSER=%s VDOMAIN=%s preline \"%s\" %s -V 2", TheDomainDir,
TheDomainDir, vpw->pw_dir, TheUser, TheDomain, MAILDROP, mailfilter_file);
+printf(prog);
+*/
+
+
+ while ((*prog == ' ') || (*prog == '|')) ++prog;
+
+ switch(child = fork())
+ {
+ case -1:
+ printf("Unable to fork: %d.", errno);
+ vexit(EXIT_DEFER);
+ case 0:
+ args[0] = "/bin/sh"; args[1] = "-c"; args[2] = prog; args[3] = 0;
+ sig_catch(SIGPIPE,SIG_DFL);
+ execv(*args,args);
+ printf("Unable to run /bin/sh: %d.", errno);
+ exit(EXIT_DEFER); /* the child's exit code will get caught below */
+ }
+
+ wait(&wstat);
+ waitpid(wstat,&child,0);
+
+ switch(wait_exitcode(wstat))
+ {
+ case 77: return -1; /* Overquota return code of maildrop */
+ case 0: return 0;
+ default: return -2; /* All other case */
+ }
+
+
+}
+
+
--
_________________________________
Jerome MOLLIER-PIERRET
Integrateur Opensource
Tel : +333 20 91 15 17
Fax : +333 20 05 30 09
Division Actinux, GROUPEKPF
http://www.actinux.com
_________________________________
