diff options
| author | Ade Lee <alee@redhat.com> | 2012-12-04 11:25:55 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-12-04 12:11:53 -0500 |
| commit | a3f7d585fed02fb8b0adaf46228f23bf1275c596 (patch) | |
| tree | 8013f66f46a15460a28c709f0ed07b6659fe443f /base/deploy/src/pkidestroy | |
| parent | 065d883a5595154ec4ca91e890aa380e3bf1d6b2 (diff) | |
| download | pki-a3f7d585fed02fb8b0adaf46228f23bf1275c596.tar.gz pki-a3f7d585fed02fb8b0adaf46228f23bf1275c596.tar.xz pki-a3f7d585fed02fb8b0adaf46228f23bf1275c596.zip | |
Interpolation correction patch based on review comments
Diffstat (limited to 'base/deploy/src/pkidestroy')
| -rwxr-xr-x | base/deploy/src/pkidestroy | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/base/deploy/src/pkidestroy b/base/deploy/src/pkidestroy index 69daa13ad..9e0a37396 100755 --- a/base/deploy/src/pkidestroy +++ b/base/deploy/src/pkidestroy @@ -115,21 +115,11 @@ def main(argv): config.pki_log.error(log.PKI_UNABLE_TO_PARSE_1, rv, extra=config.PKI_INDENTATION_LEVEL_0) sys.exit(1) - else: - # NEVER print out 'sensitive' name/value pairs!!! - config.pki_log.debug(log.PKI_DICTIONARY_COMMON, - extra=config.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(log.PKI_DICTIONARY_WEB_SERVER, - extra=config.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pkilogging.format(config.pki_web_server_dict), - extra=config.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(log.PKI_DICTIONARY_SUBSYSTEM, - extra=config.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pkilogging.format(config.pki_subsystem_dict), - extra=config.PKI_INDENTATION_LEVEL_0) # NEVER print out 'sensitive' name/value pairs!!! - config.pki_log.debug(log.PKI_DICTIONARY_COMMON, + config.pki_log.debug(log.PKI_DICTIONARY_DEFAULT, + extra=config.PKI_INDENTATION_LEVEL_0) + config.pki_log.debug(pkilogging.format(config.pki_default_dict), extra=config.PKI_INDENTATION_LEVEL_0) config.pki_log.debug(log.PKI_DICTIONARY_WEB_SERVER, extra=config.PKI_INDENTATION_LEVEL_0) |