try to synchronize error messages more carefully

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

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index ff8c486..e8fce1d 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -381,12 +381,6 @@ main(argc, argv)
        if (++HopCount > MAXHOP)
                syserr("Infinite forwarding loop (%s->%s)", From.q_paddr, *argv);
 
        if (++HopCount > MAXHOP)
                syserr("Infinite forwarding loop (%s->%s)", From.q_paddr, *argv);
 

-       /* if we have had errors sofar, drop out now */
-       if (Error && ExitStat == EX_OK)
-               ExitStat = EX_USAGE;
-       if (ExitStat != EX_OK)
-               finis();
-

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


@@ -396,6 +390,12 @@ main(argc, argv)
                sendto(*argv, 0);
        }
 
                sendto(*argv, 0);
        }
 

+       /* if we have had errors sofar, drop out now */
+       if (Error && ExitStat == EX_OK)
+               ExitStat = EX_USAGE;
+       if (ExitStat != EX_OK)
+               finis();
+

        /*
        **  See if we have anyone to send to at all.
        */
        /*
        **  See if we have anyone to send to at all.
        */