Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 68 → Rev 69

/branches/lenny/debian/changelog
1,4 → 1,4
prayer (1.2.2.1-6) UNRELEASED; urgency=low
prayer (1.2.2.1-6) unstable; urgency=low
 
* prayer.init: Correctly check for the presence of the executables.
* Split out templates to a separate arch-indep package.
5,8 → 5,12
* Change the default value of the tmp_dir option back to
${var_prefix}/tmp (/var/run/prayer/tmp) because using /tmp may not be
secure.
* usernames_with_at.patch (new, from upstream CVS): If a username
contains an @, it will be assumed to be a valid email address and be
used as envelope sender address and default "From" address when
sending mail (Closes: #497016).
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 19 Oct 2008 20:47:13 +0200
-- Magnus Holmgren <holmgren@debian.org> Fri, 31 Oct 2008 18:19:34 +0100
 
prayer (1.2.2.1-5a) unstable; urgency=medium
 
/branches/lenny/debian/patches/usernames_with_at.patch
0,0 → 1,53
--- a/session/draft.c
+++ b/session/draft.c
@@ -1399,10 +1399,12 @@ char *draft_make_msg(struct draft *draft
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, "%s@%s", session->username, default_domain);
+ }
if (draft->from_personal && draft->from_personal[0]) {
from_personal = draft->from_personal;
@@ -1431,9 +1433,14 @@ char *draft_make_msg(struct draft *draft
NIL);
bputs(mb, "" CRLF);
- if (use_sender)
- bprintf(mb, "Sender: %s@%s" CRLF, session->username,
- default_domain);
+ if (use_sender) {
+ if (strchr(session->username, '@')) {
+ bprintf(mb, "Sender: %s" CRLF, session->username);
+ } else {
+ bprintf(mb, "Sender: %s@%s" CRLF, session->username,
+ default_domain);
+ }
+ }
if (!(draft_make_abook_address(session, mb, "To", draft->to) &&
draft_make_abook_address(session, mb, "Cc", draft->cc) &&
--- a/cmd/cmd_prefs.c
+++ b/cmd/cmd_prefs.c
@@ -474,9 +474,12 @@ generate_compose1_form(struct session *s
template_vals_string(tvals, "from_address", prefs->from_address);
if (!(prefs->from_address && prefs->from_address[0])) {
- char *s = pool_printf(request->pool, "%s@%s",
- session->username, prefs->default_domain);
+ char *s = session->username;
+ if (!strchr(session->username, '@')) {
+ s = pool_printf(request->pool, "%s@%s",
+ session->username, prefs->default_domain);
+ }
template_vals_string(tvals, "default_from_address", s);
}
/branches/lenny/debian/patches/series
5,3 → 5,4
templates_fallback_to_compiled.patch
template_find_bug.patch
unlimit_login_username.patch
usernames_with_at.patch