aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>1997-01-30 21:21:52 +0000
committerEric S. Raymond <esr@thyrsus.com>1997-01-30 21:21:52 +0000
commitf9b111e07d568304c3f5e725e96107e47fb93d9c (patch)
tree50ad1bde70fa0544e43c2ef125c2f3b3aa50d9f3
parent40b787d54603222746e7d1f503d4d602dc6f9bfb (diff)
downloadfetchmail-f9b111e07d568304c3f5e725e96107e47fb93d9c.tar.gz
fetchmail-f9b111e07d568304c3f5e725e96107e47fb93d9c.tar.bz2
fetchmail-f9b111e07d568304c3f5e725e96107e47fb93d9c.zip
Don't grab a received_for twice.
svn path=/trunk/; revision=845
-rw-r--r--driver.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/driver.c b/driver.c
index fe8a0d70..6c901df0 100644
--- a/driver.c
+++ b/driver.c
@@ -520,7 +520,7 @@ char *realname; /* real name of host */
ctt_offs = (bufp - headers);
#ifdef HAVE_RES_SEARCH
- else if (MULTIDROP(ctl) && !strncasecmp("Received:", bufp, 9))
+ else if (MULTIDROP(ctl) && !received_for && !strncasecmp("Received:", bufp, 9))
received_for = parse_received(ctl, bufp);
#endif /* HAVE_RES_SEARCH */
}
@@ -1465,11 +1465,14 @@ va_dcl
if (outlevel == O_VERBOSE)
{
- char *cp;
+ if (shroud)
+ {
+ char *cp;
- if (shroud && (cp = strstr(buf, shroud)))
- memset(cp, '*', strlen(shroud));
- buf[strlen(buf)-1] = '\0';
+ if ((cp = strstr(buf, shroud)))
+ memset(cp, '*', strlen(shroud));
+ buf[strlen(buf)-1] = '\0';
+ }
error(0, 0, "%s> %s", protocol->name, buf);
}
}