From a49e9326888ff9f1ed77563201a15d64fc845242 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 14:00:38 +0000
Subject: [PATCH] OPENDJ-3222 Fix ldap* tool anonymous mode

---
 opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
index f6bf253..129654f 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
@@ -646,11 +646,11 @@
                 throw new ArgumentException(ERR_LDAPAUTH_UNSUPPORTED_SASL_MECHANISM.get(mech));
             }
 
-            if (reportAuthzIDArg.isPresent()) {
+            if (bindRequest != null && reportAuthzIDArg.isPresent()) {
                 bindRequest.addControl(AuthorizationIdentityRequestControl.newControl(false));
             }
 
-            if (usePasswordPolicyControlArg.isPresent()) {
+            if (bindRequest != null && usePasswordPolicyControlArg.isPresent()) {
                 bindRequest.addControl(PasswordPolicyRequestControl.newControl(false));
             }
         }

--
Gitblit v1.10.0