diff options
Diffstat (limited to 'fetchmailconf')
| -rwxr-xr-x | fetchmailconf | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fetchmailconf b/fetchmailconf index 79d500eb..54e6dfad 100755 --- a/fetchmailconf +++ b/fetchmailconf @@ -4,7 +4,7 @@ # by Eric S. Raymond, <esr@snark.thyrsus.com>. # Requires Python with Tkinter, and the following OS-dependent services: # posix, posixpath, socket -version = "1.15" +version = "1.16" from Tkinter import * from Dialog import * @@ -74,7 +74,7 @@ class Server: self.protocol = 'auto' # Default to auto protocol self.port = 0 # Port number to use self.uidl = FALSE # Don't use RFC1725 UIDLs by default - self.auth = 'password' # Default to password authentication + self.preauth = '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 @@ -96,7 +96,7 @@ class Server: ('protocol', 'String'), ('port', 'Int'), ('uidl', 'Boolean'), - ('auth', 'String'), + ('preauth', 'String'), ('timeout', 'Int'), ('envelope', 'String'), ('envskip', 'Int'), @@ -132,8 +132,8 @@ class Server: str = str + " envelope " + self.envelope if self.qvirtual: str = str + (" qvirtual \"%s\"\n" % (self.qvirtual,)); - if self.auth != ServerDefaults.auth: - str = str + " auth " + self.auth + if self.preauth != ServerDefaults.preauth: + str = str + " preauth " + self.preauth if self.dns != ServerDefaults.dns or self.uidl != ServerDefaults.uidl: str = str + " and options" if self.dns != ServerDefaults.dns: @@ -340,7 +340,7 @@ defaultports = {"auto":0, "IMAP-K4":143, "ETRN":25} -authlist = ("password", "kerberos") +preauthlist = ("password", "kerberos") listboxhelp = { 'title' : 'List Selection Help', @@ -1031,8 +1031,8 @@ class ServerEdit(Frame, MyWidget): secwin = Frame(rightwin, relief=RAISED, bd=5) Label(secwin, text="Security").pack(side=TOP) # Don't actually let users set this. KPOP sets it implicitly - # ButtonBar(secwin, 'Authorization mode:', - # self.auth, authlist, 1, None).pack(side=TOP) + # ButtonBar(secwin, 'Preauthorization mode:', + # self.preauth, preauthlist, 1, None).pack(side=TOP) if os_type == 'linux' or os_type == 'freebsd' or 'interface' in dictmembers: LabeledEntry(secwin, 'IP range to check before poll:', self.interface, leftwidth).pack(side=TOP, fill=X) |