aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--etrn.c9
2 files changed, 7 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 2f51b734..40f9d14a 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ fetchmail-4.6.9 ():
* Corrected MIME generation of bounce mail.
* Prevent core dumps on 'for' and 'by' in names (bug introduced in 4.6.8).
* Peter Hamlen's fix for bounce-message generation.
+* Silent mode now suppresses progress messages from 2xx responses in ETRN.
There are 247 people on fetchmail-friends and 309 on fetchmail-announce.
diff --git a/etrn.c b/etrn.c
index 74dadc1e..203dc4df 100644
--- a/etrn.c
+++ b/etrn.c
@@ -70,16 +70,19 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id,
switch(atoi(buf))
{
case 250: /* OK, queuing for node <x> started */
- error(0, 0, _("Queuing for %s started"), qnp->id);
+ if (outlevel >= O_SILENT)
+ error(0, 0, _("Queuing for %s started"), qnp->id);
break;
case 251: /* OK, no messages waiting for node <x> */
- error(0, 0, _("No messages waiting for %s"), qnp->id);
+ if (outlevel >= O_SILENT)
+ error(0, 0, _("No messages waiting for %s"), qnp->id);
return(PS_NOMAIL);
case 252: /* OK, pending messages for node <x> started */
case 253: /* OK, <n> pending messages for node <x> started */
- error(0, 0, _("Pending messages for %s started"), qnp->id);
+ if (outlevel >= O_SILENT)
+ error(0, 0, _("Pending messages for %s started"), qnp->id);
break;
case 458: /* Unable to queue messages for node <x> */