src/com

[Ludwig Krispenz]

src/com/netscape/management/admserv/admserv.properties |    2 ++
 src/com/netscape/management/admserv/task/Restart.java  |   11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit ac0e0b55498cee065b338a2dded995e85af99570
Author: Ludwig 
Date:   Thu Oct 17 14:07:00 2013 +0200

Ticket 47477 - Cannot restart SSL-admin server from console

Bug Description:  If SSL is enabled for admin server console rejects to restart admin server

Fix Description:   Behaviour like DS, warn about required password file and ask confirmation to restart

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

Reviewed by: RichM

diff --git a/src/com/netscape/management/admserv/admserv.properties b/src/com/netscape/management/admserv/admserv.properties
index 5c69620..82c3c91 100644
--- a/src/com/netscape/management/admserv/admserv.properties
+++ b/src/com/netscape/management/admserv/admserv.properties
@@ -107,6 +107,8 @@ taskDescription-SNMPRestart=Restart SNMP Master Agent
 taskDescription-SNMPStop=Stop SNMP Master Agent

restart-canNotRestart=The Administration Server cannot be restarted remotely from the Console.\nThe server can be restarted only locally from the command shell\nby running the "restart-admin" command.
+restart-confirmSSLRestart=Warning: Starting SSL-Enabled Admin Server \n\nYou cannot start an SSL-enabled Admin Server remotely unless\nyou have configured a password file for the server. If a password\nfile does not exist, you must log on to the machine where the\nserver is installed and start the server from the command line.\nThe restart-ds-admin script will prompt you for the certificate database\npassword when it starts the server.\n\nContinue to restart the server?
+

#
 # information panel 
diff --git a/src/com/netscape/management/admserv/task/Restart.java b/src/com/netscape/management/admserv/task/Restart.java
index c7e502f..c5c1eff 100644
--- a/src/com/netscape/management/admserv/task/Restart.java
+++ b/src/com/netscape/management/admserv/task/Restart.java
@@ -66,10 +66,13 @@ public class Restart extends AdminTaskObject {
         if (restartControl != null) {
             if (!restartControl.canRestartFromConsole()) {
                 String msg =
-                        AdminServer._resource.getString("restart","canNotRestart");
-                SuiOptionPane.showMessageDialog(parent, msg, getName(),
-                        SuiOptionPane.ERROR_MESSAGE);
-                return false;
+                        AdminServer._resource.getString("restart","confirmSSLRestart");
+        	int userSelection = SuiOptionPane.showConfirmDialog(parent, msg,
+                	"Restart SSL-Enabled Server", SuiOptionPane.YES_NO_OPTION);
+
+        	if (userSelection != SuiOptionPane.YES_OPTION) {
+            		return false;
+        	}
             }
         } else {
             Debug.println("RestartOperation: restart activator not in ConsoleInfo");