Index: conf.c
===================================================================
RCS file: /home/cvs/debian/fetchmail/conf.c,v
retrieving revision 1.1.1.13
retrieving revision 1.2
diff -u -w -r1.1.1.13 -r1.2
--- conf.c	12 Jul 2001 17:53:50 -0000	1.1.1.13
+++ conf.c	21 Mar 2002 15:03:56 -0000	1.2
@@ -311,6 +311,10 @@
 	    stringdump("plugin", ctl->server.plugin);
 	    stringdump("plugout", ctl->server.plugout);
 	    stringdump("principal", ctl->server.principal);
+	    if (ctl->server.esmtp_name)
+	        stringdump("esmtpname",ctl->server.esmtp_name);
+	    if (ctl->server.esmtp_password)
+	        stringdump("esmtppassword",ctl->server.esmtp_password);
 	    booldump("tracepolls", ctl->tracepolls);
 
 	    indent(0);
Index: fetchmailconf
===================================================================
RCS file: /home/cvs/debian/fetchmail/fetchmailconf,v
retrieving revision 1.1.1.25
retrieving revision 1.27
diff -u -w -r1.1.1.25 -r1.27
--- fetchmailconf	10 Mar 2002 20:08:19 -0000	1.1.1.25
+++ fetchmailconf	21 Mar 2002 15:03:56 -0000	1.27
@@ -118,6 +118,8 @@
 	    ('monitor',   'String'),
 	    ('plugin',    'String'),
 	    ('plugout',   'String'),
+            ('esmtpname', 'String'),
+            ('esmtppassword', 'String'),
 	    ('netsec',    'String'),
 	    ('principal', 'String'),
 	    ('tracepolls','Boolean'))
@@ -1189,7 +1191,7 @@
 	for (protocol, port) in (("IMAP",143), ("POP3",110), ("POP2",109)):
 	    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 	    try:
-		sock.connect(realhost, port)
+                sock.connect((realhost, port))
 		greetline = sock.recv(1024)
 		sock.close()
 	    except:
@@ -1379,7 +1381,7 @@
 	    if string.find(greetline, " IMS POP3") > 0:
 		warnings = warnings + """
 Some servers issuing the greeting line 'IMS POP3' have been known to
-do byte-stuffing correctly.  This means that if a message you receive
+do byte-stuffing incorrectly.  This means that if a message you receive
 has a . (period) at start of line, fetchmail will become confused and
 probably wedge itself.  (This bug was recorded on IMS POP3 0.86.)