From 947ab8aa80c430bdec9ecfced19074c3bbd661c2 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Tue, 18 Sep 2012 10:37:06 -0500 Subject: Removed duplicate DN escaping methods. The duplicate methods to escape DN value have been removed. The codes that used the duplicate methods have been modified to use LDAPUtil.escapeDN(). Ticket #193 --- base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java') diff --git a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java index d538ce675..b35ca054c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java @@ -58,6 +58,7 @@ import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.CMSTemplate; import com.netscape.cms.servlet.common.CMSTemplateParams; import com.netscape.cms.servlet.common.ECMSGWException; +import com.netscape.cmsutil.ldap.LDAPUtil; /** * Search for certificates matching complex query filter @@ -224,12 +225,12 @@ public class SrchCerts extends CMSServlet { lf.append("(x509cert.subject=*"); lf.append(avaName); lf.append("="); - lf.append(escapeValueRfc1779(val, true)); + lf.append(LDAPUtil.escapeFilter(LDAPUtil.escapeDN(val))); lf.append(",*)"); lf.append("(x509cert.subject=*"); lf.append(avaName); lf.append("="); - lf.append(escapeValueRfc1779(val, true)); + lf.append(LDAPUtil.escapeFilter(LDAPUtil.escapeDN(val))); lf.append(")"); lf.append(")"); } else { @@ -237,7 +238,7 @@ public class SrchCerts extends CMSServlet { lf.append(avaName); lf.append("="); lf.append("*"); - lf.append(escapeValueRfc1779(val, true)); + lf.append(LDAPUtil.escapeFilter(LDAPUtil.escapeDN(val))); lf.append("*)"); } } -- cgit