From 85b1360f70d63f12226e12a6feefad4b94148a26 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Fri, 7 Oct 2016 09:19:36 -0400 Subject: [PATCH] Ticket 49003 - Add host and port to LDAP URL construction Description: When constructing LDAP URLs always use the user port and user host https://fedorahosted.org/389/ticket/49003 Reviewed by: ? --- examples/framework/DemoTaskModel.java | 1 + src/com/netscape/management/client/ug/LdapQueryBuilderDialog.java | 3 ++- src/com/netscape/management/client/ug/ResEditorDynamicGpMembers.java | 3 ++- test/com/netscape/management/client/ace/ACITest.java | 4 +++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/examples/framework/DemoTaskModel.java b/examples/framework/DemoTaskModel.java index 2022338..de6159a 100644 --- a/examples/framework/DemoTaskModel.java +++ b/examples/framework/DemoTaskModel.java @@ -20,6 +20,7 @@ import java.util.*; import java.awt.*; import java.awt.event.*; +import javax.swing.ImageIcon; import com.sun.java.swing.*; import com.sun.java.swing.event.*; import com.netscape.management.client.*; diff --git a/src/com/netscape/management/client/ug/LdapQueryBuilderDialog.java b/src/com/netscape/management/client/ug/LdapQueryBuilderDialog.java index 1b7b613..dca95c2 100644 --- a/src/com/netscape/management/client/ug/LdapQueryBuilderDialog.java +++ b/src/com/netscape/management/client/ug/LdapQueryBuilderDialog.java @@ -271,7 +271,8 @@ public class LdapQueryBuilderDialog extends AbstractModalDialog { * Creates the search URL. */ private void createQueryString() { - _queryString = "ldap:///"; + _queryString = ("ldap://" + _consoleInfo.getUserHost() + ":" + + _consoleInfo.getUserPort() + "/"); _queryString += LDAPUrl.encode(_baseDN.getText()); switch (_searchScope.getSelectedIndex()) { diff --git a/src/com/netscape/management/client/ug/ResEditorDynamicGpMembers.java b/src/com/netscape/management/client/ug/ResEditorDynamicGpMembers.java index 70f0946..e4e7cc8 100644 --- a/src/com/netscape/management/client/ug/ResEditorDynamicGpMembers.java +++ b/src/com/netscape/management/client/ug/ResEditorDynamicGpMembers.java @@ -187,7 +187,8 @@ Observer, ActionListener { if (e.getSource().equals(_queryButton)) { } else if (e.getSource().equals(_addButton)) { String defaultQuery = - "ldap:///"+_consoleInfo.getUserBaseDN() + "??sub?"; + ("ldap://" + _consoleInfo.getUserHost() + ":" + _consoleInfo.getUserPort() + + "/" + _consoleInfo.getUserBaseDN() + "??sub?"); DynamicQueryDlg dlg = new DynamicQueryDlg(_consoleInfo, null, true, defaultQuery); diff --git a/test/com/netscape/management/client/ace/ACITest.java b/test/com/netscape/management/client/ace/ACITest.java index 164ffc3..c200fd3 100644 --- a/test/com/netscape/management/client/ace/ACITest.java +++ b/test/com/netscape/management/client/ace/ACITest.java @@ -17,13 +17,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * END COPYRIGHT BLOCK **/ -package com.netscape.management.client.ace; +package ace; import java.awt.*; import java.awt.event.*; import java.util.*; import javax.swing.*; import netscape.ldap.*; + +import com.netscape.management.client.ace.ACIManager; import com.netscape.management.client.components.*; import com.netscape.management.nmclf.*; -- 2.7.4