Author: bago
Date: Mon Apr 10 02:53:06 2006
New Revision: 392912
URL: http://svn.apache.org/viewcvs?rev=392912&view=rev
Log:
Use 452 instead of 571 when we reach rcptcount limit (JAMES-468)
Patch by Norman Maurer. Added default sleeptime = 5000 (to avoid infinite wait
as default)
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/RcptCmdHandler.java
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/RcptCmdHandler.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/smtpserver/RcptCmdHandler.java?rev=392912&r1=392911&r2=392912&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/RcptCmdHandler.java
(original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/RcptCmdHandler.java
Mon Apr 10 02:53:06 2006
@@ -41,7 +41,7 @@
private final static String RCPTCOUNT = "RCPT_COUNT";
private int maxRcpt = 0;
private int tarpitRcptCount = 0;
- private long tarpitSleepTime = 0;
+ private long tarpitSleepTime = 5000;
/**
* @see
org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
@@ -259,7 +259,7 @@
// check if the max recipients has reached
if (rcptCount > maxRcpt) {
maxRcptReached = true;
- responseString = "550
"+DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SECURITY_AUTH)+" Requested
action not taken: max recipients reached";
+ responseString = "452
"+DSNStatus.getStatus(DSNStatus.NETWORK,DSNStatus.DELIVERY_TOO_MANY_REC)+"
Requested action not taken: max recipients reached";
session.writeResponse(responseString);
getLogger().error(responseString);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
