From bdb22b37dcbca81874dec230d3b074a028eb33ec Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sun, 26 Feb 2017 14:11:32 -0800 Subject: [PATCH] Fix perl warnings https://sourceforge.net/p/webadmin/bugs/4907/ --- acl/acl-lib.pl | 3 ++- acl/edit_unix.cgi | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/acl/acl-lib.pl b/acl/acl-lib.pl index 8c98d9fcb..d40afe31c 100755 --- a/acl/acl-lib.pl +++ b/acl/acl-lib.pl @@ -1672,8 +1672,9 @@ authenticate as, as array references. =cut sub get_unixauth { +my ($miniserv) = @_; my @rv; -my @ua = split(/\s+/, $_[0]->{'unixauth'}); +my @ua = $miniserv->{'unixauth'} ? split(/\s+/, $miniserv->{'unixauth'}) : ( ); foreach my $ua (@ua) { if ($ua =~ /^(\S+)=(\S+)$/) { push(@rv, [ $1, $2 ]); diff --git a/acl/edit_unix.cgi b/acl/edit_unix.cgi index 7d0359739..636598843 100755 --- a/acl/edit_unix.cgi +++ b/acl/edit_unix.cgi @@ -30,7 +30,8 @@ my @webmins = map { [ $_->{'name'} ] } sort { $a->{'name'} cmp $b->{'name'} } &list_users(); foreach my $ua (@unixauth, [ ], [ ]) { $utable .= &ui_columns_row([ - &ui_select("mode_$i", $ua->[0] eq "" ? 0 : + &ui_select("mode_$i", !defined($ua->[0]) ? 0 : + $ua->[0] eq "" ? 0 : $ua->[0] eq "*" ? 1 : $ua->[0] =~ /^\@/ ? 2 : 3, [ [ 0, " " ],