From e4d96d745c52f15d9953d216090568e84e4a70f9 Mon Sep 17 00:00:00 2001
From: floblanc <floblanc@localhost>
Date: Thu, 06 Nov 2008 08:48:39 +0000
Subject: [PATCH] Fix a merge issue. The lines assigning client connections to the admin network group were wrongly removed.

---
 opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index c4e0248..1ce967a 100644
--- a/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -59,6 +59,7 @@
 import org.opends.server.core.SearchOperation;
 import org.opends.server.core.SearchOperationBasis;
 import org.opends.server.core.UnbindOperationBasis;
+import org.opends.server.core.networkgroups.NetworkGroup;
 import org.opends.server.extensions.NullConnectionSecurityProvider;
 import org.opends.server.extensions.TLSCapableConnection;
 import org.opends.server.extensions.TLSConnectionSecurityProvider;
@@ -238,6 +239,10 @@
 
 
     this.connectionHandler     = connectionHandler;
+    if (connectionHandler.isAdminConnectionHandler()) {
+      setNetworkGroup(NetworkGroup.getAdminNetworkGroup());
+    }
+
     this.clientChannel         = clientChannel;
     this.securityProvider      = null;
     this.clearSecurityProvider = null;

--
Gitblit v1.10.0