From ed123c687cf615e53c75da278083f8ccdedc72f3 Mon Sep 17 00:00:00 2001
From: "miodrag%netscape.com" <miodrag%netscape.com>
Date: Thu, 29 Jun 2000 22:31:17 +0000
Subject: [PATCH] Updates for LDAPJDK 4.11

---
 .../java-sdk/ldapjdk/com/netscape/sasl/ClientFactory.java     | 4 ++--
 directory/java-sdk/ldapjdk/netscape/ldap/LDAPAttribute.java   | 3 +++
 directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java  | 4 ++--
 directory/java-sdk/ldapjdk/netscape/ldap/util/LDIF.java       | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/directory/java-sdk/ldapjdk/com/netscape/sasl/ClientFactory.java b/directory/java-sdk/ldapjdk/com/netscape/sasl/ClientFactory.java
index 98b8c781824..bbd59756ca2 100644
--- a/directory/java-sdk/ldapjdk/com/netscape/sasl/ClientFactory.java
+++ b/directory/java-sdk/ldapjdk/com/netscape/sasl/ClientFactory.java
@@ -34,7 +34,7 @@ public class ClientFactory implements SaslClientFactory {
     public ClientFactory() {
         _mechanismTable = new Hashtable();
         for( int i = 0; i < _mechanismNames.length; i++ ) {
-            _mechanismTable.put( _mechanismNames[i],
+            _mechanismTable.put( _mechanismNames[i].toLowerCase(),
                                  PACKAGENAME + '.' +
                                  _mechanismClasses[i] );
         }
@@ -81,7 +81,7 @@ public class ClientFactory implements SaslClientFactory {
         }
         for( int i = 0; (mechName == null) &&
                         (i < mechanisms.length); i++ ) {
-            mechName = (String)_mechanismTable.get( mechanisms[i] );
+            mechName = (String)_mechanismTable.get( mechanisms[i].toLowerCase() );
         }
         if ( mechName != null ) {
             try {
diff --git a/directory/java-sdk/ldapjdk/netscape/ldap/LDAPAttribute.java b/directory/java-sdk/ldapjdk/netscape/ldap/LDAPAttribute.java
index 1d1e2b229ab..10ed2dee42c 100644
--- a/directory/java-sdk/ldapjdk/netscape/ldap/LDAPAttribute.java
+++ b/directory/java-sdk/ldapjdk/netscape/ldap/LDAPAttribute.java
@@ -114,6 +114,9 @@ public class LDAPAttribute implements java.io.Serializable {
             Object[] vals = new Object[set.size()];
             for (int i = 0; i < set.size(); i++) {
                 vals[i] = ((BEROctetString)set.elementAt(i)).getValue();
+                if (vals[i] == null) {
+                    vals[i] = new byte[0];
+                }
             }
             setValues( vals );
         }
diff --git a/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java b/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
index 56c28efad39..a5bea3dd3e6 100644
--- a/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
+++ b/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
@@ -260,11 +260,11 @@ public class LDAPConnection
     /**
      * Properties
      */
-    private final static Float SdkVersion = new Float(4.1f);
+    private final static Float SdkVersion = new Float(4.11f);
     private final static Float ProtocolVersion = new Float(3.0f);
     private final static String SecurityVersion = new String("none,simple,sasl");
     private final static Float MajorVersion = new Float(4.0f);
-    private final static Float MinorVersion = new Float(0.1f);
+    private final static Float MinorVersion = new Float(0.11f);
     private final static String DELIM = "#";
     private final static String PersistSearchPackageName =
       "netscape.ldap.controls.LDAPPersistSearchControl";
diff --git a/directory/java-sdk/ldapjdk/netscape/ldap/util/LDIF.java b/directory/java-sdk/ldapjdk/netscape/ldap/util/LDIF.java
index 3b54ad42dd4..42a9feb17a7 100644
--- a/directory/java-sdk/ldapjdk/netscape/ldap/util/LDIF.java
+++ b/directory/java-sdk/ldapjdk/netscape/ldap/util/LDIF.java
@@ -91,6 +91,7 @@ public class LDIF implements Serializable {
         BufferedReader d = new BufferedReader(new InputStreamReader(ds, "UTF8"));
         m_reader = new LineReader(d);
         m_source = ds.toString();
+        m_decoder = new MimeBase64Decoder();
     }
 
     /**