From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 12 Jan 2016 12:51:00 +0000 (+0100)
Subject: selftest:Samba4: configure "password hash gpg key ids" for ad_dc (if available)
X-Git-Tag: tdb-1.3.10~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4efb11964d508fc843915e606d7aec515567031;p=thirdparty%2Fsamba.git

selftest:Samba4: configure "password hash gpg key ids" for ad_dc (if available)

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
---

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 1ab932bb5e1..1284e772dbe 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -321,6 +321,7 @@ $ENV{KRB5CCNAME} = "$prefix/krb5ticket";
 $ENV{PREFIX_ABS} = $prefix_abs;
 $ENV{SRCDIR} = $srcdir;
 $ENV{SRCDIR_ABS} = $srcdir_abs;
+$ENV{GNUPGHOME} = "$srcdir_abs/selftest/gnupg";
 $ENV{BINDIR} = $bindir_abs;
 
 my $tls_enabled = not $opt_quick;
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 5bf888aecbb..ed88ac57bc9 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1631,6 +1631,27 @@ sub provision_rodc($$$)
 	return $ret;
 }
 
+sub read_config_h($)
+{
+	my ($name) = @_;
+	my %ret = {};
+	open(LF, "<$name") or die("unable to read $name: $!");
+	while (<LF>) {
+		chomp;
+		next if not (/^#define /);
+		if (/^#define (.*?)[ \t]+(.*?)$/) {
+			$ret{$1} = $2;
+			next;
+		}
+		if (/^#define (.*?)[ \t]+$/) {
+			$ret{$1} = 1;;
+			next;
+		}
+	}
+	close(LF);
+	return \%ret;
+}
+
 sub provision_ad_dc($$)
 {
 	my ($self, $prefix) = @_;
@@ -1644,6 +1665,15 @@ sub provision_ad_dc($$)
 	my $require_mutexes = "dbwrap_tdb_require_mutexes:* = yes";
 	$require_mutexes = "" if ($ENV{SELFTEST_DONT_REQUIRE_TDB_MUTEX_SUPPORT} eq "1");
 
+	my $config_h = {};
+
+	if (defined($ENV{CONFIG_H})) {
+		$config_h = read_config_h($ENV{CONFIG_H});
+	}
+
+	my $password_hash_gpg_key_ids = "password hash gpg key ids = 4952E40301FAB41A";
+	$password_hash_gpg_key_ids = "" unless defined($config_h->{HAVE_GPGME});
+
 	my $extra_smbconf_options = "
         server services = -smb +s3fs
         xattr_tdb:file = $prefix_abs/statedir/xattr.tdb
@@ -1651,6 +1681,8 @@ sub provision_ad_dc($$)
 	dbwrap_tdb_mutexes:* = yes
 	${require_mutexes}
 
+	${password_hash_gpg_key_ids}
+
 	kernel oplocks = no
 	kernel change notify = no
 	smb2 leases = no