Permalink
Browse files

Fix a long-standing connect bug, and add a pattern string for mailfront.

  • Loading branch information...
1 parent 3061879 commit 17f7ffd7f69726595b829b91ff1b3890926f3388 @bruceg committed Dec 12, 2001
Showing with 4 additions and 3 deletions.
  1. +4 −3 smtp.py
View
@@ -77,6 +77,7 @@ def docmd(self,cmd,args=""):
(r"ESMTP Service .NPlex ", "NPlex"),
(r"Generic SMTP handler", "Raptor firewall"),
(r"Netscape Mail Server", "Netscape Messaging Server, formerly Netscape Mail Server"),
+ (r"^\S+ mailfront ESMTP", "mailfront"),
(r" SMTP Server SLmail ", "SLmail"),
(r"EMWAC SMTP Receiver", "EMWAC SMTP Receiver"),
(r"GroupWise SMTP.MIME", "GroupWise"),
@@ -135,9 +136,9 @@ def docmd(self,cmd,args=""):
])
def identify(host):
- connection = SMTP()
- resp = connection.connect(host)
- return patterns.match(resp) or \
+ connection = SMTP()
+ (code,resp) = connection.connect(host)
+ return patterns.match(resp) or \
patterns.match(connection.docmd('help')) or \
patterns.match(connection.docmd('xxxx')) or \
patterns.match(connection.docmd('mail from:<nobody@nowhere.net>')) or \

0 comments on commit 17f7ffd

Please sign in to comment.