Upstream has a fix:
On Sun, 14 Sep 2008 09:48:19 +0100 (BST)
David Carter <[EMAIL PROTECTED]> wrote:
> > So it looks like you have a fix, which I will continue to run with,
> > and will let you know if I see any further complications.
>
> Good. Those two changes have already been committed.
The patches he committed were:
[from.patch text/x-diff (1.4KB)]
Index: session/draft.c
===================================================================
RCS file: /data/ucvs/hermes/src/prayer/session/draft.c,v
retrieving revision 1.2.18.2
diff -u -d -r1.2.18.2 draft.c
--- session/draft.c 1 Sep 2008 09:17:49 -0000 1.2.18.2
+++ session/draft.c 1 Sep 2008 09:19:02 -0000
@@ -1399,10 +1399,12 @@
if (draft->from_address && draft->from_address[0]) {
from_address = draft->from_address;
use_sender = T;
- } else
- from_address
- =
+ } else if (strchr(session->username, '@')) {
+ from_address = pool_strdup(pool, session->username);
+ } else {
+ from_address =
pool_printf(pool, "[EMAIL PROTECTED]", session->username,
default_domain);
+ }
if (draft->from_personal && draft->from_personal[0]) {
from_personal = draft->from_personal;
@@ -1431,9 +1433,14 @@
NIL);
bputs(mb, "" CRLF);
- if (use_sender)
- bprintf(mb, "Sender: [EMAIL PROTECTED]" CRLF, session->username,
- default_domain);
+ if (use_sender) {
+ if (strchr(session->username, '@')) {
+ bprintf(mb, "Sender: %s" CRLF, session->username);
+ } else {
+ bprintf(mb, "Sender: [EMAIL PROTECTED]" CRLF, session->username,
+ default_domain);
+ }
+ }
if (!(draft_make_abook_address(session, mb, "To", draft->to) &&
draft_make_abook_address(session, mb, "Cc", draft->cc) &&
[prefs.patch text/x-diff (896B)]
Index: cmd/cmd_prefs.c
===================================================================
RCS file: /data/ucvs/hermes/src/prayer/cmd/cmd_prefs.c,v
retrieving revision 1.2.18.3
diff -u -d -r1.2.18.3 cmd_prefs.c
--- cmd/cmd_prefs.c 28 Aug 2008 12:22:28 -0000 1.2.18.3
+++ cmd/cmd_prefs.c 2 Sep 2008 08:36:27 -0000
@@ -488,9 +488,12 @@
template_vals_string(tvals, "from_address", prefs->from_address);
if (!(prefs->from_address && prefs->from_address[0])) {
- char *s = pool_printf(request->pool, "[EMAIL PROTECTED]",
- session->username,
prefs->default_domain);
+ char *s = session->username;
+ if (!strchr(session->username, '@')) {
+ s = pool_printf(request->pool, "[EMAIL PROTECTED]",
+ session->username, prefs->default_domain);
+ }
template_vals_string(tvals, "default_from_address", s);
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
