Offer authorization mode with NTLM/MSN added to expert users.

svn path=/trunk/; revision=4344

2 files changed, 18 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index e962dad4..a0374d9b 100644
--- a/NEWS
+++ b/NEWS
@@ -217,15 +217,18 @@ fetchmail 6.3.0 (not yet released officially):
 * fetchmail should now automatically detect if OpenSSL requires -ldl.
   Matthias Andree.
 * Fix Solaris build with --disable-nls (blastwave.org). Matthias Andree.
+* Missed --port/--service/--ssl cleanups in the manual. Reminder from Thomas
+  Wolff. (MA)
+* Complain in POP3 if NTLM/MSN auth is requested but had not been enabled at
+  compile time. This configuration mismatch now causes an error message and
+  authentication failure. Found by Yves Boisjoly.  Matthias Andree
+* fetchmailconf now allows expert users to choose the authorization type and
+  also offers MSN and NTLM, suggested by Yves Boisjoly. Matthias Andree
 
 # INTERNAL CHANGES
 * Switched to automake. Matthias Andree.
 * Got rid of alloca() in fetchmail proper.  Matthias Andree
 * Got rid of ipv6-connect, inner_connect and thereabouts.  Matthias Andree
-* Missed --port/--service/--ssl cleanups. Reminder from Thomas Wolff. (MA)
-* Complain in POP3 if NTLM/MSN auth is requested but had not been enabled at
-  compile time. This configuration mismatch now causes an error message and
-  authentication failure. Found by Yves Boisjoly.  Matthias Andree
 
 fetchmail-6.2.5 (Wed Oct 15 18:39:22 EDT 2003), 23079 lines:
 
diff --git a/fetchmailconf.py b/fetchmailconf.py
index a0b058a3..c18dba84 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.47"
+version = "1.48"
 
 from Tkinter import *
 from Dialog import *
@@ -433,7 +433,8 @@ defaultports = {"auto":None,
 		"ETRN":"smtp",
 		"ODMR":"odmr"}
 
-authlist = ("any", "password", "gssapi", "kerberos", "ssh", "otp")
+authlist = ("any", "password", "gssapi", "kerberos", "ssh", "otp",
+	"msn", "ntlm")
 
 listboxhelp = {
     'title' : 'List Selection Help',
@@ -967,7 +968,12 @@ sechelp = {
     'title' : 'Security option help',
     'banner': 'Security',
     'text' : """
-The `interface' option allows you to specify a range
+The 'authorization mode' allows you to choose the
+mode that fetchmail uses to log in to your server. You
+can usually leave this at 'any', but you will have to pick
+'NTLM' and 'MSN' manually for the nonce.
+
+The 'interface' option allows you to specify a range
 of IP addresses to monitor for activity.  If these
 addresses are not active, fetchmail will not poll.
 Specifying this may protect you from a spoofing attack
@@ -1168,8 +1174,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, 'Authorization mode:',
+			 self.auth, authlist, 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)