[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nmh-commits] CVS: nmh/uip spost.c,1.13,1.14
From: |
Glenn Burkhardt <address@hidden> |
Subject: |
[Nmh-commits] CVS: nmh/uip spost.c,1.13,1.14 |
Date: |
Sun, 21 Sep 2003 21:04:07 -0400 |
Update of /cvsroot/nmh/nmh/uip
In directory subversions:/tmp/cvs-serv32219
Modified Files:
spost.c
Log Message:
make 'spost' handling of "masquerade:" line of mts.conf containing
'draft_from' same as for 'post'. Debian bug report 144098, filed by
Terran Melconian.
Index: spost.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/spost.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** spost.c 2 Jul 2002 22:09:15 -0000 1.13
--- spost.c 22 Sep 2003 01:04:04 -0000 1.14
***************
*** 182,185 ****
--- 182,187 ----
extern char *getusername (void);
+ extern boolean draft_from_masquerading; /* defined in mts.c */
+
/*
* static prototypes
***************
*** 579,586 ****
if (!(msgflags & MDAT))
fprintf (out, "Date: %s\n", dtimenow (0));
! if (msgflags & MFRM)
! fprintf (out, "Sender: %s\n", from);
else
fprintf (out, "From: %s\n", signature);
#ifdef notdef
if (!(msgflags & MVIS))
--- 581,597 ----
if (!(msgflags & MDAT))
fprintf (out, "Date: %s\n", dtimenow (0));
!
! if (msgflags & MFRM) {
! /* There was already a From: in the draft. Don't add one. */
! if (!draft_from_masquerading)
! /* mts.conf didn't contain "masquerade:[...]draft_from[...]"
! so we'll reveal the user's actual address@hidden
! address in a Sender: header (and use it as the envelope
! From: later). */
! fprintf (out, "Sender: %s\n", from);
! }
else
fprintf (out, "From: %s\n", signature);
+
#ifdef notdef
if (!(msgflags & MVIS))
***************
*** 592,598 ****
if (!(msgflags & MRDT))
fprintf (out, "Resent-Date: %s\n", dtimenow(0));
! if (msgflags & MRFM)
! fprintf (out, "Resent-Sender: %s\n", from);
else
fprintf (out, "Resent-From: %s\n", signature);
#ifdef notdef
--- 603,617 ----
if (!(msgflags & MRDT))
fprintf (out, "Resent-Date: %s\n", dtimenow(0));
! if (msgflags & MRFM) {
! /* There was already a Resent-From: in draft. Don't add one. */
! if (!draft_from_masquerading)
! /* mts.conf didn't contain "masquerade:[...]draft_from[...]"
! so we'll reveal the user's actual address@hidden
! address in a Sender: header (and use it as the envelope
! From: later). */
! fprintf (out, "Resent-Sender: %s\n", from);
! }
else
+ /* Construct a Resent-From: header. */
fprintf (out, "Resent-From: %s\n", signature);
#ifdef notdef
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Nmh-commits] CVS: nmh/uip spost.c,1.13,1.14,
Glenn Burkhardt <address@hidden> <=