Return-Path: <nacho@locus.apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 16753 invoked by uid 500); 16 Dec 2000 23:40:21 -0000
Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org
Received: (qmail 16750 invoked by uid 1122); 16 Dec 2000 23:40:20 -0000
Date: 16 Dec 2000 23:40:20 -0000
Message-ID: <20001216234020.16749.qmail@locus.apache.org>
From: nacho@locus.apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit:
 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm
 JDBCRealm.java

nacho       00/12/16 15:40:20

  Modified:    catalina/src/share/org/apache/catalina/realm JDBCRealm.java
  Log:
  Problems from hand made patches..
  
  Please send patches as attached files
  not embedded in messages....
  
  Thanks
  
  Revision  Changes    Path
  1.6       +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
  
  Index: JDBCRealm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JDBCRealm.java	2000/12/16 20:46:50	1.5
  +++ JDBCRealm.java	2000/12/16 23:40:19	1.6
  @@ -225,7 +225,7 @@
        *
        */
   
  -    private String digest=null;
  +    private String digest="";
   
      // ------------------------------------------------------------- Properties
   
  @@ -441,7 +441,7 @@
   		    log(sm.getString("jdbcRealm.authDBReOpenFail"));
   		    return null;
   		}
  -// XXX Commented it gives problems on Oracle 8i Drivers                
  +// XXX Commented it gives problems on Oracle 8i Drivers
   //		dbConnection.setReadOnly(true);
   	    }
   
  @@ -468,9 +468,9 @@
   	    ResultSet rs1 = preparedAuthenticate.executeQuery();
   	    boolean found = false;
   	    if (rs1.next()) {
  -                if (digest!= null && digest.equalsIgnoreCase("No")){
  -                    if (credentials.equals(rs1.getString(1))) {
  -                        if (debug >= 2)
  +                if( digest=="" || digest.equalsIgnoreCase("No")){
  +                    if(credentials.equals(rs1.getString(1))) {
  +                        if(debug >= 2)
                               log(sm.getString("jdbcRealm.authenticateSuccess",
                                                username));
                           found = true;