add test mode (MD_TEST, -bt)

SCCS-vsn: usr.sbin/sendmail/src/main.c 3.119
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 3.58
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.209
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 3.36

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index d7be0ec..4047d57 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -6,7 +6,7 @@
 # include "sendmail.h"
 # include <sys/stat.h>
 
 # include "sendmail.h"
 # include <sys/stat.h>
 

-SCCSID(@(#)main.c      3.118           %G%);
+SCCSID(@(#)main.c      3.119           %G%);

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

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index 74fc443..345aabd 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.57            %G%);
+SCCSID(@(#)parseaddr.c 3.58            %G%);

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


@@ -450,13 +450,11 @@ rewrite(pvp, ruleset)
        char *npvp[MAXATOM+1];          /* temporary space for rebuild */
        extern bool sameword();
 
        char *npvp[MAXATOM+1];          /* temporary space for rebuild */
        extern bool sameword();
 

-# ifdef DEBUG
-       if (tTd(21, 2))
+       if (Mode == MD_TEST || tTd(21, 2))

        {
                printf("rewrite: ruleset %d, original pvp:", ruleset);
                printav(pvp);
        }
        {
                printf("rewrite: ruleset %d, original pvp:", ruleset);
                printav(pvp);
        }

-# endif DEBUG

 
        /*
        **  Run through the list of rewrite rules, applying
 
        /*
        **  Run through the list of rewrite rules, applying


@@ -684,13 +682,11 @@ rewrite(pvp, ruleset)
                }
        }
 
                }
        }
 

-# ifdef DEBUG
-       if (tTd(21, 2))
+       if (Mode == MD_TEST || tTd(21, 2))

        {
                printf("rewrite: ruleset %d returns:", ruleset);
                printav(pvp);
        }
        {
                printf("rewrite: ruleset %d returns:", ruleset);
                printav(pvp);
        }

-# endif DEBUG

 }
 \f/*
 **  BUILDADDR -- build address from token vector.
 }
 \f/*
 **  BUILDADDR -- build address from token vector.

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index 72cfc26..383e6c4 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.35            %G%);
+SCCSID(@(#)readcf.c    3.36            %G%);

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


@@ -617,6 +617,7 @@ setoption(opt, val, safe, sticky)
                  case MD_FORK:         /* fork after verification */
                  case MD_QUEUE:        /* queue only */
                  case MD_VERIFY:       /* verify only */
                  case MD_FORK:         /* fork after verification */
                  case MD_QUEUE:        /* queue only */
                  case MD_VERIFY:       /* verify only */

+                 case MD_TEST:         /* test addresses */

                        break;
 
                  default:
                        break;
 
                  default:

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

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.208 [%G%]";
+char   Version[] = "3.209 [%G%]";