aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>1998-05-24 01:43:56 +0000
committerEric S. Raymond <esr@thyrsus.com>1998-05-24 01:43:56 +0000
commitec686b63ab58193bf59cba0bd5a5cba51809eb7c (patch)
treea7c483d7d55f5d236a6adf49736922efe8c1f795
parent9692eaf89d7829cd01b8d0777f2bdc8e4d66cf97 (diff)
downloadfetchmail-ec686b63ab58193bf59cba0bd5a5cba51809eb7c.tar.gz
fetchmail-ec686b63ab58193bf59cba0bd5a5cba51809eb7c.tar.bz2
fetchmail-ec686b63ab58193bf59cba0bd5a5cba51809eb7c.zip
Added envskip query.
svn path=/trunk/; revision=1817
-rwxr-xr-xfetchmailconf11
1 files changed, 9 insertions, 2 deletions
diff --git a/fetchmailconf b/fetchmailconf
index a30d247b..984f3e7e 100755
--- a/fetchmailconf
+++ b/fetchmailconf
@@ -45,6 +45,7 @@ class Server:
self.auth = 'password' # Default to password authentication
self.timeout = 300 # 5-minute timeout
self.envelope = 'Received' # Envelope-address header
+ self.envskip = 0 # Number of envelope headers to skip
self.qvirtual = '' # Name prefix to strip
self.aka = [] # List of DNS aka names
self.dns = TRUE # Enable DNS lookup on multidrop
@@ -64,6 +65,7 @@ class Server:
('auth', 'String'),
('timeout', 'Int'),
('envelope', 'String'),
+ ('envskip', 'Int'),
('qvirtual', 'String'),
# leave aka out
('dns', 'Boolean'),
@@ -86,8 +88,11 @@ class Server:
str = str + " timeout " + `self.timeout`
if self.interval != ServerDefaults.interval:
str = str + " interval " + `self.interval`
- if self.envelope != ServerDefaults.envelope:
- str = str + " envelope " + self.envelope
+ if self.envelope != ServerDefaults.envelope or self.envskip != ServerDefaults.envskip:
+ if self.envskip:
+ str = str + " envelope " + self.envskip + " " + self.envelope
+ else:
+ str = str + " envelope " + self.envelope
if self.qvirtual != ServerDefaults.qvirtual:
str = str + " qvirtual " + self.qvirtual
if self.auth != ServerDefaults.auth:
@@ -720,6 +725,8 @@ class ServerEdit(Frame):
Label(mdropwin, text="Multidrop options").pack(side=TOP)
LabeledEntry(mdropwin, 'Envelope address header:',
self.envelope, '22').pack(side=TOP, fill=X)
+ LabeledEntry(mdropwin, 'Envelope headers to skip:',
+ self.envskip, '22').pack(side=TOP, fill=X)
LabeledEntry(mdropwin, 'Name prefix to strip:',
self.qvirtual, '22').pack(side=TOP, fill=X)
Checkbutton(mdropwin, text="Enable multidrop DNS lookup?",