From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Sat, 7 Dec 2019 09:38:30 +0000 (+1300)
Subject: selftest: avoid redeclaring perl variables
X-Git-Tag: ldb-2.1.1~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c4ee5282e024b5cdeca30ffd0b29adcdeed1ab2;p=thirdparty%2Fsamba.git

selftest: avoid redeclaring perl variables

None of these ones are doing any harm, we just want to silence these
warnings.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index a1f2183a4cc..fa4297316d9 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -583,7 +583,7 @@ sub write_clientconf($$$)
 	# USER-${USER_PRINCIPAL_NAME}-private-key.pem symlink
 	# We make a copy here and make the certificated easily
 	# accessable in the client environment.
-	my $mask = umask;
+	$mask = umask;
 	umask 0077;
 	opendir USERS, "${ca_users_dir}" or die "Could not open dir '${ca_users_dir}': $!";
 	for my $d (readdir USERS) {
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index a9d713d6a3b..5e728f3b156 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -349,7 +349,7 @@ sub setup_nt4_member
 	}
 
 	# Add hosts file for name lookups
-	my $cmd = "NSS_WRAPPER_HOSTS='$ret->{NSS_WRAPPER_HOSTS}' ";
+	$cmd = "NSS_WRAPPER_HOSTS='$ret->{NSS_WRAPPER_HOSTS}' ";
 	$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
 	$cmd .= "SELFTEST_WINBINDD_SOCKET_DIR=\"$ret->{SELFTEST_WINBINDD_SOCKET_DIR}\" ";
 	$cmd .= "$net $ret->{CONFIGURATION} primarytrust dumpinfo | grep -q 'REDACTED SECRET VALUES'";
@@ -1372,7 +1372,7 @@ sub check_or_start($$$$$) {
 	if ($winbindd ne "yes") {
 		$daemon_ctx->{SKIP_DAEMON} = 1;
 	}
-	my $pid = Samba::fork_and_exec($self, $env_vars, $daemon_ctx, $STDIN_READER);
+	$pid = Samba::fork_and_exec($self, $env_vars, $daemon_ctx, $STDIN_READER);
 
 	$env_vars->{WINBINDD_TL_PID} = $pid;
 	write_pid($env_vars, "winbindd", $pid);
@@ -1393,7 +1393,7 @@ sub check_or_start($$$$$) {
 		$daemon_ctx->{SKIP_DAEMON} = 1;
 	}
 
-	my $pid = Samba::fork_and_exec($self, $env_vars, $daemon_ctx, $STDIN_READER);
+	$pid = Samba::fork_and_exec($self, $env_vars, $daemon_ctx, $STDIN_READER);
 
 	$env_vars->{SMBD_TL_PID} = $pid;
 	write_pid($env_vars, "smbd", $pid);
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 89f0615fabd..6f26d8a56f8 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -939,7 +939,7 @@ servicePrincipalName: host/testallowed
 		return undef;
 	}
 
-	my $user_dn = "cn=testdenied,cn=users,$base_dn";
+	$user_dn = "cn=testdenied,cn=users,$base_dn";
 	open(LDIF, "|$ldbmodify -H $ctx->{privatedir}/sam.ldb");
 	print LDIF "dn: $user_dn
 changetype: modify
@@ -959,7 +959,7 @@ userPrincipalName: testdenied_upn\@$ctx->{realm}.upn
 		return undef;
 	}
 
-	my $user_dn = "cn=testupnspn,cn=users,$base_dn";
+	$user_dn = "cn=testupnspn,cn=users,$base_dn";
 	open(LDIF, "|$ldbmodify -H $ctx->{privatedir}/sam.ldb");
 	print LDIF "dn: $user_dn
 changetype: modify
@@ -1013,7 +1013,7 @@ servicePrincipalName: http/testupnspn.$ctx->{dnsname}
 	}
 
 	# Add user joe to group "Samba Users"
-	my $samba_tool_cmd = "";
+	$samba_tool_cmd = "";
 	my $group = "Samba Users";
 	my $user_account = "joe";
 
@@ -1026,9 +1026,9 @@ servicePrincipalName: http/testupnspn.$ctx->{dnsname}
 		return undef;
 	}
 
-	my $samba_tool_cmd = "";
-	my $group = "Samba Users";
-	my $user_account = "joe";
+	$samba_tool_cmd = "";
+	$group = "Samba Users";
+	$user_account = "joe";
 
 	$samba_tool_cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
 	$samba_tool_cmd .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
@@ -1040,13 +1040,13 @@ servicePrincipalName: http/testupnspn.$ctx->{dnsname}
 	}
 
 	# Change the userPrincipalName for jane
-	my $ldbmodify = "";
+	$ldbmodify = "";
 	$ldbmodify .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
 	$ldbmodify .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
 	$ldbmodify .= Samba::bindir_path($self, "ldbmodify");
 	$ldbmodify .=  " --configfile=$ctx->{smb_conf}";
-	my $base_dn = "DC=".join(",DC=", split(/\./, $ctx->{realm}));
-	my $user_dn = "cn=jane,cn=users,$base_dn";
+	$base_dn = "DC=".join(",DC=", split(/\./, $ctx->{realm}));
+	$user_dn = "cn=jane,cn=users,$base_dn";
 
 	open(LDIF, "|$ldbmodify -H $ctx->{privatedir}/sam.ldb");
 	print LDIF "dn: $user_dn
@@ -1408,8 +1408,8 @@ sub provision_promoted_dc($$$)
 		return undef;
 	}
 
-	my $samba_tool =  Samba::bindir_path($self, "samba-tool");
-	my $cmd = $self->get_cmd_env_vars($ret);
+	$samba_tool =  Samba::bindir_path($self, "samba-tool");
+	$cmd = $self->get_cmd_env_vars($ret);
 	$cmd .= "$samba_tool domain dcpromo $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}";
 	$cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
 	$cmd .= " --machinepass=machine$ret->{PASSWORD} --dns-backend=BIND9_DLZ";
@@ -2344,13 +2344,13 @@ sub setup_generic_vampire_dc
 		}
 
 		# Pull in a full set of changes from the main DC
-		my $base_dn = "DC=".join(",DC=", split(/\./, $dc_vars->{REALM}));
+		$base_dn = "DC=".join(",DC=", split(/\./, $dc_vars->{REALM}));
 		$cmd = $self->get_cmd_env_vars($env);
 		$cmd .= " $samba_tool drs replicate $env->{SERVER} $env->{DC_SERVER}";
 		$cmd .= " $dc_vars->{CONFIGURATION}";
 		$cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}";
 		# replicate Configuration NC
-		my $cmd_repl = "$cmd \"CN=Configuration,$base_dn\"";
+		$cmd_repl = "$cmd \"CN=Configuration,$base_dn\"";
 		unless(system($cmd_repl) == 0) {
 			warn("Failed to replicate\n$cmd_repl");
 			return undef;