From 8e05f7d3a1bf66d9b2f97aefa2c40da9300885a0 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 21 Feb 2015 00:46:23 +0100 Subject: Modernize syntax. --- localmkpostfixvirtual | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/localmkpostfixvirtual b/localmkpostfixvirtual index 4c3c712..b737b45 100755 --- a/localmkpostfixvirtual +++ b/localmkpostfixvirtual @@ -1,4 +1,4 @@ -#!/usr/bin/perl -wT +#!/usr/bin/perl # # /usr/local/sbin/localmkpostfixvirtual # Copyright 2001-2006 Jonas Smedegaard @@ -96,6 +96,7 @@ # specific dbowie userpart is substituted with a wildcard) use strict; +use warnings; use User::pwent; use User::grent; @@ -146,13 +147,13 @@ sub print_accounts($$$$) { ($pre_text) && print $pre_text . "\n"; my $joker_seen; - if (&warnonce(defined(@{$addresshints{$username}}), "addresshints_$username", "Skipping non-hinted username \"$username\".")) { + if (&warnonce(@{$addresshints{$username}}, "addresshints_$username", "Skipping non-hinted username \"$username\".")) { my @localparthints = @{$addresshints{$username}}; my @localparts = grep {s/(.+)@($mailgroup|$maildomain)?$/$1/} @localparthints; foreach my $localpart (@localparts) { for ($localpart) { # FIXME: the below doesn't work as intended?!? -# if (&warnonce(! defined(@{$username_by_localpart_by_maildomain{$_}}), "address_$_", "Skipping duplicate address \"$_\" for \"$username\").")) { +# if (&warnonce(! @{$username_by_localpart_by_maildomain{$_}}, "address_$_", "Skipping duplicate address \"$_\" for \"$username\").")) { # next; # } if (/^\+$/) { @@ -180,7 +181,7 @@ sub usercomment($) { if (&warnonce(defined($fullname{$user}), "fullname_$user", "User \"$user\" lacks fullname.")) { push @s, $fullname{$user}; } - if (&warnonce(defined(@{$groups{$user}}), "groups_$user", "User \"$user\" belongs to no (secondary) group.")) { + if (&warnonce(@{$groups{$user}}, "groups_$user", "User \"$user\" belongs to no (secondary) group.")) { my @groups_sorted = sort @{$groups{$user}}; push @s, '(' . join(' ', @groups_sorted) . ')'; } @@ -195,7 +196,7 @@ sub usercomment($) { my $loop; my @mailgroups = @ARGV ? @ARGV : @{$members{'maildomains'}}; foreach my $mailgroup (@mailgroups) { - if (not &warnonce(defined(@{$addresshints{$mailgroup}}), "addresshints_$mailgroup", "Skipping empty mailgroup \"$mailgroup\".")) { + if (not &warnonce(@{$addresshints{$mailgroup}}, "addresshints_$mailgroup", "Skipping empty mailgroup \"$mailgroup\".")) { next; } my @maildomainhints = @{$addresshints{$mailgroup}}; -- cgit v1.2.3