diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java b/maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java index 7194dec7f509ba61e83092815d5516636cd9064a..8fd625563cd7cc8bd15647ca5fb33cbd0d263704 100644 --- a/maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java +++ b/maxkey-core/src/main/java/org/maxkey/constants/ldap/InetOrgPerson.java @@ -122,5 +122,10 @@ public class InetOrgPerson { /**inetOrgPerson x500uniqueIdentifier*/ public static final String X500UNIQUEIDENTIFIER = "x500uniqueIdentifier"; + //MaxKey EXTEND + public static final String mobile = "mobile"; + public static final String manager = "manager"; + public static final String department = "department"; + } diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java b/maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java index 95366289ea88bb33bf8581f8a0a54c2fcf5f2b52..96235a674a65e70eafcd095750683501602e1e7b 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java +++ b/maxkey-core/src/main/java/org/maxkey/persistence/ldap/ActiveDirectoryUtils.java @@ -33,14 +33,6 @@ import org.slf4j.LoggerFactory; public class ActiveDirectoryUtils extends LdapUtils { private final static Logger _logger = LoggerFactory.getLogger(ActiveDirectoryUtils.class); - public final static String sAMAccountName = "sAMAccountName"; - public final static String unicodePwd = "unicodePwd"; - public final static String CN = "CN"; - - public final static String servicePrincipalName = "servicePrincipalName"; - public final static String userPrincipalName = "userPrincipalName"; - public final static String userAccountControl = "userAccountControl"; - protected String domain; /** diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java b/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java index 330a100dadfb9cdd21cd04cf6b1fc868ce49c32d..6e70e2b314967c1af218870ec5cba88b8020b13e 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java +++ b/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java @@ -40,21 +40,6 @@ public class LdapUtils { public static final String propertyDomain = "domain"; public static final String propertyTrustStore = "trustStore"; public static final String propertyTrustStorePassword = "trustStorePassword"; - - public static final String uid = "uid"; - public static final String userPassword = "userPassword"; - public static final String cn = "cn"; - public static final String displayName = "displayName"; - public static final String givenName = "givenName"; - public static final String sn = "sn"; - public static final String mobile = "mobile"; - public static final String mail = "mail"; - public static final String employeeNumber = "employeeNumber"; - public static final String ou = "ou"; - public static final String manager = "manager"; - public static final String department = "department"; - public static final String departmentNumber = "departmentNumber"; - public static final String title = "title"; protected DirContext ctx; protected String baseDN;