From 26fbfc9a37809f228f66057f698880ae59cf5b0b Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 1 Apr 2011 11:23:54 +0000
Subject: [PATCH] Better name

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1087652 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/realm/RealmBase.java | 12 ++++++------
 webapps/docs/config/realm.xml                 | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java
index d7a557ac9..5cec0a30a 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -155,7 +155,7 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
      * When processing users authenticated via the GSS-API, should any
      * &quot;@...&quot; be stripped from the end of the user name?
      */
-    protected boolean stripAtForGss = true;
+    protected boolean stripRealmForGss = true;
 
     
     // ------------------------------------------------------------- Properties
@@ -279,13 +279,13 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
     }
 
 
-    public boolean isStripAtForGss() {
-        return stripAtForGss;
+    public boolean isStripRealmForGss() {
+        return stripRealmForGss;
     }
 
 
-    public void setStripAtForGss(boolean stripAtForGss) {
-        this.stripAtForGss = stripAtForGss;
+    public void setStripRealmForGss(boolean stripRealmForGss) {
+        this.stripRealmForGss = stripRealmForGss;
     }
 
 
@@ -454,7 +454,7 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
             if (gssName!= null) {
                 String name = gssName.toString();
                 
-                if (isStripAtForGss()) {
+                if (isStripRealmForGss()) {
                     int i = name.indexOf('@');
                     if (i > 0) {
                         // Zero so we don;t leave a zero length name
diff --git a/webapps/docs/config/realm.xml b/webapps/docs/config/realm.xml
index d2f533a3d..9f20a40e4 100644
--- a/webapps/docs/config/realm.xml
+++ b/webapps/docs/config/realm.xml
@@ -143,7 +143,7 @@
         a role name assigned to the corresponding user.</p>
       </attribute>
 
-      <attribute name="stripAtForGss" required="false">
+      <attribute name="stripRealmForGss" required="false">
         <p>When processing users authenticated via the GSS-API, this attribute
         controls if any &quot;@...&quot; is removed from the end of the user
         name. If not specified, the default is <code>true</code>.</p>
@@ -230,7 +230,7 @@
         a role name assigned to the corresponding user.</p>
       </attribute>
 
-      <attribute name="stripAtForGss" required="false">
+      <attribute name="stripRealmForGss" required="false">
         <p>When processing users authenticated via the GSS-API, this attribute
         controls if any &quot;@...&quot; is removed from the end of the user
         name. If not specified, the default is <code>true</code>.</p>
@@ -451,7 +451,7 @@
         <code>0</code> is used which indicates no limit.</p>
       </attribute>
 
-      <attribute name="stripAtForGss" required="false">
+      <attribute name="stripRealmForGss" required="false">
         <p>When processing users authenticated via the GSS-API, this attribute
         controls if any &quot;@...&quot; is removed from the end of the user
         name. If not specified, the default is <code>true</code>.</p>
@@ -597,7 +597,7 @@
         default value is <code>conf/tomcat-users.xml</code>.</p>
       </attribute>
 
-      <attribute name="stripAtForGss" required="false">
+      <attribute name="stripRealmForGss" required="false">
         <p>When processing users authenticated via the GSS-API, this attribute
         controls if any &quot;@...&quot; is removed from the end of the user
         name. If not specified, the default is <code>true</code>.</p>
@@ -672,7 +672,7 @@
         for your role <code>Principals</code>.</p>
       </attribute>
 
-      <attribute name="stripAtForGss" required="false">
+      <attribute name="stripRealmForGss" required="false">
         <p>When processing users authenticated via the GSS-API, this attribute
         controls if any &quot;@...&quot; is removed from the end of the user
         name. If not specified, the default is <code>true</code>.</p>
-- 
2.11.0