require an option to do auto-rebuild of alias database; allow new

operation modes to replace old ad hoc flags

SCCS-mr: usr.sbin/sendmail/src/readcf.c 066,, 069
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 3.42

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index ea15177..73f3ede 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.41            %G%);
+SCCSID(@(#)readcf.c    3.42            %G%);

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


@@ -624,7 +624,7 @@ setoption(opt, val, safe, sticky)
                ival = atoi(val);
        else if (index("F", opt) != NULL)
                ival = atooct(val);
                ival = atoi(val);
        else if (index("F", opt) != NULL)
                ival = atooct(val);

-       else if (index("acfimosv", opt) != NULL)
+       else if (index("acDfimosv", opt) != NULL)

                bval = atobool(val);
        else if (index("be", opt) != NULL)
                /* do nothing */ ;
                bval = atobool(val);
        else if (index("be", opt) != NULL)
                /* do nothing */ ;


@@ -670,6 +670,9 @@ setoption(opt, val, safe, sticky)
                  case MD_QUEUE:        /* queue only */
                  case MD_VERIFY:       /* verify only */
                  case MD_TEST:         /* test addresses */
                  case MD_QUEUE:        /* queue only */
                  case MD_VERIFY:       /* verify only */
                  case MD_TEST:         /* test addresses */

+                 case MD_PRINT:        /* print queue contents */
+                 case MD_INITALIAS:    /* initialize alias database */
+                 case MD_FREEZE:       /* freeze config file */

                        break;
 
                  default:
                        break;
 
                  default:


@@ -682,6 +685,10 @@ setoption(opt, val, safe, sticky)
                NoConnect = bval;
                break;
 
                NoConnect = bval;
                break;
 

+         case 'D':             /* rebuild alias database as needed */
+               AutoRebuild = bval;
+               break;
+

          case 'e':             /* set error processing mode */
                switch (*val)
                {
          case 'e':             /* set error processing mode */
                switch (*val)
                {