From 647234d78a9f9788f86d5f44a281f38b8f8c8571 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
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
---
 NEWS        | 4 ++++
 conf.c      | 2 +-
 fetchmail.c | 4 ++--
 fetchmail.h | 4 ++--
 options.c   | 6 +++---
 rcfile_y.y  | 8 ++++----
 transact.c  | 2 +-
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/NEWS b/NEWS
index 9a2fe188..fbacf44a 100644
--- a/NEWS
+++ b/NEWS
@@ -110,6 +110,10 @@ fetchmail 6.3.0 (not yet released officially):
 * Major fetchmail(1) manual page overhaul by R. Hannes Beinert, to
   clarify singledrop vs. multidrop operation. (MA)
 
+since -pre4:
+* Make tracepolls a server option, as documented. Fixes Debian bug
+  #156094. Matthias Andree.
+
 fetchmail-6.2.5 (Wed Oct 15 18:39:22 EDT 2003), 23079 lines:
 
 * Updated Spanish, Turkish, and German translation files.
diff --git a/conf.c b/conf.c
index 240d9e40..3b0cc486 100644
--- a/conf.c
+++ b/conf.c
@@ -317,7 +317,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
 	        stringdump("esmtpname",ctl->server.esmtp_name);
 	    if (ctl->server.esmtp_password)
 	        stringdump("esmtppassword",ctl->server.esmtp_password);
-	    booldump("tracepolls", ctl->tracepolls);
+	    booldump("tracepolls", ctl->server.tracepolls);
 
 	    indent(0);
 	    fputs("'users': ", stdout);
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"));
diff --git a/fetchmail.h b/fetchmail.h
index 337b8607..03b1aa2d 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -251,7 +251,8 @@ struct hostdata		/* shared among all user connections to given server */
 #ifdef SDPS_ENABLE
     flag sdps;				/* use Demon Internet SDPS *ENV */
 #endif /* SDPS_ENABLE */
-    flag checkalias;                  	/* resolve aliases by comparing IPs? */
+    flag checkalias;			/* resolve aliases by comparing IPs? */
+    flag tracepolls;			/* if TRUE, add poll trace info to Received */
     char *principal;			/* Kerberos principal for mail service */
     char *esmtp_name, *esmtp_password;	/* ESMTP AUTH information */
 
@@ -328,7 +329,6 @@ struct query
     flag sslcertck;		/* Strictly check the server cert. */
     char *sslfingerprint;	/* Fingerprint to check against */
     char *properties;		/* passthrough properties for extensions */
-    flag tracepolls;		/* if TRUE, add poll trace info to Received */
 
     /* internal use -- per-poll state */
     flag active;		/* should we actually poll this server? */
diff --git a/options.c b/options.c
index 390a0866..d49e1690 100644
--- a/options.c
+++ b/options.c
@@ -643,9 +643,9 @@ struct query *ctl;	/* option record to be initialized */
 	    rctl->use_syslog = FLAG_FALSE;
 	    break;
 
-        case LA_TRACEPOLLS:
-            ctl->tracepolls = FLAG_TRUE;
-            break;
+	case LA_TRACEPOLLS:
+	    ctl->server.tracepolls = FLAG_TRUE;
+	    break;
 
 	case '?':
 	case LA_HELP:
diff --git a/rcfile_y.y b/rcfile_y.y
index e11a3687..8ce862dc 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -155,7 +155,7 @@ serv_option	: AKA alias_list
 #ifdef KERBEROS_V5
 						current.server.authenticate = A_KERBEROS_V5;
 #else
-		    				current.server.authenticate = A_KERBEROS_V4;
+						current.server.authenticate = A_KERBEROS_V4;
 #endif /* KERBEROS_V5 */
 #ifdef INET6_ENABLE
 					    current.server.service = KPOP_PORT;
@@ -218,7 +218,7 @@ serv_option	: AKA alias_list
 					    void *request;
 					    int requestlen;
 
-		    			    if (net_security_strtorequest($2, &request, &requestlen))
+					    if (net_security_strtorequest($2, &request, &requestlen))
 						yyerror(GT_("invalid security request"));
 					    else {
 						current.server.netsec = xstrdup($2);
@@ -247,8 +247,8 @@ serv_option	: AKA alias_list
 		| DNS			{current.server.dns = FLAG_TRUE;}
 		| NO DNS		{current.server.dns = FLAG_FALSE;}
 		| NO ENVELOPE		{current.server.envelope = STRING_DISABLED;}
-		| TRACEPOLLS		{current.tracepolls = FLAG_TRUE;}
-		| NO TRACEPOLLS		{current.tracepolls = FLAG_FALSE;}
+		| TRACEPOLLS		{current.server.tracepolls = FLAG_TRUE;}
+		| NO TRACEPOLLS		{current.server.tracepolls = FLAG_FALSE;}
 		;
 
 userspecs	: user1opts		{record_current(); user_reset();}
diff --git a/transact.c b/transact.c
index 85cf0f38..a757538c 100644
--- a/transact.c
+++ b/transact.c
@@ -1146,7 +1146,7 @@ int readheaders(int sock,
 		    fetchmailhost,
 		    protocol->name,
 		    VERSION);
-	    if (ctl->tracepolls)
+	    if (ctl->server.tracepolls)
 	    {
 		snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 			" polling %s account %s",
-- 
cgit v1.2.3