X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fetchmailconf.py;h=2dc02d875995b088dd49e2e84a89ae434e085074;hb=da989f7b8294e342572ec5f27f1a6f3f2b1fe56f;hp=8c6decab79e8eed33254cbb841a0a0332320a745;hpb=3948bb44ff30ebda9837480c42de7f0d384e4cb9;p=~andy%2Ffetchmail

diff --git a/fetchmailconf.py b/fetchmailconf.py
index 8c6decab..2dc02d87 100755
--- a/fetchmailconf.py
+++ b/fetchmailconf.py
@@ -5,7 +5,7 @@
 # Matthias Andree <matthias.andree@gmx.de>
 # Requires Python with Tkinter, and the following OS-dependent services:
 #	posix, posixpath, socket
-version = "1.54 $Revision$"
+version = "1.57"
 
 from Tkinter import *
 from Dialog import *
@@ -22,6 +22,7 @@ class Configuration:
 	self.postmaster = None		# No last-resort address, initially
 	self.bouncemail = TRUE		# Bounce errors to users
 	self.spambounce = FALSE		# Bounce spam errors
+	self.softbounce = TRUE		# Treat permanent error as temporary
 	self.properties = None		# No exiguous properties
 	self.invisible = FALSE		# Suppress Received line & spoof?
 	self.syslog = FALSE		# Use syslogd for logging?
@@ -33,6 +34,7 @@ class Configuration:
 	    ('postmaster',	'String'),
 	    ('bouncemail',	'Boolean'),
 	    ('spambounce',	'Boolean'),
+	    ('softbounce',	'Boolean'),
 	    ('properties',	'String'),
 	    ('syslog',	  'Boolean'),
 	    ('invisible',	'Boolean'))
@@ -55,10 +57,16 @@ class Configuration:
 	    str = str + ("set spambounce\n")
 	else:
 	    str = str + ("set no spambounce\n")
+	if self.softbounce:
+	    str = str + ("set softbounce\n")
+	else:
+	    str = str + ("set no softbounce\n")
 	if self.properties != ConfigurationDefaults.properties:
 	    str = str + ("set properties \"%s\"\n" % (self.properties,));
 	if self.poll_interval > 0:
 	    str = str + "set daemon " + `self.poll_interval` + "\n"
+	if self.invisible:
+	   str = str + ("set invisible\n")
 	for site in self.servers:
 	    str = str + repr(site)
 	return str
@@ -97,6 +105,7 @@ class Server:
 	self.esmtpname = None		# ESMTP 2554 name
 	self.esmtppassword = None	# ESMTP 2554 password
 	self.tracepolls = FALSE		# Add trace-poll info to headers
+	self.badheader = FALSE		# Pass messages with bad headers on?
 	self.users = []			# List of user entries for site
 	Server.typemap = (
 	    ('pollname',  'String'),
@@ -121,7 +130,8 @@ class Server:
 	    ('esmtpname', 'String'),
 	    ('esmtppassword', 'String'),
 	    ('principal', 'String'),
-	    ('tracepolls','Boolean'))
+	    ('tracepolls','Boolean'),
+	    ('badheader', 'Boolean'))
 
     def dump(self, folded):
 	res = ""
@@ -191,6 +201,8 @@ class Server:
 	if self.interface or self.monitor or self.principal or self.plugin or self.plugout:
 	    if folded:
 		res = res + "\n"
+	if self.badheader:
+		res = res + "bad-header accept "
 
 	if res[-1] == " ": res = res[0:-1]
 
@@ -723,6 +735,14 @@ Send spam bounces?
 	postmaster (depending on the "Bounces to sender?" option.  Otherwise,
 	spam bounces are not sent (the default).
 
+Use soft bounces?
+	If this option is on, permanent delivery errors are treated as
+	temporary, i. e. mail is kept on the upstream server. Useful
+	during testing and after configuration changes, and on by
+	default.
+	  If this option is off, permanent delivery errors delete
+	undeliverable mail from the upstream.
+
 Invisible
 	If false (the default) fetchmail generates a Received line into
 	each message and generates a HELO from the machine it is running on.
@@ -813,11 +833,18 @@ class ConfigurationEdit(Frame, MyWidget):
 
 	    sb = Frame(gf)
 	    Checkbutton(sb,
-		{'text':'send spam bounces?',
+		{'text':'Send spam bounces?',
 		'variable':self.spambounce,
 		'relief':GROOVE}).pack(side=LEFT, anchor=W)
 	    sb.pack(fill=X)
 
+	    sb = Frame(gf)
+	    Checkbutton(sb,
+		{'text':'Treat permanent errors as temporary?',
+		'variable':self.softbounce,
+		'relief':GROOVE}).pack(side=LEFT, anchor=W)
+	    sb.pack(fill=X)
+
 	    sf = Frame(gf)
 	    Checkbutton(sf,
 		{'text':'Log to syslog?',
@@ -1108,6 +1135,8 @@ class ServerEdit(Frame, MyWidget):
 	    ctlwin = Frame(leftwin, relief=RAISED, bd=5)
 	    Label(ctlwin, text="Run Controls").pack(side=TOP)
 	    Checkbutton(ctlwin, text='Poll ' + host + ' normally?', variable=self.active).pack(side=TOP)
+	    Checkbutton(ctlwin, text='Pass messages with bad headers?',
+		    variable=self.badheader).pack(side=TOP)
 	    LabeledEntry(ctlwin, 'True name of ' + host + ':',
 		      self.via, leftwidth).pack(side=TOP, fill=X)
 	    LabeledEntry(ctlwin, 'Cycles to skip between polls:',
@@ -1668,9 +1697,9 @@ class UserEdit(Frame, MyWidget):
 	    Label(targwin, text="Domains to fetch from (ODMR/ETRN only)").pack(side=TOP)
 	    ListEdit("Domains:",
 		     self.user.fetchdomains, None, None, targwin, None)
-	    LabeledEntry(targwin, 'Append to MAIL FROM line:',
+	    LabeledEntry(targwin, 'Use domain on RCPT TO line:',
 		     self.smtpaddress, '26').pack(side=TOP, fill=X)
-	    LabeledEntry(targwin, 'Set RCPT To address:',
+	    LabeledEntry(targwin, 'Set fixed RCPT TO address:',
 		     self.smtpname, '26').pack(side=TOP, fill=X)
 	    LabeledEntry(targwin, 'Connection setup command:',
 		     self.preconnect, '26').pack(side=TOP, fill=X)
@@ -2064,10 +2093,10 @@ Usage: fetchmailconf {[-d] [-f fetchmailrc]|-h|--help|-V|--version}
 	    print "fetchmailconf %s" % version
 	    print """
 Copyright (C) 1997 - 2003 Eric S. Raymond
-Copyright (C) 2005 - 2006 Matthias Andree
+Copyright (C) 2005, 2006, 2008, 2009 Matthias Andree
 fetchmailconf comes with ABSOLUTELY NO WARRANTY.  This is free software, you are
 welcome to redistribute it under certain conditions.  Please see the file
-COPYING in the source or documentation directory for details.  """
+COPYING in the source or documentation directory for details."""
 	    sys.exit(0)
 
     # Get client host's FQDN