Remove default values before saving and skip when needed

Author: jrouzierinverse

addons/upgrade/to-14.1-crypt-at-rest.pl

@@ -50,6 +50,7 @@ sub update_config_controller {
             $fields2Encrypt{$fieldName} = undef;
         }
     }
+    return if keys (%fields2Encrypt) == 0;
 
     my $cs = $c->config_store;
     my $ini = $cs->cachedConfig;
@@ -59,12 +60,15 @@ sub update_config_controller {
             next if (!exists $fields2Encrypt{$param});
             print "Changing $section.$param\n";
             my $val = $ini->val($section, $param);
+            next if length($val) == 0;
             $val = pf::config::crypt::pf_encrypt($val);
             $ini->setval($section, $param, $val);
             $changed |= 1;
         }
     }
+
     if ($changed) {
+        $ini->removeDefaultValues();
         $ini->RewriteConfig();
     }
 }
@@ -89,16 +93,20 @@ sub update_config_controller_with_subtype {
                 $fields2Encrypt{$fieldName} = undef;
             }
         }
+        next if keys (%fields2Encrypt) == 0;
         for my $param ($ini->Parameters($section)) {
             next if (!exists $fields2Encrypt{$param});
             my $val = $ini->val($section, $param);
+            next if length($val) == 0;
             print "Changing $section.$param\n";
             $val = pf::config::crypt::pf_encrypt($val);
             $ini->setval($section, $param, $val);
             $changed |= 1;
         }
     }
+
     if ($changed) {
+        $ini->removeDefaultValues();
         $ini->RewriteConfig();
     }
 }