As precised in our last comment, we wanted the delivery from vdelivermail to go through maildrop.

But we wanted to keep the behavior of vdelivermail on all delivering cases (like bouncing, defrals …). This is particularly important on the way that vdelivermail handle quota, and the users notifications.

We also wanted 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, the we would like that vdelivermail deliver the mail as it does naturally.

So we rewritted a patch from scratch, witch is working fine in ours many tests …

Regards,

Here it is :

— 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 ,
* Brian PASSANTE
*
*/

/* include files */
#include
#include
@@ -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 */
}

}

You are right about the QMAIL-EXT option.

This kind of implementation using maildrop for filtering purpose seems to be the cleanest for us in our mind, because we do not have to change .qmail-default behavior in many ways (ie like qmailadmin stuff…). And therefore, using vdelivermail make us sure to do many more check regarding vpopmail, like for sample ‘bouncing over-quota mails over full mailboxes’.

But regarding deeper in the code and testing more your filtering solution… We encountred anothers questions : the big issue we founded is is that .qmail checks are completly bypassed if the mailfilter file is present for the domain.

Do you aggreed with our conclusion ?

Regards,

here is our added patch solution :

— vpopmail-5.4.17/vdelivermail.c 2006-10-20 17:15:13.000000000 0200
vpopmail-5.4.17-patchmaildrop/vdelivermail.c 2006-10-20 17:12:24.000000000 0200
@@ -187,7 187,7 @@
void get_arguments(int argc, char **argv)
{
#ifdef QMAIL_EXT
- int i;
// int i;
#endif
char *tmpstr;

@@ -214,6 214,11 @@

void postprocess(void)
{
#ifdef QMAIL_EXT
int i;
#endif

lowerit(TheUser);
lowerit(TheDomain);