add M_FULLSMTP (``X'' flag in .cf file) for eventual implementation

of full SMTP.  This version must support such garbage as line limits,
address length limits, return-path, etc.

SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 3.69
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 3.24
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.107

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index 752b25e..faf3704 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-SCCSID(@(#)readcf.c    3.23.1.1                %G%);
+SCCSID(@(#)readcf.c    3.24            %G%);

 
 /*
 **  READCF -- read control file.
 
 /*
 **  READCF -- read control file.


@@ -429,6 +429,7 @@ struct optlist      OptList[] =
        'U',    M_UGLYUUCP,
        'e',    M_EXPENSIVE,
        'R',    M_RELRCPT,
        'U',    M_UGLYUUCP,
        'e',    M_EXPENSIVE,
        'R',    M_RELRCPT,

+       'X',    M_FULLSMTP,

        '\0',   0
 };
 
        '\0',   0
 };
 

diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index b69b6a2..c374f38 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.68.1.1                %G%";
+static char SmailSccsId[] =    "@(#)sendmail.h 3.69            %G%";

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


@@ -120,6 +120,7 @@ typedef struct mailer       MAILER;
 # define M_FULLNAME    000040000L      /* want Full-Name field */
 # define M_UGLYUUCP    000100000L      /* this wants an ugly UUCP from line */
 # define M_EXPENSIVE   000200000L      /* it costs to use this mailer.... */
 # define M_FULLNAME    000040000L      /* want Full-Name field */
 # define M_UGLYUUCP    000100000L      /* this wants an ugly UUCP from line */
 # define M_EXPENSIVE   000200000L      /* it costs to use this mailer.... */

+# define M_FULLSMTP    000400000L      /* must run full SMTP, inc. limits */

 
 # define M_ARPAFMT     (M_NEEDDATE|M_NEEDFROM|M_MSGID)
 
 
 # define M_ARPAFMT     (M_NEEDDATE|M_NEEDFROM|M_MSGID)
 

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 90d8c3f..1a0236b 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
 # ifndef lint

-static char    SccsId[] = "@(#)SendMail version 3.106 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.107 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.106 [%G%]";
+char   Version[] = "3.107 [%G%]";