mirror
/
archivemail
mirror of https://git.code.sf.net/p/archivemail/code
1
0
Fork 0
Code Issues Releases Wiki Activity

IMAP: servers should never advertise LOGINDISABLED with SSL; removed the check 

for it, which was just used to spit a special error message anyway.
This commit is contained in:
Nikolaus Schulz 2008-03-21 01:05:15 +00:00
parent 26ab4611ec
commit 07219ff14b
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archivemail.py
View File

@ -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)