From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 14 Feb 2019 11:37:13 +0000 (+0100)
Subject: convert-snort: Always create directory and filelayout
X-Git-Tag: v2.23-core131~117^2~40
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=78690361abbff86772850947e1dac97eecfa0648;ds=sidebyside

convert-snort: Always create directory and filelayout

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/config/suricata/convert-snort b/config/suricata/convert-snort
index fabf70ee77..0df5a451af 100644
--- a/config/suricata/convert-snort
+++ b/config/suricata/convert-snort
@@ -33,18 +33,6 @@ my $snort_config_file = "/etc/snort/snort.conf";
 # Snort rules tarball.
 my $snort_rules_tarball = "/var/tmp/snortrules.tar.gz";
 
-# Check if a snort settings file exists.
-unless( -f "$snort_settings_file") {
-        print "$snort_settings_file not found - Nothing to do. Exiting!\n";
-        exit(0);
-}
-
-# Check if the snort settings file is empty.
-if (-z "$snort_settings_file") {
-	print "$snort_settings_file is empty - Nothing to do. Exiting!\n";
-	exit(0);
-}
-
 #
 ## Step 1: Setup directory and file layout, if not present and set correct
 ##         ownership. The converter runs as a privileged user, but the files
@@ -70,6 +58,18 @@ unless (-d $IDS::rulespath) {
 &IDS::set_ownership("$IDS::settingsdir");
 &IDS::set_ownership("$IDS::rulespath");
 
+# Check if a snort settings file exists.
+unless( -f "$snort_settings_file") {
+	print "$snort_settings_file not found - Nothing to do. Exiting!\n";
+	exit(0);
+}
+
+# Check if the snort settings file is empty.
+if (-z "$snort_settings_file") {
+	print "$snort_settings_file is empty - Nothing to do. Exiting!\n";
+	exit(0);
+}
+
 #
 ## Step 2: Import snort settings and convert to the required format for the new IDS
 ##         (suricata).