From a3f7d585fed02fb8b0adaf46228f23bf1275c596 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Tue, 4 Dec 2012 11:25:55 -0500 Subject: Interpolation correction patch based on review comments --- base/deploy/src/pkispawn | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'base/deploy/src/pkispawn') diff --git a/base/deploy/src/pkispawn b/base/deploy/src/pkispawn index 79ab1b230..21da9aef7 100755 --- a/base/deploy/src/pkispawn +++ b/base/deploy/src/pkispawn @@ -135,21 +135,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) -- cgit