From 7c298626dfbc38ccf49649e86c2eedce1bc8bc18 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sat, 12 Feb 2000 16:47:39 +0000 Subject: Fix for fetchmailconf. svn path=/trunk/; revision=2744 --- NEWS | 1 + fetchmailconf | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index efea1ae6..2b00b395 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ * Attempted fix for Joop Susan's ENOTCONN bug. * Fix for NO response during SIZE fetches for M$ Exchange IMAP server. * Thomas Zajic sent a change that copes with GMX X-UIDLs. +* Fix fetchmailconf's handling of ssl attributes when SSL is not configured. fetchmail-5.2.7 (Sun Feb 6 20:45:41 EST 2000), 18517 lines: * Updated FAQ. diff --git a/fetchmailconf b/fetchmailconf index 9d820309..245a6170 100755 --- a/fetchmailconf +++ b/fetchmailconf @@ -302,11 +302,11 @@ class User: res = res + " fetchlimit " + `self.fetchlimit` if self.batchlimit != UserDefaults.batchlimit: res = res + " batchlimit " + `self.batchlimit` - if self.ssl != UserDefaults.ssl: + if self.ssl and self.ssl != UserDefaults.ssl: res = res + flag2str(self.ssl, 'ssl') - if self.sslkey != UserDefaults.sslkey: + if self.sslkey and self.sslkey != UserDefaults.sslkey: res = res + " sslkey " + `self.sslkey` - if self.sslcert != UserDefaults.sslcert: + if self.sslcert and self.sslcert != UserDefaults.sslcert: res = res + " ssl " + `self.sslcert` if self.expunge != UserDefaults.expunge: res = res + " expunge " + `self.expunge` -- cgit v1.2.3