diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2014-09-14 22:34:04 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2014-09-14 22:34:04 -0400 |
| commit | 1a48c72b884c24be94609ac4796e64bf1bd3b74a (patch) | |
| tree | 38e7def0256015c2a052eaef61768c6d28019fd2 | |
| parent | d75d69014dfdf62497090c93a507331a4bc4370e (diff) | |
| download | pfsense-packages-1a48c72b884c24be94609ac4796e64bf1bd3b74a.tar.gz pfsense-packages-1a48c72b884c24be94609ac4796e64bf1bd3b74a.tar.bz2 pfsense-packages-1a48c72b884c24be94609ac4796e64bf1bd3b74a.zip | |
Explicitly test for '0' and empty since '0' is a valid entry.
| -rw-r--r-- | config/snort/snort_migrate_config.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php index a0f850bd..66314d7f 100644 --- a/config/snort/snort_migrate_config.php +++ b/config/snort/snort_migrate_config.php @@ -434,23 +434,23 @@ foreach ($rule as &$r) { $pconfig['smtp_max_mime_mem'] = "838860"; $updated_cfg = true; } - if (empty($pconfig['smtp_b64_decode_depth'])) { + if (empty($pconfig['smtp_b64_decode_depth']) && $pconfig['smtp_b64_decode_depth'] != "0") { $pconfig['smtp_b64_decode_depth'] = "0"; $updated_cfg = true; } - if (empty($pconfig['smtp_qp_decode_depth'])) { + if (empty($pconfig['smtp_qp_decode_depth']) && $pconfig['smtp_qp_decode_depth'] != "0") { $pconfig['smtp_qp_decode_depth'] = "0"; $updated_cfg = true; } - if (empty($pconfig['smtp_bitenc_decode_depth'])) { + if (empty($pconfig['smtp_bitenc_decode_depth']) && $pconfig['smtp_bitenc_decode_depth'] != "0") { $pconfig['smtp_bitenc_decode_depth'] = "0"; $updated_cfg = true; } - if (empty($pconfig['smtp_uu_decode_depth'])) { + if (empty($pconfig['smtp_uu_decode_depth']) && $pconfig['smtp_uu_decode_depth'] != "0") { $pconfig['smtp_uu_decode_depth'] = "0"; $updated_cfg = true; } - if (empty($pconfig['smtp_email_hdrs_log_depth']) && $pconfig['smtp_email_hdrs_log_depth'] != '0') { + if (empty($pconfig['smtp_email_hdrs_log_depth'])) { $pconfig['smtp_email_hdrs_log_depth'] = "1464"; $updated_cfg = true; } @@ -475,7 +475,6 @@ foreach ($rule as &$r) { $updated_cfg = true; } - // Migrate any BY2 limit for unified2 logs to new format if (!empty($pconfig['unified2_log_limit']) && !preg_match('/^\d+[g|k|m|G|K|M]/', $pconfig['unified2_log_limit'])) { |