serge       01/10/25 21:48:50

  Modified:    src/java/org/apache/james/remotemanager
                        RemoteManagerHandler.java
  Log:
  Shows Login id: and Password now each time, rather than only after the first time.
  
  Revision  Changes    Path
  1.4       +15 -14    
jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
  
  Index: RemoteManagerHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RemoteManagerHandler.java 2001/09/11 04:33:21     1.3
  +++ RemoteManagerHandler.java 2001/10/26 04:48:50     1.4
  @@ -44,8 +44,8 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Charles Benett</a>
    *
  - * Last changed by: $Author: serge $ on $Date: 2001/09/11 04:33:21 $
  - * $Revision: 1.3 $
  + * Last changed by: $Author: serge $ on $Date: 2001/10/26 04:48:50 $
  + * $Revision: 1.4 $
    *
    */
   public class RemoteManagerHandler
  @@ -120,19 +120,20 @@
               getLogger().info( "Access from " + remoteHost + "(" + remoteIP + ")" );
               out.println( "JAMES RemoteAdministration Tool " + 
Constants.SOFTWARE_VERSION );
               out.println("Please enter your login and password");
  -         out.println("Login id:");
  -            String login = in.readLine();
  -         out.println("Password:");
  -            String password = in.readLine();
  -
  -            while (!password.equals(admaccount.get(login)) || password.length() == 
0) {
  +            String login = null;
  +            String password = null;
  +            do {
                   scheduler.resetTrigger(this.toString());
  -                final String message = "Login failed for " + login;
  -                out.println( message );
  -                getLogger().info( message );
  +                if (login != null) {
  +                    final String message = "Login failed for " + login;
  +                    out.println( message );
  +                    getLogger().info( message );
  +                }
  +                out.println("Login id:");
                   login = in.readLine();
  +                out.println("Password:");
                   password = in.readLine();
  -            }
  +            } while (!password.equals(admaccount.get(login)) || password.length() 
== 0);
   
               scheduler.resetTrigger(this.toString());
   
  @@ -203,7 +204,7 @@
               boolean success = false;
               if (users.contains(username)) {
                   out.println("user " + username + " already exist");
  -            } 
  +            }
               else if ( inLocalUsers ) {
                   success = mailServer.addUser(username, passwd);
               }
  @@ -309,7 +310,7 @@
            }
            JamesUser aliasUser = (JamesUser) users.getUserByName(alias);
            if (aliasUser == null) {
  -             out.println("Alias unknown to server" 
  +             out.println("Alias unknown to server"
                               + " - create that user first.");
                return true;
            }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to