SF.net SVN: logwatch:[305] trunk/scripts/services

Revision: 305
          http://sourceforge.net/p/logwatch/code/305
Author:   stefjakobs
Date:     2016-01-06 19:28:18 +0000 (Wed, 06 Jan 2016)
Log Message:
-----------
fix perl 5.22 warnings (thanks: Jan Synacek; Mark Grimes)

Modified Paths:
--------------
    trunk/scripts/services/http
    trunk/scripts/services/secure

Modified: trunk/scripts/services/http
===================================================================
--- trunk/scripts/services/http	2016-01-06 19:19:09 UTC (rev 304)
+++ trunk/scripts/services/http	2016-01-06 19:28:18 UTC (rev 305)
@@ -310,10 +310,10 @@
    } elsif ($logformat =~ /\G%O/gc) {
       $parse_field[$parse_index][$parse_subindex++] = "bytes_out";
       $parse_string[$parse_index] .= "(-|\\d*)";
-   } elsif ($logformat =~ /\G%{Referer}i/gci) {
+   } elsif ($logformat =~ /\G%\{Referer}i/gci) {
       $parse_string[$parse_index] .= "(.*)";
       $parse_field[$parse_index][$parse_subindex++] = "referrer";
-   } elsif ($logformat =~ /\G%{User-Agent}i/gci) {
+   } elsif ($logformat =~ /\G%\{User-Agent}i/gci) {
       $parse_string[$parse_index] .= "(.*)";
       $parse_field[$parse_index][$parse_subindex++] = "agent";
    } elsif ($logformat =~ /\G%({.*?})?./gc) {

Modified: trunk/scripts/services/secure
===================================================================
--- trunk/scripts/services/secure	2016-01-06 19:19:09 UTC (rev 304)
+++ trunk/scripts/services/secure	2016-01-06 19:28:18 UTC (rev 305)
@@ -506,7 +506,7 @@
       $DeniedAccess{"$User,$Reason"}++;
    } elsif ($ThisLine =~ /^request-key: Cannot find command to construct key/) {
       $RequestKeyFailures++;
-   } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes {[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (ISSUE|UNKNOWN_SERVER): authtime [0-9]+, (?:etypes {rep=[0-9]+ tkt=[0-9]+ ses=[0-9]+},)? ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
+   } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes \{[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (ISSUE|UNKNOWN_SERVER): authtime [0-9]+, (?:etypes \{rep=[0-9]+ tkt=[0-9]+ ses=[0-9]+},)? ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
      if($service=~/^krbtgt\/([^@]+)@\1/) {
         $service='Login';
      }
@@ -515,7 +515,7 @@
         $e='';
      }
      $KerbList{$response}{$type}{$from}{$service}{$client}{$e}++;
-  } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes {[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (NEEDED_PREAUTH|PREAUTH_FAILED|CLIENT_NOT_FOUND): ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
+  } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes \{[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (NEEDED_PREAUTH|PREAUTH_FAILED|CLIENT_NOT_FOUND): ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
      if($service=~/^krbtgt\/([^@]+)@\1/) {
         $service='Login';
      }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------