Resolved merge errors from Makefile.

Moved ConntrackUtil.pm to Conntrack dir.
Bug fix for 7676 for conntrack logging.

1 files changed, 6 insertions, 3 deletions

diff --git a/scripts/vyatta-update-conntrack-log.pl b/scripts/vyatta-update-conntrack-log.pl
index 09ee0a5..8d0ec88 100644
--- a/scripts/vyatta-update-conntrack-log.pl
+++ b/scripts/vyatta-update-conntrack-log.pl
@@ -3,15 +3,20 @@
 use strict;
 use lib "/opt/vyatta/share/perl5";
 use Vyatta::Conntrack::Config;
+use Vyatta::Conntrack::ConntrackUtil;
 
 my $pfile = '/var/run/vyatta/connlogd.lock';
-my $lfile = '/var/run/vyatta/connlogd.log';
 
 my $config = new Vyatta::Conntrack::Config;
 my $oconfig = new Vyatta::Conntrack::Config;
+
 $config->setup();
 $oconfig->setupOrig();
 
+if (!(Vyatta::Conntrack::ConntrackUtil::check_for_conntrack_hooks())) {
+  print "Warning: Connection tracking is not enabled\n";
+}
+
 if (!($config->isDifferentFrom($oconfig))) {
   if ($config->isEmpty()) {
     print STDERR "Empty Configuration\n";
@@ -26,7 +31,6 @@ if ($config->isEmpty()) {
   Vyatta::Conntrack::Config::kill_daemon();
   # delete the .lock and .log file getting generated
   `rm -f $pfile`;
-  `rm -f $lfile`; 
    exit 0;
 }
 
@@ -35,7 +39,6 @@ if ($cmd) {
   # First stop the daemon and restart with config 
   Vyatta::Conntrack::Config::kill_daemon();
   `rm -f $pfile`;
-  `rm -f $lfile`; 
    system("$cmd");
    if ($? >> 8) {
      print STDERR "Failed to start conntrack logging daemon";