diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | driver.c | 29 | ||||
| -rw-r--r-- | fetchmail.man | 3 |
3 files changed, 19 insertions, 15 deletions
@@ -17,6 +17,8 @@ fetchmail-4.4.4 (): * Francois Wautier's fix for qvirtual. * Willem Hengeveld's fix for UID initialization. +* Strip out qvirtual prefix *before* doing name mapping (Mike McCallister + <mccallis@netcom.com>) fetchmail-4.4.3 (Sun Apr 19 18:22:00 EDT 1998): * Back out one of the changes to the null Return-Path handling, as it caused @@ -261,25 +261,26 @@ struct idlist **xmit_names; /* list of recipient names parsed out */ int sl; int off = 0; - lname = idpair_find(&ctl->localnames, name); - if (!lname && ctl->wildcard) - lname = name; - - if (lname != (char *)NULL) - { - /* - * If the name of the user begins with a - * qmail virtual domain prefix, remove - * the prefix - */ + /* + * If the name of the user begins with a + * qmail virtual domain prefix, remove + * the prefix + */ if (ctl->server.qvirtual) { sl=strlen(ctl->server.qvirtual); - if (!strncasecmp(lname,ctl->server.qvirtual,sl)) off=sl; + if (!strncasecmp(name,ctl->server.qvirtual,sl)) off=sl; } + + lname = idpair_find(&ctl->localnames, name+off); + if (!lname && ctl->wildcard) + lname = name+off; + + if (lname != (char *)NULL) + { if (outlevel == O_VERBOSE) - error(0, 0, "mapped %s to local %s", name, lname+off); - save_str(xmit_names, lname+off, XMIT_ACCEPT); + error(0, 0, "mapped %s to local %s", name, lname); + save_str(xmit_names, lname, XMIT_ACCEPT); accept_count++; } } diff --git a/fetchmail.man b/fetchmail.man index da9d3e51..122d85d3 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -389,7 +389,8 @@ in the \fI.fetchmailrc\fR file. .B -Q, --qvirtual (Keyword: qvirtual) The string assigned to this option will be removed from the user -name found in the header specified with the \fIenvelope\fR option. +name found in the header specified with the \fIenvelope\fR option +(\fIbefore\fR doing multidrop name mapping, if applicable). This option is useful if you are using .I fetchmail to collect the mail for an entire domain and your ISP (or your mail |