diff -rc alpine-1.00/alpine/send.c alpine-1.00.fromheader/alpine/send.c *** alpine-1.00/alpine/send.c 2007-12-05 09:50:54.000000000 -0800 --- alpine-1.00.fromheader/alpine/send.c 2008-01-04 20:25:09.000000000 -0800 *************** *** 909,915 **** 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}, {"From : ", "From", h_composer_from, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, ! 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, {"Reply-To: ", "Reply To", h_composer_reply_to, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, --- 909,915 ---- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE}, {"From : ", "From", h_composer_from, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, ! 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, {"Reply-To: ", "Reply To", h_composer_reply_to, 10, 0, NULL, build_address, NULL, NULL, addr_book_compose, "To AddrBk", NULL, abook_nickname_complete, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, KS_TOADDRBOOK}, *************** *** 2300,2305 **** --- 2300,2310 ---- he->rich_header = 0; } } + if (F_ON(F_ALLOW_CHANGING_FROM, ps_global) && + !ps_global->never_allow_changing_from){ + he->display_it = 1; /* show it */ + he->rich_header = 0; + } he_from = he; break; *************** *** 3037,3043 **** if(outgoing->return_path) mail_free_address(&outgoing->return_path); ! outgoing->return_path = rfc822_cpy_adr(outgoing->from); /* * Don't ever believe the sender that is there. --- 3042,3050 ---- if(outgoing->return_path) mail_free_address(&outgoing->return_path); ! outgoing->return_path = F_ON(F_USE_DOMAIN_NAME,ps_global) ! ? rfc822_cpy_adr(generate_from()) ! : rfc822_cpy_adr(outgoing->from); /* * Don't ever believe the sender that is there. diff -rc alpine-1.00/pith/conf.c alpine-1.00.fromheader/pith/conf.c *** alpine-1.00/pith/conf.c 2007-12-13 11:31:13.000000000 -0800 --- alpine-1.00.fromheader/pith/conf.c 2008-01-04 20:25:09.000000000 -0800 *************** *** 2770,2775 **** --- 2770,2777 ---- F_NO_FCC_ATTACH, h_config_no_fcc_attach, PREF_SEND, 0}, {"fcc-on-bounce", "Include Fcc When Bouncing Messages", F_FCC_ON_BOUNCE, h_config_fcc_on_bounce, PREF_SEND, 0}, + {"return-path-uses-domain-name", NULL, + F_USE_DOMAIN_NAME, h_config_use_domain, PREF_SEND, 0}, {"mark-fcc-seen", NULL, F_MARK_FCC_SEEN, h_config_mark_fcc_seen, PREF_SEND, 0}, {"fcc-only-without-confirm", "Send to Fcc Only Without Confirming", diff -rc alpine-1.00/pith/conftype.h alpine-1.00.fromheader/pith/conftype.h *** alpine-1.00/pith/conftype.h 2007-11-07 17:14:02.000000000 -0800 --- alpine-1.00.fromheader/pith/conftype.h 2008-01-04 20:25:09.000000000 -0800 *************** *** 371,376 **** --- 371,377 ---- F_AUTO_REPLY_TO, F_VERBOSE_POST, F_FCC_ON_BOUNCE, + F_USE_DOMAIN_NAME, F_SEND_WO_CONFIRM, F_USE_SENDER_NOT_X, F_BLANK_KEYMENU, diff -rc alpine-1.00/pith/pine.hlp alpine-1.00.fromheader/pith/pine.hlp *** alpine-1.00/pith/pine.hlp 2007-12-20 08:34:31.000000000 -0800 --- alpine-1.00.fromheader/pith/pine.hlp 2008-01-04 20:25:09.000000000 -0800 *************** *** 27387,27392 **** --- 27387,27408 ---- <End of help on this topic> + ====== h_config_use_domain ===== + + + FEATURE:  + + +

FEATURE:

+ + If you enable this configuration option Pine will use your domain name and your + username in that domain name to construct your Return-Path header, if not Pine + will use the address that you have set in the From: field to construct it. + +

+ <End of help on this topic> + + ====== h_config_use_sender_not_x ===== diff -rc alpine-1.00/pith/send.c alpine-1.00.fromheader/pith/send.c *** alpine-1.00/pith/send.c 2007-11-30 17:10:52.000000000 -0800 --- alpine-1.00.fromheader/pith/send.c 2008-01-04 20:25:09.000000000 -0800 *************** *** 51,57 **** /* name::type::canedit::writehdr::localcopy::rcptto */ PINEFIELD pf_template[] = { {"X-Auth-Received", FreeText, 0, 1, 1, 0}, /* N_AUTHRCVD */ ! {"From", Address, 0, 1, 1, 0}, {"Reply-To", Address, 0, 1, 1, 0}, {TONAME, Address, 1, 1, 1, 1}, {CCNAME, Address, 1, 1, 1, 1}, --- 51,57 ---- /* name::type::canedit::writehdr::localcopy::rcptto */ PINEFIELD pf_template[] = { {"X-Auth-Received", FreeText, 0, 1, 1, 0}, /* N_AUTHRCVD */ ! {"From", Address, 1, 1, 1, 0}, {"Reply-To", Address, 0, 1, 1, 0}, {TONAME, Address, 1, 1, 1, 1}, {CCNAME, Address, 1, 1, 1, 1}, *************** *** 1211,1217 **** *p = *(p+4); pf->type = pf_template[i].type; ! pf->canedit = pf_template[i].canedit; pf->rcptto = pf_template[i].rcptto; pf->writehdr = pf_template[i].writehdr; pf->localcopy = pf_template[i].localcopy; --- 1211,1217 ---- *p = *(p+4); pf->type = pf_template[i].type; ! pf->canedit = (i == N_FROM) ? CAN_EDIT(ps_global) : pf_template[i].canedit; pf->rcptto = pf_template[i].rcptto; pf->writehdr = pf_template[i].writehdr; pf->localcopy = pf_template[i].localcopy; diff -rc alpine-1.00/pith/send.h alpine-1.00.fromheader/pith/send.h *** alpine-1.00/pith/send.h 2007-11-30 17:10:52.000000000 -0800 --- alpine-1.00.fromheader/pith/send.h 2008-01-04 20:25:09.000000000 -0800 *************** *** 157,162 **** --- 157,164 ---- unsigned text_written:1; }; + #define CAN_EDIT(x) (!((x)->never_allow_changing_from) && \ + F_ON(F_ALLOW_CHANGING_FROM, (x))) #define TONAME "To" #define CCNAME "cc"