You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2017/11/16 21:22:45 UTC
directory-fortress-core git commit: set the default pw policy root dn
to ou=Policy, ...
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 6a2daf450 -> 50f6df88b
set the default pw policy root dn to ou=Policy,...
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/50f6df88
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/50f6df88
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/50f6df88
Branch: refs/heads/master
Commit: 50f6df88bfc35575012fa54cd7a3838c5fc62d7e
Parents: 6a2daf4
Author: Shawn McKinney <sm...@apache.org>
Authored: Thu Nov 16 15:22:40 2017 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Thu Nov 16 15:22:40 2017 -0600
----------------------------------------------------------------------
.../org/apache/directory/fortress/core/impl/PolicyDAO.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/50f6df88/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
index 14fc815..ca90a63 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
@@ -688,11 +688,10 @@ final class PolicyDAO extends LdapDataProvider
String szDn;
// ApacheDS requires pw policy objects to be stored under ou=config node;
- if( Config.getInstance().isOpenldap() )
- szDn = getRootDn( contextId, GlobalIds.PPOLICY_ROOT );
- else
+ if ( Config.getInstance().isApacheds() )
szDn = getRootDn( contextId, GlobalIds.ADS_PPOLICY_ROOT );
-
+ else
+ szDn = getRootDn( contextId, GlobalIds.PPOLICY_ROOT );
return szDn;
}
}
\ No newline at end of file