RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.8
diff -r1.8 JNDIRealm.java
86,87d85
< import org.apache.catalina.Realm;
< import org.apache.catalina.util.StringManager;
180a179
>  * @author Fredrik Westermarck
192a192,196
>      *  The type of authentication to use
>      */
>     protected String authentication = null;
> 
>     /**
237a242,246
>      * The protocol that will be used in the communication with the directory server.
>      */
>     protected String protocol = null;
> 
>     /**
327a337,356
>      * Return the type of authentication to use.
>      */
>     public String getAuthentication() {
> 
>         return authentication;
> 
>     }
> 
>     /**
>      * Set the type of authentication to use.
>      *
>      * @param authentication The authentication
>      */
>     public void setAuthentication(String authentication) {
> 
>       this.authentication = authentication;
> 
>     }
> 
>     /**
595a625,643
>     /**
>      * Return the protocol to be used.
>      */
>     public String getProtocol() {
> 
>         return protocol;
> 
>     }
> 
>     /**
>      * Set the protocol for this Realm.
>      *
>      * @param protocol The new protocol.
>      */
>     public void setProtocol(String protocol) {
> 
>         this.protocol = protocol;
> 
>     }
715,716c763,764
<                                                String username,
<                                                String credentials)
---
>                                                  String username,
>                                                  String credentials)
981c1029
<      * @param user The User to be authenticated
---
>      * @param info The User to be authenticated
1044c1092
<  
---
> 
1062c1110,1111
<             context.addToEnvironment(Context.SECURITY_PRINCIPAL,                                     connectionName);
---
>             context.addToEnvironment(Context.SECURITY_PRINCIPAL,
>                                      connectionName);
1122c1171
<         controls.setReturningAttributes(new String[] {roleName});
---
>             controls.setReturningAttributes(new String[] {roleName});
1290a1340,1341
>         if (authentication != null)
>             env.put(Context.SECURITY_AUTHENTICATION, authentication);
1296a1348,1349
>         if (protocol != null)
>             env.put(Context.SECURITY_PROTOCOL, protocol);