diff options
Diffstat (limited to 'lang/python26/patches/patch-aw')
-rw-r--r-- | lang/python26/patches/patch-aw | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/lang/python26/patches/patch-aw b/lang/python26/patches/patch-aw deleted file mode 100644 index c3b5f7203ab..00000000000 --- a/lang/python26/patches/patch-aw +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2010/11/17 18:44:07 tez Exp $ - -Fix for SA41968 (CVE-2010-3493) from the 2.7 branch repo -http://svn.python.org/view/python/branches/release27-maint/Lib/smtpd.py?r1=86084&r2=82503&view=patch - ---- Lib/smtpd2.6.py.orig 2010-06-30 12:41:25.000000000 -0500 -+++ Lib/smtpd2.6.py 2010-11-17 12:19:14.825489100 -0600 -@@ -121,7 +121,15 @@ - self.__rcpttos = [] - self.__data = '' - self.__fqdn = socket.getfqdn() -- self.__peer = conn.getpeername() -+ try: -+ self.__peer = conn.getpeername() -+ except socket.error, err: -+ # a race condition may occur if the other end is closing -+ # before we can get the peername -+ self.close() -+ if err[0] != errno.ENOTCONN: -+ raise -+ return - print >> DEBUGSTREAM, 'Peer:', repr(self.__peer) - self.push('220 %s %s' % (self.__fqdn, __version__)) - self.set_terminator('\r\n') -@@ -291,9 +299,11 @@ - localaddr, remoteaddr) - - def handle_accept(self): -- conn, addr = self.accept() -- print >> DEBUGSTREAM, 'Incoming connection from %s' % repr(addr) -- channel = SMTPChannel(self, conn, addr) -+ pair = self.accept() -+ if pair is not None: -+ conn, addr = pair -+ print >> DEBUGSTREAM, 'Incoming connection from %s' % repr(addr) -+ channel = SMTPChannel(self, conn, addr) - - # API for "doing something useful with the message" - def process_message(self, peer, mailfrom, rcpttos, data): |