From de1c3b187fb3619d0dd8be20f838eb8566d5428e Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Mon, 30 May 2016 15:29:10 -0700 Subject: [PATCH] strict/warnings compliance --- record-failed.pl | 14 ++++++++------ record-login.pl | 5 ++++- record-logout.pl | 5 ++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/record-failed.pl b/record-failed.pl index 042ea9b57..02dc883ef 100755 --- a/record-failed.pl +++ b/record-failed.pl @@ -1,15 +1,17 @@ #!/usr/local/bin/perl -# Write an actions log for a login +# Write an actions log for a failed login BEGIN { push(@INC, ".."); }; +use strict; +use warnings; use WebminCore; - &init_config(); -($username, $sid, $remoteip, $localip) = @ARGV; -if ($username && $sid && $remoteip) { +our ($remote_user); + +my ($username, $reason, $remoteip, $localip) = @ARGV; +if ($username && $reason && $remoteip) { $WebminCore::remote_user = $remote_user = $username; - $main::session_id = $sid; $0 = "miniserv.pl"; - &webmin_log("login", undef, undef, undef, "global", undef, + &webmin_log("failed", undef, $reason, undef, "global", undef, undef, $remoteip); } diff --git a/record-login.pl b/record-login.pl index 042ea9b57..92bedbdb6 100755 --- a/record-login.pl +++ b/record-login.pl @@ -2,10 +2,13 @@ # Write an actions log for a login BEGIN { push(@INC, ".."); }; +use strict; +use warnings; use WebminCore; +our ($remote_user); &init_config(); -($username, $sid, $remoteip, $localip) = @ARGV; +my ($username, $sid, $remoteip, $localip) = @ARGV; if ($username && $sid && $remoteip) { $WebminCore::remote_user = $remote_user = $username; $main::session_id = $sid; diff --git a/record-logout.pl b/record-logout.pl index 3bf156b4c..0d5301e10 100755 --- a/record-logout.pl +++ b/record-logout.pl @@ -2,10 +2,13 @@ # Write an actions log for a logout BEGIN { push(@INC, ".."); }; +use strict; +use warnings; use WebminCore; +our ($remote_user); &init_config(); -($username, $sid, $remoteip, $remoteip) = @ARGV; +my ($username, $sid, $remoteip, $localip) = @ARGV; if ($username && $sid && $remoteip) { $WebminCore::remote_user = $remote_user = $username; $main::session_id = $sid;