diff options
| -rwxr-xr-x | bin/drakguard | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/bin/drakguard b/bin/drakguard index 48003a5..b4d0e7b 100755 --- a/bin/drakguard +++ b/bin/drakguard @@ -296,7 +296,7 @@ gtkadd($w->{window}, ); $w->show; -if ((grep { $_ && !/acl/ } chomp_(cat_($fstab_file)) && grep { $_ && m/ext/ } chomp_(cat_($fstab_file)))) { +if (grep { $_ && !/acl/ } chomp_(cat_($fstab_file)) && grep { $_ && m/ext/ } chomp_(cat_($fstab_file))) { $acl_active = 1; $in->ask_yesorno(N("Warning"), N("The support for Access Control Lists must be enabled in order to use the Block programs feature.\nDo you want to enable it now?", $acl_active = 1)) or $acl_active = 0; if ($acl_active) { @@ -508,7 +508,7 @@ sub resolve_symlinks { sub remove_acl { my ($file, $binary) = @_; `setfacl -b $binary`; - clean_config_line($file, "$binary"); + clean_config_line($file, $binary); } sub set_permissions { @@ -624,7 +624,7 @@ sub include_guardian_file { my $to_add = ".Include<$external_file>\n"; clean_config_line($guardian_file, "$to_add"); my @all = cat_($guardian_file); - if ((($dansguardian_bannedsitelist eq $guardian_file) && !$net_control) || (($dansguardian_exceptionsitelist eq $guardian_file) && $net_control)) { + if ($dansguardian_bannedsitelist eq $guardian_file && !$net_control || $dansguardian_exceptionsitelist eq $guardian_file && $net_control) { if (!member($to_add, @all)) { output_p($guardian_file, @all, $to_add); } @@ -664,9 +664,7 @@ sub apply_whitelist { include_guardian_file($whitelist_top, $whitelist_url_file); } -sub apply_block_program { - #my @addr = @_; - #output_p($acl_file, map { $_ . "\n" } @addr); +sub apply_block_program() { if ($program_control) { my @original_list = read_program_list($url_lists[2]{file}); my @orig_list = read_program_list($url_lists[2]{file}); @@ -683,7 +681,7 @@ sub apply_block_program { my $element; @union = @intersection = @difference = (); my %count = (); - foreach $element (@original_list, @actual_list) { $count{$element}++ }; + foreach $element (@original_list, @actual_list) { $count{$element}++ } foreach $element (keys %count) { # push @union, $element; push @{ $count{$element} > 1 ? \@intersection : \@difference }, $element; |