--- ldapjdk-4.17/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java.orig	2007-12-26 23:00:49.000000000 +0100
+++ ldapjdk-4.17/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java	2007-12-26 23:01:18.000000000 +0100
@@ -4519,9 +4519,9 @@
         LDAPControl[] controls = null;
 
         synchronized(m_responseControlTable) {            
-            Enumeration enum = m_responseControlTable.keys();          
-            while (enum.hasMoreElements()) {
-                Object client = enum.nextElement();
+            Enumeration e = m_responseControlTable.keys();          
+            while (e.hasMoreElements()) {
+                Object client = e.nextElement();
                 ResponseControls rspCtrls = (ResponseControls)m_responseControlTable.get(client);
 
                 if (msgID == rspCtrls.msgID) {
--- ldapjdk-4.17/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java.orig	2007-12-26 23:03:42.000000000 +0100
+++ ldapjdk-4.17/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java	2007-12-26 23:03:59.000000000 +0100
@@ -263,9 +263,9 @@
             BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
               numRead);
 
-            BEREnumerated enum = (BEREnumerated)s.elementAt(0);
+            BEREnumerated e = (BEREnumerated)s.elementAt(0);
 
-            con.setChangeType(enum.getValue());
+            con.setChangeType(e.getValue());
 
             if (s.size() > 1) {
                 if (s.elementAt(1) instanceof BEROctetString) {
--- ldapjdk-4.17/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java.orig	2007-12-26 23:04:58.000000000 +0100
+++ ldapjdk-4.17/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java	2007-12-26 23:05:10.000000000 +0100
@@ -107,9 +107,9 @@
 	BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
 							   numRead);
 	
-	BEREnumerated enum = (BEREnumerated)s.elementAt(0);
+	BEREnumerated e1 = (BEREnumerated)s.elementAt(0);
 	    
-	m_changeTypes = enum.getValue();
+	m_changeTypes = e1.getValue();
 
 	if (s.size() > 1) {
 	    if (s.elementAt(1) instanceof BEROctetString) {
--- ldapjdk-4.17/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java~	2002-12-03 01:36:21.000000000 +0100
+++ ldapjdk-4.17/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java	2007-12-26 23:16:38.000000000 +0100
@@ -402,12 +402,12 @@
      * @see netscape.ldap.util.RDN#getAttributeSyntax
      */
     public static String[] getAttributesForSyntax( String oid ) {
-        Enumeration enum = m_attributehash.keys();
+        Enumeration e = m_attributehash.keys();
         Vector key_v = new Vector();
         String tmp_str = null;
 
-        while ( enum.hasMoreElements() ) {
-            tmp_str = (String)enum.nextElement();
+        while ( e.hasMoreElements() ) {
+            tmp_str = (String)e.nextElement();
             if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
                 key_v.addElement( tmp_str );
             }
--- ldapjdk-4.17/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java.orig	2007-12-26 23:18:20.000000000 +0100
+++ ldapjdk-4.17/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java	2007-12-26 23:18:50.000000000 +0100
@@ -151,8 +151,8 @@
      */
     static LDAPAttributeSet jndiAttrsToLdapAttrSet(Attributes jndiAttrs) throws NamingException{
         LDAPAttributeSet attrs = new LDAPAttributeSet();
-        for (Enumeration enum = jndiAttrs.getAll(); enum.hasMoreElements();) {
-            attrs.add(jndiAttrToLdapAttr((Attribute) enum.nextElement()));
+        for (Enumeration e = jndiAttrs.getAll(); e.hasMoreElements();) {
+            attrs.add(jndiAttrToLdapAttr((Attribute) e.nextElement()));
         }
         return attrs;
     }    
--- ldapjdk-4.17/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java.orig	2007-12-26 23:20:39.000000000 +0100
+++ ldapjdk-4.17/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java	2007-12-26 23:20:55.000000000 +0100
@@ -465,8 +465,8 @@
      */
     static Attributes encodeDirCtxObj(DirContext obj, Attributes attrs) throws NamingException{
         Attributes ctxAttrs = obj.getAttributes("");
-        for (NamingEnumeration enum = ctxAttrs.getAll(); enum.hasMore();) {
-            attrs.put((Attribute)enum.next());
+        for (NamingEnumeration e = ctxAttrs.getAll(); e.hasMore();) {
+            attrs.put((Attribute)e.next());
         }
         return attrs;
     }