markt       2004/07/29 12:19:43

  Modified:    catalina/src/share/org/apache/catalina/mbeans
                        MBeanUtils.java
  Log:
  Fix bug 28178. Quote user and group names to handle situation with
  certs where names may conain '='.
  As far as I can tell, this doesn't break the admin app for users but I will
  need to do some more testing once the 5.5 changes are completed.
  
  Revision  Changes    Path
  1.29      +5 -5      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- MBeanUtils.java   13 Jul 2004 09:38:21 -0000      1.28
  +++ MBeanUtils.java   29 Jul 2004 19:19:43 -0000      1.29
  @@ -1068,8 +1068,8 @@
   
           ObjectName name = null;
           name = new ObjectName(domain + ":type=Group,groupname=" +
  -                              group.getGroupname() + ",database=" +
  -                              group.getUserDatabase().getId());
  +                              ObjectName.quote(group.getGroupname()) +
  +                              ",database=" + group.getUserDatabase().getId());
           return (name);
   
       }
  @@ -1396,8 +1396,8 @@
   
           ObjectName name = null;
           name = new ObjectName(domain + ":type=User,username=" +
  -                              user.getUsername() + ",database=" +
  -                              user.getUserDatabase().getId());
  +                              ObjectName.quote(user.getUsername())
  +                              + ",database=" + user.getUserDatabase().getId());
           return (name);
   
       }
  
  
  

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

Reply via email to