diff options
| author |   gilles <gilles@openbsd.org> | 2014-11-02 21:46:03 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2014-11-02 21:46:03 +0000 |
| commit | 5512b4d52067a5e9d0754fabf9630c73fe904be0 (patch) | |
| tree | fda52fac542a223759af82f8bcf2004b190444af | |
| parent | rework domain append by locating either the brackets or the last component (diff) | |
| download | wireguard-openbsd-5512b4d52067a5e9d0754fabf9630c73fe904be0.tar.xz wireguard-openbsd-5512b4d52067a5e9d0754fabf9630c73fe904be0.zip | |
increment s->datalen counter in append domain code to correctly account for
the data we wrote
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index abdaab0e19c..389942bdda7 100644 --- a/usr.sbin/smtpd/smtp_session.c +++ b/usr.sbin/smtpd/smtp_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp_session.c,v 1.219 2014/11/02 21:13:32 gilles Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.220 2014/11/02 21:46:03 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -406,6 +406,7 @@ header_masquerade_callback(const struct rfc2822_header *hdr, void *arg) if (skip) { if (fprintf(s->ofile, "%c", l->buffer[i]) != (int)1) goto ioerror; + s->datalen += 1; } else { buffer[j++] = l->buffer[i]; @@ -413,6 +414,7 @@ header_masquerade_callback(const struct rfc2822_header *hdr, void *arg) len = strlen(buffer); if (fprintf(s->ofile, "%s", buffer) != (int)len) goto ioerror; + s->datalen += len; skip = 1; j = 0; memset(buffer, 0, sizeof buffer); @@ -423,6 +425,7 @@ header_masquerade_callback(const struct rfc2822_header *hdr, void *arg) if (skip) { if (fprintf(s->ofile, "\n") != (int)1) goto ioerror; + s->datalen += 1; } else { buffer[j++] = '\n'; @@ -430,6 +433,7 @@ header_masquerade_callback(const struct rfc2822_header *hdr, void *arg) len = strlen(buffer); if (fprintf(s->ofile, "%s", buffer) != (int)len) goto ioerror; + s->datalen += len; skip = 1; j = 0; memset(buffer, 0, sizeof buffer); @@ -444,6 +448,7 @@ header_masquerade_callback(const struct rfc2822_header *hdr, void *arg) len = strlen(buffer); if (fprintf(s->ofile, "%s", buffer) != (int)len) goto ioerror; + s->datalen += len; } return; |