cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm JDBCRealm.java

[nacho]

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;