delete H_DELETE -- can be simulated with H_ACHECK

SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 3.34
SCCS-vsn: usr.sbin/sendmail/src/deliver.c 3.31
SCCS-vsn: usr.sbin/sendmail/src/conf.c 3.24

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index b42263f..e2f0225 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -32,7 +32,7 @@
 
 
 
 
 
 

-static char SccsId[] = "@(#)conf.c     3.23    %G%";
+static char SccsId[] = "@(#)conf.c     3.24    %G%";

 
 
 # include <whoami.h>           /* definitions of machine id's at berkeley */
 
 
 # include <whoami.h>           /* definitions of machine id's at berkeley */


@@ -52,12 +52,12 @@ struct hdrinfo      HdrInfo[] =
 {
        "date",                 H_CHECK,                M_NEEDDATE,
        "from",                 H_CHECK,                M_NEEDFROM,
 {
        "date",                 H_CHECK,                M_NEEDDATE,
        "from",                 H_CHECK,                M_NEEDFROM,

-       "original-from",        H_DELETE,               0,              /* internal */
+       "original-from",        H_ACHECK,               0,              /* internal */

        "sender",               0,                      0,
        "full-name",            H_ACHECK,               M_FULLNAME,
        "to",                   H_ADDR|H_FORCE,         0,
        "cc",                   H_ADDR|H_FORCE,         0,
        "sender",               0,                      0,
        "full-name",            H_ACHECK,               M_FULLNAME,
        "to",                   H_ADDR|H_FORCE,         0,
        "cc",                   H_ADDR|H_FORCE,         0,

-       "bcc",                  H_ADDR|H_DELETE|H_FORCE,0,
+       "bcc",                  H_ADDR|H_ACHECK|H_FORCE,0,

        "message-id",           H_CHECK,                M_MSGID,
        "message",              H_EOH,                  0,
        "text",                 H_EOH,                  0,
        "message-id",           H_CHECK,                M_MSGID,
        "message",              H_EOH,                  0,
        "text",                 H_EOH,                  0,

diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index 2d2f9c1..e02f392 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.c
@@ -5,7 +5,7 @@
 # include <syslog.h>
 # endif LOG
 
 # include <syslog.h>
 # endif LOG
 

-static char SccsId[] = "@(#)deliver.c  3.30    %G%";
+static char SccsId[] = "@(#)deliver.c  3.31    %G%";

 
 /*
 **  DELIVER -- Deliver a message to a particular address.
 
 /*
 **  DELIVER -- Deliver a message to a particular address.


@@ -553,8 +553,6 @@ putmessage(fp, m)
        /* output all header lines */
        for (h = Header; h != NULL; h = h->h_link)
        {
        /* output all header lines */
        for (h = Header; h != NULL; h = h->h_link)
        {

-               if (bitset(H_DELETE, h->h_flags))
-                       continue;

                if (bitset(H_CHECK|H_ACHECK, h->h_flags) && !bitset(h->h_mflags, m->m_flags))
                {
                        p = ")><(";             /* can't happen (I hope) */
                if (bitset(H_CHECK|H_ACHECK, h->h_flags) && !bitset(h->h_mflags, m->m_flags))
                {
                        p = ")><(";             /* can't happen (I hope) */

diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index 3f9b824..5c0dbac 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -1,7 +1,7 @@
 /*
 **  SENDMAIL.H -- Global definitions for sendmail.
 **
 /*
 **  SENDMAIL.H -- Global definitions for sendmail.
 **

-**     @(#)sendmail.h  3.33    %G%
+**     @(#)sendmail.h  3.34    %G%

 */
 
 
 */
 
 


@@ -158,7 +158,6 @@ extern struct hdrinfo       HdrInfo[];
 
 /* bits for h_flags and hi_flags */
 # define H_EOH         00001   /* this field terminates header */
 
 /* bits for h_flags and hi_flags */
 # define H_EOH         00001   /* this field terminates header */

-# define H_DELETE      00002   /* don't send this field */

 # define H_DEFAULT     00004   /* if another value is found, drop this */
 # define H_USED                00010   /* indicates that this has been output */
 # define H_CHECK       00020   /* check h_mflags against m_flags */
 # define H_DEFAULT     00004   /* if another value is found, drop this */
 # define H_USED                00010   /* indicates that this has been output */
 # define H_CHECK       00020   /* check h_mflags against m_flags */