From f86429c83c7129f432bf4963a4daeab0b648d3ef Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 2 Jun 2020 16:47:50 -0400 Subject: [PATCH] Fix credserver The grubhash should only fill in if there is a value to fill in. --- confluent_server/confluent/config/configmanager.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py index a331a5af..5f6e02ed 100644 --- a/confluent_server/confluent/config/configmanager.py +++ b/confluent_server/confluent/config/configmanager.py @@ -1708,9 +1708,9 @@ class ConfigManager(object): if 'hashvalue' not in curr[attrib]: curr[attrib]['hashvalue'] = hashcrypt_value( curr[attrib]['value']) - if 'grubhashvalue' not in curr[attrib]: - curr[attrib]['grubhashvalue'] = grub_hashcrypt_value( - curr[attrib]['value']) + if 'grubhashvalue' not in curr[attrib]: + curr[attrib]['grubhashvalue'] = grub_hashcrypt_value( + curr[attrib]['value']) if 'value' in curr[attrib]: del curr[attrib]['value'] if cfgleader: # currently config slave to another @@ -2130,9 +2130,9 @@ class ConfigManager(object): if 'hashvalue' not in curr[attrib]: curr[attrib]['hashvalue'] = hashcrypt_value( curr[attrib]['value']) - if 'grubhashvalue' not in curr[attrib]: - curr[attrib]['grubhashvalue'] = grub_hashcrypt_value( - curr[attrib]['value']) + if 'grubhashvalue' not in curr[attrib]: + curr[attrib]['grubhashvalue'] = grub_hashcrypt_value( + curr[attrib]['value']) if 'value' in curr[attrib]: del curr[attrib]['value'] if cfgleader: # currently config slave to another