diff options
| author | Ade Lee <alee@redhat.com> | 2013-04-28 01:02:30 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2013-04-28 01:08:00 -0400 |
| commit | 9d535ab400a937d1ed309923302353a7c665dd96 (patch) | |
| tree | 1964f7656c54bc67a23144a017223972932342b4 /base | |
| parent | e7a9add502681e13fde159e6f3a026af249e92f9 (diff) | |
| download | pki-9d535ab400a937d1ed309923302353a7c665dd96.tar.gz pki-9d535ab400a937d1ed309923302353a7c665dd96.tar.xz pki-9d535ab400a937d1ed309923302353a7c665dd96.zip | |
Fix some errors in patch.
Update kraconnector-delete call to use -c for database password.
Update get-install-token call to specify instance certdb. Removed
--ignore-untrusted directives on both. Update man page.
Diffstat (limited to 'base')
| -rw-r--r-- | base/java-tools/man/man1/pki.1 | 7 | ||||
| -rw-r--r-- | base/server/src/engine/pkihelper.py | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/base/java-tools/man/man1/pki.1 b/base/java-tools/man/man1/pki.1 index a18117bba..ec0af7c3d 100644 --- a/base/java-tools/man/man1/pki.1 +++ b/base/java-tools/man/man1/pki.1 @@ -26,6 +26,9 @@ pki [CLI options] <command> [command arguments] .SH OPTIONS .TP +.B -c <database password> +Specifies the certificate database password. +.TP .B -d <database> Specifies the certificate database to be used. .TP @@ -60,7 +63,7 @@ Displays verbose information. Displays 'pki' CLI version information. .TP .B -w <password> -Specifies the password. +Specifies the user password. .SH OPERATIONS To view available commands and options, simply type \fBpki\fP. Some commands have sub-commands. To view the sub-commands, type \fBpki <command>\fP. To view each command's usage, type \fB pki <command> --help\fP. @@ -89,7 +92,7 @@ To authenticate with a username and password: To authenticate with a client certificate: -.B pki -d <certificate database directory> -w <certificate database password> -n "<certificate nickname>" <command> +.B pki -d <certificate database directory> -c <certificate database password> -n "<certificate nickname>" <command> .SS Viewing Certificates Certificates can be viewed anonymously. diff --git a/base/server/src/engine/pkihelper.py b/base/server/src/engine/pkihelper.py index 1ff50cd13..e7735d8d3 100644 --- a/base/server/src/engine/pkihelper.py +++ b/base/server/src/engine/pkihelper.py @@ -2594,8 +2594,7 @@ class kra_connector: def execute_using_pki(self, caport, cahost, subsystemnick, token_pwd, krahost, kraport, critical_failure=False): - command = "/bin/pki -p '{}' -h '{}' -n '{}' -P https -d '{}' -w '{}' "\ - "--ignore-cert-status UNTRUSTED_ISSUER "\ + command = "/bin/pki -p '{}' -h '{}' -n '{}' -P https -d '{}' -c '{}' "\ "kraconnector-del {} {}".format( caport, cahost, subsystemnick, master['pki_database_path'], @@ -2858,11 +2857,11 @@ class security_domain: secadminport = cs_cfg.get('securitydomain.httpsadminport') secselect = cs_cfg.get('securitydomain.select') - command = "/bin/pki -p '{}' -h '{}' -P https -u '{}' -w '{}' "\ - "--ignore-cert-status UNTRUSTED_ISSUER "\ + command = "/bin/pki -p '{}' -h '{}' -P https -u '{}' -w '{}' -d '{}' "\ "securitydomain-get-install-token --hostname {} "\ "--subsystem {}".format( secadminport, sechost, secuser, secpass, + master['pki_database_path'], machinename, cstype) try: output = subprocess.check_output(command, |