Author: norman
Date: Thu May 18 11:47:55 2006
New Revision: 407611
URL: http://svn.apache.org/viewvc?rev=407611&view=rev
Log:
Rename config options and methods to better reflect the usage
Modified:
james/server/branches/v2.3/src/conf/james-config.xml
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/EhloCmdHandler.java
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/HeloCmdHandler.java
james/server/branches/v2.3/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
Modified: james/server/branches/v2.3/src/conf/james-config.xml
URL:
http://svn.apache.org/viewvc/james/server/branches/v2.3/src/conf/james-config.xml?rev=407611&r1=407610&r2=407611&view=diff
==============================================================================
--- james/server/branches/v2.3/src/conf/james-config.xml (original)
+++ james/server/branches/v2.3/src/conf/james-config.xml Thu May 18 11:47:55
2006
@@ -718,7 +718,7 @@
<handler command="HELO"
class="org.apache.james.smtpserver.HeloCmdHandler">
<!-- If is set to true helo is only accepted if it can be
resolved -->
<!--
- <checkValidHelo> false </checkValidHelo>
+ <checkResolvableHelo> false </checkResolvableHelo>
-->
<!-- If is set to true sender domain will be checked also for
clients that -->
@@ -730,7 +730,7 @@
<handler command="EHLO"
class="org.apache.james.smtpserver.EhloCmdHandler">
<!-- If is set to true ehlo is only accepted if it can be
resolved -->
<!--
- <checkValidEhlo> false </checkValidEhlo>
+ <checkResolvableEhlo> false </checkResolvableEhlo>
-->
<!-- If is set to true sender domain will be checked also for
clients that -->
Modified:
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/EhloCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/branches/v2.3/src/java/org/apache/james/smtpserver/EhloCmdHandler.java?rev=407611&r1=407610&r2=407611&view=diff
==============================================================================
---
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/EhloCmdHandler.java
(original)
+++
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/EhloCmdHandler.java
Thu May 18 11:47:55 2006
@@ -37,9 +37,9 @@
private final static String COMMAND_NAME = "EHLO";
/**
- * set checkValidHelo to false as default value
+ * set checkResolvableEhlo to false as default value
*/
- private boolean checkValidEhlo = false;
+ private boolean checkResolvableEhlo = false;
private boolean checkAuthNetworks = false;
@@ -47,9 +47,9 @@
* @see
org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
*/
public void configure(Configuration handlerConfiguration) throws
ConfigurationException {
- Configuration configuration =
handlerConfiguration.getChild("checkValidEhlo",false);
+ Configuration configuration =
handlerConfiguration.getChild("checkResolvableEhlo",false);
if(configuration != null) {
- checkValidEhlo = configuration.getValueAsBoolean();
+ checkResolvableEhlo = configuration.getValueAsBoolean();
}
Configuration configRelay =
handlerConfiguration.getChild("checkAuthNetworks",false);
@@ -80,8 +80,8 @@
StringBuffer responseBuffer = session.getResponseBuffer();
boolean badEhlo = false;
- // check for helo if its set in config
- if (checkValidEhlo) {
+ // check for resolvabe helo if its set in config
+ if (checkResolvableEhlo) {
/**
* don't check if the ip address is allowed to relay. Only check
if it is set in the config. ed.
Modified:
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/HeloCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/branches/v2.3/src/java/org/apache/james/smtpserver/HeloCmdHandler.java?rev=407611&r1=407610&r2=407611&view=diff
==============================================================================
---
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/HeloCmdHandler.java
(original)
+++
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/HeloCmdHandler.java
Thu May 18 11:47:55 2006
@@ -38,7 +38,7 @@
/**
* set checkValidHelo to false as default value
*/
- private boolean checkValidHelo = false;
+ private boolean checkResolvableHelo = false;
private boolean checkAuthNetworks = false;
@@ -46,9 +46,9 @@
* @see
org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
*/
public void configure(Configuration handlerConfiguration) throws
ConfigurationException {
- Configuration configuration =
handlerConfiguration.getChild("checkValidHelo",false);
+ Configuration configuration =
handlerConfiguration.getChild("checkResolvableHelo",false);
if(configuration != null) {
- checkValidHelo = configuration.getValueAsBoolean();
+ checkResolvableHelo = configuration.getValueAsBoolean();
}
Configuration configRelay =
handlerConfiguration.getChild("checkAuthNetworks",false);
@@ -80,8 +80,8 @@
boolean badHelo = false;
- // check for helo if its set in config
- if (checkValidHelo) {
+ // check for resolvable helo if its set in config
+ if (checkResolvableHelo) {
/**
* don't check if the ip address is allowed to relay. Only check
if it is set in the config. ed.
Modified:
james/server/branches/v2.3/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/branches/v2.3/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=407611&r1=407610&r2=407611&view=diff
==============================================================================
---
james/server/branches/v2.3/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
(original)
+++
james/server/branches/v2.3/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
Thu May 18 11:47:55 2006
@@ -136,10 +136,10 @@
String cmd = ((DefaultConfiguration)
heloConfig[i]).getAttribute("command",null);
if (cmd != null) {
if ("HELO".equals(cmd)) {
- ((DefaultConfiguration)
heloConfig[i]).addChild(Util.getValuedConfiguration("checkValidHelo",m_heloResolv+""));
+ ((DefaultConfiguration)
heloConfig[i]).addChild(Util.getValuedConfiguration("checkResolvableHelo",m_heloResolv+""));
((DefaultConfiguration)
heloConfig[i]).addChild(Util.getValuedConfiguration("checkAuthNetworks",m_checkAuthNetworks+""));
} else if ("EHLO".equals(cmd)) {
- ((DefaultConfiguration)
heloConfig[i]).addChild(Util.getValuedConfiguration("checkValidEhlo",m_ehloResolv+""));
+ ((DefaultConfiguration)
heloConfig[i]).addChild(Util.getValuedConfiguration("checkResolvableEhlo",m_ehloResolv+""));
((DefaultConfiguration)
heloConfig[i]).addChild(Util.getValuedConfiguration("checkAuthNetworks",m_checkAuthNetworks+""));
} else if ("MAIL".equals(cmd)) {
((DefaultConfiguration)
heloConfig[i]).addChild(Util.getValuedConfiguration("checkValidSenderDomain",m_senderDomainResolv+""));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
