don't flag errors in setting dangerous options when -C is used

SCCS-mr: usr.sbin/sendmail/src/version.c 063
SCCS-mr: usr.sbin/sendmail/src/readcf.c 063
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.239
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 3.41

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

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


@@ -718,9 +718,8 @@ setoption(opt, val, safe, sticky)
                break;
 
          case 'g':             /* default gid */
                break;
 
          case 'g':             /* default gid */

-               if (!safe)
-                       goto syntax;
-               DefGid = ival;
+               if (safe)
+                       DefGid = ival;

                break;
 
          case 'H':             /* help file */
                break;
 
          case 'H':             /* help file */


@@ -784,9 +783,8 @@ setoption(opt, val, safe, sticky)
                break;
 
          case 'u':             /* set default uid */
                break;
 
          case 'u':             /* set default uid */

-               if (!safe)
-                       goto syntax;
-               DefUid = ival;
+               if (safe)
+                       DefUid = ival;

                break;
 
          case 'v':             /* run in verbose mode */
                break;
 
          case 'v':             /* run in verbose mode */


@@ -797,9 +795,8 @@ setoption(opt, val, safe, sticky)
 
 # ifdef DEBUG
          case 'W':             /* set the wizards password */
 
 # ifdef DEBUG
          case 'W':             /* set the wizards password */

-               if (!safe)
-                       goto syntax;
-               WizWord = val;
+               if (safe)
+                       WizWord = val;

                break;
 # endif DEBUG
 
                break;
 # endif DEBUG
 

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

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.238 [%G%]";
+char   Version[] = "3.239 [%G%]";