Fix to detect NetworkManager networking on Debian

ⓘ Prefer Netplan when Debian has Netplan YAML config, otherwise select the existing NetworkManager backend for Debian systems with saved NM connection profiles, with regression tests for backend selection.

https://github.com/webmin/webmin/issues/2559

.github/workflows/code-review.yml

@@ -1,12 +0,0 @@
-name: Code Review
-
-on:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  code-review:
-    uses: webmin/webmin-ci-cd/.github/workflows/code-review.yml@main
-    secrets:
-      CODE_REVIEW_API_KEY: ${{ secrets.CODE_REVIEW_API_KEY }}

at/macos-lib.pl

@@ -35,21 +35,24 @@ return @rv;
 # create_atjob(user, time, commands, directory, send-email)
 sub create_atjob
 {
-my @tm = localtime($_[1]);
+my ($user, $tm, $cmds, $dir, $email) = @_;
+my @tm = localtime($tm);
 my $date = sprintf "%2.2d:%2.2d %d.%d.%d",
 		$tm[2], $tm[1], $tm[3], $tm[4]+1, $tm[5]+1900;
-my $mailflag = $_[4] ? "-m" : "";
+my $mailflag = $email ? "-m" : "";
 no strict "subs";
-&open_execute_command(AT, "su \"$_[0]\" -c \"cd $_[3] ; at $mailflag $date\" >/dev/null 2>&1", 0); 
-print AT $_[2];
+my $fullcmd = &command_as_user($user, 0, "cd $dir ; at $mailflag $date");
+&open_execute_command(AT, "$fullcmd >/dev/null 2>&1", 0); 
+print AT $cmds;
 close(AT);
 use strict "subs";
-&additional_log('exec', undef, "su \"$_[0]\" -c \"cd $_[3] ; at $mailflag $date\"");
+&additional_log('exec', undef, $fullcmd);
 }
 
 # delete_atjob(id)
 sub delete_atjob
 {
-&system_logged("atrm \"$_[0]\" >/dev/null 2>&1");
+my ($id) = @_;
+&system_logged("atrm ".quotemeta($id)." >/dev/null 2>&1");
 }
 

at/openserver-lib.pl

@@ -5,13 +5,13 @@ no warnings "redefine";
 
 sub list_atjobs
 {
-local @rv;
+my @rv;
 opendir(DIR, $config{'at_dir'}) || return ();
 while($f = readdir(DIR)) {
-	local $p = "$config{'at_dir'}/$f";
+	my $p = "$config{'at_dir'}/$f";
 	if ($f =~ /^(\d+)\.a(\S+)$/) {
-		local @st = stat($p);
-		local $job = { 'id' => $f,
+		my @st = stat($p);
+		my $job = { 'id' => $f,
 			       'date' => $1,
 			       'user' => scalar(getpwuid($st[4])),
 			       'created' => $st[9] };
@@ -32,17 +32,20 @@ return @rv;
 # create_atjob(user, time, commands, directory)
 sub create_atjob
 {
-local @tm = localtime($_[1]);
-local $date = strftime "%H:%M %b %d", @tm;
-&open_execute_command(AT, "su \"$_[0]\" -c \"cd $_[3] ; at $date\"", 0); 
-print AT $_[2];
+my ($user, $tm, $cmds, $dir) = @_;
+my @tm = localtime($tm);
+my $date = strftime "%H:%M %b %d", @tm;
+my $fullcmd = &command_as_user($user, 0, "cd $dir ; at $date");
+&open_execute_command(AT, $fullcmd, 0); 
+print AT $cmds;
 close(AT);
-&additional_log('exec', undef, "su \"$_[0]\" -c \"cd $_[3] ; at $date\"");
+&additional_log('exec', undef, $fullcmd);
 }
 
 # delete_atjob(id)
 sub delete_atjob
 {
-&system_logged("at -r \"$_[0]\"");
+my ($id) = @_;
+&system_logged("at -r ".quotemeta($id));
 }
 

bind8/acl_security.pl

@@ -3,7 +3,7 @@ use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
 
-require 'bind8-lib.pl';
+require 'bind8-lib.pl';    ## no critic
 # Globals from bind8-lib.pl
 our (%config, %text, %in);
 

bind8/backup_config.pl

@@ -45,21 +45,21 @@ return map { &make_chroot($_) } &unique(@rv);
 # Called before the files are actually read
 sub pre_backup
 {
-return undef;
+return;
 }
 
 # post_backup(&files)
 # Called after the files are actually read
 sub post_backup
 {
-return undef;
+return;
 }
 
 # pre_restore(&files)
 # Called before the files are restored from a backup
 sub pre_restore
 {
-return undef;
+return;
 }
 
 # post_restore(&files)
@@ -71,7 +71,7 @@ my $pidfile = &get_pid_file();
 if (&check_pid_file(&make_chroot($pidfile, 1))) {
 	return &restart_bind();
 	}
-return undef;
+return;
 }
 
 1;

bind8/bind8-lib.pl

@@ -12,16 +12,31 @@ use WebminCore;
 our (%text, %config, %gconfig, $module_name, $module_var_directory, $module_config_file, $module_config_directory);
 
 my $dnssec_tools_minver = 1.13;
-my $have_dnssec_tools = eval "require Net::DNS::SEC::Tools::dnssectools;";
+my $have_dnssec_tools = eval {
+	require Net::DNS::SEC::Tools::dnssectools;
+	1;
+	};
 my %freeze_zone_count;
 
 if ($have_dnssec_tools) {
-	eval "use Net::DNS::SEC::Tools::dnssectools;
-	      use Net::DNS::SEC::Tools::rollmgr;
-	      use Net::DNS::SEC::Tools::rollrec;
-	      use Net::DNS::SEC::Tools::keyrec;
-	      use Net::DNS::RR::DS;
-	      use Net::DNS;";
+	# All companion modules must load cleanly. A partial install would
+	# otherwise leave unqualified calls like rollmgr_sendcmd / rollrec_*
+	# undefined, causing runtime death deep inside dnssec helpers.
+	$have_dnssec_tools = eval {
+		require Net::DNS::SEC::Tools::dnssectools;
+		Net::DNS::SEC::Tools::dnssectools->import;
+		require Net::DNS::SEC::Tools::rollmgr;
+		Net::DNS::SEC::Tools::rollmgr->import;
+		require Net::DNS::SEC::Tools::rollrec;
+		Net::DNS::SEC::Tools::rollrec->import;
+		require Net::DNS::SEC::Tools::keyrec;
+		Net::DNS::SEC::Tools::keyrec->import;
+		require Net::DNS::RR::DS;
+		Net::DNS::RR::DS->import;
+		require Net::DNS;
+		Net::DNS->import;
+		1;
+		};
 	}
 
 &init_config();
@@ -78,7 +93,7 @@ if ($gconfig{'os_type'} =~ /-linux$/ &&
 		# Version: 9.14.2 deprecated the use of -r option
 		# in favor of using /dev/random [bugs:#5370]. So no
 		# entropy generation is needed.
-		return undef;
+		return;
 		}
 	}
 # No random flag, and entropy is needed
@@ -97,13 +112,13 @@ sub have_dnssec_tools_support
 		# dnssectools_rollrec
 		# dnssectools_keydir
 		# dnssectools_rollmgr_pidfile
-		return undef if (!$config{'dnssectools_conf'} ||
+		return if (!$config{'dnssectools_conf'} ||
 				 !$config{'dnssectools_rollrec'} ||
 				 !$config{'dnssectools_keydir'} ||
 				 !$config{'dnssectools_rollmgr_pidfile'});
 		return 1;
 	}
-	return undef;
+	return;
 }
 
 # get_bind_version()
@@ -116,7 +131,7 @@ if (&has_command($config{'named_path'})) {
 		return $2;
 		}
 	}
-return undef;
+return;
 }
 
 our @get_config_cache;
@@ -330,7 +345,7 @@ else {
 	while(1) {
 		$t = $_[0]->[++$i];
 		if ($t eq "{" || $t eq ";" || $t eq "}") { last; }
-		elsif (!defined($t)) { ${$_[2]} = $i; return undef; }
+		elsif (!defined($t)) { ${$_[2]} = $i; return; }
 		else { push(@vals, $t); }
 		}
 	$str{'values'} = \@vals;
@@ -342,7 +357,7 @@ else {
 		$str{'type'} = 1;
 		$j = 0;
 		while($_[0]->[$i] ne "}") {
-			if (!defined($_[0]->[$i])) { ${$_[2]} = $i; return undef; }
+			if (!defined($_[0]->[$i])) { ${$_[2]} = $i; return; }
 			my $substr = &parse_struct(
 				$_[0], $_[1], \$i, $j++, $_[4]);
 			if ($substr) {
@@ -388,7 +403,7 @@ sub find_value
 {
 my @v = &find($_[0], $_[1]);
 if (!@v) {
-	return undef;
+	return wantarray ? () : undef;
 	}
 elsif (wantarray) {
 	return map { &extract_value($_) } @v;
@@ -2075,9 +2090,9 @@ foreach my $v (&find("view", $conf)) {
         push(@zones, &find("zone", $v->{'members'}));
         }
 my ($z) = grep { lc($_->{'value'}) eq lc($name) } @zones;
-return undef if (!$z);
+return if (!$z);
 my $file = &find("file", $z->{'members'});
-return undef if (!$file);
+return if (!$file);
 my $filename = &absolute_path($file->{'values'}->[0]);
 $filename = &make_chroot($filename) if ($chroot);
 return $filename;
@@ -2256,7 +2271,7 @@ else {
 		}
 	}
 &refresh_nscd();
-return undef;
+return;
 }
 
 # before_editing(&zone)
@@ -2330,7 +2345,7 @@ elsif ($ex || $out =~ /failed|not found|error/i) {
 	return &text('restart_endc', "<tt>".&html_escape($out)."</tt>");
 	}
 &refresh_nscd();
-return undef;
+return;
 }
 
 # start_bind()
@@ -2375,7 +2390,7 @@ my $rv = $?;
 if ($rv || $out =~ /chroot.*not available/i) {
 	return &text('start_error', $out ? "<tt>$out</tt>" : "Unknown error");
 	}
-return undef;
+return;
 }
 
 # stop_bind()
@@ -2398,7 +2413,7 @@ else {
 		return $text{'stop_epid'};
 		}
 	}
-return undef;
+return;
 }
 
 # is_bind_running()
@@ -2437,7 +2452,7 @@ foreach my $c (@$vconf) {
 		return $c->{'index'};
 		}
 	}
-return undef;
+return;
 }
 
 # create_zone(&zone, &conf, [view-idx])
@@ -2641,7 +2656,7 @@ foreach my $z (@zones) {
 		return $z;
 		}
 	}
-return undef;
+return;
 }
 
 # get_zone_name_or_error(index|name, [viewindex|"any"])
@@ -2870,7 +2885,7 @@ if ($config{'tmpl_dnssec'} && &supports_dnssec()) {
 if ($secerr) {
 	return &text('mcreate_ednssec', $secerr);
 	}
-return undef;
+return;
 }
 
 # automatic_filename(domain, is-reverse, base, [viewname])
@@ -3305,7 +3320,7 @@ if ($view eq '' && @views || $view ne '' && @views > 1) {
                         [ map { [ $_->{'index'}, $_->{'value'} ] }
                             grep { $_->{'index'} ne $view } @views ]));
 	}
-return undef;
+return;
 }
 
 # download_root_zone(file)
@@ -3344,7 +3359,7 @@ if ($temp) {
 				     quotemeta($rootfile)." </dev/null");
 	return &text('boot_egzip2', "<tt>".&html_escape($out)."</tt>") if ($?);
 	}
-return undef;
+return;
 }
 
 # restart_links([&zone-name])
@@ -3458,13 +3473,14 @@ $fn || return "Could not work out keys directory!";
 my $dom = $z->{'members'} ? $z->{'values'}->[0] : $z->{'name'};
 
 # Remove all keys for the same zone
-opendir(ZONEDIR, $fn);
-foreach my $f (readdir(ZONEDIR)) {
+opendir(my $zonedir, $fn)
+	|| return "Failed to open keys directory $fn : $!";
+foreach my $f (readdir($zonedir)) {
 	if ($f =~ /^K\Q$dom\E\.\+(\d+)\+(\d+)\.(key|private)$/) {
 		&unlink_file("$fn/$f");
 		}
 	}
-closedir(ZONEDIR);
+closedir($zonedir);
 
 # Fork a background job to do lots of IO, to generate entropy
 my $pid;
@@ -3570,7 +3586,7 @@ foreach my $key (@keys) {
 	}
 &bump_soa_record($chrootfn, \@recs);
 
-return undef;
+return;
 }
 
 # resign_dnssec_key(&zone|&zone-name)
@@ -3643,7 +3659,7 @@ $newzonekey || return "Could not find new DNSSEC zone key";
 my $err = &sign_dnssec_zone($z);
 return "Re-signing failed : $err" if ($err);
 
-return undef;
+return;
 }
 
 # delete_dnssec_key(&zone|&zone-name, [save-key])
@@ -3753,7 +3769,7 @@ foreach my $r (@signedrecs) {
 	}
 &create_multiple_records($fn, \@addrecs);
 &unlink_file($signed);
-return undef;
+return;
 }
 
 # check_if_dnssec_tools_managed(&domain)
@@ -3801,7 +3817,7 @@ if (&check_if_dnssec_tools_managed($dom)) {
 	my $err = &dt_resign_zone($dom, $zonefile, $krfile, 0);
 	&unlock_file(&make_chroot($zonefile));
 	&error($err) if ($err);
-	return undef;
+	return;
 	}
 
 my $keyrec = &get_dnskey_record($z, $recs);
@@ -3820,8 +3836,17 @@ my ($z, $saved) = @_;
 my $dir = &get_keys_dir($z);
 my $dom = $z->{'members'} ? $z->{'values'}->[0] : $z->{'name'};
 my %keymap;
-opendir(ZONEDIR, $dir);
-foreach my $f (readdir(ZONEDIR)) {
+my $zonedir;
+if (!opendir($zonedir, $dir)) {
+	# A missing keys directory is the normal state before any DNSSEC
+	# keys have been generated for this zone; an unreadable one is a
+	# real error, but we can't return a string here because several
+	# list-context callers would treat it as a key hashref. Fall back
+	# to "no keys" and leave a breadcrumb in the error log.
+	warn "get_dnssec_key: opendir $dir failed: $!\n" if (-e $dir);
+	return wantarray ? () : undef;
+	}
+foreach my $f (readdir($zonedir)) {
 	if ($f =~ /^K\Q$dom\E\.\+(\d+)\+(\d+)\.key(\.saved)?$/) {
 		# Found the public key file .. read it
 		next if ($3 && !$saved);
@@ -3867,7 +3892,7 @@ foreach my $f (readdir(ZONEDIR)) {
 		while($rv->{'privatetext'} =~ s/^;.*\r?\n//) { }
 		}
 	}
-closedir(ZONEDIR);
+closedir($zonedir);
 
 # Sort to put KSK first
 my @rv = values %keymap;
@@ -4155,7 +4180,7 @@ sub dt_sign_zone
 
 	&dt_rollerd_restart();
 	&restart_bind();
-	return undef;
+	return;
 }
 
 # dt_resign_zone(zone-name, zonefile, krfile, threshold)
@@ -4212,7 +4237,7 @@ sub dt_resign_zone
 
 	&restart_zone($d);
 
-	return undef;
+	return;
 }
 
 # dt_zskroll_zone(zone-name)
@@ -4220,12 +4245,13 @@ sub dt_resign_zone
 sub dt_zskroll_zone
 {
 	my ($d) = @_;
-	no strict "subs";
+	# Constants exported by Net::DNS::SEC::Tools::rollmgr,
+	# which is only loaded when dnssec-tools is installed.
+	no strict "subs";    ## no critic (ProhibitNoStrict)
 	if (!rollmgr_sendcmd(CHANNEL_WAIT,ROLLCMD_ROLLZSK,$d)) {
 		return $text{'dt_zone_erollctl'};
 	}
-	use strict "subs";
-	return undef;
+	return;
 }
 
 # dt_kskroll_zone(zone-name)
@@ -4233,12 +4259,11 @@ sub dt_zskroll_zone
 sub dt_kskroll_zone
 {
 	my ($d) = @_;
-	no strict "subs";
+	no strict "subs";    ## no critic (ProhibitNoStrict)
 	if (!rollmgr_sendcmd(CHANNEL_WAIT,ROLLCMD_ROLLKSK,$d)) {
 		return $text{'dt_zone_erollctl'};
 	}
-	use strict "subs";
-	return undef;
+	return;
 }
 
 # dt_notify_parentzone(zone-name)
@@ -4246,12 +4271,11 @@ sub dt_kskroll_zone
 sub dt_notify_parentzone
 {
 	my ($d) = @_;
-	no strict "subs";
+	no strict "subs";    ## no critic (ProhibitNoStrict)
 	if (!rollmgr_sendcmd(CHANNEL_WAIT,ROLLCMD_DSPUB,$d)) {
 		return $text{'dt_zone_erollctl'};
 	}
-	use strict "subs";
-	return undef;
+	return;
 }
 
 # dt_rollerd_restart()
@@ -4270,7 +4294,7 @@ sub dt_rollerd_restart
 	$r = $config{"dnssectools_rollrec"};
 	$cmd = "$rollerd -rrfile ".quotemeta($r);
 	&execute_command($cmd);
-	return undef;
+	return;
 }
 
 # dt_genkrf()
@@ -4329,7 +4353,7 @@ sub dt_genkrf
 	$out = &backquote_logged("$cmd 2>&1");
 
 	return $out if ($?);
-	return undef;
+	return;
 }
 
 
@@ -4400,7 +4424,7 @@ sub dt_delete_dnssec_state
 		&unlink_file($z_dir."/dsset-".$dom.".");
 	}
 
-	return undef;
+	return;
 }
 
 # get_ds_record(&zone|&zone-name)
@@ -4424,7 +4448,7 @@ else {
 if (&has_command("dnssec-dsfromkey")) {
 	# Generate with a command
 	my $out = &backquote_command("dnssec-dsfromkey -f ".quotemeta(&make_chroot(&absolute_path($zonefile)))." ".quotemeta($dom)." 2>/dev/null");
-	return undef if ($?);
+	return if ($?);
 	$out =~ s/\r|\n//g;
 	return $out;
 	}
@@ -4445,9 +4469,9 @@ my $conf = &get_config();
 my $options = &find("options", $conf);
 my $mems = $options ? $options->{'members'} : [ ];
 my $en = &find_value("dnssec-enable", $mems);
-return undef if (!$en || $en !~ /yes/i);
+return if (!$en || $en !~ /yes/i);
 my $tkeys = &find("trusted-keys", $conf);
-return undef if (!$tkeys || !@{$tkeys->{'members'}});
+return if (!$tkeys || !@{$tkeys->{'members'}});
 return &text('trusted_warning',
 	     &get_webprefix().'/bind8/conf_trusted.cgi')."<p>\n".
        &ui_form_start(&get_webprefix().'/bind8/fix_trusted.cgi')."\n".

bind8/cgi_args.pl

@@ -62,5 +62,5 @@ elsif ($cgi eq 'view_text.cgi' || $cgi eq 'edit_soptions.cgi') {
 	return $z ? 'zone='.$z->{'zone'}.
 		    ($z->{'view'} ? '&view='.$z->{'viewindex'} : '') : 'none';
 	}
-return undef;
+return;
 }

bind8/check_zone.cgi

@@ -5,7 +5,7 @@ use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 # Globals from bind8-lib.pl
 our (%access, %text, %in);
 

bind8/close.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 # Globals
 our (%in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my @heiropen = &get_heiropen();
 @heiropen = grep { $_ ne $in{'what'} } @heiropen;

bind8/conf_acls.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%text, %access);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'acls_ecannot'});
 &ui_print_header(undef, $text{'acls_title'}, "",
 		 undef, undef, undef, undef, &restart_links());

bind8/conf_controls.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 # Globals
 our (%text, %access); 
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'controls_ecannot'});
 &ui_print_header(undef, $text{'controls_title'}, "",
 		 undef, undef, undef, undef, &restart_links());

bind8/conf_dnssec.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 # Globals
 our (%text, %access, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 $access{'defaults'} || &error($text{'dnssec_ecannot'});
 &ui_print_header(undef, $text{'dnssec_title'}, "",

bind8/conf_dnssectools.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 
 &ReadParse();
 $access{'defaults'} || &error($text{'dt_conf_ecannot'});

bind8/conf_files.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'files_ecannot'});
 &ui_print_header(undef, $text{'files_title'}, "",
 		 undef, undef, undef, undef, &restart_links());

bind8/conf_forwarding.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'forwarding_ecannot'});
 &ui_print_header(undef, $text{'forwarding_title'}, "",
 		 undef, undef, undef, undef, &restart_links());

bind8/conf_keys.cgi

@@ -6,7 +6,7 @@ use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 # Globals
 our (%access, %text);
 

bind8/conf_logging.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 our (%access, %text, %in);
 our (@syslog_levels, @severities, @cat_list);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'logging_ecannot'});
 &ui_print_header(undef, $text{'logging_title'}, "",
 		 undef, undef, undef, undef, &restart_links());

bind8/conf_manual.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'manual_ecannot'});
 &ReadParse();
 &ui_print_header(undef, $text{'manual_title'}, "",

bind8/conf_misc.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'misc_ecannot'});
 &ui_print_header(undef, $text{'misc_title'}, "",
 		 undef, undef, undef, undef, &restart_links());

bind8/conf_ncheck.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 $access{'defaults'} || &error($text{'ncheck_ecannot'});
 

bind8/conf_net.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text); 
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'net_ecannot'});
 &ui_print_header(undef, $text{'net_title'}, "",
 		 undef, undef, undef, undef, &restart_links());

bind8/conf_rndc.cgi

@@ -9,7 +9,7 @@ no warnings 'uninitialized';
 our (%access, %text, %config);
 our $module_name;
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'rndc_ecannot'});
 &ui_print_header(undef, $text{'rndc_title'}, "",
 		 undef, undef, undef, undef, &restart_links());

bind8/conf_servers.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'servers_ecannot'});
 &ui_print_header(undef, $text{'servers_title'}, "",
 		 undef, undef, undef, undef, &restart_links());

bind8/conf_trusted.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 our (%access, %text, $bind_version);
 our $dnssec_dlv_zone;
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 $access{'defaults'} || &error($text{'trusted_ecannot'});
 &supports_dnssec_client() || &error($text{'trusted_esupport'});

bind8/conf_zonedef.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'zonedef_ecannot'});
 &ui_print_header(undef, $text{'zonedef_title'}, "",
 		 undef, undef, undef, undef, &restart_links());
@@ -92,7 +92,7 @@ if (&supports_dnssec()) {
 
 	# Default algorithm
 	print &ui_table_row($text{'zonedef_alg'},
-		&ui_select("alg", $config{'tmpl_dnssecalg'} || "RSASHA1",
+		&ui_select("alg", $config{'tmpl_dnssecalg'} || "RSASHA256",
 			   [ &list_dnssec_algorithms() ]), 3);
 
 	# Default size

bind8/convert_master.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'convert_err'});
 

bind8/convert_slave.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'convert_err'});
 

bind8/cpan_modules.pl

@@ -1,4 +1,6 @@
-require 'bind8-lib.pl';
+use strict;
+use warnings;
+require 'bind8-lib.pl';    ## no critic
 
 sub cpan_recommended
 {

bind8/create_delegation.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'dcreate_err'});
 $access{'delegation'} || &error($text{'dcreate_ecannot'});

bind8/create_forward.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'fcreate_err'});
 $access{'forward'} || &error($text{'fcreate_ecannot'});

bind8/create_hint.cgi

@@ -9,7 +9,7 @@ no warnings 'uninitialized';
 our (%access, %text, %in);
 our $module_root_directory;
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'hcreate_err'});
 $access{'master'} || &error($text{'hcreate_ecannot'});

bind8/create_master.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'mcreate_err'});
 $access{'master'} || &error($text{'mcreate_ecannot'});

bind8/create_slave.cgi

@@ -11,7 +11,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($in{'type'} ? $text{'screate_err1'} : $text{'screate_err2'});
 $access{'slave'} || &error($in{'type'} ? $text{'screate_ecannot1'}

bind8/create_view.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &error_setup($text{'vcreate_err'});
 &ReadParse();
 my $add_to_file = &add_to_file();

bind8/delegation_form.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'delegation'} || &error($text{'dcreate_ecannot'});
 $access{'ro'} && &error($text{'master_ero'});
 &ui_print_header(undef, $text{'dcreate_title'}, "",

bind8/delete_recs.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'drecs_err'});
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});

bind8/delete_view.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 # Globals
 our (%access, %text, %in); 
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my $parent = &get_config_parent();
 my $conf = $parent->{'members'};

bind8/delete_zone.cgi

@@ -11,7 +11,7 @@ our (%access, %text, %in, %config);
 # Globals from records-lib.pl
 our $ipv6revzone;
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});

bind8/disable_zonedt.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in); 
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 
 &error_setup($text{'dt_zone_err'});
 &ReadParse();

bind8/disable_zonekey.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &error_setup($text{'zonekey_err'});
 &ReadParse();
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});

bind8/dns_boot.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%text, %config, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &error_setup($text{'boot_err'});
 &ReadParse();
 

bind8/edit_delegation.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %in, %text);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 
 $in{'view'} = 'any' if ($in{'view'} eq '');

bind8/edit_forward.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %in, %text);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 
 $in{'view'} = 'any' if ($in{'view'} eq '');

bind8/edit_hint.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%in, %text);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
 my $dom = $zone->{'name'};

bind8/edit_master.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config, %is_extra);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 our $ipv6revzone;
 $in{'view'} = 'any' if (!$in{'view'} || $in{'view'} eq '');

bind8/edit_options.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in); 
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});

bind8/edit_record.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in); 
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
 my $dom = $zone->{'name'};

bind8/edit_recs.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config, %is_extra);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
 my $dom = $zone->{'name'};

bind8/edit_slave.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config); 
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 our $ipv6revzone;
 

bind8/edit_soa.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %in, %text, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
 my $dom = $zone->{'name'};
@@ -65,7 +65,7 @@ print &ui_table_row($text{'master_minimum'},
 	&time_unit_choice("minunit", $u[3]));
 
 # Default TTL
-my $ttl = $defttl->{'defttl'} if ($defttl);
+my $ttl = $defttl ? $defttl->{'defttl'} : undef;
 my ($ttlu) = &extract_time_units($ttl);
 print &ui_table_row($text{'master_defttl'},
 	&ui_radio("defttl_def", $defttl ? 0 : 1,

bind8/edit_soptions.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 our (%access, %in, %text);
 our $scriptname;
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});

bind8/edit_text.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
 my $file = &absolute_path($zone->{'file'});

bind8/edit_tls.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'tls_ecannot'});
 &supports_tls() || &error($text{'tls_esupport'});
 &ReadParse();

bind8/edit_view.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my $conf = &get_config();
 my $view = $conf->[$in{'index'}];

bind8/edit_zonedt.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config, $in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 
 &ReadParse();
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});

bind8/edit_zonekey.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %in, %text, $in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
 my $dom = $zone->{'name'};

bind8/enable_zonedt.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 
 &error_setup($text{'dt_zone_err'});
 &ReadParse();

bind8/enable_zonekey.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &error_setup($text{'zonekey_err'});
 &ReadParse();
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});

bind8/find_free.cgi

@@ -8,7 +8,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});

bind8/find_zones.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%in, %config, %text); 
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 
 if (&have_dnssec_tools_support()) {

bind8/fix_trusted.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'trusted_ecannot'});
 &error_setup($text{'trusted_err'});
 &ReadParse();

bind8/forward_form.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'forward'} || &error($text{'fcreate_ecannot'});
 $access{'ro'} && &error($text{'master_ero'});
 &ui_print_header(undef, $text{'fcreate_title'}, "",

bind8/free_chooser.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%config, %text);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 
 # Go through all zones to find IPs in use, and networks
 my $conf = &get_config();

bind8/freeze_zone.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 $access{'ro'} && &error($text{'restart_ecannot'});
 $access{'apply'} || &error($text{'restart_ecannot'});

bind8/hint_form.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'master'} || &error($text{'hcreate_ecannot'});
 $access{'ro'} && &error($text{'master_ero'});
 &ui_print_header(undef, $text{'hcreate_title'}, "",

bind8/index.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 our (%access, %text, %config, %gconfig, %in);
 our ($module_name, $module_config_directory);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 
 my $need_create = !-r &make_chroot($config{'named_conf'}) ||

bind8/list_gen.cgi

@@ -8,7 +8,7 @@ no warnings 'uninitialized';
 our(%access, %text, %in); 
 our $bind_version;
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 $access{'gen'} || &error($text{'gen_ecannot'});
 

bind8/list_slaves.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'slaves'} || &error($text{'slaves_ecannot'});
 &foreign_require("servers", "servers-lib.pl");
 &ReadParse();

bind8/list_tls.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'tls_ecannot'});
 &supports_tls() || &error($text{'tls_esupport'});
 my $conf = &get_config();

bind8/log_parser.pl

@@ -1,13 +1,16 @@
 # log_parser.pl
 # Functions for parsing this module's logs
+use strict;
+use warnings;
 
-do 'bind8-lib.pl';
+do 'bind8-lib.pl';    ## no critic
+our (%text);
 
 # parse_webmin_log(user, script, action, type, object, &params)
 # Converts logged information from this module into human-readable form
 sub parse_webmin_log
 {
-local ($user, $script, $action, $type, $object, $p) = @_;
+my ($user, $script, $action, $type, $object, $p) = @_;
 if ($type eq 'record') {
 	if ($p->{'type'} eq 'PTR') {
 		return &text("log_${action}_record", $text{"type_$p->{'type'}"},
@@ -88,7 +91,7 @@ elsif ($text{"log_${action}"}) {
 	return $text{"log_${action}"};
 	}
 else {
-	return undef;
+	return;
 	}
 }
 

bind8/mass_create.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %in, %text, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParseMime();
 &ui_print_unbuffered_header(undef, $text{'mass_title'}, "");
 &error_setup($text{'mass_err'});

bind8/mass_delete.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my $conf = &get_config();
 

bind8/mass_form.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &ui_print_header(undef, $text{'mass_title'}, "");
 

bind8/mass_rcreate.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'rmass_err'});
 

bind8/mass_rcreate_form.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'rmass_err'});
 my @d = split(/\0/, $in{'d'});

bind8/mass_rdelete.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'umass_err'});
 

bind8/mass_rdelete_form.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'rdmass_err'});
 my @d = split(/\0/, $in{'d'});

bind8/mass_update.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'umass_err'});
 

bind8/mass_update_form.cgi

@@ -1,16 +1,21 @@
 #!/usr/local/bin/perl
 # Show a form for changing the IPs in multiple zones
+use strict;
+use warnings;
+no warnings 'uninitialized';
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
+our (%text, %in, %config);
 &ReadParse();
 &error_setup($text{'umass_err'});
-@d = split(/\0/, $in{'d'});
+my @d = split(/\0/, $in{'d'});
 @d || &error($text{'umass_enone'});
 
 &ui_print_header(undef, $text{'umass_title'}, "");
 
 print &ui_form_start("mass_update.cgi", "post");
-foreach $d (@d) {
+my $dc = 0;
+foreach my $d (@d) {
 	print &ui_hidden("d", $d),"\n";
 	$dc++;
 	}
@@ -20,7 +25,7 @@ print &ui_table_start($text{'umass_header'}, undef, 2);
 print &ui_table_row($text{'umass_sel'}, $dc);
 
 # Type to change
-@rtypes = ( 'ttl', 'A', 'CNAME', 'NS', 'MX', 'PTR', 'TXT', 'SPF',
+my @rtypes = ( 'ttl', 'A', 'CNAME', 'NS', 'MX', 'PTR', 'TXT', 'SPF',
 	    $config{'support_aaaa'} ? ( "AAAA" ) : ( ) );
 print &ui_table_row($text{'umass_type'},
 	&ui_select("type", "A",

bind8/master_form.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 $access{'master'} || &error($text{'mcreate_ecannot'});
 &ui_print_header(undef, $text{'mcreate_title'}, "",

bind8/move_zone.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});

bind8/old_save_controls.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'misc_ecannot'});
 &error_setup($text{'controls_err'});
 &ReadParse();

bind8/open.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 my @heiropen = &get_heiropen();
 push(@heiropen, $in{'what'});

bind8/records-lib.pl

@@ -830,7 +830,7 @@ if ($txt =~ /^v=spf1/) {
 		}
 	return $spf;
 	}
-return undef;
+return;
 }
 
 # join_spf(&spf)
@@ -898,7 +898,7 @@ if ($txt =~ /^v=dmarc1/i) {
 		}
 	return $dmarc;
 	}
-return undef;
+return;
 }
 
 # join_dmarc(&dmarc)
@@ -1018,13 +1018,13 @@ $abs ||= 0;
 my $fn;
 if ($z->{'members'}) {
 	my $file = &find("file", $z->{'members'});
-	return undef if (!$file);
+	return if (!$file);
 	$fn = $file->{'values'}->[0];
 	}
 else {
 	$fn = $z->{'file'};
 	}
-return undef if (!$fn);
+return if (!$fn);
 if ($abs) {
 	$fn = &absolute_path($fn);
 	}
@@ -1075,7 +1075,7 @@ sub find_record_by_id
 my ($recs, $id, $num) = @_;
 my @rv = grep { &record_id($_) eq $id } @$recs;
 if (!@rv) {
-	return undef;
+	return;
 	}
 elsif (@rv == 1) {
 	return $rv[0];

bind8/refetch.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &error_setup($text{'refetch_err'});
 &ReadParse();
 

bind8/resign.pl

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 our %config;
 
 my $no_acl_check++;
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 
 my $zonefile;
 my $krfile;

bind8/resign_zone.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &error_setup($text{'resign_err'});
 &ReadParse();
 my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});

bind8/restart.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 $access{'ro'} && &error($text{'restart_ecannot'});
 $access{'apply'} == 1 || $access{'apply'} == 3 ||

bind8/restart_zone.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 $access{'ro'} && &error($text{'restart_ecannot'});
 $access{'apply'} || &error($text{'restart_ecannot'});

bind8/save_acls.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'acls_ecannot'});
 &error_setup($text{'acls_err'});
 &ReadParse();

bind8/save_controls.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'controls_ecannot'});
 &error_setup($text{'controls_err'});
 &ReadParse();

bind8/save_dnssec.cgi

@@ -9,7 +9,7 @@ our $dnssec_cron_cmd;
 our $module_name;
 our $module_config_file;
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &foreign_require("cron", "cron-lib.pl");
 &ReadParse();
 &error_setup($text{'dnssec_err'});

bind8/save_dnssectools.cgi

@@ -7,7 +7,7 @@ no warnings 'uninitialized';
 our (%access, %text, %in, %config);
 our $module_config_file;
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 
 &ReadParse();
 &error_setup($text{'dt_conf_err'});

bind8/save_files.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'files_ecannot'});
 &error_setup($text{'files_err'});
 &ReadParse();

bind8/save_forward.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 &error_setup($text{'fwd_err'});
 

bind8/save_forwarding.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %config, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'forwarding_ecannot'});
 &error_setup($text{'forwarding_err'});
 &ReadParse();

bind8/save_gen.cgi

@@ -10,7 +10,7 @@ our (%access, %text, %in);
 # From records-lib.pl
 our ($uscore, $star);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &ReadParse();
 $access{'gen'} || &error($text{'gen_ecannot'});
 

bind8/save_keys.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'keys_ecannot'});
 &error_setup($text{'keys_err'});
 &ReadParse();

bind8/save_logging.cgi

@@ -7,7 +7,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in, %config);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 $access{'defaults'} || &error($text{'logging_ecannot'});
 &error_setup($text{'files_err'});
 &ReadParse();

bind8/save_manual.cgi

@@ -6,7 +6,7 @@ no warnings 'redefine';
 no warnings 'uninitialized';
 our (%access, %text, %in);
 
-require './bind8-lib.pl';
+require './bind8-lib.pl';    ## no critic
 &error_setup($text{'manual_err'});
 $access{'defaults'} || &error($text{'manual_ecannot'});
 &ReadParseMime();