From: Neal Norwitz <nnorwitz@gmail.com>
Date: Wed, 24 Oct 2007 03:52:50 +0000 (+0000)
Subject: Backport 58618:
X-Git-Tag: v2.5.2c1~152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b2a6dbf60da3caa1bec8d40886f8330dae3da40;p=thirdparty%2FPython%2Fcpython.git

Backport 58618:
Issue 1307 by Derek Shockey, fix the same bug for RCPT.
---

diff --git a/Lib/smtpd.py b/Lib/smtpd.py
index 4aa34763ecff..e09774f2d9bd 100755
--- a/Lib/smtpd.py
+++ b/Lib/smtpd.py
@@ -237,7 +237,7 @@ class SMTPChannel(asynchat.async_chat):
         if not self.__mailfrom:
             self.push('503 Error: need MAIL command')
             return
-        address = self.__getaddr('TO:', arg)
+        address = self.__getaddr('TO:', arg) if arg else None
         if not address:
             self.push('501 Syntax: RCPT TO: <address>')
             return