Author: vetinari
Date: Fri May 9 10:41:59 2008
New Revision: 894
Modified:
trunk/plugins/tls
Log:
remove the workaround for -prefork, fixed by rev 893
Modified: trunk/plugins/tls
==============================================================================
--- trunk/plugins/tls (original)
+++ trunk/plugins/tls Fri May 9 10:41:59 2008
@@ -104,10 +104,6 @@
}
}
}
-
- # work-around for failed connections in -prefork after STARTTLS connection:
- $self->register_hook('post-connection', 'prefork_workaround')
- if $qp->isa('Qpsmtpd::SMTP::Prefork');
}
sub hook_ehlo {
@@ -240,17 +236,6 @@
}
*hook_helo = *hook_data = *hook_rcpt = *hook_mail = \&bad_ssl_hook;
-# work-around for failed connections in -prefork after STARTTLS connection:
-sub prefork_workaround {
- my $self = shift;
- # nothing to do on SSL only (SMTPS) and clear text communications
- return (DECLINED) if $self->connection->local_port == 465;
- return (DECLINED) unless $self->connection->notes('tls_enabled');
-
- $self->log(LOGWARN, "Exiting because 'tls_enabled' was true.");
- exit;
-}
-
package UpgradeClientSSL;
# borrowed heavily from Perlbal::SocketSSL
