completed merge from master for psad-2.2 features

diff --cc fwcheck_psad.pl
index badea0c,2df8031..3427b25
--- 1/fwcheck_psad.pl
--- 2/fwcheck_psad.pl
+++ b/fwcheck_psad.pl
@@@ -90,9 -90,8 +95,11 @@@ if ($fw_file) 
  ### import psad.conf
  &import_config($config_file);
  
+ $enable_ipv6 = 1 if $config{'ENABLE_IPV6_DETECTION'} eq 'Y';
+ 
 +### set firewall type
 +&set_fw_type();
 +
  ### import FW_MSG_SEARCH strings
  &import_fw_search($config_file);
  

diff --cc install.pl
Simple merge

diff --cc psad
Simple merge

diff --cc test/test-psad.pl
index 8c0af71,ee87d78..5eae9a9
--- 1/test/test-psad.pl
--- 2/test/test-psad.pl
+++ b/test/test-psad.pl
@@@ -72,38 -72,37 +74,44 @@@ my $help = 0
  my @args_cp = @ARGV;
  
  exit 1 unless GetOptions(
-     'psad-path=s'       => \$psadCmd,
-     'test-include=s'    => \$test_include,
-     'include=s'         => \$test_include,  ### synonym
-     'test-exclude=s'    => \$test_exclude,
-     'exclude=s'         => \$test_exclude,  ### synonym
-     'List-mode'         => \$list_mode,
-     'diff'              => \$diff_mode,
-     'firewall-type=s'   => \$cmdline_fw_type,
-     'fw-type=s'         => \$cmdline_fw_type,  ### synonym
-     'help'              => \$help
+     'psad-path=s'         => \$psadCmd,
+     'test-include=s'      => \$test_include,
+     'include=s'           => \$test_include,  ### synonym
+     'test-exclude=s'      => \$test_exclude,
+     'exclude=s'           => \$test_exclude,  ### synonym
 -    'test-system-install' => \$test_system_install,
+     'List-mode'           => \$list_mode,
+     'diff'                => \$diff_mode,
++    'test-system-install' => \$test_system_install,
++    'firewall-type=s'     => \$cmdline_fw_type,
++    'fw-type=s'           => \$cmdline_fw_type,  ### synonym
+     'help'                => \$help
  );
  
  &usage() if $help;
  
 +&set_fw_type();
 +
- my $psad_def = "$psadCmd --test-mode --fw-type $fw_type";
+ if ($test_system_install) {
+     $normal_root_override_str = "-O $conf_dir/normal_root_override.conf";
+     $psadCmd = '/usr/sbin/psad';
+ }
+ 
++my $psad_def = "$psadCmd --test-mode --fw-type $fw_type $normal_root_override_str";
 +
 +my %test_keys = (
 +    'category'        => $REQUIRED,
 +    'subcategory'     => $OPTIONAL,
 +    'detail'          => $REQUIRED,
 +    'function'        => $REQUIRED,
 +    'cmdline'         => $OPTIONAL,
 +    'fatal'           => $OPTIONAL,
 +    'exec_err'        => $OPTIONAL,
 +    'match_all'       => $OPTIONAL,
 +    'firewalls'       => $OPTIONAL,
 +    'postive_output_matches'  => $OPTIONAL,
 +    'negative_output_matches' => $OPTIONAL,
 +);
 +
  ### define all tests
  my @tests = (
      {