You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by da...@apache.org on 2002/02/04 11:07:06 UTC

cvs commit: jakarta-james/src/java/org/apache/james/smtpserver SMTPHandler.java

danny       02/02/04 02:07:06

  Modified:    src/java/org/apache/james/smtpserver Tag: v2-0a2candidate1
                        SMTPHandler.java
  Log:
  Patching resetState() according to patch submitted by  "Kevin Holmes" <ke...@open-iq.com>
         " seems that after authenticating an smtp client sends
          a RSET, so we need to remember that they are authenticated"
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.13.2.1  +13 -5     jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java
  
  Index: SMTPHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- SMTPHandler.java	7 Dec 2001 22:08:29 -0000	1.13
  +++ SMTPHandler.java	4 Feb 2002 10:07:06 -0000	1.13.2.1
  @@ -44,8 +44,8 @@
    * @author Matthew Pangaro <ma...@lokitech.com>
    * @author Danny Angus <da...@thought.co.uk>
    *
  - * This is $Revision: 1.13 $
  - * Committed on $Date: 2001/12/07 22:08:29 $ by: $Author: serge $
  + * This is $Revision: 1.13.2.1 $
  + * Committed on $Date: 2002/02/04 10:07:06 $ by: $Author: danny $
    */
   public class SMTPHandler
       extends BaseConnectionHandler
  @@ -195,14 +195,22 @@
           }
       }
   
  -    private void resetState() {
  + private void resetState() {
  +        String user = (String) state.get(AUTH);
  +
           state.clear();
  -        state.put(SERVER_NAME, this.helloName );
  -        state.put(SERVER_TYPE, this.softwaretype );
  +        state.put(SERVER_NAME, this.helloName);
  +        state.put(SERVER_TYPE, this.softwaretype);
           state.put(REMOTE_NAME, remoteHost);
           state.put(REMOTE_IP, remoteIP);
           state.put(SMTP_ID, smtpID);
  +        // seems that after authenticating an smtp client sends
  +        // a RSET, so we need to remember that they are authenticated
  +        if(user != null){
  +            state.put(AUTH, user);
  +        }
       }
  +
   
       private boolean parseCommand(String command)
           throws Exception {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>