From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 3 Jun 2016 19:46:13 +0000 (+0200)
Subject: selftest/Samba: copy pkinit@$DOMAIN certificates to the environment
X-Git-Tag: tdb-1.3.10~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3f827009b2d8cfb71218a8cf640ea879d4da821;p=thirdparty%2Fsamba.git

selftest/Samba: copy pkinit@$DOMAIN certificates to the environment

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>
---

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 636bd525931..69b956df5a0 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -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";