src/com/netscape/admin/dirserv/panel/EncryptionPanel.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 1c02856f5f4e547f0d0347625bdaf6aa323cc343
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Sep 3 17:03:22 2014 -0400
Ticket 47887 - DS Console does not correctly disable SSL
Bug Description: Disabling SSL incorrectly sets nsServerSecurity to "on"
in the SIE entry.
Fix Description: Properly set and check when SSL is being disabled/enabled.
https://fedorahosted.org/389/ticket/47887
Reviewed by: rmeggins(Thanks!)
diff --git a/src/com/netscape/admin/dirserv/panel/EncryptionPanel.java
b/src/com/netscape/admin/dirserv/panel/EncryptionPanel.java
index 1a6023b..20d885f 100644
--- a/src/com/netscape/admin/dirserv/panel/EncryptionPanel.java
+++ b/src/com/netscape/admin/dirserv/panel/EncryptionPanel.java
@@ -251,7 +251,7 @@ public class EncryptionPanel extends BlankPanel
else if (_rbRequired.isSelected()) {
_configData.clientAuth = _configData.CLIENT_AUTH_REQUIRED;
}
- _configData.sslConsoleOn = _cbConsoleSSL.isSelected();
+ _configData.sslConsoleOn = _configData.sslServerOn &&
_cbConsoleSSL.isSelected();
_configData.sslCheckHostName = _cbSSLCheckHostName.isSelected();
// Write the config data to the directories
@@ -447,6 +447,8 @@ public class EncryptionPanel extends BlankPanel
Debug.println(4,
"EncryptionPanel.securityEnabledChanged: enable = " + enable);
_configData.sslServerOn = enable;
+ _configData.sslConsoleOn = enable;
+
// We must enable/disable the components accordingly.
updateComponentState();
setDirty(true);