some cleanup for short syslog buffers

SCCS-vsn: usr.sbin/sendmail/src/deliver.c 8.62
SCCS-vsn: usr.sbin/sendmail/src/headers.c 8.21

diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index 41406aa..dfd311c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)deliver.c  8.61 (Berkeley) %G%";
+static char sccsid[] = "@(#)deliver.c  8.62 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "sendmail.h"
 #endif /* not lint */
 
 #include "sendmail.h"


@@ -1875,7 +1875,7 @@ logdelivery(m, mci, stat, ctladdr, e)
 
 #  else                /* we have a very short log buffer size */
 
 
 #  else                /* we have a very short log buffer size */
 

-       l = SYSLOG_BUFSIZE - 40;
+       l = SYSLOG_BUFSIZE - 80;

        p = e->e_to;
        while (strlen(p) >= l)
        {
        p = e->e_to;
        while (strlen(p) >= l)
        {


@@ -1904,11 +1904,15 @@ logdelivery(m, mci, stat, ctladdr, e)
                }
                syslog(LOG_INFO, "%s: %s", e->e_id, buf);
        }
                }
                syslog(LOG_INFO, "%s: %s", e->e_id, buf);
        }

-       syslog(LOG_INFO, "%s: delay=%s",
-               e->e_id, pintvl(curtime() - e->e_ctime, TRUE));
+       bp = buf;
+       sprintf(bp, "delay=%s", pintvl(curtime() - e->e_ctime, TRUE));
+       bp += strlen(bp);

 
        if (m != NULL)
 
        if (m != NULL)

-               syslog(LOG_INFO, "%s: mailer=%s", e->e_id, m->m_name);
+       {
+               sprintf(bp, ", mailer=%s", m->m_name);
+               bp += strlen(bp);
+       }

 
        if (mci != NULL && mci->mci_host != NULL)
        {
 
        if (mci != NULL && mci->mci_host != NULL)
        {


@@ -1916,22 +1920,22 @@ logdelivery(m, mci, stat, ctladdr, e)
                extern SOCKADDR CurHostAddr;
 # endif
 
                extern SOCKADDR CurHostAddr;
 # endif
 

-               (void) strcpy(buf, mci->mci_host);
+               sprintf(bp, ", relay=%s", mci->mci_host);

 
 # ifdef DAEMON
 
 # ifdef DAEMON

-               (void) strcat(buf, " (");
-               (void) strcat(buf, anynet_ntoa(&CurHostAddr));
-               (void) strcat(buf, ")");
+               (void) strcat(bp, " (");
+               (void) strcat(bp, anynet_ntoa(&CurHostAddr));
+               (void) strcat(bp, ")");

 # endif
 # endif

-               syslog(LOG_INFO, "%s: relay=%s", e->e_id, buf);

        }
        else
        {
                char *p = macvalue('h', e);
 
                if (p != NULL && p[0] != '\0')
        }
        else
        {
                char *p = macvalue('h', e);
 
                if (p != NULL && p[0] != '\0')

-                       syslog(LOG_INFO, "%s: relay=%s", e->e_id, p);
+                       sprintf(bp, ", relay=%s", p);

        }
        }

+       syslog(LOG_INFO, "%s: %s", e->e_id, buf);

 
        syslog(LOG_INFO, "%s: stat=%s", e->e_id, shortenstring(stat, 63));
 #  endif /* short log buffer */
 
        syslog(LOG_INFO, "%s: stat=%s", e->e_id, shortenstring(stat, 63));
 #  endif /* short log buffer */

diff --git a/usr/src/usr.sbin/sendmail/src/headers.c b/usr/src/usr.sbin/sendmail/src/headers.c
index 8995894..f312df9 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/headers.c
+++ b/usr/src/usr.sbin/sendmail/src/headers.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)headers.c  8.20 (Berkeley) %G%";
+static char sccsid[] = "@(#)headers.c  8.21 (Berkeley) %G%";

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


@@ -536,12 +536,21 @@ logsender(e, msgid)
                e->e_msgpriority, e->e_nrcpts);
        if (msgid != NULL)
                syslog(LOG_INFO, "%s: msgid=%s", e->e_id, msgid);
                e->e_msgpriority, e->e_nrcpts);
        if (msgid != NULL)
                syslog(LOG_INFO, "%s: msgid=%s", e->e_id, msgid);

+       sbp = sbuf;
+       sprintf(sbp, "%s:", e->e_id);
+       sbp += strlen(sbp);

        if (e->e_bodytype != NULL)
        if (e->e_bodytype != NULL)

-               syslog(LOG_INFO, "%s: bodytype=%s", e->e_id, e->e_bodytype);
+       {
+               sprintf(sbp, " bodytype=%s,", e->e_bodytype);
+               sbp += strlen(sbp);
+       }

        p = macvalue('r', e);
        if (p != NULL)
        p = macvalue('r', e);
        if (p != NULL)

-               syslog(LOG_INFO, "%s: proto=%s", e->e_id, p);
-       syslog(LOG_INFO, "%s: relay=%s", e->e_id, name);
+       {
+               sprintf(sbp, " proto=%s,", e->e_id, p);
+               sbp += strlen(sbp);
+       }
+       syslog(LOG_INFO, "%s relay=%s", sbuf, name);

 #  endif
 }
 \f/*
 #  endif
 }
 \f/*