Index: /home/maurer/stuff/workspace/james-dev/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
===================================================================
--- /home/maurer/stuff/workspace/james-dev/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java	(revision 392227)
+++ /home/maurer/stuff/workspace/james-dev/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java	(working copy)
@@ -34,7 +34,9 @@
     private boolean m_heloResolv = false;
     private boolean m_ehloResolv = false;
     private boolean m_senderDomainResolv = false;
+    private boolean m_ignoreRelayClients = true;
     private int m_maxRcpt = 0;
+
     
     public SMTPTestConfiguration(int smtpListenerPort) {
         super("smptserver");
@@ -90,6 +92,10 @@
         m_senderDomainResolv = true; 
     }
     
+    public void setIgnoreRelayClients(boolean ignore) {
+        m_ignoreRelayClients = ignore; 
+    }
+    
     public void setMaxRcpt(int maxRcpt) {
         m_maxRcpt = maxRcpt; 
     }
@@ -118,9 +124,11 @@
                 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("checkValidHelo",m_heloResolv+""));
+                        ((DefaultConfiguration) heloConfig[i]).addChild(Util.getValuedConfiguration("ignoreRelayClients",m_ignoreRelayClients+""));
                     } else if ("EHLO".equals(cmd)) {
                         ((DefaultConfiguration) heloConfig[i]).addChild(Util.getValuedConfiguration("checkValidEhlo",m_ehloResolv+""));
+                        ((DefaultConfiguration) heloConfig[i]).addChild(Util.getValuedConfiguration("ignoreRelayClients",m_ignoreRelayClients+""));   
                     } else if ("MAIL".equals(cmd)) {
                         ((DefaultConfiguration) heloConfig[i]).addChild(Util.getValuedConfiguration("checkValidSenderDomain",m_senderDomainResolv+""));
                     } else if ("RCPT".equals(cmd)) {