directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: do not validate user pw policy assignment if ldapserver type is not openldap or apacheds
Date Wed, 07 Nov 2018 23:17:21 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 2b887bf4a -> 1dc73ed6f


do not validate user pw policy assignment if ldapserver type is not openldap or apacheds


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/1dc73ed6
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/1dc73ed6
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/1dc73ed6

Branch: refs/heads/master
Commit: 1dc73ed6fb3bf27d83d78e06a8b246b6299cb814
Parents: 2b887bf
Author: Shawn McKinney <smckinney@apache.org>
Authored: Wed Nov 7 14:31:37 2018 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Wed Nov 7 14:31:37 2018 -0600

----------------------------------------------------------------------
 .../java/org/apache/directory/fortress/core/impl/UserP.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/1dc73ed6/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
index b4c5210..6f4e196 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
@@ -45,6 +45,7 @@ import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserAdminRole;
 import org.apache.directory.fortress.core.model.UserRole;
+import org.apache.directory.fortress.core.util.Config;
 import org.apache.directory.fortress.core.util.VUtil;
 
 import org.slf4j.Logger;
@@ -941,8 +942,8 @@ final class UserP
             }
         }
 
-        // 1 OpenLDAP password policy name must be valid if set:
-        if ( StringUtils.isNotEmpty( entity.getPwPolicy() ) )
+        // password policy name must be valid if set:
+        if ( StringUtils.isNotEmpty( entity.getPwPolicy() ) && ( Config.getInstance().isOpenldap()
|| Config.getInstance().isApacheds() ) )
         {
             PwPolicy policy = new PwPolicy( entity.getPwPolicy() );
             policy.setContextId( entity.getContextId() );


Mime
View raw message