From 73fb345e06b70d23a852743e4dc81ef6063e738a Mon Sep 17 00:00:00 2001 From: Jack Magne Date: Wed, 6 May 2015 16:49:59 -0700 Subject: Fix #1351 pki securitydomain-get-install-token fails when run with caadmin user. The short term solution to this problem was to remove the man page information and all references to the command line module reponsible for this issue. The installer already has an alternative method to remove a subsystem from the security domain list. We now assume the alternate method and don't even try to find the token at this point. A user at the command line of the pki command will no longer be able to attempt this as well. Tested this to verify that the man page for the "securtydomain" command no longer mentions or documents the "get-install-token" variant. Tested to verify that this command can't be manually called from the command line using "pki". This attempt results in an "unknown module". Tested by installing and uninstalling a subsytem. The security domain was kept up to date as expected for each install over remove attempted. --- base/java-tools/man/man1/pki-securitydomain.1 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'base/java-tools/man') diff --git a/base/java-tools/man/man1/pki-securitydomain.1 b/base/java-tools/man/man1/pki-securitydomain.1 index a8c36c556..cbefa7568 100644 --- a/base/java-tools/man/man1/pki-securitydomain.1 +++ b/base/java-tools/man/man1/pki-securitydomain.1 @@ -20,7 +20,6 @@ pki-securitydomain \- Command-Line Interface for managing Certificate System sec .SH SYNOPSIS .nf \fBpki\fR [CLI options] \fBsecuritydomain\fR -\fBpki\fR [CLI options] \fBsecuritydomain-get-install-token\fR [command options] \fBpki\fR [CLI options] \fBsecuritydomain-show\fR [command options] .fi @@ -33,11 +32,6 @@ The \fBpki-securitydomain\fR commands provide command-line interfaces to manage This command is to list available security domain commands. .RE .PP -\fBpki\fR [CLI options] \fBsecuritydomain-get-install-token\fR [command options] -.RS 4 -This command is to get an installation token. -.RE -.PP \fBpki\fR [CLI options] \fBsecuritydomain-show\fR [command options] .RS 4 This command is to show the contents of the security domain. @@ -49,9 +43,7 @@ The CLI options are described in \fBpki\fR(1). .SH OPERATIONS To view available security domain commands, type \fBpki securitydomain\fP. To view each command's usage, type \fB pki securitydomain- \-\-help\fP. -To get an installation token (used when installing a new subsystem within a security domain): - -\fBpki securitydomain-get-install-token \-\-hostname \-\-subsystem \fP +." To get an installation token (used when installing a new subsystem within a security domain): To show the contents of the security domain: -- cgit