fix non-return of addresses presented on the command line

SCCS-vsn: usr.sbin/sendmail/src/main.c 8.10

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index abe7124..b411fb9 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,7 +13,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     8.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     8.10 (Berkeley) %G%";

 #endif /* not lint */
 
 #define        _DEFINE
 #endif /* not lint */
 
 #define        _DEFINE


@@ -959,6 +959,17 @@ main(argc, argv, envp)
                smtp(CurEnv);
 # endif /* SMTP */
 
                smtp(CurEnv);
 # endif /* SMTP */
 

+       if (OpMode == MD_VERIFY)
+       {
+               CurEnv->e_sendmode = SM_VERIFY;
+               CurEnv->e_errormode = EM_QUIET;
+       }
+       else
+       {
+               /* interactive -- all errors are global */
+               CurEnv->e_flags |= EF_GLOBALERRS;
+       }
+

        /*
        **  Do basic system initialization and set the sender
        */
        /*
        **  Do basic system initialization and set the sender
        */


@@ -978,11 +989,6 @@ main(argc, argv, envp)
                        collect(FALSE, FALSE, CurEnv);
                finis();
        }
                        collect(FALSE, FALSE, CurEnv);
                finis();
        }

-       if (OpMode == MD_VERIFY)
-       {
-               CurEnv->e_sendmode = SM_VERIFY;
-               CurEnv->e_errormode = EM_QUIET;
-       }

 
        /*
        **  Scan argv and deliver the message to everyone.
 
        /*
        **  Scan argv and deliver the message to everyone.