[389-commits] 2 commits - src/com

src/com/netscape/admin/dirserv/dirserv.properties | 2 ++
src/com/netscape/admin/dirserv/roledit/ResEditorManagedRole.java | 9 ++++-----
2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 801a83ef74aba2cdbb679cea84cd93fc6846c770
Author: Mark Reynolds <mreynolds@redhat.com>
Date: Fri Oct 7 12:24:32 2016 -0400

Ticket 49003 - Managed role error dialog empty

Description: The managed role property was missing the title and error text.
This caused an empty dialog box to appear if the ldap url could
not be parsed.

https://fedorahosted.org/389/ticket/49003

Reviewed by: viktor & nhosoi(Thanks!)

diff --git a/src/com/netscape/admin/dirserv/dirserv.properties b/src/com/netscape/admin/dirserv/dirserv.properties
index 65b6f17..0de5113 100644
--- a/src/com/netscape/admin/dirserv/dirserv.properties
+++ b/src/com/netscape/admin/dirserv/dirserv.properties
@@ -2528,6 +2528,8 @@ managedRolePage-namedRequired=Give a name to the role first
managedRolePage-alreadyMember-msg=User %0 is already member
managedRolePage-alreadyMember-title=Note
managedRolePage-browserTitle=Choose New Member
+managedRolePage-errortitle=Incorrect LDAP URL
+managedRolePage-errortext=LDAP URL could not be parsed
filteredRolePage-id=Filtered Role
filteredRolePage-label=The members of this role are the users who match the following LDAP filter:
filteredRolePage-testButton-label=Test

commit e6690a0dcb045da5dd198c17406452307e6cd9a8
Author: Mark Reynolds <mreynolds@redhat.com>
Date: Thu Oct 6 16:54:57 2016 -0400

Ticket 49003 - Add the host and port to the ldapurl in the role form

Description: To workaround an existing bug in the ldapjdk, we need to create ldap urls
that contain the host and port, as opposed to "ldap:///".

https://fedorahosted.org/389/ticket/49003

Reviewed by: ?

diff --git a/src/com/netscape/admin/dirserv/roledit/ResEditorManagedRole.java b/src/com/netscape/admin/dirserv/roledit/ResEditorManagedRole.java
index bb15a0f..c8c37df 100644
--- a/src/com/netscape/admin/dirserv/roledit/ResEditorManagedRole.java
+++ b/src/com/netscape/admin/dirserv/roledit/ResEditorManagedRole.java
@@ -431,11 +431,10 @@ public class ResEditorManagedRole extends DefaultResEditorPage
return;
}

- String roleDn = makeLastRoleDn();
- String baseDn = RolePickerDialog.makeParentDn(roleDn);
-
- String URLstring = "ldap:///" + baseDn + "??sub?(nsroledn=" + roleDn + ")";
- Debug.println("ResEditorManagedRole.actionRefresh: url = " + URLstring);
+ String roleDn = makeLastRoleDn();
+ String baseDn = RolePickerDialog.makeParentDn(roleDn);
+ String URLstring = "ldap://" + info.getUserHost() + ":" + info.getUserPort() + "/" + baseDn + "??sub?(nsroledn=" + roleDn + ")";
+ Debug.println("ResEditorManagedRole.actionRefresh: url = " + URLstring);
try {
LDAPUrl ldapURL = new LDAPUrl(URLstring);
LDAPConnection ldc = info.getUserLDAPConnection();

_______________________________________________
389-commits mailing list -- 389-commits@lists.fedoraproject.org
To unsubscribe send an email to 389-commits-leave@lists.fedoraproject.org