handle multi-line greeting messages

SCCS-vsn: usr.sbin/sendmail/src/srvrsmtp.c 8.33

diff --git a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
index 545a7b5..d80a505 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
@@ -10,9 +10,9 @@
 
 #ifndef lint
 #ifdef SMTP
 
 #ifndef lint
 #ifdef SMTP

-static char sccsid[] = "@(#)srvrsmtp.c 8.32 (Berkeley) %G% (with SMTP)";
+static char sccsid[] = "@(#)srvrsmtp.c 8.33 (Berkeley) %G% (with SMTP)";

 #else
 #else

-static char sccsid[] = "@(#)srvrsmtp.c 8.32 (Berkeley) %G% (without SMTP)";
+static char sccsid[] = "@(#)srvrsmtp.c 8.33 (Berkeley) %G% (without SMTP)";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -125,13 +125,25 @@ smtp(e)
 
        setproctitle("server %s startup", CurSmtpClient);
        expand("\201e", inp, &inp[sizeof inp], e);
 
        setproctitle("server %s startup", CurSmtpClient);
        expand("\201e", inp, &inp[sizeof inp], e);

+       p = strchr(inp, '\n');
+       if (p != NULL)
+               *p++ = '\0';

        if (BrokenSmtpPeers)
        {
                message("220 %s", inp);
        }
        else
        {
        if (BrokenSmtpPeers)
        {
                message("220 %s", inp);
        }
        else
        {

-               message("220-%s", inp);
+               char *q = inp;
+
+               while (q != NULL)
+               {
+                       message("220-%s", q);
+                       q = p;
+                       p = strchr(p, '\n');
+                       if (p != NULL)
+                               *p++ = '\0';
+               }

                message("220 ESMTP spoken here");
        }
        protocol = NULL;
                message("220 ESMTP spoken here");
        }
        protocol = NULL;