Change mailer spec to have labelled fields for future expansion.

**** This delta invalidates previous configuration files ****

SCCS-mr: usr.sbin/sendmail/src/main.c 152
SCCS-mr: usr.sbin/sendmail/src/sendmail.h 152
SCCS-vsn: usr.sbin/sendmail/src/main.c 3.151
SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 3.111

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 1f42ddd..7601a91 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -4,7 +4,7 @@
 # include "sendmail.h"
 # include <sys/file.h>
 
 # include "sendmail.h"
 # include <sys/file.h>
 

-SCCSID(@(#)main.c      3.150           %G%);
+SCCSID(@(#)main.c      3.151           %G%);

 
 /*
 **  SENDMAIL -- Post mail to a set of destinations.
 
 /*
 **  SENDMAIL -- Post mail to a set of destinations.


@@ -387,8 +387,11 @@ main(argc, argv)
 
                        if (m == NULL)
                                continue;
 
                        if (m == NULL)
                                continue;

-                       printf("mailer %d: %s %s %lo %d %d\n", i, m->m_name,
-                              m->m_mailer, m->m_flags, m->m_s_rwset, m->m_r_rwset);
+                       printf("mailer %d (%s): P=%s F=%lo S=%d R=%d E=", i,
+                              m->m_name, m->m_mailer, m->m_flags, m->m_s_rwset,
+                              m->m_r_rwset);
+                       xputs(m->m_eol);
+                       printf("\n");

                }
        }
 # endif DEBUG
                }
        }
 # endif DEBUG

diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index e7cc0bb..6e1c0e2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -7,7 +7,7 @@
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint

-static char SmailSccsId[] =    "@(#)sendmail.h 3.110           %G%";
+static char SmailSccsId[] =    "@(#)sendmail.h 3.111           %G%";

 # endif lint
 # else  _DEFINE
 # define EXTERN extern
 # endif lint
 # else  _DEFINE
 # define EXTERN extern


@@ -87,6 +87,7 @@ struct mailer
        char    **m_argv;       /* template argument vector */
        short   m_s_rwset;      /* rewriting set for sender addresses */
        short   m_r_rwset;      /* rewriting set for recipient addresses */
        char    **m_argv;       /* template argument vector */
        short   m_s_rwset;      /* rewriting set for sender addresses */
        short   m_r_rwset;      /* rewriting set for recipient addresses */

+       char    *m_eol;         /* end of line string */

 };
 
 typedef struct mailer  MAILER;
 };
 
 typedef struct mailer  MAILER;


@@ -111,7 +112,6 @@ typedef struct mailer       MAILER;
 # define M_EXPENSIVE   000200000L      /* it costs to use this mailer.... */
 # define M_LIMITS      000400000L      /* must enforce SMTP line limits */
 # define M_INTERNAL    001000000L      /* SMTP to another sendmail site */
 # define M_EXPENSIVE   000200000L      /* it costs to use this mailer.... */
 # define M_LIMITS      000400000L      /* must enforce SMTP line limits */
 # define M_INTERNAL    001000000L      /* SMTP to another sendmail site */

-# define M_CRLF                002000000L      /* use CRLF instead of NL as EOLine */

 # define M_FROMPATH    004000000L      /* use reverse-path in MAIL FROM: */
 # define M_XDOT                010000000L      /* use hidden-dot algorithm */
 
 # define M_FROMPATH    004000000L      /* use reverse-path in MAIL FROM: */
 # define M_XDOT                010000000L      /* use hidden-dot algorithm */
 


@@ -450,9 +450,6 @@ EXTERN u_char       tTdvect[100];
 /* set exit status */
 # define setstat(s)            { if (ExitStat == EX_OK) ExitStat = s; }
 
 /* set exit status */
 # define setstat(s)            { if (ExitStat == EX_OK) ExitStat = s; }
 

-/* line terminator appropriate for a given mailer */
-# define crlf(m)               (bitset(M_CRLF, (m)->m_flags) ? "\r\n" : "\n")
-

 /* make a copy of a string */
 # define newstr(s)             strcpy(xalloc(strlen(s) + 1), s)
 
 /* make a copy of a string */
 # define newstr(s)             strcpy(xalloc(strlen(s) + 1), s)