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/extensions/GSSAPISASLMechanismHandler.java | 41 +++--------------------------------------
1 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index ccc9566..4daf7b6 100644
--- a/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -85,7 +85,7 @@
// The identity mapper that will be used to map the Kerberos principal to a
// directory user.
- private IdentityMapper identityMapper;
+ private IdentityMapper<?> identityMapper;
// The fully-qualified domain name for the server system.
private String serverFQDN;
@@ -121,12 +121,6 @@
// Get the identity mapper that should be used to find users.
DN identityMapperDN = configuration.getIdentityMapperDN();
identityMapper = DirectoryServer.getIdentityMapper(identityMapperDN);
- if (identityMapper == null)
- {
- Message message = ERR_SASLGSSAPI_NO_SUCH_IDENTITY_MAPPER.get(
- String.valueOf(identityMapperDN), String.valueOf(configEntryDN));
- throw new ConfigException(message);
- }
// Determine the fully-qualified hostname for this system. It may be
@@ -394,24 +388,7 @@
GSSAPISASLMechanismHandlerCfg configuration,
List<Message> unacceptableReasons)
{
- boolean configAcceptable = true;
- DN cfgEntryDN = configuration.dn();
-
- // Get the identity mapper that should be used to find users.
- DN identityMapperDN = configuration.getIdentityMapperDN();
- IdentityMapper newIdentityMapper =
- DirectoryServer.getIdentityMapper(identityMapperDN);
- if (newIdentityMapper == null)
- {
-
- unacceptableReasons.add(ERR_SASLGSSAPI_NO_SUCH_IDENTITY_MAPPER.get(
- String.valueOf(identityMapperDN),
- String.valueOf(cfgEntryDN)));
- configAcceptable = false;
- }
-
-
- return configAcceptable;
+ return true;
}
@@ -429,20 +406,8 @@
// Get the identity mapper that should be used to find users.
DN identityMapperDN = configuration.getIdentityMapperDN();
- IdentityMapper newIdentityMapper =
+ IdentityMapper<?> newIdentityMapper =
DirectoryServer.getIdentityMapper(identityMapperDN);
- if (newIdentityMapper == null)
- {
- if (resultCode == ResultCode.SUCCESS)
- {
- resultCode = ResultCode.CONSTRAINT_VIOLATION;
- }
-
-
- messages.add(ERR_SASLGSSAPI_NO_SUCH_IDENTITY_MAPPER.get(
- String.valueOf(identityMapperDN),
- String.valueOf(configEntryDN)));
- }
// Determine the fully-qualified hostname for this system. It may be
--
Gitblit v1.10.0