summaryrefslogtreecommitdiffstats
path: root/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2013-02-01 14:31:15 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2013-02-03 00:53:32 -0500
commit2ea42ce4cf91053bc91e5722abeb259cd0577510 (patch)
treef656b7b675c780fed7ddd4e301338cd6fe89b7b4 /base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
parentb9d65ba5237fc51adc018d1ddcf5fac2f6e30e27 (diff)
downloadpki-2ea42ce4cf91053bc91e5722abeb259cd0577510.tar.gz
pki-2ea42ce4cf91053bc91e5722abeb259cd0577510.tar.xz
pki-2ea42ce4cf91053bc91e5722abeb259cd0577510.zip
Fixed getInstallToken() invocation.
The configuration code has been modified to use the REST interface to get the installation token and ignore CA cert validation errors. Ticket #476
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java')
-rw-r--r--base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
index a7ec566ce..f8869fc06 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
@@ -314,17 +314,19 @@ public class ConfigurationUtils {
public static String getInstallToken(String sdhost, int sdport, String user, String passwd) throws Exception {
IConfigStore cs = CMS.getConfigStore();
- boolean oldtoken = cs.getBoolean("cs.useOldTokenInterface", true);
+ boolean oldtoken = cs.getBoolean("cs.useOldTokenInterface", false);
if (oldtoken) {
return ConfigurationUtils.getOldToken(sdhost, sdport, user, passwd);
}
+
String csType = cs.getString("cs.type");
ClientConfig config = new ClientConfig();
config.setServerURI("https://" + sdhost + ":" + sdport + "/ca");
config.setUsername(user);
config.setPassword(passwd);
+ config.setInstanceCreationMode(true);
PKIConnection connection = new PKIConnection(config);
AccountClient accountClient = new AccountClient(connection);