ids-functions.pl: Make downloader work with new ruleset-sources file

format.

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

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 0e397ca192182a1dd9b61604c04ed09b2cbf1184..e9298ac4b6f989fdc252836e5a773223b0ed6b0c 100644 (file)
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -169,10 +169,6 @@ sub downloadruleset {
                return 1;
        }
 
-       # Get all available ruleset locations.
-       my %rulesetsources=();
-       &General::readhash($rulesetsourcesfile, \%rulesetsources);
-
        # Read proxysettings.
        my %proxysettings=();
        &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
@@ -205,7 +201,7 @@ sub downloadruleset {
        }
 
        # Grab the right url based on the configured vendor.
-       my $url = $rulesetsources{$rulessettings{'RULES'}};
+       my $url = $IDS::Ruleset::Providers{$rulessettings{'RULES'}}{'dl_url'};
 
        # Check if the vendor requires an oinkcode and add it if needed.
        $url =~ s/\<oinkcode\>/$rulessettings{'OINKCODE'}/g;