X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Frouters%2Fredirect.c;h=9be15ede4142336a519f4e9ffb929cd498118f2a;hp=0153a4d499e704c2f041484408e97effa4b64d97;hb=fd6de02e0406522ba0cfff43d6be5b0201200b95;hpb=e4a89c47c2a7d9a9268f36728b4b4f1b028b17b1 diff --git a/src/src/routers/redirect.c b/src/src/routers/redirect.c index 0153a4d49..9be15ede4 100644 --- a/src/src/routers/redirect.c +++ b/src/src/routers/redirect.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/routers/redirect.c,v 1.9 2005/04/06 14:40:24 ph10 Exp $ */ +/* $Cambridge: exim/src/src/routers/redirect.c,v 1.14 2005/09/12 15:09:55 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -112,8 +112,10 @@ optionlist redirect_router_options[] = { (void *)offsetof(redirect_router_options_block, srs_alias) }, { "srs_condition", opt_stringptr, (void *)offsetof(redirect_router_options_block, srs_condition) }, - { "srs_db", opt_stringptr, - (void *)offsetof(redirect_router_options_block, srs_db) }, + { "srs_dbinsert", opt_stringptr, + (void *)offsetof(redirect_router_options_block, srs_dbinsert) }, + { "srs_dbselect", opt_stringptr, + (void *)offsetof(redirect_router_options_block, srs_dbselect) }, #endif { "syntax_errors_text", opt_stringptr, (void *)offsetof(redirect_router_options_block, syntax_errors_text) }, @@ -152,9 +154,10 @@ redirect_router_options_block redirect_router_option_defaults = { NULL, /* owngroups */ #ifdef EXPERIMENTAL_SRS NULL, /* srs */ - NULL, /* srs_condition */ - NULL, /* srs_db */ NULL, /* srs_alias */ + NULL, /* srs_condition */ + NULL, /* srs_dbinsert */ + NULL, /* srs_dbselect */ #endif 022, /* modemask */ RDO_REWRITE, /* bit_options */ @@ -255,7 +258,7 @@ passed on must have the original errors_address value. Arguments: rblock the router control block addr the address being routed - verify true if verifying + verify v_none/v_recipient/v_sender/v_expn addr_prop point to the propagated block, which is where the new values are to be placed @@ -265,7 +268,7 @@ Returns: the result of rf_get_errors_address() or rf_get_munge_headers(), static int sort_errors_and_headers(router_instance *rblock, address_item *addr, - BOOL verify, address_item_propagated *addr_prop) + int verify, address_item_propagated *addr_prop) { int frc = rf_get_errors_address(addr, rblock, verify, &(addr_prop->errors_address)); @@ -496,7 +499,7 @@ int redirect_router_entry( router_instance *rblock, /* data for this instantiation */ address_item *addr, /* address we are working on */ struct passwd *pw, /* passwd entry after check_local_user */ - BOOL verify, /* TRUE when verifying */ + int verify, /* v_none/v_recipient/v_sender/v_expn */ address_item **addr_local, /* add it to this if it's local */ address_item **addr_remote, /* add it to this if it's remote */ address_item **addr_new, /* put new addresses on here */ @@ -529,10 +532,14 @@ addr_prop.errors_address = NULL; addr_prop.extra_headers = NULL; addr_prop.remove_headers = NULL; +#ifdef EXPERIMENTAL_SRS +addr_prop.srs_sender = NULL; +#endif + /* When verifying and testing addresses, the "logwrite" command in filters must be bypassed. */ -if (!verify && !address_test_mode) options |= RDO_REALLOG; +if (verify == v_none && !address_test_mode) options |= RDO_REALLOG; /* Sort out the fixed or dynamic uid/gid. This uid is used (a) for reading the file (and interpreting a filter) and (b) for running the transports for @@ -555,8 +562,8 @@ if (!ugid.gid_set && pw != NULL) } #ifdef EXPERIMENTAL_SRS - /* For reverse SRS, fill the srs_recipient expandsion variable, - on failure, return decline/fail as relevant */ + /* Perform SRS on recipient/return-path as required */ + if(ob->srs != NULL) { BOOL usesrs = TRUE; @@ -565,22 +572,81 @@ if (!ugid.gid_set && pw != NULL) usesrs = expand_check_condition(ob->srs_condition, "srs_condition expansion failed", NULL); if(usesrs) - if(Ustrcmp(ob->srs, "reverse") == 0 || Ustrcmp(ob->srs, "reverseandforward") == 0) + { + int srs_action = 0, n_srs; + uschar *res; + uschar *usedomain; + + /* What are we doing? */ + if(Ustrcmp(ob->srs, "forward") == 0) + srs_action = 1; + else if(Ustrcmp(ob->srs, "reverseandforward") == 0) { - uschar *res; - int n_srs; + srs_action = 3; + + if((ob->srs_dbinsert == NULL) ^ (ob->srs_dbselect == NULL)) + return DEFER; + } + else if(Ustrcmp(ob->srs, "reverse") == 0) + srs_action = 2; + /* Reverse SRS */ + if(srs_action & 2) + { srs_orig_recipient = addr->address; + eximsrs_init(); - if(ob->srs_db) - eximsrs_db_set(TRUE, ob->srs_db); - if((n_srs = eximsrs_reverse(&res, addr->address)) != OK) + if(ob->srs_dbselect) + eximsrs_db_set(TRUE, ob->srs_dbselect); +/* Comment this out for now... +// else +// eximsrs_db_set(TRUE, NULL); +*/ + + if((n_srs = eximsrs_reverse(&res, addr->address)) == OK) + { + srs_recipient = res; + DEBUG(D_any) + debug_printf("SRS (reverse): Recipient '%s' rewritten to '%s'\n", srs_orig_recipient, srs_recipient); + } + + eximsrs_done(); + + if(n_srs != OK) return n_srs; - srs_recipient = res; + } + + /* Forward SRS */ + /* No point in actually performing SRS if we are just verifying a recipient */ + if((srs_action & 1) && verify == v_none && + (sender_address ? sender_address[0] != 0 : FALSE)) + { + + srs_orig_sender = sender_address; + eximsrs_init(); + if(ob->srs_dbinsert) + eximsrs_db_set(FALSE, ob->srs_dbinsert); +/* Comment this out for now... +// else +// eximsrs_db_set(FALSE, NULL); +*/ + + if(ob->srs_alias != NULL ? (usedomain = expand_string(ob->srs_alias)) == NULL : 1) + usedomain = deliver_domain; + + if((n_srs = eximsrs_forward(&res, sender_address, usedomain)) == OK) + { + addr_prop.srs_sender = res; + DEBUG(D_any) + debug_printf("SRS (forward): Sender '%s' rewritten to '%s'\n", srs_orig_sender, res); + } + eximsrs_done(); - DEBUG(D_any) - debug_printf("SRS: Recipient '%s' rewritten to '%s'\n", srs_orig_recipient, srs_recipient); + + if(n_srs != OK) + return n_srs; } + } } #endif @@ -655,8 +721,13 @@ switch (frc) if ((xrc = sort_errors_and_headers(rblock, addr, verify, &addr_prop)) != OK) return xrc; add_generated(rblock, addr_new, addr, generated, &addr_prop, &ugid, pw); - if (addr->message == NULL) addr->message = US"forced rejection"; - else addr->user_message = addr->message; + if (addr->message == NULL) + addr->message = US"forced rejection"; + else + { + addr->user_message = addr->message; + setflag(addr, af_pass_message); + } return FAIL; /* As in the case of a system filter, a freeze does not happen after a manual @@ -731,12 +802,12 @@ dealing with it, the router declines. */ if (eblock != NULL) { if (!moan_skipped_syntax_errors( - rblock->name, /* For message content */ - eblock, /* Ditto */ - (verify || address_test_mode)? - NULL : ob->syntax_errors_to, /* Who to mail */ - generated != NULL, /* True if not all failed */ - ob->syntax_errors_text)) /* Custom message */ + rblock->name, /* For message content */ + eblock, /* Ditto */ + (verify != v_none || address_test_mode)? + NULL : ob->syntax_errors_to, /* Who to mail */ + generated != NULL, /* True if not all failed */ + ob->syntax_errors_text)) /* Custom message */ return DEFER; if (filtertype != FILTER_FORWARD || generated == NULL) @@ -765,7 +836,7 @@ generated anything. Log what happened to this address, and return DISCARD. */ if (frc == FF_DELIVERED) { - if (generated == NULL && !verify && !address_test_mode) + if (generated == NULL && verify == v_none && !address_test_mode) { log_write(0, LOG_MAIN, "=> %s <%s> R=%s", discarded, addr->address, rblock->name); @@ -808,39 +879,6 @@ else (addr_prop.errors_address != NULL)? "\n" : ""); } -#ifdef EXPERIMENTAL_SRS - /* On successful redirection, check for SRS forwarding and adjust sender */ - if(ob->srs != NULL) - { - BOOL usesrs = TRUE; - - if(ob->srs_condition != NULL) - usesrs = expand_check_condition(ob->srs_condition, "srs_condition expansion failed", NULL); - - if(usesrs) - if((Ustrcmp(ob->srs, "forward") == 0 || Ustrcmp(ob->srs, "reverseandforward") == 0) && !verify) - { - uschar *res; - uschar *usedomain; - int n_srs; - - srs_orig_sender = sender_address; - eximsrs_init(); - if(ob->srs_db) - eximsrs_db_set(FALSE, ob->srs_db); - - if(ob->srs_alias != NULL ? (usedomain = expand_string(ob->srs_alias)) == NULL : 1) - usedomain = deliver_domain; - - if((n_srs = eximsrs_forward(&res, sender_address, usedomain)) != OK) - return n_srs; - sender_address = res; - DEBUG(D_any) - debug_printf("SRS: Sender '%s' rewritten to '%s'\n", srs_orig_sender, sender_address); - } - } -#endif - /* Control gets here only when the address has been completely handled. Put the original address onto the succeed queue so that any retry items that get attached to it get processed. */