selftest/Samba: copy pkinit@$DOMAIN certificates to the environment
authorStefan Metzmacher <metze@samba.org>
Fri, 3 Jun 2016 19:46:13 +0000 (21:46 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 22 Jul 2016 21:34:21 +0000 (23:34 +0200)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11441

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
selftest/target/Samba.pm

index 636bd525931da3540222ad8cd7a6ba3f00c68f36..69b956df5a0cad43fb074084fcaee7694200043a 100644 (file)
@@ -98,6 +98,10 @@ sub prepare_keyblobs($)
        my $admindir = "$cadir/Users/$adminprincipalname";
        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 $tlsdir = "$ctx->{tlsdir}";
        my $pkinitdir = "$ctx->{prefix_abs}/pkinit";
@@ -109,6 +113,8 @@ sub prepare_keyblobs($)
        my $keyfile = "$tlsdir/key.pem";
        my $admincertfile = "$pkinitdir/USER-$adminprincipalname-cert.pem";
        my $adminkeyfile = "$pkinitdir/USER-$adminprincipalname-private-key.pem";
+       my $pkinitcertfile = "$pkinitdir/USER-$pkinitprincipalname-cert.pem";
+       my $pkinitkeyfile = "$pkinitdir/USER-$pkinitprincipalname-private-key.pem";
 
        mkdir($tlsdir, 0700);
        mkdir($pkinitdir, 0700);
@@ -160,6 +166,10 @@ EOF
                copy_file_content(${admincert}, ${admincertfile});
                copy_file_content(${adminkey_private}, ${adminkeyfile});
        }
+       if (-e ${pkinitkey_private}) {
+               copy_file_content(${pkinitcert}, ${pkinitcertfile});
+               copy_file_content(${pkinitkey_private}, ${pkinitkeyfile});
+       }
 
        # COMPAT stuff to be removed in a later commit
        my $kdccertfile = "$tlsdir/kdc.pem";