[Fedora-directory-commits] console/src/com/netscape/management/client/topology AdminGroupNode.java, 1.3, 1.4 ServerNode.java, 1.4, 1.5

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/dirsec/console/src/com/netscape/management/client/topology
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10703/console/src/com/netscape/management/client/topology

Modified Files:
	AdminGroupNode.java ServerNode.java 
Log Message:
Resolves: bug 430364
Bug Description: setup-ds-admin.pl does not correctly set the admin server ip address
Reviewed by: nkinder (Thanks!)
Fix Description: If the admin server advertises its IP address in its cn=config nsServerAddress, the console will attempt to use the address instead of hostname (which will break https, btw).  If the address is set to 0.0.0.0, clients cannot use this, so must fall back on the hostname.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no



Index: AdminGroupNode.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/AdminGroupNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AdminGroupNode.java	15 Nov 2007 16:56:53 -0000	1.3
+++ AdminGroupNode.java	29 Jan 2009 21:23:59 -0000	1.4
@@ -415,8 +415,9 @@
                  * nsserveraddress might not be defined, which means that the
                  * admin server should listen on all interfaces rather than on
                  * a specific one. Read serverhostname from the SIE entry.
+                 * admin server uses 0.0.0.0 to mean listen on all interfaces
                  */
-                if (host == null || host.trim().length() == 0) {
+                if ((host == null) || (host.trim().length() == 0) || host.equals("0.0.0.0")) {
                     LDAPEntry sieEntry = ldc.read(dn=ldapDN, new String[] {"serverhostname"});
                     if (sieEntry == null) {
                         Debug.println(0, "AdminGroupNode.findAdminURL: " + 


Index: ServerNode.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/ServerNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerNode.java	9 Jul 2007 19:01:01 -0000	1.4
+++ ServerNode.java	29 Jan 2009 21:23:59 -0000	1.5
@@ -994,8 +994,9 @@
              * nsserveraddress might not be defined, which means that the
              * admin server should listen on all interfaces rather than on
              * a specific one. Read serverhostname from the SIE entry.
+             * admin server uses 0.0.0.0 to mean listen on all interfaces
              */
-            if (host == null || host.trim().length() == 0) {
+            if ((host == null) || (host.trim().length() == 0) || host.equals("0.0.0.0")) {
                 LDAPEntry sieEntry = ldc.read(dn=adminServerDN, new String[] {"serverhostname"});
                 if (sieEntry == null) {
                     Debug.println(0, "ERROR ConsoleInfo.getInstanceAdminURL: " +