From 647234d78a9f9788f86d5f44a281f38b8f8c8571 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Mon, 18 Jul 2005 10:11:23 +0000 Subject: Make tracepolls a server option, as documented. Fixes Debian bug #156094. svn path=/trunk/; revision=4121 --- fetchmail.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fetchmail.c') diff --git a/fetchmail.c b/fetchmail.c index 5f5fc854..6079f4ff 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -866,6 +866,7 @@ static void optmerge(struct query *h2, struct query *h1, int force) FLAG_MERGE(server.plugin); FLAG_MERGE(server.plugout); + FLAG_MERGE(server.tracepolls); FLAG_MERGE(wildcard); FLAG_MERGE(remotename); @@ -906,7 +907,6 @@ static void optmerge(struct query *h2, struct query *h1, int force) #endif FLAG_MERGE(expunge); - FLAG_MERGE(tracepolls); FLAG_MERGE(properties); #undef FLAG_MERGE } @@ -1877,7 +1877,7 @@ static void dump_params (struct runctl *runp, } } - if (ctl->tracepolls) + if (ctl->server.tracepolls) printf(GT_(" Poll trace information will be added to the Received header.\n")); else if (outlevel >= O_VERBOSE) printf(GT_(" No poll trace information will be added to the Received header.\n.\n")); -- cgit v1.2.3