summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--alpine/send.c18
-rw-r--r--pith/pine.hlp2
2 files changed, 1 insertions, 19 deletions
diff --git a/alpine/send.c b/alpine/send.c
index 4d988a0c..bc70dadf 100644
--- a/alpine/send.c
+++ b/alpine/send.c
@@ -603,7 +603,6 @@ compose_mail(char *given_to, char *fcc_arg, ACTION_S *role_arg,
int impl, template_len = 0;
long rflags = ROLE_COMPOSE;
PAT_STATE dummy;
- char *hostpart;
/*================= Compose new message ===============*/
body = mail_newbody();
@@ -644,24 +643,7 @@ compose_mail(char *given_to, char *fcc_arg, ACTION_S *role_arg,
q_status_message1(SM_ORDER, 3, 4, _("Composing using role \"%s\""),
role->nick);
- /*
- * set ps_global->hostname to something sensible, if possible,
- * for purposes of generating a message id
- */
- hostpart = cpystr(ps_global->hostname);
- fs_give((void **) &ps_global->hostname);
- if(role && role->from)
- ps_global->hostname = cpystr(role->from->host ? role->from->host : "huh");
- else if(ps_global->maildomain) /* as in generate_from() */
- ps_global->hostname = cpystr(ps_global->maildomain);
- else
- ps_global->hostname = cpystr(hostpart); /* all for nothing */
outgoing->message_id = generate_message_id(role);
- /* undo the changes above */
- fs_give((void **) &ps_global->hostname);
- ps_global->hostname = cpystr(hostpart);
- fs_give((void **) &hostpart);
-
/*
* The type of storage object allocated below is vitally
* important. See SIMPLIFYING ASSUMPTION #37
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 0495b408..fb7ecdc8 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 474 2020-06-29 16:38:45
+Alpine Commit 475 2020-06-29 18:37:01
============= h_news =================
<HTML>
<HEAD>