keycloak-uncached

diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPIdentityStoreRegistry.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPIdentityStoreRegistry.java
index 22aa55a..b818ace 100644
--- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPIdentityStoreRegistry.java
+++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPIdentityStoreRegistry.java
@@ -92,6 +92,9 @@ public class LDAPIdentityStoreRegistry {
                 case LDAPConstants.VENDOR_TIVOLI:
                     uniqueIdentifierAttributeName = "uniqueidentifier";
                     break;
+                case LDAPConstants.VENDOR_NOVELL_EDIRECTORY:
+                    uniqueIdentifierAttributeName = "guid";
+                    break;
                 case LDAPConstants.VENDOR_ACTIVE_DIRECTORY:
                     uniqueIdentifierAttributeName = LDAPConstants.OBJECT_GUID;
             }

diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
index 30003bd..17fbb16 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
@@ -547,6 +547,7 @@ module.controller('LDAPCtrl', function($scope, $location, Notifications, Dialog,
         { "id": "ad", "name": "Active Directory" },
         { "id": "rhds", "name": "Red Hat Directory Server" },
         { "id": "tivoli", "name": "Tivoli" },
+        { "id": "edirectory", "name": "Novell eDirectory" },
         { "id": "other", "name": "Other" }
     ];
 

diff --git a/model/api/src/main/java/org/keycloak/models/LDAPConstants.java b/model/api/src/main/java/org/keycloak/models/LDAPConstants.java
index acab3e0..14aa55d 100644
--- a/model/api/src/main/java/org/keycloak/models/LDAPConstants.java
+++ b/model/api/src/main/java/org/keycloak/models/LDAPConstants.java
@@ -10,6 +10,7 @@ public class LDAPConstants {
     public static final String VENDOR_ACTIVE_DIRECTORY = "ad";
     public static final String VENDOR_OTHER = "other";
     public static final String VENDOR_TIVOLI = "tivoli";
+    public static final String VENDOR_NOVELL_EDIRECTORY="edirectory" ;
 
     public static final String USERNAME_LDAP_ATTRIBUTE = "usernameLDAPAttribute";
     public static final String USER_OBJECT_CLASSES = "userObjectClasses";