[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sendmail
Subject:    Re: Patch: PrivacyOptions=noactualrecipient: no X-Actual-Recipient
From:       Dan Harkless <usenet () harkless ! org>
Date:       2004-09-30 22:28:20
Message-ID: 104930233837.~INN-REAa00150.comp-news () dl ! ac ! uk
[Download RAW message or body]

I, Dan Harkless <usenet@harkless.org> wrote:
> [[If this is the second copy of this you're seeing to
> comp.mail.sendmail, can you let me know?  It appears my NNTP server is
> not propagating articles.  Unfortunately Google Groups is going to
> destructively wrap some lines in the patch below...]]

Heard back from Claus from my sendmail-bugs CC and he says the new
privacy option won't be going in until 8.14 (unless possibly as an FFR
in 8.13.2).  Therefore for people wanting the feature in the meantime,
it would be nice if I could successfully post a copy of the patch that
isn't mangled by destructive line-wrapping.  ;^>  Trying again with a
new NNTP server -- the intact patch should appear below my sig.

--
Dan Harkless
usenet@harkless.org
http://harkless.org/dan/


diff -ur sendmail-8.13.1/RELEASE_NOTES sendmail-8.13.1+patches/RELEASE_NOTES
--- sendmail-8.13.1/RELEASE_NOTES       2004-07-30 11:03:07.000000000 -0700
+++ sendmail-8.13.1+patches/RELEASE_NOTES       2004-09-28 18:39:53.000000000 -0700
@@ -6,6 +6,11 @@
  of the sendmail configuration files, the date of release, and a
  summary of the changes in that release.

+8.13.2/8.13.2  2004/09/28
+       PrivacyOptions=noactualrecipient stops sendmail from putting
+               X-Actual-Recipient lines in DSNs revealing the actual
+               account that addresses map to.  Patch from Dan Harkless.
+
  8.13.1/8.13.1  2004/07/30
         Using the default AliasFile ldap: specification would cause the
                 objectClasses of the LDAP response to be included in the
diff -ur sendmail-8.13.1/doc/op/op.me sendmail-8.13.1+patches/doc/op/op.me
--- sendmail-8.13.1/doc/op/op.me        2004-06-03 11:29:01.000000000 -0700
+++ sendmail-8.13.1+patches/doc/op/op.me        2004-09-28 18:28:21.000000000 -0700
@@ -7531,7 +7531,7 @@
  .i opt ions
  can be selected from:
  .(b
-.ta \w'needvrfyhelo'u+3n
+.ta \w'noactualrecipient'u+1n
  public Allow open access
  needmailhelo   Insist on HELO or EHLO command before MAIL
  needexpnhelo   Insist on HELO or EHLO command before EXPN
@@ -7544,6 +7544,7 @@
  restrictqrun   Restrict \-q command line flag
  restrictexpand Restrict \-bv and \-v command line flags
  noreceipts     Don't return success DSNs\**
+noactualrecipient      Don't include X-Actual-Recipient in DSNs
  nobodyreturn   Don't return the body of a message with DSNs
  goaway Disallow essentially all SMTP status queries
  authwarnings   Put X-Authentication-Warning: headers in messages
@@ -7564,6 +7565,7 @@
  .q restrictqrun ,
  .q restrictexpand ,
  .q noetrn ,
+.q noactualrecipient ,
  and
  .q nobodyreturn .
  If mailq is restricted,
diff -ur sendmail-8.13.1/sendmail/conf.c sendmail-8.13.1+patches/sendmail/conf.c
--- sendmail-8.13.1/sendmail/conf.c     2004-07-14 14:54:23.000000000 -0700
+++ sendmail-8.13.1+patches/sendmail/conf.c     2004-09-28 18:12:27.000000000 -0700
@@ -144,6 +144,7 @@
         { "noreceipts",         PRIV_NORECEIPTS         },
         { "nobodyreturn",       PRIV_NOBODYRETN         },
         { "goaway",             PRIV_GOAWAY             },
+       { "noactualrecipient",  PRIV_NOACTUALRECIPIENT  },
         { NULL,                 0                       }
  };

diff -ur sendmail-8.13.1/sendmail/savemail.c sendmail-8.13.1+patches/sendmail/savemail.c
--- sendmail-8.13.1/sendmail/savemail.c 2004-01-13 18:56:51.000000000 -0800
+++ sendmail-8.13.1+patches/sendmail/savemail.c 2004-09-28 18:24:52.000000000 -0700
@@ -1182,6 +1182,7 @@
                         /* X-Actual-Recipient: -- the real problem address */
                         if (actual[0] != '\0' &&
                             q->q_finalrcpt != NULL &&
+                           !bitset(PRIV_NOACTUALRECIPIENT, PrivacyFlags) &&
                             strcmp(actual, q->q_finalrcpt) != 0)
                         {
                                 (void) sm_snprintf(buf, sizeof buf,
diff -ur sendmail-8.13.1/sendmail/sendmail.h sendmail-8.13.1+patches/sendmail/sendmail.h
--- sendmail-8.13.1/sendmail/sendmail.h 2004-07-14 14:54:22.000000000 -0700
+++ sendmail-8.13.1+patches/sendmail/sendmail.h 2004-09-28 18:33:24.000000000 -0700
@@ -1601,8 +1601,9 @@
  #define PRIV_NOETRN            0x00080000      /* disallow ETRN command */
  #define PRIV_NOBODYRETN                0x00100000      /* do not return bodies on bounces */
  #define PRIV_NORECEIPTS                0x00200000      /* disallow return receipts */
+#define PRIV_NOACTUALRECIPIENT 0x00400000      /* no X-Actual-Recipient in DSNs */

-/* don't give no info, anyway, anyhow */
+/* don't give no info, anyway, anyhow (in the main SMTP transaction, anyway) */
  #define PRIV_GOAWAY            0x0000ffff

  /* struct defining such things */


[prev in list] [next in list] [prev in thread] [next in thread]