On Fri, Jan 05, 2007 at 10:00:08PM -0800, Robert Spier wrote:
> Anyway,
> applied (with tweaks to make it more RFC3848 compliant) in r703.
One additional minor tweak, so that it's possible to end up with ESMTPSA
for the case when both authentication and TLS are present (also defined in
rfc3848).
-mct
--- lib/Qpsmtpd/SMTP.pm.old 2007-01-06 01:57:54.000000000 -0500
+++ lib/Qpsmtpd/SMTP.pm 2007-01-06 01:59:32.000000000 -0500
@@ -663,12 +663,12 @@
if (defined $self->connection->notes('tls_enabled')
and $self->connection->notes('tls_enabled')) {
- $smtp eq "ESMTP" and $smtp .= "S"; # RFC3848
+ $smtp =~ /^ESMTP/ and $smtp .= "S"; # RFC3848
$sslheader = "(".$self->connection->notes('tls_socket')->get_cipher()."
encrypted) ";
}
if (defined $self->{_auth} and $self->{_auth} == OK) {
- $smtp eq "ESMTP" and $smtp .= "A"; # RFC3848
+ $smtp =~ /^ESMTP/ and $smtp .= "A"; # RFC3848
$authheader = "(smtp-auth username $self->{_auth_user}, mechanism
$self->{_auth_mechanism})\n";
}
