From b1e11d360d8a0d5dc7f8cd98bb4e0943a7046759 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sun, 24 Jul 2022 13:10:15 -0700 Subject: [PATCH] Fix version detection to deal with numbers like 3.14 https://forum.virtualmin.com/t/modsec-audit-log-impervious-to-log-file-rotation-settings/116142/4 --- logrotate/edit_log.cgi | 4 ++-- logrotate/save_log.cgi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/logrotate/edit_log.cgi b/logrotate/edit_log.cgi index 2de861738..39b482e44 100755 --- a/logrotate/edit_log.cgi +++ b/logrotate/edit_log.cgi @@ -143,7 +143,7 @@ print &ui_table_row($text{'edit_mailfl'}, $text{'edit_mailfirst'} : $text{'edit_maillast'}) ] ])); -if (&get_logrotate_version() < 3.6) { +if (&compare_version_numbers(&get_logrotate_version(), 3.6) < 0) { $errors = &find_value("errors", $lconf); print &ui_table_row($text{'edit_errors'}, &ui_opt_textbox("errors", $errors, 30, @@ -162,7 +162,7 @@ $post = &find_value("postrotate", $lconf); print &ui_table_row($text{'edit_post'}, &ui_textarea("post", $post, 3, 60)); -if (&get_logrotate_version() >= 3.4) { +if (&compare_version_numbers(&get_logrotate_version(), 3.4) >= 0) { &yesno_option("sharedscripts", "nosharedscripts", $lconf); } diff --git a/logrotate/save_log.cgi b/logrotate/save_log.cgi index 5f9f5dffd..ad3a194b9 100755 --- a/logrotate/save_log.cgi +++ b/logrotate/save_log.cgi @@ -178,7 +178,7 @@ else { &save_directive($log, "postrotate"); } - if (&get_logrotate_version() >= 3.4) { + if (defined($in{'sharedscripts'})) { &parse_yesno("sharedscripts", "nosharedscripts", $log); }