From d4e7ec2f91424753ade018c0201090de6d875f53 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 22 Jul 2011 09:41:44 +0000
Subject: [PATCH] Fix OPENDJ-236: re-enable use of assertion control to avoid race conditions now that OPENDJ-241 has been fixed.

---
 opends/src/server/org/opends/server/plugins/SambaPasswordPlugin.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/opends/src/server/org/opends/server/plugins/SambaPasswordPlugin.java b/opends/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
index 268e2c0..739047d 100644
--- a/opends/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opends/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -759,9 +759,7 @@
             pwdAttribute.getNameOrOID(), encPasswords.get(0));
         final Control assertionControl = new LDAPAssertionRequestControl(true,
             filter);
-
-        // FIXME: see OPENDJ-241
-        // controls = Collections.singletonList(assertionControl);
+        controls = Collections.singletonList(assertionControl);
       }
 
       final ModifyOperation modifyOperation = connection.processModify(dn,

--
Gitblit v1.10.0