16 bit changes -- should have no effect on VAX binaries to

speak of.

SCCS-vsn: usr.sbin/sendmail/src/deliver.c 3.74
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 3.40
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.95
SCCS-vsn: usr.sbin/sendmail/src/main.c 3.72
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 3.22
SCCS-vsn: usr.sbin/sendmail/src/stab.c 3.12

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

-SCCSID(@(#)deliver.c   3.73            %G%);
+SCCSID(@(#)deliver.c   3.74            %G%);

 
 /*
 **  DELIVER -- Deliver a message to a list of addresses.
 
 /*
 **  DELIVER -- Deliver a message to a list of addresses.


@@ -322,11 +322,8 @@ deliver(firstto, editfcn)
                */
 
                /* link together the chain of recipients */
                */
 
                /* link together the chain of recipients */

-               if (!bitset(QDONTSEND, to->q_flags))
-               {
-                       to->q_tchain = tochain;
-                       tochain = to;
-               }
+               to->q_tchain = tochain;
+               tochain = to;

 
                /* create list of users for error messages */
                if (tobuf[0] != '\0')
 
                /* create list of users for error messages */
                if (tobuf[0] != '\0')

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 855c118..50ae793 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -7,7 +7,7 @@
 # include <syslog.h>
 # endif LOG
 
 # include <syslog.h>
 # endif LOG
 

-SCCSID(@(#)main.c      3.71            %G%);
+SCCSID(@(#)main.c      3.72            %G%);

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


@@ -431,7 +431,7 @@ main(argc, argv)
 
                        if (m == NULL)
                                continue;
 
                        if (m == NULL)
                                continue;

-                       printf("mailer %d: %s %s %o %s\n", i, m->m_name,
+                       printf("mailer %d: %s %s %lo %s\n", i, m->m_name,

                               m->m_mailer, m->m_flags, m->m_from);
                }
        }
                               m->m_mailer, m->m_flags, m->m_from);
                }
        }

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index b2dab4f..13baebc 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr/src/usr.sbin/sendmail/src/parseaddr.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-SCCSID(@(#)parseaddr.c 3.39            %G%);
+SCCSID(@(#)parseaddr.c 3.40            %G%);

 
 /*
 **  PARSE -- Parse an address
 
 /*
 **  PARSE -- Parse an address


@@ -507,7 +507,7 @@ rewrite(pvp, ruleset)
                                else
                                        class -= 'a';
                                s = stab(ap, ST_CLASS, ST_FIND);
                                else
                                        class -= 'a';
                                s = stab(ap, ST_CLASS, ST_FIND);

-                               if (s == NULL || (s->s_class & (1 << class)) == 0)
+                               if (s == NULL || (s->s_class & (1L << class)) == 0)

                                        goto fail;
 
                                /* explicit fall-through */
                                        goto fail;
 
                                /* explicit fall-through */

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index 450485d..706a2a9 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.21            %G%);
+SCCSID(@(#)readcf.c    3.22            %G%);

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


@@ -178,7 +178,7 @@ readcf(cfname, safe)
                                if (wd[0] != '\0')
                                {
                                        s = stab(wd, ST_CLASS, ST_ENTER);
                                if (wd[0] != '\0')
                                {
                                        s = stab(wd, ST_CLASS, ST_ENTER);

-                                       s->s_class |= 1 << class;
+                                       s->s_class |= 1L << class;

                                }
                                *p = delim;
                        }
                                }
                                *p = delim;
                        }


@@ -234,7 +234,7 @@ fileclass(class, filename, fmt)
                if (sscanf(buf, fmt, wordbuf) != 1)
                        continue;
                s = stab(wordbuf, ST_CLASS, ST_ENTER);
                if (sscanf(buf, fmt, wordbuf) != 1)
                        continue;
                s = stab(wordbuf, ST_CLASS, ST_ENTER);

-               s->s_class |= 1 << class;
+               s->s_class |= 1L << class;

        }
 
        (void) fclose(f);
        }
 
        (void) fclose(f);


@@ -407,7 +407,7 @@ printrules()
 struct optlist
 {
        char    opt_name;       /* external name of option */
 struct optlist
 {
        char    opt_name;       /* external name of option */

-       int     opt_value;      /* internal name of option */
+       u_long  opt_value;      /* internal name of option */

 };
 struct optlist OptList[] =
 {
 };
 struct optlist OptList[] =
 {

diff --git a/usr/src/usr.sbin/sendmail/src/stab.c b/usr/src/usr.sbin/sendmail/src/stab.c
index 4136163..e53b7f4 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/stab.c
+++ b/usr/src/usr.sbin/sendmail/src/stab.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-SCCSID(@(#)stab.c      3.11            %G%);
+SCCSID(@(#)stab.c      3.12            %G%);

 
 /*
 **  STAB -- manage the symbol table
 
 /*
 **  STAB -- manage the symbol table


@@ -74,7 +74,7 @@ stab(name, type, op)
                        if (s == NULL)
                                printf("not found\n");
                        else
                        if (s == NULL)
                                printf("not found\n");
                        else

-                               printf("type %d val %x\n", s->s_type, s->s_class);
+                               printf("type %d val %lx\n", s->s_type, s->s_class);

                }
 # endif DEBUG
                return (s);
                }
 # endif DEBUG
                return (s);

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index b8409c2..c021e0d 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.94 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.95 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.94 [%G%]";
+char   Version[] = "3.95 [%G%]";