From a052caad0008ede711b0c43d9955eccc3bb858ba Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index f0ffedc..15da5d9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -165,8 +165,8 @@
// attributes.
PasswordPolicy defaultPolicy = DirectoryServer.getDefaultPasswordPolicy();
Set<DN> authSchemeDNs =
- configuration.getDefaultAuthPasswordStorageSchemeDN();
- if ((authSchemeDNs == null) || authSchemeDNs.isEmpty())
+ configuration.getDefaultAuthPasswordStorageSchemeDNs();
+ if (authSchemeDNs.isEmpty())
{
if (defaultPolicy.usesAuthPasswordSyntax())
{
@@ -221,8 +221,8 @@
// Get the set of default password storage schemes for user password
// attributes.
Set<DN> userSchemeDNs =
- configuration.getDefaultUserPasswordStorageSchemeDN();
- if ((userSchemeDNs == null) || userSchemeDNs.isEmpty())
+ configuration.getDefaultUserPasswordStorageSchemeDNs();
+ if (userSchemeDNs.isEmpty())
{
if (! defaultPolicy.usesAuthPasswordSyntax())
{
@@ -642,8 +642,8 @@
// Get the set of default password storage schemes for auth password
// attributes.
Set<DN> authSchemeDNs =
- configuration.getDefaultAuthPasswordStorageSchemeDN();
- if ((authSchemeDNs == null) || authSchemeDNs.isEmpty())
+ configuration.getDefaultAuthPasswordStorageSchemeDNs();
+ if (authSchemeDNs.isEmpty())
{
PasswordStorageScheme[] defaultAuthSchemes = new PasswordStorageScheme[1];
defaultAuthSchemes[0] =
@@ -690,8 +690,8 @@
// Get the set of default password storage schemes for user password
// attributes.
Set<DN> userSchemeDNs =
- configuration.getDefaultUserPasswordStorageSchemeDN();
- if ((userSchemeDNs == null) || userSchemeDNs.isEmpty())
+ configuration.getDefaultUserPasswordStorageSchemeDNs();
+ if (userSchemeDNs.isEmpty())
{
PasswordStorageScheme[] defaultUserSchemes = new PasswordStorageScheme[1];
defaultUserSchemes[0] =
@@ -747,8 +747,8 @@
PasswordPolicy defaultPolicy = DirectoryServer.getDefaultPasswordPolicy();
PasswordStorageScheme[] defaultAuthSchemes;
Set<DN> authSchemeDNs =
- configuration.getDefaultAuthPasswordStorageSchemeDN();
- if ((authSchemeDNs == null) || authSchemeDNs.isEmpty())
+ configuration.getDefaultAuthPasswordStorageSchemeDNs();
+ if (authSchemeDNs.isEmpty())
{
if (defaultPolicy.usesAuthPasswordSyntax())
{
@@ -806,8 +806,8 @@
// attributes.
PasswordStorageScheme[] defaultUserSchemes;
Set<DN> userSchemeDNs =
- configuration.getDefaultUserPasswordStorageSchemeDN();
- if ((userSchemeDNs == null) || userSchemeDNs.isEmpty())
+ configuration.getDefaultUserPasswordStorageSchemeDNs();
+ if (userSchemeDNs.isEmpty())
{
if (! defaultPolicy.usesAuthPasswordSyntax())
{
--
Gitblit v1.10.0