From 749c2d94f16fa418a8ee211b3d632bd40a23fe9d Mon Sep 17 00:00:00 2001

From: "Endi S. Dewata" <edewata@redhat.com>

Date: Wed, 4 Nov 2020 09:08:35 -0600

Subject: [PATCH] Fix NPE in UGSubsystem.findUsersByKeyword()

---

 .../src/com/netscape/cmscore/usrgrp/UGSubsystem.java      | 8 ++++++--

 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/base/server/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/server/src/com/netscape/cmscore/usrgrp/UGSubsystem.java

index bbfbf4663..2080f58a1 100644

--- a/base/server/src/com/netscape/cmscore/usrgrp/UGSubsystem.java

+++ b/base/server/src/com/netscape/cmscore/usrgrp/UGSubsystem.java

@@ -268,8 +268,12 @@ public class UGSubsystem {

      * Searchs for identities that matches the filter.

      */

     public Enumeration<User> findUsersByKeyword(String keyword) throws EUsrGrpException {

-        keyword = LDAPUtil.escapeFilter(keyword);

-        String filter = "(|(uid=*" + keyword + "*)(cn=*" + keyword + "*)(mail=*" + keyword + "*))";

+        String filter = null;

+

+        if (keyword != null) {

+            keyword = LDAPUtil.escapeFilter(keyword);

+            filter = "(|(uid=*" + keyword + "*)(cn=*" + keyword + "*)(mail=*" + keyword + "*))";

+        }

         return findUsers(filter);

     }

-- 

2.25.4