From 467abee4eed9f7da95326e2ccd8120440378b58f Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Sat, 7 Dec 2019 23:15:00 +1300 Subject: [PATCH] selftest/target/samba: avoid overwriting $pkinitdir We were declaring the same variable twice with two different paths, "$cadir/Users/$pkinitprincipalname" here and "$ctx->{prefix_abs}/pkinit" about 5 lines down. Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer Reviewed-by: Andrew Bartlett --- selftest/target/Samba.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index 0cfa5c57dd5..213aaa8d8d3 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -162,9 +162,9 @@ sub prepare_keyblobs($) my $admincert = "$admindir/USER-$adminprincipalname-cert.pem"; my $adminkey_private = "$admindir/USER-$adminprincipalname-private-key.pem"; my $pkinitprincipalname = "pkinit\@$ctx->{dnsname}"; - my $pkinitdir = "$cadir/Users/$pkinitprincipalname"; - my $pkinitcert = "$pkinitdir/USER-$pkinitprincipalname-cert.pem"; - my $pkinitkey_private = "$pkinitdir/USER-$pkinitprincipalname-private-key.pem"; + my $ca_pkinitdir = "$cadir/Users/$pkinitprincipalname"; + my $pkinitcert = "$ca_pkinitdir/USER-$pkinitprincipalname-cert.pem"; + my $pkinitkey_private = "$ca_pkinitdir/USER-$pkinitprincipalname-private-key.pem"; my $tlsdir = "$ctx->{tlsdir}"; my $pkinitdir = "$ctx->{prefix_abs}/pkinit"; -- 2.34.1