[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel/replication AgreementDestinationPanel.java, 1.2, 1.3 WindowsAgreementDestinationPanel.java, 1.3, 1.4

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28857/directoryconsole/src/com/netscape/admin/dirserv/panel/replication

Modified Files:
	AgreementDestinationPanel.java 
	WindowsAgreementDestinationPanel.java 
Log Message:
Resolves: bug 483660
Bug Description: Replication and Sync agreement edit should not allow change to/from LDAPS
Reviewed by: nhosoi (Thanks!)
Fix Description: The problem is that there is no way to change the port number in this panel, so if you change to/from LDAPS, there is no way to supply the correct port number.  If the agreement was created with LDAPS, disable the LDAP and StartTLS fields, and vice versa.
Platforms tested: RHEL5
Flag Day: no
Doc impact: Yes



Index: AgreementDestinationPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/AgreementDestinationPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AgreementDestinationPanel.java	24 Nov 2008 16:09:23 -0000	1.2
+++ AgreementDestinationPanel.java	3 Mar 2009 01:24:26 -0000	1.3
@@ -349,7 +349,7 @@
                 
     }
 
-    private void enableFields(){	
+    private void enableFields(){
     	boolean ssl = _sslEncrypt.isSelected() || _tlsEncrypt.isSelected();
     	if (_sslAuth != null) {
     		_sslAuth.setEnabled(ssl);
@@ -357,6 +357,14 @@
     	if (_gssapiAuth != null) {
     		_gssapiAuth.setEnabled(!ssl);
     	}
+    	// cannot convert to or from LDAPS because there is no way to change
+    	// the port number in this panel
+    	if (_sslEncrypt.isSelected()) {
+    	    _tlsEncrypt.setEnabled(false);
+    	    _noEncrypt.setEnabled(false);
+    	} else {
+    	    _sslEncrypt.setEnabled(false);
+    	}
     }
 
 


Index: WindowsAgreementDestinationPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/WindowsAgreementDestinationPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WindowsAgreementDestinationPanel.java	24 Nov 2008 16:09:23 -0000	1.3
+++ WindowsAgreementDestinationPanel.java	3 Mar 2009 01:24:26 -0000	1.4
@@ -792,6 +792,14 @@
         _bindText.setText(_wizardInfo.getBindDN());
         _tlsEncrypt.setSelected(_wizardInfo.getStartTLS());
         _sslEncrypt.setSelected(_wizardInfo.getSSL());
+        // cannot change to/from LDAPS in this panel because there
+        // is no way to change the port number
+        if (_sslEncrypt.isSelected()) {
+            _noEncrypt.setEnabled(false);
+            _tlsEncrypt.setEnabled(false);
+        } else {
+            _sslEncrypt.setEnabled(false);
+        }
         enableSimpleAuth(true);
         /* none of the other auth methods are currently supported */
     }