From 5ceb2e9601d2501d021d0c61188ec913076555a0 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.
---
opends/src/server/org/opends/server/core/CoreConfigManager.java | 29 +----------------------------
1 files changed, 1 insertions(+), 28 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/CoreConfigManager.java b/opends/src/server/org/opends/server/core/CoreConfigManager.java
index a9bf894..c170ac7 100644
--- a/opends/src/server/org/opends/server/core/CoreConfigManager.java
+++ b/opends/src/server/org/opends/server/core/CoreConfigManager.java
@@ -40,11 +40,9 @@
import org.opends.server.admin.std.server.GlobalCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.api.IdentityMapper;
import org.opends.server.config.ConfigException;
import org.opends.server.types.AcceptRejectWarn;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Privilege;
import org.opends.server.types.ResultCode;
@@ -151,7 +149,7 @@
DirectoryServer.setCheckSchema(globalConfig.isCheckSchema());
DirectoryServer.setDefaultPasswordPolicyDN(
- globalConfig.getDefaultPasswordPolicy());
+ globalConfig.getDefaultPasswordPolicyDN());
DirectoryServer.setAddMissingRDNAttributes(
globalConfig.isAddMissingRDNAttributes());
@@ -352,31 +350,6 @@
{
boolean configAcceptable = true;
- // Make sure that the default password policy DN is valid.
- DN policyDN = configuration.getDefaultPasswordPolicy();
- PasswordPolicy policy = DirectoryServer.getPasswordPolicy(policyDN);
- if (policy == null)
- {
- Message message = ERR_CONFIG_CORE_NO_SUCH_PWPOLICY.get(
- String.valueOf(policyDN));
- unacceptableReasons.add(message);
-
- configAcceptable = false;
- }
-
- // Make sure that the proxied auth identity mapper is valid.
- DN mapperDN = configuration.getProxiedAuthorizationIdentityMapperDN();
- IdentityMapper mapper = DirectoryServer.getIdentityMapper(mapperDN);
- if (mapper == null)
- {
- Message message = ERR_CONFIG_CORE_NO_PROXY_MAPPER_FOR_DN.get(
- String.valueOf(mapperDN),
- String.valueOf(configuration.dn()));
- unacceptableReasons.add(message);
-
- configAcceptable = false;
- }
-
Set<String> smtpServers = configuration.getSMTPServer();
if (smtpServers != null)
{
--
Gitblit v1.10.0