Author: norman
Date: Thu Jan 4 07:46:57 2007
New Revision: 492616
URL: http://svn.apache.org/viewvc?view=rev&rev=492616
Log:
Add ESMTPSA to received header if ESMTP and Auth is used. See JAMES-753
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/core/DataCmdHandler.java
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/core/DataCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/core/DataCmdHandler.java?view=diff&rev=492616&r1=492615&r2=492616
==============================================================================
---
james/server/trunk/src/java/org/apache/james/smtpserver/core/DataCmdHandler.java
(original)
+++
james/server/trunk/src/java/org/apache/james/smtpserver/core/DataCmdHandler.java
Thu Jan 4 07:46:57 2007
@@ -239,7 +239,17 @@
// Check if EHLO was used
if ("EHLO".equals(heloMode)) {
- headerLineBuffer.append("ESMTP");
+
+ // Not succesfull auth
+ if (session.getUser() == null) {
+ headerLineBuffer.append("ESMTP");
+ } else {
+ // See RFC3848
+ // The new keyword "ESMTPA" indicates the use of ESMTP when
the SMTP
+ // AUTH [3] extension is also used and authentication is
successfully
+ // achieved.
+ headerLineBuffer.append("ESMTPA");
+ }
} else {
headerLineBuffer.append("SMTP");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
