From 48edecb8654348e5de7e5c35de3da60bc2553123 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 6 May 1998 12:59:02 +0000 Subject: Mike McAllister sent a fix for qvirtual. svn path=/trunk/; revision=1758 --- driver.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'driver.c') diff --git a/driver.c b/driver.c index fe8bec8a..9c1db97d 100644 --- a/driver.c +++ b/driver.c @@ -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++; } } -- cgit v1.2.3