]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
selftest/target/samba: avoid overwriting $pkinitdir
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Sat, 7 Dec 2019 10:15:00 +0000 (23:15 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 4 Feb 2020 05:13:39 +0000 (05:13 +0000)
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 <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
selftest/target/Samba.pm

index 0cfa5c57dd50e661421fbb64ab7c0f76bb4b31e3..213aaa8d8d3cd44637f6de11d4e7abe8bf3e56aa 100644 (file)
@@ -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";