diff options
| author | Nikolaus Schulz <microschulz@web.de> | 2008-03-21 01:05:15 +0000 |
|---|---|---|
| committer | Nikolaus Schulz <microschulz@web.de> | 2008-03-21 01:05:15 +0000 |
| commit | 07219ff14b43eca37a74e5b1d6deb5ff161a528b (patch) | |
| tree | b75ce6ab354a5ca89f8201fc3da88bf7ddf10f16 | |
| parent | 26ab4611ec208add84e3b91948e8720346170de3 (diff) | |
| download | archivemail-07219ff14b43eca37a74e5b1d6deb5ff161a528b.tar.gz archivemail-07219ff14b43eca37a74e5b1d6deb5ff161a528b.tar.bz2 archivemail-07219ff14b43eca37a74e5b1d6deb5ff161a528b.zip | |
IMAP: servers should never advertise LOGINDISABLED with SSL; removed the check
for it, which was just used to spit a special error message anyway.
| -rwxr-xr-x | archivemail.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/archivemail.py b/archivemail.py index 135b497..55c3934 100755 --- a/archivemail.py +++ b/archivemail.py @@ -1361,7 +1361,6 @@ def _archive_imap(mailbox_name, final_archive_name): else: vprint("establishing connection to server %s" % imap_server) imap_srv = imaplib.IMAP4(imap_server) - # What about having an option that makes archivemail never try cram-md5? if "AUTH=CRAM-MD5" in imap_srv.capabilities: vprint("authenticating (cram-md5) to server as %s" % imap_username) result, response = imap_srv.login_cram_md5(imap_username, imap_password) @@ -1369,11 +1368,8 @@ def _archive_imap(mailbox_name, final_archive_name): vprint("logging in to server as %s" % imap_username) result, response = imap_srv.login(imap_username, imap_password) else: - if not is_ssl: - user_error("imap server %s has login disabled (hint: " + user_error("imap server %s has login disabled (hint: " "try ssl/imaps)" % imap_server) - else: # Shouldn't happen - unexpected_error("imap server %s has login disabled!" % imap_server) roflag = options.dry_run or options.copy_old_mail # Work around python bug #1277098 (still pending in python << 2.5) |