From c313c5fdcb815c7f1579f250814a498506fb5c07 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 23 Jan 2014 18:32:14 +0000
Subject: [PATCH] OPENDJ-1235: Migrate configuration framework
---
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index 037de4a..43c0faf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -46,6 +46,7 @@
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
+import org.forgerock.opendj.ldap.AddressMask;
import org.opends.messages.Message;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.ConnectionHandlerCfg;
@@ -1235,7 +1236,7 @@
// Check to see if the client is on the denied list.
// If so, then reject it immediately.
if ((!deniedClients.isEmpty())
- && AddressMask.maskListContains(clientAddr, deniedClients))
+ && AddressMask.matchesAny(deniedClients, clientAddr))
{
clientConnection.disconnect(DisconnectReason.CONNECTION_REJECTED,
currentConfig.isSendRejectionNotice(), ERR_CONNHANDLER_DENIED_CLIENT
@@ -1247,7 +1248,7 @@
// there is whether the client is on that list. If
// not, then reject the connection.
if ((!allowedClients.isEmpty())
- && (!AddressMask.maskListContains(clientAddr, allowedClients)))
+ && (!AddressMask.matchesAny(allowedClients, clientAddr)))
{
clientConnection.disconnect(DisconnectReason.CONNECTION_REJECTED,
currentConfig.isSendRejectionNotice(),
--
Gitblit v1.10.0