redefine $r, $s, and $_ in error envelopes; properly handle

parseaddr return in ESM_POSTMASTER case

SCCS-vsn: usr.sbin/sendmail/src/savemail.c 6.30

diff --git a/usr/src/usr.sbin/sendmail/src/savemail.c b/usr/src/usr.sbin/sendmail/src/savemail.c
index 9eb9ead..69b59d8 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/savemail.c
+++ b/usr/src/usr.sbin/sendmail/src/savemail.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)savemail.c 6.29 (Berkeley) %G%";
+static char sccsid[] = "@(#)savemail.c 6.30 (Berkeley) %G%";

 #endif /* not lint */
 
 # include <pwd.h>
 #endif /* not lint */
 
 # include <pwd.h>


@@ -236,7 +236,8 @@ savemail(e)
                        **  Similar to previous case, but to system postmaster.
                        */
 
                        **  Similar to previous case, but to system postmaster.
                        */
 

-                       if (parseaddr("postmaster", q, 0, '\0', NULL, e) == NULL)
+                       q = parseaddr("postmaster", q, 0, '\0', NULL, e);
+                       if (q == NULL)

                        {
                                syserr("553 cannot parse postmaster!");
                                ExitStat = EX_SOFTWARE;
                        {
                                syserr("553 cannot parse postmaster!");
                                ExitStat = EX_SOFTWARE;


@@ -406,6 +407,9 @@ returntosender(msg, returnq, sendbody, e)
        define('g', e->e_from.q_paddr, e);
        ee = newenvelope(&errenvelope, e);
        define('a', "\201b", ee);
        define('g', e->e_from.q_paddr, e);
        ee = newenvelope(&errenvelope, e);
        define('a', "\201b", ee);

+       define('r', "internal", ee);
+       define('s', "localhost", ee);
+       define('_', "localhost", ee);

        ee->e_puthdr = putheader;
        ee->e_putbody = errbody;
        ee->e_flags |= EF_RESPONSE;
        ee->e_puthdr = putheader;
        ee->e_putbody = errbody;
        ee->e_flags |= EF_RESPONSE;