selftest: Add functionality for setting extra krb5.conf options

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 7edac5065607c85946e70c7b07e370608cdc48ad..075609c61f6db2d60d3ee565fdae53093a8f7ea2 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -336,6 +336,18 @@ sub mk_krb5_conf($$)
        print KRB5CONF "
 #Generated krb5.conf for $ctx->{realm}
 
+";
+
+       if (defined($ctx->{krb5_conf_extra_options})) {
+               # These come first so that they override any later options in the file.
+               print KRB5CONF "
+[libdefaults]
+$ctx->{krb5_conf_extra_options}
+
+";
+       }
+
+       print KRB5CONF "
 [libdefaults]
  default_realm = $ctx->{realm}
  dns_lookup_realm = false

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index af50e4d01ea98d6dba72d87f84d4a869c413961f..b0e9e3a0ef6f41a0f80aea333e6411cec6b87fbd 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1202,7 +1202,8 @@ sub provision($$$$$$$$$$$)
            $force_fips_mode,
            $extra_smbconf_options,
            $extra_smbconf_shares,
-           $extra_provision_options) = @_;
+           $extra_provision_options,
+           $extra_krb5_conf_options) = @_;
 
        my $samsid = Samba::random_domain_sid();
 
@@ -1324,6 +1325,8 @@ sub provision($$$$$$$$$$$)
 $extra_smbconf_shares
 ";
 
+       $ctx->{krb5_conf_extra_options} = $extra_krb5_conf_options if defined($extra_krb5_conf_options);
+
        my $ret = $self->provision_raw_step1($ctx);
        unless (defined $ret) {
                return undef;