incorporate SMI changes -- still experimental

SCCS-vsn: usr.sbin/sendmail/src/err.c 5.4
SCCS-vsn: usr.sbin/sendmail/src/conf.h 5.3
SCCS-vsn: usr.sbin/sendmail/src/conf.c 5.6
SCCS-vsn: usr.sbin/sendmail/src/main.c 5.6
SCCS-vsn: usr.sbin/sendmail/src/daemon.c 5.9
SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 5.3
SCCS-vsn: usr.sbin/sendmail/src/srvrsmtp.c 5.8
SCCS-vsn: usr.sbin/sendmail/src/stats.c 5.6
SCCS-vsn: usr.sbin/sendmail/src/alias.c 5.4
SCCS-vsn: usr.sbin/sendmail/src/version.c 5.10
SCCS-vsn: usr.sbin/sendmail/src/envelope.c 5.4
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 5.2
SCCS-vsn: usr.sbin/sendmail/src/usersmtp.c 5.5
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 5.4

diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index 2c688f9..05b7ae2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -10,9 +10,9 @@
 
 #ifndef lint
 # ifdef DBM
 
 #ifndef lint
 # ifdef DBM

-static char    SccsId[] = "@(#)alias.c 5.3.1.1 (Berkeley) %G%  (with DBM)";
+static char    SccsId[] = "@(#)alias.c 5.4 (Berkeley) %G%      (with DBM)";

 # else DBM
 # else DBM

-static char    SccsId[] = "@(#)alias.c 5.3.1.1 (Berkeley) %G%  (without DBM)";
+static char    SccsId[] = "@(#)alias.c 5.4 (Berkeley) %G%      (without DBM)";

 # endif DBM
 #endif not lint
 
 # endif DBM
 #endif not lint
 

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 1c93d34..9645782 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)conf.c  5.3.1.1 (Berkeley) %G%";
+static char    SccsId[] = "@(#)conf.c  5.6 (Berkeley) %G%";

 #endif not lint
 
 # include <pwd.h>
 #endif not lint
 
 # include <pwd.h>

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 596d4e1..5ddaad1 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -7,7 +7,7 @@
 **  All rights reserved.  The Berkeley software License Agreement
 **  specifies the terms and conditions for redistribution.
 **
 **  All rights reserved.  The Berkeley software License Agreement
 **  specifies the terms and conditions for redistribution.
 **

-**     @(#)conf.h      5.1.1.1 (Berkeley) %G%
+**     @(#)conf.h      5.3 (Berkeley) %G%

 */
 
 /*
 */
 
 /*

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index 42acec4..4c554f4 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/daemon.c
+++ b/usr/src/usr.sbin/sendmail/src/daemon.c
@@ -15,7 +15,7 @@
 
 # ifndef DAEMON
 # ifndef lint
 
 # ifndef DAEMON
 # ifndef lint

-static char    SccsId[] = "@(#)daemon.c        5.4.1.1 (Berkeley) %G%  (w/o daemon mode)";
+static char    SccsId[] = "@(#)daemon.c        5.9 (Berkeley) %G%      (w/o daemon mode)";

 # endif not lint
 # else
 
 # endif not lint
 # else
 


@@ -26,7 +26,7 @@ static char   SccsId[] = "@(#)daemon.c        5.4.1.1 (Berkeley) %G%  (w/o daemon mode)";
 # include <sys/resource.h>
 
 # ifndef lint
 # include <sys/resource.h>
 
 # ifndef lint

-static char    SccsId[] = "@(#)daemon.c        5.4.1.1 (Berkeley) %G% (with daemon mode)";
+static char    SccsId[] = "@(#)daemon.c        5.9 (Berkeley) %G% (with daemon mode)";

 # endif not lint
 
 /*
 # endif not lint
 
 /*


@@ -121,7 +121,6 @@ getrequests()
          severe:
 # ifdef LOG
                if (LogLevel > 0)
          severe:
 # ifdef LOG
                if (LogLevel > 0)

-                       syslog(LOG_ALERT, "cannot get connection");

 # endif LOG
                finis();
        }
 # endif LOG
                finis();
        }

diff --git a/usr/src/usr.sbin/sendmail/src/envelope.c b/usr/src/usr.sbin/sendmail/src/envelope.c
index a66d41a..aa0d097 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/envelope.c
+++ b/usr/src/usr.sbin/sendmail/src/envelope.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)envelope.c      5.3.1.1 (Berkeley) %G%";
+static char    SccsId[] = "@(#)envelope.c      5.4 (Berkeley) %G%";

 #endif not lint
 
 #include <pwd.h>
 #endif not lint
 
 #include <pwd.h>

diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c
index 87c050a..62ef7ee 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/err.c
+++ b/usr/src/usr.sbin/sendmail/src/err.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)err.c   5.2.1.1 (Berkeley) %G%";
+static char    SccsId[] = "@(#)err.c   5.4 (Berkeley) %G%";

 #endif not lint
 
 # include "sendmail.h"
 #endif not lint
 
 # include "sendmail.h"

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 4805958..536a65f 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -15,7 +15,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char    SccsId[] = "@(#)main.c  5.4.1.1 (Berkeley) %G%";
+static char    SccsId[] = "@(#)main.c  5.6 (Berkeley) %G%";

 #endif not lint
 
 # define  _DEFINE
 #endif not lint
 
 # define  _DEFINE


@@ -209,7 +209,6 @@ main(argc, argv, envp)
 # endif V6
 
 # ifdef LOG
 # endif V6
 
 # ifdef LOG

-       openlog("sendmail", LOG_PID, LOG_MAIL);

 # endif LOG
        errno = 0;
        from = NULL;
 # endif LOG
        errno = 0;
        from = NULL;

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index 97ab383..792e0ff 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr/src/usr.sbin/sendmail/src/parseaddr.c
@@ -10,7 +10,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)parseaddr.c     5.1.1.1 (Berkeley) %G%";
+static char    SccsId[] = "@(#)parseaddr.c     5.2 (Berkeley) %G%";

 #endif not lint
 
 # include "sendmail.h"
 #endif not lint
 
 # include "sendmail.h"

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index beafcef..3a2a77c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)readcf.c        5.3.1.1 (Berkeley) %G%";
+static char    SccsId[] = "@(#)readcf.c        5.4 (Berkeley) %G%";

 #endif not lint
 
 # include "sendmail.h"
 #endif not lint
 
 # include "sendmail.h"

diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index b397ca2..af0a498 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -7,7 +7,7 @@
 **  All rights reserved.  The Berkeley software License Agreement
 **  specifies the terms and conditions for redistribution.
 **
 **  All rights reserved.  The Berkeley software License Agreement
 **  specifies the terms and conditions for redistribution.
 **

-**     @(#)sendmail.h  5.1.1.1 (Berkeley) %G%
+**     @(#)sendmail.h  5.3 (Berkeley) %G%

 */
 
 /*
 */
 
 /*


@@ -19,7 +19,7 @@
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint

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

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

diff --git a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
index 2436ee5..2709908 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
@@ -15,12 +15,12 @@
 
 # ifndef SMTP
 # ifndef lint
 
 # ifndef SMTP
 # ifndef lint

-static char    SccsId[] = "@(#)srvrsmtp.c      5.5.1.1 (Berkeley) %G%  (no SMTP)";
+static char    SccsId[] = "@(#)srvrsmtp.c      5.8 (Berkeley) %G%      (no SMTP)";

 # endif not lint
 # else SMTP
 
 # ifndef lint
 # endif not lint
 # else SMTP
 
 # ifndef lint

-static char    SccsId[] = "@(#)srvrsmtp.c      5.5.1.1 (Berkeley) %G%";
+static char    SccsId[] = "@(#)srvrsmtp.c      5.8 (Berkeley) %G%";

 # endif not lint
 
 /*
 # endif not lint
 
 /*

diff --git a/usr/src/usr.sbin/sendmail/src/stats.c b/usr/src/usr.sbin/sendmail/src/stats.c
index 5ef88cd..6290165 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/stats.c
+++ b/usr/src/usr.sbin/sendmail/src/stats.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)stats.c 5.4.1.1 (Berkeley) %G%";
+static char    SccsId[] = "@(#)stats.c 5.6 (Berkeley) %G%";

 #endif not lint
 
 # include "sendmail.h"
 #endif not lint
 
 # include "sendmail.h"


@@ -42,15 +42,18 @@ markstats(e, to)
 {
        if (to == NULL)
        {
 {
        if (to == NULL)
        {

-               /* if is possible to get mail from an unparseable address,
-                  in this case, the q_mailer field is null, so that the
-                  indirection below causes a dereference of a NULL pointer.
+
+               /*
+               **  If is possible to get mail from an unparseable address,
+               **  in this case, the q_mailer field is null, so that the
+               **  indirection below causes a dereference of a NULL pointer.

                */
                */

+

                if (e->e_from.q_mailer != NULL )
                {
                        Stat.stat_nf[e->e_from.q_mailer->m_mno]++;
                        Stat.stat_bf[e->e_from.q_mailer->m_mno] +=
                if (e->e_from.q_mailer != NULL )
                {
                        Stat.stat_nf[e->e_from.q_mailer->m_mno]++;
                        Stat.stat_bf[e->e_from.q_mailer->m_mno] +=

-                               kbytes(CurEnv->e_msgsize);
+                               KBYTES(CurEnv->e_msgsize);

                }
        }
        else
                }
        }
        else

diff --git a/usr/src/usr.sbin/sendmail/src/usersmtp.c b/usr/src/usr.sbin/sendmail/src/usersmtp.c
index f2a8fe3..e4c688d 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/usersmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/usersmtp.c
@@ -16,12 +16,12 @@
 
 # ifndef SMTP
 # ifndef lint
 
 # ifndef SMTP
 # ifndef lint

-static char    SccsId[] = "@(#)usersmtp.c      5.3.1.1 (Berkeley) %G%  (no SMTP)";
+static char    SccsId[] = "@(#)usersmtp.c      5.5 (Berkeley) %G%      (no SMTP)";

 # endif not lint
 # else SMTP
 
 # ifndef lint
 # endif not lint
 # else SMTP
 
 # ifndef lint

-static char    SccsId[] = "@(#)usersmtp.c      5.3.1.1 (Berkeley) %G%";
+static char    SccsId[] = "@(#)usersmtp.c      5.5 (Berkeley) %G%";

 # endif not lint
 
 
 # endif not lint
 
 

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 8c8bc82..b9fe2d2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)version.c       5.9 (Berkeley) %G%";
+static char    SccsId[] = "@(#)version.c       5.10 (Berkeley) %G%";

 #endif not lint
 
 #endif not lint
 

-char   Version[] = "5.9";
+char   Version[] = "5.10";