diff -ru courier-0.34.1/courier/module.esmtp/esmtp.c courier-0.34.1-rn/courier/module.esmtp/esmtp.c --- courier-0.34.1/courier/module.esmtp/esmtp.c Sun Mar 5 18:23:09 2000 +++ courier-0.34.1-rn/courier/module.esmtp/esmtp.c Tue Jul 3 10:29:23 2001 @@ -127,9 +127,12 @@ /* When called from submit (initial receipt of a message), ** either RELAYCLIENT must be set, or this must be one of our domains. + ** gmessmer: This hurts.... + ** Also relay if the sender is from one of the domains we accept for. */ - if (!getenv("RELAYCLIENT") && !acceptdomain(p->next)) + if (!getenv("RELAYCLIENT") && !acceptdomain(p->next) + && !acceptdomain(info->sender->next->next)) { (*info->err_func)(513, "Relaying denied.", info); return (-1);